chore(release): bump version to 0.5.3

Single-fix patch to close the CodeQL pointer-arithmetic alert that
v0.5.2 left open. v0.5.2 already shipped, so we tag forward instead
of moving the published tag.

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

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

.github/dependabot.yml

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

.github/workflows/build.yml

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

.github/workflows/codeql.yml

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

.github/workflows/release.yml

@@ -0,0 +1,61 @@
+name: Release
+
+# Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the
+# current Dalamud staging branch, locates the latest.zip produced by
+# DalamudPackager and attaches it to the matching GitHub Release.
+# Does not consume any user-controlled event payload, only the tag name
+# (validated by the on.tags filter) and the steps output of the locate
+# step (path string from Get-ChildItem on a controlled directory).
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Build and attach release ZIP
+    runs-on: windows-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+
+      - name: Download Dalamud staging
+        shell: pwsh
+        run: |
+          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
+          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
+          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
+
+      - name: Build (Release)
+        run: dotnet build ChatTwo/ChatTwo.csproj --configuration Release
+
+      - name: Locate latest.zip
+        id: locate
+        shell: pwsh
+        run: |
+          $zip = Get-ChildItem -Path ChatTwo\bin\Release -Recurse -Filter latest.zip | Select-Object -First 1
+          if (-not $zip)
+          {
+              throw "latest.zip not found under ChatTwo\bin\Release"
+          }
+          Write-Host "Found: $($zip.FullName)"
+          "path=$($zip.FullName)" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+
+      - name: Attach to GitHub release
+        uses: softprops/action-gh-release@v3
+        with:
+          files: ${{ steps.locate.outputs.path }}
+          fail_on_unmatched_files: true
+          generate_release_notes: false

.gitignore

@@ -372,6 +372,11 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
+#Specs und Plan datein
+/.superpowers/
+
+#Test Datein
+ChatTwo.Tests
 TestResults
 *.db-shm
 *.db-wal

AI_DISCLOSURE.md

@@ -1,18 +1,49 @@
 # AI assistance disclosure
 
-Per the [Dalamud Plugin AI Usage Policy](https://github.com/goatcorp/DalamudPluginsD17/),
-this fork uses AI assistance at the **Pair** level. Pair means the maintainer
-plans the architecture, decides what gets built, reviews each change and
-tests against the running game; Claude (Anthropic) helps explain Dalamud
-APIs, suggests patterns, drafts code on request, and reviews approaches.
-Neither side acts autonomously: nothing ships without the maintainer's
-review, and Claude can't run the game.
+This fork uses AI assistance per the [Dalamud Plugin AI Usage Policy](https://github.com/goatcorp/DalamudPluginsD17/)
+at the **Pair** level.
 
-The level varies by area and over time. Some commits are mostly hand-written
-with the AI used as a sounding board, others lean more on Claude for an API
-walkthrough or a code draft that the maintainer then reads, edits and
-integrates. The maintainer's commitment is to be able to explain why every
-piece of Hellion code is the way it is — not "I typed every character."
+A note up front: Hellion Chat is currently in a rebuild and adjustment
+phase, and there are no plans to submit it to the Dalamud team for review
+while it stays standalone. If the plugin stays out of the official repo I
+technically wouldn't need to disclose any of this, but I'd rather be
+upfront about how it's built.
+
+Hellion Chat is my entry point into game modding and plugin development. I
+have never written a plugin for a game before. I work alone, so I get help
+where I need it. That's not something I want to hide.
+
+## How I actually work
+
+I plan the architecture, decide what gets built, and own every design
+decision. For each change I:
+
+- Read the code Claude drafts before I integrate it
+- Test with my own tooling and in the running game
+- Read the Dalamud log output to verify behaviour
+- Run security and privacy audits on anything that touches user data
+
+One of the main reasons I use AI is consistency. I want the Hellion code to
+match the style of the upstream Chat 2 codebase and stay readable for
+anyone who opens the repo, not just for me. Claude helps me catch when I'm
+drifting from upstream conventions or writing something that only makes
+sense in my own head.
+
+The balance is shifting toward more hand-written work as I get more
+comfortable with Dalamud and plugin development in general.
+
+## What AI is used for
+
+- API explanations (Dalamud, ImGui, .NET specifics I haven't worked with before)
+- Code drafts that I read, edit, and integrate
+- Pattern suggestions and code review
+- Keeping the style aligned with the upstream Chat 2 codebase
+
+## What AI isn't used for
+
+- **Visual assets.** Logos, icons, banners, and screenshots are human-drawn
+  or taken from the running game.
+- **German translations.** Written by me as a native speaker.
 
 ## What's where
 
@@ -22,20 +53,24 @@ produced with AI assistance. Hellion-specific code lives in
 `Ui/SettingsTabs/Privacy.cs`, `Ui/FirstRunWizard.cs`, `Ui/HellionStyle.cs`,
 plus the Migrate3 recovery and plugin layout migration in `MessageStore.cs`
 and `Plugin.cs`. These were developed with Pair-level assistance as
-described above; the share of human vs. AI authorship varies file by file
-and is expected to keep shifting toward more hand-written work as the
-maintainer's plugin-dev experience grows.
+described above.
 
-## What AI is not used for
+## If AI-assisted development is a dealbreaker for you
 
-- **Visual assets.** Logos, icons, banners, screenshots are human-drawn or
-  taken from the running game.
-- **German translations.** Written by the maintainer (native speaker).
+Fair enough. There are solid alternatives that don't rely on AI in their
+development:
+
+- [Chat 2](https://github.com/Infiziert90/ChatTwo), the original upstream
+  this fork is based on
+- [XIV Instant Messenger](https://github.com/NightmareXIV/XIVInstantMessenger),
+  a different approach to chat in FFXIV
+
+Both are good projects. Use what fits you best.
 
 ## Tooling
 
-- Claude (Anthropic) via Claude Code CLI as the main pair partner.
-- Context7 / Microsoft Learn for current Dalamud and .NET documentation.
+- Claude (Anthropic) via Claude Code CLI
+- Context7 / Microsoft Learn for current Dalamud and .NET documentation
 
 ## Contact
 

COPYRIGHT

@@ -0,0 +1,27 @@
+HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV
+
+Copyright (c) 2024-2025 Infiziert90 (Infi) and Anna Clemens (ascclemens)
+    Original ChatTwo authors and copyright holders of the upstream
+    plugin this fork is built on. Their work covers the message store,
+    the channel filtering, the sidebar tab system, the FFXIV chat
+    hooks, the localisation infrastructure and most of the
+    architecture HellionChat still relies on.
+
+Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
+    HellionChat-specific modifications, including the privacy filter,
+    per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
+    Hellion theme and font integration, German localisation and the
+    EUPL-1.2 fork maintenance.
+
+Licensed under the European Union Public Licence (EUPL), Version 1.2
+only. The full Licence text lives in the LICENSE file at the root of
+this repository. The official Licence website is at:
+
+    https://eupl.eu/1.2/en/
+
+This Work is provided "AS IS" without warranties of any kind. See
+Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of
+Liability) of the Licence for the legally binding wording.
+
+Acknowledgements directed at the upstream ChatTwo authors live in
+NOTICE.md. The manual upstream-sync workflow lives in UPSTREAM_SYNC.md.

ChatTwo.Tests/ChatTwo.Tests.csproj

@@ -1,53 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net10.0-windows</TargetFrameworks>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="morelinq" Version="4.4.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ChatTwo\ChatTwo.csproj" />
-  </ItemGroup>
-
-    <PropertyGroup>
-        <DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev</DalamudLibPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
-        <DalamudLibPath>$(DALAMUD_HOME)</DalamudLibPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(IsCI)' == 'true'">
-        <DalamudLibPath>$(HOME)/dalamud</DalamudLibPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Reference Include="Dalamud">
-            <HintPath>$(DalamudLibPath)\Dalamud.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="FFXIVClientStructs">
-            <HintPath>$(DalamudLibPath)\FFXIVClientStructs.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Lumina">
-            <HintPath>$(DalamudLibPath)\Lumina.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Lumina.Excel">
-            <HintPath>$(DalamudLibPath)\Lumina.Excel.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-    </ItemGroup>
-
-
-</Project>

ChatTwo.Tests/MessageStoreTest.cs

@@ -1,293 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using ChatTwo.Code;
-using ChatTwo.Util;
-using Dalamud.Game.Text;
-using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
-using JetBrains.Annotations;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Chat2PartyFinderPayload = ChatTwo.Util.PartyFinderPayload;
-
-namespace ChatTwo.Tests;
-
-[TestClass]
-[TestSubject(typeof(MessageStore))]
-public class MessageStoreTest {
-    // From Message.cs
-    private static readonly byte[] ExtraChatChannelPayloadBytes = [0, 0x27, 18, 0x20];
-
-    public TestContext TestContext { get; set; }
-
-    public static string GetImportPath() {
-        string[] importPaths = [
-            @".\TestData",
-            @"..\TestData",
-            @"..\..\TestData",
-            @"..\..\..\TestData",
-        ];
-        var importPath = importPaths.FirstOrDefault(Directory.Exists);
-        if (string.IsNullOrEmpty(importPath)) {
-            throw new DirectoryNotFoundException("Could not find the import path");
-        }
-        return importPath;
-    }
-
-    [TestMethod]
-    [Timeout(5000)]
-    public void StoreAndRetrieve() {
-        var tempDir = Directory.CreateTempSubdirectory("ChatTwo_test_");
-        var dbPath = Path.Join(tempDir.FullName, "test.db");
-        TestContext.WriteLine("Using database path: " + dbPath);
-        using var store = new MessageStore(dbPath);
-
-        // Write the message.
-        var input = BigMessage();
-        store.UpsertMessage(input);
-
-        // Read the message back.
-        using var messageEnumerator = store.GetMostRecentMessages();
-        var messages = messageEnumerator.ToList();
-        Assert.AreEqual(1, messages.Count);
-        AssertMessagesEqual(input, messages.First());
-    }
-
-    [TestMethod]
-    [Timeout(5000)]
-    public void RetrieveMultiple() {
-        var tempDir = Directory.CreateTempSubdirectory("ChatTwo_test_");
-        var dbPath = Path.Join(tempDir.FullName, "test.db");
-        TestContext.WriteLine("Using database path: " + dbPath);
-        using var store = new MessageStore(dbPath);
-
-        // Insert 10 messages in the wrong order of date.
-        var messages = new List<Message>();
-        const uint receiver = 12345;
-        var now = DateTimeOffset.UtcNow;
-        for (var i = 0; i < 10; i++) {
-            var message = BigMessage(true, receiver, now.AddSeconds(-i));
-            TestContext.WriteLine($"Inserting message {i}: {message.Id}");
-            store.UpsertMessage(message);
-            messages.Add(message);
-        }
-
-        // Insert a message for a different receiver. This shouldn't be returned
-        // because of the receiver filtering.
-        var otherReceiverMsg = BigMessage(receiver: receiver + 1, dateTime: now.AddSeconds(1));
-        TestContext.WriteLine($"Inserting other receiver message: {otherReceiverMsg.Id}");
-        store.UpsertMessage(otherReceiverMsg);
-
-        // Query the most recent 5 messages. Should return the 4 newest messages
-        // from the list, as well as the different receiver message because we
-        // aren't filtering.
-        using var unfilteredMessageEnumerator = store.GetMostRecentMessages(count: 5);
-        var outputMessages = unfilteredMessageEnumerator.ToList();
-        var gotIds = outputMessages.Select(m => m.Id).ToList();
-        TestContext.WriteLine($"Query 1 got IDs: {string.Join(", ", gotIds)}");
-        AssertGuidsEqual(new List<Guid> {
-            messages[3].Id,
-            messages[2].Id,
-            messages[1].Id,
-            messages[0].Id,
-            otherReceiverMsg.Id
-        }, gotIds);
-
-        // Query the most recent 5 messages but filter by receiver ID.
-        using var filteredByReceiverMessageEnumerator = store.GetMostRecentMessages(receiver: receiver, count: 5);
-        outputMessages = filteredByReceiverMessageEnumerator.ToList();
-        gotIds = outputMessages.Select(m => m.Id).ToList();
-        TestContext.WriteLine($"Query 2 got IDs: {string.Join(", ", gotIds)}");
-        AssertGuidsEqual(new List<Guid> {
-            messages[4].Id,
-            messages[3].Id,
-            messages[2].Id,
-            messages[1].Id,
-            messages[0].Id,
-        }, gotIds);
-
-        // Query the most recent 5 messages but only since a specific date.
-        using var filteredByReceiverAndDateMessageEnumerator = store.GetMostRecentMessages(receiver, since: messages[1].Date, count: 5);
-        outputMessages = filteredByReceiverAndDateMessageEnumerator.ToList();
-        gotIds = outputMessages.Select(m => m.Id).ToList();
-        TestContext.WriteLine($"Query 3 got IDs: {string.Join(", ", gotIds)}");
-        AssertGuidsEqual(new List<Guid> {
-            messages[1].Id,
-            messages[0].Id,
-        }, gotIds);
-    }
-
-    [TestMethod]
-    [Timeout(5000)]
-    // This test guards against the data format changing in an incompatible way.
-    public void RetrieveExisting() {
-        var input = BigMessage(uniqId: false);
-
-        var dbPath = Path.Join(GetImportPath(), "existing.db");
-        TestContext.WriteLine($"Using existing database: {dbPath}");
-        Assert.IsTrue(File.Exists(dbPath));
-
-        // Uncomment this section to regenerate the existing database.
-        /*
-        File.Delete(dbPath);
-        using (var newStore = new MessageStore(dbPath)) {
-            newStore.UpsertMessage(input);
-        }
-        */
-
-        using var store = new MessageStore(dbPath);
-        using var existingMessageEnumerator = store.GetMostRecentMessages();
-        var output = existingMessageEnumerator.ToList();
-        Assert.AreEqual(1, output.Count);
-        AssertMessagesEqual(input, output[0]);
-    }
-
-    [TestMethod]
-    [Timeout(30_000)]
-    public void ProfileMany() {
-        const int count = 20_000;
-
-        var tempDir = Directory.CreateTempSubdirectory("ChatTwo_test_");
-        var dbPath = Path.Join(tempDir.FullName, "test.db");
-        TestContext.WriteLine("Using database path: " + dbPath);
-        using var store = new MessageStore(dbPath);
-
-        for (var i = 0; i < count; i++) {
-            var message = BigMessage(uniqId: true);
-            store.UpsertMessage(message);
-        }
-
-        using var messageEnumerator = store.GetMostRecentMessages(count: count);
-        var messages = messageEnumerator.ToList();
-        Assert.AreEqual(count, messages.Count);
-        foreach (var message in messages) {
-            // Load the message because they are lazily parsed.
-            Assert.IsTrue(message.Id != Guid.Empty);
-        }
-    }
-
-    internal static Message BigMessage(bool uniqId = true, uint receiver = 12345, DateTimeOffset? dateTime = null) {
-        // NOTE: These values aren't valid in the game.
-        // NOTE: we can't test UiForeground, UiGlow, or AutoTranslatePayload
-        // because they load data from the game.
-        var senderSeString = new SeStringBuilder()
-            .AddText("<")
-            .Add(new PlayerPayload("Player Name", 12345))
-            .AddItalics("Player Name")
-            .Add(RawPayload.LinkTerminator)
-            .AddText(">: ")
-            .Build();
-        var extraChatId = Guid.Parse("03d9e6d4-dc1a-4005-bbe7-66b8c3529277");
-        var contentSeString = new SeStringBuilder()
-            .Add(new RawPayload(ExtraChatChannelPayloadBytes.Concat(extraChatId.ToByteArray()).ToArray()))
-            .AddIcon(BitmapFontIcon.IslandSanctuary)
-            .AddMapLink(1, 2, 3, 4)
-            .AddText("map")
-            .Add(RawPayload.LinkTerminator)
-            .AddQuestLink(12345)
-            .AddText("quest")
-            .Add(RawPayload.LinkTerminator)
-            .Add(new DalamudLinkPayload())
-            .AddText("dalamud")
-            .Add(RawPayload.LinkTerminator)
-            .AddStatusLink(12345)
-            .AddText("status")
-            .Add(RawPayload.LinkTerminator)
-            .AddPartyFinderLink(12345)
-            .AddText("party finder")
-            .Add(RawPayload.LinkTerminator)
-            .Build();
-
-        // Add Chat 2 specific payloads (that can't be serialized into the
-        // SeString).
-        var contentChunks = ChunkUtil.ToChunks(contentSeString, ChunkSource.Content, ChatType.Say).ToList();
-        contentChunks = contentChunks.Concat([
-            new TextChunk(ChunkSource.Content, new Chat2PartyFinderPayload(12345), "chat 2 party finder"),
-            new TextChunk(ChunkSource.Content, new AchievementPayload(12345), "chat 2 achievement"),
-            new TextChunk(ChunkSource.Content, new UriPayload(new Uri("https://dalamud.dev")), "chat 2 uri"),
-        ]).ToList();
-
-        var chatCode = new ChatCode((XivChatType)46, XivChatRelationKind.LocalPlayer, XivChatRelationKind.EngagedEnemy);
-        return new Message(
-            uniqId ? Guid.NewGuid() : Guid.Parse("f011343e-6a21-49e5-a6f9-238f0f1f8c2c"),
-            receiver,
-            54321,
-            dateTime ?? DateTimeOffset.FromUnixTimeMilliseconds(1713520182440),
-            chatCode,
-            ChunkUtil.ToChunks(senderSeString, ChunkSource.Sender, ChatType.Debug).ToList(),
-            contentChunks,
-            senderSeString,
-            contentSeString,
-            extraChatId
-        );
-    }
-
-    internal static void AssertMessagesEqual(Message input, Message output) {
-        // Check basic fields.
-        Assert.AreEqual(input.Id, output.Id);
-        Assert.AreEqual(input.Receiver, output.Receiver);
-        Assert.AreEqual(input.ContentId, output.ContentId);
-        // Assert time is within 1 second
-        var timeDifference = Math.Abs(input.Date.ToUniversalTime().Subtract(output.Date.ToUniversalTime()).TotalSeconds);
-        Assert.IsTrue(timeDifference < 1);
-        Assert.AreEqual(input.Code, output.Code);
-        Assert.AreEqual($"{input.SenderSource.Encode():X}", $"{output.SenderSource.Encode():X}");
-        Assert.AreEqual($"{input.ContentSource.Encode():X}", $"{output.ContentSource.Encode():X}");
-        Assert.AreEqual(input.SortCodeV2, output.SortCodeV2);
-        Assert.AreEqual(input.ExtraChatChannel, output.ExtraChatChannel);
-
-        // Check chunks.
-        AssertChunksEqual(input.Sender, output.Sender);
-        AssertChunksEqual(input.Content, output.Content);
-    }
-
-    private static void AssertChunksEqual(IReadOnlyList<Chunk> inputChunks, IReadOnlyList<Chunk> outputChunks) {
-        Assert.AreEqual(inputChunks.Count, outputChunks.Count);
-        for (var i = 0; i < inputChunks.Count; i++) {
-            var inputChunk = inputChunks[i];
-            var outputChunk = outputChunks[i];
-            Assert.AreEqual(inputChunk.Source, outputChunk.Source);
-            switch (inputChunk.Link) {
-                case AchievementPayload inputAchievementPayload:
-                    Assert.AreEqual(inputAchievementPayload.Id, ((AchievementPayload) outputChunk.Link)!.Id);
-                    break;
-                case Chat2PartyFinderPayload inputPartyFinderPayload:
-                    Assert.AreEqual(inputPartyFinderPayload.Id, ((Chat2PartyFinderPayload) outputChunk.Link)!.Id);
-                    break;
-                case UriPayload inputUriPayload:
-                    Assert.AreEqual(inputUriPayload.Uri, ((UriPayload) outputChunk.Link)!.Uri);
-                    break;
-                case null:
-                    Assert.IsTrue(outputChunk.Link == null);
-                    break;
-                default:
-                    Assert.AreEqual($"{inputChunk.Link.Encode():X}", $"{outputChunk.Link!.Encode():X}");
-                    break;
-            }
-
-            switch (inputChunk) {
-                case TextChunk inputTextChunk:
-                    var outputTextChunk = (TextChunk)outputChunk;
-                    Assert.AreEqual(inputTextChunk.FallbackColour, outputTextChunk.FallbackColour);
-                    Assert.AreEqual(inputTextChunk.Foreground, outputTextChunk.Foreground);
-                    Assert.AreEqual(inputTextChunk.Glow, outputTextChunk.Glow);
-                    Assert.AreEqual(inputTextChunk.Italic, outputTextChunk.Italic);
-                    Assert.AreEqual(inputTextChunk.Content, outputTextChunk.Content);
-                    break;
-                case IconChunk inputIconChunk:
-                    Assert.AreEqual(inputIconChunk.Icon, ((IconChunk) outputChunk).Icon);
-                    break;
-                default:
-                    throw new Exception("Unknown chunk type");
-            }
-        }
-    }
-
-    private static void AssertGuidsEqual(IReadOnlyList<Guid> expected, IReadOnlyList<Guid> got) {
-        Assert.AreEqual(expected.Count, got.Count);
-        for (var i = 0; i < expected.Count; i++) {
-            Assert.AreEqual(expected[i].ToString(), got[i].ToString());
-        }
-    }
-}

ChatTwo/AutoTellTabsService.cs

@@ -0,0 +1,370 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ChatTwo.Code;
+using ChatTwo.GameFunctions.Types;
+using ChatTwo.Resources;
+using ChatTwo.Util;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+
+namespace ChatTwo;
+
+// 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).
+internal sealed class AutoTellTabsService : IDisposable
+{
+    private readonly Plugin _plugin;
+    private readonly MessageManager _messageManager;
+    private readonly MessageStore _store;
+    private readonly object _tempTabsLock = new();
+
+    private bool _initialized;
+
+    internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
+    {
+        _plugin = plugin;
+        _messageManager = messageManager;
+        _store = store;
+    }
+
+    internal int ActiveTempTabCount
+    {
+        get
+        {
+            lock (_tempTabsLock)
+            {
+                return Plugin.Config.Tabs.Count(t => t.IsTempTab);
+            }
+        }
+    }
+
+    internal void Initialize()
+    {
+        if (_initialized)
+        {
+            return;
+        }
+
+        _messageManager.MessageProcessed += HandleTell;
+        Plugin.ClientState.Logout += OnLogout;
+        _initialized = true;
+    }
+
+    public void Dispose()
+    {
+        if (!_initialized)
+        {
+            return;
+        }
+
+        Plugin.ClientState.Logout -= OnLogout;
+        _messageManager.MessageProcessed -= HandleTell;
+        _initialized = false;
+    }
+
+    internal void HandleTell(Message message)
+    {
+        if (!Plugin.Config.EnableAutoTellTabs)
+        {
+            return;
+        }
+
+        if (message.Code.Type != ChatType.TellIncoming && message.Code.Type != ChatType.TellOutgoing)
+        {
+            return;
+        }
+
+        var partner = ExtractTellPartner(message);
+        if (partner == null)
+        {
+            // Real message without a player payload — e.g. GM tells, which
+            // we deliberately skip. The diagnostics make future regressions
+            // (FFXIV changing tell payload shape, new edge cases) findable
+            // without having to crank up debug logging at the source.
+            Plugin.Log.Warning(
+                $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, " +
+                $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, " +
+                $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, " +
+                $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}");
+            return;
+        }
+
+        lock (_tempTabsLock)
+        {
+            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).
+                return;
+            }
+
+            if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
+            {
+                DropOldestTempTab();
+            }
+
+            SpawnTempTab(partner.Value, message);
+        }
+    }
+
+    private (string Name, uint World)? ExtractTellPartner(Message message)
+    {
+        if (message.Code.Type == ChatType.TellIncoming)
+        {
+            // Incoming tell: the sender is the conversation partner. The
+            // PlayerPayload normally rides on a chunk's Link slot, but for
+            // some tell types FFXIV only puts it in the raw SeString —
+            // fall back to that before giving up.
+            var fromSender = ChunkUtil.TryGetPlayerPayload(message.Sender)
+                             ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
+            if (fromSender != null)
+            {
+                return (fromSender.PlayerName, fromSender.World.RowId);
+            }
+            return null;
+        }
+
+        // Outgoing tell: the local player is the sender, the partner shows
+        // up either as a payload in the content (for tells typed via the
+        // Chat 2 input bar) or as the channel's tracked tell target (set by
+        // the SetContextTellTarget game hook). Same SeString fallback.
+        var fromContent = ChunkUtil.TryGetPlayerPayload(message.Content)
+                          ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
+                          ?? ChunkUtil.TryGetPlayerPayload(message.Sender)
+                          ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
+        if (fromContent != null)
+        {
+            return (fromContent.PlayerName, fromContent.World.RowId);
+        }
+
+        var current = _plugin.CurrentTab.CurrentChannel.TellTarget
+                      ?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
+        if (current != null && current.IsSet())
+        {
+            return (current.Name, current.World);
+        }
+
+        return null;
+    }
+
+    private Tab? FindTempTab(string name, uint world)
+    {
+        return Plugin.Config.Tabs.FirstOrDefault(t =>
+            t.IsTempTab
+            && t.TellTarget != null
+            && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
+            && t.TellTarget.World == world);
+    }
+
+    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.
+        var victim = Plugin.Config.Tabs
+            .Select((tab, idx) => (Tab: tab, Index: idx))
+            .Where(t => t.Tab.IsTempTab)
+            .OrderByDescending(t => t.Tab.IsGreeted)
+            .ThenBy(t => t.Tab.LastActivity)
+            .FirstOrDefault();
+
+        if (victim.Tab == null)
+        {
+            return;
+        }
+
+        Plugin.Config.Tabs.RemoveAt(victim.Index);
+
+        // Re-anchor the active tab so the user does not silently end up on
+        // a different conversation when their tab gets dropped or shifted.
+        if (victim.Index <= _plugin.LastTab)
+        {
+            _plugin.WantedTab = 0;
+        }
+    }
+
+    private void SpawnTempTab((string Name, uint World) partner, Message currentMessage)
+    {
+        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.
+        PreloadHistory(tab, partner.Name, partner.World, currentMessage.Id);
+
+        tab.AddMessage(currentMessage, unread: true);
+        Plugin.Config.Tabs.Add(tab);
+    }
+
+    private static Tab BuildTempTab(string playerName, uint worldRowId)
+    {
+        return new Tab
+        {
+            Name = FormatTabName(playerName, worldRowId),
+            IsTempTab = true,
+            AllSenderMessages = true,
+            TellTarget = new TellTarget(playerName, worldRowId, 0, TellReason.Direct),
+            Channel = InputChannel.Tell,
+            DisplayTimestamp = true,
+            UnreadMode = UnreadMode.Unseen,
+            HideWhenInactive = false,
+            SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
+            {
+                [ChatType.TellIncoming] = (ChatSourceExt.All, ChatSourceExt.All),
+                [ChatType.TellOutgoing] = (ChatSourceExt.All, ChatSourceExt.All),
+            },
+        };
+    }
+
+    private static string FormatTabName(string playerName, uint worldRowId)
+    {
+        if (Sheets.WorldSheet.TryGetRow(worldRowId, out var worldRow))
+        {
+            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.
+        return $"{playerName}@World{worldRowId}";
+    }
+
+    private void PreloadHistory(Tab tab, string senderName, uint senderWorld, Guid currentMessageId)
+    {
+        var preloadCount = Plugin.Config.AutoTellTabsHistoryPreload;
+        if (preloadCount <= 0)
+        {
+            return;
+        }
+
+        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.
+            var history = _store.GetTellHistoryWithSender(
+                _messageManager.CurrentContentId,
+                senderName,
+                senderWorld,
+                preloadCount + 1);
+
+            var historicMessages = history
+                .Where(m => m.Id != currentMessageId)
+                .Take(preloadCount)
+                .ToList();
+
+            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.
+                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.
+            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.
+            tab.Messages.AddPrune(
+                MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator),
+                MessageManager.MessageDisplayLimit);
+        }
+        catch (Exception ex)
+        {
+            // Non-fatal: the tab still spawns, but the user gets a visible
+            // notice instead of silently missing history. The error logs
+            // once with full stack trace for diagnosis.
+            Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
+            tab.Messages.AddPrune(
+                MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
+                MessageManager.MessageDisplayLimit);
+        }
+    }
+
+    private static Message MakeSystemMarker(string text)
+    {
+        var seString = new SeStringBuilder().AddText(text).Build();
+        var chunks = ChunkUtil.ToChunks(seString, ChunkSource.Content, ChatType.System).ToList();
+        var code = new ChatCode((XivChatType)ChatType.System, 0, 0);
+        return Message.FakeMessage(chunks, code);
+    }
+
+    internal void MarkGreeted(Tab tab)
+    {
+        SetGreeted(tab, true);
+    }
+
+    internal void UnmarkGreeted(Tab tab)
+    {
+        SetGreeted(tab, false);
+    }
+
+    internal bool IsGreeted(Tab tab)
+    {
+        return tab.IsGreeted;
+    }
+
+    private void SetGreeted(Tab tab, bool greeted)
+    {
+        if (tab == null)
+        {
+            return;
+        }
+
+        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.
+            if (!Plugin.Config.Tabs.Contains(tab))
+            {
+                return;
+            }
+
+            tab.IsGreeted = greeted;
+        }
+    }
+
+    private void OnLogout(int type, int code)
+    {
+        lock (_tempTabsLock)
+        {
+            // Snapshot whether the active tab is about to be removed, BEFORE
+            // we mutate the list — index lookups would lie to us afterwards.
+            var lastIndex = _plugin.LastTab;
+            var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
+            var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab;
+
+            Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
+
+            // 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.
+            var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
+            if (currentWasTempTab || !stillValid)
+            {
+                _plugin.WantedTab = 0;
+            }
+        }
+    }
+}

ChatTwo/ChatTwo.csproj

@@ -4,7 +4,7 @@
              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>0.2.0</Version>
+        <Version>0.5.3</Version>
         <ImplicitUsings>enable</ImplicitUsings>
         <!-- HellionChat fork: assembly is renamed so Dalamud uses
              pluginConfigs/HellionChat instead of pluginConfigs/ChatTwo,
@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="MessagePack" Version="3.1.4" />
-        <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
         <PackageReference Include="morelinq" Version="4.4.0" />
         <PackageReference Include="Pidgin" Version="3.3.0" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
@@ -57,17 +57,16 @@
     </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. -->
     <ItemGroup>
-      <Folder Include="images\" />
-    </ItemGroup>
-
-    <!-- Copy images/icon.png next to the built DLL so Dalamud's local
-         plugin loader finds it at <plugindir>/images/icon.png. The
-         DalamudPackager.targets file in this directory then includes
-         the same path inside the release ZIP — see that file for the
-         full packaging override. -->
-    <ItemGroup>
-        <None Include="images\icon.png">
+        <None Include="images\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>

ChatTwo/Configuration.cs

@@ -6,6 +6,7 @@ using ChatTwo.Util;
 using Dalamud;
 using Dalamud.Configuration;
 using Dalamud.Game.ClientState.Keys;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface.FontIdentifier;
 using Dalamud.Bindings.ImGui;
 
@@ -33,7 +34,7 @@ public class ConfigKeyBind
 [Serializable]
 public class Configuration : IPluginConfiguration
 {
-    private const int LatestVersion = 8;
+    private const int LatestVersion = 10;
 
     public int Version { get; set; } = LatestVersion;
 
@@ -72,8 +73,10 @@ public class Configuration : IPluginConfiguration
     public bool HellionThemeEnabled = true;
 
     // Window background opacity, 0.5–1.0. Lower values make the plugin
-    // panes more glass-like so the game shines through. Default ~92%.
-    public float HellionThemeWindowOpacity = 0.92f;
+    // panes more glass-like so the game shines through. Default 0.5
+    // matches the maintainer's daily-driver preference; users who want
+    // a less translucent look bump it up in Aussehen → Theme.
+    public float HellionThemeWindowOpacity = 0.5f;
 
     // Use the bundled Exo 2 font (OFL-1.1) for the regular plugin font
     // instead of whatever GlobalFontV2.FontId points at. Default ON so a
@@ -81,6 +84,25 @@ public class Configuration : IPluginConfiguration
     // to fall back to the user's chosen system or Dalamud font.
     public bool UseHellionFont = 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;
+
     public int GetRetentionDays(ChatType type)
     {
         if (RetentionPerChannelDays.TryGetValue(type, out var userOverride))
@@ -112,7 +134,12 @@ public class Configuration : IPluginConfiguration
     public bool MoreCompactPretty;
     public bool HideSameTimestamps;
     public bool ShowNoviceNetwork;
-    public bool SidebarTabView;
+    // 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;
     public int PreviewMinimum = 1;
@@ -122,7 +149,7 @@ public class Configuration : IPluginConfiguration
     public LanguageOverride LanguageOverride = LanguageOverride.None;
     public bool CanMove = true;
     public bool CanResize = true;
-    public bool ShowTitleBar;
+    public bool ShowTitleBar = true;
     public bool ShowPopOutTitleBar = true;
     public bool DatabaseBattleMessages;
     public bool LoadPreviousSession;
@@ -132,8 +159,12 @@ public class Configuration : IPluginConfiguration
     public bool CollapseKeepUniqueLinks;
     public bool PlaySounds = true;
     public bool KeepInputFocus = true;
-    public int MaxLinesToRender = 10_000; // 1-10000
-    public bool Use24HourClock;
+    public int MaxLinesToRender = 5_000; // 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 = [];
@@ -230,7 +261,17 @@ public class Configuration : IPluginConfiguration
         TooltipOffset = other.TooltipOffset;
         WindowAlpha = other.WindowAlpha;
         ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
-        Tabs = other.Tabs.Select(t => t.Clone()).ToList();
+
+        // 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. Persistent tabs from `other`
+        // still get the regular clone-replace treatment.
+        var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
+        Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t => t.Clone()).ToList();
+        Tabs.AddRange(liveTempTabs);
+
         OverrideStyle = other.OverrideStyle;
         ChosenStyle = other.ChosenStyle;
         ChatTabForward = other.ChatTabForward;
@@ -249,6 +290,12 @@ public class Configuration : IPluginConfiguration
         HellionThemeEnabled = other.HellionThemeEnabled;
         HellionThemeWindowOpacity = other.HellionThemeWindowOpacity;
         UseHellionFont = other.UseHellionFont;
+
+        EnableAutoTellTabs = other.EnableAutoTellTabs;
+        AutoTellTabsLimit = other.AutoTellTabsLimit;
+        AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay;
+        AutoTellTabsHistoryPreload = other.AutoTellTabsHistoryPreload;
+        AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle;
     }
 }
 
@@ -324,9 +371,27 @@ 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.
+    [NonSerialized] public bool IsGreeted;
+
     public bool Matches(Message message)
     {
-        return message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels);
+        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".
+        if (IsTempTab && TellTarget?.IsSet() == true)
+        {
+            return ChunkUtil.MatchesSender(message, TellTarget.Name, TellTarget.World);
+        }
+
+        return true;
     }
 
     public void AddMessage(Message message, bool unread = true)
@@ -375,6 +440,7 @@ public class Tab
             IsTempTab = IsTempTab,
             AllSenderMessages = AllSenderMessages,
             TellTarget = TellTarget.From(TellTarget),
+            IsGreeted = IsGreeted,
         };
     }
 

ChatTwo/DalamudPackager.targets

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  HellionChat — DalamudPackager override.
-
-  The default DalamudPackager.targets shipped by the SDK does not set
-  HandleImages / ImagesPath, so the images/ directory is silently
-  excluded from the release ZIP. The presence of this file at
-  $(ProjectDir)DalamudPackager.targets disables the SDK's default
-  target (it guards on `!Exists('$(PackagerTargetFile)')`) and lets
-  us call the packager task ourselves with the image fields wired in.
-
-  Apart from HandleImages + ImagesPath the property list mirrors the
-  SDK default verbatim so we don't lose any other manifest field as
-  the upstream SDK evolves.
--->
-<Project>
-    <Target Name="HellionDalamudPackagerDebug"
-            AfterTargets="Build"
-            Condition="'$(Configuration)' == 'Debug'">
-        <DalamudPackager ProjectDir="$(ProjectDir)"
-                         OutputPath="$(OutputPath)"
-                         AssemblyName="$(AssemblyName)"
-                         MakeZip="false"
-                         Author="$(Author)"
-                         Name="$(Name)"
-                         MinimumDalamudVersion="$(MinimumDalamudVersion)"
-                         Punchline="$(Punchline)"
-                         Description="$(Description)"
-                         ApplicableVersion="$(ApplicableVersion)"
-                         RepoUrl="$(RepoUrl)"
-                         Tags="$(Tags)"
-                         CategoryTags="$(CategoryTags)"
-                         DalamudApiLevel="$(DalamudApiLevel)"
-                         LoadRequiredState="$(LoadRequiredState)"
-                         LoadSync="$(LoadSync)"
-                         CanUnloadAsync="$(CanUnloadAsync)"
-                         LoadPriority="$(LoadPriority)"
-                         ImageUrls="$(ImageUrls)"
-                         IconUrl="$(IconUrl)"
-                         Changelog="$(Changelog)"
-                         AcceptsFeedback="$(AcceptsFeedback)"
-                         FeedbackMessage="$(FeedbackMessage)"
-                         HandleImages="true"
-                         ImagesPath="$(ProjectDir)images" />
-    </Target>
-
-    <Target Name="HellionDalamudPackagerRelease"
-            AfterTargets="Build"
-            Condition="'$(Configuration)' == 'Release'">
-        <DalamudPackager ProjectDir="$(ProjectDir)"
-                         OutputPath="$(OutputPath)"
-                         AssemblyName="$(AssemblyName)"
-                         MakeZip="true"
-                         Author="$(Author)"
-                         Name="$(Name)"
-                         MinimumDalamudVersion="$(MinimumDalamudVersion)"
-                         Punchline="$(Punchline)"
-                         Description="$(Description)"
-                         ApplicableVersion="$(ApplicableVersion)"
-                         RepoUrl="$(RepoUrl)"
-                         Tags="$(Tags)"
-                         CategoryTags="$(CategoryTags)"
-                         DalamudApiLevel="$(DalamudApiLevel)"
-                         LoadRequiredState="$(LoadRequiredState)"
-                         LoadSync="$(LoadSync)"
-                         CanUnloadAsync="$(CanUnloadAsync)"
-                         LoadPriority="$(LoadPriority)"
-                         ImageUrls="$(ImageUrls)"
-                         IconUrl="$(IconUrl)"
-                         Changelog="$(Changelog)"
-                         AcceptsFeedback="$(AcceptsFeedback)"
-                         FeedbackMessage="$(FeedbackMessage)"
-                         HandleImages="true"
-                         ImagesPath="$(ProjectDir)images" />
-    </Target>
-</Project>

ChatTwo/EmoteCache.cs

@@ -32,23 +32,23 @@ public static class EmoteCache
     private struct Top100()
     {
         [JsonPropertyName("emote")]
-        public Emote Emote = default;
+        public Emote Emote { get; set; }
 
         [JsonPropertyName("id")]
-        public string Id = string.Empty;
+        public required string Id { get; set; }
     }
 
     [Serializable]
     public struct Emote()
     {
         [JsonPropertyName("id")]
-        public string Id = string.Empty;
+        public required string Id { get; set; }
 
         [JsonPropertyName("code")]
-        public string Code = string.Empty;
+        public required string Code { get; set; }
 
         [JsonPropertyName("imageType")]
-        public string ImageType = string.Empty;
+        public required string ImageType { get; set; }
     }
 
     public enum LoadingState
@@ -66,7 +66,7 @@ public static class EmoteCache
 
     public static string[] SortedCodeArray = [];
 
-    public static async void LoadData()
+    public static async Task LoadData()
     {
         if (State is not LoadingState.Unloaded)
             return;
@@ -105,6 +105,11 @@ public static class EmoteCache
         }
         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.
+            State = LoadingState.Unloaded;
             Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
         }
     }
@@ -168,10 +173,19 @@ public static class EmoteCache
 
         internal async Task<byte[]> LoadAsync(Emote emote)
         {
-            var dir = Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1");
+            // BetterTTV-supplied Id and ImageType are interpolated straight
+            // into the filename. HTTPS protects the wire, but a compromised
+            // upstream could still hand us "../foo" and write into the
+            // pluginConfigs root (or worse). Resolve the candidate path and
+            // refuse anything that escapes the cache directory.
+            var dir = Path.GetFullPath(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1"));
             Directory.CreateDirectory(dir);
 
-            var filePath = Path.Join(dir, $"{emote.Id}.{emote.ImageType}");
+            var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar) ? dir : dir + Path.DirectorySeparatorChar;
+            var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}"));
+            if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal))
+                throw new InvalidOperationException($"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}");
+
             if (File.Exists(filePath))
             {
                 RawData = await File.ReadAllBytesAsync(filePath);

ChatTwo/HellionChat.yaml

@@ -3,12 +3,12 @@ author: JonKazama-Hellion
 punchline: Chat 2 with privacy controls aligned to EU, US and JP rules
 description: |-
   Hellion Chat is built on top of Chat 2 with one removal and a stack
-  of privacy controls on top. The /chat2 command, tabs, channel
-  filters, RGB colours, emotes, screenshot mode, IPC integration and
-  the chat replacement window itself work the same. The optional
-  webinterface that Chat 2 ships is intentionally not part of this
-  fork because it could not be hardened to the privacy guarantees
-  Hellion Chat makes by default.
+  of privacy controls on top. Tabs, channel filters, RGB colours,
+  emotes, screenshot mode, IPC integration and the chat replacement
+  window itself work the same. The optional webinterface that Chat 2
+  ships is intentionally not part of this fork because it serves a
+  different use case from the smaller default footprint Hellion Chat
+  is built around.
 
   On top of that, Hellion Chat adds privacy and data-handling controls
   designed to align with the modern data protection rules that apply
@@ -33,6 +33,10 @@ description: |-
   Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
 repo_url: https://github.com/JonKazama-Hellion/HellionChat
 accepts_feedback: true
+icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/icon.png
+image_urls:
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/chatWindow.png
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/withSimpleTweaks.png
 tags:
   - Social
   - UI
@@ -40,17 +44,262 @@ tags:
   - Replacement
   - Privacy
 changelog: |-
+  **Hellion Chat 0.5.3 — Pointer arithmetic hardening**
+
+  Single hardening fix on top of v0.5.2.
+
+  Security:
+
+  - Closed CodeQL Critical alert "unvalidated local pointer
+    arithmetic" in ImGuiUtil.WrapText. The earlier v0.5.2 fix
+    handled the empty-input edge case but the rule re-fired on the
+    pointer arithmetic itself because Encoding.GetBytes is virtual
+    on the base Encoding class and CodeQL therefore tracks its
+    return as untrusted input. Now compute the expected byte count
+    via GetByteCount on the same encoder and bail out if a swapped
+    Encoding ever returned a buffer of the wrong length. Real
+    consistency check, not a dead defensive guard.
+
+  No new features, no migration, configuration version stays at 10.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 0.5.2 — Bugfix patch**
+
+  Three corrections to the v0.5.1 surface plus two security findings
+  closed by the new manual-build CodeQL workflow. No new features, no
+  migration, configuration version stays at 10.
+
+  Bug fixes:
+
+  - Auto-Tell-Tabs: the "earlier conversations" separator no longer
+    lands below the live tell. The triggering message was already
+    persisted in the store by the time the spawn handler fired, so
+    it appeared as the youngest historic message. The preload now
+    excludes the live tell explicitly and pulls one extra row so the
+    user does not lose a slot to the exclusion.
+  - General/Aussehen: HellionThemeWindowOpacity ships at 0.5 so a
+    fresh install lands at the more glass-like default. Existing
+    users keep their saved value.
+  - General/Allgemein: Use24HourClock ships at true so a German /
+    European install starts on 24h time without a manual flip.
+  - Tabs/Gruppe: the default Gruppe preset no longer auto-routes
+    /party into the tab. The tab still collects /party, /alliance,
+    /pvpteam together as a read surface but does not steal the
+    input focus when you wanted /alliance.
+
+  Security:
+
+  - Closed CodeQL Critical alert "unvalidated local pointer
+    arithmetic" in ImGuiUtil.WrapText: empty splits between
+    consecutive newlines produced a zero-length byte array whose
+    fixed pointer collapsed onto its end pointer. Bail before the
+    fixed block when the slice is empty.
+  - Closed CodeQL Medium alert "workflow does not contain
+    permissions" by pinning the build workflow to contents: read.
+
+  Documentation: README now carries Build, CodeQL, License, Latest
+  Release, Dalamud API, .NET and FFXIV badges. License detection
+  picks up EUPL-1.2 correctly via a separated COPYRIGHT file. Added
+  NOTICE.md and UPSTREAM_SYNC.md after leaving the GitHub fork
+  network.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 0.5.1 — Backlog Sweep**
+
+  Pure hardening and polish. No new features. Eight backlog items
+  from the v0.5.0 codebase review collected into one patch:
+
+  - Cleanup preview now flags itself as out-of-date when the user
+    edits the whitelist after the last refresh, and the refresh
+    button is visually emphasised in that state
+  - Greeted Auto-Tell-Tabs now also dim their selection and hover
+    backgrounds in the sidebar, not just the text
+  - Performance section in the General tab moves to the standard
+    HelpMarker tooltip pattern instead of a wall-of-text description
+  - Tabs and Database settings tabs pull their display name from
+    HellionStrings instead of the upstream Language bundle, so all
+    eight tabs share one i18n source
+  - FontChooser results are now marshalled onto the framework thread
+    via Plugin.Framework.Run instead of being written to settings
+    state directly from the threadpool
+  - EmoteCache.LoadData drops async void and the four CS8618 build
+    warnings the build has been carrying since v0.4.0
+  - All MessageStore SQL paths that fed dynamic value lists into
+    interpolated SQL now use named parameter bindings via a new
+    BindIntList helper. Same behaviour, defence against future
+    user-input regressions
+
+  Configuration version is unchanged at 10. No migration. Existing
+  installs upgrade silently.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 0.5.0 — Settings UX polish**
+
+  The settings window has been pulled apart and rebuilt around eight
+  themed tabs instead of the twelve organic ones it grew into.
+  Settings now sit where they belong and the wall-of-text descriptions
+  have been replaced with hover help markers across every section.
+
+  What changed in this release:
+
+  - Twelve tabs collapsed into eight: General, Appearance, Window,
+    Chat, Tabs, Privacy, Database and Information
+  - Theme and font controls moved out of the Privacy tab into
+    Appearance where they belong
+  - Auto-Tell-Tabs settings, message preview and emote controls now
+    live under one Chat tab with collapsible sections
+  - About and Changelog merged into a single Information tab
+  - Disabled settings keep their tooltip help marker visible so you
+    can still read why an option is greyed out
+  - Section headings start collapsed by default, the same pattern
+    used for the Auto-Tell-Tabs preload section in 0.4.0
+
+  Configuration version bumps from 9 to 10 as a wipe migration. The
+  old config file is copied to HellionChat.json.pre-v10-backup before
+  the new defaults are written, so you can restore your previous
+  setup by hand if anything looks off. A one-shot notification on
+  first start explains the reset.
+
+  No changes to message storage, retention sweep, the privacy filter
+  or the export pipeline. Tabs and chat history are untouched by the
+  migration.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 0.4.0 — Auto-Tell-Tabs**
+
+  Auto-Tell-Tabs lets you turn each /tell into a session-only tab
+  dedicated to that conversation partner. The original use case is
+  the FFXIV club greeter who has to track 5–15 parallel "hi, welcome"
+  exchanges; everyone else can disable the feature in one click and
+  go back to a single Tell Exclusive tab.
+
+  What lands in this release:
+
+  - Auto-spawn temp tab "Name@World" on /tell (incoming and outgoing)
+  - Tab limit (default 15, range 1–50) with LRU drop that prefers
+    greeted tabs first, then sorts by last activity
+  - History preload from the local message store (default 20 tells,
+    range 0–100) with a "— Earlier conversations —" separator above
+    the live tell that triggered the spawn
+  - Optional "mark as greeted" toggle button (off by default,
+    greeter-specific) that dims the tab name and lets you flip the
+    status
+  - Section header "Active Tells (n)" or compact-mode separator in
+    the sidebar between persistent tabs and the temp tabs
+  - Settings UI under Chat (toggle / limit / compact / greeted-toggle)
+    and Privacy (history preload count), with hover-tooltip help
+    markers replacing the previous wall-of-text descriptions for the
+    new sections
+  - Save and load filters strip temp tabs from the on-disk config so
+    a crash or a sidebar-mode toggle never persists or wipes them
+
+  Compatibility note: if XIV Messanger or another plugin is
+  suppressing direct messages, disable its "Suppress DMs" option so
+  Hellion Chat can receive tells and open the auto tabs.
+
+  Configuration version bumps from 8 to 9. Existing users get a one-
+  shot notification on the first start, defaults are seeded by
+  property initializers, persistent tabs are untouched.
+
+  The vertical sidebar tab view becomes the default for fresh
+  installs; existing users keep their saved preference.
+
+  Inspired by the per-sender tab pattern in XIV InstantMessenger
+  (Limiana, AGPL-3.0). No code was ported across the licence
+  boundary; only the architectural concept influenced this design.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 0.3.1 — Upstream emote regression fix**
+
+  Cherry-picks Infi's upstream commit ff899ff "Fix a regression
+  from API 15 updates" which changes the BetterTTV emote DTOs
+  (Emote and Top100) from public fields to public properties.
+  System.Text.Json under the API 15 toolchain only honours the
+  [JsonPropertyName] attribute on properties, so the previous
+  field-based version deserialised every fetched emote into empty
+  default values. Result: BetterTTV emotes were silently broken
+  on fresh installs. The fix is six lines and applies cleanly on
+  top of our defensive null-check from earlier; the EmoteCache
+  path-traversal hardening from 0.3.0 stays as it is.
+
+  Authorship of the fix is preserved with git cherry-pick -x, so
+  Infi shows up as the author on the commit. Thanks to him for
+  catching it in the upstream codebase.
+
+  **Hellion Chat 0.3.0 — Audit hardening, brand sweep and rebrand of slash commands**
+
+  This release closes the remaining audit follow-ups from the
+  0.2.0 cleanup and finishes turning Hellion Chat into a properly
+  branded fork rather than a Chat 2 with a different name.
+
+  Slash commands have been renamed across the board so they no
+  longer collide with the upstream plugin and tell you which
+  plugin owns them at a glance:
+
+  - /chat2          becomes /hellion
+  - /chat2Viewer    becomes /hellionView
+  - /clearlog2      becomes /clearhellion
+  - /chat2Debugger  becomes /hellionDebugger (internal)
+  - /chat2SeString  becomes /hellionSeString (internal)
+
+  This is a breaking change for anyone with macros bound to the
+  old command names. The upstream Chat 2 commands keep working
+  if you also have that plugin installed.
+
+  Privacy and storage hardening based on the post-0.2.0 audit:
+
+  - Privacy filter master switch now states explicitly that the
+    filter only governs storage, not the live chat log
+  - Emote cache refuses to write outside its own directory if a
+    third-party API ever returns a path that escapes
+  - Retention sweep is serialised so the 24h auto-sweep and the
+    manual button cannot launch in parallel and race for the
+    SQLite connection
+  - DbViewer paging uses an int constant and the matching SQL
+    parameter name (the upstream code passed a float and a name
+    without the parameter prefix; both worked in practice but
+    were inconsistent)
+
+  Visual identity now matches the Hellion Online Media website:
+
+  - Theme palette switched to Arctic Cyan plus Ember Orange,
+    matching the website's BRANDING.md tokens
+  - Active tabs and window title bars use a brand-color-dark teal
+    variation as identity colour, replacing the previous slate
+    violet that did not appear in the brand
+  - Resize grips and scrollbar grabs picked up Ember Orange
+    instead of industrial amber on hover and active states
+
+  About tab rewritten and properly localised:
+
+  - New "Why this fork exists" block sets out the mission in
+    neutral terms, framing Chat 2's full-history default as the
+    right one for most users while explaining the narrower
+    default footprint this fork chose
+  - All Hellion-specific About copy now lives in HellionStrings
+    in EN and DE, so German users see the Hellion sections in
+    German rather than the upstream English fallback
+  - Webinterface absence is described as a focus mismatch
+    (different use case, substantial rebuild) rather than as
+    a security issue with the upstream code
+  - Translator list at the bottom of the About tab is reachable
+    again on smaller settings windows
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
   **Hellion Chat 0.2.0 — Webinterface removed**
 
-  Following an internal security and consistency audit the upstream
-  webinterface has been removed in its entirety. Hardening it to the
-  privacy guarantees Hellion Chat makes by default would have meant
-  rewriting the auth flow (the upstream code uses a five-digit
-  numeric code from System.Random), changing the default bind address
-  (currently every interface), reworking cookie handling and adding
-  the privacy filter to the live message stream that the webinterface
-  was broadcasting around it. The cumulative cost did not match the
-  niche use case for a fork that wants less network surface, not more.
+  The upstream webinterface has been removed in its entirety. It
+  serves a different use case from the smaller default footprint
+  this fork is built around, namely remote access to chat from a
+  second device. Aligning it with the data minimisation defaults
+  Hellion Chat ships with would have meant a substantial rebuild.
+  Removing it was the cleaner path for this particular fork.
 
   What changed in this release:
 

ChatTwo/MessageManager.cs

@@ -50,6 +50,13 @@ 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.
+    public event Action<Message>? MessageProcessed;
+
     internal unsafe MessageManager(Plugin plugin)
     {
         Plugin = plugin;
@@ -266,6 +273,8 @@ internal class MessageManager : IAsyncDisposable
             if (tab.Matches(message))
                 tab.AddMessage(message, unread);
         }
+
+        MessageProcessed?.Invoke(message);
     }
 
     internal class NameFormatting

ChatTwo/MessageStore.cs

@@ -239,6 +239,9 @@ 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.
         using var cmd = Connection.CreateCommand();
         cmd.CommandText = $"PRAGMA table_info({table});";
         using var reader = cmd.ExecuteReader();
@@ -298,8 +301,10 @@ internal class MessageStore : IDisposable
     {
         Plugin.Log.Information($"Setting version {version}");
         using var cmd = Connection.CreateCommand();
-        // Parameters aren't supported for PRAGMA queries, and you can't set the
-        // version with a pragma_ function.
+        // 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.
         cmd.CommandText = $"PRAGMA user_version = {version};";
         cmd.ExecuteNonQuery();
     }
@@ -346,31 +351,44 @@ internal class MessageStore : IDisposable
                 throw new ArgumentOutOfRangeException(nameof(chatTypeDaysMap), "Negative retention is not allowed.");
 
         var nowMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-        var clauses = new List<string>();
-        foreach (var (type, days) in chatTypeDaysMap)
-        {
-            var cutoff = nowMs - days * 86400000L;
-            clauses.Add($"(ChatType = {type} AND Date < {cutoff})");
-        }
 
-        // 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.
-        if (defaultDays > 0)
-        {
-            var cutoff = nowMs - defaultDays * 86400000L;
-            var explicitTypes = chatTypeDaysMap.Count > 0
-                ? string.Join(",", chatTypeDaysMap.Keys)
-                : "-1"; // empty list would produce invalid SQL
-            clauses.Add($"(ChatType NOT IN ({explicitTypes}) AND Date < {cutoff})");
-        }
-
-        if (clauses.Count == 0)
+        if (chatTypeDaysMap.Count == 0 && defaultDays <= 0)
             return 0;
 
         long deleted;
         using (var cmd = Connection.CreateCommand())
         {
+            var clauses = new List<string>();
+            var index = 0;
+            foreach (var (type, days) in chatTypeDaysMap)
+            {
+                var cutoff = nowMs - days * 86400000L;
+                var typeParam = $"$type{index}";
+                var cutoffParam = $"$cutoff{index}";
+                cmd.Parameters.AddWithValue(typeParam, type);
+                cmd.Parameters.AddWithValue(cutoffParam, cutoff);
+                clauses.Add($"(ChatType = {typeParam} AND Date < {cutoffParam})");
+                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.
+            if (defaultDays > 0)
+            {
+                var defaultCutoff = nowMs - defaultDays * 86400000L;
+                cmd.Parameters.AddWithValue("$defaultCutoff", defaultCutoff);
+
+                var explicitPlaceholders = chatTypeDaysMap.Count > 0
+                    ? BindIntList(cmd, "explicit", chatTypeDaysMap.Keys)
+                    : "-1"; // empty list would produce invalid SQL
+                clauses.Add($"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)");
+            }
+
+            if (clauses.Count == 0)
+                return 0;
+
             cmd.CommandText = $"DELETE FROM messages WHERE {string.Join(" OR ", clauses)};";
             cmd.CommandTimeout = 600;
             deleted = cmd.ExecuteNonQuery();
@@ -395,11 +413,11 @@ internal class MessageStore : IDisposable
             throw new InvalidOperationException("CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe.");
         }
 
-        var inList = string.Join(",", allowedTypes);
         long deleted;
         using (var cmd = Connection.CreateCommand())
         {
-            cmd.CommandText = $"DELETE FROM messages WHERE ChatType NOT IN ({inList});";
+            var placeholders = BindIntList(cmd, "ct", allowedTypes);
+            cmd.CommandText = $"DELETE FROM messages WHERE ChatType NOT IN ({placeholders});";
             cmd.CommandTimeout = 600;
             deleted = cmd.ExecuteNonQuery();
         }
@@ -512,15 +530,16 @@ internal class MessageStore : IDisposable
         DateTimeOffset? from,
         DateTimeOffset? to)
     {
+        var cmd = Connection.CreateCommand();
+
         var clauses = new List<string> { "deleted = false" };
         if (chatTypes is { Count: > 0 })
-            clauses.Add($"ChatType IN ({string.Join(",", chatTypes)})");
+            clauses.Add($"ChatType IN ({BindIntList(cmd, "exct", chatTypes)})");
         if (from is not null)
             clauses.Add("Date >= $From");
         if (to is not null)
             clauses.Add("Date <= $To");
 
-        var cmd = Connection.CreateCommand();
         cmd.CommandText = @"
             SELECT
                 Id,
@@ -602,6 +621,84 @@ 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>
+    internal IReadOnlyList<Message> GetTellHistoryWithSender(
+        ulong receiver,
+        string senderName,
+        uint senderWorld,
+        int limit,
+        int sqlScanLimit = 500)
+    {
+        if (limit <= 0)
+        {
+            return [];
+        }
+
+        using var cmd = Connection.CreateCommand();
+        cmd.CommandText = @"
+            SELECT
+                Id,
+                Receiver,
+                ContentId,
+                Date,
+                ChatType,
+                SourceKind,
+                TargetKind,
+                Sender,
+                Content,
+                SenderSource,
+                ContentSource,
+                ExtraChatChannel
+            FROM messages
+            WHERE deleted = false
+              AND Receiver = $Receiver
+              AND ChatType IN ($TellIncoming, $TellOutgoing)
+            ORDER BY Date DESC
+            LIMIT $ScanLimit;
+        ";
+        cmd.CommandTimeout = 60;
+        cmd.Parameters.AddWithValue("$Receiver", receiver);
+        cmd.Parameters.AddWithValue("$TellIncoming", (int)ChatType.TellIncoming);
+        cmd.Parameters.AddWithValue("$TellOutgoing", (int)ChatType.TellOutgoing);
+        cmd.Parameters.AddWithValue("$ScanLimit", sqlScanLimit);
+
+        var collected = new List<Message>();
+        using var enumerator = new MessageEnumerator(cmd.ExecuteReader());
+        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.
+        collected.Reverse();
+        return collected;
+    }
+
     /// <summary>
     /// Marks a message as deleted so it won't get returned in queries.
     /// </summary>
@@ -615,16 +712,17 @@ internal class MessageStore : IDisposable
 
     internal long CountDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null)
     {
+        using var cmd = Connection.CreateCommand();
+
         List<string> whereClauses = ["deleted = false"];
         if (receiver != null)
             whereClauses.Add("Receiver = $Receiver");
 
         whereClauses.Add("Date BETWEEN $After AND $Before");
-        whereClauses.Add($"ChatType IN ({string.Join(", ", channels)})");
+        whereClauses.Add($"ChatType IN ({BindIntList(cmd, "cdr", channels.Select(c => (int)c))})");
 
         var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
 
-        using var cmd = Connection.CreateCommand();
         // Select last N messages by date DESC, but reverse the order to get
         // them in ascending order.
         cmd.CommandText = @"
@@ -644,16 +742,17 @@ internal class MessageStore : IDisposable
 
     internal MessageEnumerator GetDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null)
     {
+        var cmd = Connection.CreateCommand();
+
         List<string> whereClauses = ["deleted = false"];
         if (receiver != null)
             whereClauses.Add("Receiver = $Receiver");
 
         whereClauses.Add("Date BETWEEN $After AND $Before");
-        whereClauses.Add($"ChatType IN ({string.Join(", ", channels)})");
+        whereClauses.Add($"ChatType IN ({BindIntList(cmd, "gdr", channels.Select(c => (int)c))})");
 
         var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
 
-        var cmd = Connection.CreateCommand();
         // Select last N messages by date DESC, but reverse the order to get
         // them in ascending order.
         cmd.CommandText = @"
@@ -685,16 +784,17 @@ internal class MessageStore : IDisposable
 
     internal MessageEnumerator GetPagedDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null, int page = 0)
     {
+        var cmd = Connection.CreateCommand();
+
         List<string> whereClauses = ["deleted = false"];
         if (receiver != null)
             whereClauses.Add("Receiver = $Receiver");
 
         whereClauses.Add("Date BETWEEN $After AND $Before");
-        whereClauses.Add($"ChatType IN ({string.Join(", ", channels)})");
+        whereClauses.Add($"ChatType IN ({BindIntList(cmd, "pdr", channels.Select(c => (int)c))})");
 
         var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
 
-        var cmd = Connection.CreateCommand();
         // Select last N messages by date DESC, but reverse the order to get
         // them in ascending order.
         cmd.CommandText = @"
@@ -724,10 +824,28 @@ internal class MessageStore : IDisposable
         cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds());
         cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds());
         cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page);
-        cmd.Parameters.AddWithValue("OffsetCount", DbViewer.RowPerPage);
+        cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage);
 
         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.
+    private static string BindIntList(SqliteCommand cmd, string prefix, IEnumerable<int> values)
+    {
+        var names = new List<string>();
+        var index = 0;
+        foreach (var value in values)
+        {
+            var name = $"${prefix}{index}";
+            cmd.Parameters.AddWithValue(name, value);
+            names.Add(name);
+            index++;
+        }
+        return string.Join(",", names);
+    }
 }
 
 internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, IDisposable, IAsyncDisposable

ChatTwo/Plugin.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using System.IO;
 using ChatTwo.Ipc;
 using ChatTwo.Resources;
 using ChatTwo.Ui;
@@ -57,6 +58,7 @@ public sealed class Plugin : IDalamudPlugin
     internal Commands Commands { get; }
     internal GameFunctions.GameFunctions Functions { get; }
     internal MessageManager MessageManager { get; }
+    internal AutoTellTabsService AutoTellTabsService { get; }
     internal IpcManager Ipc { get; }
     internal ExtraChat ExtraChat { get; }
     internal TypingIpc TypingIpc { get; }
@@ -64,6 +66,18 @@ public sealed class Plugin : IDalamudPlugin
 
     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.
+    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
@@ -91,75 +105,70 @@ public sealed class Plugin : IDalamudPlugin
 
             Config = Interface.GetPluginConfig() as Configuration ?? new Configuration();
 
-#pragma warning disable CS0618 // Type or member is obsolete
-            // TODO Remove after 01.07.2026
-            // Migrate old channel values
-            if (Config.Version <= 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.
+            Config.Tabs.RemoveAll(t => t.IsTempTab);
+
+            // Hellion Chat v9 → v10 — wipes the configuration so the new 8-tab
+            // layout starts from defaults instead of mapping every previous setting
+            // to its new position. Backup-Failure ist non-fatal, der Wipe läuft
+            // trotzdem; dem User fehlt dann nur das manuelle Restore-Sicherheitsnetz.
+            if (Config.Version < 10)
             {
-                foreach (var tab in Config.Tabs)
+                var pluginConfigsDir = Interface.ConfigDirectory.Parent?.FullName;
+                if (pluginConfigsDir is not null)
                 {
-                    if (tab.ChatCodes.Count > 0)
-                    {
-                        tab.SelectedChannels = tab.ChatCodes.ToDictionary(pair => pair.Key, pair => (pair.Value, pair.Value));
-                        tab.ChatCodes.Clear();
-                    }
+                    var liveConfigPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json");
+                    var backupPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json.pre-v10-backup");
 
-                    if (Config.InactivityHideChannels.Count > 0)
+                    try
                     {
-                        Config.InactivityHideChannelsV2 = Config.InactivityHideChannels.ToDictionary(pair => pair.Key, pair => (pair.Value, pair.Value));
-                        Config.InactivityHideChannels.Clear();
+                        if (File.Exists(liveConfigPath))
+                        {
+                            File.Copy(liveConfigPath, backupPath, overwrite: true);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.Warning(ex, "HellionChat: pre-v10 config backup failed");
                     }
-
-                    Config.Version = 6;
-                    SaveConfig();
                 }
-            }
-#pragma warning restore CS0618 // Type or member is obsolete
 
-            // Hellion Chat v6→v7: seed Privacy-First defaults.
-            if (Config.Version <= 6)
-            {
-                Config.PrivacyFilterEnabled = true;
-                Config.PrivacyPersistChannels = [..Privacy.PrivacyDefaults.PrivacyFirstWhitelist];
-                Config.PrivacyPersistUnknownChannels = false;
-                // Existing ChatTwo users skip the first-run wizard — the
-                // migration toast already explains what changed and they
-                // can reopen the wizard from Settings → Privacy if they
-                // want to pick a different profile.
-                Config.FirstRunCompleted = true;
-                Config.Version = 7;
+                Config = new Configuration
+                {
+                    Version = 10,
+                    FirstRunCompleted = true,
+                };
                 SaveConfig();
 
                 Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
                 {
-                    Title = HellionStrings.Migration_Notification_Title,
-                    Content = HellionStrings.Migration_Notification_Content,
+                    Title = HellionStrings.SettingsRefactor_Migration_Title,
+                    Content = HellionStrings.SettingsRefactor_Migration_Content,
                     Type = Dalamud.Interface.ImGuiNotification.NotificationType.Info,
-                    InitialDuration = TimeSpan.FromSeconds(15),
-                });
-            }
-
-            // Hellion Chat v7→v8: webinterface removed in 0.2.0. Old config
-            // entries (WebinterfacePassword, AuthStore, etc.) get dropped on
-            // the next save because their properties no longer exist on the
-            // Configuration class. The bump is recorded so the notification
-            // only fires once.
-            if (Config.Version <= 7)
-            {
-                Config.Version = 8;
-                SaveConfig();
-
-                Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
-                {
-                    Title = HellionStrings.Migration_Webinterface_Removed_Title,
-                    Content = HellionStrings.Migration_Webinterface_Removed_Content,
-                    Type = Dalamud.Interface.ImGuiNotification.NotificationType.Info,
-                    InitialDuration = TimeSpan.FromSeconds(20),
+                    InitialDuration = TimeSpan.FromSeconds(25),
                 });
             }
 
+            // Hellion default tab layout for first-run and v10-wipe.
+            // General catches player chat plus active gameplay events; the
+            // System tab takes the technical noise so it does not bury real
+            // conversation. Beginner tab only appears when the Novice
+            // Network is enabled in Audio and Notifications, otherwise it
+            // would just sit empty.
             if (Config.Tabs.Count == 0)
+            {
                 Config.Tabs.Add(TabsUtil.VanillaGeneral);
+                Config.Tabs.Add(TabsUtil.HellionSystem);
+                Config.Tabs.Add(TabsUtil.HellionFreeCompany);
+                Config.Tabs.Add(TabsUtil.HellionParty);
+                if (Config.ShowNoviceNetwork)
+                    Config.Tabs.Add(TabsUtil.HellionBeginner);
+                Config.Tabs.Add(TabsUtil.HellionLinkshell);
+                Config.Tabs.Add(TabsUtil.VanillaTellExclusive);
+            }
 
             LanguageChanged(Interface.UiLanguage);
             ImGuiUtil.Initialize(this);
@@ -175,6 +184,14 @@ public sealed class Plugin : IDalamudPlugin
 
             MessageManager = new MessageManager(this); // Does it require UI?
 
+            // Hellion Chat — Auto-Tell-Tabs service. Subscribes to the
+            // MessageManager's MessageProcessed event for live tells and
+            // to ClientState.Logout for the cleanup pass. Created after
+            // MessageManager so the constructor can hand off the live
+            // store and event source.
+            AutoTellTabsService = new AutoTellTabsService(this, MessageManager, MessageManager.Store);
+            AutoTellTabsService.Initialize();
+
             // Hellion Chat — daily retention sweep, off-thread so it never
             // blocks plugin load. Skips itself when disabled or already ran
             // within the past 24 hours.
@@ -224,7 +241,7 @@ public sealed class Plugin : IDalamudPlugin
             Interface.UiBuilder.OpenMainUi += OpenMainUi;
 
             if (Config.ShowEmotes)
-                Task.Run(EmoteCache.LoadData);
+                _ = EmoteCache.LoadData(); // Fire-and-forget intentional, exceptions are caught inside
 
             #if !DEBUG
             // Avoid 300ms hitch when sending first message by preloading the
@@ -265,6 +282,10 @@ public sealed class Plugin : IDalamudPlugin
         TypingIpc?.Dispose();
         ExtraChat?.Dispose();
         Ipc?.Dispose();
+        // Dispose the Auto-Tell-Tabs service before MessageManager so it
+        // can cleanly unsubscribe from the MessageProcessed event before
+        // its source goes away.
+        AutoTellTabsService?.Dispose();
         MessageManager?.DisposeAsync().AsTask().Wait();
         Functions?.Dispose();
         Commands?.Dispose();
@@ -405,6 +426,16 @@ public sealed class Plugin : IDalamudPlugin
 
         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.
+            lock (RetentionSweepLock)
+            {
+                if (RetentionSweepRunning)
+                    return;
+                RetentionSweepRunning = true;
+            }
+
             try
             {
                 var deleted = MessageManager.Store.DeleteByRetentionPolicy(policy, defaultDays);
@@ -429,6 +460,11 @@ public sealed class Plugin : IDalamudPlugin
             {
                 Log.Error(e, "Retention sweep failed");
             }
+            finally
+            {
+                lock (RetentionSweepLock)
+                    RetentionSweepRunning = false;
+            }
         }) { IsBackground = true }.Start();
     }
 
@@ -467,7 +503,17 @@ public sealed class Plugin : IDalamudPlugin
 
     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.
+        var snapshot = Config.Tabs.ToList();
+        Config.Tabs.RemoveAll(t => t.IsTempTab);
+
         Interface.SavePluginConfig(Config);
+
+        Config.Tabs.Clear();
+        Config.Tabs.AddRange(snapshot);
     }
 
     internal void LanguageChanged(string langCode)

ChatTwo/Resources/HellionStrings.Designer.cs

@@ -44,6 +44,8 @@ internal class HellionStrings
     internal static string Privacy_Tab_Title => Get(nameof(Privacy_Tab_Title));
     internal static string Privacy_FilterEnabled_Name => Get(nameof(Privacy_FilterEnabled_Name));
     internal static string Privacy_FilterEnabled_Description => Get(nameof(Privacy_FilterEnabled_Description));
+    internal static string Privacy_FilterEnabled_StorageOnly_Help => Get(nameof(Privacy_FilterEnabled_StorageOnly_Help));
+    internal static string Privacy_Filter_Tree_Heading => Get(nameof(Privacy_Filter_Tree_Heading));
     internal static string Privacy_Whitelist_Help => Get(nameof(Privacy_Whitelist_Help));
     internal static string Privacy_Preset_PrivacyFirst => Get(nameof(Privacy_Preset_PrivacyFirst));
     internal static string Privacy_Preset_ClearAll => Get(nameof(Privacy_Preset_ClearAll));
@@ -62,6 +64,8 @@ internal class HellionStrings
     internal static string Cleanup_Heading => Get(nameof(Cleanup_Heading));
     internal static string Cleanup_Help_Intro => Get(nameof(Cleanup_Help_Intro));
     internal static string Cleanup_Help_SavedNote => Get(nameof(Cleanup_Help_SavedNote));
+    internal static string Cleanup_Preview_Stale => Get(nameof(Cleanup_Preview_Stale));
+    internal static string Retention_Help_SavedNote => Get(nameof(Retention_Help_SavedNote));
     internal static string Cleanup_RefreshPreview => Get(nameof(Cleanup_RefreshPreview));
     internal static string Cleanup_NoPreview => Get(nameof(Cleanup_NoPreview));
     internal static string Cleanup_TotalStored => Get(nameof(Cleanup_TotalStored));
@@ -97,11 +101,6 @@ internal class HellionStrings
     internal static string Retention_Success => Get(nameof(Retention_Success));
     internal static string Retention_Error => Get(nameof(Retention_Error));
 
-    internal static string Migration_Notification_Title => Get(nameof(Migration_Notification_Title));
-    internal static string Migration_Notification_Content => Get(nameof(Migration_Notification_Content));
-    internal static string Migration_Webinterface_Removed_Title => Get(nameof(Migration_Webinterface_Removed_Title));
-    internal static string Migration_Webinterface_Removed_Content => Get(nameof(Migration_Webinterface_Removed_Content));
-
     internal static string Wizard_Title => Get(nameof(Wizard_Title));
     internal static string Wizard_Intro => Get(nameof(Wizard_Intro));
     internal static string Wizard_Profile_PrivacyFirst_Heading => Get(nameof(Wizard_Profile_PrivacyFirst_Heading));
@@ -133,11 +132,114 @@ internal class HellionStrings
     internal static string Export_Empty => Get(nameof(Export_Empty));
     internal static string Export_Error => Get(nameof(Export_Error));
 
-    internal static string Theme_Heading => Get(nameof(Theme_Heading));
     internal static string Theme_Enabled_Name => Get(nameof(Theme_Enabled_Name));
     internal static string Theme_Enabled_Description => Get(nameof(Theme_Enabled_Description));
     internal static string Theme_WindowOpacity_Label => Get(nameof(Theme_WindowOpacity_Label));
     internal static string Theme_WindowOpacity_Help => Get(nameof(Theme_WindowOpacity_Help));
     internal static string Theme_UseHellionFont_Name => Get(nameof(Theme_UseHellionFont_Name));
     internal static string Theme_UseHellionFont_Description => Get(nameof(Theme_UseHellionFont_Description));
+
+    internal static string About_Maintainer_Heading => Get(nameof(About_Maintainer_Heading));
+    internal static string About_Maintainer_Body => Get(nameof(About_Maintainer_Body));
+    internal static string About_Maintainer_Website_Label => Get(nameof(About_Maintainer_Website_Label));
+    internal static string About_Mission_Heading => Get(nameof(About_Mission_Heading));
+    internal static string About_Mission_P1 => Get(nameof(About_Mission_P1));
+    internal static string About_Mission_P2 => Get(nameof(About_Mission_P2));
+    internal static string About_Mission_P3 => Get(nameof(About_Mission_P3));
+    internal static string About_BuiltOn_Heading => Get(nameof(About_BuiltOn_Heading));
+    internal static string About_BuiltOn_P1 => Get(nameof(About_BuiltOn_P1));
+    internal static string About_BuiltOn_P2 => Get(nameof(About_BuiltOn_P2));
+    internal static string About_BuiltOn_Upstream_Label => Get(nameof(About_BuiltOn_Upstream_Label));
+    internal static string About_License_Heading => Get(nameof(About_License_Heading));
+    internal static string About_License_P1 => Get(nameof(About_License_P1));
+    internal static string About_License_P2 => Get(nameof(About_License_P2));
+    internal static string About_License_P3 => Get(nameof(About_License_P3));
+    internal static string About_SE_Heading => Get(nameof(About_SE_Heading));
+    internal static string About_SE_P1 => Get(nameof(About_SE_P1));
+    internal static string About_SE_P2 => Get(nameof(About_SE_P2));
+    internal static string About_Localization_Heading => Get(nameof(About_Localization_Heading));
+    internal static string About_Localization_P1 => Get(nameof(About_Localization_P1));
+    internal static string About_Localization_P2 => Get(nameof(About_Localization_P2));
+    internal static string About_Translators_TreeNode => Get(nameof(About_Translators_TreeNode));
+
+    // Hellion Chat — Auto-Tell-Tabs runtime strings
+    internal static string AutoTellTabs_SectionHeader => Get(nameof(AutoTellTabs_SectionHeader));
+    internal static string AutoTellTabs_HistorySeparator => Get(nameof(AutoTellTabs_HistorySeparator));
+    internal static string AutoTellTabs_HistoryLoadError => Get(nameof(AutoTellTabs_HistoryLoadError));
+    internal static string AutoTellTabs_GreetedTooltip => Get(nameof(AutoTellTabs_GreetedTooltip));
+    internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip));
+
+    // Hellion Chat — Auto-Tell-Tabs Chat settings tab
+    internal static string ChatLog_AutoTellTabs_Section_Title => Get(nameof(ChatLog_AutoTellTabs_Section_Title));
+    internal static string ChatLog_AutoTellTabs_Enable_Name => Get(nameof(ChatLog_AutoTellTabs_Enable_Name));
+    internal static string ChatLog_AutoTellTabs_Enable_Description => Get(nameof(ChatLog_AutoTellTabs_Enable_Description));
+    internal static string ChatLog_AutoTellTabs_Limit_Name => Get(nameof(ChatLog_AutoTellTabs_Limit_Name));
+    internal static string ChatLog_AutoTellTabs_Limit_Description => Get(nameof(ChatLog_AutoTellTabs_Limit_Description));
+    internal static string ChatLog_AutoTellTabs_Compact_Name => Get(nameof(ChatLog_AutoTellTabs_Compact_Name));
+    internal static string ChatLog_AutoTellTabs_Compact_Description => Get(nameof(ChatLog_AutoTellTabs_Compact_Description));
+    internal static string ChatLog_AutoTellTabs_GreetedToggle_Name => Get(nameof(ChatLog_AutoTellTabs_GreetedToggle_Name));
+    internal static string ChatLog_AutoTellTabs_GreetedToggle_Description => Get(nameof(ChatLog_AutoTellTabs_GreetedToggle_Description));
+    internal static string ChatLog_AutoTellTabs_PreloadHint => Get(nameof(ChatLog_AutoTellTabs_PreloadHint));
+    internal static string ChatLog_AutoTellTabs_ConflictHint => Get(nameof(ChatLog_AutoTellTabs_ConflictHint));
+
+    // Hellion Chat — Auto-Tell-Tabs Privacy settings tab
+    internal static string Privacy_AutoTellTabs_Section_Title => Get(nameof(Privacy_AutoTellTabs_Section_Title));
+    internal static string Privacy_AutoTellTabs_Preload_Name => Get(nameof(Privacy_AutoTellTabs_Preload_Name));
+    internal static string Privacy_AutoTellTabs_Preload_Description => Get(nameof(Privacy_AutoTellTabs_Preload_Description));
+    internal static string Privacy_AutoTellTabs_Preload_Hint => Get(nameof(Privacy_AutoTellTabs_Preload_Hint));
+
+    // Hellion Chat — Settings UX Polish v10 wipe migration
+    internal static string SettingsRefactor_Migration_Title => Get(nameof(SettingsRefactor_Migration_Title));
+    internal static string SettingsRefactor_Migration_Content => Get(nameof(SettingsRefactor_Migration_Content));
+
+    // Hellion Chat — Settings UX Polish 8-tab structure
+    internal static string Settings_Tab_General => Get(nameof(Settings_Tab_General));
+    internal static string Settings_Tab_Appearance => Get(nameof(Settings_Tab_Appearance));
+    internal static string Settings_Tab_Window => Get(nameof(Settings_Tab_Window));
+    internal static string Settings_Tab_Chat => Get(nameof(Settings_Tab_Chat));
+    internal static string Settings_Tab_Tabs => Get(nameof(Settings_Tab_Tabs));
+    internal static string Settings_Tab_Database => Get(nameof(Settings_Tab_Database));
+    internal static string Settings_Tab_Information => Get(nameof(Settings_Tab_Information));
+
+    // Hellion Chat — General-Tab section headings
+    internal static string Settings_General_Input_Heading => Get(nameof(Settings_General_Input_Heading));
+    internal static string Settings_General_Audio_Heading => Get(nameof(Settings_General_Audio_Heading));
+    internal static string Settings_General_Performance_Heading => Get(nameof(Settings_General_Performance_Heading));
+    internal static string Settings_General_Language_Heading => Get(nameof(Settings_General_Language_Heading));
+
+    // Hellion Chat — Appearance-Tab section headings
+    internal static string Settings_Appearance_Theme_Heading => Get(nameof(Settings_Appearance_Theme_Heading));
+    internal static string Settings_Appearance_Fonts_Heading => Get(nameof(Settings_Appearance_Fonts_Heading));
+    internal static string Settings_Appearance_Colours_Heading => Get(nameof(Settings_Appearance_Colours_Heading));
+    internal static string Settings_Appearance_Timestamps_Heading => Get(nameof(Settings_Appearance_Timestamps_Heading));
+
+    // Hellion Chat — Window-Tab section headings
+    internal static string Settings_Window_Hide_Heading => Get(nameof(Settings_Window_Hide_Heading));
+    internal static string Settings_Window_InactivityHide_Heading => Get(nameof(Settings_Window_InactivityHide_Heading));
+    internal static string Settings_Window_Frame_Heading => Get(nameof(Settings_Window_Frame_Heading));
+    internal static string Settings_Window_Tooltips_Heading => Get(nameof(Settings_Window_Tooltips_Heading));
+
+    // Hellion Chat — Chat-Tab section headings
+    internal static string Settings_Chat_AutoTellTabs_Heading => Get(nameof(Settings_Chat_AutoTellTabs_Heading));
+    internal static string Settings_Chat_Behaviour_Heading => Get(nameof(Settings_Chat_Behaviour_Heading));
+    internal static string Settings_Chat_Preview_Heading => Get(nameof(Settings_Chat_Preview_Heading));
+    internal static string Settings_Chat_Emotes_Heading => Get(nameof(Settings_Chat_Emotes_Heading));
+
+    // Hellion Chat — Database-Tab section headings
+    internal static string Settings_Database_Storage_Heading => Get(nameof(Settings_Database_Storage_Heading));
+    internal static string Settings_Database_Viewer_Heading => Get(nameof(Settings_Database_Viewer_Heading));
+    internal static string Settings_Database_Stats_Heading => Get(nameof(Settings_Database_Stats_Heading));
+
+    // Hellion Chat — Information-Tab section headings
+    internal static string Settings_Information_VersionInfo_Heading => Get(nameof(Settings_Information_VersionInfo_Heading));
+    internal static string Settings_Information_About_Heading => Get(nameof(Settings_Information_About_Heading));
+    internal static string Settings_Information_Changelog_Heading => Get(nameof(Settings_Information_Changelog_Heading));
+
+    // Hellion Chat — Default tab presets (channel-themed)
+    internal static string Tabs_Presets_System => Get(nameof(Tabs_Presets_System));
+    internal static string Tabs_Presets_FreeCompany => Get(nameof(Tabs_Presets_FreeCompany));
+    internal static string Tabs_Presets_Party => Get(nameof(Tabs_Presets_Party));
+    internal static string Tabs_Presets_Beginner => Get(nameof(Tabs_Presets_Beginner));
+    internal static string Tabs_Presets_Linkshell => Get(nameof(Tabs_Presets_Linkshell));
+    internal static string Tabs_Presets_Linkshell_Hint => Get(nameof(Tabs_Presets_Linkshell_Hint));
 }

ChatTwo/Resources/HellionStrings.de.resx

@@ -21,6 +21,12 @@
   <data name="Privacy_FilterEnabled_Description" xml:space="preserve">
     <value>Wenn aktiviert, werden nur Nachrichten aus den erlaubten Kanälen in die Datenbank gespeichert. Beim Deaktivieren gilt wieder das Standard-Verhalten von ChatTwo, also alles außer Battle-Logs wird gespeichert.</value>
   </data>
+  <data name="Privacy_FilterEnabled_StorageOnly_Help" xml:space="preserve">
+    <value>Der Filter steuert nur, was in die lokale Datenbank geschrieben wird. Im Chat-Log siehst du weiterhin jede Nachricht live, ausgeschlossene Kanäle werden nur nicht mehr gespeichert. Wenn du Kanäle auch aus der sichtbaren Anzeige entfernen willst, nutze die normalen Chat-Tab-Filter im Spiel.</value>
+  </data>
+  <data name="Privacy_Filter_Tree_Heading" xml:space="preserve">
+    <value>Privacy-Filter und Whitelist</value>
+  </data>
   <data name="Privacy_Whitelist_Help" xml:space="preserve">
     <value>Wähle aus, welche Kanäle in die lokale Datenbank gespeichert werden. Standard nach Datensparsamkeit: nur deine eigenen Konversationen. Über die Buttons unten kannst du eine Voreinstellung anwenden.</value>
   </data>
@@ -72,6 +78,12 @@
   <data name="Cleanup_Help_SavedNote" xml:space="preserve">
     <value>Das Aufräumen nutzt deine GESPEICHERTE Whitelist (Plugin.Config), nicht ungespeicherte Änderungen oben. Klicke zuerst Speichern, wenn du deine aktuellen Änderungen anwenden willst.</value>
   </data>
+  <data name="Retention_Help_SavedNote" xml:space="preserve">
+    <value>Der manuelle Lauf nutzt deine GESPEICHERTE Retention-Policy, nicht die Slider-Werte oben. Klicke zuerst Speichern, wenn der Lauf deine aktuellen Änderungen anwenden soll.</value>
+  </data>
+  <data name="Cleanup_Preview_Stale" xml:space="preserve">
+    <value>Vorschau veraltet, deine Whitelist hat sich seit dem letzten Aktualisieren geändert. Klicke Aktualisieren, um neu zu berechnen.</value>
+  </data>
   <data name="Cleanup_RefreshPreview" xml:space="preserve">
     <value>Vorschau aktualisieren</value>
   </data>
@@ -171,18 +183,6 @@
   <data name="Retention_Error" xml:space="preserve">
     <value>Aufbewahrungs-Bereinigung fehlgeschlagen, siehe /xllog</value>
   </data>
-  <data name="Migration_Notification_Title" xml:space="preserve">
-    <value>Hellion Chat</value>
-  </data>
-  <data name="Migration_Notification_Content" xml:space="preserve">
-    <value>Datenschutz-Filter ist standardmäßig aktiviert. Einstellungen → Datenschutz zum Anpassen.</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Title" xml:space="preserve">
-    <value>Hellion Chat 0.2.0</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Content" xml:space="preserve">
-    <value>Das Webinterface wurde in dieser Version entfernt, weil es nicht auf das Datenschutz-Niveau gehärtet werden konnte das Hellion Chat standardmäßig zusichert. Falls du es genutzt hast, schau bitte in die README für Hintergründe.</value>
-  </data>
   <data name="Wizard_Title" xml:space="preserve">
     <value>Hellion Chat — Willkommen</value>
   </data>
@@ -270,14 +270,11 @@
   <data name="Export_Error" xml:space="preserve">
     <value>Export fehlgeschlagen, siehe /xllog</value>
   </data>
-  <data name="Theme_Heading" xml:space="preserve">
-    <value>Erscheinungsbild</value>
-  </data>
   <data name="Theme_Enabled_Name" xml:space="preserve">
     <value>Hellion-Theme für alle Plugin-Fenster verwenden</value>
   </data>
   <data name="Theme_Enabled_Description" xml:space="preserve">
-    <value>Industrielle HUD-Palette mit cyan-blauen Aktionsfarben, schiefer-violetten Tabs und Bernstein-Akzenten für aktive Zustände, global angewendet auf Chat-Fenster, Einstellungen, Viewer und Wizard. Deaktivieren, um das Standard-Dalamud-Erscheinungsbild zu nutzen.</value>
+    <value>Hellion-Online-Media-Palette aus Arctic Cyan und Ember Orange, angewendet auf Chat-Fenster, Einstellungen, Viewer und Wizard. Deaktivieren, um das Standard-Dalamud-Erscheinungsbild zu nutzen.</value>
   </data>
   <data name="Theme_WindowOpacity_Label" xml:space="preserve">
     <value>Fenster-Deckkraft</value>
@@ -291,4 +288,271 @@
   <data name="Theme_UseHellionFont_Description" xml:space="preserve">
     <value>Rendert Chat und UI in Exo 2 (SIL Open Font License 1.1), die mit dem Plugin ausgeliefert wird. Deaktivieren, um auf die unter Einstellungen → Schrift gewählte Schriftart zurückzufallen.</value>
   </data>
+
+  <data name="About_Maintainer_Heading" xml:space="preserve">
+    <value>Maintainer</value>
+  </data>
+  <data name="About_Maintainer_Body" xml:space="preserve">
+    <value>Ich pflege Hellion Chat über Hellion Online Media. Auf der Website findest du die Kontaktdaten für lizenzrechtliche, rechtliche oder geschäftliche Fragen.</value>
+  </data>
+  <data name="About_Maintainer_Website_Label" xml:space="preserve">
+    <value>Website:</value>
+  </data>
+
+  <data name="About_Mission_Heading" xml:space="preserve">
+    <value>Warum es diesen Fork gibt</value>
+  </data>
+  <data name="About_Mission_P1" xml:space="preserve">
+    <value>Hellion Chat soll Chat 2 nicht ersetzen. Chat 2 liefert ein vollständiges Chat-Erlebnis mit kompletter Historie, die für Filter, Suche und Replay zur Verfügung steht. Dieser Default ist für die meisten Nutzer der richtige. Dieser Fork wählt einen anderen Ansatz: einen kleineren Default-Footprint, mit zusätzlichen Stellschrauben für Nutzer, die weniger fremden Chat auf der Festplatte behalten möchten.</value>
+  </data>
+  <data name="About_Mission_P2" xml:space="preserve">
+    <value>Der Wunsch nach diesem engeren Default war 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 Fremden in Limsa. Genau diese Daten machen Chat 2's Voll-Historie nützlich, und die meisten Nutzer behalten sie gerne. Mein eigener Geschmack wollte einen kleineren Default. Also habe ich diesen Fork gebaut.</value>
+  </data>
+  <data name="About_Mission_P3" xml:space="preserve">
+    <value>Ich strebe keine große Zielgruppe an, und der Fork steht nicht in Konkurrenz zu Chat 2. Der Code liegt offen unter derselben EUPL-1.2-Lizenz wie das Original. Infi, Anna oder sonst jemand dürfen reinschauen, Ideen mitnehmen, Fragen stellen oder das Projekt einfach ignorieren. Alles drei ist für mich in Ordnung.</value>
+  </data>
+
+  <data name="About_BuiltOn_Heading" xml:space="preserve">
+    <value>Aufbauend auf Chat 2</value>
+  </data>
+  <data name="About_BuiltOn_P1" xml:space="preserve">
+    <value>Hellion Chat ist ein Fork von Chat 2 von Infi und Anna (ascclemens). Das Chat-Replacement-Fenster, die IPC-Integration, die Render-Engine und der komplette Storage-Kern stammen aus dem Original.</value>
+  </data>
+  <data name="About_BuiltOn_P2" xml:space="preserve">
+    <value>Das Webinterface ist das einzige größere Teil, das ich entfernt habe. Es ist für den Remote-Zugriff auf den Chat von einem zweiten Gerät gebaut, also für einen anderen Fokus als der kleinere Default-Footprint, den dieser Fork verfolgt. Es an diese Defaults anzupassen hätte einen erheblichen Umbau bedeutet, also war die Entfernung der saubere Weg für genau diesen 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>Lizenz</value>
+  </data>
+  <data name="About_License_P1" xml:space="preserve">
+    <value>Hellion Chat und Chat 2 stehen beide unter der European Union Public Licence v1.2 (EUPL-1.2).</value>
+  </data>
+  <data name="About_License_P2" xml:space="preserve">
+    <value>© 2023 bis 2026, die Chat-2-Autoren (Infi, Anna und die Upstream-Mitwirkenden).</value>
+  </data>
+  <data name="About_License_P3" xml:space="preserve">
+    <value>© 2026 Hellion Online Media für die Erweiterungen in diesem Fork.</value>
+  </data>
+
+  <data name="About_SE_Heading" xml:space="preserve">
+    <value>FINAL FANTASY XIV-Hinweis</value>
+  </data>
+  <data name="About_SE_P1" xml:space="preserve">
+    <value>FINAL FANTASY XIV © SQUARE ENIX CO., LTD. Alle Rechte vorbehalten.</value>
+  </data>
+  <data name="About_SE_P2" xml:space="preserve">
+    <value>Hellion Chat ist ein inoffizielles Fan-Plugin. Es steht in keiner Verbindung zu Square Enix und wird von ihnen weder unterstützt, gesponsert noch genehmigt.</value>
+  </data>
+
+  <data name="About_Localization_Heading" xml:space="preserve">
+    <value>Lokalisierung</value>
+  </data>
+  <data name="About_Localization_P1" xml:space="preserve">
+    <value>Die deutschen Übersetzungen der Hellion-spezifischen Strings stammen von mir. Weitere Sprachen sind aktuell nicht verfügbar.</value>
+  </data>
+  <data name="About_Localization_P2" xml:space="preserve">
+    <value>Die Übersetzerliste weiter unten gehört zu den Chat-2-Strings auf Crowdin. Diese Freiwilligen haben Chat 2 übersetzt, nicht die Hellion-Erweiterungen.</value>
+  </data>
+  <data name="About_Translators_TreeNode" xml:space="preserve">
+    <value>Chat-2-Community-Übersetzer (Upstream)</value>
+  </data>
+
+  <!-- Hellion Chat — Auto-Tell-Tabs (Runtime-Strings) -->
+  <data name="AutoTellTabs_SectionHeader" xml:space="preserve">
+    <value>Aktive Tells</value>
+  </data>
+  <data name="AutoTellTabs_HistorySeparator" xml:space="preserve">
+    <value>— Frühere Unterhaltungen —</value>
+  </data>
+  <data name="AutoTellTabs_HistoryLoadError" xml:space="preserve">
+    <value>Verlauf konnte nicht geladen werden.</value>
+  </data>
+  <data name="AutoTellTabs_GreetedTooltip" xml:space="preserve">
+    <value>Als begrüßt markiert. Klicken um die Markierung zu entfernen.</value>
+  </data>
+  <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
+    <value>Als begrüßt markieren.</value>
+  </data>
+
+  <!-- Hellion Chat — Auto-Tell-Tabs (Chat-Einstellungstab) -->
+  <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
+    <value>Auto-Tell-Tabs</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Enable_Name" xml:space="preserve">
+    <value>Bei jedem /tell automatisch einen Tab pro Gesprächspartner öffnen</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Enable_Description" xml:space="preserve">
+    <value>Sobald du einen /tell empfängst oder sendest, wird automatisch ein temporärer Tab für diesen Spieler geöffnet. Die Tabs verschwinden beim Logout.</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Limit_Name" xml:space="preserve">
+    <value>Maximale Anzahl der Auto-Tell-Tabs</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
+    <value>Beim Erreichen werden begrüßte Tabs mit der ältesten Aktivität zuerst geschlossen. Änderungen greifen beim nächsten /tell.</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
+    <value>Kompakte Anzeige</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Compact_Description" xml:space="preserve">
+    <value>Zeigt nur einen dünnen Separator zwischen normalen Tabs und Auto-Tell-Tabs, ohne Sektions-Header.</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_GreetedToggle_Name" xml:space="preserve">
+    <value>„Als begrüßt markieren"-Button anzeigen</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_GreetedToggle_Description" xml:space="preserve">
+    <value>Fügt neben jedem Auto-Tell-Tab einen Klick-Button hinzu, um einen Gesprächspartner als bereits begrüßt zu markieren — der Tab-Name wird dann gedimmt. Nützlich für Club-Greeter, die parallel viele Konversationen führen. Standardmäßig aus.</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_PreloadHint" xml:space="preserve">
+    <value>Die Anzahl der vorgeladenen Tells lässt sich im Datenschutz-Tab einstellen.</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_ConflictHint" xml:space="preserve">
+    <value>Hinweis: Falls XIV Messanger oder ein ähnliches Plugin Tells unterdrückt, dort die Option „Suppress DMs" deaktivieren, damit Hellion Chat Tells empfangen und die Auto-Tabs öffnen kann.</value>
+  </data>
+
+  <!-- Hellion Chat — Auto-Tell-Tabs (Datenschutz-Einstellungstab) -->
+  <data name="Privacy_AutoTellTabs_Section_Title" xml:space="preserve">
+    <value>Tell-Verlauf in Auto-Tabs</value>
+  </data>
+  <data name="Privacy_AutoTellTabs_Preload_Name" xml:space="preserve">
+    <value>Anzahl der vorgeladenen Tells</value>
+  </data>
+  <data name="Privacy_AutoTellTabs_Preload_Description" xml:space="preserve">
+    <value>Wie viele frühere Tell-Nachrichten beim Öffnen eines Auto-Tell-Tabs aus der Datenbank geladen werden. 0 deaktiviert die Vorladung.</value>
+  </data>
+  <data name="Privacy_AutoTellTabs_Preload_Hint" xml:space="preserve">
+    <value>Greift nur, wenn Auto-Tell-Tabs im Chat-Tab aktiviert sind.</value>
+  </data>
+
+  <!-- Hellion Chat — Settings UX Polish v10 Wipe-Migration -->
+  <data name="SettingsRefactor_Migration_Title" xml:space="preserve">
+    <value>Settings umstrukturiert</value>
+  </data>
+  <data name="SettingsRefactor_Migration_Content" xml:space="preserve">
+    <value>Hellion Chat 0.5.0 hat die Settings in thematische Tabs umstrukturiert. Deine Chat-Datenbank und dein Nachrichtenverlauf bleiben unverändert. Settings wurden auf Defaults zurückgesetzt. Falls du das Privacy-Profil neu wählen willst, findest du den Reopen-Button im Datenschutz-Tab. Ein Backup der vorherigen Config liegt unter HellionChat.json.pre-v10-backup neben der aktiven Config-Datei.</value>
+  </data>
+
+  <!-- Hellion Chat — Settings UX Polish 8-Tab-Struktur -->
+  <data name="Settings_Tab_General" xml:space="preserve">
+    <value>Allgemein</value>
+  </data>
+  <data name="Settings_Tab_Appearance" xml:space="preserve">
+    <value>Aussehen</value>
+  </data>
+  <data name="Settings_Tab_Window" xml:space="preserve">
+    <value>Fenster</value>
+  </data>
+  <data name="Settings_Tab_Chat" xml:space="preserve">
+    <value>Chat</value>
+  </data>
+  <data name="Settings_Tab_Tabs" xml:space="preserve">
+    <value>Kanäle</value>
+  </data>
+  <data name="Settings_Tab_Database" xml:space="preserve">
+    <value>Datenbank</value>
+  </data>
+  <data name="Settings_Tab_Information" xml:space="preserve">
+    <value>Über</value>
+  </data>
+
+  <!-- Hellion Chat — Sektions-Überschriften des Allgemein-Tabs -->
+  <data name="Settings_General_Input_Heading" xml:space="preserve">
+    <value>Eingabe</value>
+  </data>
+  <data name="Settings_General_Audio_Heading" xml:space="preserve">
+    <value>Audio &amp; Benachrichtigungen</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>Sprache &amp; Eingabe-Hilfen</value>
+  </data>
+
+  <!-- Hellion Chat — Sektions-Überschriften des Aussehen-Tabs -->
+  <data name="Settings_Appearance_Theme_Heading" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="Settings_Appearance_Fonts_Heading" xml:space="preserve">
+    <value>Schriftarten</value>
+  </data>
+  <data name="Settings_Appearance_Colours_Heading" xml:space="preserve">
+    <value>Chat-Farben</value>
+  </data>
+  <data name="Settings_Appearance_Timestamps_Heading" xml:space="preserve">
+    <value>Zeitstempel</value>
+  </data>
+
+  <!-- Hellion Chat — Sektions-Überschriften des Fenster-Tabs -->
+  <data name="Settings_Window_Hide_Heading" xml:space="preserve">
+    <value>Verstecken</value>
+  </data>
+  <data name="Settings_Window_InactivityHide_Heading" xml:space="preserve">
+    <value>Inaktivitäts-Verstecken</value>
+  </data>
+  <data name="Settings_Window_Frame_Heading" xml:space="preserve">
+    <value>Fenster-Rahmen</value>
+  </data>
+  <data name="Settings_Window_Tooltips_Heading" xml:space="preserve">
+    <value>Tooltips</value>
+  </data>
+
+  <!-- Hellion Chat — Sektions-Überschriften des Chat-Tabs -->
+  <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>Nachrichten-Verhalten</value>
+  </data>
+  <data name="Settings_Chat_Preview_Heading" xml:space="preserve">
+    <value>Vorschau</value>
+  </data>
+  <data name="Settings_Chat_Emotes_Heading" xml:space="preserve">
+    <value>Emotes</value>
+  </data>
+
+  <!-- Hellion Chat — Sektions-Überschriften des Database-Tabs -->
+  <data name="Settings_Database_Storage_Heading" xml:space="preserve">
+    <value>Speicherung</value>
+  </data>
+  <data name="Settings_Database_Viewer_Heading" xml:space="preserve">
+    <value>Übersicht</value>
+  </data>
+  <data name="Settings_Database_Stats_Heading" xml:space="preserve">
+    <value>Wartung</value>
+  </data>
+
+  <!-- Hellion Chat — Sektions-Überschriften des Information-Tabs -->
+  <data name="Settings_Information_VersionInfo_Heading" xml:space="preserve">
+    <value>Versionsinfo</value>
+  </data>
+  <data name="Settings_Information_About_Heading" xml:space="preserve">
+    <value>Über HellionChat</value>
+  </data>
+  <data name="Settings_Information_Changelog_Heading" xml:space="preserve">
+    <value>Changelog</value>
+  </data>
+
+  <!-- Hellion Chat — Default-Tab-Presets (kanalspezifisch) -->
+  <data name="Tabs_Presets_System" xml:space="preserve">
+    <value>System</value>
+  </data>
+  <data name="Tabs_Presets_FreeCompany" xml:space="preserve">
+    <value>Free Company</value>
+  </data>
+  <data name="Tabs_Presets_Party" xml:space="preserve">
+    <value>Gruppe</value>
+  </data>
+  <data name="Tabs_Presets_Beginner" xml:space="preserve">
+    <value>Neulinge</value>
+  </data>
+  <data name="Tabs_Presets_Linkshell" xml:space="preserve">
+    <value>Linkshell</value>
+  </data>
+  <data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve">
+    <value>Wenn du mehrere Linkshells benutzt, empfiehlt der Maintainer einen Tab pro Shell für eine sauberere Übersicht. Tab duplizieren und je Kopie die Kanalauswahl einschränken.</value>
+  </data>
 </root>

ChatTwo/Resources/HellionStrings.resx

@@ -21,6 +21,12 @@
   <data name="Privacy_FilterEnabled_Description" xml:space="preserve">
     <value>When enabled, only messages from whitelisted channels are persisted to the database. Disabling restores upstream ChatTwo behavior (everything except battle messages 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>
+  </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>
   </data>
@@ -72,6 +78,12 @@
   <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>
   </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>
+  </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>
+  </data>
   <data name="Cleanup_RefreshPreview" xml:space="preserve">
     <value>Refresh preview</value>
   </data>
@@ -121,7 +133,7 @@
     <value>Auto-delete messages after a per-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 every plugin start (at most once per 24 hours). Off by default. The plugin never deletes history without your explicit consent.</value>
   </data>
   <data name="Retention_Default_Label" xml:space="preserve">
     <value>Default retention (days, 0 = never)</value>
@@ -171,18 +183,6 @@
   <data name="Retention_Error" xml:space="preserve">
     <value>Retention sweep failed, see /xllog</value>
   </data>
-  <data name="Migration_Notification_Title" xml:space="preserve">
-    <value>Hellion Chat</value>
-  </data>
-  <data name="Migration_Notification_Content" xml:space="preserve">
-    <value>Privacy filter activated by default. Settings → Privacy to adjust.</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Title" xml:space="preserve">
-    <value>Hellion Chat 0.2.0</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Content" xml:space="preserve">
-    <value>The webinterface has been removed in this version because it could not be hardened to the privacy guarantees Hellion Chat makes by default. If you used it, please consult the README for context.</value>
-  </data>
   <data name="Wizard_Title" xml:space="preserve">
     <value>Hellion Chat — Welcome</value>
   </data>
@@ -270,14 +270,11 @@
   <data name="Export_Error" xml:space="preserve">
     <value>Export failed, see /xllog</value>
   </data>
-  <data name="Theme_Heading" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
   <data name="Theme_Enabled_Name" xml:space="preserve">
     <value>Use the Hellion theme across all plugin windows</value>
   </data>
   <data name="Theme_Enabled_Description" xml:space="preserve">
-    <value>Industrial HUD palette with cyan-teal action accents, slate-violet tabs and amber active highlights, applied globally to 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 plus Ember Orange, applied across the chat log, settings, viewers and the wizard. Disable to fall back to the default Dalamud look.</value>
   </data>
   <data name="Theme_WindowOpacity_Label" xml:space="preserve">
     <value>Window opacity</value>
@@ -291,4 +288,271 @@
   <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>
   </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>
+  </data>
+  <data name="About_Maintainer_Website_Label" xml:space="preserve">
+    <value>Website:</value>
+  </data>
+
+  <data name="About_Mission_Heading" xml:space="preserve">
+    <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>
+  </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>
+  </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>
+  </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>
+  </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>
+  </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>
+  </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>
+  </data>
+  <data name="About_License_P2" xml:space="preserve">
+    <value>© 2023 to 2026, the Chat 2 authors (Infi, Anna and the 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>
+  </data>
+
+  <data name="About_SE_Heading" xml:space="preserve">
+    <value>FINAL FANTASY XIV disclaimer</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>
+  </data>
+
+  <data name="About_Localization_Heading" xml:space="preserve">
+    <value>Localization</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>
+  </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>
+  </data>
+  <data name="About_Translators_TreeNode" xml:space="preserve">
+    <value>Chat 2 community translators (upstream)</value>
+  </data>
+
+  <!-- Hellion Chat — Auto-Tell-Tabs (runtime strings) -->
+  <data name="AutoTellTabs_SectionHeader" xml:space="preserve">
+    <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>
+  </data>
+  <data name="AutoTellTabs_GreetedTooltip" xml:space="preserve">
+    <value>Marked as greeted. Click to remove the marker.</value>
+  </data>
+  <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
+    <value>Mark as greeted.</value>
+  </data>
+
+  <!-- Hellion Chat — Auto-Tell-Tabs (Chat settings tab) -->
+  <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
+    <value>Auto-Tell-Tabs</value>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Enable_Name" xml:space="preserve">
+    <value>Open a tab automatically for each tell partner</value>
+  </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>
+  </data>
+  <data name="ChatLog_AutoTellTabs_Limit_Name" xml:space="preserve">
+    <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>
+  </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>
+  </data>
+  <data name="ChatLog_AutoTellTabs_GreetedToggle_Name" xml:space="preserve">
+    <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>
+  </data>
+  <data name="ChatLog_AutoTellTabs_PreloadHint" xml:space="preserve">
+    <value>The number of preloaded tells is 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>
+  </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>
+  </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>
+  </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>
+  </data>
+
+  <!-- Hellion Chat — Settings UX Polish v10 wipe migration -->
+  <data name="SettingsRefactor_Migration_Title" xml:space="preserve">
+    <value>Settings reorganised</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>
+  </data>
+
+  <!-- Hellion Chat — Settings UX Polish 8-tab structure -->
+  <data name="Settings_Tab_General" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="Settings_Tab_Appearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="Settings_Tab_Window" xml:space="preserve">
+    <value>Window</value>
+  </data>
+  <data name="Settings_Tab_Chat" xml:space="preserve">
+    <value>Chat</value>
+  </data>
+  <data name="Settings_Tab_Tabs" xml:space="preserve">
+    <value>Tabs</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>
+  </data>
+
+  <!-- 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>
+  </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>
+  </data>
+
+  <!-- Hellion Chat — Appearance-Tab section headings -->
+  <data name="Settings_Appearance_Theme_Heading" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="Settings_Appearance_Fonts_Heading" xml:space="preserve">
+    <value>Fonts</value>
+  </data>
+  <data name="Settings_Appearance_Colours_Heading" xml:space="preserve">
+    <value>Chat Colours</value>
+  </data>
+  <data name="Settings_Appearance_Timestamps_Heading" xml:space="preserve">
+    <value>Timestamps</value>
+  </data>
+
+  <!-- Hellion Chat — Window-Tab section headings -->
+  <data name="Settings_Window_Hide_Heading" xml:space="preserve">
+    <value>Hide</value>
+  </data>
+  <data name="Settings_Window_InactivityHide_Heading" xml:space="preserve">
+    <value>Inactivity Hide</value>
+  </data>
+  <data name="Settings_Window_Frame_Heading" xml:space="preserve">
+    <value>Window Frame</value>
+  </data>
+  <data name="Settings_Window_Tooltips_Heading" xml:space="preserve">
+    <value>Tooltips</value>
+  </data>
+
+  <!-- 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>
+  </data>
+  <data name="Settings_Chat_Preview_Heading" xml:space="preserve">
+    <value>Preview</value>
+  </data>
+  <data name="Settings_Chat_Emotes_Heading" xml:space="preserve">
+    <value>Emotes</value>
+  </data>
+
+  <!-- Hellion Chat — Database-Tab section headings -->
+  <data name="Settings_Database_Storage_Heading" xml:space="preserve">
+    <value>Storage</value>
+  </data>
+  <data name="Settings_Database_Viewer_Heading" xml:space="preserve">
+    <value>Overview</value>
+  </data>
+  <data name="Settings_Database_Stats_Heading" xml:space="preserve">
+    <value>Maintenance</value>
+  </data>
+
+  <!-- Hellion Chat — Information-Tab section headings -->
+  <data name="Settings_Information_VersionInfo_Heading" xml:space="preserve">
+    <value>Version Info</value>
+  </data>
+  <data name="Settings_Information_About_Heading" xml:space="preserve">
+    <value>About HellionChat</value>
+  </data>
+  <data name="Settings_Information_Changelog_Heading" xml:space="preserve">
+    <value>Changelog</value>
+  </data>
+
+  <!-- Hellion Chat — Default tab presets (channel-themed) -->
+  <data name="Tabs_Presets_System" xml:space="preserve">
+    <value>System</value>
+  </data>
+  <data name="Tabs_Presets_FreeCompany" xml:space="preserve">
+    <value>Free Company</value>
+  </data>
+  <data name="Tabs_Presets_Party" xml:space="preserve">
+    <value>Party</value>
+  </data>
+  <data name="Tabs_Presets_Beginner" xml:space="preserve">
+    <value>Beginner</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>
+  </data>
 </root>

ChatTwo/Ui/ChatLogWindow.cs

@@ -99,8 +99,8 @@ public sealed class ChatLogWindow : Window
         SetUpTextCommandChannels();
         SetUpAllCommands();
 
-        Plugin.Commands.Register("/clearlog2", "Clear the Chat 2 chat log").Execute += ClearLog;
-        Plugin.Commands.Register("/chat2").Execute += ToggleChat;
+        Plugin.Commands.Register("/clearhellion", "Clear the Hellion Chat log").Execute += ClearLog;
+        Plugin.Commands.Register("/hellion").Execute += ToggleChat;
 
         Plugin.ClientState.Login += Login;
         Plugin.ClientState.Logout += Logout;
@@ -115,8 +115,8 @@ public sealed class ChatLogWindow : Window
         Plugin.AddonLifecycle.UnregisterListener(AddonEvent.PostUpdate, "ActionDetail", PayloadHandler.MoveTooltip);
         Plugin.ClientState.Logout -= Logout;
         Plugin.ClientState.Login -= Login;
-        Plugin.Commands.Register("/chat2").Execute -= ToggleChat;
-        Plugin.Commands.Register("/clearlog2").Execute -= ClearLog;
+        Plugin.Commands.Register("/hellion").Execute -= ToggleChat;
+        Plugin.Commands.Register("/clearhellion").Execute -= ClearLog;
     }
 
     private void Logout(int _, int __)
@@ -451,7 +451,9 @@ public sealed class ChatLogWindow : Window
             Flags |= ImGuiWindowFlags.NoTitleBar;
 
         if (LastViewport == ImGuiHelpers.MainViewport.Handle && !WasDocked)
-            BgAlpha = Plugin.Config.WindowAlpha / 100f;
+            BgAlpha = Plugin.Config.HellionThemeEnabled
+                ? Plugin.Config.HellionThemeWindowOpacity
+                : Plugin.Config.WindowAlpha / 100f;
 
         LastViewport = ImGui.GetWindowViewport().Handle;
         WasDocked = ImGui.IsWindowDocked();
@@ -1188,7 +1190,13 @@ public sealed class ChatLogWindow : Window
                 if (tab.DisplayTimestamp)
                 {
                     var localTime = message.Date.ToLocalTime();
-                    var timestamp = localTime.ToString("t", !Plugin.Config.Use24HourClock ? null : CultureInfo.CreateSpecificCulture("de-DE"));
+                    // Force the format explicitly per setting. Relying on the
+                    // current culture meant a German system locale always
+                    // produced 24h regardless of the toggle, so the checkbox
+                    // looked dead.
+                    var timestamp = Plugin.Config.Use24HourClock
+                        ? localTime.ToString("HH:mm", CultureInfo.InvariantCulture)
+                        : localTime.ToString("h:mm tt", CultureInfo.InvariantCulture);
                     if (isTable)
                     {
                         if (!Plugin.Config.HideSameTimestamps || timestamp != lastTimestamp)
@@ -1303,14 +1311,90 @@ public sealed class ChatLogWindow : Window
             if (child)
             {
                 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.
+                var tempTabHeaderRendered = false;
+                var tempTabCount = Plugin.Config.Tabs.Count(t => t.IsTempTab);
+
                 for (var tabI = 0; tabI < Plugin.Config.Tabs.Count; tabI++)
                 {
                     var tab = Plugin.Config.Tabs[tabI];
                     if (tab.PopOut)
                         continue;
 
+                    if (tab.IsTempTab && !tempTabHeaderRendered)
+                    {
+                        ImGui.Separator();
+                        if (!Plugin.Config.AutoTellTabsCompactDisplay)
+                        {
+                            ImGui.TextDisabled($"{HellionStrings.AutoTellTabs_SectionHeader} ({tempTabCount})");
+                        }
+                        tempTabHeaderRendered = true;
+                    }
+
                     var unread = tabI == Plugin.LastTab || tab.UnreadMode == UnreadMode.None || tab.Unread == 0 ? "" : $" ({tab.Unread})";
-                    var clicked = ImGui.Selectable($"{tab.Name}{unread}###log-tab-{tabI}", Plugin.LastTab == tabI || Plugin.WantedTab == tabI);
+                    var selectableLabel = $"{tab.Name}{unread}###log-tab-{tabI}";
+                    var isCurrentTab = Plugin.LastTab == tabI || Plugin.WantedTab == tabI;
+
+                    var showGreetedAffordance = tab.IsTempTab && Plugin.Config.AutoTellTabsShowGreetedToggle;
+
+                    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.
+                        var greetedIcon = tab.IsGreeted ? FontAwesomeIcon.CheckCircle : FontAwesomeIcon.Check;
+                        var greetedTooltip = tab.IsGreeted
+                            ? HellionStrings.AutoTellTabs_GreetedTooltip
+                            : HellionStrings.AutoTellTabs_UnGreetedTooltip;
+
+                        using (ImRaii.PushStyle(ImGuiStyleVar.FramePadding, new Vector2(2, 1)))
+                        using (ImRaii.PushColor(ImGuiCol.Button, 0))
+                        {
+                            if (ImGuiUtil.IconButton(greetedIcon, $"greeted-{tabI}", greetedTooltip))
+                            {
+                                if (tab.IsGreeted)
+                                {
+                                    Plugin.AutoTellTabsService.UnmarkGreeted(tab);
+                                }
+                                else
+                                {
+                                    Plugin.AutoTellTabsService.MarkGreeted(tab);
+                                }
+                            }
+                        }
+                        ImGui.SameLine();
+                    }
+
+                    bool clicked;
+                    if (showGreetedAffordance && tab.IsGreeted)
+                    {
+                        // Dim the tab name once the user marked the partner
+                        // as greeted, so a glance at the sidebar tells them
+                        // who still needs attention. Selectable has no idle
+                        // background slot in ImGui, so the dim only applies
+                        // to the selected and hovered states — the text dim
+                        // alone signals greeted in the idle state.
+                        var headerBase = ImGui.GetColorU32(ImGuiCol.Header);
+                        var hoverBase = ImGui.GetColorU32(ImGuiCol.HeaderHovered);
+                        var dimHeader = (headerBase & 0xFF000000u) | ((headerBase & 0x00FEFEFEu) >> 1);
+                        var dimHover = (hoverBase & 0xFF000000u) | ((hoverBase & 0x00FEFEFEu) >> 1);
+
+                        using (ImRaii.PushColor(ImGuiCol.Text, ImGui.GetColorU32(ImGuiCol.TextDisabled)))
+                        using (ImRaii.PushColor(ImGuiCol.Header, dimHeader))
+                        using (ImRaii.PushColor(ImGuiCol.HeaderHovered, dimHover))
+                        {
+                            clicked = ImGui.Selectable(selectableLabel, isCurrentTab);
+                        }
+                    }
+                    else
+                    {
+                        clicked = ImGui.Selectable(selectableLabel, isCurrentTab);
+                    }
+
                     DrawTabContextMenu(tab, tabI);
 
                     if (!clicked && Plugin.WantedTab != tabI)

ChatTwo/Ui/DbViewer.cs

@@ -22,7 +22,7 @@ namespace ChatTwo.Ui;
 
 public class DbViewer : Window
 {
-    public const float RowPerPage = 1000.0f;
+    public const int RowPerPage = 1000;
 
     private readonly Plugin Plugin;
 
@@ -76,19 +76,19 @@ public class DbViewer : Window
         RespectCloseHotkey = false;
         DisableWindowSounds = true;
 
-        Plugin.Commands.Register("/chat2Viewer", "Get access to your message history, with simple filter options.", true).Execute += Toggle;
+        Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute += Toggle;
     }
 
     public void Dispose()
     {
-        Plugin.Commands.Register("/chat2Viewer", "Get access to your message history, with simple filter options.", true).Execute -= Toggle;
+        Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute -= Toggle;
     }
 
     private void Toggle(string _, string __) => Toggle();
 
     public override void Draw()
     {
-        var totalPages = (int)Math.Ceiling(Count / RowPerPage);
+        var totalPages = (int)Math.Ceiling((double)Count / RowPerPage);
         if (totalPages < 1)
             totalPages = 1;
 

ChatTwo/Ui/Debugger.cs

@@ -28,12 +28,12 @@ public class DebuggerWindow : Window
         RespectCloseHotkey = false;
         DisableWindowSounds = true;
 
-        Plugin.Commands.Register("/chat2Debugger", showInHelp: false).Execute += Toggle;
+        Plugin.Commands.Register("/hellionDebugger", showInHelp: false).Execute += Toggle;
     }
 
     public void Dispose()
     {
-        Plugin.Commands.Register("/chat2Debugger", showInHelp: false).Execute -= Toggle;
+        Plugin.Commands.Register("/hellionDebugger", showInHelp: false).Execute -= Toggle;
     }
 
     private void Toggle(string _, string __) => Toggle();

ChatTwo/Ui/HellionStyle.cs

@@ -21,63 +21,79 @@ internal static class HellionStyle
 {
     // Encoded as 0xRRGGBBAA, matching ChatTwo convention (see Settings.cs
     // Ko-fi buttons). RgbaToAbgr handles the byte swap to the format ImGui
-    // expects.
+    // expects. Hex values are sourced from the Hellion Online Media brand
+    // guide ("Arctic Cyan + Ember Glow", BRANDING.md in the website repo).
 
-    // Primary — cyan-teal for actionable controls (buttons, checks, sliders).
-    private const uint PrimaryRgba = 0x00B8D4FF;
-    private const uint PrimaryHoverRgba = 0x26C6DAFF;
-    private const uint PrimaryActiveRgba = 0x00838FFF;
+    // Primary — Arctic Cyan, used for every interactive control (buttons,
+    // checks, sliders, separators when hovered). Three brand stages plus a
+    // hover that lifts to brand-color-light and a press that drops to
+    // brand-color-dark.
+    private const uint PrimaryRgba = 0x00BED2FF;       // brand-color
+    private const uint PrimaryHoverRgba = 0x4DD9E8FF;  // brand-color-light
+    private const uint PrimaryActiveRgba = 0x0097A7FF; // brand-color-dark
 
-    // Secondary — industrial amber, used as a warm highlight for active
-    // states (tab borders, resize grips, scrollbar grabs).
-    private const uint SecondaryRgba = 0xFFB300FF;
-    private const uint SecondaryHoverRgba = 0xFFC940FF;
-    private const uint SecondaryActiveRgba = 0xC68400FF;
+    // Identity — brand-color-dark teal for window title bars and the
+    // active tab. Sits visibly below the primary cyan on buttons so the
+    // user sees "where am I" (deep teal) versus "what can I click"
+    // (brand cyan) without leaving the cyan family.
+    private const uint IdentityRgba = 0x0097A7FF;       // brand-color-dark
+    private const uint IdentityHoverRgba = 0x4DD9E8FF;  // brand-color-light
+    private const uint IdentityDeepRgba = 0x005670FF;   // dimmer teal for unfocused-active tab
 
-    // Tertiary — slate violet, reserved for title bars and the active tab
-    // background so identity beats out the cyan accent without competing
-    // with it on action controls.
-    private const uint TertiaryRgba = 0x7B61FFFF;
-    private const uint TertiaryHoverRgba = 0x9580FFFF;
-    private const uint TertiaryActiveRgba = 0x5E45D9FF;
+    // Accent — Ember Orange for warm highlights on grips and scrollbar
+    // pulls. Replaces the previous industrial amber so the plugin matches
+    // the website's CTA palette. AccentActive is reserved for any future
+    // pressed-state on accent surfaces; the current slots only need
+    // AccentRgba and AccentHoverRgba.
+    private const uint AccentRgba = 0xF97316FF;        // accent-color
+    private const uint AccentHoverRgba = 0xFB923CFF;   // accent-color-light
 
-    // Surfaces — deep slate window/frame backgrounds, steel borders.
-    private const uint WindowBgRgba = 0x0E1A20FF;
-    private const uint ChildBgRgba = 0x102027FF;
-    private const uint PopupBgRgba = 0x102027FF;
-    private const uint FrameBgRgba = 0x162831FF;
-    private const uint FrameBgHoverRgba = 0x1F3540FF;
-    private const uint FrameBgActiveRgba = 0x274250FF;
-    private const uint BorderRgba = 0x37474FFF;
+    // Surfaces — Hellion brand background ladder. Window darkest, frame
+    // hover ladder climbs into surface tones. Matches the website's
+    // background / background-medium / background-light / surface vars.
+    private const uint WindowBgRgba = 0x070B12FF;       // background
+    private const uint ChildBgRgba = 0x0C1220FF;        // background-medium
+    private const uint PopupBgRgba = 0x0C1220FF;        // background-medium
+    private const uint FrameBgRgba = 0x141E30FF;        // background-light
+    private const uint FrameBgHoverRgba = 0x1A2538FF;   // surface
+    private const uint FrameBgActiveRgba = 0x22303FFF;  // surface-hover
+    // Cyan-tinted border — matches website --border-brand (cyan @ 40% α).
+    private const uint BorderRgba = 0x00BED266;
     private const uint BorderShadowRgba = 0x00000000;
 
-    // Headers / collapsing-headers / tree nodes / selectables.
-    private const uint HeaderRgba = 0x1B2C36FF;
-    private const uint HeaderHoverRgba = 0x263A45FF;
-    private const uint HeaderActiveRgba = 0x324A57FF;
+    // Headers / collapsing-headers / tree nodes / selectables — same
+    // surface ladder as frames so panels feel consistent.
+    private const uint HeaderRgba = 0x141E30FF;
+    private const uint HeaderHoverRgba = 0x1A2538FF;
+    private const uint HeaderActiveRgba = 0x22303FFF;
 
-    // Title bars — tertiary identity for the active state.
-    private const uint TitleBgRgba = 0x0E1A20FF;
-    private const uint TitleBgActiveRgba = 0x5E45D9FF;
-    private const uint TitleBgCollapsedRgba = 0x0A1318FF;
+    // Title bars — Identity teal on active so the focused window reads
+    // as "yours" without using accent or primary slots.
+    private const uint TitleBgRgba = 0x070B12FF;
+    private const uint TitleBgActiveRgba = IdentityRgba;
+    private const uint TitleBgCollapsedRgba = 0x05080EFF;
 
-    // Tabs — tertiary tint, secondary highlight while hovered/unfocused.
-    private const uint TabRgba = 0x162831FF;
-    private const uint TabHoveredRgba = 0x9580FFFF;
-    private const uint TabActiveRgba = 0x7B61FFFF;
-    private const uint TabUnfocusedRgba = 0x12222AFF;
-    private const uint TabUnfocusedActiveRgba = 0x5E45D9FF;
+    // Tabs — neutral inactive, Identity-light on hover, Identity teal on
+    // active. Unfocused-active uses the deeper Identity stage so an
+    // unfocused window's active tab still reads but does not pull focus.
+    private const uint TabRgba = 0x141E30FF;
+    private const uint TabHoveredRgba = IdentityHoverRgba;
+    private const uint TabActiveRgba = IdentityRgba;
+    private const uint TabUnfocusedRgba = 0x0C1220FF;
+    private const uint TabUnfocusedActiveRgba = IdentityDeepRgba;
 
-    // Scrollbar — slate base, secondary amber on grab.
-    private const uint ScrollbarBgRgba = 0x0E1A20FF;
-    private const uint ScrollbarGrabRgba = 0x37474FFF;
-    private const uint ScrollbarGrabHoveredRgba = 0xFFC940FF;
-    private const uint ScrollbarGrabActiveRgba = 0xFFB300FF;
+    // Scrollbar — Ember on grab so the pull stands out without competing
+    // with the cyan action buttons. Idle grab is a subtle surface tone,
+    // hover/active climb into accent.
+    private const uint ScrollbarBgRgba = 0x070B12FF;
+    private const uint ScrollbarGrabRgba = 0x22303FFF;       // surface-hover
+    private const uint ScrollbarGrabHoveredRgba = AccentHoverRgba;
+    private const uint ScrollbarGrabActiveRgba = AccentRgba;
 
-    // Resize grip — secondary amber for the active corner pull.
-    private const uint ResizeGripRgba = 0x37474FFF;
-    private const uint ResizeGripHoveredRgba = 0xFFC940FF;
-    private const uint ResizeGripActiveRgba = 0xFFB300FF;
+    // Resize grip — same Ember treatment as the scrollbar.
+    private const uint ResizeGripRgba = 0x141E30FF;
+    private const uint ResizeGripHoveredRgba = AccentHoverRgba;
+    private const uint ResizeGripActiveRgba = AccentRgba;
 
     // Separator and check mark / slider follow the primary cyan.
 

ChatTwo/Ui/Popout.cs

@@ -70,8 +70,16 @@ internal class Popout : Window
 
         if (!ChatLogWindow.PopOutDocked[Idx])
         {
-            var alpha = Tab.IndependentOpacity ? Tab.Opacity : Plugin.Config.WindowAlpha;
-            BgAlpha = alpha / 100f;
+            if (Tab.IndependentOpacity)
+            {
+                BgAlpha = Tab.Opacity / 100f;
+            }
+            else
+            {
+                BgAlpha = Plugin.Config.HellionThemeEnabled
+                    ? Plugin.Config.HellionThemeWindowOpacity
+                    : Plugin.Config.WindowAlpha / 100f;
+            }
         }
     }
 

ChatTwo/Ui/SeStringDebugger.cs

@@ -30,14 +30,14 @@ public class SeStringDebugger : Window
         DisableWindowSounds = true;
 
         #if DEBUG
-        Plugin.Commands.Register("/chat2SeString", showInHelp: false).Execute += Toggle;
+        Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute += Toggle;
         #endif
     }
 
     public void Dispose()
     {
         #if DEBUG
-        Plugin.Commands.Register("/chat2SeString", showInHelp: false).Execute -= Toggle;
+        Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute -= Toggle;
         #endif
     }
 

ChatTwo/Ui/Settings.cs

@@ -9,7 +9,7 @@ using Dalamud.Bindings.ImGui;
 
 namespace ChatTwo.Ui;
 
-public sealed class SettingsWindow : Window
+public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
 {
     private readonly Plugin Plugin;
 
@@ -33,18 +33,14 @@ public sealed class SettingsWindow : Window
 
         Tabs =
         [
-            new Display(Mutable),
-            new ChatLog(Plugin, Mutable),
-            new Emote(Plugin, Mutable),
-            new Preview(Mutable),
-            new Fonts(Mutable),
-            new ChatColours(Plugin, Mutable),
-            new Tabs(Plugin, Mutable),
+            new General(Plugin, Mutable),
+            new Appearance(Plugin, Mutable),
+            new SettingsTabs.Window(Plugin, Mutable),
+            new Chat(Plugin, Mutable),
+            new SettingsTabs.Tabs(Plugin, Mutable),
             new SettingsTabs.Privacy(Plugin, Mutable),
             new Database(Plugin, Mutable),
-            new Miscellaneous(Mutable),
-            new Changelog(Mutable),
-            new About()
+            new Information(Mutable),
         ];
 
         RespectCloseHotkey = false;
@@ -52,14 +48,14 @@ public sealed class SettingsWindow : Window
 
         Initialise();
 
-        Plugin.Commands.Register("/chat2", "Perform various actions with Chat 2.").Execute += Command;
+        Plugin.Commands.Register("/hellion", "Perform various actions with Hellion Chat.").Execute += Command;
         Plugin.Interface.UiBuilder.OpenConfigUi += Toggle;
     }
 
     public void Dispose()
     {
         Plugin.Interface.UiBuilder.OpenConfigUi -= Toggle;
-        Plugin.Commands.Register("/chat2").Execute -= Command;
+        Plugin.Commands.Register("/hellion").Execute -= Command;
     }
 
     private void Command(string command, string args)
@@ -114,14 +110,16 @@ public sealed class SettingsWindow : Window
 
         ImGui.SameLine();
 
-        if (ImGui.Button(Language.Settings_SaveAndClose)) {
+        if (ImGui.Button(Language.Settings_SaveAndClose))
+        {
             save = true;
             IsOpen = false;
         }
 
         ImGui.SameLine();
 
-        if (ImGui.Button(Language.Settings_Discard)) {
+        if (ImGui.Button(Language.Settings_Discard))
+        {
             IsOpen = false;
         }
 
@@ -135,7 +133,7 @@ public sealed class SettingsWindow : Window
         {
             var buttonWidth = ImGui.CalcTextSize(buttonLabel).X + ImGui.GetStyle().FramePadding.X * 2;
             var buttonWidth2 = ImGui.CalcTextSize(buttonLabel2).X + ImGui.GetStyle().FramePadding.X * 2;
-            ImGui.SameLine(ImGui.GetContentRegionAvail().X - buttonWidth - buttonWidth2);
+            ImGui.SameLine(ImGui.GetContentRegionAvail().X - buttonWidth - buttonWidth2 - ImGui.GetStyle().ItemSpacing.X);
 
             if (ImGui.Button(buttonLabel2))
                 Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii");
@@ -179,7 +177,7 @@ public sealed class SettingsWindow : Window
             GameFunctions.GameFunctions.SetChatInteractable(true);
 
         if (Plugin.Config.ShowEmotes)
-            Task.Run(EmoteCache.LoadData);
+            _ = EmoteCache.LoadData(); // Fire-and-forget intentional, exceptions are caught inside
 
         Initialise();
     }

ChatTwo/Ui/SettingsTabs/About.cs

@@ -1,127 +0,0 @@
-using System.Numerics;
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Interface;
-using Dalamud.Interface.Colors;
-using Dalamud.Interface.Utility;
-using Dalamud.Interface.Utility.Raii;
-using Dalamud.Bindings.ImGui;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class About : ISettingsTab
-{
-    public string Name => string.Format(Language.Options_About_Tab, Plugin.PluginName) + "###tabs-about";
-
-    private readonly List<string> Translators =
-    [
-        "q673135110", "Akizem", "d0tiKs",
-        "Moonlight_Everlit", "Dark32", "andreycout",
-        "Button_", "Cali666", "cassandra308",
-        "lokinmodar", "jtabox", "AkiraYorumoto",
-        "MKhayle", "elena.space", "imlisa",
-        "andrei5125", "ShivaMaheshvara", "aislinn87",
-        "nishinatsu051", "lichuyuan", "Risu64",
-        "yummypillow", "witchymary", "Yuzumi",
-        "zomsakura", "Sirayuki"
-    ];
-
-    internal About()
-    {
-        Translators.Sort((a, b) => string.Compare(a.ToLowerInvariant(), b.ToLowerInvariant(), StringComparison.Ordinal));
-    }
-
-    public void Draw(bool changed)
-    {
-        using var wrap = ImRaii.TextWrapPos(0.0f);
-
-        ImGui.TextUnformatted(string.Format(Language.Options_About_Opening, Plugin.PluginName));
-
-        ImGuiHelpers.ScaledDummy(10.0f);
-
-        ImGui.TextUnformatted(Language.Options_About_Authors);
-        ImGui.SameLine();
-        ImGui.TextColored(ImGuiColors.ParsedGold, Plugin.Interface.Manifest.Author);
-
-        ImGui.TextUnformatted(Language.Options_About_Discord);
-        ImGui.SameLine();
-        ImGui.TextColored(ImGuiColors.ParsedGold, "@j.j_kazama");
-
-        ImGui.TextUnformatted(Language.Options_About_Version);
-        ImGui.SameLine();
-        ImGui.TextColored(ImGuiColors.ParsedOrange, Plugin.Interface.Manifest.AssemblyVersion.ToString(3));
-
-        ImGuiHelpers.ScaledDummy(10.0f);
-
-        ImGui.TextUnformatted(Language.Options_About_Github_Issues);
-        ImGui.SameLine();
-        if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues"))
-            Dalamud.Utility.Util.OpenLink("https://github.com/JonKazama-Hellion/HellionChat/issues");
-
-        ImGuiHelpers.ScaledDummy(10.0f);
-
-        // Hellion-specific maintainer / attribution / license / SE-
-        // disclaimer block. Hand-rolled in English here rather than via
-        // HellionStrings — the legal-ish copy stays close to the EUPL-1.2
-        // wording and the SE disclaimer is the same in every locale.
-        ImGui.TextColored(ImGuiColors.ParsedGold, "Maintainer");
-        ImGui.TextUnformatted("Hellion Chat is maintained by Hellion Online Media (Florian Wathling).");
-        ImGui.TextUnformatted("Website:");
-        ImGui.SameLine();
-        if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "hellionMedia"))
-            Dalamud.Utility.Util.OpenLink("https://hellion-media.de");
-        ImGui.TextUnformatted("For licensing, legal or contact inquiries please reach out via the website above.");
-
-        ImGuiHelpers.ScaledDummy(10.0f);
-
-        ImGui.TextColored(ImGuiColors.ParsedGold, "Built on Chat 2");
-        ImGui.TextUnformatted("Hellion Chat is a fork of Chat 2 by Infi and Anna (ascclemens).");
-        ImGui.TextUnformatted("Every chat replacement feature, the IPC integration, the rendering engine and the storage core come from upstream Chat 2.");
-        ImGui.TextUnformatted("The upstream webinterface is intentionally not part of Hellion Chat — it could not be hardened to the privacy guarantees this fork makes by default.");
-        ImGui.TextUnformatted("Upstream repository:");
-        ImGui.SameLine();
-        if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "chatTwoUpstream"))
-            Dalamud.Utility.Util.OpenLink("https://github.com/Infiziert90/ChatTwo");
-
-        ImGuiHelpers.ScaledDummy(10.0f);
-
-        ImGui.TextColored(ImGuiColors.ParsedGold, "License");
-        ImGui.TextUnformatted("Hellion Chat and Chat 2 are licensed under the European Union Public License v1.2 (EUPL-1.2).");
-        ImGui.TextUnformatted("© 2023–2026 the Chat 2 authors (Infi, Anna and the upstream contributors).");
-        ImGui.TextUnformatted("© 2026 Hellion Online Media — for the Hellion Chat additions.");
-
-        ImGuiHelpers.ScaledDummy(10.0f);
-
-        ImGui.TextColored(ImGuiColors.DalamudOrange, "FINAL FANTASY XIV disclaimer");
-        ImGui.TextUnformatted("FINAL FANTASY XIV © SQUARE ENIX CO., LTD. All rights reserved.");
-        ImGui.TextUnformatted("Hellion Chat is an unofficial, fan-made plugin and is not affiliated with, endorsed, sponsored or approved by Square Enix.");
-
-        ImGui.Spacing();
-
-        ImGui.TextColored(ImGuiColors.ParsedGold, "Localization");
-        ImGui.TextUnformatted("German translations of Hellion-specific UI strings (HellionStrings.de.resx) are written by the Hellion Online Media maintainer.");
-        ImGui.TextUnformatted("All other locales for Hellion-specific strings are not currently provided.");
-        ImGui.TextUnformatted("The translator list below covers the upstream Chat 2 community translators on Crowdin — their work covers the inherited Chat 2 strings, not the Hellion additions.");
-
-        ImGui.Spacing();
-
-        var height = ImGui.GetContentRegionAvail().Y - ImGui.CalcTextSize("A").Y - ImGui.GetStyle().ItemSpacing.Y * 2;
-        using (var aboutChild = ImRaii.Child("about", new Vector2(-1, height)))
-        {
-            if (aboutChild)
-            {
-                using var treeNode = ImRaii.TreeNode("Chat 2 community translators (upstream)");
-                if (treeNode)
-                {
-                    using var translatorChild = ImRaii.Child("translators");
-                    if (translatorChild)
-                    {
-                        foreach (var translator in Translators)
-                            ImGui.TextUnformatted(translator);
-                    }
-                }
-            }
-        }
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/Appearance.cs

@@ -0,0 +1,292 @@
+using ChatTwo.Code;
+using ChatTwo.Resources;
+using ChatTwo.Util;
+using Dalamud;
+using Dalamud.Interface;
+using Dalamud.Interface.FontIdentifier;
+using Dalamud.Interface.Style;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Bindings.ImGui;
+
+namespace ChatTwo.Ui.SettingsTabs;
+
+internal sealed class Appearance : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    public string Name => HellionStrings.Settings_Tab_Appearance + "###tabs-appearance";
+
+    internal Appearance(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+    }
+
+    public void Draw(bool changed)
+    {
+        DrawThemeSection();
+        ImGui.Spacing();
+        DrawFontsSection();
+        ImGui.Spacing();
+        DrawColoursSection();
+        ImGui.Spacing();
+        DrawTimestampsSection();
+    }
+
+    private void DrawThemeSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Theme_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(HellionStrings.Theme_Enabled_Name, ref Mutable.HellionThemeEnabled);
+            ImGuiUtil.HelpMarker(HellionStrings.Theme_Enabled_Description);
+
+            // Clamp 0.5–1.0 stays consistent with Privacy.cs which already
+            // shipped this slider; lower values would let chat windows
+            // disappear behind game UI.
+            using (ImRaii.Disabled(!Mutable.HellionThemeEnabled))
+            {
+                ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
+                var opacity = Mutable.HellionThemeWindowOpacity;
+                if (ImGui.SliderFloat($"{HellionStrings.Theme_WindowOpacity_Label}##theme-opacity", ref opacity, 0.5f, 1.0f, "%.2f"))
+                {
+                    Mutable.HellionThemeWindowOpacity = Math.Clamp(opacity, 0.5f, 1.0f);
+                }
+                ImGuiUtil.HelpMarker(HellionStrings.Theme_WindowOpacity_Help);
+            }
+
+            ImGui.Spacing();
+
+            ImGui.Checkbox(Language.Options_OverrideStyle_Name, ref Mutable.OverrideStyle);
+            ImGuiUtil.HelpMarker(Language.Options_OverrideStyle_Name_Desc);
+
+            if (Mutable.OverrideStyle)
+            {
+                DrawStyleCombo();
+            }
+
+            // The Bestand-Slider WindowAlpha targets the chat log window's
+            // background only. The Hellion theme opacity above already covers
+            // every plugin window globally, so the two sliders fight each
+            // other when the theme is active. Disable the legacy slider in
+            // that case to make Hellion theme the single source of truth.
+            using (ImRaii.Disabled(Mutable.HellionThemeEnabled))
+            {
+                ImGuiUtil.DragFloatVertical(Language.Options_WindowOpacity_Name, ref Mutable.WindowAlpha, .25f, 0f, 100f, $"{Mutable.WindowAlpha:N2}%%", ImGuiSliderFlags.AlwaysClamp);
+            }
+        }
+    }
+
+    private void DrawStyleCombo()
+    {
+        var styles = StyleModel.GetConfiguredStyles();
+        if (styles == null)
+        {
+            ImGui.TextUnformatted(Language.Options_OverrideStyle_NotAvailable);
+            return;
+        }
+
+        var currentStyle = Mutable.ChosenStyle ?? Language.Options_OverrideStyle_NotSelected;
+        using var combo = ImRaii.Combo(Language.Options_OverrideStyleDropdown_Name, currentStyle);
+        if (!combo)
+        {
+            return;
+        }
+
+        foreach (var style in styles)
+        {
+            if (ImGui.Selectable(style.Name, Mutable.ChosenStyle == style.Name))
+            {
+                Mutable.ChosenStyle = style.Name;
+            }
+        }
+    }
+
+    private void DrawFontsSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Fonts_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            if (ImGui.Checkbox(HellionStrings.Theme_UseHellionFont_Name, ref Mutable.UseHellionFont))
+            {
+                // Mutex with the Bestand custom-font stack. Leaving FontsEnabled
+                // checked alongside UseHellionFont made both checkboxes look
+                // active even though the lower stack was greyed out, which
+                // confused the user during the v0.5.0 walkthrough.
+                if (Mutable.UseHellionFont)
+                    Mutable.FontsEnabled = false;
+            }
+            ImGuiUtil.HelpMarker(HellionStrings.Theme_UseHellionFont_Description);
+            ImGui.Spacing();
+
+            using var fontDisabled = ImRaii.Disabled(Mutable.UseHellionFont);
+
+            ImGui.Checkbox(Language.Options_FontsEnabled, ref Mutable.FontsEnabled);
+            ImGui.Spacing();
+
+            var unused = false;
+            if (!Mutable.FontsEnabled)
+            {
+                ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2);
+            }
+            else
+            {
+                var globalChooser = ImGuiUtil.FontChooser(Language.Options_Font_Name, Mutable.GlobalFontV2, false, ref unused);
+                globalChooser?.ResultTask.ContinueWith(r =>
+                {
+                    if (r.IsCompletedSuccessfully)
+                    {
+                        Plugin.Framework.Run(() => Mutable.GlobalFontV2 = r.Result);
+                    }
+                });
+                ImGui.SameLine();
+                if (ImGui.Button("Reset##global"))
+                {
+                    Mutable.GlobalFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f };
+                }
+
+                ImGuiUtil.HelpMarker(string.Format(Language.Options_Font_Description, Plugin.PluginName));
+                ImGuiUtil.WarningText(Language.Options_Font_Warning);
+                ImGui.Spacing();
+
+                // LocaleNames being null means it is likely a game font which all support JP symbols.
+                var japaneseChooser = ImGuiUtil.FontChooser(Language.Options_JapaneseFont_Name, Mutable.JapaneseFontV2, false, ref unused, id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false, "いろはにほへと   ちりぬるを");
+                japaneseChooser?.ResultTask.ContinueWith(r =>
+                {
+                    if (r.IsCompletedSuccessfully)
+                    {
+                        Plugin.Framework.Run(() => Mutable.JapaneseFontV2 = r.Result);
+                    }
+                });
+                ImGui.SameLine();
+                if (ImGui.Button("Reset##japanese"))
+                {
+                    Mutable.JapaneseFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkMedium), SizePt = 12.75f };
+                }
+
+                ImGuiUtil.HelpMarker(string.Format(Language.Options_JapaneseFont_Description, Plugin.PluginName));
+                ImGui.Spacing();
+
+                var italicChooser = ImGuiUtil.FontChooser(Language.Options_ItalicFont_Name, Mutable.ItalicFontV2, true, ref Mutable.ItalicEnabled);
+                italicChooser?.ResultTask.ContinueWith(r =>
+                {
+                    if (r.IsCompletedSuccessfully)
+                    {
+                        Plugin.Framework.Run(() => Mutable.ItalicFontV2 = r.Result);
+                    }
+                });
+                ImGui.SameLine();
+                if (ImGui.Button("Reset##italic"))
+                {
+                    Mutable.ItalicEnabled = false;
+                    Mutable.ItalicFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f };
+                }
+
+                ImGuiUtil.HelpMarker(string.Format(Language.Options_Italic_Description, Plugin.PluginName));
+                ImGui.Spacing();
+
+                if (ImGui.CollapsingHeader(Language.Options_ExtraGlyphs_Name))
+                {
+                    ImGuiUtil.HelpMarker(string.Format(Language.Options_ExtraGlyphs_Description, Plugin.PluginName));
+
+                    var range = (int)Mutable.ExtraGlyphRanges;
+                    foreach (var extra in Enum.GetValues<ExtraGlyphRanges>())
+                    {
+                        ImGui.CheckboxFlags(extra.Name(), ref range, (int)extra);
+                    }
+
+                    Mutable.ExtraGlyphRanges = (ExtraGlyphRanges)range;
+                }
+
+                ImGui.Spacing();
+            }
+
+            ImGuiUtil.FontSizeCombo(Language.Options_SymbolsFontSize_Name, ref Mutable.SymbolsFontSizeV2);
+            ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description);
+
+            ImGui.Spacing();
+        }
+    }
+
+    private void DrawColoursSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Colours_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            foreach (var (_, types) in ChatTypeExt.SortOrder)
+            {
+                foreach (var type in types)
+                {
+                    if (ImGuiUtil.IconButton(FontAwesomeIcon.UndoAlt, $"{type}", Language.Options_ChatColours_Reset))
+                    {
+                        Mutable.ChatColours.Remove(type);
+                    }
+
+                    ImGui.SameLine();
+
+                    if (ImGuiUtil.IconButton(FontAwesomeIcon.LongArrowAltDown, $"{type}", Language.Options_ChatColours_Import))
+                    {
+                        var gameColour = Plugin.Functions.Chat.GetChannelColor(type);
+                        Mutable.ChatColours[type] = gameColour ?? type.DefaultColor() ?? 0;
+                    }
+
+                    ImGui.SameLine();
+
+                    var vec = Mutable.ChatColours.TryGetValue(type, out var colour)
+                        ? ColourUtil.RgbaToVector3(colour)
+                        : ColourUtil.RgbaToVector3(type.DefaultColor() ?? 0);
+                    if (ImGui.ColorEdit3(type.Name(), ref vec, ImGuiColorEditFlags.NoInputs))
+                    {
+                        Mutable.ChatColours[type] = ColourUtil.Vector3ToRgba(vec);
+                    }
+                }
+            }
+
+            ImGui.Spacing();
+        }
+    }
+
+    private void DrawTimestampsSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Timestamps_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_PrettierTimestamps_Name, ref Mutable.PrettierTimestamps);
+            ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description);
+
+            if (Mutable.PrettierTimestamps)
+            {
+                ImGui.Checkbox(Language.Options_MoreCompactPretty_Name, ref Mutable.MoreCompactPretty);
+                ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description);
+
+                ImGui.Checkbox(Language.Options_HideSameTimestamps_Name, ref Mutable.HideSameTimestamps);
+                ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description);
+            }
+
+            ImGui.Checkbox(Language.Options_Use24HourClock_Name, ref Mutable.Use24HourClock);
+            ImGuiUtil.HelpMarker(Language.Options_Use24HourClock_Description);
+        }
+    }
+}

ChatTwo/Ui/SettingsTabs/Changelog.cs

@@ -1,51 +0,0 @@
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Interface.Utility.Raii;
-using Dalamud.Bindings.ImGui;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class Changelog : ISettingsTab
-{
-    private Configuration Mutable { get; }
-
-    public string Name => Language.Options_Changelog_Tab + "###tabs-changelog";
-
-    internal Changelog(Configuration mutable)
-    {
-        Mutable = mutable;
-    }
-
-    public void Draw(bool changed)
-    {
-        using var wrap = ImRaii.TextWrapPos(0.0f);
-
-        ImGui.TextUnformatted(Language.Options_Warning_NotImplemented);
-        ImGuiUtil.OptionCheckbox(ref Mutable.PrintChangelog, Language.Options_PrintChangelog_Name, Language.Options_PrintChangelog_Description);
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        var changelog = Plugin.Interface.Manifest.Changelog;
-        if (changelog != null)
-        {
-            ImGui.TextUnformatted(Language.Options_Changelog_Header);
-            ImGui.TextUnformatted($"Version {Plugin.Interface.Manifest.AssemblyVersion.ToString(3)}");
-            ImGui.Spacing();
-            foreach (var sentence in changelog.Split("\n"))
-            {
-                if (sentence == string.Empty)
-                {
-                    ImGui.NewLine();
-                    continue;
-                }
-
-                var condition = sentence.StartsWith('-') || sentence.StartsWith("  -");
-                using var indent = ImRaii.PushIndent(10.0f, true, condition);
-                ImGui.TextUnformatted(sentence);
-            }
-        }
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/Chat.cs

@@ -0,0 +1,234 @@
+using System.Numerics;
+using ChatTwo.Resources;
+using ChatTwo.Util;
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Bindings.ImGui;
+
+namespace ChatTwo.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.
+internal sealed class Chat : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    public string Name => HellionStrings.Settings_Tab_Chat + "###tabs-chat";
+
+    private SearchSelector.SelectorPopupOptions WordPopupOptions;
+
+    internal Chat(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+
+        WordPopupOptions = RefillSheet();
+    }
+
+    private SearchSelector.SelectorPopupOptions RefillSheet()
+    {
+        return new SearchSelector.SelectorPopupOptions
+        {
+            FilteredSheet = EmoteCache.SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w)).ToArray()
+        };
+    }
+
+    public void Draw(bool changed)
+    {
+        DrawAutoTellTabsSection();
+        ImGui.Spacing();
+        DrawBehaviourSection();
+        ImGui.Spacing();
+        DrawPreviewSection();
+        ImGui.Spacing();
+        DrawEmotesSection();
+    }
+
+    private void DrawAutoTellTabsSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_AutoTellTabs_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_Enable_Name, ref Mutable.EnableAutoTellTabs);
+            ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Enable_Description);
+
+            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(HellionStrings.ChatLog_AutoTellTabs_Compact_Name, ref Mutable.AutoTellTabsCompactDisplay);
+            ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Compact_Description);
+
+            ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Name, ref Mutable.AutoTellTabsShowGreetedToggle);
+            ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Description);
+
+            ImGui.Spacing();
+            ImGuiUtil.HelpText(HellionStrings.ChatLog_AutoTellTabs_PreloadHint);
+
+            ImGui.Spacing();
+            ImGuiUtil.WarningText(HellionStrings.ChatLog_AutoTellTabs_ConflictHint);
+        }
+    }
+
+    private void DrawBehaviourSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Behaviour_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_CollapseDuplicateMessages_Name, ref Mutable.CollapseDuplicateMessages);
+            ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMessages_Description);
+
+            if (Mutable.CollapseDuplicateMessages)
+            {
+                ImGui.Checkbox(Language.Options_CollapseDuplicateMsgUniqueLink_Name, ref Mutable.CollapseKeepUniqueLinks);
+                ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMsgUniqueLink_Description);
+            }
+        }
+    }
+
+    private void DrawPreviewSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Preview_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Preview_Name, Mutable.PreviewPosition.Name()))
+            {
+                if (combo)
+                {
+                    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 (ImGuiUtil.InputIntVertical(Language.Options_PreviewMinimum_Name, Language.Options_PreviewMinimum_Description, 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);
+        }
+    }
+
+    private void DrawEmotesSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Emotes_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_ShowEmotes_Name, ref Mutable.ShowEmotes);
+            ImGuiUtil.HelpMarker(Language.Options_ShowEmotes_Desc);
+
+            ImGui.Spacing();
+            ImGui.TextUnformatted(Language.Options_Emote_BlockedEmotes);
+            ImGui.Spacing();
+
+            if (EmoteCache.State is EmoteCache.LoadingState.Done && WordPopupOptions.FilteredSheet.Length == 0)
+            {
+                WordPopupOptions = RefillSheet();
+            }
+
+            var buttonWidth = ImGui.GetContentRegionAvail().X / 3;
+            using (Plugin.FontManager.FontAwesome.Push())
+                ImGui.Button(FontAwesomeIcon.Plus.ToIconString(), new Vector2(buttonWidth, 0));
+
+            if (SearchSelector.SelectorPopup("WordAddPopup", out var newWord, WordPopupOptions))
+            {
+                Mutable.BlockedEmotes.Add(newWord);
+            }
+
+            using (var table = ImRaii.Table("##BlockedWords", 2, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner))
+            {
+                if (table)
+                {
+                    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)
+                    {
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted(word);
+
+                        ImGui.TableNextColumn();
+                        if (ImGuiUtil.Button($"##{word}Del", FontAwesomeIcon.Trash, !ImGui.GetIO().KeyCtrl))
+                        {
+                            Mutable.BlockedEmotes.Remove(word);
+                        }
+                    }
+                }
+            }
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            ImGui.TextUnformatted(Language.Options_Emote_EmoteStats);
+            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", 5, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner))
+            {
+                if (emoteTable)
+                {
+                    ImGui.TableSetupColumn("##word1");
+                    ImGui.TableSetupColumn("##word2");
+                    ImGui.TableSetupColumn("##word3");
+                    ImGui.TableSetupColumn("##word4");
+                    ImGui.TableSetupColumn("##word5");
+
+                    foreach (var word in EmoteCache.SortedCodeArray)
+                    {
+                        ImGui.TableNextColumn();
+                        ImGui.TextUnformatted(word);
+                    }
+                }
+            }
+        }
+    }
+}

ChatTwo/Ui/SettingsTabs/ChatColours.cs

@@ -1,69 +0,0 @@
-using ChatTwo.Code;
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Interface;
-using Dalamud.Bindings.ImGui;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class ChatColours : ISettingsTab
-{
-    private Plugin Plugin { get; }
-    private Configuration Mutable { get; }
-
-    public string Name => Language.Options_ChatColours_Tab + "###tabs-chat-colours";
-
-    internal ChatColours(Plugin plugin, Configuration mutable)
-    {
-        Plugin = plugin;
-        Mutable = mutable;
-
-        #if DEBUG
-        // Users can set colours for ExtraChat linkshells in the ExtraChat plugin directly.
-        var sortable = ChatTypeExt.SortOrder
-            .SelectMany(entry => entry.Item2)
-            .Where(type => !type.IsGm() && !type.IsExtraChatLinkshell())
-            .ToHashSet();
-        var total = Enum.GetValues<ChatType>()
-            .Where(type => !type.IsGm() && !type.IsExtraChatLinkshell())
-            .ToHashSet();
-        if (sortable.Count != total.Count)
-        {
-            Plugin.Log.Warning($"There are {sortable.Count} sortable channels, but there are {total.Count} total channels.");
-            total.ExceptWith(sortable);
-            foreach (var missing in total)
-                Plugin.Log.Information($"Missing {missing}");
-        }
-        #endif
-    }
-
-    public void Draw(bool changed)
-    {
-        foreach (var (_, types) in ChatTypeExt.SortOrder)
-        {
-            foreach (var type in types)
-            {
-                if (ImGuiUtil.IconButton(FontAwesomeIcon.UndoAlt, $"{type}", Language.Options_ChatColours_Reset))
-                    Mutable.ChatColours.Remove(type);
-
-                ImGui.SameLine();
-
-                if (ImGuiUtil.IconButton(FontAwesomeIcon.LongArrowAltDown, $"{type}", Language.Options_ChatColours_Import))
-                {
-                    var gameColour = Plugin.Functions.Chat.GetChannelColor(type);
-                    Mutable.ChatColours[type] = gameColour ?? type.DefaultColor() ?? 0;
-                }
-
-                ImGui.SameLine();
-
-                var vec = Mutable.ChatColours.TryGetValue(type, out var colour)
-                    ? ColourUtil.RgbaToVector3(colour)
-                    : ColourUtil.RgbaToVector3(type.DefaultColor() ?? 0);
-                if (ImGui.ColorEdit3(type.Name(), ref vec, ImGuiColorEditFlags.NoInputs))
-                    Mutable.ChatColours[type] = ColourUtil.Vector3ToRgba(vec);
-            }
-        }
-
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/ChatLog.cs

@@ -1,119 +0,0 @@
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Interface.Style;
-using Dalamud.Interface.Utility.Raii;
-using Dalamud.Bindings.ImGui;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class ChatLog : ISettingsTab
-{
-    private readonly Plugin Plugin;
-    private Configuration Mutable { get; }
-
-    public string Name => Language.Options_ChatLog_Tab + "###tabs-chatlog";
-
-    internal ChatLog(Plugin plugin, Configuration mutable)
-    {
-        Plugin = plugin;
-        Mutable = mutable;
-    }
-
-    public void Draw(bool changed)
-    {
-        using (ImRaii.TextWrapPos(0.0f))
-        {
-            ImGuiUtil.OptionCheckbox(ref Mutable.KeepInputFocus, Language.Options_KeepInputFocus_Name, Language.Options_KeepInputFocus_Description);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.PlaySounds, Language.Options_PlaySounds_Name, Language.Options_PlaySounds_Description);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.SidebarTabView, Language.Options_SidebarTabView_Name, string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName));
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.ShowNoviceNetwork, Language.Options_ShowNoviceNetwork_Name, Language.Options_ShowNoviceNetwork_Description);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.ShowHideButton, Language.Options_ShowHideButton_Name, Language.Options_ShowHideButton_Description);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.NativeItemTooltips, Language.Options_NativeItemTooltips_Name, string.Format(Language.Options_NativeItemTooltips_Description, Plugin.PluginName));
-            ImGui.Spacing();
-
-            if (Mutable.NativeItemTooltips)
-            {
-                ImGuiUtil.DragFloatVertical(Language.Options_TooltipOffset_Name, Language.Options_TooltipOffset_Desc, ref Mutable.TooltipOffset, 1, 0f, 400f, $"{Mutable.TooltipOffset:N0}px", ImGuiSliderFlags.AlwaysClamp);
-                ImGui.Spacing();
-            }
-
-            ImGuiUtil.DragFloatVertical(Language.Options_WindowOpacity_Name, ref Mutable.WindowAlpha, .25f, 0f, 100f, $"{Mutable.WindowAlpha:N2}%%", ImGuiSliderFlags.AlwaysClamp);
-            ImGui.Spacing();
-
-            if (ImGuiUtil.InputIntVertical(Language.Options_MaxLinesToShow_Name, Language.Options_MaxLinesToShow_Description, ref Mutable.MaxLinesToRender))
-                Mutable.MaxLinesToRender = Math.Clamp(Mutable.MaxLinesToRender, 1, 10_000);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.CanMove, Language.Options_CanMove_Name);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.CanResize, Language.Options_CanResize_Name);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.ShowTitleBar, Language.Options_ShowTitleBar_Name);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.ShowPopOutTitleBar, Language.Options_ShowPopOutTitleBar_Name);
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(ref Mutable.OverrideStyle, Language.Options_OverrideStyle_Name, Language.Options_OverrideStyle_Name_Desc);
-            ImGui.Spacing();
-
-            ImGui.Spacing();
-            ImGui.Separator();
-            ImGui.Spacing();
-
-            ImGui.TextUnformatted(Language.Options_ChatTabForwardKeybind_Name);
-            ImGui.SetNextItemWidth(-1);
-            ImGuiUtil.KeybindInput("ChatTabForwardKeybind", ref Mutable.ChatTabForward);
-
-            ImGui.TextUnformatted(Language.Options_ChatTabBackwardKeybind_Name);
-            ImGui.SetNextItemWidth(-1);
-            ImGuiUtil.KeybindInput("ChatTabBackwardKeybind", ref Mutable.ChatTabBackward);
-
-            ImGui.Spacing();
-            ImGui.Separator();
-            ImGui.Spacing();
-
-            ImGui.TextUnformatted(Language.Options_AdjustPosition_Name);
-            ImGui.SetNextItemWidth(-1);
-            var pos = Plugin.ChatLogWindow.LastWindowPos;
-            if (ImGui.DragFloat2($"##{Language.Options_AdjustPosition_Name}", ref pos, 1, 0, float.MaxValue, "%.0fpx"))
-                Plugin.ChatLogWindow.Position = pos;
-            ImGuiUtil.WarningText(Language.Options_AdjustPosition_Warning);
-            ImGui.Spacing();
-        }
-
-        if (!Mutable.OverrideStyle)
-            return;
-
-        var styles = StyleModel.GetConfiguredStyles();
-        if (styles == null)
-        {
-            ImGui.TextUnformatted(Language.Options_OverrideStyle_NotAvailable);
-            ImGui.Spacing();
-            return;
-        }
-
-        var currentStyle = Mutable.ChosenStyle ?? Language.Options_OverrideStyle_NotSelected;
-        using var combo = ImRaii.Combo(Language.Options_OverrideStyleDropdown_Name, currentStyle);
-        if (combo)
-        {
-            foreach (var style in styles)
-                if (ImGui.Selectable(style.Name, Mutable.ChosenStyle == style.Name))
-                    Mutable.ChosenStyle = style.Name;
-        }
-
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/Database.cs

@@ -16,7 +16,7 @@ internal sealed class Database : ISettingsTab
     private Plugin Plugin { get; }
     private Configuration Mutable { get; }
 
-    public string Name => Language.Options_Database_Tab + "###tabs-database";
+    public string Name => HellionStrings.Settings_Tab_Database + "###tabs-database";
 
     internal Database(Plugin plugin, Configuration mutable)
     {
@@ -33,56 +33,76 @@ internal sealed class Database : ISettingsTab
 
     public void Draw(bool changed)
     {
+        // Shift-on-open keeps the Advanced tools available without a permanent
+        // toggle in the UI, mirroring upstream Chat 2 behaviour.
         if (changed)
             ShowAdvanced = ImGui.GetIO().KeyShift;
 
-        ImGuiUtil.OptionCheckbox(ref Mutable.DatabaseBattleMessages, Language.Options_DatabaseBattleMessages_Name, Language.Options_DatabaseBattleMessages_Description);
+        DrawStorageSection();
         ImGui.Spacing();
-
-        if (ImGuiUtil.OptionCheckbox(ref Mutable.LoadPreviousSession, Language.Options_LoadPreviousSession_Name, Language.Options_LoadPreviousSession_Description))
-            if (Mutable.LoadPreviousSession)
-                Mutable.FilterIncludePreviousSessions = true;
-
+        DrawViewerSection();
         ImGui.Spacing();
+        DrawStatsSection();
+    }
 
-        if (ImGuiUtil.OptionCheckbox(ref Mutable.FilterIncludePreviousSessions, Language.Options_FilterIncludePreviousSessions_Name, Language.Options_FilterIncludePreviousSessions_Description))
-            if (!Mutable.FilterIncludePreviousSessions)
-                Mutable.LoadPreviousSession = false;
+    private void DrawStorageSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Storage_Heading);
+        if (!tree.Success)
+            return;
 
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
-        var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db"));
-        if (old.Exists || migratedOld.Exists)
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
-            ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
-            ImGui.Spacing();
+            ImGui.Checkbox(Language.Options_DatabaseBattleMessages_Name, ref Mutable.DatabaseBattleMessages);
+            ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description);
 
-            if (ImGuiUtil.CtrlShiftButton(Language.Options_Database_Old_Delete, Language.Options_Database_Old_Delete_Tooltip))
+            if (ImGui.Checkbox(Language.Options_LoadPreviousSession_Name, ref Mutable.LoadPreviousSession))
+                if (Mutable.LoadPreviousSession)
+                    Mutable.FilterIncludePreviousSessions = true;
+            ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description);
+
+            if (ImGui.Checkbox(Language.Options_FilterIncludePreviousSessions_Name, ref Mutable.FilterIncludePreviousSessions))
+                if (!Mutable.FilterIncludePreviousSessions)
+                    Mutable.LoadPreviousSession = false;
+            ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description);
+
+            var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
+            var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db"));
+            if (old.Exists || migratedOld.Exists)
             {
-                try
+                ImGui.Spacing();
+                ImGui.Separator();
+                ImGui.Spacing();
+
+                ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
+                ImGui.Spacing();
+
+                if (ImGuiUtil.CtrlShiftButton(Language.Options_Database_Old_Delete, Language.Options_Database_Old_Delete_Tooltip))
                 {
-                    if (old.Exists)
-                        old.Delete();
-                    else
-                        migratedOld.Delete();
-                    WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Success, NotificationType.Success);
-                }
-                catch (Exception e)
-                {
-                    Plugin.Log.Error(e, "Unable to delete old database");
-                    WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error);
+                    try
+                    {
+                        if (old.Exists)
+                            old.Delete();
+                        else
+                            migratedOld.Delete();
+                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Success, NotificationType.Success);
+                    }
+                    catch (Exception e)
+                    {
+                        Plugin.Log.Error(e, "Unable to delete old database");
+                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error);
+                    }
                 }
             }
-
-            ImGui.Spacing();
-            ImGui.Separator();
-            ImGui.Spacing();
         }
+    }
+
+    private void DrawViewerSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Viewer_Heading);
+        if (!tree.Success)
+            return;
 
-        ImGui.TextUnformatted(Language.Options_Database_Metadata_Heading);
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
             // Refresh the database size and message count every 5 seconds to avoid
@@ -132,28 +152,34 @@ internal sealed class Database : ISettingsTab
                 WrapperUtil.AddNotification(Language.Options_ClearDatabase_Success, NotificationType.Info);
             }
         }
+    }
 
-        ImGui.Spacing();
-
+    private void DrawStatsSection()
+    {
         if (!ShowAdvanced)
             return;
 
-        using var treeNode = ImRaii.TreeNode(Language.Options_Database_Advanced);
-        using var wrap = ImRaii.TextWrapPos(0.0f);
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Stats_Heading);
+        if (!tree.Success)
+            return;
 
-        ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning);
-        if (ImGuiUtil.CtrlShiftButton("Perform maintenance", "Ctrl+Shift: MessageManager.Store.PerformMaintenance()"))
-            Plugin.MessageManager.Store.PerformMaintenance();
-
-        if (ImGuiUtil.CtrlShiftButton("Reload messages from database", "Ctrl+Shift: MessageManager.FilterAllTabs()"))
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
-            Plugin.MessageManager.ClearAllTabs();
-            Plugin.MessageManager.FilterAllTabsAsync();
-        }
+            using var wrap = ImRaii.TextWrapPos(0.0f);
 
-        if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)"))
-            new Thread(() => InsertMessages(10_000)).Start();
-        ImGui.Spacing();
+            ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning);
+            if (ImGuiUtil.CtrlShiftButton("Perform maintenance", "Ctrl+Shift: MessageManager.Store.PerformMaintenance()"))
+                Plugin.MessageManager.Store.PerformMaintenance();
+
+            if (ImGuiUtil.CtrlShiftButton("Reload messages from database", "Ctrl+Shift: MessageManager.FilterAllTabs()"))
+            {
+                Plugin.MessageManager.ClearAllTabs();
+                Plugin.MessageManager.FilterAllTabsAsync();
+            }
+
+            if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)"))
+                new Thread(() => InsertMessages(10_000)).Start();
+        }
     }
 
     private void InsertMessages(int count)

ChatTwo/Ui/SettingsTabs/Display.cs

@@ -1,116 +0,0 @@
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Interface.Utility.Raii;
-using Dalamud.Bindings.ImGui;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class Display : ISettingsTab
-{
-    private Configuration Mutable { get; }
-
-    public string Name => Language.Options_Display_Tab + "###tabs-display";
-
-    internal Display(Configuration mutable)
-    {
-        Mutable = mutable;
-    }
-
-    public void Draw(bool changed)
-    {
-        using var wrap = ImRaii.TextWrapPos(0.0f);
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.HideChat, Language.Options_HideChat_Name, Language.Options_HideChat_Description);
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.HideDuringCutscenes, Language.Options_HideDuringCutscenes_Name, string.Format(Language.Options_HideDuringCutscenes_Description, Plugin.PluginName));
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.HideWhenNotLoggedIn, Language.Options_HideWhenNotLoggedIn_Name, string.Format(Language.Options_HideWhenNotLoggedIn_Description, Plugin.PluginName));
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.HideWhenUiHidden, Language.Options_HideWhenUiHidden_Name, string.Format(Language.Options_HideWhenUiHidden_Description, Plugin.PluginName));
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.HideInLoadingScreens, Language.Options_HideInLoadingScreens_Name, string.Format(Language.Options_HideInLoadingScreens_Description, Plugin.PluginName));
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.HideInBattle, Language.Options_HideInBattle_Name, Language.Options_HideInBattle_Description);
-        ImGui.Spacing();
-
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.HideWhenInactive, Language.Options_HideWhenInactive_Name, Language.Options_HideWhenInactive_Description);
-        ImGui.Spacing();
-
-        if (Mutable.HideWhenInactive)
-        {
-            using var _ = ImRaii.PushIndent();
-            ImGuiUtil.InputIntVertical(Language.Options_InactivityHideTimeout_Name,
-                Language.Options_InactivityHideTimeout_Description, ref Mutable.InactivityHideTimeout, 1, 10);
-            // Enforce a minimum of 2 seconds to avoid people soft locking
-            // themselves.
-            Mutable.InactivityHideTimeout = Math.Max(2, Mutable.InactivityHideTimeout);
-            ImGui.Spacing();
-
-            // This setting conflicts with HideInBattle, so it's disabled.
-            using (ImRaii.Disabled(Mutable.HideInBattle))
-            {
-                ImGuiUtil.OptionCheckbox(ref Mutable.InactivityHideActiveDuringBattle,
-                    Language.Options_InactivityHideActiveDuringBattle_Name,
-                    Language.Options_InactivityHideActiveDuringBattle_Description);
-                ImGui.Spacing();
-            }
-
-            using var channelTree = ImRaii.TreeNode(Language.Options_InactivityHideChannels_Name);
-            if (channelTree.Success)
-            {
-                if (ImGuiUtil.CtrlShiftButton(Language.Options_InactivityHideChannels_All_Label, Language.Options_InactivityHideChannels_Button_Tooltip))
-                {
-                    Mutable.InactivityHideChannelsV2 = TabsUtil.AllChannels();
-                    Mutable.InactivityHideExtraChatAll = true;
-                    Mutable.InactivityHideExtraChatChannels = [];
-                }
-
-                ImGui.SameLine();
-                if (ImGuiUtil.CtrlShiftButton(Language.Options_InactivityHideChannels_None_Label, Language.Options_InactivityHideChannels_Button_Tooltip))
-                {
-                    Mutable.InactivityHideChannelsV2 = [];
-                    Mutable.InactivityHideExtraChatAll = false;
-                    Mutable.InactivityHideExtraChatChannels = [];
-                }
-
-                ImGui.Spacing();
-
-                ImGuiUtil.ChannelSelector(Language.Options_Tabs_Channels, Mutable.InactivityHideChannelsV2);
-                ImGuiUtil.ExtraChatSelector(Language.Options_Tabs_ExtraChatChannels,
-                    ref Mutable.InactivityHideExtraChatAll, Mutable.InactivityHideExtraChatChannels);
-            }
-            ImGui.Spacing();
-        }
-
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.Use24HourClock, Language.Options_Use24HourClock_Name, Language.Options_Use24HourClock_Description);
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.PrettierTimestamps, Language.Options_PrettierTimestamps_Name, Language.Options_PrettierTimestamps_Description);
-
-        if (Mutable.PrettierTimestamps)
-        {
-            using var _ = ImRaii.PushIndent();
-            ImGuiUtil.OptionCheckbox(ref Mutable.MoreCompactPretty, Language.Options_MoreCompactPretty_Name, Language.Options_MoreCompactPretty_Description);
-            ImGuiUtil.OptionCheckbox(ref Mutable.HideSameTimestamps, Language.Options_HideSameTimestamps_Name, Language.Options_HideSameTimestamps_Description);
-        }
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.CollapseDuplicateMessages, Language.Options_CollapseDuplicateMessages_Name, Language.Options_CollapseDuplicateMessages_Description);
-        if (Mutable.CollapseDuplicateMessages)
-        {
-            using var _ = ImRaii.PushIndent();
-            ImGuiUtil.OptionCheckbox(ref Mutable.CollapseKeepUniqueLinks, Language.Options_CollapseDuplicateMsgUniqueLink_Name, Language.Options_CollapseDuplicateMsgUniqueLink_Description);
-        }
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/Emote.cs

@@ -1,113 +0,0 @@
-using System.Numerics;
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Interface;
-using Dalamud.Interface.Colors;
-using Dalamud.Interface.Utility.Raii;
-using Dalamud.Bindings.ImGui;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class Emote : ISettingsTab
-{
-    private readonly Plugin Plugin;
-    private Configuration Mutable { get; }
-
-    public string Name => Language.Options_Emote_Tab + "###tabs-emote";
-
-    private static SearchSelector.SelectorPopupOptions? WordPopupOptions;
-
-    internal Emote(Plugin plugin, Configuration mutable)
-    {
-        Plugin = plugin;
-        Mutable = mutable;
-
-        WordPopupOptions = new SearchSelector.SelectorPopupOptions
-        {
-            FilteredSheet = EmoteCache.SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w)).ToArray()
-        };
-    }
-
-    private SearchSelector.SelectorPopupOptions RefillSheet()
-    {
-        return new SearchSelector.SelectorPopupOptions
-        {
-            FilteredSheet = EmoteCache.SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w)).ToArray()
-        };
-    }
-
-    public void Draw(bool changed)
-    {
-        using var wrap = ImRaii.TextWrapPos(0.0f);
-
-        ImGuiUtil.OptionCheckbox(ref Mutable.ShowEmotes, Language.Options_ShowEmotes_Name, Language.Options_ShowEmotes_Desc);
-        ImGui.Spacing();
-
-        ImGui.TextUnformatted(Language.Options_Emote_BlockedEmotes);
-        ImGui.Spacing();
-
-        WordPopupOptions ??= RefillSheet();
-        if (EmoteCache.State is EmoteCache.LoadingState.Done && WordPopupOptions.FilteredSheet.Length == 0)
-            WordPopupOptions = RefillSheet();
-
-        var buttonWidth = ImGui.GetContentRegionAvail().X / 3;
-        using (Plugin.FontManager.FontAwesome.Push())
-            ImGui.Button(FontAwesomeIcon.Plus.ToIconString(), new Vector2(buttonWidth, 0));
-
-        if (SearchSelector.SelectorPopup("WordAddPopup", out var newWord, WordPopupOptions))
-            Mutable.BlockedEmotes.Add(newWord);
-
-        using(var table = ImRaii.Table("##BlockedWords", 2, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner))
-        {
-            if (table)
-            {
-                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)
-                {
-                    ImGui.TableNextColumn();
-                    ImGui.TextUnformatted(word);
-
-                    ImGui.TableNextColumn();
-                    if (ImGuiUtil.Button($"##{word}Del", FontAwesomeIcon.Trash, !ImGui.GetIO().KeyCtrl))
-                        Mutable.BlockedEmotes.Remove(word);
-                }
-            }
-        }
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        ImGui.TextUnformatted(Language.Options_Emote_EmoteStats);
-        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", 5, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner))
-        {
-            if (emoteTable)
-            {
-                ImGui.TableSetupColumn("##word1");
-                ImGui.TableSetupColumn("##word2");
-                ImGui.TableSetupColumn("##word3");
-                ImGui.TableSetupColumn("##word4");
-                ImGui.TableSetupColumn("##word5");
-
-                foreach (var word in EmoteCache.SortedCodeArray)
-                {
-                    ImGui.TableNextColumn();
-                    ImGui.TextUnformatted(word);
-                }
-            }
-        }
-    }
-}

ChatTwo/Ui/SettingsTabs/Fonts.cs

@@ -1,97 +0,0 @@
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud;
-using Dalamud.Interface.FontIdentifier;
-using Dalamud.Bindings.ImGui;
-using Dalamud.Interface.Utility.Raii;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-public class Fonts : ISettingsTab
-{
-    private Configuration Mutable { get; }
-
-    public string Name => Language.Options_Fonts_Tab + "###tabs-fonts";
-
-    internal Fonts(Configuration mutable)
-    {
-        Mutable = mutable;
-    }
-
-    public void Draw(bool _)
-    {
-        using var wrap = ImRaii.TextWrapPos(0.0f);
-
-        ImGui.Checkbox(Language.Options_FontsEnabled, ref Mutable.FontsEnabled);
-        ImGui.Spacing();
-
-        if (!Mutable.FontsEnabled)
-        {
-            ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2);
-        }
-        else
-        {
-            var globalChooser = ImGuiUtil.FontChooser(Language.Options_Font_Name, Mutable.GlobalFontV2, false, ref _);
-            globalChooser?.ResultTask.ContinueWith(r =>
-            {
-                if (r.IsCompletedSuccessfully)
-                    Mutable.GlobalFontV2 = r.Result;
-            });
-            ImGui.SameLine();
-            if (ImGui.Button("Reset##global"))
-                Mutable.GlobalFontV2 = new SingleFontSpec{ FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f };
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Font_Description, Plugin.PluginName));
-            ImGuiUtil.WarningText(Language.Options_Font_Warning);
-            ImGui.Spacing();
-
-            // LocaleNames being null means it is likely a game font which all support JP symbols
-            var japaneseChooser = ImGuiUtil.FontChooser(Language.Options_JapaneseFont_Name, Mutable.JapaneseFontV2, false, ref _, id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false, "いろはにほへと   ちりぬるを");
-            japaneseChooser?.ResultTask.ContinueWith(r =>
-            {
-                if (r.IsCompletedSuccessfully)
-                    Mutable.JapaneseFontV2 = r.Result;
-            });
-            ImGui.SameLine();
-            if (ImGui.Button("Reset##japanese"))
-                Mutable.JapaneseFontV2 = new SingleFontSpec{ FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkMedium), SizePt = 12.75f };
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_JapaneseFont_Description, Plugin.PluginName));
-            ImGui.Spacing();
-
-            var italicChooser = ImGuiUtil.FontChooser(Language.Options_ItalicFont_Name, Mutable.ItalicFontV2, true, ref Mutable.ItalicEnabled);
-            italicChooser?.ResultTask.ContinueWith(r =>
-            {
-                if (r.IsCompletedSuccessfully)
-                    Mutable.ItalicFontV2 = r.Result;
-            });
-            ImGui.SameLine();
-            if (ImGui.Button("Reset##italic"))
-            {
-                Mutable.ItalicEnabled = false;
-                Mutable.ItalicFontV2 = new SingleFontSpec{ FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f };
-            }
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Italic_Description, Plugin.PluginName));
-            ImGui.Spacing();
-
-            if (ImGui.CollapsingHeader(Language.Options_ExtraGlyphs_Name))
-            {
-                ImGuiUtil.HelpText(string.Format(Language.Options_ExtraGlyphs_Description, Plugin.PluginName));
-
-                var range = (int) Mutable.ExtraGlyphRanges;
-                foreach (var extra in Enum.GetValues<ExtraGlyphRanges>())
-                    ImGui.CheckboxFlags(extra.Name(), ref range, (int) extra);
-
-                Mutable.ExtraGlyphRanges = (ExtraGlyphRanges) range;
-            }
-
-            ImGui.Spacing();
-        }
-
-        ImGuiUtil.FontSizeCombo(Language.Options_SymbolsFontSize_Name, ref Mutable.SymbolsFontSizeV2);
-        ImGuiUtil.HelpText(Language.Options_SymbolsFontSize_Description);
-
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/General.cs

@@ -0,0 +1,161 @@
+using ChatTwo.Resources;
+using ChatTwo.Util;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Bindings.ImGui;
+
+namespace ChatTwo.Ui.SettingsTabs;
+
+internal sealed class General : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    public string Name => HellionStrings.Settings_Tab_General + "###tabs-general";
+
+    internal General(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+    }
+
+    public void Draw(bool changed)
+    {
+        DrawInputSection();
+        ImGui.Spacing();
+        DrawAudioSection();
+        ImGui.Spacing();
+        DrawPerformanceSection();
+        ImGui.Spacing();
+        DrawLanguageSection();
+    }
+
+    private void DrawInputSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_General_Input_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_KeepInputFocus_Name, ref Mutable.KeepInputFocus);
+            ImGuiUtil.HelpMarker(Language.Options_KeepInputFocus_Description);
+
+            ImGui.Spacing();
+            ImGui.TextUnformatted(Language.Options_ChatTabForwardKeybind_Name);
+            ImGui.SetNextItemWidth(-1);
+            ImGuiUtil.KeybindInput("ChatTabForwardKeybind", ref Mutable.ChatTabForward);
+
+            ImGui.TextUnformatted(Language.Options_ChatTabBackwardKeybind_Name);
+            ImGui.SetNextItemWidth(-1);
+            ImGuiUtil.KeybindInput("ChatTabBackwardKeybind", ref Mutable.ChatTabBackward);
+        }
+    }
+
+    private void DrawAudioSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_General_Audio_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_PlaySounds_Name, ref Mutable.PlaySounds);
+            ImGuiUtil.HelpMarker(Language.Options_PlaySounds_Description);
+
+            ImGui.Checkbox(Language.Options_ShowNoviceNetwork_Name, ref Mutable.ShowNoviceNetwork);
+            ImGuiUtil.HelpMarker(Language.Options_ShowNoviceNetwork_Description);
+        }
+    }
+
+    private void DrawPerformanceSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_General_Performance_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
+            if (ImGui.InputInt(Language.Options_MaxLinesToShow_Name, ref Mutable.MaxLinesToRender))
+            {
+                Mutable.MaxLinesToRender = Math.Clamp(Mutable.MaxLinesToRender, 1, 10_000);
+            }
+            ImGuiUtil.HelpMarker(Language.Options_MaxLinesToShow_Description);
+        }
+    }
+
+    private void DrawLanguageSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_General_Language_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Language_Name, Mutable.LanguageOverride.Name()))
+            {
+                if (combo.Success)
+                {
+                    foreach (var language in Enum.GetValues<LanguageOverride>())
+                    {
+                        if (ImGui.Selectable(language.Name()))
+                        {
+                            Mutable.LanguageOverride = language;
+                        }
+                    }
+                }
+            }
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_Language_Description, Plugin.PluginName));
+            ImGui.Spacing();
+
+            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_CommandHelpSide_Name, Mutable.CommandHelpSide.Name()))
+            {
+                if (combo.Success)
+                {
+                    foreach (var side in Enum.GetValues<CommandHelpSide>())
+                    {
+                        if (ImGui.Selectable(side.Name(), Mutable.CommandHelpSide == side))
+                        {
+                            Mutable.CommandHelpSide = side;
+                        }
+                    }
+                }
+            }
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName));
+            ImGui.Spacing();
+
+            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name()))
+            {
+                if (combo.Success)
+                {
+                    foreach (var mode in Enum.GetValues<KeybindMode>())
+                    {
+                        if (ImGui.Selectable(mode.Name(), Mutable.KeybindMode == mode))
+                        {
+                            Mutable.KeybindMode = mode;
+                        }
+
+                        if (ImGui.IsItemHovered())
+                        {
+                            ImGuiUtil.Tooltip(mode.Tooltip() ?? "");
+                        }
+                    }
+                }
+            }
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName));
+            ImGui.Spacing();
+
+            ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate);
+            ImGuiUtil.HelpMarker(Language.Options_SortAutoTranslate_Description);
+        }
+    }
+}

ChatTwo/Ui/SettingsTabs/Information.cs

@@ -0,0 +1,188 @@
+using ChatTwo.Resources;
+using ChatTwo.Util;
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Bindings.ImGui;
+
+namespace ChatTwo.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.
+internal sealed class Information : ISettingsTab
+{
+    private Configuration Mutable { get; }
+
+    public string Name => HellionStrings.Settings_Tab_Information + "###tabs-information";
+
+    private readonly List<string> Translators =
+    [
+        "q673135110", "Akizem", "d0tiKs",
+        "Moonlight_Everlit", "Dark32", "andreycout",
+        "Button_", "Cali666", "cassandra308",
+        "lokinmodar", "jtabox", "AkiraYorumoto",
+        "MKhayle", "elena.space", "imlisa",
+        "andrei5125", "ShivaMaheshvara", "aislinn87",
+        "nishinatsu051", "lichuyuan", "Risu64",
+        "yummypillow", "witchymary", "Yuzumi",
+        "zomsakura", "Sirayuki"
+    ];
+
+    internal Information(Configuration mutable)
+    {
+        Mutable = mutable;
+        Translators.Sort((a, b) => string.Compare(a.ToLowerInvariant(), b.ToLowerInvariant(), StringComparison.Ordinal));
+    }
+
+    public void Draw(bool changed)
+    {
+        using var wrap = ImRaii.TextWrapPos(0.0f);
+
+        DrawVersionInfoSection();
+        ImGui.Spacing();
+        DrawAboutSection();
+        ImGui.Spacing();
+        DrawChangelogSection();
+    }
+
+    private void DrawVersionInfoSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Information_VersionInfo_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.TextUnformatted(string.Format(Language.Options_About_Opening, Plugin.PluginName));
+
+            ImGuiHelpers.ScaledDummy(10.0f);
+
+            ImGui.TextUnformatted(Language.Options_About_Authors);
+            ImGui.SameLine();
+            ImGui.TextColored(ImGuiColors.ParsedGold, Plugin.Interface.Manifest.Author);
+
+            ImGui.TextUnformatted(Language.Options_About_Discord);
+            ImGui.SameLine();
+            ImGui.TextColored(ImGuiColors.ParsedGold, "@j.j_kazama");
+
+            ImGui.TextUnformatted(Language.Options_About_Version);
+            ImGui.SameLine();
+            ImGui.TextColored(ImGuiColors.ParsedOrange, Plugin.Interface.Manifest.AssemblyVersion.ToString(3));
+
+            ImGuiHelpers.ScaledDummy(10.0f);
+
+            ImGui.TextUnformatted(Language.Options_About_Github_Issues);
+            ImGui.SameLine();
+            if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues"))
+                Dalamud.Utility.Util.OpenLink("https://github.com/JonKazama-Hellion/HellionChat/issues");
+        }
+    }
+
+    private void DrawAboutSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Information_About_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.TextColored(ImGuiColors.ParsedGold, HellionStrings.About_Maintainer_Heading);
+            ImGui.TextUnformatted(HellionStrings.About_Maintainer_Body);
+            ImGui.TextUnformatted(HellionStrings.About_Maintainer_Website_Label);
+            ImGui.SameLine();
+            if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "hellionMedia"))
+                Dalamud.Utility.Util.OpenLink("https://hellion-media.de");
+
+            ImGuiHelpers.ScaledDummy(10.0f);
+
+            ImGui.TextColored(ImGuiColors.ParsedGold, HellionStrings.About_Mission_Heading);
+            ImGui.TextUnformatted(HellionStrings.About_Mission_P1);
+            ImGui.Spacing();
+            ImGui.TextUnformatted(HellionStrings.About_Mission_P2);
+            ImGui.Spacing();
+            ImGui.TextUnformatted(HellionStrings.About_Mission_P3);
+
+            ImGuiHelpers.ScaledDummy(10.0f);
+
+            ImGui.TextColored(ImGuiColors.ParsedGold, HellionStrings.About_BuiltOn_Heading);
+            ImGui.TextUnformatted(HellionStrings.About_BuiltOn_P1);
+            ImGui.Spacing();
+            ImGui.TextUnformatted(HellionStrings.About_BuiltOn_P2);
+            ImGui.Spacing();
+            ImGui.TextUnformatted(HellionStrings.About_BuiltOn_Upstream_Label);
+            ImGui.SameLine();
+            if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "chatTwoUpstream"))
+                Dalamud.Utility.Util.OpenLink("https://github.com/Infiziert90/ChatTwo");
+
+            ImGuiHelpers.ScaledDummy(10.0f);
+
+            ImGui.TextColored(ImGuiColors.ParsedGold, HellionStrings.About_License_Heading);
+            ImGui.TextUnformatted(HellionStrings.About_License_P1);
+            ImGui.TextUnformatted(HellionStrings.About_License_P2);
+            ImGui.TextUnformatted(HellionStrings.About_License_P3);
+
+            ImGuiHelpers.ScaledDummy(10.0f);
+
+            ImGui.TextColored(ImGuiColors.DalamudOrange, HellionStrings.About_SE_Heading);
+            ImGui.TextUnformatted(HellionStrings.About_SE_P1);
+            ImGui.TextUnformatted(HellionStrings.About_SE_P2);
+
+            ImGui.Spacing();
+
+            ImGui.TextColored(ImGuiColors.ParsedGold, HellionStrings.About_Localization_Heading);
+            ImGui.TextUnformatted(HellionStrings.About_Localization_P1);
+            ImGui.TextUnformatted(HellionStrings.About_Localization_P2);
+
+            ImGui.Spacing();
+
+            using (var translatorTree = ImRaii.TreeNode(HellionStrings.About_Translators_TreeNode))
+            {
+                if (translatorTree)
+                {
+                    using var indent = ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false);
+                    foreach (var translator in Translators)
+                        ImGui.TextUnformatted(translator);
+                }
+            }
+        }
+    }
+
+    private void DrawChangelogSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Information_Changelog_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_PrintChangelog_Name, ref Mutable.PrintChangelog);
+            ImGuiUtil.HelpMarker(Language.Options_PrintChangelog_Description);
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            var changelog = Plugin.Interface.Manifest.Changelog;
+            if (changelog == null)
+                return;
+
+            ImGui.TextUnformatted(Language.Options_Changelog_Header);
+            ImGui.TextUnformatted($"Version {Plugin.Interface.Manifest.AssemblyVersion.ToString(3)}");
+            ImGui.Spacing();
+            foreach (var sentence in changelog.Split("\n"))
+            {
+                if (sentence == string.Empty)
+                {
+                    ImGui.NewLine();
+                    continue;
+                }
+
+                var indented = sentence.StartsWith('-') || sentence.StartsWith("  -");
+                using var indent = ImRaii.PushIndent(10.0f, true, indented);
+                ImGui.TextUnformatted(sentence);
+            }
+        }
+    }
+}

ChatTwo/Ui/SettingsTabs/Miscellaneous.cs

@@ -1,62 +0,0 @@
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Bindings.ImGui;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class Miscellaneous(Configuration mutable) : ISettingsTab
-{
-    private Configuration Mutable { get; } = mutable;
-    public string Name => Language.Options_Miscellaneous_Tab + "###tabs-miscellaneous";
-
-    public void Draw(bool changed)
-    {
-        using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Language_Name, Mutable.LanguageOverride.Name()))
-        {
-            if (combo.Success)
-            {
-                foreach (var language in Enum.GetValues<LanguageOverride>())
-                    if (ImGui.Selectable(language.Name()))
-                        Mutable.LanguageOverride = language;
-            }
-        }
-
-        ImGuiUtil.HelpText(string.Format(Language.Options_Language_Description, Plugin.PluginName));
-        ImGui.Spacing();
-
-        using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_CommandHelpSide_Name, Mutable.CommandHelpSide.Name()))
-        {
-            if (combo.Success)
-            {
-                foreach (var side in Enum.GetValues<CommandHelpSide>())
-                    if (ImGui.Selectable(side.Name(), Mutable.CommandHelpSide == side))
-                        Mutable.CommandHelpSide = side;
-            }
-        }
-
-        ImGuiUtil.HelpText(string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName));
-        ImGui.Spacing();
-
-        using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name()))
-        {
-            if (combo.Success)
-            {
-                foreach (var mode in Enum.GetValues<KeybindMode>())
-                {
-                    if (ImGui.Selectable(mode.Name(), Mutable.KeybindMode == mode))
-                        Mutable.KeybindMode = mode;
-
-                    if (ImGui.IsItemHovered())
-                        ImGuiUtil.Tooltip(mode.Tooltip() ?? "");
-                }
-            }
-        }
-
-        ImGuiUtil.HelpText(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName));
-        ImGui.Spacing();
-
-        ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate);
-        ImGuiUtil.HelpText(Language.Options_SortAutoTranslate_Description);
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/Preview.cs

@@ -1,42 +0,0 @@
-using ChatTwo.Resources;
-using ChatTwo.Util;
-using Dalamud.Bindings.ImGui;
-using Dalamud.Interface.Utility.Raii;
-
-namespace ChatTwo.Ui.SettingsTabs;
-
-internal sealed class Preview : ISettingsTab
-{
-    private Configuration Mutable { get; }
-
-    public string Name => $"{Language.Options_Preview_Tab}###tabs-preview";
-
-    internal Preview(Configuration mutable)
-    {
-        Mutable = mutable;
-    }
-
-    public void Draw(bool changed)
-    {
-        using var wrap = ImRaii.TextWrapPos(0.0f);
-
-        using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Preview_Name, Mutable.PreviewPosition.Name()))
-        {
-            if (combo)
-            {
-                foreach (var position in Enum.GetValues<PreviewPosition>())
-                    if (ImGui.Selectable(position.Name(), Mutable.PreviewPosition == position))
-                        Mutable.PreviewPosition = position;
-            }
-        }
-        ImGuiUtil.HelpText(Language.Options_Preview_Description);
-        ImGui.Spacing();
-
-        if (ImGuiUtil.InputIntVertical(Language.Options_PreviewMinimum_Name, Language.Options_PreviewMinimum_Description, ref Mutable.PreviewMinimum))
-            Mutable.PreviewMinimum = Math.Clamp(Mutable.PreviewMinimum, 1, 250);
-        ImGui.Spacing();
-        ImGuiUtil.OptionCheckbox(ref Mutable.OnlyPreviewIf, Language.Options_PreviewOnlyIf_Name, Language.Options_PreviewOnlyIf_Description);
-
-        ImGui.Spacing();
-    }
-}

ChatTwo/Ui/SettingsTabs/Privacy.cs

@@ -3,7 +3,9 @@ using ChatTwo.Export;
 using ChatTwo.Privacy;
 using ChatTwo.Resources;
 using ChatTwo.Util;
+using Dalamud.Interface.Colors;
 using Dalamud.Interface.ImGuiNotification;
+using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Bindings.ImGui;
 
@@ -54,8 +56,13 @@ internal sealed class Privacy : ISettingsTab
     private long CleanupKeepCount;
     private long CleanupDeleteCount;
     private bool CleanupRunning;
+    private bool CleanupPreviewStale;
+    private HashSet<ChatType>? CleanupPreviewSnapshot;
 
-    private bool RetentionRunning;
+    // The retention-running state lives on Plugin so the auto-sweep and
+    // this manual button see the same flag. UI reads stay lock-free
+    // because ImGui is single-threaded and bool reads are atomic in .NET.
+    private bool RetentionRunning => Plugin.RetentionSweepRunning;
 
     // Export form state
     private int ExportRangeDays = 30;
@@ -70,99 +77,7 @@ internal sealed class Privacy : ISettingsTab
             Plugin.FirstRunWizard.IsOpen = true;
         ImGui.Spacing();
 
-        ImGui.TextUnformatted(HellionStrings.Theme_Heading);
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGuiUtil.OptionCheckbox(
-                ref Mutable.HellionThemeEnabled,
-                HellionStrings.Theme_Enabled_Name,
-                HellionStrings.Theme_Enabled_Description);
-
-            using (ImRaii.Disabled(!Mutable.HellionThemeEnabled))
-            {
-                ImGui.Spacing();
-                var opacity = Mutable.HellionThemeWindowOpacity;
-                if (ImGui.SliderFloat($"{HellionStrings.Theme_WindowOpacity_Label}##theme-opacity", ref opacity, 0.5f, 1.0f, "%.2f"))
-                    Mutable.HellionThemeWindowOpacity = Math.Clamp(opacity, 0.5f, 1.0f);
-                ImGuiUtil.HelpText(HellionStrings.Theme_WindowOpacity_Help);
-            }
-
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(
-                ref Mutable.UseHellionFont,
-                HellionStrings.Theme_UseHellionFont_Name,
-                HellionStrings.Theme_UseHellionFont_Description);
-        }
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        ImGuiUtil.OptionCheckbox(
-            ref Mutable.PrivacyFilterEnabled,
-            HellionStrings.Privacy_FilterEnabled_Name,
-            HellionStrings.Privacy_FilterEnabled_Description);
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        using (ImRaii.Disabled(!Mutable.PrivacyFilterEnabled))
-        {
-            ImGuiUtil.HelpText(HellionStrings.Privacy_Whitelist_Help);
-
-            ImGui.Spacing();
-
-            if (ImGui.Button(HellionStrings.Privacy_Preset_PrivacyFirst))
-                Mutable.PrivacyPersistChannels = [..PrivacyDefaults.PrivacyFirstWhitelist];
-
-            ImGui.SameLine();
-            if (ImGui.Button(HellionStrings.Privacy_Preset_ClearAll))
-                Mutable.PrivacyPersistChannels.Clear();
-
-            ImGui.SameLine();
-            if (ImGui.Button(HellionStrings.Privacy_Preset_SelectAll))
-                foreach (var group in Groups)
-                foreach (var t in group.Types)
-                    Mutable.PrivacyPersistChannels.Add(t);
-
-            ImGui.Spacing();
-            ImGui.Separator();
-            ImGui.Spacing();
-
-            foreach (var (heading, types) in Groups)
-            {
-                using var tree = ImRaii.TreeNode(heading());
-                if (!tree.Success)
-                    continue;
-
-                using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-                {
-                    foreach (var type in types)
-                    {
-                        var enabled = Mutable.PrivacyPersistChannels.Contains(type);
-                        var label = type.ToString();
-                        if (ImGui.Checkbox($"{label}##privacy-{(int)type}", ref enabled))
-                        {
-                            if (enabled)
-                                Mutable.PrivacyPersistChannels.Add(type);
-                            else
-                                Mutable.PrivacyPersistChannels.Remove(type);
-                        }
-                    }
-                }
-            }
-
-            ImGui.Spacing();
-            ImGui.Separator();
-            ImGui.Spacing();
-
-            ImGuiUtil.OptionCheckbox(
-                ref Mutable.PrivacyPersistUnknownChannels,
-                HellionStrings.Privacy_PersistUnknown_Name,
-                HellionStrings.Privacy_PersistUnknown_Description);
-        }
+        DrawPrivacyFilterSection();
 
         ImGui.Spacing();
         ImGui.Separator();
@@ -181,6 +96,109 @@ internal sealed class Privacy : ISettingsTab
         ImGui.Spacing();
 
         DrawExportSection();
+
+        ImGui.Spacing();
+        ImGui.Separator();
+        ImGui.Spacing();
+
+        DrawAutoTellTabsPreloadSection();
+    }
+
+    private void DrawAutoTellTabsPreloadSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Privacy_AutoTellTabs_Section_Title);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            var preload = Mutable.AutoTellTabsHistoryPreload;
+            ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
+            if (ImGui.SliderInt(HellionStrings.Privacy_AutoTellTabs_Preload_Name, ref preload, 0, 100))
+            {
+                Mutable.AutoTellTabsHistoryPreload = preload;
+            }
+            ImGuiUtil.HelpMarker(HellionStrings.Privacy_AutoTellTabs_Preload_Description);
+
+            ImGui.Spacing();
+            ImGuiUtil.HelpText(HellionStrings.Privacy_AutoTellTabs_Preload_Hint);
+        }
+    }
+
+    private void DrawPrivacyFilterSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Privacy_Filter_Tree_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGuiUtil.OptionCheckbox(
+                ref Mutable.PrivacyFilterEnabled,
+                HellionStrings.Privacy_FilterEnabled_Name,
+                HellionStrings.Privacy_FilterEnabled_Description);
+            ImGuiUtil.HelpMarker(HellionStrings.Privacy_FilterEnabled_StorageOnly_Help);
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            using (ImRaii.Disabled(!Mutable.PrivacyFilterEnabled))
+            {
+                ImGuiUtil.HelpText(HellionStrings.Privacy_Whitelist_Help);
+
+                ImGui.Spacing();
+
+                if (ImGui.Button(HellionStrings.Privacy_Preset_PrivacyFirst))
+                    Mutable.PrivacyPersistChannels = [..PrivacyDefaults.PrivacyFirstWhitelist];
+
+                ImGui.SameLine();
+                if (ImGui.Button(HellionStrings.Privacy_Preset_ClearAll))
+                    Mutable.PrivacyPersistChannels.Clear();
+
+                ImGui.SameLine();
+                if (ImGui.Button(HellionStrings.Privacy_Preset_SelectAll))
+                    foreach (var group in Groups)
+                    foreach (var t in group.Types)
+                        Mutable.PrivacyPersistChannels.Add(t);
+
+                ImGui.Spacing();
+                ImGui.Separator();
+                ImGui.Spacing();
+
+                foreach (var (heading, types) in Groups)
+                {
+                    using var groupTree = ImRaii.TreeNode(heading());
+                    if (!groupTree.Success)
+                        continue;
+
+                    using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+                    {
+                        foreach (var type in types)
+                        {
+                            var enabled = Mutable.PrivacyPersistChannels.Contains(type);
+                            var label = type.ToString();
+                            if (ImGui.Checkbox($"{label}##privacy-{(int)type}", ref enabled))
+                            {
+                                if (enabled)
+                                    Mutable.PrivacyPersistChannels.Add(type);
+                                else
+                                    Mutable.PrivacyPersistChannels.Remove(type);
+                            }
+                        }
+                    }
+                }
+
+                ImGui.Spacing();
+                ImGui.Separator();
+                ImGui.Spacing();
+
+                ImGuiUtil.OptionCheckbox(
+                    ref Mutable.PrivacyPersistUnknownChannels,
+                    HellionStrings.Privacy_PersistUnknown_Name,
+                    HellionStrings.Privacy_PersistUnknown_Description);
+            }
+        }
     }
 
     private void DrawExportSection()
@@ -330,7 +348,7 @@ internal sealed class Privacy : ISettingsTab
                 var defaultDays = Mutable.RetentionDefaultDays;
                 if (ImGui.InputInt(HellionStrings.Retention_Default_Label, ref defaultDays))
                     Mutable.RetentionDefaultDays = Math.Max(0, defaultDays);
-                ImGuiUtil.HelpText(HellionStrings.Retention_Default_Help);
+                ImGuiUtil.HelpMarker(HellionStrings.Retention_Default_Help);
 
                 ImGui.Spacing();
 
@@ -388,6 +406,9 @@ internal sealed class Privacy : ISettingsTab
 
                 ImGui.Spacing();
 
+                ImGuiUtil.HelpText(HellionStrings.Retention_Help_SavedNote);
+                ImGui.Spacing();
+
                 using (ImRaii.Disabled(RetentionRunning))
                 {
                     if (ImGuiUtil.CtrlShiftButton(HellionStrings.Retention_Apply_Label, HellionStrings.Retention_Apply_Tooltip))
@@ -408,10 +429,17 @@ internal sealed class Privacy : ISettingsTab
 
     private void StartRetentionRun()
     {
-        if (RetentionRunning)
-            return;
+        // Take the shared retention lock so we cannot fight the auto-sweep
+        // for the database connection. If the auto-sweep is already in
+        // flight we just bail — the user can press the button again once
+        // it finishes.
+        lock (Plugin.RetentionSweepLock)
+        {
+            if (Plugin.RetentionSweepRunning)
+                return;
+            Plugin.RetentionSweepRunning = true;
+        }
 
-        RetentionRunning = true;
         var policy = Plugin.Config.RetentionPerChannelDays.ToDictionary(p => (int)(ushort)p.Key, p => p.Value);
         var defaultDays = Plugin.Config.RetentionDefaultDays;
 
@@ -443,7 +471,8 @@ internal sealed class Privacy : ISettingsTab
             }
             finally
             {
-                RetentionRunning = false;
+                lock (Plugin.RetentionSweepLock)
+                    Plugin.RetentionSweepRunning = false;
             }
         }) { IsBackground = true }.Start();
     }
@@ -458,6 +487,21 @@ internal sealed class Privacy : ISettingsTab
 
             ImGui.Spacing();
 
+            // Drift-detection between the snapshot taken at last refresh
+            // and the current Mutable whitelist. Cleanup itself runs on
+            // the SAVED policy (Cleanup_Help_SavedNote covers that), but
+            // the user usually expects "the preview reflects what I just
+            // ticked" — so we surface the divergence instead of silently
+            // showing stale numbers.
+            if (CleanupPreviewSnapshot is not null
+                && !CleanupPreviewSnapshot.SetEquals(Mutable.PrivacyPersistChannels))
+            {
+                CleanupPreviewStale = true;
+            }
+
+            using (var emphasis = CleanupPreviewStale
+                       ? ImRaii.PushColor(ImGuiCol.Button, ImGuiColors.HealerGreen with { W = 0.6f })
+                       : null)
             using (ImRaii.Disabled(CleanupRunning))
             {
                 if (ImGui.Button(HellionStrings.Cleanup_RefreshPreview))
@@ -470,10 +514,22 @@ internal sealed class Privacy : ISettingsTab
                 return;
             }
 
+            if (CleanupPreviewStale)
+            {
+                ImGui.Spacing();
+                ImGuiUtil.HelpText(HellionStrings.Cleanup_Preview_Stale);
+            }
+
             ImGui.Spacing();
-            ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_TotalStored, CleanupKeepCount + CleanupDeleteCount));
-            ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount));
-            ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount));
+
+            using (var staleColor = CleanupPreviewStale
+                       ? ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudGrey)
+                       : null)
+            {
+                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_TotalStored, CleanupKeepCount + CleanupDeleteCount));
+                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount));
+                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount));
+            }
 
             using (var tree = ImRaii.TreeNode(HellionStrings.Cleanup_Breakdown))
             {
@@ -529,6 +585,13 @@ internal sealed class Privacy : ISettingsTab
                 else
                     CleanupDeleteCount += count;
             }
+
+            // Snapshot the whitelist as it stood at preview-time so the
+            // render pass can flag the user about subsequent edits. Only
+            // updated on success — if the preview throws, the previous
+            // snapshot stays in place so stale-detection keeps working.
+            CleanupPreviewSnapshot = new HashSet<ChatType>(Mutable.PrivacyPersistChannels);
+            CleanupPreviewStale = false;
         }
         catch (Exception e)
         {

ChatTwo/Ui/SettingsTabs/Tabs.cs

@@ -10,10 +10,10 @@ namespace ChatTwo.Ui.SettingsTabs;
 
 internal sealed class Tabs : ISettingsTab
 {
-    private readonly Plugin Plugin;
+    private Plugin Plugin { get; }
     private Configuration Mutable { get; }
 
-    public string Name => Language.Options_Tabs_Tab + "###tabs-tabs";
+    public string Name => HellionStrings.Settings_Tab_Tabs + "###tabs-tabs";
 
     private int ToOpen = -2;
 
@@ -27,6 +27,9 @@ internal sealed class Tabs : ISettingsTab
     {
         const string addTabPopup = "add-tab-popup";
 
+        ImGuiUtil.HelpText(HellionStrings.Tabs_Presets_Linkshell_Hint);
+        ImGui.Spacing();
+
         if (ImGuiUtil.IconButton(FontAwesomeIcon.Plus, tooltip: Language.Options_Tabs_Add))
             ImGui.OpenPopup(addTabPopup);
 

ChatTwo/Ui/SettingsTabs/Window.cs

@@ -0,0 +1,163 @@
+using ChatTwo.Resources;
+using ChatTwo.Util;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Bindings.ImGui;
+
+namespace ChatTwo.Ui.SettingsTabs;
+
+internal sealed class Window : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    public string Name => HellionStrings.Settings_Tab_Window + "###tabs-window";
+
+    internal Window(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+    }
+
+    public void Draw(bool changed)
+    {
+        DrawHideSection();
+        ImGui.Spacing();
+        DrawInactivityHideSection();
+        ImGui.Spacing();
+        DrawFrameSection();
+        ImGui.Spacing();
+        DrawTooltipsSection();
+    }
+
+    private void DrawHideSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_Hide_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_HideChat_Name, ref Mutable.HideChat);
+            ImGuiUtil.HelpMarker(Language.Options_HideChat_Description);
+
+            ImGui.Checkbox(Language.Options_HideDuringCutscenes_Name, ref Mutable.HideDuringCutscenes);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_HideDuringCutscenes_Description, Plugin.PluginName));
+
+            ImGui.Checkbox(Language.Options_HideWhenNotLoggedIn_Name, ref Mutable.HideWhenNotLoggedIn);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_HideWhenNotLoggedIn_Description, Plugin.PluginName));
+
+            ImGui.Checkbox(Language.Options_HideWhenUiHidden_Name, ref Mutable.HideWhenUiHidden);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_HideWhenUiHidden_Description, Plugin.PluginName));
+
+            ImGui.Checkbox(Language.Options_HideInLoadingScreens_Name, ref Mutable.HideInLoadingScreens);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_HideInLoadingScreens_Description, Plugin.PluginName));
+
+            ImGui.Checkbox(Language.Options_HideInBattle_Name, ref Mutable.HideInBattle);
+            ImGuiUtil.HelpMarker(Language.Options_HideInBattle_Description);
+        }
+    }
+
+    private void DrawInactivityHideSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_InactivityHide_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_HideWhenInactive_Name, ref Mutable.HideWhenInactive);
+            ImGuiUtil.HelpMarker(Language.Options_HideWhenInactive_Description);
+
+            if (!Mutable.HideWhenInactive)
+            {
+                return;
+            }
+
+            ImGuiUtil.InputIntVertical(Language.Options_InactivityHideTimeout_Name, Language.Options_InactivityHideTimeout_Description, ref Mutable.InactivityHideTimeout, 1, 10);
+            // Untergrenze von 2 Sekunden gegen Selbst-Soft-Lock.
+            Mutable.InactivityHideTimeout = Math.Max(2, Mutable.InactivityHideTimeout);
+
+            using (ImRaii.Disabled(Mutable.HideInBattle))
+            {
+                ImGui.Checkbox(Language.Options_InactivityHideActiveDuringBattle_Name, ref Mutable.InactivityHideActiveDuringBattle);
+                ImGuiUtil.HelpMarker(Language.Options_InactivityHideActiveDuringBattle_Description);
+            }
+
+            using var channelTree = ImRaii.TreeNode(Language.Options_InactivityHideChannels_Name);
+            if (!channelTree.Success)
+            {
+                return;
+            }
+
+            if (ImGuiUtil.CtrlShiftButton(Language.Options_InactivityHideChannels_All_Label, Language.Options_InactivityHideChannels_Button_Tooltip))
+            {
+                Mutable.InactivityHideChannelsV2 = TabsUtil.AllChannels();
+                Mutable.InactivityHideExtraChatAll = true;
+                Mutable.InactivityHideExtraChatChannels = [];
+            }
+
+            ImGui.SameLine();
+            if (ImGuiUtil.CtrlShiftButton(Language.Options_InactivityHideChannels_None_Label, Language.Options_InactivityHideChannels_Button_Tooltip))
+            {
+                Mutable.InactivityHideChannelsV2 = [];
+                Mutable.InactivityHideExtraChatAll = false;
+                Mutable.InactivityHideExtraChatChannels = [];
+            }
+
+            ImGui.Spacing();
+
+            ImGuiUtil.ChannelSelector(Language.Options_Tabs_Channels, Mutable.InactivityHideChannelsV2);
+            ImGuiUtil.ExtraChatSelector(Language.Options_Tabs_ExtraChatChannels, ref Mutable.InactivityHideExtraChatAll, Mutable.InactivityHideExtraChatChannels);
+        }
+    }
+
+    private void DrawFrameSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_Frame_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_CanMove_Name, ref Mutable.CanMove);
+
+            ImGui.Checkbox(Language.Options_CanResize_Name, ref Mutable.CanResize);
+
+            ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar);
+
+            ImGui.Checkbox(Language.Options_ShowPopOutTitleBar_Name, ref Mutable.ShowPopOutTitleBar);
+
+            ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton);
+            ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description);
+
+            ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName));
+        }
+    }
+
+    private void DrawTooltipsSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_Tooltips_Heading);
+        if (!tree.Success)
+        {
+            return;
+        }
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_NativeItemTooltips_Name, ref Mutable.NativeItemTooltips);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_NativeItemTooltips_Description, Plugin.PluginName));
+
+            if (Mutable.NativeItemTooltips)
+            {
+                ImGuiUtil.DragFloatVertical(Language.Options_TooltipOffset_Name, Language.Options_TooltipOffset_Desc, ref Mutable.TooltipOffset, 1, 0f, 400f, $"{Mutable.TooltipOffset:N0}px", ImGuiSliderFlags.AlwaysClamp);
+            }
+        }
+    }
+}

ChatTwo/Util/ChunkUtil.cs

@@ -398,6 +398,60 @@ internal static class ChunkUtil
         return builder.ToString();
     }
 
+    // Hellion Chat — shared helper for Auto-Tell-Tabs and the MessageStore
+    // history-preload query. Walks the chunk list once and returns the
+    // first PlayerPayload it finds, or null when the message has no
+    // resolved player link (e.g. system messages, GM tells we already
+    // skipped earlier in the pipeline).
+    internal static PlayerPayload? TryGetPlayerPayload(IReadOnlyList<Chunk> chunks)
+    {
+        foreach (var chunk in chunks)
+        {
+            if (chunk.Link is PlayerPayload pp)
+            {
+                return pp;
+            }
+        }
+        return null;
+    }
+
+    // Fallback for tells where the PlayerPayload lives in the raw SeString
+    // payload list rather than on a chunk's Link slot. Same semantics as
+    // the chunk-walking variant above: returns the first PlayerPayload or
+    // null if the SeString has none.
+    internal static PlayerPayload? TryGetPlayerPayload(SeString? seString)
+    {
+        if (seString == null)
+        {
+            return null;
+        }
+        foreach (var payload in seString.Payloads)
+        {
+            if (payload is PlayerPayload pp)
+            {
+                return pp;
+            }
+        }
+        return null;
+    }
+
+    // True when the message's sender (or, as a fallback, content) carries a
+    // PlayerPayload that matches the given identity. Used by both the
+    // Tab.Matches sender filter and the MessageStore tell-history scan.
+    internal static bool MatchesSender(Message message, string senderName, uint senderWorld)
+    {
+        var payload = TryGetPlayerPayload(message.Sender) ?? TryGetPlayerPayload(message.Content);
+        if (payload == null)
+        {
+            return false;
+        }
+        if (!string.Equals(payload.PlayerName, senderName, StringComparison.OrdinalIgnoreCase))
+        {
+            return false;
+        }
+        return payload.World.RowId == senderWorld;
+    }
+
     internal static readonly RawPayload PeriodicRecruitmentLink = new([0x02, 0x27, 0x07, 0x08, 0x01, 0x01, 0x01, 0xFF, 0x01, 0x03]);
 
     private static uint GetInteger(BinaryReader input)

ChatTwo/Util/ImGuiUtil.cs

@@ -93,18 +93,25 @@ internal static class ImGuiUtil
 
         foreach (var part in csText.Split(["\r\n", "\r", "\n"], StringSplitOptions.None))
         {
+            // Encoding.GetBytes is virtual, so the returned array's
+            // Length is treated as untrusted by CodeQL for pointer
+            // arithmetic ("cs/unvalidated-local-pointer-arithmetic").
+            // Compute the expected byte count against the same encoder
+            // and bail out if a swapped-in encoding ever returned a
+            // mismatched buffer. Also drops empty splits so the textEnd
+            // pointer below cannot collapse onto text.
+            var expectedLength = Encoding.UTF8.GetByteCount(part);
             var bytes = Encoding.UTF8.GetBytes(part);
+            if (expectedLength == 0 || bytes.Length != expectedLength)
+            {
+                ImGui.TextUnformatted("");
+                continue;
+            }
+
             fixed (byte* rawText = bytes)
             {
                 var text = rawText;
-                var textEnd = text + bytes.Length;
-
-                // empty string
-                if (text == null)
-                {
-                    ImGui.TextUnformatted("");
-                    continue;
-                }
+                var textEnd = text + expectedLength;
 
                 var widthLeft = ImGui.GetContentRegionAvail().X;
                 var endPrevLine = ImGuiNative.CalcWordWrapPositionA(ImGui.GetFont().Handle, ImGuiHelpers.GlobalScale, text, textEnd, widthLeft);
@@ -215,6 +222,28 @@ internal static class ImGuiUtil
             ImGui.TextUnformatted(text);
     }
 
+    // Hellion Chat — compact help affordance: a dimmed "(?)" glyph rendered
+    // on the same line as the previous item, with the long-form description
+    // tucked into a hover tooltip. Lets us keep the settings panes scannable
+    // instead of stacking a wall of HelpText paragraphs under every option.
+    internal static void HelpMarker(string description)
+    {
+        ImGui.SameLine();
+        using (ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]))
+            ImGui.TextUnformatted("(?)");
+
+        // AllowWhenDisabled — ohne das Flag liefert IsItemHovered bei
+        // ausgegrauten Settings false, der User könnte nicht mehr lesen
+        // warum eine Option nicht aktiv ist. Genau dann braucht er den
+        // Hover-Tooltip aber am dringendsten.
+        if (!ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
+            return;
+
+        using var tooltip = ImRaii.Tooltip();
+        using (ImRaii.TextWrapPos(35.0f * ImGui.GetFontSize()))
+            ImGui.TextUnformatted(description);
+    }
+
     internal static void WarningText(string text, bool wrap = true)
     {
         var style = StyleModel.GetConfiguredStyle() ?? StyleModel.GetFromCurrent();

ChatTwo/Util/TabsUtil.cs

@@ -14,21 +14,20 @@ public static class TabsUtil
         return channels;
     }
 
+    // Hellion-tuned General preset. The pure player-talk catch-all plus
+    // the active-gameplay event streams (loot, crafting, gathering, NPC
+    // dialogue, party-finder pings). Pure technical noise (System, Error,
+    // Login/Logout spam, retainer sales, alarms, sign messages) lives in
+    // the dedicated System tab so it doesn't bury actual conversation.
     public static Tab VanillaGeneral => new()
     {
         Name = Language.Tabs_Presets_General,
         SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
         {
-            // Special
-            [ChatType.Debug] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Urgent] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Notice] = (ChatSourceExt.All, ChatSourceExt.All),
-            // Chat
+            // Player chat
             [ChatType.Say] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Yell] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Shout] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.TellIncoming] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.TellOutgoing] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Party] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.CrossParty] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Alliance] = (ChatSourceExt.All, ChatSourceExt.All),
@@ -50,33 +49,13 @@ public static class TabsUtil
             [ChatType.Linkshell6] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Linkshell7] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Linkshell8] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.NoviceNetwork] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.StandardEmote] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.CustomEmote] = (ChatSourceExt.All, ChatSourceExt.All),
-            // Announcements
-            [ChatType.System] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.GatheringSystem] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Error] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Echo] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.NoviceNetworkSystem] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.FreeCompanyAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.PvpTeamAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.FreeCompanyLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.PvpTeamLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.RetainerSale] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.NpcAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
+            // Active-gameplay events
+            [ChatType.NpcDialogue] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.LootNotice] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Progress] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.LootRoll] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Crafting] = (ChatSourceExt.All, ChatSourceExt.All),
             [ChatType.Gathering] = (ChatSource.LocalPlayer, ChatSource.LocalPlayer),
             [ChatType.PeriodicRecruitmentNotification] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Sign] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.RandomNumber] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Orchestrion] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.MessageBook] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.Alarm] = (ChatSourceExt.All, ChatSourceExt.All),
-            [ChatType.GlamourNotifications] = (ChatSourceExt.All, ChatSourceExt.All),
         }
     };
 
@@ -98,6 +77,105 @@ 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.
+    public static Tab HellionFreeCompany => new()
+    {
+        Name = HellionStrings.Tabs_Presets_FreeCompany,
+        SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
+        {
+            [ChatType.FreeCompany] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.FreeCompanyAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.FreeCompanyLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
+        },
+        Channel = InputChannel.FreeCompany,
+    };
+
+    public static Tab HellionParty => new()
+    {
+        Name = HellionStrings.Tabs_Presets_Party,
+        SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
+        {
+            [ChatType.Party] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossParty] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Alliance] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.PvpTeam] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.PvpTeamAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.PvpTeamLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
+            [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.
+    };
+
+    public static Tab HellionBeginner => new()
+    {
+        Name = HellionStrings.Tabs_Presets_Beginner,
+        SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
+        {
+            [ChatType.NoviceNetwork] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.NoviceNetworkSystem] = (ChatSourceExt.All, ChatSourceExt.All),
+        },
+        Channel = InputChannel.NoviceNetwork,
+    };
+
+    public static Tab HellionSystem => new()
+    {
+        Name = HellionStrings.Tabs_Presets_System,
+        SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
+        {
+            [ChatType.Debug] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Urgent] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Notice] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.System] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Error] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Echo] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.GatheringSystem] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.NoviceNetworkSystem] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.NpcAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.FreeCompanyLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.PvpTeamLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.RetainerSale] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Progress] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.RandomNumber] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Orchestrion] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.MessageBook] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Alarm] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Sign] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.GlamourNotifications] = (ChatSourceExt.All, ChatSourceExt.All),
+        },
+    };
+
+    public static Tab HellionLinkshell => new()
+    {
+        Name = HellionStrings.Tabs_Presets_Linkshell,
+        SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
+        {
+            [ChatType.Linkshell1] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Linkshell2] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Linkshell3] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Linkshell4] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Linkshell5] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Linkshell6] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Linkshell7] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.Linkshell8] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell1] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell2] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell3] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell4] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell5] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell6] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell7] = (ChatSourceExt.All, ChatSourceExt.All),
+            [ChatType.CrossLinkshell8] = (ChatSourceExt.All, ChatSourceExt.All),
+        },
+    };
+
     public static Dictionary<ChatType, (ChatSource, ChatSource)> MostlyPlayer => new()
     {
             // Special

ChatTwo/packages.lock.json

@@ -27,13 +27,13 @@
       },
       "Microsoft.Data.Sqlite": {
         "type": "Direct",
-        "requested": "[9.0.0, )",
-        "resolved": "9.0.0",
-        "contentHash": "lw6wthgXGx3r/U775k1UkUAWIn0kAT0wj4ZRq0WlhPx4WAOiBsIjgDKgWkXcNTGT0KfHiClkM+tyPVFDvxeObw==",
+        "requested": "[10.0.7, )",
+        "resolved": "10.0.7",
+        "contentHash": "DZ6G2QuyPrsh5VS+wfiZbNBtYT6p+CkxXjD0aZHF04xso7QsG/uk0JpG30hzYlK6u/wtTzta1Dqfgbc/Sl2sDA==",
         "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "9.0.0",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.10",
-          "SQLitePCLRaw.core": "2.1.10"
+          "Microsoft.Data.Sqlite.Core": "10.0.7",
+          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.11",
+          "SQLitePCLRaw.core": "2.1.11"
         }
       },
       "morelinq": {
@@ -66,10 +66,10 @@
       },
       "Microsoft.Data.Sqlite.Core": {
         "type": "Transitive",
-        "resolved": "9.0.0",
-        "contentHash": "cFfZjFL+tqzGYw9lB31EkV1IWF5xRQNk2k+MQd+Cf86Gl6zTeAoiZIFw5sRB1Z8OxpEC7nu+nTDsLSjieBAPTw==",
+        "resolved": "10.0.7",
+        "contentHash": "xVrtBg3M1wJlBDkoT0dXEYB/wSc8bIHJPYtw/bu1AqpWgF79uPSs87DAhERR/Ilumre6TKZa1cjMg3VUUObVLA==",
         "dependencies": {
-          "SQLitePCLRaw.core": "2.1.10"
+          "SQLitePCLRaw.core": "2.1.11"
         }
       },
       "Microsoft.NET.StringTools": {
@@ -79,29 +79,29 @@
       },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.10",
-        "contentHash": "UxWuisvZ3uVcVOLJQv7urM/JiQH+v3TmaJc1BLKl5Dxfm/nTzTUrqswCqg/INiYLi61AXnHo1M1JPmPqqLnAdg==",
+        "resolved": "2.1.11",
+        "contentHash": "DC4nA7yWnf4UZdgJDF+9Mus4/cb0Y3Sfgi3gDnAoKNAIBwzkskNAbNbyu+u4atT0ruVlZNJfwZmwiEwE5oz9LQ==",
         "dependencies": {
-          "SQLitePCLRaw.lib.e_sqlite3": "2.1.10",
-          "SQLitePCLRaw.provider.e_sqlite3": "2.1.10"
+          "SQLitePCLRaw.lib.e_sqlite3": "2.1.11",
+          "SQLitePCLRaw.provider.e_sqlite3": "2.1.11"
         }
       },
       "SQLitePCLRaw.core": {
         "type": "Transitive",
-        "resolved": "2.1.10",
-        "contentHash": "Ii8JCbC7oiVclaE/mbDEK000EFIJ+ShRPwAvvV89GOZhQ+ZLtlnSWl6ksCNMKu/VGXA4Nfi2B7LhN/QFN9oBcw=="
+        "resolved": "2.1.11",
+        "contentHash": "PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA=="
       },
       "SQLitePCLRaw.lib.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.10",
-        "contentHash": "mAr69tDbnf3QJpRy2nJz8Qdpebdil00fvycyByR58Cn9eARvR+UiG2Vzsp+4q1tV3ikwiYIjlXCQFc12GfebbA=="
+        "resolved": "2.1.11",
+        "contentHash": "Ev2ytaXiOlWZ4b3R67GZBsemTINslLD1DCJr2xiacpn4tbapu0Q4dHEzSvZSMnVWeE5nlObU3VZN2p81q3XOYQ=="
       },
       "SQLitePCLRaw.provider.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.10",
-        "contentHash": "uZVTi02C1SxqzgT0HqTWatIbWGb40iIkfc3FpFCpE/r7g6K0PqzDUeefL6P6HPhDtc6BacN3yQysfzP7ks+wSQ==",
+        "resolved": "2.1.11",
+        "contentHash": "Y/0ZkR+r0Cg3DQFuCl1RBnv/tmxpIZRU3HUvelPw6MVaKHwYYR8YNvgs0vuNuXCMvlyJ+Fh88U1D4tah1tt6qw==",
         "dependencies": {
-          "SQLitePCLRaw.core": "2.1.10"
+          "SQLitePCLRaw.core": "2.1.11"
         }
       }
     }

LICENCE

@@ -1,287 +0,0 @@
-                      EUROPEAN UNION PUBLIC LICENCE v. 1.2
-                      EUPL © the European Union 2007, 2016
-
-This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined
-below) which is provided under the terms of this Licence. Any use of the Work,
-other than as authorised under this Licence is prohibited (to the extent such
-use is covered by a right of the copyright holder of the Work).
-
-The Work is provided under the terms of this Licence when the Licensor (as
-defined below) has placed the following notice immediately following the
-copyright notice for the Work:
-
-        Licensed under the EUPL
-
-or has expressed by any other means his willingness to license under the EUPL.
-
-1. Definitions
-
-In this Licence, the following terms have the following meaning:
-
-- ‘The Licence’: this Licence.
-
-- ‘The Original Work’: the work or software distributed or communicated by the
-  Licensor under this Licence, available as Source Code and also as Executable
-  Code as the case may be.
-
-- ‘Derivative Works’: the works or software that could be created by the
-  Licensee, based upon the Original Work or modifications thereof. This Licence
-  does not define the extent of modification or dependence on the Original Work
-  required in order to classify a work as a Derivative Work; this extent is
-  determined by copyright law applicable in the country mentioned in Article 15.
-
-- ‘The Work’: the Original Work or its Derivative Works.
-
-- ‘The Source Code’: the human-readable form of the Work which is the most
-  convenient for people to study and modify.
-
-- ‘The Executable Code’: any code which has generally been compiled and which is
-  meant to be interpreted by a computer as a program.
-
-- ‘The Licensor’: the natural or legal person that distributes or communicates
-  the Work under the Licence.
-
-- ‘Contributor(s)’: any natural or legal person who modifies the Work under the
-  Licence, or otherwise contributes to the creation of a Derivative Work.
-
-- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of
-  the Work under the terms of the Licence.
-
-- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending,
-  renting, distributing, communicating, transmitting, or otherwise making
-  available, online or offline, copies of the Work or providing access to its
-  essential functionalities at the disposal of any other natural or legal
-  person.
-
-2. Scope of the rights granted by the Licence
-
-The Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-sublicensable licence to do the following, for the duration of copyright vested
-in the Original Work:
-
-- use the Work in any circumstance and for all usage,
-- reproduce the Work,
-- modify the Work, and make Derivative Works based upon the Work,
-- communicate to the public, including the right to make available or display
-  the Work or copies thereof to the public and perform publicly, as the case may
-  be, the Work,
-- distribute the Work or copies thereof,
-- lend and rent the Work or copies thereof,
-- sublicense rights in the Work or copies thereof.
-
-Those rights can be exercised on any media, supports and formats, whether now
-known or later invented, as far as the applicable law permits so.
-
-In the countries where moral rights apply, the Licensor waives his right to
-exercise his moral right to the extent allowed by law in order to make effective
-the licence of the economic rights here above listed.
-
-The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to
-any patents held by the Licensor, to the extent necessary to make use of the
-rights granted on the Work under this Licence.
-
-3. Communication of the Source Code
-
-The Licensor may provide the Work either in its Source Code form, or as
-Executable Code. If the Work is provided as Executable Code, the Licensor
-provides in addition a machine-readable copy of the Source Code of the Work
-along with each copy of the Work that the Licensor distributes or indicates, in
-a notice following the copyright notice attached to the Work, a repository where
-the Source Code is easily and freely accessible for as long as the Licensor
-continues to distribute or communicate the Work.
-
-4. Limitations on copyright
-
-Nothing in this Licence is intended to deprive the Licensee of the benefits from
-any exception or limitation to the exclusive rights of the rights owners in the
-Work, of the exhaustion of those rights or of other applicable limitations
-thereto.
-
-5. Obligations of the Licensee
-
-The grant of the rights mentioned above is subject to some restrictions and
-obligations imposed on the Licensee. Those obligations are the following:
-
-Attribution right: The Licensee shall keep intact all copyright, patent or
-trademarks notices and all notices that refer to the Licence and to the
-disclaimer of warranties. The Licensee must include a copy of such notices and a
-copy of the Licence with every copy of the Work he/she distributes or
-communicates. The Licensee must cause any Derivative Work to carry prominent
-notices stating that the Work has been modified and the date of modification.
-
-Copyleft clause: If the Licensee distributes or communicates copies of the
-Original Works or Derivative Works, this Distribution or Communication will be
-done under the terms of this Licence or of a later version of this Licence
-unless the Original Work is expressly distributed only under this version of the
-Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee
-(becoming Licensor) cannot offer or impose any additional terms or conditions on
-the Work or Derivative Work that alter or restrict the terms of the Licence.
-
-Compatibility clause: If the Licensee Distributes or Communicates Derivative
-Works or copies thereof based upon both the Work and another work licensed under
-a Compatible Licence, this Distribution or Communication can be done under the
-terms of this Compatible Licence. For the sake of this clause, ‘Compatible
-Licence’ refers to the licences listed in the appendix attached to this Licence.
-Should the Licensee's obligations under the Compatible Licence conflict with
-his/her obligations under this Licence, the obligations of the Compatible
-Licence shall prevail.
-
-Provision of Source Code: When distributing or communicating copies of the Work,
-the Licensee will provide a machine-readable copy of the Source Code or indicate
-a repository where this Source will be easily and freely available for as long
-as the Licensee continues to distribute or communicate the Work.
-
-Legal Protection: This Licence does not grant permission to use the trade names,
-trademarks, service marks, or names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the copyright notice.
-
-6. Chain of Authorship
-
-The original Licensor warrants that the copyright in the Original Work granted
-hereunder is owned by him/her or licensed to him/her and that he/she has the
-power and authority to grant the Licence.
-
-Each Contributor warrants that the copyright in the modifications he/she brings
-to the Work are owned by him/her or licensed to him/her and that he/she has the
-power and authority to grant the Licence.
-
-Each time You accept the Licence, the original Licensor and subsequent
-Contributors grant You a licence to their contributions to the Work, under the
-terms of this Licence.
-
-7. Disclaimer of Warranty
-
-The Work is a work in progress, which is continuously improved by numerous
-Contributors. It is not a finished work and may therefore contain defects or
-‘bugs’ inherent to this type of development.
-
-For the above reason, the Work is provided under the Licence on an ‘as is’ basis
-and without warranties of any kind concerning the Work, including without
-limitation merchantability, fitness for a particular purpose, absence of defects
-or errors, accuracy, non-infringement of intellectual property rights other than
-copyright as stated in Article 6 of this Licence.
-
-This disclaimer of warranty is an essential part of the Licence and a condition
-for the grant of any rights to the Work.
-
-8. Disclaimer of Liability
-
-Except in the cases of wilful misconduct or damages directly caused to natural
-persons, the Licensor will in no event be liable for any direct or indirect,
-material or moral, damages of any kind, arising out of the Licence or of the use
-of the Work, including without limitation, damages for loss of goodwill, work
-stoppage, computer failure or malfunction, loss of data or any commercial
-damage, even if the Licensor has been advised of the possibility of such damage.
-However, the Licensor will be liable under statutory product liability laws as
-far such laws apply to the Work.
-
-9. Additional agreements
-
-While distributing the Work, You may choose to conclude an additional agreement,
-defining obligations or services consistent with this Licence. However, if
-accepting obligations, You may act only on your own behalf and on your sole
-responsibility, not on behalf of the original Licensor or any other Contributor,
-and only if You agree to indemnify, defend, and hold each Contributor harmless
-for any liability incurred by, or claims asserted against such Contributor by
-the fact You have accepted any warranty or additional liability.
-
-10. Acceptance of the Licence
-
-The provisions of this Licence can be accepted by clicking on an icon ‘I agree’
-placed under the bottom of a window displaying the text of this Licence or by
-affirming consent in any other similar way, in accordance with the rules of
-applicable law. Clicking on that icon indicates your clear and irrevocable
-acceptance of this Licence and all of its terms and conditions.
-
-Similarly, you irrevocably accept this Licence and all of its terms and
-conditions by exercising any rights granted to You by Article 2 of this Licence,
-such as the use of the Work, the creation by You of a Derivative Work or the
-Distribution or Communication by You of the Work or copies thereof.
-
-11. Information to the public
-
-In case of any Distribution or Communication of the Work by means of electronic
-communication by You (for example, by offering to download the Work from a
-remote location) the distribution channel or media (for example, a website) must
-at least provide to the public the information requested by the applicable law
-regarding the Licensor, the Licence and the way it may be accessible, concluded,
-stored and reproduced by the Licensee.
-
-12. Termination of the Licence
-
-The Licence and the rights granted hereunder will terminate automatically upon
-any breach by the Licensee of the terms of the Licence.
-
-Such a termination will not terminate the licences of any person who has
-received the Work from the Licensee under the Licence, provided such persons
-remain in full compliance with the Licence.
-
-13. Miscellaneous
-
-Without prejudice of Article 9 above, the Licence represents the complete
-agreement between the Parties as to the Work.
-
-If any provision of the Licence is invalid or unenforceable under applicable
-law, this will not affect the validity or enforceability of the Licence as a
-whole. Such provision will be construed or reformed so as necessary to make it
-valid and enforceable.
-
-The European Commission may publish other linguistic versions or new versions of
-this Licence or updated versions of the Appendix, so far this is required and
-reasonable, without reducing the scope of the rights granted by the Licence. New
-versions of the Licence will be published with a unique version number.
-
-All linguistic versions of this Licence, approved by the European Commission,
-have identical value. Parties can take advantage of the linguistic version of
-their choice.
-
-14. Jurisdiction
-
-Without prejudice to specific agreement between parties,
-
-- any litigation resulting from the interpretation of this License, arising
-  between the European Union institutions, bodies, offices or agencies, as a
-  Licensor, and any Licensee, will be subject to the jurisdiction of the Court
-  of Justice of the European Union, as laid down in article 272 of the Treaty on
-  the Functioning of the European Union,
-
-- any litigation arising between other parties and resulting from the
-  interpretation of this License, will be subject to the exclusive jurisdiction
-  of the competent court where the Licensor resides or conducts its primary
-  business.
-
-15. Applicable Law
-
-Without prejudice to specific agreement between parties,
-
-- this Licence shall be governed by the law of the European Union Member State
-  where the Licensor has his seat, resides or has his registered office,
-
-- this licence shall be governed by Belgian law if the Licensor has no seat,
-  residence or registered office inside a European Union Member State.
-
-Appendix
-
-‘Compatible Licences’ according to Article 5 EUPL are:
-
-- GNU General Public License (GPL) v. 2, v. 3
-- GNU Affero General Public License (AGPL) v. 3
-- Open Software License (OSL) v. 2.1, v. 3.0
-- Eclipse Public License (EPL) v. 1.0
-- CeCILL v. 2.0, v. 2.1
-- Mozilla Public Licence (MPL) v. 2
-- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
-- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
-  works other than software
-- European Union Public Licence (EUPL) v. 1.1, v. 1.2
-- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong
-  Reciprocity (LiLiQ-R+).
-
-The European Commission may update this Appendix to later versions of the above
-licences without producing a new version of the EUPL, as long as they provide
-the rights granted in Article 2 of this Licence and protect the covered Source
-Code from exclusive appropriation.
-
-All other changes or additions to this Appendix require the production of a new
-EUPL version.

LICENSE

@@ -0,0 +1,306 @@
+                      EUROPEAN UNION PUBLIC LICENCE v. 1.2
+                      EUPL (c) the European Union 2007, 2016
+
+This European Union Public Licence (the 'EUPL') applies to the Work (as
+defined below) which is provided under the terms of this Licence. Any use
+of the Work, other than as authorised under this Licence is prohibited (to
+the extent such use is covered by a right of the copyright holder of the
+Work).
+
+The Work is provided under the terms of this Licence when the Licensor (as
+defined below) has placed the following notice immediately following the
+copyright notice for the Work:
+
+        Licensed under the EUPL
+
+or has expressed by any other means his willingness to license under the
+EUPL.
+
+1. Definitions
+
+In this Licence, the following terms have the following meaning:
+
+- 'The Licence': this Licence.
+
+- 'The Original Work': the work or software distributed or communicated by
+  the Licensor under this Licence, available as Source Code and also as
+  Executable Code as the case may be.
+
+- 'Derivative Works': the works or software that could be created by the
+  Licensee, based upon the Original Work or modifications thereof. This
+  Licence does not define the extent of modification or dependence on the
+  Original Work required in order to classify a work as a Derivative Work;
+  this extent is determined by copyright law applicable in the country
+  mentioned in Article 15.
+
+- 'The Work': the Original Work or its Derivative Works.
+
+- 'The Source Code': the human-readable form of the Work which is the most
+  convenient for people to study and modify.
+
+- 'The Executable Code': any code which has generally been compiled and
+  which is meant to be interpreted by a computer as a program.
+
+- 'The Licensor': the natural or legal person that distributes or
+  communicates the Work under the Licence.
+
+- 'Contributor(s)': any natural or legal person who modifies the Work under
+  the Licence, or otherwise contributes to the creation of a Derivative
+  Work.
+
+- 'The Licensee' or 'You': any natural or legal person who makes any usage
+  of the Work under the terms of the Licence.
+
+- 'Distribution' or 'Communication': any act of selling, giving, lending,
+  renting, distributing, communicating, transmitting, or otherwise making
+  available, online or offline, copies of the Work or providing access to
+  its essential functionalities at the disposal of any other natural or
+  legal person.
+
+2. Scope of the rights granted by the Licence
+
+The Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+sublicensable licence to do the following, for the duration of copyright
+vested in the Original Work:
+
+- use the Work in any circumstance and for all usage,
+- reproduce the Work,
+- modify the Work, and make Derivative Works based upon the Work,
+- communicate to the public, including the right to make available or
+  display the Work or copies thereof to the public and perform publicly,
+  as the case may be, the Work,
+- distribute the Work or copies thereof,
+- lend and rent the Work or copies thereof,
+- sublicense rights in the Work or copies thereof.
+
+Those rights can be exercised on any media, supports and formats, whether
+now known or later invented, as far as the applicable law permits so.
+
+In the countries where moral rights apply, the Licensor waives his right
+to exercise his moral right to the extent allowed by law in order to make
+effective the licence of the economic rights here above listed.
+
+The Licensor grants to the Licensee royalty-free, non-exclusive usage
+rights to any patents held by the Licensor, to the extent necessary to
+make use of the rights granted on the Work under this Licence.
+
+3. Communication of the Source Code
+
+The Licensor may provide the Work either in its Source Code form, or as
+Executable Code. If the Work is provided as Executable Code, the Licensor
+provides in addition a machine-readable copy of the Source Code of the
+Work along with each copy of the Work that the Licensor distributes or
+indicates, in a notice following the copyright notice attached to the
+Work, a repository where the Source Code is easily and freely accessible
+for as long as the Licensor continues to distribute or communicate the
+Work.
+
+4. Limitations on copyright
+
+Nothing in this Licence is intended to deprive the Licensee of the
+benefits from any exception or limitation to the exclusive rights of the
+rights owners in the Work, of the exhaustion of those rights or of other
+applicable limitations thereto.
+
+5. Obligations of the Licensee
+
+The grant of the rights mentioned above is subject to some restrictions
+and obligations imposed on the Licensee. Those obligations are the
+following:
+
+Attribution right: The Licensee shall keep intact all copyright, patent or
+trademarks notices and all notices that refer to the Licence and to the
+disclaimer of warranties. The Licensee must include a copy of such notices
+and a copy of the Licence with every copy of the Work he/she distributes
+or communicates. The Licensee must cause any Derivative Work to carry
+prominent notices stating that the Work has been modified and the date of
+modification.
+
+Copyleft clause: If the Licensee distributes or communicates copies of the
+Original Works or Derivative Works, this Distribution or Communication
+will be done under the terms of this Licence or of a later version of
+this Licence unless the Original Work is expressly distributed only under
+this version of the Licence. The Licensee (becoming Licensor) cannot
+offer or impose any additional terms or conditions on the Work or
+Derivative Work that alter or restrict the terms of the Licence.
+
+Compatibility clause: If the Licensee Distributes or Communicates
+Derivative Works or copies thereof based upon both the Work and another
+work licensed under a Compatible Licence, this Distribution or
+Communication can be done under the terms of this Compatible Licence. For
+the sake of this clause, 'Compatible Licence' refers to the licences
+listed in the appendix attached to this Licence. Should the Licensee's
+obligations under the Compatible Licence conflict with his/her obligations
+under this Licence, the obligations of the Compatible Licence shall
+prevail.
+
+Provision of Source Code: When distributing or communicating copies of
+the Work, the Licensee will provide a machine-readable copy of the Source
+Code or indicate a repository where this Source will be easily and freely
+available for as long as the Licensee continues to distribute or
+communicate the Work.
+
+Legal Protection: This Licence does not grant permission to use the trade
+names, trademarks, service marks, or names of the Licensor, except as
+required for reasonable and customary use in describing the origin of the
+Work and reproducing the content of the copyright notice.
+
+6. Chain of Authorship
+
+The original Licensor warrants that the copyright in the Original Work
+granted hereunder is owned by him/her or licensed to him/her and that
+he/she has the power and authority to grant the Licence.
+
+Each Contributor warrants that the copyright in the modifications he/she
+brings to the Work are owned by him/her or licensed to him/her and that
+he/she has the power and authority to grant the Licence.
+
+Each time You accept the Licence, the original Licensor and subsequent
+Contributors grant You a licence to their contributions to the Work,
+under the terms of this Licence.
+
+7. Disclaimer of Warranty
+
+The Work is a work in progress, which is continuously improved by
+numerous Contributors. It is not a finished work and may therefore contain
+defects or 'bugs' inherent to this type of development.
+
+For the above reason, the Work is provided under the Licence on an 'as
+is' basis and without warranties of any kind concerning the Work,
+including without limitation merchantability, fitness for a particular
+purpose, absence of defects or errors, accuracy, non-infringement of
+intellectual property rights other than copyright as stated in Article 6
+of this Licence.
+
+This disclaimer of warranty is an essential part of the Licence and a
+condition for the grant of any rights to the Work.
+
+8. Disclaimer of Liability
+
+Except in the cases of wilful misconduct or damages directly caused to
+natural persons, the Licensor will in no event be liable for any direct
+or indirect, material or moral, damages of any kind, arising out of the
+Licence or of the use of the Work, including without limitation, damages
+for loss of goodwill, work stoppage, computer failure or malfunction,
+loss of data or any commercial damage, even if the Licensor has been
+advised of the possibility of such damage. However, the Licensor will be
+liable under statutory product liability laws as far such laws apply to
+the Work.
+
+9. Additional agreements
+
+While distributing the Work, You may choose to conclude an additional
+agreement, defining obligations or services consistent with this Licence.
+However, if accepting obligations, You may act only on your own behalf
+and on your sole responsibility, not on behalf of the original Licensor
+or any other Contributor, and only if You agree to indemnify, defend, and
+hold each Contributor harmless for any liability incurred by, or claims
+asserted against such Contributor by the fact You have accepted any
+warranty or additional liability.
+
+10. Acceptance of the Licence
+
+The provisions of this Licence can be accepted by clicking on an icon 'I
+agree' placed under the bottom of a window displaying the text of this
+Licence or by affirming consent in any other similar way, in accordance
+with the rules of applicable law. Clicking on that icon indicates your
+clear and irrevocable acceptance of this Licence and all of its terms and
+conditions.
+
+Similarly, you irrevocably accept this Licence and all of its terms and
+conditions by exercising any rights granted to You by Article 2 of this
+Licence, such as the use of the Work, the creation by You of a Derivative
+Work or the Distribution or Communication by You of the Work or copies
+thereof.
+
+11. Information to the public
+
+In case of any Distribution or Communication of the Work by means of
+electronic communication by You (for example, by offering to download the
+Work from a remote location) the distribution channel or media (for
+example, a website) must at least provide to the public the information
+requested by the applicable law regarding the Licensor, the Licence and
+the way it may be accessible, concluded, stored and reproduced by the
+Licensee.
+
+12. Termination of the Licence
+
+The Licence and the rights granted hereunder will terminate automatically
+upon any breach by the Licensee of the terms of the Licence.
+
+Such a termination will not terminate the licences of any person who has
+received the Work from the Licensee under the Licence, provided such
+persons remain in full compliance with the Licence.
+
+13. Miscellaneous
+
+Without prejudice of Article 9 above, the Licence represents the complete
+agreement between the Parties as to the Work.
+
+If any provision of the Licence is invalid or unenforceable under
+applicable law, this will not affect the validity or enforceability of
+the Licence as a whole. Such provision will be construed or reformed so
+as necessary to make it valid and enforceable.
+
+The European Commission may publish other linguistic versions or new
+versions of this Licence or updated versions of the Appendix, so far this
+is required and reasonable, without reducing the scope of the rights
+granted by the Licence. New versions of the Licence will be published
+with a unique version number.
+
+All linguistic versions of this Licence, approved by the European
+Commission, have identical value. Parties can take advantage of the
+linguistic version of their choice.
+
+14. Jurisdiction
+
+Without prejudice to specific agreement between parties,
+
+- any litigation resulting from the interpretation of this License,
+  arising between the European Union institutions, bodies, offices or
+  agencies, as a Licensor, and any Licensee, will be subject to the
+  jurisdiction of the Court of Justice of the European Union, as laid
+  down in article 272 of the Treaty on the Functioning of the European
+  Union,
+
+- any litigation arising between other parties and resulting from the
+  interpretation of this License, will be subject to the exclusive
+  jurisdiction of the competent court where the Licensor resides or
+  conducts its primary business.
+
+15. Applicable Law
+
+Without prejudice to specific agreement between parties,
+
+- this Licence shall be governed by the law of the European Union Member
+  State where the Licensor has his seat, resides or has his registered
+  office,
+
+- this licence shall be governed by Belgian law if the Licensor has no
+  seat, residence or registered office inside a European Union Member
+  State.
+
+Appendix
+
+'Compatible Licences' according to Article 5 EUPL are:
+
+- GNU General Public License (GPL) v. 2, v. 3
+- GNU Affero General Public License (AGPL) v. 3
+- Open Software License (OSL) v. 2.1, v. 3.0
+- Eclipse Public License (EPL) v. 1.0
+- CeCILL v. 2.0, v. 2.1
+- Mozilla Public Licence (MPL) v. 2
+- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0)
+  for works other than software
+- European Union Public Licence (EUPL) v. 1.1, v. 1.2
+- Quebec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong
+  Reciprocity (LiLiQ-R+)
+
+The European Commission may update this Appendix to later versions of the
+above licences without producing a new version of the EUPL, as long as
+they provide the rights granted in Article 2 of this Licence and protect
+the covered Source Code from exclusive appropriation.
+
+All other changes or additions to this Appendix require the production of
+a new EUPL version.

NOTICE.md

@@ -0,0 +1,89 @@
+# Notice
+
+## Acknowledgements
+
+HellionChat is a fork of [Chat 2](https://github.com/Infiziert90/ChatTwo) by
+**Infiziert90 (Infi)** and **Anna Clemens**, both of whom kept that plugin
+running and maintained for years before I ever opened the source. Without
+their work this fork would not exist, full stop. I owe them the architecture,
+the message store, the channel filtering, the sidebar tab system, the
+hooks into FFXIV's chat, the localisation infrastructure, and countless
+small decisions that I only noticed because they had already been made
+correctly.
+
+If you find HellionChat useful, please remember that the foundation came
+from Chat 2. The code Anna and Infi wrote is doing most of the heavy
+lifting in this fork too.
+
+## A direct word to Infi and Anna
+
+Hi. I am Florian (Flo, also Jon Kazama in-game on Phoenix). I forked Chat 2
+because I wanted a privacy-by-default version for my own use case and a
+small group of friends I play with, not because I thought I could do
+anything better than what you built. The opposite is true. ChatTwo's
+default of full history and cross-character logging is the right call for
+most users. I just have a different threat model and a different
+data-handling philosophy that fits a smaller, locally-stored, retention-
+limited approach.
+
+What HellionChat adds is mostly Hellion-specific surface area: a privacy
+filter, per-channel retention windows, an export pipeline, an Auto-Tell-
+Tabs feature for FFXIV club greeters, the Hellion theme and font, German
+localisation, and a settings UX rebuild. None of it touches the bones of
+what you built. Where I had to modify your code I tried to keep the
+edits minimal, isolated to clearly-marked Hellion files, and reversible.
+
+Concrete example: when API 15 hit, I cherry-picked your fix for the
+BetterTTV emote regression with `git cherry-pick -x` so authorship and
+co-author trail stay intact. That is the standard I want to keep using as
+long as both projects are alive. You should never have to look at this
+fork and wonder if I quietly ate your work.
+
+If anything in this fork ever steps on something you would not be okay
+with, please reach out and I will fix it. Genuinely. The list of contacts
+is below.
+
+## Maintainer contact
+
+If something in HellionChat causes problems, especially if it relates back
+to Chat 2 or to anything Infi or Anna would want flagged:
+
+- **GitHub Issues:** [JonKazama-Hellion/HellionChat/issues](https://github.com/JonKazama-Hellion/HellionChat/issues)
+- **Discord:** `@j.j_kazama`
+- **Email (business):** maintainer@hellion-media.de
+
+I respond on weekdays during European business hours. For anything
+urgent (security, attribution, takedown), email is the fastest path.
+
+## Why this fork is not upstreamed
+
+The privacy-by-default position fits a small audience. ChatTwo's
+full-history-by-default position fits a much larger one, including the
+roleplaying community where chat archive is part of the play experience.
+Trying to upstream HellionChat's defaults would have meant arguing that
+Chat 2's defaults are wrong, and they are not. They are right for the
+user base ChatTwo serves. So I keep the fork separate, attribute clearly,
+and pull selected upstream patches when they apply.
+
+## Why HellionChat left the GitHub fork network
+
+The Dalamud plugin ecosystem treats the GitHub-Fork relation as a signal
+that a fork is either a development branch or a dead mirror. HellionChat
+is neither. It is an independently-maintained EUPL-1.2 fork with its own
+release cadence, its own custom repo, its own user base. Detaching the
+fork-network relation just makes the situation honest. The git history,
+the cherry-pick trail, and the attribution stay exactly the same. The
+only thing that changes is the GitHub UI no longer says "forked from".
+
+## Trademarks and naming
+
+"Chat 2" and "ChatTwo" are the names Infi and Anna chose for the upstream
+plugin. HellionChat does not use either of those names in user-facing
+copy except where required to describe origin (settings tab, manifest,
+this file, the README). The Hellion brand is mine.
+
+## Questions
+
+This file is the canonical place for "is this attribution correct, is the
+maintainer reachable, is the relationship to Chat 2 documented". If
+anything in here is wrong, please open an issue or contact me directly.

README.md

@@ -1,10 +1,22 @@
 # Hellion Chat
 
-**Version 0.2.0** — DSGVO-bewusste Erweiterung von [Chat 2](https://github.com/Infiziert90/ChatTwo) für FINAL FANTASY XIV / Dalamud.
+[![Build](https://github.com/JonKazama-Hellion/HellionChat/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/JonKazama-Hellion/HellionChat/actions/workflows/build.yml)
+[![CodeQL](https://github.com/JonKazama-Hellion/HellionChat/actions/workflows/github-code-scanning/codeql/badge.svg?branch=main)](https://github.com/JonKazama-Hellion/HellionChat/security/code-scanning)
+[![License: EUPL-1.2](https://img.shields.io/badge/License-EUPL--1.2-blue.svg)](LICENSE)
+[![Latest release](https://img.shields.io/github/v/release/JonKazama-Hellion/HellionChat?display_name=tag&sort=semver&color=brightgreen)](https://github.com/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/)
+
+**Version 0.5.1** — DSGVO-bewusste Erweiterung von [Chat 2](https://github.com/Infiziert90/ChatTwo) für FINAL FANTASY XIV / Dalamud.
 
 Hellion Chat baut auf Chat 2 auf und ergänzt es um Datenschutz- und Daten-Handling-Kontrollen, die mit den Datenschutz-Regeln in der EU, den USA und Japan im Einklang sind. Alle Chat-2-Funktionen, Befehle und Tastenkürzel funktionieren unverändert. Eigenständiger Plugin-Slot, eigene Konfiguration, eigene Datenbank.
 
-Privates Repository, EUPL-1.2-lizenziert. Distribution über Custom-Repo während der Bootstrap-Phase.
+Eigenständiges Repository, EUPL-1.2-lizenziert. Distribution über Custom-Repo. Selektive Cherry-Picks von Upstream-Chat-2 nach Bedarf, dokumentiert in [UPSTREAM_SYNC.md](UPSTREAM_SYNC.md).
+
+## Acknowledgements
+
+Hellion Chat baut auf [Chat 2](https://github.com/Infiziert90/ChatTwo) von **Infiziert90 (Infi)** und **Anna Clemens** auf, die das Plugin über Jahre gepflegt haben bevor ich den Source-Code überhaupt gesehen habe. Die ganze Kern-Architektur, der Message-Store, die Channel-Logik, das Hook-System und vieles mehr stammt von ihnen. Wenn dir Hellion Chat hilft, dann läuft die Anerkennung dafür zu großen Teilen an Infi und Anna. Eine ausführliche Danksagung liegt in [NOTICE.md](NOTICE.md).
 
 ---
 
@@ -56,7 +68,7 @@ Privates Repository, EUPL-1.2-lizenziert. Distribution über Custom-Repo währen
 
 ### Was gegenüber Chat 2 fehlt
 
-- **Webinterface** wurde in Hellion Chat 0.2.0 entfernt. Der eingebaute HTTP-Server hat unter dem Privacy-Versprechen nicht abgesichert werden können (5-stelliger numerischer Auth-Code aus `System.Random`, Bind auf alle Interfaces per Default, Cookies ohne Security-Flags und ein Server-Sent-Events-Stream der den Privacy-Filter umgangen hat). Wer den Funktionsumfang von Chat 2 vollständig braucht, sollte beim Upstream-Plugin bleiben; Hellion Chat fokussiert auf DSGVO-konforme Persistenz und verzichtet bewusst auf Remote-Zugriffs-Features.
+- **Webinterface** wurde in Hellion Chat 0.2.0 entfernt. Es bedient einen anderen Anwendungsfall als der Fokus dieses Forks, nämlich Remote-Zugriff auf den Chat von einem zweiten Gerät. An die kleineren Defaults dieses Forks anzupassen hätte einen erheblichen Umbau bedeutet, also ist es ersatzlos entfernt worden. Wer den vollen Funktionsumfang von Chat 2 möchte, ist mit dem Upstream-Plugin besser bedient. Hellion Chat fokussiert sich auf einen schmaleren Datenbestand und verzichtet bewusst auf Remote-Zugriffs-Features.
 
 ---
 
@@ -231,7 +243,7 @@ Konflikte in Upstream-Sprach-Ressourcen (`Language.<lang>.resx`) kommen häufig
 
 ## Projektstatus
 
-**Version 0.2.0** | Stand: Mai 2026
+**Version 0.3.1** | Stand: Mai 2026
 
 Alle Bootstrap-Phasen abgeschlossen:
 
@@ -244,11 +256,13 @@ Alle Bootstrap-Phasen abgeschlossen:
 - [x] About-Tab im Hellion-Branding mit License + Disclaimer
 - [x] AI-Disclosure dokumentiert (Pair-Klassifikation)
 - [x] Webinterface entfernt (Phase 1.5, Audit-Konsequenz aus 2026-05-02)
+- [x] Audit-Hardening Phase 2 (Path-Traversal, Retention-Race, DbViewer-Konsistenz, Privacy-Filter-Help-Text)
+- [x] Slash-Commands auf `/hellion`-Familie umbenannt
+- [x] Theme auf Hellion-Online-Media-Brand-Palette aligned (Arctic Cyan + Ember Orange)
+- [x] About-Tab vollständig lokalisiert (EN + DE) mit Mission-Statement und neutraler Tonart
 
-Phase 2 (offen, kein festes Datum):
+Phase 3 (offen, kein festes Datum):
 
-- [ ] EmoteCache Path-Traversal-Hardening (`Path.GetFullPath` + StartsWith-Check)
-- [ ] Race-Hardening für `RetentionLastRunAt` (CompareExchange / Lock)
 - [ ] MySQL/MariaDB-Backend mit Drei-Stufen-Bestätigung
 - [ ] PostgreSQL-Backend
 - [ ] Encryption für sensible Channels (AES-256, lokaler Key)
@@ -263,7 +277,7 @@ Phase 2 (offen, kein festes Datum):
 
 ## Lizenz
 
-EUPL-1.2 (gleiche Lizenz wie Upstream Chat 2). Siehe `LICENCE`.
+EUPL-1.2 (gleiche Lizenz wie Upstream Chat 2). Volltext in [LICENSE](LICENSE), Copyright-Notes mit Dual-Holder-Block in [COPYRIGHT](COPYRIGHT), persönliche Danksagung an die Upstream-Autoren in [NOTICE.md](NOTICE.md).
 
 © 2023–2026 die Chat-2-Autoren (Infi, Anna und die Upstream-Contributors) für die Engine, IPC und Storage-Schicht.
 © 2026 Hellion Online Media für die Hellion-Chat-Erweiterungen.

SECURITY.md

@@ -0,0 +1,49 @@
+# Security policy
+
+## Reporting a vulnerability
+
+If you find a security issue in HellionChat, please do not open a public
+GitHub issue. Use one of the private channels below instead so we can
+investigate and ship a fix before the details go out.
+
+**Preferred:**
+[Privately report a vulnerability](https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new)
+through GitHub's Security Advisories. This routes the report directly to
+me and keeps the conversation off the public timeline.
+
+**Alternative:**
+- Email: `maintainer@hellion-media.de`
+- Discord: `@j.j_kazama`
+
+I respond on weekdays during European business hours. For urgent
+disclosures (active exploitation, user-data exposure) email is the
+fastest path.
+
+## What I treat as in scope
+
+- Code paths in HellionChat that touch user-controlled input (chat
+  messages, plugin config, file paths the user can influence)
+- The privacy filter in MessageStore.cs and the export pipeline
+- The Configuration migration logic
+- The EmoteCache HTTP client and path handling
+- The Auto-Tell-Tabs spawn logic and history preload
+
+## What is not in scope
+
+- Issues in upstream Chat 2 that we have not modified — please report
+  those at <https://github.com/Infiziert90/ChatTwo/issues>
+- Issues in Dalamud itself — those go to <https://github.com/goatcorp/Dalamud>
+- Issues in the FFXIV game client
+- Anything that needs the user to install a malicious plugin first
+
+## Acknowledgement
+
+I list everyone who reports a real issue in the changelog of the release
+that fixes it, unless they prefer to stay anonymous. No bug bounty,
+nothing financial; this is a hobby plugin.
+
+## Disclosure window
+
+I aim to ship a fix within 14 days for high-severity issues and within
+30 days for everything else. If a fix needs more time I will say so in
+the private thread.

UPSTREAM_SYNC.md

@@ -0,0 +1,110 @@
+# Upstream sync workflow
+
+HellionChat is a standalone EUPL-1.2 fork of [Chat 2](https://github.com/Infiziert90/ChatTwo).
+We pull selected patches from upstream manually instead of running an
+automated mirror. This file documents how that works so anyone (including
+future-me) can do it cleanly.
+
+## One-time setup
+
+Add the upstream repo as a remote on a fresh clone:
+
+```bash
+git remote add upstream https://github.com/Infiziert90/ChatTwo.git
+git fetch upstream
+```
+
+Verify both remotes are wired up:
+
+```bash
+git remote -v
+# origin    https://github.com/JonKazama-Hellion/HellionChat.git (fetch)
+# origin    https://github.com/JonKazama-Hellion/HellionChat.git (push)
+# upstream  https://github.com/Infiziert90/ChatTwo.git (fetch)
+# upstream  https://github.com/Infiziert90/ChatTwo.git (push)
+```
+
+You never push to `upstream`. It is read-only for us.
+
+## Reviewing what is new upstream
+
+Before any feature cycle starts I run a quick check:
+
+```bash
+git fetch upstream
+git log --oneline main..upstream/main | head -30
+```
+
+That shows every commit Infi or contributors landed since the last sync.
+Read the messages, decide which ones apply.
+
+## What we cherry-pick
+
+**Always:** security fixes, API-version compatibility patches (Dalamud
+API 15 → 16 → ...), BetterTTV / emote-cache fixes, regression fixes for
+the upstream behaviour we still rely on.
+
+**Sometimes:** small bug fixes in `MessageManager.cs`, `MessageStore.cs`,
+`ChatLogWindow.cs`, the Tabs system. Pull them when they touch code we
+have not heavily modified.
+
+**Never:** webinterface changes (the entire webinterface tree is gone in
+HellionChat), changes that conflict with the privacy filter, changes that
+re-add upstream defaults we deliberately reversed (full-history logging,
+Tell Exclusive defaults, etc.).
+
+## How we cherry-pick
+
+Always with `-x` so authorship and the original commit hash stay
+visible:
+
+```bash
+git checkout -b sync/upstream-<topic> main
+git cherry-pick -x <upstream-commit-sha>
+```
+
+`-x` adds a `(cherry picked from commit <sha>)` line to the commit
+message. That preserves the upstream-author credit and lets anyone
+reading `git log` trace the change back to ChatTwo. Co-Author trail
+intact, no AI lines, no "Hellion" prefix on commits that were not
+authored by us.
+
+## Conflict handling
+
+When a cherry-pick conflicts:
+
+1. Resolve the conflict by hand. Do not "fix" upstream code to match
+   Hellion conventions; that is what the merge marker showed us.
+2. If the conflict is fundamental (touches code that no longer exists
+   in our fork), abort the cherry-pick and document why in
+   `Hellion Chat Backlog.md` instead. Some upstream patches are not
+   portable; that is fine.
+3. After a successful resolve, the commit message stays identical to
+   the upstream message, with the `-x` cherry-pick footer Git appends
+   automatically. Do not rewrite the message to match our format.
+
+## Pushing the sync
+
+Cherry-picked commits go through the same review as our own work: the
+sync branch lands in `main` via a no-fast-forward merge, then a release
+tag if the user-visible behaviour changes (otherwise just merged).
+
+```bash
+git checkout main
+git merge --no-ff sync/upstream-<topic> -m "merge: upstream sync — <topic>"
+```
+
+## When upstream goes silent
+
+If Chat 2 stops receiving updates entirely we keep this workflow alive
+anyway. The remote stays configured, the documentation stays here. The
+moment maintenance picks back up we are ready to pull again.
+
+## When upstream takes a direction we cannot follow
+
+If a future ChatTwo release breaks compatibility with our privacy
+philosophy in a way we cannot resolve (e.g. mandatory cloud sync,
+removal of the local message store, a license change that makes EUPL
+incompatible), HellionChat continues on its own from the last
+compatible cherry-pick. The history we already inherited stays under
+EUPL-1.2 and stays attributed.