Merge branch 'feature/v1.5.5'

release(v1.5.5): manifest bump, changelog and forge post
feat(ui): add bundled custom notification sounds
2026-05-21 21:27:57 +02:00 · 2026-05-21 20:43:54 +02:00 · 2026-05-21 20:07:09 +02:00 · 2026-05-21 19:01:45 +02:00 · 2026-05-21 19:01:42 +02:00 · 2026-05-21 18:47:25 +02:00
280 changed files with 59025 additions and 8310 deletions
@@ -1,156 +1,252 @@
+# ##############################################################
+# #
+# #   .editorconfig – Hellion Forge / Hellion Media
+# #
+# #   Überarbeitet: Mai 2026
+# #
+# #   Strategie:
+# #     - Standard-.NET-Conventions (private Fields = _camelCase)
+# #     - CSharpier übernimmt die meiste Formatierung
+# #     - Hier: Naming, IDE-Hints, Backup-Format-Regeln
+# #
+# # ##############################################################
+
+root = true
+
+
+# =====================================================
+# Defaults (alle Files)
+# =====================================================
+
 [*]
-indent_style=space
-tab_width=4
-indent_size=4
-trim_trailing_whitespace=true
-insert_final_newline=false
+indent_style = space
+tab_width = 4
+indent_size = 4
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true

-# JetBrains Rider custom properties for code formatting styles
-resharper_csharp_brace_style=next_line

-resharper_csharp_braces_for_foreach=not_required
-resharper_csharp_braces_for_for=not_required
-resharper_csharp_braces_for_while=not_required
-charset=utf-8
-end_of_line=crlf
+# =====================================================
+# Markdown: Trailing Spaces erlaubt (2 Spaces = <br>)
+# =====================================================

-# Microsoft .NET properties
-csharp_new_line_before_members_in_object_initializers=false
-csharp_preferred_modifier_order=public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
-csharp_style_prefer_utf8_string_literals=true:suggestion
-csharp_style_var_elsewhere=true:suggestion
-csharp_style_var_for_built_in_types=true:suggestion
-csharp_style_var_when_type_is_apparent=true:suggestion
-dotnet_naming_rule.private_constants_rule.import_to_resharper=True
-dotnet_naming_rule.private_constants_rule.resharper_description=Constant fields (private)
-dotnet_naming_rule.private_constants_rule.resharper_guid=236f7aa5-7b06-43ca-bf2a-9b31bfcff09a
-dotnet_naming_rule.private_constants_rule.severity=warning
-dotnet_naming_rule.private_constants_rule.style=upper_camel_case_style
-dotnet_naming_rule.private_constants_rule.symbols=private_constants_symbols
-dotnet_naming_rule.private_instance_fields_rule.import_to_resharper=True
-dotnet_naming_rule.private_instance_fields_rule.resharper_description=Instance fields (private)
-dotnet_naming_rule.private_instance_fields_rule.resharper_guid=4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c
-dotnet_naming_rule.private_instance_fields_rule.severity=warning
-dotnet_naming_rule.private_instance_fields_rule.style=upper_camel_case_style
-dotnet_naming_rule.private_instance_fields_rule.symbols=private_instance_fields_symbols
-dotnet_naming_rule.private_instance_fields_rule_1.import_to_resharper=True
-dotnet_naming_rule.private_instance_fields_rule_1.resharper_description=Instance fields (private)
-dotnet_naming_rule.private_instance_fields_rule_1.resharper_guid=4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c
-dotnet_naming_rule.private_instance_fields_rule_1.severity=warning
-dotnet_naming_rule.private_instance_fields_rule_1.style=upper_camel_case_style
-dotnet_naming_rule.private_instance_fields_rule_1.symbols=private_instance_fields_symbols_1
-dotnet_naming_rule.private_static_fields_rule.import_to_resharper=True
-dotnet_naming_rule.private_static_fields_rule.resharper_description=Static fields (private)
-dotnet_naming_rule.private_static_fields_rule.resharper_guid=f9fce829-e6f4-4cb2-80f1-5497c44f51df
-dotnet_naming_rule.private_static_fields_rule.severity=warning
-dotnet_naming_rule.private_static_fields_rule.style=upper_camel_case_style
-dotnet_naming_rule.private_static_fields_rule.symbols=private_static_fields_symbols
-dotnet_naming_rule.private_static_readonly_rule.import_to_resharper=True
-dotnet_naming_rule.private_static_readonly_rule.resharper_description=Static readonly fields (private)
-dotnet_naming_rule.private_static_readonly_rule.resharper_guid=15b5b1f1-457c-4ca6-b278-5615aedc07d3
-dotnet_naming_rule.private_static_readonly_rule.severity=warning
-dotnet_naming_rule.private_static_readonly_rule.style=upper_camel_case_style
-dotnet_naming_rule.private_static_readonly_rule.symbols=private_static_readonly_symbols
-dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper=True
-dotnet_naming_rule.unity_serialized_field_rule.resharper_description=Unity serialized field
-dotnet_naming_rule.unity_serialized_field_rule.resharper_guid=5f0fdb63-c892-4d2c-9324-15c80b22a7ef
-dotnet_naming_rule.unity_serialized_field_rule.severity=warning
-dotnet_naming_rule.unity_serialized_field_rule.style=lower_camel_case_style_1
-dotnet_naming_rule.unity_serialized_field_rule.symbols=unity_serialized_field_symbols
-dotnet_naming_rule.unity_serialized_field_rule_1.import_to_resharper=True
-dotnet_naming_rule.unity_serialized_field_rule_1.resharper_description=Unity serialized field
-dotnet_naming_rule.unity_serialized_field_rule_1.resharper_guid=5f0fdb63-c892-4d2c-9324-15c80b22a7ef
-dotnet_naming_rule.unity_serialized_field_rule_1.severity=warning
-dotnet_naming_rule.unity_serialized_field_rule_1.style=lower_camel_case_style_1
-dotnet_naming_rule.unity_serialized_field_rule_1.symbols=unity_serialized_field_symbols_1
-dotnet_naming_style.lower_camel_case_style.capitalization=camel_case
-dotnet_naming_style.lower_camel_case_style.required_prefix=_
-dotnet_naming_style.lower_camel_case_style_1.capitalization=camel_case
-dotnet_naming_style.upper_camel_case_style.capitalization=pascal_case
-dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities=private
-dotnet_naming_symbols.private_constants_symbols.applicable_kinds=field
-dotnet_naming_symbols.private_constants_symbols.required_modifiers=const
-dotnet_naming_symbols.private_constants_symbols.resharper_applicable_kinds=constant_field
-dotnet_naming_symbols.private_constants_symbols.resharper_required_modifiers=any
-dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities=private
-dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds=field
-dotnet_naming_symbols.private_instance_fields_symbols.resharper_applicable_kinds=field,readonly_field
-dotnet_naming_symbols.private_instance_fields_symbols.resharper_required_modifiers=instance
-dotnet_naming_symbols.private_instance_fields_symbols_1.applicable_accessibilities=private
-dotnet_naming_symbols.private_instance_fields_symbols_1.applicable_kinds=field
-dotnet_naming_symbols.private_instance_fields_symbols_1.resharper_applicable_kinds=field,readonly_field
-dotnet_naming_symbols.private_instance_fields_symbols_1.resharper_required_modifiers=instance
-dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities=private
-dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds=field
-dotnet_naming_symbols.private_static_fields_symbols.required_modifiers=static
-dotnet_naming_symbols.private_static_fields_symbols.resharper_applicable_kinds=field
-dotnet_naming_symbols.private_static_fields_symbols.resharper_required_modifiers=static
-dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities=private
-dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds=field
-dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers=readonly,static
-dotnet_naming_symbols.private_static_readonly_symbols.resharper_applicable_kinds=readonly_field
-dotnet_naming_symbols.private_static_readonly_symbols.resharper_required_modifiers=static
-dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities=*
-dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds=
-dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds=unity_serialised_field
-dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers=instance
-dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_accessibilities=*
-dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_kinds=
-dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_applicable_kinds=unity_serialised_field
-dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_required_modifiers=instance
-dotnet_style_parentheses_in_arithmetic_binary_operators=never_if_unnecessary:none
-dotnet_style_parentheses_in_other_binary_operators=always_for_clarity:none
-dotnet_style_parentheses_in_relational_binary_operators=never_if_unnecessary:none
-dotnet_style_predefined_type_for_locals_parameters_members=true:suggestion
-dotnet_style_predefined_type_for_member_access=true:suggestion
-dotnet_style_qualification_for_event=false:suggestion
-dotnet_style_qualification_for_field=false:suggestion
-dotnet_style_qualification_for_method=false:suggestion
-dotnet_style_qualification_for_property=false:suggestion
-dotnet_style_require_accessibility_modifiers=for_non_interface_members:suggestion
+[*.md]
+trim_trailing_whitespace = false

-# ReSharper properties
-resharper_autodetect_indent_settings=true
-resharper_cpp_insert_final_newline=true
-resharper_csharp_insert_final_newline=false
-resharper_formatter_off_tag=@formatter:off
-resharper_formatter_on_tag=@formatter:on
-resharper_formatter_tags_enabled=true
-resharper_fsharp_insert_final_newline=false
-resharper_html_insert_final_newline=false
-resharper_resx_insert_final_newline=false
-resharper_shaderlab_insert_final_newline=false
-resharper_t4_insert_final_newline=false
-resharper_use_indent_from_vs=false
-resharper_vb_insert_final_newline=false
-resharper_xmldoc_insert_final_newline=false
-resharper_xml_insert_final_newline=false

-# ReSharper inspection severities
-resharper_arrange_redundant_parentheses_highlighting=hint
-resharper_arrange_this_qualifier_highlighting=hint
-resharper_arrange_type_member_modifiers_highlighting=hint
-resharper_arrange_type_modifiers_highlighting=hint
-resharper_built_in_type_reference_style_for_member_access_highlighting=hint
-resharper_built_in_type_reference_style_highlighting=hint
-resharper_razor_assembly_not_resolved_highlighting=warning
-resharper_redundant_base_qualifier_highlighting=warning
-resharper_suggest_var_or_type_built_in_types_highlighting=hint
-resharper_suggest_var_or_type_elsewhere_highlighting=hint
-resharper_suggest_var_or_type_simple_types_highlighting=hint
-resharper_web_config_module_not_resolved_highlighting=warning
-resharper_web_config_type_not_resolved_highlighting=warning
-resharper_web_config_wrong_module_highlighting=warning
+# =====================================================
+# JSON / YAML / Web-Configs: 2-Space-Indent
+# Konsistent mit yamllint und Prettier-Override
+# =====================================================

-[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config}]
-indent_style=space
-indent_size=2
+[*.{yaml,yml}]
+indent_size = 2

-[{*.yaml,*.yml}]
-indent_style=space
-indent_size=2
+[*.{json,jsonc,har,jsb2,jsb3,postman_collection,postman_environment}]
+indent_size = 2

-[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,c++m,cc,ccm,cginc,compute,cp,cpp,cppm,cs,cshtml,cu,cuh,cxx,cxxm,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,mxx,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,uxml,vb,xaml,xamlx,xoml,xsd}]
-indent_style=space
-indent_size=4
-tab_width=4
+[{.babelrc,.eslintrc,.prettierrc,.markdownlintrc,.stylelintrc,bowerrc}]
+indent_size = 2
+
+
+# =====================================================
+# .NET / XAML / Razor / Resources: 4-Space-Indent
+# =====================================================
+
+[*.{cs,csx,vb,fs,fsi,fsx}]
+indent_size = 4
+
+[*.{xml,xsd,xaml,axaml,paml,resx,resw,nuspec,config}]
+indent_size = 4
+
+[*.{cshtml,razor,aspx,ascx,asax,master,axaml}]
+indent_size = 4
+
+
+# ##############################################################
+# #
+# #   C# Sektion: Style, Naming, Format
+# #
+# ##############################################################
+
+[*.{cs,csx}]
+
+
+# =====================================================
+# C# Style – var-Präferenz
+# =====================================================
+
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+
+# =====================================================
+# C# Style – Sonstiges
+# =====================================================
+
+# UTF-8 String Literals (C# 11+)
+csharp_style_prefer_utf8_string_literals = true:suggestion
+
+# Reihenfolge der Access-Modifier (Microsoft-Empfehlung)
+csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
+
+# Initializer: nicht alles auf eine Zeile
+csharp_new_line_before_members_in_object_initializers = false
+
+
+# =====================================================
+# C# Format – Braces (Backup, falls CSharpier nicht läuft)
+# =====================================================
+
+# Allman Style: Klammern auf neue Zeile
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+
+
+# =====================================================
+# C# Format – Switch-Einrückung
+# =====================================================
+
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+
+
+# =====================================================
+# .NET Style – Qualification (kein "this." nötig)
+# =====================================================
+
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+
+# =====================================================
+# .NET Style – Predefined Types (int statt Int32 etc.)
+# =====================================================
+
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+
+# =====================================================
+# .NET Style – Parentheses
+# =====================================================
+
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
+
+
+# =====================================================
+# .NET Style – Accessibility-Modifier erzwingen
+# =====================================================
+
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+
+# ##############################################################
+# #
+# #   Naming Conventions (.NET-Standard)
+# #
+# #   Private Instance Fields:      _camelCase
+# #   Private Static Fields:        _camelCase
+# #   Private Constants:            PascalCase
+# #   Private Static Readonly:      PascalCase
+# #
+# ##############################################################
+
+# === Style: Underscore + camelCase ===
+dotnet_naming_style.underscore_camel_case_style.capitalization = camel_case
+dotnet_naming_style.underscore_camel_case_style.required_prefix = _
+
+# === Style: PascalCase ===
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+
+
+# === Rule: Private Instance Fields → _camelCase ===
+dotnet_naming_rule.private_instance_fields.severity = warning
+dotnet_naming_rule.private_instance_fields.symbols = private_instance_fields_symbols
+dotnet_naming_rule.private_instance_fields.style = underscore_camel_case_style
+
+dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
+
+
+# === Rule: Private Static Fields → _camelCase ===
+dotnet_naming_rule.private_static_fields.severity = warning
+dotnet_naming_rule.private_static_fields.symbols = private_static_fields_symbols
+dotnet_naming_rule.private_static_fields.style = underscore_camel_case_style
+
+dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
+
+
+# === Rule: Private Constants → PascalCase ===
+dotnet_naming_rule.private_constants.severity = warning
+dotnet_naming_rule.private_constants.symbols = private_constants_symbols
+dotnet_naming_rule.private_constants.style = pascal_case_style
+
+dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
+
+
+# === Rule: Private Static Readonly → PascalCase ===
+dotnet_naming_rule.private_static_readonly.severity = warning
+dotnet_naming_rule.private_static_readonly.symbols = private_static_readonly_symbols
+dotnet_naming_rule.private_static_readonly.style = pascal_case_style
+
+dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
+
+
+# ##############################################################
+# #
+# #   JetBrains Rider / ReSharper Settings
+# #
+# ##############################################################
+
+# === Brace-Style (für ReSharper-spezifische Formatierung) ===
+resharper_csharp_brace_style = next_line
+
+# Kurze Statements ohne Klammern erlaubt (für 1-Zeiler)
+resharper_csharp_braces_for_foreach = not_required
+resharper_csharp_braces_for_for = not_required
+resharper_csharp_braces_for_while = not_required
+
+# === Auto-Detection und Formatter-Tags ===
+resharper_autodetect_indent_settings = true
+resharper_use_indent_from_vs = false
+
+# Erlaubt @formatter:off / @formatter:on Kommentare im Code
+resharper_formatter_off_tag = @formatter:off
+resharper_formatter_on_tag = @formatter:on
+resharper_formatter_tags_enabled = true
+
+
+# =====================================================
+# ReSharper Inspection Severities
+# (Hints = blaue Wellen, Warnings = gelb, Errors = rot)
+# =====================================================
+
+# Style-Suggestions: nur als Hint anzeigen
+resharper_arrange_redundant_parentheses_highlighting = hint
+resharper_arrange_this_qualifier_highlighting = hint
+resharper_arrange_type_member_modifiers_highlighting = hint
+resharper_arrange_type_modifiers_highlighting = hint
+resharper_built_in_type_reference_style_for_member_access_highlighting = hint
+resharper_built_in_type_reference_style_highlighting = hint
+resharper_suggest_var_or_type_built_in_types_highlighting = hint
+resharper_suggest_var_or_type_elsewhere_highlighting = hint
+resharper_suggest_var_or_type_simple_types_highlighting = hint
+
+# Echte Probleme: als Warning
+resharper_redundant_base_qualifier_highlighting = warning
@@ -1,19 +1,50 @@
-# Local development environment template
-#
-# Copy this file to `.env` and adjust paths to your setup,
-# or run: bash scripts/setup-dev-env.sh
-#
-# `.env` is gitignored — never commit your local paths.
-#
-# Activate in shell:
-#   set -a; source .env; set +a
-#
-# Or use direnv (recommended):
-#   echo 'dotenv .env' > .envrc && direnv allow
+##############################################################
+##
+##   .env.example – Hellion Forge / Hellion Media
+##
+##   Template für lokale Entwicklungsumgebung.
+##   Kopiere diese Datei nach `.env` und passe die Pfade
+##   an dein Setup an.
+##
+##   ⚠️  `.env` ist gitignored – niemals lokale Pfade committen!
+##
+##############################################################
+##
+##   SETUP
+##
+##   1) Manuell:
+##        cp .env.example .env
+##        # Pfade in .env anpassen
+##
+##   2) Automatisch:
+##        bash scripts/setup-dev-env.sh
+##
+##   AKTIVIERUNG IN DER SHELL
+##
+##   Variante A – einmalig pro Shell:
+##        set -a; source .env; set +a
+##
+##   Variante B – mit direnv (empfohlen):
+##        echo 'dotenv .env' > .envrc
+##        direnv allow
+##
+##############################################################

-# Path to Dalamud development DLLs (Dalamud.dll, FFXIVClientStructs.dll,
-# Lumina.dll, Lumina.Excel.dll). Required for building ChatTwo.Tests project.
+
+# =====================================================
+# Build & Development Paths
+# =====================================================
+
+# Pfad zu den Dalamud-Development-DLLs:
+#   - Dalamud.dll
+#   - FFXIVClientStructs.dll
+#   - Lumina.dll
+#   - Lumina.Excel.dll
 #
-# XIVLauncher Core (Linux):  ~/.xlcore/dalamud/Hooks/dev
-# XIVLauncher (Windows):     %AppData%\XIVLauncher\addon\Hooks\dev
+# Wird zum Bauen des HellionChat.Tests-Projekts benötigt.
+#
+# Standardpfade je nach Plattform:
+#   XIVLauncher Core (Linux):  ~/.xlcore/dalamud/Hooks/dev
+#   XIVLauncher    (Windows):  %AppData%\XIVLauncher\addon\Hooks\dev
+#   XIVLauncher    (macOS):    ~/Library/Application Support/XIV on Mac/dalamud/Hooks/dev
 DALAMUD_HOME=/path/to/dalamud/dev/dlls
@@ -1,2 +1,178 @@
-# Generated files
-HellionChat/Resources/Language.*.resx linguist-generated=true
+##############################################################
+##
+##   .gitattributes – Hellion Forge / Hellion Media
+##
+##   Setup:        Linux-First Development
+##                 (Hauptentwicklung auf Linux, Target = Dalamud/Windows)
+##   Überarbeitet: Mai 2026
+##
+##   Strategie:
+##     - Default:                Alles LF (Linux-Konvention)
+##     - Windows-Batch-Scripts:  CRLF (technische Pflicht!)
+##     - PowerShell:             CRLF (Sicherheit für Windows PS 5.1)
+##     - Binärdateien:           explizit markiert (gegen Korruption)
+##
+##   Hinweis:
+##     Moderne Visual-Studio- und MSBuild-Versionen kommen
+##     problemlos mit LF in .sln/.csproj klar.
+##     Falls jemals Probleme auftauchen: hier umstellen.
+##
+##############################################################
+
+
+# =====================================================
+# Default: Auto-Detect, alles auf LF normalisieren
+# =====================================================
+
+* text=auto eol=lf
+
+
+# =====================================================
+# Source Code (LF)
+# =====================================================
+
+*.cs            text eol=lf
+*.csx           text eol=lf
+*.vb            text eol=lf
+*.fs            text eol=lf
+*.fsx           text eol=lf
+
+
+# =====================================================
+# Configs & Daten (LF)
+# =====================================================
+
+*.json          text eol=lf
+*.yml           text eol=lf
+*.yaml          text eol=lf
+*.xml           text eol=lf
+*.md            text eol=lf
+*.txt           text eol=lf
+*.config        text eol=lf
+*.editorconfig  text eol=lf
+.gitignore      text eol=lf
+.gitattributes  text eol=lf
+.env.example    text eol=lf
+
+
+# =====================================================
+# Visual Studio / MSBuild Project Files (LF)
+# Linux-first: moderne Tools kommen mit LF zurecht
+# =====================================================
+
+*.sln           text eol=lf
+*.csproj        text eol=lf
+*.vbproj        text eol=lf
+*.fsproj        text eol=lf
+*.props         text eol=lf
+*.targets       text eol=lf
+
+
+# =====================================================
+# Resources & Lokalisierung (LF)
+# =====================================================
+
+# Linguist soll generierte Sprachdateien nicht mitzählen
+HellionChat/Resources/Language.*.resx linguist-generated=true
+
+*.resx          text eol=lf
+*.resw          text eol=lf
+
+
+# =====================================================
+# Linux/Mac-Scripts (LF – Pflicht)
+# =====================================================
+
+*.sh            text eol=lf
+*.bash          text eol=lf
+*.zsh           text eol=lf
+
+
+# =====================================================
+# >>> AUSNAHMEN <<<
+# Windows-Scripts brauchen ZWINGEND CRLF.
+# Mit LF werden diese auf Windows nicht ausgeführt!
+# =====================================================
+
+# Batch-Scripts (cmd.exe braucht CRLF)
+*.bat           text eol=crlf
+*.cmd           text eol=crlf
+
+# PowerShell (PS 7+ wäre LF-tolerant,
+# aber Windows PowerShell 5.1 zickt teilweise)
+*.ps1           text eol=crlf
+*.psm1          text eol=crlf
+*.psd1          text eol=crlf
+
+
+# =====================================================
+# Binäre Build-Artefakte
+# =====================================================
+
+*.dll           binary
+*.exe           binary
+*.pdb           binary
+*.so            binary
+*.dylib         binary
+*.nupkg         binary
+*.snupkg        binary
+
+
+# =====================================================
+# Bilder (binary)
+# =====================================================
+
+*.png           binary
+*.jpg           binary
+*.jpeg          binary
+*.gif           binary
+*.ico           binary
+*.bmp           binary
+*.tiff          binary
+*.webp          binary
+
+# SVG ist eigentlich XML – als Text behandeln
+*.svg           text eol=lf
+
+
+# =====================================================
+# Fonts (binary)
+# =====================================================
+
+*.ttf           binary
+*.otf           binary
+*.woff          binary
+*.woff2         binary
+*.eot           binary
+
+
+# =====================================================
+# Archive (binary)
+# =====================================================
+
+*.zip           binary
+*.7z            binary
+*.tar           binary
+*.gz            binary
+*.rar           binary
+
+
+# =====================================================
+# Audio / Video (binary)
+# =====================================================
+
+*.wav           binary
+*.mp3           binary
+*.ogg           binary
+*.mp4           binary
+
+
+# =====================================================
+# FFXIV / Dalamud spezifische Binär-Formate
+# =====================================================
+
+*.tex           binary
+*.pap           binary
+*.avfx          binary
+*.shpk          binary
+*.scd           binary
@@ -3,6 +3,12 @@ name: Build
 # Verifies that every push to main and every PR still builds against the
 # current Dalamud staging branch. Does not produce release artefacts; the
 # release workflow handles that on tag.
+#
+# Linux runner: gitea.com Cloud Actions provides ubuntu-latest. The plugin
+# csproj targets net10.0-windows, but `dotnet build` cross-compiles on
+# Linux as long as the Dalamud staging assemblies are present at the
+# expected lookup path ($(HOME)/.xlcore/dalamud/Hooks/dev/, which the
+# Dalamud SDK 15 uses on Linux).

 on:
  push:
@@ -21,36 +27,27 @@ permissions:
 jobs:
  build:
    name: Build (Release)
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
    timeout-minutes: 15

    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

      - name: Setup .NET 10
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
        with:
          dotnet-version: 10.0.x

      - 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
+          hooks="$HOME/.xlcore/dalamud/Hooks/dev"
+          mkdir -p "$hooks"
+          curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
+          unzip -oq dalamud.zip -d "$hooks"

      - name: Restore
        run: dotnet restore HellionChat/HellionChat.csproj

      - name: Build (Release)
        run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
-
-      - name: Upload build output
-        uses: actions/upload-artifact@v7
-        with:
-          name: HellionChat-build-${{ github.run_number }}
-          path: HellionChat/bin/Release/**/HellionChat/**
-          if-no-files-found: warn
-          retention-days: 14
@@ -34,10 +34,9 @@ jobs:
  announce:
    name: Post changelog to Hellion Forge
    runs-on: ubuntu-latest
-    # The DISCORD_FORGE_WEBHOOK secret lives under Settings → Environments
-    # → Webhook (case-sensitive). Without this declaration the secret is
-    # not in scope for the job.
-    environment: Webhook
+    # The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
+    # on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
+    # scope for every job by default, no environment: declaration needed.
    timeout-minutes: 5

    steps:
@@ -45,7 +44,7 @@ jobs:
      # the user supplies the tag explicitly. Always check out that tag so
      # the yaml + forge-posts file are read from the tagged tree, not main.
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.inputs.tag || github.ref }}

@@ -102,16 +101,16 @@ jobs:
          if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
          $afterMarker = $raw.Substring($idx + $marker.Length)
          $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
-              if ($_ -match '^  ') { $_.Substring(2) } else { $_ }
+              if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
          }) -join "`n"

-          $header = "**Hellion Chat $version"
+          $header = "**v$version "
          $start = $changelogBody.IndexOf($header)
          if ($start -lt 0) {
              throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
          }
          $rest = $changelogBody.Substring($start)
-          $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
+          $nextHdr = $rest.IndexOf("`n`n**v", 1)
          $trailer = $rest.IndexOf("`n`n---")
          if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
              $enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
@@ -121,20 +120,40 @@ jobs:
              $enBlock = $rest.TrimEnd()
          }

-          # ---------- Char-Cap-Check (5500 Total auf title + description + footer) ----------
+          # ---------- Embed-Felder + Per-Field-Caps (Discord-Hard-Limits) ----------
+          # Discord enforces per-embed-field limits separately from the
+          # combined-total limit. We split the DE and EN blocks into two
+          # embeds that share the same release URL so Discord stitches
+          # them into one visual card. Hard caps per Discord docs:
+          #   description: 4096 per embed
+          #   title:        256 per embed
+          #   footer.text: 2048 per embed
+          #   combined sum across all embeds: 6000
          $title = "Hellion Chat $version — $subtitle"
-          $description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock"
+          $deDesc = "**Deutsch**`n`n$deBody"
+          $enDesc = "**English**`n`n$enBlock"
          $footerText = "Hellion Forge · $versionsnatur"
-          $totalChars = $title.Length + $description.Length + $footerText.Length
-          if ($totalChars -gt 5500) {
-              throw "V6: Total char count $totalChars exceeds 5500 limit. Major-Release detected — please post manually via Bot/Multi-Embed (see forge style §8). Forge-Auto-Announce stays off for this tag."
-          }
-          Write-Host "Char-Cap OK: $totalChars / 5500"
+          $releaseUrl = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"

-          # ---------- Embed-Payload bauen ----------
+          if ($deDesc.Length -gt 4096) {
+              throw "V6a: DE-Body too long for one embed ($($deDesc.Length) chars, max 4096). Trim .github/forge-posts/$tag.md or post the announcement manually (see forge style §8)."
+          }
+          if ($enDesc.Length -gt 4096) {
+              throw "V6b: EN-Block too long for one embed ($($enDesc.Length) chars, max 4096). Trim the changelog entry in HellionChat/HellionChat.yaml or post manually."
+          }
+          $totalChars = $title.Length + $deDesc.Length + $enDesc.Length + $footerText.Length
+          if ($totalChars -gt 6000) {
+              throw "V6c: Combined embed chars $totalChars exceed Discord's 6000-total limit. Major-Release detected — post manually via Bot/Multi-Embed (see forge style §8)."
+          }
+          Write-Host "Embed-Caps OK: de=$($deDesc.Length)/4096, en=$($enDesc.Length)/4096, total=$totalChars/6000"
+
+          # ---------- Embed-Payload bauen (zwei Embeds, gleiche url) ----------
+          # Sharing the same `url` tells Discord to render both embeds as a
+          # single contiguous card block. The title sits on the first embed,
+          # the footer + timestamp on the last so it reads as one post.
          $payload = [ordered]@{
              username = "Forge Herald"
-              avatar_url = "https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png"
+              avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
              content = "<@&1500489631555260446>"
              allowed_mentions = [ordered]@{
                  parse = @()
@@ -143,9 +162,14 @@ jobs:
              embeds = @(
                  [ordered]@{
                      title = $title
-                      url = "https://github.com/JonKazama-Hellion/HellionChat/releases/tag/$tag"
+                      url = $releaseUrl
                      color = 12730636
-                      description = $description
+                      description = $deDesc
+                  },
+                  [ordered]@{
+                      url = $releaseUrl
+                      color = 12730636
+                      description = $enDesc
                      footer = [ordered]@{ text = $footerText }
                      timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
                  }
@@ -2,30 +2,30 @@ 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.
+# DalamudPackager and attaches it to the matching Gitea Release.
 #
 # User-controlled inputs touched by this workflow:
 #   - the tag name (filtered by on.tags = v*, validated again at runtime
 #     against ^v\d+\.\d+\.\d+$ before being used in any string)
 # All other values are either repo-controlled (paths under
-# HellionChat/bin/Release derived from Get-ChildItem) or pinned URLs to
-# goatcorp / GitHub. Nothing from a webhook event payload (issue/PR
+# HellionChat/bin/Release derived from find / Get-ChildItem) or pinned
+# URLs to goatcorp / gitea. Nothing from a webhook event payload (issue/PR
 # titles, commit messages, etc.) flows into a run-step.
+#
+# Linux runner: gitea.com Cloud Actions only ships ubuntu-latest. The
+# plugin csproj targets net10.0-windows, `dotnet build` cross-compiles on
+# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...

 on:
  push:
    tags:
      - 'v*'
-  # Manual recovery trigger. Use when a tag was pushed but the auto-run
-  # was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`.
-  # The tag input is validated against the same semver regex as the
-  # auto-trigger before any string interpolation happens.
+  # Manual recovery trigger. Use Gitea's "Run workflow" UI and select the
+  # tag (e.g. v1.4.4) from the Ref dropdown - not main. The Validate tag
+  # ref step below hard-fails if a non-tag ref is selected, because the
+  # release-action reads GITHUB_REF directly and rejects anything that
+  # does not start with refs/tags/.
  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Existing tag to (re)release, e.g. v0.6.1'
-        required: true
-        type: string

 permissions:
  contents: write
@@ -33,46 +33,51 @@ permissions:
 jobs:
  release:
    name: Build and attach release ZIP
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
    timeout-minutes: 20

    steps:
-      # On push:tags, github.ref_name is the tag — checkout default works.
-      # On workflow_dispatch, ref defaults to the branch the action was
-      # invoked from; we need to explicitly check out the tag the user
-      # supplied so the build comes from the tagged commit, not main.
+      # release-action@main reads GITHUB_REF directly (its action.yml
+      # does not declare a tag_name input). Validate up-front so manual
+      # dispatches from a branch ref fail loud here instead of burning
+      # a full build before the final step errors out with "ref X is
+      # not a tag".
+      - name: Validate tag ref
+        run: |
+          if [[ "${GITHUB_REF}" != refs/tags/v* ]]; then
+              echo "::error::Release workflow must run on a v*.X.Y tag ref, got ${GITHUB_REF}"
+              echo "::error::Push a tag, or pick the tag (not main) in the workflow_dispatch Ref dropdown."
+              exit 1
+          fi
+
      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ github.event.inputs.tag || github.ref }}
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

      - name: Setup .NET 10
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
        with:
          dotnet-version: 10.0.x

      - 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
+          hooks="$HOME/.xlcore/dalamud/Hooks/dev"
+          mkdir -p "$hooks"
+          curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
+          unzip -oq dalamud.zip -d "$hooks"

      - name: Build (Release)
        run: dotnet build HellionChat/HellionChat.csproj --configuration Release

      - name: Locate latest.zip
        id: locate
-        shell: pwsh
        run: |
-          $zip = Get-ChildItem -Path HellionChat\bin\Release -Recurse -Filter latest.zip | Select-Object -First 1
-          if (-not $zip)
-          {
-              throw "latest.zip not found under HellionChat\bin\Release"
-          }
-          Write-Host "Found: $($zip.FullName)"
-          "path=$($zip.FullName)" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
+          if [ -z "$zip" ]; then
+              echo "latest.zip not found under HellionChat/bin/Release" >&2
+              exit 1
+          fi
+          echo "Found: $zip"
+          echo "path=$zip" >> "$GITHUB_OUTPUT"

      # Build a release body from the matching changelog block in
      # HellionChat.yaml plus a static install / docs footer. Fails the
@@ -87,12 +92,11 @@ jobs:
      - name: Generate release body
        shell: pwsh
        env:
-          # workflow_dispatch carries the user-supplied tag in inputs.tag;
-          # push:tags carries it in github.ref_name. Either way the value
-          # is treated as a PowerShell variable (env-var pass), not as
-          # inline shell text, and validated against the semver regex
-          # below before any string interpolation.
-          TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
+          # github.ref_name is the tag because Validate tag ref above
+          # already enforced refs/tags/v*. Read via env: so the value
+          # is a PowerShell variable, not inline shell text, and gets
+          # re-validated against the semver regex below.
+          TAG_NAME: ${{ github.ref_name }}
        run: |
          $tag = $env:TAG_NAME
          if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
@@ -109,20 +113,22 @@ jobs:

          # changelog: is the last top-level key in the manifest, so
          # everything after the marker is the literal block. Strip the
-          # 2-space yaml indent from each line.
+          # 4-space yaml indent (prettier convention) from each line.
          $afterMarker = $raw.Substring($idx + $marker.Length)
          $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
-              if ($_ -match '^  ') { $_.Substring(2) } else { $_ }
+              if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
          }) -join "`n"

-          $header = "**Hellion Chat $version"
+          # Subblock convention: "**vX.Y.Z — <subtitle> (<date>)**"
+          # matches verify-changelog-sync.sh and slim-rule grep.
+          $header = "**v$version "
          $start = $changelogBody.IndexOf($header)
          if ($start -lt 0) {
              throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
          }

          $rest = $changelogBody.Substring($start)
-          $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
+          $nextHdr = $rest.IndexOf("`n`n**v", 1)
          $trailer = $rest.IndexOf("`n`n---")

          if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
@@ -150,15 +156,28 @@ jobs:
          Write-Host $body
          Write-Host "----------------------------------------"

-      - name: Attach to GitHub release
-        uses: softprops/action-gh-release@v3
+      # release-action@main only declares files/title/body/pre_release/
+      # draft/api_key/insecure as inputs (see its action.yml). It silently
+      # ignores anything else, including body_path and tag_name. The tag
+      # itself comes from GITHUB_REF, the body must be passed inline via
+      # body:, so we re-emit release-body.md as a step output first.
+      - name: Expose release body for release-action
+        id: body
+        shell: bash
+        run: |
+          {
+              echo 'content<<RELEASE_BODY_EOF'
+              cat release-body.md
+              echo 'RELEASE_BODY_EOF'
+          } >> "$GITHUB_OUTPUT"
+
+      # Gitea-native release action. Creates the release if the tag has no
+      # release yet, or updates the existing one with latest.zip attached
+      # and the generated body. The auto-injected GITHUB_TOKEN on Gitea
+      # Actions has Gitea-API scope and is sufficient for release write.
+      - name: Attach to Gitea release
+        uses: https://gitea.com/actions/release-action@main
        with:
-          # Explicit tag_name so the action targets the correct release in
-          # both push:tags (auto) and workflow_dispatch (manual recovery)
-          # modes. Without this, dispatch runs would default to the branch
-          # ref (main) and fail to find the release.
-          tag_name: ${{ github.event.inputs.tag || github.ref_name }}
          files: ${{ steps.locate.outputs.path }}
-          body_path: release-body.md
-          fail_on_unmatched_files: true
-          generate_release_notes: false
+          body: ${{ steps.body.outputs.content }}
+          api_key: ${{ secrets.GITHUB_TOKEN }}
@@ -0,0 +1,20 @@
+name: Security
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+  schedule:
+    - cron: '0 6 * * 1'
+  workflow_dispatch:
+
+jobs:
+  scan:
+    uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main
+    with:
+      # MessageStore.cs uses string-interpolation in CommandText for table
+      # names and clause-joins that come from internal code constants, not
+      # user input. Values are bound via SqlParameter, the SQL surface is
+      # local-only inside a Dalamud plugin. Semgrep matches the pattern
+      # without dataflow, so it flags those eight call sites; CodeQL
+      # would not. Suppressed for this repo only.
+      semgrep-exclude-rules: 'csharp.lang.security.sqli.csharp-sqli.csharp-sqli'
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# .githooks/pre-push — invokes preflight.sh (A/B/C/D=build).
+exec scripts/preflight.sh
@@ -8,7 +8,7 @@ body:
      value: |
        Thanks for reporting. Please fill in the fields below so I can
        reproduce the issue. If this is a security issue, stop here and
-        use the [private vulnerability advisory](https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new)
+        report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
        instead.

  - type: input
@@ -16,7 +16,7 @@ body:
    attributes:
      label: HellionChat version
      description: From Settings → Information → Version
-      placeholder: "0.5.4"
+      placeholder: '0.5.4'
    validations:
      required: true

@@ -2,12 +2,13 @@ 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.
+    url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
+    about: Do not open a public issue for security problems. Report by e-mail instead.

  - name: Upstream Chat 2 issue
    url: https://github.com/Infiziert90/ChatTwo/issues
-    about: If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well.
+    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
@@ -37,9 +37,9 @@ body:
    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)"
+        - '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
@@ -3,9 +3,9 @@ Thanks for contributing to HellionChat. Please fill in the sections
 below so the review goes quickly. Delete sections that genuinely do
 not apply, but do not delete the whole template.

-If this is a security fix, stop here and use a private security
-advisory instead:
-https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
+If this is a security fix, stop here and report it privately by
+e-mail instead of opening a public PR:
+mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
 -->

 ## Summary
@@ -18,12 +18,11 @@ https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new

 - [ ] Bug fix (non-breaking change that fixes an issue)
 - [ ] New feature (non-breaking change that adds behaviour)
- [ ] Breaking change (config migration, removed feature, or behaviour
-      change that user-visible defaults rely on)
+- [ ] Breaking change (config migration, removed feature, or behaviour change that user-visible
+      defaults rely on)
 - [ ] Documentation only
 - [ ] Translation update
 - [ ] Build, CI or tooling change
- [ ] Upstream cherry-pick from Chat 2

 ## Linked issue

@@ -53,7 +52,6 @@ new commands, new translations, removed behaviour. If none, write
  bump and is it covered by the existing migration tests?
 - Does this change the schema in MessageStore?
 - Does this change the repo.json or HellionChat.yaml manifest fields?
- Does this affect the upstream cherry-pick path? See docs/UPSTREAM_SYNC.md.
 -->

 ## Checklist
@@ -61,12 +59,9 @@ new commands, new translations, removed behaviour. If none, write
 - [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and
      [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
 - [ ] My change matches the existing code style (`.editorconfig`).
- [ ] I added or updated tests where the existing test infrastructure
-      made that practical, or I have explained why tests are not
-      applicable.
- [ ] I updated the README, in-plugin strings or documentation if my
-      change is user-visible.
- [ ] I did not include any AI-generated code without disclosing it
-      in the PR description (see [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
- [ ] I confirm my contribution is released under the
-      [EUPL-1.2](../LICENSE).
+- [ ] I added or updated tests where the existing test infrastructure made that practical, or I have
+      explained why tests are not applicable.
+- [ ] I updated the README, in-plugin strings or documentation if my change is user-visible.
+- [ ] I did not include any AI-generated code without disclosing it in the PR description (see
+      [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
+- [ ] I confirm my contribution is released under the [EUPL-1.2](../LICENSE).
@@ -9,14 +9,14 @@ updates:
    schedule:
      interval: weekly
      day: monday
-      time: "07:00"
+      time: '07:00'
      timezone: Europe/Berlin
    open-pull-requests-limit: 5
    labels:
      - dependencies
      - nuget
    commit-message:
-      prefix: "chore(deps)"
+      prefix: 'chore(deps)'
    groups:
      patches:
        update-types:
@@ -32,11 +32,11 @@ updates:
    directory: /
    schedule:
      interval: monthly
-      time: "07:00"
+      time: '07:00'
      timezone: Europe/Berlin
    open-pull-requests-limit: 3
    labels:
      - dependencies
      - github-actions
    commit-message:
-      prefix: "chore(actions)"
+      prefix: 'chore(actions)'
@@ -2,11 +2,17 @@
 subtitle: "Theme Foundation"
 versionsnatur: "Major-UI-Cycle"
 ---
- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC zurück zur Übersicht
+
+- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon,
+  Moonlit Bloom, Mint Grove
+- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View,
+  Breadcrumb und ESC zurück zur Übersicht
 - Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick
- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch abgelegt
- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben
+- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten
+  Start automatisch abgelegt
+- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch
+  überschrieben
 - Plugin-Icon zum Hellion-Forge-Hammer gewechselt
- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings → Themes
+- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2
+  Klassik in Settings → Themes
 - Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`
@@ -2,14 +2,23 @@
 subtitle: "Layout Refresh"
 versionsnatur: "Major-UI-Cycle"
 ---
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den aktiven Tab
+
+- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale
+  Akzent-Pill markiert den aktiven Tab
 - Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab
 - Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool)
- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher Partner ergibt konsistent dieselbe
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben beide
+- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon
+  (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84
+  Kombinationen, gleicher Partner ergibt konsistent dieselbe
+- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft,
+  2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
+- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge,
+  Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
+- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter
+  Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
+- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn
+  Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert.
+  Persistente und Auto-Tell-Tabs überleben beide
 - Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren
 - Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben

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

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

-Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt.
+Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für
+Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt.
@@ -2,9 +2,19 @@
 subtitle: "Plugin Integrations: Honorific"
 versionsnatur: "Plugin-Integration-Cycle 1"
 ---
+
 - Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap
- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel aktiv ist
- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger)
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald HellionChat aktualisiert
+- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint
+  jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht
+  installiert ist oder kein Custom-Titel aktiv ist
+- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der
+  User raten muss
+- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert,
+  inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt:
+  Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und
+  LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger)
+- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum
+  Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen
+  Integrationen
+- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel
+  automatisch sobald HellionChat aktualisiert
@@ -0,0 +1,24 @@
+---
+subtitle: Critical Lifecycle Fixes
+versionsnatur: Stability-Hotfix
+---
+
+**Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
+
+Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den
+Audit-Pässen abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
+
+- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der
+  Connection macht den manuellen GC.Collect überflüssig
+- **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das
+  Plugin-Domain kann sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
+- **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose.
+  Kein Schreib-Risiko mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
+- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
+- **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden,
+  Settings-Änderungen aus den letzten Frames vor Disable überleben jetzt zuverlässig
+- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das
+  neue WindowOpacity-Feld statt auf 0.85 zurückzufallen
+
+Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown
+spürbar sauberer laufen.
@@ -0,0 +1,29 @@
+---
+subtitle: Theme Engine Performance
+versionsnatur: Performance-Patch
+---
+
+**Hellion Chat 1.4.1 — Theme Engine Performance**
+
+Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad
+eliminiert, Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter
+Built-In und überarbeitete Author-Credits.
+
+- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle
+  Color-Slots einmalig in ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem
+  Cache statt pro Slot pro Frame durch ColourUtil.RgbaToAbgr zu jagen. Real gemessene
+  Frame-Time-Recovery: **~13 %** in typischer Render-Szene (Plan-Erwartung war 2-6 % konservativ,
+  real ~10-15 %)
+- **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während
+  HellionChat reloaden will, fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation
+  ab. Last-Known-Good-Snapshot bleibt im Picker, beim nächsten Tick wird automatisch retry'd —
+  vorher fiel das Theme aus der Liste bis zum Plugin-Reload
+- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne
+  Cache-Fill in den Speicher gekommen ist, holt Switch() das beim Anwenden nach
+- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett,
+  80s-Neon-Grid-Vibes für Late-Night-Raids
+- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und
+  Forge Merchantman werden Carla Beleandis als Community-Geste zugeschrieben.
+
+Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in
+Theme-getrieben rendernden Szenen merklich glatter laufen und ein neues Theme im Picker steht.
@@ -0,0 +1,27 @@
+---
+subtitle: Symbol-Picker und Tell-History Fix
+versionsnatur: Feature-Patch + Hotfix
+---
+
+- Symbol-Picker im Chat-Eingang: ein kleiner Smile-Button links neben dem Kanal-Indikator öffnet ein
+  Popup mit zwei Tabs. Der erste listet alle 161 FFXIV-PUA-Glyphen (Dalamuds SeIconChar); der zweite
+  trägt 97 verifizierte BMP-Symbole (Latin-Marken, Währungen, das ganze griechische Alphabet,
+  Geometrie, Spielkarten, Noten) — jedes davon über `/echo` und `/say` in einer vierrundigen
+  Whitelist-Probe durchgereicht, damit der Channel-Render dem entspricht, was der Picker anzeigt.
+  Klick fügt das Symbol an der Cursor-Position ein, Multi-Insert lässt das Popup offen, eine
+  Recent-Used-Leiste zeigt die letzten sechzehn Picks über beide Tabs. Toggle in Settings → Chat →
+  Nachrichten-Verhalten, Default an.
+- Verlauf in angepinnten Tell-Tabs lädt wieder vollständig: ein versteckter 500-Zeilen-Scan-Cap in
+  PreloadHistory hat das User-Setting `AutoTellTabsHistoryPreload` überschrieben, wodurch
+  weniger-frequente Tell-Partner ihren Backlog verloren haben sobald die Scan-Schicht mit anderen
+  Chat-Partnern voll lief. Cap ist raus, der Index auf `(Receiver, Date)` hält die Query schnell.
+- Slash-Command-Teardown: /hellion, /hellionView, /hellionDebugger (und im Debug-Build
+  /hellionSeString) sind als private Felder gecached. Plugin-Dispose detached die echte
+  Registrierung, statt mit identischen Args neu zu registrieren — schließt eine latente
+  Wartungs-Falle aus v1.4.9.
+- v1.4.x-Polish-Sweep endet hier. Der ImGuiListClipper-Refactor von der v1.4.10-Reserve-Liste wurde
+  gecancelt, nachdem der Cross- Plattform-Smoke gezeigt hat dass das Scroll-Gummi ein Wine/Linux-
+  Quirk ist — Windows-User haben es nie gesehen. Spike dafür kommt in einem späteren Patch. Nächster
+  Major-Cycle ist v1.5.0 mit der DI-Container-Adoption (`Microsoft.Extensions.Hosting` +
+  `ILogger<T>`) nach dem Lightless-Vorbild.
+- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations-Aufwand.
@@ -0,0 +1,31 @@
+---
+subtitle: ChatLog Frame-Hot-Path
+versionsnatur: Performance-Patch
+---
+
+**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
+
+Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem
+ChatLogWindow-Render- Pfad und der Settings-StatusBar eliminiert.
+
+- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right
+  und die ABGR- Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das
+  gut 500 redundante P/Invokes und Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups
+  (mehrere parallele Chat-Windows) profitieren proportional, weil der Hoist pro DrawMessages-Call
+  greift, also pro Window
+- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro
+  Tab pro Frame, mit zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der
+  neue TabTintCache liest pre-computed Werte aus dem Tab und rechnet nur neu wenn das Tell-Target
+  drifted. Beide Caches haben separate Validation-Keys, also keine Cross-Invalidation zwischen Tint-
+  und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne Tab-Awareness
+- **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert
+  die Tab-Message- Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag
+  bisher hinter den LINQ-Pfaden, also liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate,
+  plus die LINQ-Pfade durch eine Single-Pass-Foreach ersetzt. Die Aggregation läuft auf etwa 1 % der
+  Frames
+
+Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr
+durch die Card-Border- Multiplikation pro Window.
+
+Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log
+und in der Settings-Statusleiste merklich glatter laufen.
@@ -0,0 +1,33 @@
+---
+subtitle: Async-Lifecycle + Gitea-Cutover
+versionsnatur: Architecture-Refactor
+---
+
+**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
+
+Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's
+`IAsyncDalamudPlugin`-API migriert und das Custom-Repo zieht von GitHub auf Gitea um.
+
+- **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials
+  (Config-Load, Language-Init, Conflict-Detection). Migrationen, Service-Allokationen,
+  Window-Konstruktion und Hook-Subscription wandern in LoadAsync, sodass Dalamud die UI während der
+  schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in DisposeAsync mirrort
+  LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
+- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die
+  Custom-Repo-URL auf
+  `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
+  umstellen, dann XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener
+  v1.4.2-Snapshot stehen und wird nicht mehr aktualisiert
+- **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen
+  harten Schema-Check in Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1)
+  bekommen jetzt eine klare „install v1.4.2 first"-Fehlermeldung statt eines impliziten
+  Migrations-Pfads
+- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt
+  blockierend im Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen
+  kurzen Hitch haben, dafür kein 300-ms-Block beim Plugin-Start
+- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der
+  Async-Refactor ist Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) und
+  Code-Architektur-Hygiene, kein direkter User-spürbarer Speed-Win in dieser Release
+
+Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs
+bleiben unangetastet.
@@ -0,0 +1,37 @@
+---
+subtitle: Threading- und IPC-Sicherheits-Politur
+versionsnatur: Wartung und Robustheit
+---
+
+**Hellion Chat 1.4.4 — Threading- und IPC-Sicherheits-Politur**
+
+Fünfter Sub-Patch der v1.4.x Polish-Sweep-Serie. Threading-Annahmen werden explizit pro Methode
+dokumentiert, ein Hot-Path-Lock im Auto-Tell-Tab-Counter fällt weg, IPC-Cleanup wird sichtbar wenn
+er fehlschlägt und der Privacy-Filter spricht jetzt bei unbekannten ChatTypes.
+
+- **AutoTellTabsService Hot-Path-Lock entfernt.** `ActiveTempTabCount` hat bisher pro Render-Frame
+  ein LINQ-Count unter einem Lock gemacht. Jetzt läuft das über einen Interlocked-Counter der
+  parallel zur Tabs-Liste mitgeführt wird, inklusive Resync-Hook für den Snapshot-Restore-Pfad in
+  `SaveConfig`. Plus Pure-Helper-Test-Mirror in der Build-Suite damit die Atomicity-Semantik nicht
+  versehentlich wegrefactored wird
+- **HonorificService selbst-dokumentierende Threading-Banner.** Statt eines Block-Comments am
+  Klassen-Ende hat jede IPC-Callback-Methode jetzt einen 1-Zeilen-Banner darüber, der den
+  Thread-Kontext direkt am Call-Site benennt (framework only, framework scheduled, any). Mehr Hilfe
+  für künftige Reviews als ein abstraktes Threading-Kapitel
+- **Unsubscribe-Failure ist jetzt sichtbar.** `TryUnsubscribe` hat ein Honorific-Unsubscribe-Failure
+  bisher als Debug geloggt, was bei Standard-Loglevel verschluckt wurde. Eine geleakte Subscription
+  kann den Service über Plugin-Reloads hinweg leben lassen, also läuft der Log jetzt auf Warning
+- **AutoTranslate-Warmup blockiert den Plugin-Unload nicht mehr.** Der Cache-Warmup-Thread war ohne
+  `IsBackground=true` unterwegs, was den Unload um 100-300 ms verzögern konnte. Pattern-Match zu
+  MessageManager und RetentionSweep (beide seit v1.4.0)
+- **Privacy-Filter loggt unbekannte ChatTypes.** Wenn FFXIV durch einen Patch einen neuen ChatType
+  einführt der weder in der Whitelist noch in den Defaults steht, wird er bisher silent durch den
+  Failsafe geleitet. Jetzt loggt der Filter einmalig pro Runtime eine Warning mit dem Type und dem
+  Failsafe-Wert. Dedup über ein NonSerialized-HashSet, also kein Log-Spam
+- **Default-Flip für neue Installationen.** `PrivacyPersistUnknownChannels` startet bei neuen
+  Configs jetzt auf `true`, damit ein Patch-bedingt neuer ChatType nicht stillschweigend gedroppt
+  wird bevor der User entscheiden kann. Bestehende Configs behalten ihre Wahl, weil der Deserializer
+  den Initializer überschreibt. Keine Migration, kein Schema-Bump
+
+Keine User-sichtbaren Funktions-Änderungen außer dem Default-Flip für neue Installationen. Settings,
+Themes, Tabs und das Privacy-Verhalten für Bestand bleiben unangetastet.
@@ -0,0 +1,31 @@
+---
+subtitle: UX und Robustheit
+versionsnatur: UX-Polish-Cycle
+---
+
+**Hellion Chat 1.4.5 — UX und Robustheit**
+
+Sechster Sub-Patch der v1.4.x Polish-Sweep-Serie. Render-Fehler im Chat-Fenster werden jetzt
+sichtbar, der First-Run-Wizard hat eine explizite Cancel-Schaltfläche, der Eingabe-Verlauf bleibt
+nicht mehr über Plugin-Reloads hinweg liegen, und die Statusleiste klippt in schmalen Fenstern nicht
+mehr.
+
+- **Fehler-Benachrichtigung im Chat-Fenster.** Wenn ein Render-Fehler in `DrawChatLog` auftritt,
+  zeigt das Plugin jetzt eine einmalige Warning-Notification mit Verweis aufs `/xllog`, statt das
+  Fenster stillschweigend leer zu lassen. Der Stack-Trace selbst geht weiter via `Plugin.Log.Error`
+  ins Logfile. De-Dup über Per-Session-Bool, damit ein wiederkehrender Fehler die Notification-Stack
+  nicht pro Frame neu vollkippt
+- **First-Run-Wizard trennt Accept und Close.** `OnClose` setzt nicht mehr stillschweigend
+  `FirstRunCompleted=true`, also lässt das X den Wizard schwebend zurück und er kommt beim nächsten
+  Plugin-Reload wieder. Eine neue „Später — Defaults behalten"-Schaltfläche im Footer ist der
+  explizite Weg, ohne Profil-Auswahl rauszukommen. Strings bilingual EN+DE plus Tooltip
+- **Eingabe-Verlauf wird beim Plugin-Reload geleert.** `InputHistoryService.Reset` hängt jetzt in
+  `Plugin.DisposeAsync` neben den anderen Pure-Memory-Cleanups, damit der statische Zustand aus der
+  vorigen Session den nächsten Load nicht mehr erbt
+- **Statusleiste klippt nicht mehr.** Der rechtsbündige Versions-Slot wird ausgeblendet wenn die
+  Chat-Window-Breite abzüglich Versions-Text unter 200 px fällt — vorher überlappte er die vier
+  linken Slots. Ab ausreichender Breite taucht der Slot wieder auf
+- **Intern:** `FontManager` fällt auf System-Font zurück wenn die eingebettete Hellion-Font-Resource
+  fehlt (Broken-csproj-Pfad, nie ein Produktions-Build), plus expliziter
+  Session-Only-Invariant-Kommentar für Auto-Tell-Tabs in `Plugin.cs:167-168` mit einem
+  TempTabCounter-Init-Pin in der Build-Suite. Kein Schema-Bump, keine Migration
@@ -0,0 +1,36 @@
+---
+subtitle: Code Hygiene and Refactor
+versionsnatur: Maintenance-Cycle
+---
+
+Wartungs-Patch ohne User-sichtbare Änderungen. Saubere Code-Basis als Vorbereitung auf das
+v1.4.7-Backlog-Cleanup, plus zwei geerbte Bugfixes aus dem ChatTwo-Upstream `f35b7d3`.
+
+- **preflight.sh härter**: csharpier-Reflow-Check (Block E) und markdownlint (Block F) laufen jetzt
+  im Pre-Push-Gate, statt erst beim Pre-Merge-Review aufzufallen.
+- **FontManager-Fallback robuster**: Atlas-Toolkit-Throws aus kaputten Font-Configs (IO,
+  InvalidOperation, ArgumentException) fallen jetzt zuverlässig auf NotoSansCjkRegular, statt den
+  Atlas-Build mitzureißen. Der Exception-Typ wird im Log mitgegeben für die Diagnose.
+- **URL-Validation beim Plugin-Load**: BrandingLinks (5 URLs) und IntegrationLinks (2 URLs) werden
+  via `[ModuleInitializer]` geprüft. Ein Tippfehler bei einer künftigen URL-Rotation wirft jetzt
+  sofort beim Plugin-Load, statt still beim Klick zu scheitern.
+- **Cherry-Pick aus ChatTwo `f35b7d3`** — Memory-Leak in `Chat.SetChannel`: der native `Utf8String`
+  wird jetzt auch dann freigegeben, wenn der Linkshell-Check den Channel ablehnt (vorher gefangen im
+  early-return).
+- **Cherry-Pick aus ChatTwo `f35b7d3`** — `Tab.Clone()` Deep-cloned jetzt `UsedChannel` und
+  `TellTarget`. Vorher Reference-Share-Bug: PopOut- und Temp-Tabs mutierten sich gegenseitig.
+- **Aktive-Tab-Underline pixel-perfect bei DPI-Scaling**: Die Underline-Pill skaliert jetzt mit
+  `ImGuiHelpers.GlobalScale` und rundet die DrawList-Koordinaten auf physische Pixel. Kein
+  Sub-Pixel-Blur mehr auf 125/150%-Setups.
+- **IconButton-Width-Fix**: der manuelle `width - 2 * CellPadding.X`-Subtract verlor den HUD-Scale
+  (Padding skaliert, der raw int nicht). Gemessene Breite läuft jetzt unverändert durch.
+- **Test-Isolation für MessageStore**: `Dalamud.Utility.Util`-Surface (IsWine, OpenLink) läuft jetzt
+  durch eine `IPlatformUtil`-Indirektion. MessageStores `IsWine`-Probe ist isoliert testbar in der
+  Build-Suite. Plus: HellionStyle-ChildBgAlpha als Pure-Helper extrahiert, Plugin.SaveConfig kopiert
+  nur Session-Tabs statt der ganzen Tab-Liste, SettingsOverview cached den DrawList einmal pro
+  Frame.
+- **Built-in-Theme-Roster**: Crystal Nocturne (Royal Sapphire + Electric Magenta auf Obsidian, von
+  CRYSTALLITE) ersetzt Moonlit Bloom. User mit Moonlit Bloom als aktivem Theme fallen beim ersten
+  Plugin-Load auf Hellion Arctic zurück.
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
@@ -0,0 +1,33 @@
+---
+subtitle: Backlog Cleanup and Mid-Features
+versionsnatur: Mid-Feature-Patch
+---
+
+Achter Sub-Patch der v1.4.x Polish-Sweep-Serie. Erstes User-sichtbares Feature-Bundle seit v1.4.5 —
+angepinnte Tell-Tabs die Relog überleben, opt-in Honorific-Glow, plus eine konfigurierbare Sidebar.
+
+- **TempTell anpinnen**: Rechtsklick auf einen TempTell-Tab in der Sidebar → „Tab anpinnen".
+  Angepinnte Tabs überleben Plugin-Reload und Char-Logout, behalten ihre Konversations-Historie
+  (wird beim Rehydrate aus dem MessageStore nachgeladen) und bleiben an die gleiche /tell-Person
+  gebunden. Hard-Cap 5 angepinnte Tabs in einem separaten Pool — die normalen Auto-Tell-Tabs (15er
+  Cap) sind davon entkoppelt, Gesamt-Decke 20. Die Sidebar gruppiert angepinnte Tabs in einer
+  eigenen „Angepinnt"-Sektion mit eigenem Trenner.
+- **Honorific Glow-Outline**: rendert jetzt eine 8-Richtungs-DrawList-Outline wenn der
+  Honorific-Titel eine Glow-Farbe trägt. Opt-in via **Settings → Integrationen → Glow-Outline
+  rendern (Honorific)** (Default OFF). Gradient (Color3 / GradientColourSet / Wave / Pulse) wird
+  geparst und im DTO weitergereicht, rendert aktuell aber statisch als Primärfarbe — der volle
+  Gradient-Port (Animations-Algorithmus + Pride-Palette) kommt als eigener Cycle nach.
+- **Sidebar-Breite konfigurierbar**: in **Theme & Layout** ein Slider 44–160 px. Default bleibt 44
+  px (icon-only), aber breiter machen damit Sektion-Header wie „Aktive Tells (3)" oder „Angepinnt
+  (2)" nicht abgeschnitten werden.
+- **Settings-Save Channel-Fix**: ein Save mit aktivem Party- oder Linkshell-Tab konnte den
+  Chat-Input zurück auf `/tell <angepinnte Person>` springen lassen. `Configuration.UpdateFrom`
+  bewahrt jetzt den Runtime-`CurrentChannel` über den persistent-Tab-Merge hinweg, und `TabSwitched`
+  deep-cloned den Seed-Channel statt sich den `UsedChannel` mit dem vorigen Tab zu teilen.
+- **Internal**: `IPluginLogProxy`-Indirektion vor Dalamud's `IPluginLog` über alle ~91
+  `Plugin.Log`-Call-Sites. Damit läuft `MessageStore.Migrate0` voll-isoliert in xUnit (F12.1-Lücke
+  aus v1.4.6 geschlossen). Plus: TempTab-Counter als abgeleitete Property statt gecachtes
+  Interlocked-Feld — die neuen Pin/Unpin-Übergänge sind Cold-Path, kein Lock-Free-Vorteil mehr.
+  Migration v16 → v17 ist rein additiv (neues `Tab.IsPinned`-Bool, Default false).
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
@@ -0,0 +1,19 @@
+---
+subtitle: Hook-Layer und Polish-Quick-Wins
+versionsnatur: Polish-Patch
+---
+
+- DbViewer Volltext-Suche: optionaler FTS5-Index über die ganze Chat-Historie. Wird beim ersten
+  v1.4.8-Start asynchron im Hintergrund gebaut, Progress als Toast. Lokale Page-Suche bleibt
+  Default. Such-Eingaben werden als exakte Wortfolge gematcht; mehrere Wörter werden nur gefunden,
+  wenn sie zusammen und in der Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt
+  eigene Anführungszeichen um den Suchbegriff.
+- Custom-Theme-Files laden sich beim Speichern automatisch neu, wenn das Theme aktiv ist. Kein
+  Picker-Klick mehr nötig.
+- Retention-Sweep blockt nicht mehr den Framework-Thread. Der Mini-Hitch von ~194ms pro Sweep ist
+  weg.
+- Statusleiste rendert sauber bei Windows-Skalierung über 100%.
+- Receive-Suppressed-Tells-Routing wurde in diesem Cycle untersucht und auf v1.5.x verschoben: wenn
+  andere Plugins Tells via CheckMessageHandled unterdrücken, überspringt FFXIVs Chat-Pipeline den
+  RaptureLogModule-Resolver und HellionChats Tab-Routing verliert den Tell-Partner. Der Fix liegt
+  architektonisch neben dem geplanten Ad-Block-Hook-Layer und kommt dort mit.
@@ -0,0 +1,28 @@
+---
+subtitle: Plugin-Load Render Polish
+versionsnatur: Performance-Patch
+---
+
+- First-Frame-HITCH unter 100 ms: der erste Render-Frame des Plugins liegt jetzt bei ~76 ms Median
+  (vorher ~127 ms), die Dalamud-Warnung „UiBuilder(Hellion Chat) > 100ms" beim Plugin-Start ist
+  damit weg. Erreicht durch das Verlagern von sechs nicht-essentiellen Render- Sektionen
+  (Statusleiste, Kanalname-Chunks, Fenster-Bounds-Check, Hinweis-Banner, Autocomplete,
+  Input-Preview) auf den zweiten Frame. Bei 60 fps sieht man die deferred-Sektionen ~17 ms später,
+  was im Atlas-Build-Fenster nach einem Reload unsichtbar bleibt.
+- Slash-Commands zentral registriert: /hellion, /hellionView, /hellionSeString und /hellionDebugger
+  werden jetzt im Plugin-Load zentral registriert statt erst beim ersten Öffnen ihres Ziel-Fensters.
+  Heißt: die Befehle funktionieren ab dem ersten Tick, auch wenn das jeweilige Fenster nie geöffnet
+  wurde. Der „Einstellungen"-Button im Plugin-Manager hängt am selben Pfad.
+- Plugin-Load-Diagnose-Logs als Tripwire: die Profiling-Logs für MessageStore.Connect,
+  MessageStore.Migrate, FilterAllTabs und den Auto-Translate-Warmup bleiben auf Information-Level
+  eingeschaltet. Falls eine zukünftige Änderung die Lade-Zeit wieder über 100 ms drückt, taucht der
+  Mehrverbrauch direkt im /xllog auf, ohne dass jemand erst den Debug-Filter einschalten muss.
+- ChatTwo-IPC-Kompatibilitäts-Layer: HellionChat spiegelt jetzt die komplette ChatTwo-IPC-Surface
+  (`GetChatInputState`, `ChatInputStateChanged`, `Register`, `Unregister`, `Available`, `Invoke`)
+  zusätzlich zu unseren eigenen `HellionChat.*`-Gates unter dem `ChatTwo.*`-Namensraum. Drittseitige
+  Integrationen die nur auf ChatTwo's IPC reagieren, etwa die Kontextmenü-Hooks von Artisan und
+  AllaganTools, funktionieren damit weiter ohne Code-Änderung auf ihrer Seite. Die
+  Conflict-Detection blockiert das parallele Laden von ChatTwo, daher kein Namensraum-Konflikt im
+  Live-Betrieb.
+- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations- Aufwand. Nach dem Update
+  läuft das Plugin gegen die bestehende v17-Datenbank weiter.
@@ -0,0 +1,28 @@
+---
+subtitle: DI Foundation und Service-Refactor
+versionsnatur: Architektur-Cycle
+---
+
+- **Architektur-Umbau ohne User-spürbare Verhaltens-Änderung:** der Plugin-Bootstrap wechselt auf
+  einen Generic-Host DI-Container (`Microsoft.Extensions.Hosting` + `IServiceCollection`) nach dem
+  Lightless-Sync-Muster. 18 Service-Klassen wandern von einem statischen `Plugin.LogProxy`-Locator
+  auf typisierte `ILogger<T>`-Constructor-Injection. `DalamudLogger` brückt
+  `Microsoft.Extensions.Logging` über auf Dalamuds `IPluginLog` — im xllog erscheinen jetzt
+  Service-spezifische Spalten wie `[ MessageManager]` und `[Honori...ervice]`.
+- **Plugin.LogProxy bleibt für die acht Buckets erhalten,** die Constructor-Injection nicht
+  erreicht: Static-Helper (EmoteCache, AutoTranslate, MemoryUtil, WrapperUtil), Dalamud-Reflektion
+  (Configuration), Data-Class mit Massen-Instanziierung (Message) und Instanz-Klassen die nur aus
+  Static-Methods loggen (FontManager, eine GameFunctions-Stelle).
+- **Performance bestätigt durch Cross-Plugin-Baseline:** HellionChat First-Frame-HITCH 77 ms Median,
+  Chat 2 v1.40.2 74 ms Median — kein DI-Penalty gegenüber dem Upstream-Fork-Origin. Lightless und
+  XIVInstantMessenger liegen bei ~7 ms weil sie ihren FontAtlas-Build deferren; das wird das
+  v1.5.1-Item.
+- **User-sichtbarer Bug-Fix nebenbei:** Slash-Command-Einfügen in das Chat-Eingabefeld (Friend-List
+  "/tell"-Action plus Plugin-Inserts von Artisan, AllaganTools und ähnlichen) ersetzt jetzt den
+  vorhandenen Input, statt anzukonkatenieren. Cherry-Pick aus ChatTwo upstream `ee7768ac` mit
+  Namespace-Anpassung.
+- **Foundation für die Plugin-Integrations-Wave:** v1.5.7-11 (Context-Menu, NotificationMaster,
+  Moodles, ExtraChat, XIVIM Quick-DM) werden ab jetzt strukturell handhabbar — neue Services sind
+  ein `services.AddSingleton<T>` plus ein paar Factory-Lambda- Zeilen, kein Plugin.cs-Anflanschen
+  mehr.
+- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations-Aufwand.
@@ -0,0 +1,21 @@
+---
+subtitle: "FontAtlas Refactor and Forge Signature"
+versionsnatur: "Architecture + Closure + Branding"
+---
+
+- **FontManager-Refactor.** Der FontAtlas baut jetzt nur noch einmal pro Plugin-Load statt vier- bis
+  fünfmal. Weniger CPU- und GPU-Druck in den ersten Sekunden nach einem Reload, weniger
+  Atlas-Texture-Memory-Churn. Die acht Font-Einstellungen können live über den neuen
+  `RebuildDelegateFonts`-Pfad geändert werden, ohne dass das Plugin neu geladen werden muss.
+- **Hellion Forge Signatur.** Das Plugin trägt jetzt eine ASCII-Fuchs-Signatur. Im `/xllog`
+  erscheint beim Plugin-Load ein kleiner Fuchs-Kopf, im First-Run-Wizard und unter Settings →
+  Information taucht eine eingeklappte „Hellion Forge"-Sektion mit dem vollen Fuchs auf. Gezeichnet
+  von Julia Moon, fest in der Plugin-DLL eingebettet.
+- **Honorific-Integration bleibt unverändert.** Der ursprünglich geplante Gradient-Render-Pfad
+  (Wave/Pulse-Animation) entfällt. Honorific 3.2 stellt keine IPC für den fertig gerenderten
+  Gradient-Frame zur Verfügung, und ein eigener Port der Pride-Palette wurde verworfen. Die
+  Honorific-Anzeige bleibt wie in v1.4.7 etabliert (statischer Glow plus Title).
+- **Hinweis zum HITCH-Win.** Der ursprünglich angepeilte 10×-First-Frame-Sprung
+  (Lightless/XIVIM-Pattern, ~7 ms statt ~75 ms) ist in diesem Cycle nicht eingetreten. Die
+  Render-Kosten liegen im UiBuilder-First-Frame-Pfad, nicht im FontAtlas-Build. Investigation kommt
+  als eigener späterer Cycle. Keine User-sichtbare Disruption, keine Migration.
@@ -0,0 +1,10 @@
+---
+subtitle: "First-Run Wizard — neu in 4 Steps, Roleplay-Profil neu"
+versionsnatur: "UX-Patch"
+---
+- **Vier Steps statt Single-Page.** Der First-Run-Wizard öffnet jetzt in vier Bühnen: Willkommen → Privacy-Profil → Power-Settings → Fertig. Pagination-Dots in Forge-Bronze oben rechts, Back/Skip/Next im Footer. Standardgröße 720×480 (Min 600×400) und der Fuchs-Banner sitzt als zugeklappter TreeNode oben in Step 1, damit die Einleitung im Fokus bleibt.
+- **Neues Privacy-Profil „Roleplay".** Datensparsamkeit plus Sagen und beide Emote-Typen für Story-Logs. Schreien und Rufen bleiben außen vor, Public-Distance-Lärm von Fremden ist kein Story-Inhalt. Aufbewahrung: Sagen 30 Tage, Emotes 90 Tage. Privacy-Picker wird zum 2×2-Grid, Casual bleibt mit ★-Marker als Empfehlung.
+- **Power-Settings sichtbar.** Bislang versteckte Defaults bekommen eine eigene Bühne: Vorherige Session laden, Filter inkl. alter Messages, N Tell-Messages vorladen, Compact-Density, Prettier-Timestamps und Theme-Picker für die 10 Built-in-Themes. Keine neuen Settings, nur das Bestehende sauber sichtbar.
+- **Staged-Commit und Test-Hint auf der Fertig-Bühne.** Auswahl wird erst beim Klick auf „Fertig ✓" geschrieben. „Später entscheiden" oder X-Close lässt die bestehende Config unangetastet, ein nicht angefasster Step behält die alten Werte. Direkt darunter sichtbar: „Tipp /tell <Spielername>", plus die aktuelle Preload-Zahl aus Step 3 als Hinweis auf den Auto-Tell-Tab-Spawn.
+- **Bestehende User sehen den neuen Wizard einmal.** Wer schon v1.5.1 hatte, bekommt den Multi-Step-Flow beim ersten v1.5.2-Boot aufgepoppt. Neues Config-Feld `WizardLastShownVersion` triggert das einmalig pro Wizard-Rework; Skip oder Finish reicht und danach öffnet er nicht mehr automatisch.
+- **Unter der Haube.** Pure-Helper-Tests für alle vier Profile-Sets in der Build-Suite (zwölf neue Facts), plus ein WizardStateSmokeStep für `/xlperf`. Migration v17 bleibt, nur ein optionales Config-Feld kommt dazu.
@@ -0,0 +1,9 @@
+---
+subtitle: "24 Sprachen, Inter Light statt Exo 2, HITCH 74 → 20 ms"
+versionsnatur: "Localisation + Font-Stack"
+---
+- **24 wählbare UI-Sprachen.** Aus dem ursprünglich nur als FR-Lokalisierung geplanten Cycle ist eine breite Welle geworden: Catalan, Czech, Danish, Dutch, English, Finnish, French, German, Greek, Hungarian, Italian, Japanese, Korean, Norsk bokmål, Polish, Portuguese (BR), Portuguese (PT), Romanian, Russian, Spanish, Swedish, Turkish, Ukrainian, Simplified Chinese, Traditional Chinese. Dropdown sortiert alphabetisch nach Endonym, „None" oben angepinnt. Nicht-native Übersetzungen sind AI-assisted und für Community-Review im Forge-Discord markiert.
+- **Inter Light statt Exo 2 als bundled Schrift.** Plus NotoSansCjkRegular als dritte Merge-Schicht. Damit deckt der Stack Latin Extended-A/B, Greek polytonic, Cyrillic Supplement und CJK (inkl. Hangul, Simplified-Han nach Reform) ab — die nicht-vanilla-FFXIV-Sprachen waren mit Exo 2 nicht lesbar.
+- **HITCH 74 → ~20 ms als Side-Effect.** Der UiBuilder-First-Frame-Lag lag seit v1.4.x stabil bei 74 ms; v1.5.1 wollte ihn in Richtung 7 ms ziehen, fiel als „Hypothese zu optimistisch" durch. Echter Grund: `Plugin.cs:937` push'te `RegularFont` nur wenn `FontsEnabled` true war — die „Mitgelieferte Schrift verwenden"-Logik setzte `FontsEnabled = false` mit, der bundled-Pfad war die ganze v1.5.x-Reihe tot, FFXIVs Axis-Font übernahm und kostete ~50 ms extra. Fix routet `RegularFont` jetzt auch über `UseHellionFont`. Median ~20 ms im 5-Reload-Stresstest (17.9-23.6 ms, Linux/Wine; Windows-Baseline steht aus).
+- **Glyph-Ranges aktivieren sich automatisch beim Sprachwechsel** plus eine One-Shot-Migration für User die schon eine non-Latin-Sprache eingestellt hatten. Neue WarningText unter dem Sprach-Dropdown weist darauf hin, dass FFXIVs Chat-Engine offiziell nur EN/DE/FR/JA-Glyphen rendert — andere Schriften können in der Game-Eingabe Garbled-Output zeigen.
+- **Unter der Haube.** Drei-Layer-Font-Stack, zwei neue ExtraGlyphRanges-Flags (`LatinExtended`, `Greek`), `LanguageOverride`-Enum wächst um zehn Locales plus drei reaktivierte (Italian, Korean, Norwegian mit `nb`). Append-only damit User-Configs stabil bleiben. Migration v17 bleibt.
@@ -0,0 +1,9 @@
+---
+subtitle: "Theme-Crossfade, Quick-Picker, Hover-Animationen"
+versionsnatur: "Polish & Motion"
+---
+- **Theme-Crossfade.** Theme-Wechsel blenden jetzt sanft über rund 300 ms ineinander, statt hart umzuschalten. Alle Hellion-Flächen gleiten mit: Sidebar, Titel, Buttons, Tabs, Scrollbar, Trennlinien. Der Fenster-Hintergrund snappt bewusst weiter, damit das Per-Window-Deckkraft-Setting aus Dalamuds Pinning-Menü unangetastet bleibt.
+- **Header-Quick-Picker.** Neuer Paletten-Button links vom Zahnrad im Chat-Header. Ein Klick öffnet ein kompaktes Popup mit zwei Sektionen: alle Built-in- und Custom-Themes sowie alle Tabs. Der aktive Eintrag trägt ein Häkchen, ein Klick wechselt ohne das Popup zu schließen. So lassen sich mehrere Wechsel hintereinander erledigen, ohne den Umweg über die Einstellungen.
+- **Sanfte Hover-Animationen.** Sidebar-Icons faden bei Hover sanft von gedimmt auf volle Deckkraft. Card-Mode-Trennlinien heben sich beim Überfahren einer Zeile für den ganzen Tab dezent ab. Beides framerate-unabhängig gerechnet, also auch bei Wine-Stall-Frames stabil.
+- **Bewegung reduzieren.** Neuer Toggle im Tab für Theme und Layout. Er deaktiviert Crossfade, Hover-Animationen und das Pulsieren ungelesener Tabs für alle, die eine statische Oberfläche bevorzugen.
+- Drei P3-Items plus der Accessibility-Toggle, kein Schema-Bump, keine Migration. Eine kleine Polish-Welle vor den größeren Cycles.
@@ -0,0 +1,11 @@
+---
+subtitle: "Backlog-Sync Tab-Features"
+versionsnatur: "Bundle-Patch (Hälfte 1 von 2)"
+---
+- **Fehlgeschlagener Tell.** Geht ein gesendeter Tell nicht durch (Empfänger offline, in einer Instanz oder blockiert), erscheint jetzt ein Warn-Toast statt dass die Systemmeldung durchrauscht. Abschaltbar in den Einstellungen unter Chat.
+- **Ton pro Tab.** Jeder Chat-Tab kann einen Benachrichtigungston spielen, wenn eine Nachricht eintrifft, während ein anderer Tab aktiv ist. Zur Wahl stehen die 16 Spiel-Chat-Sounds oder drei mitgelieferte Hellion-Sounds, mit einem Vorhör-Knopf. Standardmäßig aus, hört auf den globalen Sound-Schalter.
+- **Tab umbenennen.** Das Umbenennen-Feld im Rechtsklick-Menü fokussiert sich beim Öffnen von selbst und nimmt jetzt bis zu 512 Zeichen.
+- **Sprung ans Ende.** In der Chat-Kopfleiste erscheint ein Knopf, sobald man vom aktuellen Ende weggescrollt ist. Ein Klick springt zurück zur jüngsten Nachricht.
+- **Karten- und Item-Links.** Kartenmarkierung und verlinktes Item lassen sich aus dem Rechtsklick-Menü der Chat-Eingabe einfügen.
+- **Fuchs-Banner.** Das Hellion-Forge-Fuchs-Motiv im Einrichtungs-Assistenten und im Informations-Tab ist jetzt ein echtes Bild statt ASCII-Kunst.
+- Schema-Bump auf v18, rein additiv.
@@ -1,26 +1,29 @@
-
 ---

 ## How to install

-This release is distributed via the HellionChat custom repository, not the
-Dalamud main plugin repo. To install:
+This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo.
+To install:

 1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
 2. Add the URL:
-   `https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/repo.json`
+   `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
 3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install

 ## Project documents

- [README](https://github.com/JonKazama-Hellion/HellionChat/blob/main/README.md) — features, architecture, build
- [Privacy notice](https://github.com/JonKazama-Hellion/HellionChat/blob/main/PRIVACY.md) — what the plugin stores and sends
- [Third-party notices](https://github.com/JonKazama-Hellion/HellionChat/blob/main/docs/THIRD_PARTY_NOTICES.md) — dependencies and licences
- [Security policy](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SECURITY.md) — vulnerability reporting
- [Support](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SUPPORT.md) — bug reports, questions, contact paths
+- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md)
+  — features, architecture, build
+- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md)
+  — what the plugin stores and sends
+- [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md)
+  — dependencies and licences
+- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md)
+  — vulnerability reporting
+- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md)
+  — bug reports, questions, contact paths

 ## Licence

-[EUPL-1.2](https://github.com/JonKazama-Hellion/HellionChat/blob/main/LICENSE).
-Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna,
-also EUPL-1.2.
+[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE).
+Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
@@ -1,93 +0,0 @@
-name: CodeQL
-
-# Replaces the GitHub default-setup CodeQL scan. The default setup runs
-# without resolving the Dalamud assemblies (they live in a user-AppData
-# path) and reports "Low C# analysis quality" because call-target
-# resolution sits at ~64%. This workflow downloads the Dalamud staging
-# distribution before the build, runs a manual dotnet build, and then
-# lets CodeQL analyse the fully-resolved compilation. Quality climbs
-# back above the 85% thresholds.
-#
-# This workflow only consumes trusted inputs: the tag/branch ref via
-# the standard checkout action, and the Dalamud distribution URL which
-# is pinned to a goatcorp-controlled GitHub Pages target. No user-
-# controlled event payload (issue title, PR body, commit message) flows
-# into a run-step.
-#
-# Disable the default setup in the repo before this workflow lands:
-# Settings -> Code security -> Code scanning -> "CodeQL analysis" tile
-# -> Switch to advanced.
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  schedule:
-    - cron: '17 6 * * 1'
-
-permissions:
-  actions: read
-  contents: read
-  security-events: write
-
-jobs:
-  analyze-csharp:
-    name: Analyze (csharp)
-    runs-on: windows-latest
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-
-      - name: Setup .NET 10
-        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7  # v5.2.0
-        with:
-          dotnet-version: 10.0.x
-
-      - name: Download Dalamud staging
-        shell: pwsh
-        run: |
-          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
-          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
-          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          languages: csharp
-          build-mode: manual
-          queries: security-extended
-
-      - name: Restore
-        run: dotnet restore HellionChat/HellionChat.csproj
-
-      - name: Build (Release)
-        run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          category: /language:csharp
-
-  analyze-actions:
-    name: Analyze (actions)
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          languages: actions
-          build-mode: none
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          category: /language:actions
@@ -1,37 +1,193 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
+##############################################################
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+##   .gitignore – Hellion Forge / Hellion Media
+##
+##   Basis:        github/gitignore VisualStudio.gitignore
+##   Überarbeitet: Mai 2026
+##   Status:       Original-Patterns vollständig erhalten,
+##                 neu sortiert in logische Sektionen,
+##                 Sicherheits- & Tooling-Sektionen ergänzt.
+##
+##   Markierungen:
+##     [!! OBSOLET 2026 !!]  → Tool offiziell eingestellt,
+##                             Pattern bleibt aus Vorsicht drin.
+##
+##############################################################

-# Local development environment (HellionChat fork)
+
+# =====================================================
+# [!! KRITISCH !!]  Secrets, Keys & Credentials
+# Diese Sachen dürfen NIEMALS im Repo landen!
+# =====================================================
+
+# Environment Files
 .env
+.env.*
 .env.bak*
 .envrc
 !.env.example
-.vscode/
-scripts/
+!.env.sample

-# Local test project (stays out of the published plugin repo;
-# pure-function safety net for refactor cycles)
+# Private Keys & Zertifikate
+*.pem
+*.key
+*.p12
+*.pfx
+*.cer
+*.crt
+*.csr
+*.gpg
+*.asc
+
+# SSH Keys (falls jemand die ins Repo legt)
+id_rsa
+id_ed25519
+id_ecdsa
+known_hosts
+
+# Auth-/Token-Files
+auth.json
+.npmrc
+.pypirc
+secrets.json
+
+# ASP.NET / .NET App-Configs mit lokalen Secrets
+appsettings.*.local.json
+appsettings.Local.json
+local.settings.json
+
+# Memory Dumps (können Credentials im Heap enthalten!)
+*.dmp
+*.mdmp
+crash.log
+
+
+# =====================================================
+# Projekt-spezifisch (HellionChat Fork)
+# =====================================================
+
+# Lokale Entwicklungsumgebung
+.vscode/
+scripts/setup-dev-env.sh
+
+# Lokales Test-Projekt (bleibt aus dem Plugin-Repo raus;
+# pure-function safety net für Refactor-Cycles)
 HellionChat.Tests/
+ChatTwo.Tests
+TestResults
+*.db-shm
+*.db-wal

 # Packaging
 pack/

-# User-specific files
+# Specs und Plan-Dateien
+/.superpowers/
+
+# Claude Code lokales Setup (nicht committed)
+/.claude/
+/CLAUDE.md
+
+# Cycle-Working-Notes (im Vault gepflegt, lokales Repo-Pad bei Bedarf)
+/docs/cycle-notes/
+
+
+# =====================================================
+# OS-spezifische Files
+# =====================================================
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+._*
+
+# Windows
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+
+# Linux
+.directory
+.Trash-*
+
+
+# =====================================================
+# AI / LLM Tooling (2026 era)
+# =====================================================
+
+# Cursor IDE
+.cursor/
+.cursorignore
+
+# Aider
+.aider*
+
+# Continue.dev
+.continue/
+.continuerc.json
+
+# Windsurf
+.windsurf/
+
+# Sourcegraph Cody
+.cody/
+
+# Lokale Prompt-Sammlungen / Scratch-Pads
+prompts/local/
+
+
+# =====================================================
+# Editor & IDE (neben Visual Studio)
+# =====================================================
+
+# JetBrains (IntelliJ, Rider, etc.)
+.idea/
+
+# Vim / Neovim
+*.swp
+*.swo
+*.swn
+
+# Sublime Text
+*.sublime-workspace
+*.sublime-project
+
+
+# =====================================================
+# IDE & Editor – User-spezifische Files (VS)
+# =====================================================
+
+# Visual Studio User Files
 *.rsuser
 *.suo
 *.user
 *.userosscache
 *.sln.docstates

-# User-specific files (MonoDevelop/Xamarin Studio)
+# MonoDevelop/Xamarin Studio
 *.userprefs

-# Mono auto generated files
-mono_crash.*
+# Visual Studio Cache/Options Directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto-generated files
+Generated\ Files/
+
+# Local History
+.localhistory/
+
+# CodeRush personal settings
+.cr/personal
+
+
+# =====================================================
+# Build Output
+# =====================================================

-# Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
@@ -47,43 +203,24 @@ bld/
 [Ll]og/
 [Ll]ogs/

-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
+# ATL Project Build Output
 [Dd]ebugPS/
 [Rr]eleasePS/
 dlldata.c

-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
 # .NET Core
 project.lock.json
 project.fragment.lock.json
 artifacts/

-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
+# MigrationBackup (Package Reference Convert Tool)
+MigrationBackup/

-# StyleCop
-StyleCopReport.xml

-# Files built by Visual Studio
+# =====================================================
+# Build-Artefakte (Files built by Visual Studio)
+# =====================================================
+
 *_i.c
 *_p.c
 *_h.h
@@ -105,6 +242,7 @@ StyleCopReport.xml
 *.tmp_proj
 *_wpftmp.csproj
 *.log
+*.binlog
 *.vspscc
 *.vssscc
 .builds
@@ -112,10 +250,87 @@ StyleCopReport.xml
 *.svclog
 *.scc

-# Chutzpah Test files
+
+# =====================================================
+# Test Results
+# =====================================================
+
+# MSTest
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# Verify / Snapshot Testing (modern .NET, Spotty Wisdom)
+*.received.*
+*.received.txt
+
+# [!! OBSOLET 2026 !!] Chutzpah – Repository auf GitHub archiviert
 _Chutzpah*

+
+# =====================================================
+# Code Coverage
+# =====================================================
+
+# Coverlet
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage
+*.coverage
+*.coveragexml
+
+# DotCover (JetBrains)
+*.dotCover
+
+# AxoCover
+.axoCover/*
+!.axoCover/settings.json
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# OpenCover UI Analysis
+OpenCover/
+
+# [!! OBSOLET 2026 !!] MightyMoose / AutoTest.Net – seit >10 Jahren nicht mehr gepflegt
+*.mm.*
+AutoTest.Net/
+
+
+# =====================================================
+# Profiler & Trace
+# =====================================================
+
+# Visual Studio Profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# NVidia Nsight GPU Debugger
+*.nvuser
+
+
+# =====================================================
+# Cache Files (VS, C++, Sass)
+# =====================================================
+
 # Visual C++ cache files
+# Hinweis: Manche Patterns hier werden auch vom C#-Linter genutzt (z. B. *.lscache)
 ipch/
 *.aps
 *.ncb
@@ -125,101 +340,80 @@ ipch/
 *.cachefile
 *.VC.db
 *.VC.VC.opendb
+*.lscache

-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
+# Visual Studio cache (.cache files allgemein, .cache directories behalten)
+*.[Cc]ache
+!?*.[Cc]ache/

-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
+# Web Workbench Sass
 .sass-cache/

-# Installshield output folder
-[Ee]xpress/

-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
+# =====================================================
+# NuGet & Dependencies
+# =====================================================

 # NuGet Packages
 *.nupkg
-# NuGet Symbol Packages
 *.snupkg
-# The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
 !**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets

+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Fody – auto-generated XML schema
+FodyWeavers.xsd
+
+# Node (falls JS-Tooling im Build genutzt wird)
+.ntvs_analysis.dat
+node_modules/
+
+# Python Tools für Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+
+# =====================================================
+# Mono
+# =====================================================
+
+mono_crash.*
+
+
+# =====================================================
+# Publish & Deploy
+# =====================================================
+
+# Click-Once
+publish/
+
+# Publish Web Output
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.[Pp]ublish.xml
+*.azurePubxml
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App Publish Settings
+# Comment the next line if you want to checkin your Azure Web App publish settings,
+# but sensitive information contained in these scripts will be unencrypted
+PublishScripts/
+
 # Microsoft Azure Build Output
 csx/
 *.build.csdef
@@ -228,7 +422,35 @@ csx/
 ecf/
 rcf/

-# Windows Store app package directories and files
+# Service Fabric Backup
+ServiceFabricBackup/
+
+# Installshield
+[Ee]xpress/
+
+
+# =====================================================
+# Container / Infrastructure-as-Code (Vorsicht: Tokens!)
+# =====================================================
+
+# Docker
+docker-compose.override.yml
+
+# Terraform
+.terraform/
+*.tfstate
+*.tfstate.*
+*.tfvars
+!example.tfvars
+
+# Serverless Framework
+.serverless/
+
+
+# =====================================================
+# Windows Store / AppX
+# =====================================================
+
 AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
@@ -237,50 +459,29 @@ _pkginfo.txt
 *.appxbundle
 *.appxupload

-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/

-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
+# =====================================================
+# Datenbanken & SQL
+# =====================================================

-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
+# SQL Server
 *.mdf
 *.ldf
 *.ndf

-# Business Intelligence projects
+# Andere DB-bezogene
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+
+# [!! OBSOLET 2026 !!] BeatPulse – wurde 2019 umbenannt zu AspNetCore.Diagnostics.HealthChecks
+healthchecksdb
+
+
+# =====================================================
+# Business Intelligence / Reporting
+# =====================================================
+
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
@@ -288,27 +489,97 @@ ServiceFabricBackup/
 *- [Bb]ackup.rdl
 *- [Bb]ackup ([0-9]).rdl
 *- [Bb]ackup ([0-9][0-9]).rdl
+*.rptproj.bak
+
+
+# =====================================================
+# Add-ins & Analyzer Tools
+# =====================================================
+
+# ReSharper
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity
+_TeamCity*
+
+# StyleCop
+StyleCopReport.xml
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# Guidance Automation Toolkit
+*.gpState

 # Microsoft Fakes
 FakesAssemblies/

-# GhostDoc plugin setting file
+# [!! OBSOLET 2026 !!] GhostDoc Plugin – Submain hat das Tool eingestellt
 *.GhostDoc.xml

-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
+# Tabs Studio
+*.tss

-# Visual Studio 6 build log
+# Telerik JustMock
+*.jmconfig
+
+# MFractors (Xamarin productivity tool)
+.mfractor/
+
+# DocProject Documentation Generator
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+
+# =====================================================
+# Sonstige Sprachen & Tooling
+# =====================================================
+
+# Ionide (F# VS Code Tools)
+.ionide/
+
+# Azure Stream Analytics Local Run
+ASALocalRun/
+
+# BizTalk Build Output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# Orleans
+orleans.codegen.cs
+
+
+# =====================================================
+# [!! OBSOLET 2026 !!]  Legacy-Tooling (eingestellt)
+# Patterns bleiben aus Vorsicht drin.
+# =====================================================
+
+# [!! OBSOLET 2026 !!] TFS 2012 Local Workspace – ersetzt durch Azure DevOps
+$tf/
+
+# [!! OBSOLET 2026 !!] Visual Studio 6 Build Log – VS6 ist von 1998
 *.plg

-# Visual Studio 6 workspace options file
+# [!! OBSOLET 2026 !!] Visual Studio 6 Workspace Options
 *.opt

-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+# [!! OBSOLET 2026 !!] Visual Studio 6 Workspace File
 *.vbw

-# Visual Studio LightSwitch build output
+# [!! OBSOLET 2026 !!] RIA / Silverlight – Microsoft hat das Okt. 2021 eingestellt
+Generated_Code/
+
+# [!! OBSOLET 2026 !!] Visual Studio LightSwitch – von Microsoft eingestellt
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
 **/*.DesktopClient/ModelManifest.xml
@@ -316,71 +587,31 @@ node_modules/
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions

-# Paket dependency manager
-.paket/paket.exe
-paket-files/

-# FAKE - F# Make
-.fake/
+# =====================================================
+# Upgrade / Backup-Reports
+# =====================================================

-# CodeRush personal settings
-.cr/personal
+# Backup-Files vom Konvertieren alter VS-Projekte (wir haben ja git ;-))
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm

-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc

-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
+# =====================================================
+# Misc / Temp / Backup
+# =====================================================

-# Tabs Studio
-*.tss
+ClientBin/
+~$*
+*~
+*.publishsettings

-# Telerik's JustMock configuration file
-*.jmconfig
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk

-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-
-#Specs und Plan datein
-/.superpowers/
-
-#Test Datein
-ChatTwo.Tests
-TestResults
-*.db-shm
-*.db-wal
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
@@ -0,0 +1,17 @@
+{
+    "MD003": { "style": "atx" },
+    "MD004": { "style": "dash" },
+    "MD007": { "indent": 2 },
+    "MD009": { "br_spaces": 2, "strict": false, "list_item_empty_lines": false },
+    "MD013": false,
+    "MD024": { "siblings_only": true },
+    "MD029": false,
+    "MD033": false,
+    "MD036": false,
+    "MD040": true,
+    "MD041": false,
+    "MD046": { "style": "fenced" },
+    "MD048": { "style": "backtick" },
+    "MD049": { "style": "underscore" },
+    "MD050": { "style": "asterisk" }
+}
@@ -0,0 +1,50 @@
+# ##############################################################
+# #
+# #   .prettierignore – Hellion Forge / Hellion Media
+# #
+# #   Files die Prettier NICHT anfassen soll.
+# #   Überarbeitet: Mai 2026
+# #
+# #   Hinweis: Prettier liest auch .gitignore automatisch mit.
+# #   Hier nur Sachen die zusätzlich ignoriert werden müssen
+# #   oder die im Repo liegen aber nicht formatiert werden dürfen.
+# #
+# ##############################################################
+
+
+# === .NET Build Output ===
+bin/
+obj/
+
+# === JS / Web Build Output ===
+node_modules/
+dist/
+out/
+build/
+coverage/
+
+# === Generierte C#-Files (Designer, Source Generators) ===
+*.Designer.cs
+*.g.cs
+*.g.i.cs
+*.generated.cs
+*.AssemblyInfo.cs
+*.AssemblyAttributes.cs
+
+# === Lock-Files (NIE umformatieren – zerschießt den Hash) ===
+package-lock.json
+yarn.lock
+pnpm-lock.yaml
+packages.lock.json
+
+# === Minified Files (bewusst kompakt, niemals anfassen) ===
+*.min.js
+*.min.css
+
+# === Test-Snapshots (z. B. Verify) ===
+*.received.*
+*.verified.*
+**/__snapshots__/
+
+# === Plugin-Manifest (DalamudPackager-Schema, fix lassen) ===
+HellionChat/HellionChat.yaml
@@ -0,0 +1,35 @@
+{
+    "printWidth": 120,
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": false,
+    "trailingComma": "all",
+    "bracketSpacing": true,
+    "arrowParens": "always",
+    "proseWrap": "always",
+    "endOfLine": "lf",
+    "overrides": [
+        {
+            "files": "*.md",
+            "options": {
+                "printWidth": 100,
+                "tabWidth": 2
+            }
+        },
+        {
+            "files": ["*.yml", "*.yaml"],
+            "options": {
+                "tabWidth": 2,
+                "singleQuote": true
+            }
+        },
+        {
+            "files": "*.json",
+            "options": {
+                "tabWidth": 4,
+                "trailingComma": "none"
+            }
+        }
+    ]
+}
@@ -0,0 +1,53 @@
+# ##############################################################
+# #
+# #   .yamllint.yaml – Hellion Forge / Hellion Media
+# #
+# #   YAML-Linting Konfiguration.
+# #   Überarbeitet: Mai 2026
+# #
+# #   Regel-Doku:
+# #     https://yamllint.readthedocs.io/en/stable/rules.html
+# #
+# ##############################################################
+
+extends: default
+
+# Plugin-Manifest folgt DalamudPackager-Konvention (4-space-indent für
+# image_urls + tags). yamllint-Default verlangt 2 — Konflikt, daher
+# ignorieren statt das Manifest zu reformatieren.
+ignore: |
+  HellionChat/HellionChat.yaml
+
+rules:
+  # Zeilenlängen-Check aus (konsistent mit markdownlint MD013)
+  line-length: disable
+
+  # YAML ohne führendes "---" erlaubt
+  document-start: disable
+
+  # GitHub Actions nutzt "on:" als Trigger-Key.
+  # Ohne diesen Override würde yamllint das als boolean "on" beklagen.
+  truthy:
+    allowed-values: ['true', 'false', 'on']
+
+  # Maximal 1 Leerzeile in Folge (saubere Files)
+  empty-lines:
+    max: 1
+
+  # YAML-Standard ist 2 Spaces (auch GitHub Actions erwartet das).
+  # Explizit setzen, um Konsistenz im Repo zu erzwingen.
+  indentation:
+    spaces: 2
+    indent-sequences: true
+    check-multi-line-strings: false
+
+  # Kommentare brauchen Space nach #, müssen mit Content beginnen
+  comments:
+    require-starting-space: true
+    min-spaces-from-content: 1
+
+  # Kein Whitespace am Zeilenende
+  trailing-spaces: enable
+
+  # Datei muss mit Newline enden
+  new-line-at-end-of-file: enable
@@ -2,16 +2,15 @@

 ## A Note on This Project

-HellionChat is a one-person side project developed under Hellion Forge.
-I maintain this in my spare time, which means replies can take a few
-days. Please do not escalate just because a thread is quiet.
+HellionChat is a one-person side project developed under Hellion Forge. I maintain this in my spare
+time, which means replies can take a few days. Please do not escalate just because a thread is
+quiet.

-When in doubt, assume good intent. Contributors come from different
-backgrounds, time zones and skill levels. A clarifying question is
-almost always a better first move than an accusation.
+When in doubt, assume good intent. Contributors come from different backgrounds, time zones and
+skill levels. A clarifying question is almost always a better first move than an accusation.

-Please also keep discussions on topic. This project is about a Dalamud
-chat plugin. Off-topic arguments belong elsewhere.
+Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic
+arguments belong elsewhere.

 ---

@@ -19,88 +18,75 @@ chat plugin. Off-topic arguments belong elsewhere.

 We pledge to make our community welcoming, safe, and equitable for all.

-We are committed to fostering an environment that respects and promotes
-the dignity, rights, and contributions of all individuals, regardless
-of characteristics including race, ethnicity, caste, color, age,
-physical characteristics, neurodiversity, disability, sex or gender,
-gender identity or expression, sexual orientation, language, philosophy
-or religion, national or social origin, socio-economic position, level
-of education, or other status. The same privileges of participation are
-extended to everyone who participates in good faith and in accordance
-with this Covenant.
+We are committed to fostering an environment that respects and promotes the dignity, rights, and
+contributions of all individuals, regardless of characteristics including race, ethnicity, caste,
+color, age, physical characteristics, neurodiversity, disability, sex or gender, gender identity or
+expression, sexual orientation, language, philosophy or religion, national or social origin,
+socio-economic position, level of education, or other status. The same privileges of participation
+are extended to everyone who participates in good faith and in accordance with this Covenant.

 ## Encouraged Behaviors

-While acknowledging differences in social norms, we all strive to meet
-our community's expectations for positive behavior. We also understand
-that our words and actions may be interpreted differently than we intend
-based on culture, background, or native language.
+While acknowledging differences in social norms, we all strive to meet our community's expectations
+for positive behavior. We also understand that our words and actions may be interpreted differently
+than we intend based on culture, background, or native language.

-With these considerations in mind, we agree to behave mindfully toward
-each other and act in ways that center our shared values, including:
+With these considerations in mind, we agree to behave mindfully toward each other and act in ways
+that center our shared values, including:

-1. Respecting the **purpose of our community**, our activities, and our
-   ways of gathering.
+1. Respecting the **purpose of our community**, our activities, and our ways of gathering.
 2. Engaging **kindly and honestly** with others.
 3. Respecting **different viewpoints** and experiences.
 4. **Taking responsibility** for our actions and contributions.
 5. Gracefully giving and accepting **constructive feedback**.
 6. Committing to **repairing harm** when it occurs.
-7. Behaving in other ways that promote and sustain the **well-being of
-   our community**.
+7. Behaving in other ways that promote and sustain the **well-being of our community**.

 ## Restricted Behaviors

-We agree to restrict the following behaviors in our community.
-Instances, threats, and promotion of these behaviors are violations of
-this Code of Conduct.
+We agree to restrict the following behaviors in our community. Instances, threats, and promotion of
+these behaviors are violations of this Code of Conduct.

-1. **Harassment.** Violating explicitly expressed boundaries or engaging
-   in unnecessary personal attention after any clear request to stop.
-2. **Character attacks.** Making insulting, demeaning, or pejorative
-   comments directed at a community member or group of people.
-3. **Stereotyping or discrimination.** Characterizing anyone's
-   personality or behavior on the basis of immutable identities or
-   traits.
-4. **Sexualization.** Behaving in a way that would generally be
-   considered inappropriately intimate in the context or purpose of the
-   community.
-5. **Violating confidentiality.** Sharing or acting on someone's
-   personal or private information without their permission.
-6. **Endangerment.** Causing, encouraging, or threatening violence or
-   other harm toward any person or group.
-7. Behaving in other ways that **threaten the well-being** of our
-   community.
+1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal
+   attention after any clear request to stop.
+2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a
+   community member or group of people.
+3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis
+   of immutable identities or traits.
+4. **Sexualization.** Behaving in a way that would generally be considered inappropriately intimate
+   in the context or purpose of the community.
+5. **Violating confidentiality.** Sharing or acting on someone's personal or private information
+   without their permission.
+6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person
+   or group.
+7. Behaving in other ways that **threaten the well-being** of our community.

 ### Other Restrictions

-1. **Misleading identity.** Impersonating someone else for any reason,
-   or pretending to be someone else to evade enforcement actions.
-2. **Failing to credit sources.** Not properly crediting the sources of
-   content you contribute.
-3. **Promotional materials.** Sharing marketing or other commercial
-   content in a way that is outside the norms of the community.
-4. **Irresponsible communication.** Failing to responsibly present
-   content which includes, links to, or describes any other restricted
-   behaviors.
+1. **Misleading identity.** Impersonating someone else for any reason, or pretending to be someone
+   else to evade enforcement actions.
+2. **Failing to credit sources.** Not properly crediting the sources of content you contribute.
+3. **Promotional materials.** Sharing marketing or other commercial content in a way that is outside
+   the norms of the community.
+4. **Irresponsible communication.** Failing to responsibly present content which includes, links to,
+   or describes any other restricted behaviors.

 ## Reporting

-If something here is being broken, contact me directly. Do not open a
-public issue.
+If something here is being broken, contact me directly. Do not open a public issue.

-| Channel    | Address                  |
-| ---------- | ------------------------ |
+| Channel    | Address                    |
+| ---------- | -------------------------- |
 | Email      | `kontakt@hellion-media.de` |
-| Discord DM | `@j.j_kazama`            |
+| Discord DM | `@j.j_kazama`              |

-Reports stay private. I will acknowledge within a few weekdays
-(European business hours) and tell you what I plan to do.
+Reports stay private. I will acknowledge within a few weekdays (European business hours) and tell
+you what I plan to do.

 ## Enforcement

-I am the sole maintainer, so enforcement is a single-person process.
-I will pick the lightest measure that actually resolves the situation:
+I am the sole maintainer, so enforcement is a single-person process. I will pick the lightest
+measure that actually resolves the situation:

 1. Private note asking the behaviour to stop.
 2. Public correction in the affected thread.
@@ -109,25 +95,20 @@ I will pick the lightest measure that actually resolves the situation:
 5. Temporary block from the repository or related spaces.
 6. Permanent block.

-Severe cases skip the lower steps. I will not negotiate over harassment
-or threats.
+Severe cases skip the lower steps. I will not negotiate over harassment or threats.

 ## Scope

-This Code of Conduct applies to all spaces the project owns or that I
-run on its behalf: the GitHub repository, GitHub Discussions,
-project-related Discord conversations, and the maintainer contact
-listed in [`SECURITY.md`](SECURITY.md). It also applies when someone
-is identifiably representing HellionChat elsewhere, for example when
-posting as a HellionChat maintainer in the Dalamud Discord.
+This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub
+repository, GitHub Discussions, project-related Discord conversations, and the maintainer contact
+listed in [`SECURITY.md`](SECURITY.md). It also applies when someone is identifiably representing
+HellionChat elsewhere, for example when posting as a HellionChat maintainer in the Dalamud Discord.

 ## Attribution

-This Code of Conduct is adapted from the Contributor Covenant, version
-3.0, available at
+This Code of Conduct is adapted from the Contributor Covenant, version 3.0, available at
 [https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/).

-Contributor Covenant is stewarded by the Organization for Ethical
-Source and licensed under CC BY-SA 4.0. To view a copy of this
-license, visit
+Contributor Covenant is stewarded by the Organization for Ethical Source and licensed under CC BY-SA
+4.0. To view a copy of this license, visit
 [https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/).
@@ -1,87 +1,75 @@
 # Contributing to HellionChat

-Thanks for taking a look. HellionChat is a one-person side project
-developed under Hellion Forge. It started as a fork of
-[Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become
-a standalone plugin under its own namespace, IPC channels and
-source tree (standalone-cut completed in v1.0.0). Forking HellionChat
-itself is explicitly permitted under the EUPL-1.2.
+Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It
+started as a fork of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a
+standalone plugin under its own namespace, IPC channels and source tree (standalone-cut completed in
+v1.0.0). Forking HellionChat itself is explicitly permitted under the EUPL-1.2.

-This document explains what I am looking for, what I am not, and how
-to make a contribution land smoothly.
+This document explains what I am looking for, what I am not, and how to make a contribution land
+smoothly.

 ## Before You Open Anything

- Read the [README](README.md) so you understand the scope: a
-  privacy-focused, EUPL-1.2-licensed Dalamud plugin that intentionally
-  removes the upstream webinterface and ships privacy-first defaults.
- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Cherry-picks
-  from upstream Chat 2 are selective and deliberate; not everything
-  that lands there belongs here.
- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes
-  through a private advisory, never a public issue or PR.
+- Read the [README](README.md) so you understand the scope: a privacy-focused, EUPL-1.2-licensed
+  Dalamud plugin that intentionally removes the upstream webinterface and ships privacy-first
+  defaults.
+- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2
+  has ended in the v1.4.x cycle; HellionChat continues as an independent codebase. Existing
+  upstream-derived code keeps its attribution. New contributions stand on their own and do not need
+  to be cherry-pick-compatible.
+- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes through a private advisory,
+  never a public issue or PR.
 - Read the [Code of Conduct](CODE_OF_CONDUCT.md).

 ## What I Will Accept

- Bug fixes for behaviour documented in the README, the in-plugin
-  settings or the changelog.
- Translation contributions for Hellion-specific strings via direct
-  pull requests against
-  `HellionChat/Resources/HellionStrings.*.resx`. Translations for
-  upstream Chat 2 strings (`Language.*.resx`) are not handled here;
-  those go to the upstream Chat 2 project.
+- Bug fixes for behaviour documented in the README, the in-plugin settings or the changelog.
+- Translation contributions for Hellion-specific strings via direct pull requests against
+  `HellionChat/Resources/HellionStrings.*.resx`. Translations for upstream Chat 2 strings
+  (`Language.*.resx`) are not handled here; those go to the upstream Chat 2 project.
 - Documentation improvements (README, comments, this file).
 - Performance fixes with a measurable before/after.
- New features that fit the privacy-first scope and do not duplicate
-  what an existing Dalamud plugin already does well.
+- New features that fit the privacy-first scope and do not duplicate what an existing Dalamud plugin
+  already does well.

 ## What I Will Probably Decline

- Re-introducing the webinterface or any remote-access feature. It was
-  removed in v0.2.0 on purpose. See the README section
-  "Was gegenüber Chat 2 fehlt".
- Features that bypass the privacy filter or weaken the default
-  retention behaviour without an explicit, documented opt-in.
- Sweeping refactors that touch large parts of the codebase. They make
-  selective upstream cherry-picks much harder and the maintenance cost
-  outweighs the benefit for a one-person project.
+- Re-introducing the webinterface or any remote-access feature. It was removed in v0.2.0 on purpose.
+  See the README section "Was gegenüber Chat 2 fehlt".
+- Features that bypass the privacy filter or weaken the default retention behaviour without an
+  explicit, documented opt-in.
+- Sweeping refactors that touch large parts of the codebase. The maintenance cost outweighs the
+  benefit for a one-person project. (This used to be doubly important because of the upstream
+  cherry-pick path; that path is closed now, but the rule still holds on its own merits.)
 - AI-generated code dropped in without disclosure or human review. See
-  [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle
-  AI assistance on my side; I expect comparable transparency from
-  contributors.
+  [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle AI assistance on my side; I
+  expect comparable transparency from contributors.

-If you are unsure whether an idea fits, open a feature-request issue
-first and ask before writing code. I would rather say "no" to a
-proposal than to a finished pull request.
+If you are unsure whether an idea fits, open a feature-request issue first and ask before writing
+code. I would rather say "no" to a proposal than to a finished pull request.

 ## Workflow

-1. Open an issue (bug or feature request) using the templates under
-   `.github/ISSUE_TEMPLATE/`. Skip this for trivial typos.
-2. Fork the repository and branch off `main`. Branch naming is
-   informal; something like `fix/auto-tell-history-empty` or
-   `feat/theme-export` is fine.
-3. Match the existing code style. The repository ships an
-   `.editorconfig` that VS Code and Rider pick up automatically.
-4. Keep commits focused. Several small commits with clear messages are
-   easier to review than one large one. Squash-on-merge happens at
-   the PR level if needed.
-5. If your change touches user-visible behaviour, update the README
-   and/or the changelog block in `HellionChat/HellionChat.yaml` and
-   `repo.json`. I bump the version number myself at release time.
-6. Open the pull request against `main`. The PR template will ask
-   you to summarise the change, the testing you did and any
-   compatibility notes.
+1. Open an issue (bug or feature request) using the templates under `.github/ISSUE_TEMPLATE/`. Skip
+   this for trivial typos.
+2. Fork the repository and branch off `main`. Branch naming is informal; something like
+   `fix/auto-tell-history-empty` or `feat/theme-export` is fine.
+3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider
+   pick up automatically.
+4. Keep commits focused. Several small commits with clear messages are easier to review than one
+   large one. Squash-on-merge happens at the PR level if needed.
+5. If your change touches user-visible behaviour, update the README and/or the changelog block in
+   `HellionChat/HellionChat.yaml` and `repo.json`. I bump the version number myself at release time.
+6. Open the pull request against `main`. The PR template will ask you to summarise the change, the
+   testing you did and any compatibility notes.

 ## Build and Test

-The project targets `net10.0-windows` against Dalamud SDK 15. To build
-locally you need:
+The project targets `net10.0-windows` against Dalamud SDK 15. To build locally you need:

 - .NET 10 SDK
- A working Dalamud dev environment with `DALAMUD_HOME` set
-  (XIVLauncher installed and launched once is the simplest path)
+- A working Dalamud dev environment with `DALAMUD_HOME` set (XIVLauncher installed and launched once
+  is the simplest path)
 - VS Code with the C# Dev Kit, Rider, or Visual Studio

 ```bash
@@ -89,59 +77,74 @@ dotnet restore
 dotnet build HellionChat.sln -c Release
 ```

-There are currently no tests in `HellionChat.sln`. If you add a test
-project, point it at the relevant subsystems (privacy filter,
-configuration migration, message store) and mention it in the PR.
+There are currently no tests in `HellionChat.sln`. If you add a test project, point it at the
+relevant subsystems (privacy filter, configuration migration, message store) and mention it in the
+PR.

-For a smoke test in-game: build, copy the output into your Dalamud
-`devPlugins/HellionChat/` directory and load it via `/xlplugins`.
+For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/`
+directory and load it via `/xlplugins`.

 ## Continuous Integration

 Every push and every pull request runs:

-| Workflow      | What it checks                        |
-| ------------- | ------------------------------------- |
-| `build.yml`   | `dotnet build` and `dotnet test`      |
-| `codeql.yml`  | CodeQL security analysis              |
+| Workflow     | What it checks                   |
+| ------------ | -------------------------------- |
+| `build.yml`  | `dotnet build` and `dotnet test` |
+| `codeql.yml` | CodeQL security analysis         |

-A pull request will not be merged while either of these is failing.
-CodeQL findings on changed code need to be addressed; pre-existing
-findings on untouched code are tracked separately.
+A pull request will not be merged while either of these is failing. CodeQL findings on changed code
+need to be addressed; pre-existing findings on untouched code are tracked separately.

 ## Translations

-Hellion-specific strings live in
-`HellionChat/Resources/HellionStrings.resx` (English source) and
-`HellionStrings.<lang>.resx` (per-language). These are accepted as
-direct pull requests.
+Hellion-specific strings live in `HellionChat/Resources/HellionStrings.resx` (English source) and
+`HellionStrings.<lang>.resx` (per-language). These are accepted as direct pull requests.

-The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx`
-are **not** translated here. They are owned by the upstream project
-and synced in via cherry-pick. Please contribute those to
-[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) instead.
+The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` are **not** translated here.
+They are kept as-is from the last upstream sync and remain the work of the Chat 2 Crowdin community.
+Active cherry-picking from upstream ended in the v1.4.x cycle (see
+[`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future translation improvements to those
+upstream strings will not flow into HellionChat automatically anymore. If you have improvements for
+the original Chat 2 strings, please contribute them to
+[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) directly.

 ## Licensing

 By submitting a pull request you confirm that:

- Your contribution is your own work, or you have the right to
-  contribute it under the project licence.
- You agree that your contribution will be released under the
-  [EUPL-1.2](LICENSE), the same licence as the rest of the project.
+- Your contribution is your own work, or you have the right to contribute it under the project
+  licence.
+- You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence
+  as the rest of the project.

-There is no separate CLA. Forking HellionChat is explicitly permitted
-under the EUPL-1.2, as with any EUPL-licensed project.
+There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with
+any EUPL-licensed project.

 ## Response Times

-| Channel       | Address                    |
-| ------------- | -------------------------- |
+| Channel       | Address                                 |
+| ------------- | --------------------------------------- |
 | GitHub Issues | Preferred for bugs and feature requests |
-| Discord DM    | `@j.j_kazama`              |
-| Email         | `kontakt@hellion-media.de` |
+| Discord DM    | `@j.j_kazama`                           |
+| Email         | `kontakt@hellion-media.de`              |

-I respond on weekdays during European business hours and take weekends
-and FFXIV patch days off. A pull request that sits for a few days has
-not been ignored. Pinging once after a week is fine; please do not
-ping daily.
+I respond on weekdays during European business hours and take weekends and FFXIV patch days off. A
+pull request that sits for a few days has not been ignored. Pinging once after a week is fine;
+please do not ping daily.
+
+## First-time setup
+
+After cloning, run once:
+
+```bash
+./scripts/setup-hooks.sh
+```
+
+This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight
+(versions/manifest/changelog/build).
+
+### Test suite
+
+The plugin's test suite lives in a separate local repository and is not part of this codebase. If
+you need access for development, contact the maintainer.
@@ -4,22 +4,22 @@ HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV
 Source code
 ═══════════════════════════════════════════════════════════════════

-Copyright (c) 2022-2026 Infiziert90 (Infi) and Anna Clemens (ascclemens)
-    Original ChatTwo authors and copyright holders of the upstream
-    plugin this fork is built on. Their work covers the message store,
-    the channel filtering, the sidebar tab system, the FFXIV chat
-    hooks, the localisation infrastructure and most of the
-    architecture HellionChat still relies on.
+Copyright (c) 2022-2026 **[Infiziert90 (Infi)](https://github.com/Infiziert90)** and **[Anna](https://github.com/anna-is-cute)**
+Original ChatTwo authors and copyright holders of the upstream
+plugin this fork is built on. Their work covers the message store,
+the channel filtering, the sidebar tab system, the FFXIV chat
+hooks, the localisation infrastructure and most of the
+architecture HellionChat still relies on.

 Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
-    HellionChat-specific modifications, including the privacy filter,
-    per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
-    German localisation and the EUPL-1.2 fork maintenance.
+HellionChat-specific modifications, including the privacy filter,
+per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
+German localisation and the EUPL-1.2 fork maintenance.

 Source code is licensed under the European Union Public Licence
 (EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
 file at the root of this repository. The official Licence website is
-at: https://eupl.eu/1.2/en/
+at: <https://eupl.eu/1.2/en/>

 This Work is provided "AS IS" without warranties of any kind. See
 Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of
@@ -42,8 +42,8 @@ Bundled assets
 ═══════════════════════════════════════════════════════════════════

 Exo 2 font (HellionChat/Resources/HellionFont.ttf)
-    SIL Open Font License 1.1, full text in HellionFont-OFL.txt.
-    Bundled with permission per the OFL terms.
+SIL Open Font License 1.1, full text in HellionFont-OFL.txt.
+Bundled with permission per the OFL terms.

 ═══════════════════════════════════════════════════════════════════

@@ -1,49 +1,57 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Interface.ImGuiNotification;
 using HellionChat.Code;
 using HellionChat.GameFunctions.Types;
 using HellionChat.Resources;
 using HellionChat.Util;
-using Dalamud.Game.Text;
-using Dalamud.Game.Text.SeStringHandling;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

-// Hellion Chat — Auto-Tell-Tabs.
-//
-// Spawns a session-only tab per /tell partner so a club greeter can track
-// multiple parallel conversations without losing context. Subscribes to
-// MessageManager.MessageProcessed for live tells and to ClientState.Logout
-// for the cleanup pass; everything else hangs off these two entry points.
-//
-// See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian vault).
+// Auto-Tell-Tabs: spawns session-only tabs per /tell partner.
+// Subscribes to MessageManager.MessageProcessed and ClientState.Logout.
 internal sealed class AutoTellTabsService : IDisposable
 {
    private readonly Plugin _plugin;
    private readonly MessageManager _messageManager;
    private readonly MessageStore _store;
+    private readonly ILogger<AutoTellTabsService> _logger;
    private readonly object _tempTabsLock = new();

+    // Hard cap on pinned TempTabs so the sidebar doesn't inflate over years
+    // of usage. Separate pool from AutoTellTabsLimit (15) — pinned tabs live
+    // in their own bucket. A configurable cap is a vault-backlog anchor for
+    // a later cycle if tester feedback demands it.
+    internal const int MaxPinnedTempTabs = 5;
+
    private bool _initialized;

-    internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
+    internal AutoTellTabsService(
+        Plugin plugin,
+        MessageManager messageManager,
+        MessageStore store,
+        ILogger<AutoTellTabsService> logger
+    )
    {
        _plugin = plugin;
        _messageManager = messageManager;
        _store = store;
+        _logger = logger;
    }

-    internal int ActiveTempTabCount
-    {
-        get
-        {
-            lock (_tempTabsLock)
-            {
-                return Plugin.Config.Tabs.Count(t => t.IsTempTab);
-            }
-        }
-    }
+    // Derived from the tab list on read. Pin/Unpin/Promote/Logout simply
+    // mutate IsPinned or remove tabs — the count adapts automatically.
+    // Replaces the F2.1 Interlocked counter because the new pin-state
+    // transitions are cold-path and don't need lock-free reads.
+    internal int ActiveTempTabCount =>
+        Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInUnpinnedPool);
+
+    internal int PinnedTempTabCount => Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);

    internal void Initialize()
    {
@@ -52,11 +60,53 @@ internal sealed class AutoTellTabsService : IDisposable
            return;
        }

+        // Pinned tabs come out of the JSON with TellTarget set but
+        // CurrentChannel reset (NonSerialized). Without re-seeding, the chat
+        // input has no tell-target on the active pinned tab, and the
+        // game-side channel hook only repaints CurrentChannel once the user
+        // triggers a /tell or channel switch.
+        RehydratePinnedTabs();
+
        _messageManager.MessageProcessed += HandleTell;
        Plugin.ClientState.Logout += OnLogout;
        _initialized = true;
    }

+    private void RehydratePinnedTabs()
+    {
+        var pinned = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
+        _logger.LogDebug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
+
+        foreach (var tab in Plugin.Config.Tabs)
+        {
+            if (!TabLifecycleHelpers.IsInPinnedPool(tab))
+                continue;
+
+            if (tab.TellTarget is null || !tab.TellTarget.IsSet())
+            {
+                _logger.LogWarning(
+                    $"[Pin] Pinned tab '{tab.Name}' has no usable TellTarget "
+                        + $"(Name={tab.TellTarget?.Name ?? "<null>"} World={tab.TellTarget?.World ?? 0}). "
+                        + "Chat input on this tab will be empty until the partner sends a tell or you /tell manually."
+                );
+                continue;
+            }
+
+            tab.Channel ??= InputChannel.Tell;
+            tab.CurrentChannel.Channel = InputChannel.Tell;
+            tab.CurrentChannel.TellTarget = tab.TellTarget.Clone();
+
+            // MessageList is NonSerialized so pinned tabs come back empty.
+            // Preload the same history window the spawn path uses so the user
+            // sees the recent conversation, not a blank tab.
+            PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
+
+            _logger.LogDebug(
+                $"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
+            );
+        }
+    }
+
    public void Dispose()
    {
        if (!_initialized)
@@ -76,7 +126,10 @@ internal sealed class AutoTellTabsService : IDisposable
            return;
        }

-        if (message.Code.Type != ChatType.TellIncoming && message.Code.Type != ChatType.TellOutgoing)
+        if (
+            message.Code.Type != ChatType.TellIncoming
+            && message.Code.Type != ChatType.TellOutgoing
+        )
        {
            return;
        }
@@ -84,15 +137,13 @@ internal sealed class AutoTellTabsService : IDisposable
        var partner = ExtractTellPartner(message);
        if (partner == null)
        {
-            // Real message without a player payload — e.g. GM tells, which
-            // we deliberately skip. The diagnostics make future regressions
-            // (FFXIV changing tell payload shape, new edge cases) findable
-            // without having to crank up debug logging at the source.
-            Plugin.Log.Warning(
-                $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, " +
-                $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, " +
-                $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, " +
-                $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}");
+            // Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
+            _logger.LogWarning(
+                $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
+                    + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
+                    + $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
+                    + $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}"
+            );
            return;
        }

@@ -101,9 +152,23 @@ internal sealed class AutoTellTabsService : IDisposable
            var existing = FindTempTab(partner.Value.Name, partner.Value.World);
            if (existing != null)
            {
-                // Tab already exists; Tab.Matches has already routed this
-                // message via the MessageManager pipeline (see Task 2 sender
-                // filter).
+                // Already routed via MessageManager pipeline. Repair the
+                // tell-target if the fallback hit a pinned tab whose
+                // TellTarget didn't survive a previous round-trip — keeps
+                // FindTempTab fast on the next message.
+                if (
+                    existing.IsPinned
+                    && (existing.TellTarget is null || !existing.TellTarget.IsSet())
+                )
+                {
+                    existing.TellTarget = new TellTarget(
+                        partner.Value.Name,
+                        partner.Value.World,
+                        0,
+                        TellReason.Direct
+                    );
+                    _plugin.SaveConfig();
+                }
                return;
            }

@@ -120,12 +185,10 @@ internal sealed class AutoTellTabsService : IDisposable
    {
        if (message.Code.Type == ChatType.TellIncoming)
        {
-            // Incoming tell: the sender is the conversation partner. The
-            // PlayerPayload normally rides on a chunk's Link slot, but for
-            // some tell types FFXIV only puts it in the raw SeString —
-            // fall back to that before giving up.
-            var fromSender = ChunkUtil.TryGetPlayerPayload(message.Sender)
-                             ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
+            // Sender is the partner; check chunks first, then raw SeString as fallback
+            var fromSender =
+                ChunkUtil.TryGetPlayerPayload(message.Sender)
+                ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
            if (fromSender != null)
            {
                return (fromSender.PlayerName, fromSender.World.RowId);
@@ -133,21 +196,20 @@ internal sealed class AutoTellTabsService : IDisposable
            return null;
        }

-        // Outgoing tell: the local player is the sender, the partner shows
-        // up either as a payload in the content (for tells typed via the
-        // Chat 2 input bar) or as the channel's tracked tell target (set by
-        // the SetContextTellTarget game hook). Same SeString fallback.
-        var fromContent = ChunkUtil.TryGetPlayerPayload(message.Content)
-                          ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
-                          ?? ChunkUtil.TryGetPlayerPayload(message.Sender)
-                          ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
+        // Outgoing tell: check content first, then channels's TellTarget as fallback
+        var fromContent =
+            ChunkUtil.TryGetPlayerPayload(message.Content)
+            ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
+            ?? ChunkUtil.TryGetPlayerPayload(message.Sender)
+            ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
        if (fromContent != null)
        {
            return (fromContent.PlayerName, fromContent.World.RowId);
        }

-        var current = _plugin.CurrentTab.CurrentChannel.TellTarget
-                      ?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
+        var current =
+            _plugin.CurrentTab.CurrentChannel.TellTarget
+            ?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
        if (current != null && current.IsSet())
        {
            return (current.Name, current.World);
@@ -156,24 +218,35 @@ internal sealed class AutoTellTabsService : IDisposable
        return null;
    }

-    private Tab? FindTempTab(string name, uint world)
+    private static Tab? FindTempTab(string name, uint world)
    {
-        return Plugin.Config.Tabs.FirstOrDefault(t =>
+        var byTarget = Plugin.Config.Tabs.FirstOrDefault(t =>
            t.IsTempTab
            && t.TellTarget != null
            && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
-            && t.TellTarget.World == world);
+            && t.TellTarget.World == world
+        );
+        if (byTarget != null)
+            return byTarget;
+
+        // Fallback: match by tab name. Pinned tabs are named via
+        // FormatTabName(player, world) at spawn time, so the name is a
+        // stable secondary key when TellTarget didn't survive a save/load
+        // (older configs from a renamed pin, malformed migrations, etc.).
+        var expectedName = FormatTabName(name, world);
+        return Plugin.Config.Tabs.FirstOrDefault(t =>
+            t.IsTempTab && string.Equals(t.Name, expectedName, StringComparison.OrdinalIgnoreCase)
+        );
    }

-    private void DropOldestTempTab()
+    internal void DropOldestTempTab()
    {
-        // Greeted tabs are dropped before un-greeted ones (the user said
-        // "I'm done with that conversation"), and within each bucket we
-        // pick the oldest LastActivity. This protects active conversations
-        // and unfinished greetings while still freeing up a slot.
-        var victim = Plugin.Config.Tabs
-            .Select((tab, idx) => (Tab: tab, Index: idx))
-            .Where(t => t.Tab.IsTempTab)
+        // Pinned tabs live in their own bucket (MaxPinnedTempTabs) and are
+        // never drop candidates. They leave the bucket only via Unpin or
+        // PromoteToPermanent.
+        var victim = Plugin
+            .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
+            .Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t.Tab))
            .OrderByDescending(t => t.Tab.IsGreeted)
            .ThenBy(t => t.Tab.LastActivity)
            .FirstOrDefault();
@@ -183,16 +256,12 @@ internal sealed class AutoTellTabsService : IDisposable
            return;
        }

-        // v0.6.1 — if the victim is currently popped out, tear down the
-        // matching Popout window first. Otherwise the window stays in
-        // PopOutWindows + WindowSystem and renders empty / re-spawns on the
-        // next AddPopOutsToDraw tick. Latent since pop-outs were introduced;
-        // becomes visible with AutoTellTabsOpenAsPopout where dropping a
-        // popped tab is now a routine code path.
+        // Clean up pop-out window if tab is popped out
        if (victim.Tab.PopOut)
        {
-            var popout = _plugin.ChatLogWindow.ActivePopouts
-                .FirstOrDefault(p => p.TabIdentifier == victim.Tab.Identifier);
+            var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
+                p.TabIdentifier == victim.Tab.Identifier
+            );
            if (popout != null)
            {
                popout.IsOpen = false;
@@ -201,8 +270,7 @@ internal sealed class AutoTellTabsService : IDisposable

        Plugin.Config.Tabs.RemoveAt(victim.Index);

-        // Re-anchor the active tab so the user does not silently end up on
-        // a different conversation when their tab gets dropped or shifted.
+        // Re-anchor active tab to avoid silent switch when tab is dropped
        if (victim.Index <= _plugin.LastTab)
        {
            _plugin.WantedTab = 0;
@@ -213,22 +281,12 @@ internal sealed class AutoTellTabsService : IDisposable
    {
        var tab = BuildTempTab(partner.Name, partner.World);

-        // Preload first so the tab opens with chronological history above
-        // the current message — and so a slow DB query never causes a
-        // visible "empty tab, then history pops in" effect on screen.
-        // The current message is already persisted in the store by the
-        // time MessageProcessed fires (see MessageManager.cs: UpsertMessage
-        // runs before the event), so we have to exclude it explicitly to
-        // avoid the separator landing below the live tell.
+        // Preload history: chronological order with current message already persisted
        PreloadHistory(tab, partner.Name, partner.World, currentMessage.Id);

        tab.AddMessage(currentMessage, unread: true);

-        // Hellion Chat v0.6.1 — opt-in: open new /tell tabs directly as a
-        // pop-out window. Set BEFORE Tabs.Add so the next render-tick's
-        // AddPopOutsToDraw() sees PopOut=true and spawns the Popout window
-        // alongside the tab going into the list. No SaveConfig() because
-        // auto-tell tabs are IsTempTab (session-only, never persisted).
+        // Open as pop-out if configured (set before Tabs.Add for next render-tick)
        if (Plugin.Config.AutoTellTabsOpenAsPopout)
        {
            tab.PopOut = true;
@@ -263,9 +321,7 @@ internal sealed class AutoTellTabsService : IDisposable
        {
            return $"{playerName}@{worldRow.Name}";
        }
-        // World sheet lookup miss is rare (only for FFXIV worlds Dalamud has
-        // not yet seen). Fall back to the raw RowId so the user still has a
-        // unique, readable label.
+        // Fallback if world lookup misses (rare; only for unseen worlds)
        return $"{playerName}@World{worldRowId}";
    }

@@ -279,14 +335,13 @@ internal sealed class AutoTellTabsService : IDisposable

        try
        {
-            // Pull one extra row because the live tell that triggered this
-            // spawn is already in the store and would otherwise eat one of
-            // the user's preload-budget slots.
+            // Pull one extra row: current message is already in store and would eat a preload slot
            var history = _store.GetTellHistoryWithSender(
                _messageManager.CurrentContentId,
                senderName,
                senderWorld,
-                preloadCount + 1);
+                preloadCount + 1
+            );

            var historicMessages = history
                .Where(m => m.Id != currentMessageId)
@@ -295,36 +350,30 @@ internal sealed class AutoTellTabsService : IDisposable

            if (historicMessages.Count == 0)
            {
-                // No prior tells with this player — leave the tab to start
-                // empty so the user does not see a "history loaded" marker
-                // sitting alone above the very first message.
+                // No prior tells; leave tab empty to avoid orphaned "history loaded" marker
                return;
            }

-            // The history list is already oldest-first, so a plain AddPrune
-            // loop produces the chronological order the user expects to see
-            // when the tab opens.
+            // History is oldest-first; add in order for chronological display
            foreach (var message in historicMessages)
            {
                tab.Messages.AddPrune(message, MessageManager.MessageDisplayLimit);
            }

-            // Visible separator between the loaded history and the live
-            // tell that triggered this spawn. Goes in last so it sorts
-            // after the historical messages but before the current one.
+            // Separator between history and live tell (sorts after history but before current)
            tab.Messages.AddPrune(
                MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator),
-                MessageManager.MessageDisplayLimit);
+                MessageManager.MessageDisplayLimit
+            );
        }
        catch (Exception ex)
        {
-            // Non-fatal: the tab still spawns, but the user gets a visible
-            // notice instead of silently missing history. The error logs
-            // once with full stack trace for diagnosis.
-            Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
+            // Non-fatal: tab still spawns with visible error notice instead of silent history loss
+            _logger.LogError(ex, "[AutoTellTabs] History preload failed");
            tab.Messages.AddPrune(
                MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
-                MessageManager.MessageDisplayLimit);
+                MessageManager.MessageDisplayLimit
+            );
        }
    }

@@ -360,9 +409,7 @@ internal sealed class AutoTellTabsService : IDisposable

        lock (_tempTabsLock)
        {
-            // Frame-race guard (E5): the sidebar might still render a tab
-            // that has already been removed by LRU drop or logout cleanup.
-            // Silently skip the toggle so we don't mutate stale state.
+            // Guard against frame-race: sidebar might render a tab already removed by LRU or logout
            if (!Plugin.Config.Tabs.Contains(tab))
            {
                return;
@@ -376,43 +423,101 @@ internal sealed class AutoTellTabsService : IDisposable
    {
        lock (_tempTabsLock)
        {
-            // Snapshot whether the active tab is about to be removed, BEFORE
-            // we mutate the list — index lookups would lie to us afterwards.
+            // Pinned TempTabs must survive char-switch — that's the whole point
+            // of pinning. Only unpinned ones get stripped.
            var lastIndex = _plugin.LastTab;
            var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
-            var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab;
+            var currentWasUnpinnedTempTab =
+                lastIndexValid
+                && TabLifecycleHelpers.IsInUnpinnedPool(Plugin.Config.Tabs[lastIndex]);

-            // v0.6.1 — symmetric to DropOldestTempTab cleanup: tear down any
-            // popped-out temp tab windows before removing the tabs themselves,
-            // otherwise PopOutWindows + WindowSystem keep ghost entries until
-            // the next plugin reload. Especially relevant once Auto-Pop-Out is
-            // enabled — every logout would otherwise leak as many ghosts as
-            // there were active /tell pop-outs.
-            var poppedTempTabIds = Plugin.Config.Tabs
-                .Where(t => t.IsTempTab && t.PopOut)
+            var poppedTempTabIds = Plugin
+                .Config.Tabs.Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t) && t.PopOut)
                .Select(t => t.Identifier)
                .ToList();
            if (poppedTempTabIds.Count > 0)
            {
                var poppedSet = poppedTempTabIds.ToHashSet();
-                foreach (var popout in _plugin.ChatLogWindow.ActivePopouts
-                             .Where(p => poppedSet.Contains(p.TabIdentifier))
-                             .ToList())
+                foreach (
+                    var popout in _plugin
+                        .ChatLogWindow.ActivePopouts.Where(p => poppedSet.Contains(p.TabIdentifier))
+                        .ToList()
+                )
                {
                    popout.IsOpen = false;
                }
            }

-            Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
+            Plugin.Config.Tabs.RemoveAll(TabLifecycleHelpers.IsInUnpinnedPool);

-            // Force a switch to tab 0 if the active tab was a temp tab OR
-            // if drops before the active index pushed LastTab out of range.
-            // Otherwise the user keeps their current persistent tab.
+            // Force switch to tab 0 if active tab was an unpinned temp tab or
+            // index is now out of range. Pinned tabs survive — no switch needed.
            var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
-            if (currentWasTempTab || !stillValid)
+            if (currentWasUnpinnedTempTab || !stillValid)
            {
                _plugin.WantedTab = 0;
            }
        }
    }
+
+    internal bool TryPin(Tab tab)
+    {
+        if (!tab.IsTempTab || tab.IsPinned)
+        {
+            _logger.LogDebug(
+                $"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
+            );
+            return false;
+        }
+
+        if (PinnedTempTabCount >= MaxPinnedTempTabs)
+        {
+            WrapperUtil.AddNotification(
+                string.Format(HellionStrings.PinTab_LimitReached, MaxPinnedTempTabs),
+                NotificationType.Warning
+            );
+            return false;
+        }
+
+        tab.IsPinned = true;
+        _logger.LogDebug(
+            $"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
+        );
+        _plugin.SaveConfig();
+        return true;
+    }
+
+    internal void Unpin(Tab tab)
+    {
+        if (!tab.IsPinned)
+        {
+            return;
+        }
+
+        // If the unpinned pool is already full, dropping the oldest before
+        // flipping the flag avoids counting the just-unpinned tab as a drop
+        // candidate.
+        if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
+        {
+            DropOldestTempTab();
+        }
+
+        tab.IsPinned = false;
+        _logger.LogDebug("[Pin] Unpinned tab '{TabName}'", tab.Name);
+        _plugin.SaveConfig();
+    }
+
+    internal void PromoteToPermanent(Tab tab)
+    {
+        if (!tab.IsTempTab)
+        {
+            return;
+        }
+
+        tab.IsTempTab = false;
+        tab.IsPinned = false;
+        tab.TellTarget = TellTarget.Empty();
+        _logger.LogDebug($"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)");
+        _plugin.SaveConfig();
+    }
 }
@@ -1,12 +1,33 @@
-// HellionChat/Branding/BrandingLinks.cs
+using System.Runtime.CompilerServices;
+using HellionChat.Util;
+
 namespace HellionChat.Branding;

-// Centralised so a future invite rotation only touches one file. The same
-// link is currently hard-coded in repo.json, README.md, SUPPORT.md,
-// CONTRIBUTORS.md and HellionChat.yaml — those will be migrated to consume
-// this constant in a separate housekeeping sweep, but that's out of scope
-// for this Cycle.
+// Centralised — a future invite/URL rotation only touches this file.
 internal static class BrandingLinks
 {
    public const string HellionForgeDiscordInvite = "https://discord.gg/X9V7Kcv5gR";
+    public const string HellionForgeGitea = "https://gitea.hellion-forge.cloud/Hellion-Forge";
+    public const string HellionChatRepo =
+        "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat";
+    public const string HellionForgeWebsite = "https://hellion-forge.cloud";
+    public const string HellionMediaWebsite = "https://hellion-media.de/de";
+
+    // CA2255 warns against [ModuleInitializer] in library code, but Dalamud
+    // loads the plugin DLL directly so the module-init pass is the right hook
+    // for a one-shot URL sanity check at plugin load.
+#pragma warning disable CA2255
+    [ModuleInitializer]
+#pragma warning restore CA2255
+    internal static void ValidateUrls()
+    {
+        UrlValidation.ValidateAll(
+            nameof(BrandingLinks),
+            HellionForgeDiscordInvite,
+            HellionForgeGitea,
+            HellionChatRepo,
+            HellionForgeWebsite,
+            HellionMediaWebsite
+        );
+    }
 }
@@ -0,0 +1,22 @@
+using Dalamud.Interface.Textures;
+
+namespace HellionChat.Branding;
+
+// UI sibling of HellionForgeAscii.FoxMini: the embedded Hellion Forge fox
+// banner PNG. Uses ITextureProvider.GetFromManifestResource, a "Get" shared
+// texture, so Dalamud owns the cache and lifetime. No manual dispose, no async
+// handling in the plugin. Static to mirror HellionForgeAscii (zero injectable
+// deps; Plugin.TextureProvider is a static [PluginService]).
+internal static class FoxBannerTexture
+{
+    private const string ResourceName = "HellionChat.Branding.fox-banner.png";
+
+    // Resolved fresh on every access. Dalamud keeps the shared texture cached
+    // internally and decodes it asynchronously, so GetWrapOrDefault() returns
+    // null for the first few frames until the decode finishes.
+    public static ISharedImmediateTexture Shared =>
+        Plugin.TextureProvider.GetFromManifestResource(
+            typeof(FoxBannerTexture).Assembly,
+            ResourceName
+        );
+}
@@ -0,0 +1,29 @@
+namespace HellionChat.Branding;
+
+// Lazy-loaded ASCII art that ships embedded with the DLL.
+//
+//   - FoxMini: the four-line fox-head + curly-tail that gets stitched
+//     into the DI-logger bootstrap line so an xllog reader sees the
+//     same signature on every plugin load.
+//
+// The file lives as an embedded resource under HellionChat.Branding.* so
+// the plugin DLL is self-contained; no on-disk asset lookup that could
+// silently miss after a partial deploy.
+internal static class HellionForgeAscii
+{
+    private static string? _foxMini;
+
+    public static string FoxMini => _foxMini ??= Load("HellionChat.Branding.fox-mini.txt");
+
+    private static string Load(string resourceName)
+    {
+        using var stream = typeof(HellionForgeAscii).Assembly.GetManifestResourceStream(
+            resourceName
+        );
+        if (stream is null)
+            return string.Empty;
+
+        using var reader = new StreamReader(stream);
+        return reader.ReadToEnd();
+    }
+}
@@ -1,6 +1,6 @@
 using System.Linq;
-using HellionChat.Resources;
 using Dalamud.Plugin;
+using HellionChat.Resources;

 namespace HellionChat;

@@ -10,17 +10,19 @@ internal static class ChatTwoConflictDetector

    public static void ThrowIfChatTwoIsLoaded(IDalamudPluginInterface pluginInterface)
    {
-        var conflict = pluginInterface.InstalledPlugins
-            .FirstOrDefault(p =>
-                p.InternalName == UpstreamInternalName &&
-                p.IsLoaded);
+        var conflict = pluginInterface.InstalledPlugins.FirstOrDefault(p =>
+            p.InternalName == UpstreamInternalName && p.IsLoaded
+        );

        if (conflict is null)
            return;

-        var message = HellionStrings.ChatTwoConflictTitle + "\n\n" +
-                      HellionStrings.ChatTwoConflictBody + "\n\n" +
-                      HellionStrings.ChatTwoConflictAction;
+        var message =
+            HellionStrings.ChatTwoConflictTitle
+            + "\n\n"
+            + HellionStrings.ChatTwoConflictBody
+            + "\n\n"
+            + HellionStrings.ChatTwoConflictAction;

        throw new System.InvalidOperationException(message);
    }
@@ -1,5 +1,5 @@
-using HellionChat.Code;
 using Dalamud.Game.Text.SeStringHandling;
+using HellionChat.Code;
 using MessagePack;

 namespace HellionChat;
@@ -25,24 +25,23 @@ public abstract class Chunk
        Link = link;
    }

-    internal SeString? GetSeString() => Source switch
-    {
-        ChunkSource.None => null,
-        ChunkSource.Sender => Message?.SenderSource,
-        ChunkSource.Content => Message?.ContentSource,
-        _ => null,
-    };
+    internal SeString? GetSeString() =>
+        Source switch
+        {
+            ChunkSource.None => null,
+            ChunkSource.Sender => Message?.SenderSource,
+            ChunkSource.Content => Message?.ContentSource,
+            _ => null,
+        };

-    /// <summary>
-    /// Get some basic text for use in generating hashes.
-    /// </summary>
+    // Returns basic text for hashing (content for TextChunk, icon name for IconChunk)
    internal string StringValue()
    {
        return this switch
        {
            TextChunk text => text.Content,
            IconChunk icon => icon.Icon.ToString(),
-            _ => ""
+            _ => "",
        };
    }
 }
@@ -57,18 +56,29 @@ public enum ChunkSource
 [MessagePackObject(AllowPrivate = true)]
 public class TextChunk : Chunk
 {
-    [Key(2)] public ChatType? FallbackColour;
-    [Key(3)] public uint? Foreground;
-    [Key(4)] public uint? Glow;
-    [Key(5)] public bool Italic;
-    [Key(6)] public string Content;
+    [Key(2)]
+    public ChatType? FallbackColour;

-    private TextChunk(Chunk chunk, string content) : base(chunk.Source, chunk.Link)
+    [Key(3)]
+    public uint? Foreground;
+
+    [Key(4)]
+    public uint? Glow;
+
+    [Key(5)]
+    public bool Italic;
+
+    [Key(6)]
+    public string Content;
+
+    private TextChunk(Chunk chunk, string content)
+        : base(chunk.Source, chunk.Link)
    {
        Content = content;
    }

-    internal TextChunk(ChunkSource source, Payload? link, string content) : base(source, link)
+    internal TextChunk(ChunkSource source, Payload? link, string content)
+        : base(source, link)
    {
        // This has been null in the past, and it broke rendering code.
        // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
@@ -76,7 +86,16 @@ public class TextChunk : Chunk
    }

    // ReSharper disable once UnusedMember.Global // Used by MessagePack
-    public TextChunk(ChunkSource source, Payload? link, ChatType? fallbackColour, uint? foreground, uint? glow, bool italic, string content) : base(source, link)
+    public TextChunk(
+        ChunkSource source,
+        Payload? link,
+        ChatType? fallbackColour,
+        uint? foreground,
+        uint? glow,
+        bool italic,
+        string content
+    )
+        : base(source, link)
    {
        FallbackColour = fallbackColour;
        Foreground = foreground;
@@ -87,9 +106,6 @@ public class TextChunk : Chunk
        Content = content ?? "";
    }

-    /// <summary>
-    /// Creates a new TextChunk with identical styling to this one.
-    /// </summary>
    public TextChunk NewWithStyle(ChunkSource source, Payload? link, string content)
    {
        return new TextChunk(source, link, content)
@@ -101,9 +117,6 @@ public class TextChunk : Chunk
        };
    }

-    /// <summary>
-    /// Creates a new TextChunk with identical styling to this one.
-    /// </summary>
    public TextChunk NewWithStyle(Chunk chunk, string content)
    {
        return new TextChunk(chunk, content)
@@ -122,7 +135,8 @@ public class IconChunk : Chunk
    [Key(2)]
    public BitmapFontIcon Icon { get; set; }

-    public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon) : base(source, link)
+    public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon)
+        : base(source, link)
    {
        Icon = icon;
    }
@@ -16,7 +16,7 @@ public class ChatCode
    }

    public ChatCode(byte type, byte source, byte target)
-        : this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) {}
+        : this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) { }

    public bool IsBattle()
    {
@@ -7,36 +7,36 @@ public enum ChatSource : ushort
 {
    None = 0,

-    /// <summary>The player currently controlled by the local client.</summary>
+    // The player controlled by this client
    LocalPlayer = 1 << XivChatRelationKind.LocalPlayer,

-    /// <summary>A player in the same 4-man or 8-man party as the local player.</summary>
+    // Member of the local party
    PartyMember = 1 << XivChatRelationKind.PartyMember,

-    /// <summary>A player in the same alliance raid.</summary>
+    // Member of the alliance
    AllianceMember = 1 << XivChatRelationKind.AllianceMember,

-    /// <summary>A player not in the local player's party or alliance.</summary>
+    // Other player
    OtherPlayer = 1 << XivChatRelationKind.OtherPlayer,

-    /// <summary>An enemy entity that is currently in combat with the player or party.</summary>
+    // Enemy in combat
    EngagedEnemy = 1 << XivChatRelationKind.EngagedEnemy,

-    /// <summary>An enemy entity that is not yet in combat or claimed.</summary>
+    // Enemy out of combat
    UnengagedEnemy = 1 << XivChatRelationKind.UnengagedEnemy,

-    /// <summary>An NPC that is friendly or neutral to the player (e.g., EventNPCs).</summary>
+    // Friendly NPC
    FriendlyNpc = 1 << XivChatRelationKind.FriendlyNpc,

-    /// <summary>A pet (Summoner/Scholar) or companion (Chocobo) belonging to the local player.</summary>
+    // Own pet or companion
    PetOrCompanion = 1 << XivChatRelationKind.PetOrCompanion,

-    /// <summary>A pet or companion belonging to a member of the local player's party.</summary>
+    // Pet or companion of party members
    PetOrCompanionParty = 1 << XivChatRelationKind.PetOrCompanionParty,

-    /// <summary>A pet or companion belonging to a member of the alliance.</summary>
+    // Pet or companion of alliance members
    PetOrCompanionAlliance = 1 << XivChatRelationKind.PetOrCompanionAlliance,

-    /// <summary>A pet or companion belonging to a player not in the party or alliance.</summary>
+    // Pet or companion of other players
    PetOrCompanionOther = 1 << XivChatRelationKind.PetOrCompanionOther,
 }
@@ -5,24 +5,32 @@ namespace HellionChat.Code;
 internal static class ChatSourceExt
 {
    internal const ChatSource All =
-        ChatSource.LocalPlayer | ChatSource.PartyMember | ChatSource.AllianceMember |
-        ChatSource.OtherPlayer | ChatSource.EngagedEnemy | ChatSource.UnengagedEnemy |
-        ChatSource.FriendlyNpc | ChatSource.PetOrCompanion | ChatSource.PetOrCompanionParty |
-        ChatSource.PetOrCompanionAlliance | ChatSource.PetOrCompanionOther;
+        ChatSource.LocalPlayer
+        | ChatSource.PartyMember
+        | ChatSource.AllianceMember
+        | ChatSource.OtherPlayer
+        | ChatSource.EngagedEnemy
+        | ChatSource.UnengagedEnemy
+        | ChatSource.FriendlyNpc
+        | ChatSource.PetOrCompanion
+        | ChatSource.PetOrCompanionParty
+        | ChatSource.PetOrCompanionAlliance
+        | ChatSource.PetOrCompanionOther;

-    internal static string Name(this ChatSource source) => source switch
-    {
-        ChatSource.LocalPlayer => Language.ChatSource_Self,
-        ChatSource.PartyMember => Language.ChatSource_PartyMember,
-        ChatSource.AllianceMember => Language.ChatSource_AllianceMember,
-        ChatSource.OtherPlayer => Language.ChatSource_Other,
-        ChatSource.EngagedEnemy => Language.ChatSource_EngagedEnemy,
-        ChatSource.UnengagedEnemy => Language.ChatSource_UnengagedEnemy,
-        ChatSource.FriendlyNpc => Language.ChatSource_FriendlyNpc,
-        ChatSource.PetOrCompanion => Language.ChatSource_SelfPet,
-        ChatSource.PetOrCompanionParty => Language.ChatSource_PartyPet,
-        ChatSource.PetOrCompanionAlliance => Language.ChatSource_AlliancePet,
-        ChatSource.PetOrCompanionOther => Language.ChatSource_OtherPet,
-        _ => throw new ArgumentOutOfRangeException(nameof(source), source, null),
-    };
+    internal static string Name(this ChatSource source) =>
+        source switch
+        {
+            ChatSource.LocalPlayer => Language.ChatSource_Self,
+            ChatSource.PartyMember => Language.ChatSource_PartyMember,
+            ChatSource.AllianceMember => Language.ChatSource_AllianceMember,
+            ChatSource.OtherPlayer => Language.ChatSource_Other,
+            ChatSource.EngagedEnemy => Language.ChatSource_EngagedEnemy,
+            ChatSource.UnengagedEnemy => Language.ChatSource_UnengagedEnemy,
+            ChatSource.FriendlyNpc => Language.ChatSource_FriendlyNpc,
+            ChatSource.PetOrCompanion => Language.ChatSource_SelfPet,
+            ChatSource.PetOrCompanionParty => Language.ChatSource_PartyPet,
+            ChatSource.PetOrCompanionAlliance => Language.ChatSource_AlliancePet,
+            ChatSource.PetOrCompanionOther => Language.ChatSource_OtherPet,
+            _ => throw new ArgumentOutOfRangeException(nameof(source), source, null),
+        };
 }
@@ -1,92 +1,98 @@
+using Dalamud.Game.Config;
 using HellionChat.Resources;
 using HellionChat.Util;
-using Dalamud.Game.Config;

 namespace HellionChat.Code;

 internal static class ChatTypeExt
 {
    internal static IEnumerable<(string, ChatType[])> SortOrder =>
-    [
-        (Language.Options_Tabs_ChannelTypes_Special, [ChatType.Debug, ChatType.Urgent, ChatType.Notice]),
-
-        (Language.Options_Tabs_ChannelTypes_Chat,
        [
-            ChatType.Say,
-            ChatType.Yell,
-            ChatType.Shout,
-            ChatType.TellIncoming,
-            ChatType.TellOutgoing,
-            ChatType.Party,
-            ChatType.CrossParty,
-            ChatType.Alliance,
-            ChatType.FreeCompany,
-            ChatType.PvpTeam,
-            ChatType.CrossLinkshell1,
-            ChatType.CrossLinkshell2,
-            ChatType.CrossLinkshell3,
-            ChatType.CrossLinkshell4,
-            ChatType.CrossLinkshell5,
-            ChatType.CrossLinkshell6,
-            ChatType.CrossLinkshell7,
-            ChatType.CrossLinkshell8,
-            ChatType.Linkshell1,
-            ChatType.Linkshell2,
-            ChatType.Linkshell3,
-            ChatType.Linkshell4,
-            ChatType.Linkshell5,
-            ChatType.Linkshell6,
-            ChatType.Linkshell7,
-            ChatType.Linkshell8,
-            ChatType.NoviceNetwork,
-            ChatType.StandardEmote,
-            ChatType.CustomEmote
-        ]),
-
-        (Language.Options_Tabs_ChannelTypes_Battle,
-        [
-            ChatType.Damage,
-            ChatType.Miss,
-            ChatType.Action,
-            ChatType.Item,
-            ChatType.Healing,
-            ChatType.GainBuff,
-            ChatType.LoseBuff,
-            ChatType.GainDebuff,
-            ChatType.LoseDebuff
-        ]),
-
-        (Language.Options_Tabs_ChannelTypes_Announcements,
-        [
-            ChatType.System,
-            ChatType.BattleSystem,
-            ChatType.GatheringSystem,
-            ChatType.Error,
-            ChatType.Echo,
-            ChatType.NoviceNetworkSystem,
-            ChatType.FreeCompanyAnnouncement,
-            ChatType.PvpTeamAnnouncement,
-            ChatType.FreeCompanyLoginLogout,
-            ChatType.PvpTeamLoginLogout,
-            ChatType.RetainerSale,
-            ChatType.NpcDialogue,
-            ChatType.NpcAnnouncement,
-            ChatType.LootNotice,
-            ChatType.Progress,
-            ChatType.LootRoll,
-            ChatType.Crafting,
-            ChatType.Gathering,
-            ChatType.PeriodicRecruitmentNotification,
-            ChatType.Sign,
-            ChatType.RandomNumber,
-            ChatType.Orchestrion,
-            ChatType.MessageBook,
-            ChatType.Alarm,
-            ChatType.GlamourNotifications
-        ])
-        // Note: ExtraChat linkshells are handled separately in the tab settings
-        // UI.
-    ];
+            (
+                Language.Options_Tabs_ChannelTypes_Special,
+                [ChatType.Debug, ChatType.Urgent, ChatType.Notice]
+            ),
+            (
+                Language.Options_Tabs_ChannelTypes_Chat,
+                [
+                    ChatType.Say,
+                    ChatType.Yell,
+                    ChatType.Shout,
+                    ChatType.TellIncoming,
+                    ChatType.TellOutgoing,
+                    ChatType.Party,
+                    ChatType.CrossParty,
+                    ChatType.Alliance,
+                    ChatType.FreeCompany,
+                    ChatType.PvpTeam,
+                    ChatType.CrossLinkshell1,
+                    ChatType.CrossLinkshell2,
+                    ChatType.CrossLinkshell3,
+                    ChatType.CrossLinkshell4,
+                    ChatType.CrossLinkshell5,
+                    ChatType.CrossLinkshell6,
+                    ChatType.CrossLinkshell7,
+                    ChatType.CrossLinkshell8,
+                    ChatType.Linkshell1,
+                    ChatType.Linkshell2,
+                    ChatType.Linkshell3,
+                    ChatType.Linkshell4,
+                    ChatType.Linkshell5,
+                    ChatType.Linkshell6,
+                    ChatType.Linkshell7,
+                    ChatType.Linkshell8,
+                    ChatType.NoviceNetwork,
+                    ChatType.StandardEmote,
+                    ChatType.CustomEmote,
+                ]
+            ),
+            (
+                Language.Options_Tabs_ChannelTypes_Battle,
+                [
+                    ChatType.Damage,
+                    ChatType.Miss,
+                    ChatType.Action,
+                    ChatType.Item,
+                    ChatType.Healing,
+                    ChatType.GainBuff,
+                    ChatType.LoseBuff,
+                    ChatType.GainDebuff,
+                    ChatType.LoseDebuff,
+                ]
+            ),
+            (
+                Language.Options_Tabs_ChannelTypes_Announcements,
+                [
+                    ChatType.System,
+                    ChatType.BattleSystem,
+                    ChatType.GatheringSystem,
+                    ChatType.Error,
+                    ChatType.Echo,
+                    ChatType.NoviceNetworkSystem,
+                    ChatType.FreeCompanyAnnouncement,
+                    ChatType.PvpTeamAnnouncement,
+                    ChatType.FreeCompanyLoginLogout,
+                    ChatType.PvpTeamLoginLogout,
+                    ChatType.RetainerSale,
+                    ChatType.NpcDialogue,
+                    ChatType.NpcAnnouncement,
+                    ChatType.LootNotice,
+                    ChatType.Progress,
+                    ChatType.LootRoll,
+                    ChatType.Crafting,
+                    ChatType.Gathering,
+                    ChatType.PeriodicRecruitmentNotification,
+                    ChatType.Sign,
+                    ChatType.RandomNumber,
+                    ChatType.Orchestrion,
+                    ChatType.MessageBook,
+                    ChatType.Alarm,
+                    ChatType.GlamourNotifications,
+                ]
+            ),
+            // Note: ExtraChat linkshells are handled separately in the tab settings
+            // UI.
+        ];

    internal static string Name(this ChatType type)
    {
@@ -143,7 +149,8 @@ internal static class ChatTypeExt
            ChatType.FreeCompanyAnnouncement => Language.ChatType_FreeCompanyAnnouncement,
            ChatType.FreeCompanyLoginLogout => Language.ChatType_FreeCompanyLoginLogout,
            ChatType.RetainerSale => Language.ChatType_RetainerSale,
-            ChatType.PeriodicRecruitmentNotification => Language.ChatType_PeriodicRecruitmentNotification,
+            ChatType.PeriodicRecruitmentNotification =>
+                Language.ChatType_PeriodicRecruitmentNotification,
            ChatType.Sign => Language.ChatType_Sign,
            ChatType.RandomNumber => Language.ChatType_RandomNumber,
            ChatType.NoviceNetworkSystem => Language.ChatType_NoviceNetworkSystem,
@@ -306,181 +313,187 @@ internal static class ChatTypeExt
        }
    }

-    internal static InputChannel? ToInputChannel(this ChatType type) => type switch
-    {
-        ChatType.TellOutgoing => InputChannel.Tell,
-        ChatType.Say => InputChannel.Say,
-        ChatType.Party => InputChannel.Party,
-        ChatType.Alliance => InputChannel.Alliance,
-        ChatType.Yell => InputChannel.Yell,
-        ChatType.Shout => InputChannel.Shout,
-        ChatType.FreeCompany => InputChannel.FreeCompany,
-        ChatType.PvpTeam => InputChannel.PvpTeam,
-        ChatType.NoviceNetwork => InputChannel.NoviceNetwork,
-        ChatType.CrossLinkshell1 => InputChannel.CrossLinkshell1,
-        ChatType.CrossLinkshell2 => InputChannel.CrossLinkshell2,
-        ChatType.CrossLinkshell3 => InputChannel.CrossLinkshell3,
-        ChatType.CrossLinkshell4 => InputChannel.CrossLinkshell4,
-        ChatType.CrossLinkshell5 => InputChannel.CrossLinkshell5,
-        ChatType.CrossLinkshell6 => InputChannel.CrossLinkshell6,
-        ChatType.CrossLinkshell7 => InputChannel.CrossLinkshell7,
-        ChatType.CrossLinkshell8 => InputChannel.CrossLinkshell8,
-        ChatType.Linkshell1 => InputChannel.Linkshell1,
-        ChatType.Linkshell2 => InputChannel.Linkshell2,
-        ChatType.Linkshell3 => InputChannel.Linkshell3,
-        ChatType.Linkshell4 => InputChannel.Linkshell4,
-        ChatType.Linkshell5 => InputChannel.Linkshell5,
-        ChatType.Linkshell6 => InputChannel.Linkshell6,
-        ChatType.Linkshell7 => InputChannel.Linkshell7,
-        ChatType.Linkshell8 => InputChannel.Linkshell8,
-        _ => null,
-    };
+    internal static InputChannel? ToInputChannel(this ChatType type) =>
+        type switch
+        {
+            ChatType.TellOutgoing => InputChannel.Tell,
+            ChatType.Say => InputChannel.Say,
+            ChatType.Party => InputChannel.Party,
+            ChatType.Alliance => InputChannel.Alliance,
+            ChatType.Yell => InputChannel.Yell,
+            ChatType.Shout => InputChannel.Shout,
+            ChatType.FreeCompany => InputChannel.FreeCompany,
+            ChatType.PvpTeam => InputChannel.PvpTeam,
+            ChatType.NoviceNetwork => InputChannel.NoviceNetwork,
+            ChatType.CrossLinkshell1 => InputChannel.CrossLinkshell1,
+            ChatType.CrossLinkshell2 => InputChannel.CrossLinkshell2,
+            ChatType.CrossLinkshell3 => InputChannel.CrossLinkshell3,
+            ChatType.CrossLinkshell4 => InputChannel.CrossLinkshell4,
+            ChatType.CrossLinkshell5 => InputChannel.CrossLinkshell5,
+            ChatType.CrossLinkshell6 => InputChannel.CrossLinkshell6,
+            ChatType.CrossLinkshell7 => InputChannel.CrossLinkshell7,
+            ChatType.CrossLinkshell8 => InputChannel.CrossLinkshell8,
+            ChatType.Linkshell1 => InputChannel.Linkshell1,
+            ChatType.Linkshell2 => InputChannel.Linkshell2,
+            ChatType.Linkshell3 => InputChannel.Linkshell3,
+            ChatType.Linkshell4 => InputChannel.Linkshell4,
+            ChatType.Linkshell5 => InputChannel.Linkshell5,
+            ChatType.Linkshell6 => InputChannel.Linkshell6,
+            ChatType.Linkshell7 => InputChannel.Linkshell7,
+            ChatType.Linkshell8 => InputChannel.Linkshell8,
+            _ => null,
+        };

-    internal static bool IsGm(this ChatType type) => type switch
-    {
-        ChatType.GmTell => true,
-        ChatType.GmSay => true,
-        ChatType.GmShout => true,
-        ChatType.GmYell => true,
-        ChatType.GmParty => true,
-        ChatType.GmFreeCompany => true,
-        ChatType.GmLinkshell1 => true,
-        ChatType.GmLinkshell2 => true,
-        ChatType.GmLinkshell3 => true,
-        ChatType.GmLinkshell4 => true,
-        ChatType.GmLinkshell5 => true,
-        ChatType.GmLinkshell6 => true,
-        ChatType.GmLinkshell7 => true,
-        ChatType.GmLinkshell8 => true,
-        ChatType.GmNoviceNetwork => true,
-        _ => false,
-    };
+    internal static bool IsGm(this ChatType type) =>
+        type switch
+        {
+            ChatType.GmTell => true,
+            ChatType.GmSay => true,
+            ChatType.GmShout => true,
+            ChatType.GmYell => true,
+            ChatType.GmParty => true,
+            ChatType.GmFreeCompany => true,
+            ChatType.GmLinkshell1 => true,
+            ChatType.GmLinkshell2 => true,
+            ChatType.GmLinkshell3 => true,
+            ChatType.GmLinkshell4 => true,
+            ChatType.GmLinkshell5 => true,
+            ChatType.GmLinkshell6 => true,
+            ChatType.GmLinkshell7 => true,
+            ChatType.GmLinkshell8 => true,
+            ChatType.GmNoviceNetwork => true,
+            _ => false,
+        };

-    internal static bool IsExtraChatLinkshell(this ChatType type) => type switch
-    {
-        ChatType.ExtraChatLinkshell1 => true,
-        ChatType.ExtraChatLinkshell2 => true,
-        ChatType.ExtraChatLinkshell3 => true,
-        ChatType.ExtraChatLinkshell4 => true,
-        ChatType.ExtraChatLinkshell5 => true,
-        ChatType.ExtraChatLinkshell6 => true,
-        ChatType.ExtraChatLinkshell7 => true,
-        ChatType.ExtraChatLinkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsExtraChatLinkshell(this ChatType type) =>
+        type switch
+        {
+            ChatType.ExtraChatLinkshell1 => true,
+            ChatType.ExtraChatLinkshell2 => true,
+            ChatType.ExtraChatLinkshell3 => true,
+            ChatType.ExtraChatLinkshell4 => true,
+            ChatType.ExtraChatLinkshell5 => true,
+            ChatType.ExtraChatLinkshell6 => true,
+            ChatType.ExtraChatLinkshell7 => true,
+            ChatType.ExtraChatLinkshell8 => true,
+            _ => false,
+        };

-    public static UiConfigOption ToConfigEntry(this ChatType type) => type switch
-    {
-        ChatType.Say => UiConfigOption.ColorSay,
-        ChatType.Shout => UiConfigOption.ColorShout,
-        ChatType.TellOutgoing => UiConfigOption.ColorTell,
-        ChatType.Party => UiConfigOption.ColorParty,
-        ChatType.Linkshell1 => UiConfigOption.ColorLS1,
-        ChatType.Linkshell2 => UiConfigOption.ColorLS2,
-        ChatType.Linkshell3 => UiConfigOption.ColorLS3,
-        ChatType.Linkshell4 => UiConfigOption.ColorLS4,
-        ChatType.Linkshell5 => UiConfigOption.ColorLS5,
-        ChatType.Linkshell6 => UiConfigOption.ColorLS6,
-        ChatType.Linkshell7 => UiConfigOption.ColorLS7,
-        ChatType.Linkshell8 => UiConfigOption.ColorLS8,
-        ChatType.FreeCompany => UiConfigOption.ColorFCompany,
-        ChatType.NoviceNetwork => UiConfigOption.ColorBeginner,
-        ChatType.CustomEmote => UiConfigOption.ColorEmoteUser,
-        ChatType.StandardEmote => UiConfigOption.ColorEmote,
-        ChatType.Yell => UiConfigOption.ColorYell,
-        ChatType.GainBuff => UiConfigOption.ColorBuffGive,
-        ChatType.GainDebuff => UiConfigOption.ColorDebuffGive,
-        ChatType.System => UiConfigOption.ColorSysMsg,
-        ChatType.NpcDialogue => UiConfigOption.ColorNpcSay,
-        ChatType.LootRoll => UiConfigOption.ColorLoot,
-        ChatType.FreeCompanyAnnouncement => UiConfigOption.ColorFCAnnounce,
-        ChatType.PvpTeamAnnouncement => UiConfigOption.ColorPvPGroupAnnounce,
-        _ => UiConfigOption.ColorSay,
-    };
+    public static UiConfigOption ToConfigEntry(this ChatType type) =>
+        type switch
+        {
+            ChatType.Say => UiConfigOption.ColorSay,
+            ChatType.Shout => UiConfigOption.ColorShout,
+            ChatType.TellOutgoing => UiConfigOption.ColorTell,
+            ChatType.Party => UiConfigOption.ColorParty,
+            ChatType.Linkshell1 => UiConfigOption.ColorLS1,
+            ChatType.Linkshell2 => UiConfigOption.ColorLS2,
+            ChatType.Linkshell3 => UiConfigOption.ColorLS3,
+            ChatType.Linkshell4 => UiConfigOption.ColorLS4,
+            ChatType.Linkshell5 => UiConfigOption.ColorLS5,
+            ChatType.Linkshell6 => UiConfigOption.ColorLS6,
+            ChatType.Linkshell7 => UiConfigOption.ColorLS7,
+            ChatType.Linkshell8 => UiConfigOption.ColorLS8,
+            ChatType.FreeCompany => UiConfigOption.ColorFCompany,
+            ChatType.NoviceNetwork => UiConfigOption.ColorBeginner,
+            ChatType.CustomEmote => UiConfigOption.ColorEmoteUser,
+            ChatType.StandardEmote => UiConfigOption.ColorEmote,
+            ChatType.Yell => UiConfigOption.ColorYell,
+            ChatType.GainBuff => UiConfigOption.ColorBuffGive,
+            ChatType.GainDebuff => UiConfigOption.ColorDebuffGive,
+            ChatType.System => UiConfigOption.ColorSysMsg,
+            ChatType.NpcDialogue => UiConfigOption.ColorNpcSay,
+            ChatType.LootRoll => UiConfigOption.ColorLoot,
+            ChatType.FreeCompanyAnnouncement => UiConfigOption.ColorFCAnnounce,
+            ChatType.PvpTeamAnnouncement => UiConfigOption.ColorPvPGroupAnnounce,
+            _ => UiConfigOption.ColorSay,
+        };

-    internal static bool HasSource(this ChatType type) => type switch
-    {
-        // Battle
-        ChatType.Damage => true,
-        ChatType.Miss => true,
-        ChatType.Action => true,
-        ChatType.Item => true,
-        ChatType.Healing => true,
-        ChatType.GainBuff => true,
-        ChatType.LoseBuff => true,
-        ChatType.GainDebuff => true,
-        ChatType.LoseDebuff => true,
+    internal static bool HasSource(this ChatType type) =>
+        type switch
+        {
+            // Battle
+            ChatType.Damage => true,
+            ChatType.Miss => true,
+            ChatType.Action => true,
+            ChatType.Item => true,
+            ChatType.Healing => true,
+            ChatType.GainBuff => true,
+            ChatType.LoseBuff => true,
+            ChatType.GainDebuff => true,
+            ChatType.LoseDebuff => true,

-        // Announcements
-        ChatType.System => true,
-        ChatType.BattleSystem => true,
-        ChatType.Error => true,
-        ChatType.LootNotice => true,
-        ChatType.Progress => true,
-        ChatType.LootRoll => true,
-        ChatType.Crafting => true,
-        ChatType.Gathering => true,
-        ChatType.FreeCompanyLoginLogout => true,
-        ChatType.PvpTeamLoginLogout => true,
-        _ => false,
-    };
+            // Announcements
+            ChatType.System => true,
+            ChatType.BattleSystem => true,
+            ChatType.Error => true,
+            ChatType.LootNotice => true,
+            ChatType.Progress => true,
+            ChatType.LootRoll => true,
+            ChatType.Crafting => true,
+            ChatType.Gathering => true,
+            ChatType.FreeCompanyLoginLogout => true,
+            ChatType.PvpTeamLoginLogout => true,
+            _ => false,
+        };

-    internal static ChatType Parent(this ChatType type) => type switch
-    {
-        ChatType.Say => ChatType.Say,
-        ChatType.GmSay => ChatType.Say,
-        ChatType.Shout => ChatType.Shout,
-        ChatType.GmShout => ChatType.Shout,
-        ChatType.TellOutgoing => ChatType.TellOutgoing,
-        ChatType.TellIncoming => ChatType.TellOutgoing,
-        ChatType.GmTell => ChatType.TellOutgoing,
-        ChatType.Party => ChatType.Party,
-        ChatType.CrossParty => ChatType.Party,
-        ChatType.GmParty => ChatType.Party,
-        ChatType.Linkshell1 => ChatType.Linkshell1,
-        ChatType.GmLinkshell1 => ChatType.Linkshell1,
-        ChatType.Linkshell2 => ChatType.Linkshell2,
-        ChatType.GmLinkshell2 => ChatType.Linkshell2,
-        ChatType.Linkshell3 => ChatType.Linkshell3,
-        ChatType.GmLinkshell3 => ChatType.Linkshell3,
-        ChatType.Linkshell4 => ChatType.Linkshell4,
-        ChatType.GmLinkshell4 => ChatType.Linkshell4,
-        ChatType.Linkshell5 => ChatType.Linkshell5,
-        ChatType.GmLinkshell5 => ChatType.Linkshell5,
-        ChatType.Linkshell6 => ChatType.Linkshell6,
-        ChatType.GmLinkshell6 => ChatType.Linkshell6,
-        ChatType.Linkshell7 => ChatType.Linkshell7,
-        ChatType.GmLinkshell7 => ChatType.Linkshell7,
-        ChatType.Linkshell8 => ChatType.Linkshell8,
-        ChatType.GmLinkshell8 => ChatType.Linkshell8,
-        ChatType.FreeCompany => ChatType.FreeCompany,
-        ChatType.GmFreeCompany => ChatType.FreeCompany,
-        ChatType.NoviceNetwork => ChatType.NoviceNetwork,
-        ChatType.GmNoviceNetwork => ChatType.NoviceNetwork,
-        ChatType.CustomEmote => ChatType.CustomEmote,
-        ChatType.StandardEmote => ChatType.StandardEmote,
-        ChatType.Yell => ChatType.Yell,
-        ChatType.GmYell => ChatType.Yell,
-        ChatType.GainBuff => ChatType.GainBuff,
-        ChatType.LoseBuff => ChatType.GainBuff,
-        ChatType.GainDebuff => ChatType.GainDebuff,
-        ChatType.LoseDebuff => ChatType.GainDebuff,
-        ChatType.System => ChatType.System,
-        ChatType.Alarm => ChatType.System,
-        ChatType.GlamourNotifications => ChatType.System,
-        ChatType.RetainerSale => ChatType.System,
-        ChatType.PeriodicRecruitmentNotification => ChatType.System,
-        ChatType.Sign => ChatType.System,
-        ChatType.Orchestrion => ChatType.System,
-        ChatType.MessageBook => ChatType.System,
-        ChatType.NpcDialogue => ChatType.NpcDialogue,
-        ChatType.NpcAnnouncement => ChatType.NpcDialogue,
-        ChatType.LootRoll => ChatType.LootRoll,
-        ChatType.RandomNumber => ChatType.LootRoll,
-        ChatType.FreeCompanyAnnouncement => ChatType.FreeCompanyAnnouncement,
-        ChatType.FreeCompanyLoginLogout => ChatType.FreeCompanyAnnouncement,
-        ChatType.PvpTeamAnnouncement => ChatType.PvpTeamAnnouncement,
-        ChatType.PvpTeamLoginLogout => ChatType.PvpTeamAnnouncement,
-        _ => type,
-    };
+    internal static ChatType Parent(this ChatType type) =>
+        type switch
+        {
+            ChatType.Say => ChatType.Say,
+            ChatType.GmSay => ChatType.Say,
+            ChatType.Shout => ChatType.Shout,
+            ChatType.GmShout => ChatType.Shout,
+            ChatType.TellOutgoing => ChatType.TellOutgoing,
+            ChatType.TellIncoming => ChatType.TellOutgoing,
+            ChatType.GmTell => ChatType.TellOutgoing,
+            ChatType.Party => ChatType.Party,
+            ChatType.CrossParty => ChatType.Party,
+            ChatType.GmParty => ChatType.Party,
+            ChatType.Linkshell1 => ChatType.Linkshell1,
+            ChatType.GmLinkshell1 => ChatType.Linkshell1,
+            ChatType.Linkshell2 => ChatType.Linkshell2,
+            ChatType.GmLinkshell2 => ChatType.Linkshell2,
+            ChatType.Linkshell3 => ChatType.Linkshell3,
+            ChatType.GmLinkshell3 => ChatType.Linkshell3,
+            ChatType.Linkshell4 => ChatType.Linkshell4,
+            ChatType.GmLinkshell4 => ChatType.Linkshell4,
+            ChatType.Linkshell5 => ChatType.Linkshell5,
+            ChatType.GmLinkshell5 => ChatType.Linkshell5,
+            ChatType.Linkshell6 => ChatType.Linkshell6,
+            ChatType.GmLinkshell6 => ChatType.Linkshell6,
+            ChatType.Linkshell7 => ChatType.Linkshell7,
+            ChatType.GmLinkshell7 => ChatType.Linkshell7,
+            ChatType.Linkshell8 => ChatType.Linkshell8,
+            ChatType.GmLinkshell8 => ChatType.Linkshell8,
+            ChatType.FreeCompany => ChatType.FreeCompany,
+            ChatType.GmFreeCompany => ChatType.FreeCompany,
+            ChatType.NoviceNetwork => ChatType.NoviceNetwork,
+            ChatType.GmNoviceNetwork => ChatType.NoviceNetwork,
+            ChatType.CustomEmote => ChatType.CustomEmote,
+            ChatType.StandardEmote => ChatType.StandardEmote,
+            ChatType.Yell => ChatType.Yell,
+            ChatType.GmYell => ChatType.Yell,
+            ChatType.GainBuff => ChatType.GainBuff,
+            ChatType.LoseBuff => ChatType.GainBuff,
+            ChatType.GainDebuff => ChatType.GainDebuff,
+            ChatType.LoseDebuff => ChatType.GainDebuff,
+            ChatType.System => ChatType.System,
+            ChatType.Alarm => ChatType.System,
+            ChatType.GlamourNotifications => ChatType.System,
+            ChatType.RetainerSale => ChatType.System,
+            ChatType.PeriodicRecruitmentNotification => ChatType.System,
+            ChatType.Sign => ChatType.System,
+            ChatType.Orchestrion => ChatType.System,
+            ChatType.MessageBook => ChatType.System,
+            ChatType.NpcDialogue => ChatType.NpcDialogue,
+            ChatType.NpcAnnouncement => ChatType.NpcDialogue,
+            ChatType.LootRoll => ChatType.LootRoll,
+            ChatType.RandomNumber => ChatType.LootRoll,
+            ChatType.FreeCompanyAnnouncement => ChatType.FreeCompanyAnnouncement,
+            ChatType.FreeCompanyLoginLogout => ChatType.FreeCompanyAnnouncement,
+            ChatType.PvpTeamAnnouncement => ChatType.PvpTeamAnnouncement,
+            ChatType.PvpTeamLoginLogout => ChatType.PvpTeamAnnouncement,
+            _ => type,
+        };
 }
@@ -4,111 +4,114 @@ namespace HellionChat.Code;

 internal static class InputChannelExt
 {
-    internal static ChatType ToChatType(this InputChannel input) => input switch
-    {
-        InputChannel.Tell => ChatType.TellOutgoing,
-        InputChannel.Say => ChatType.Say,
-        InputChannel.Party => ChatType.Party,
-        InputChannel.Alliance => ChatType.Alliance,
-        InputChannel.Yell => ChatType.Yell,
-        InputChannel.Shout => ChatType.Shout,
-        InputChannel.FreeCompany => ChatType.FreeCompany,
-        InputChannel.PvpTeam => ChatType.PvpTeam,
-        InputChannel.NoviceNetwork => ChatType.NoviceNetwork,
-        InputChannel.CrossLinkshell1 => ChatType.CrossLinkshell1,
-        InputChannel.CrossLinkshell2 => ChatType.CrossLinkshell2,
-        InputChannel.CrossLinkshell3 => ChatType.CrossLinkshell3,
-        InputChannel.CrossLinkshell4 => ChatType.CrossLinkshell4,
-        InputChannel.CrossLinkshell5 => ChatType.CrossLinkshell5,
-        InputChannel.CrossLinkshell6 => ChatType.CrossLinkshell6,
-        InputChannel.CrossLinkshell7 => ChatType.CrossLinkshell7,
-        InputChannel.CrossLinkshell8 => ChatType.CrossLinkshell8,
-        InputChannel.Linkshell1 => ChatType.Linkshell1,
-        InputChannel.Linkshell2 => ChatType.Linkshell2,
-        InputChannel.Linkshell3 => ChatType.Linkshell3,
-        InputChannel.Linkshell4 => ChatType.Linkshell4,
-        InputChannel.Linkshell5 => ChatType.Linkshell5,
-        InputChannel.Linkshell6 => ChatType.Linkshell6,
-        InputChannel.Linkshell7 => ChatType.Linkshell7,
-        InputChannel.Linkshell8 => ChatType.Linkshell8,
-        InputChannel.ExtraChatLinkshell1 => ChatType.ExtraChatLinkshell1,
-        InputChannel.ExtraChatLinkshell2 => ChatType.ExtraChatLinkshell2,
-        InputChannel.ExtraChatLinkshell3 => ChatType.ExtraChatLinkshell3,
-        InputChannel.ExtraChatLinkshell4 => ChatType.ExtraChatLinkshell4,
-        InputChannel.ExtraChatLinkshell5 => ChatType.ExtraChatLinkshell5,
-        InputChannel.ExtraChatLinkshell6 => ChatType.ExtraChatLinkshell6,
-        InputChannel.ExtraChatLinkshell7 => ChatType.ExtraChatLinkshell7,
-        InputChannel.ExtraChatLinkshell8 => ChatType.ExtraChatLinkshell8,
-        InputChannel.Invalid => ChatType.Echo,
-        _ => throw new ArgumentOutOfRangeException(nameof(input), input, null),
-    };
+    internal static ChatType ToChatType(this InputChannel input) =>
+        input switch
+        {
+            InputChannel.Tell => ChatType.TellOutgoing,
+            InputChannel.Say => ChatType.Say,
+            InputChannel.Party => ChatType.Party,
+            InputChannel.Alliance => ChatType.Alliance,
+            InputChannel.Yell => ChatType.Yell,
+            InputChannel.Shout => ChatType.Shout,
+            InputChannel.FreeCompany => ChatType.FreeCompany,
+            InputChannel.PvpTeam => ChatType.PvpTeam,
+            InputChannel.NoviceNetwork => ChatType.NoviceNetwork,
+            InputChannel.CrossLinkshell1 => ChatType.CrossLinkshell1,
+            InputChannel.CrossLinkshell2 => ChatType.CrossLinkshell2,
+            InputChannel.CrossLinkshell3 => ChatType.CrossLinkshell3,
+            InputChannel.CrossLinkshell4 => ChatType.CrossLinkshell4,
+            InputChannel.CrossLinkshell5 => ChatType.CrossLinkshell5,
+            InputChannel.CrossLinkshell6 => ChatType.CrossLinkshell6,
+            InputChannel.CrossLinkshell7 => ChatType.CrossLinkshell7,
+            InputChannel.CrossLinkshell8 => ChatType.CrossLinkshell8,
+            InputChannel.Linkshell1 => ChatType.Linkshell1,
+            InputChannel.Linkshell2 => ChatType.Linkshell2,
+            InputChannel.Linkshell3 => ChatType.Linkshell3,
+            InputChannel.Linkshell4 => ChatType.Linkshell4,
+            InputChannel.Linkshell5 => ChatType.Linkshell5,
+            InputChannel.Linkshell6 => ChatType.Linkshell6,
+            InputChannel.Linkshell7 => ChatType.Linkshell7,
+            InputChannel.Linkshell8 => ChatType.Linkshell8,
+            InputChannel.ExtraChatLinkshell1 => ChatType.ExtraChatLinkshell1,
+            InputChannel.ExtraChatLinkshell2 => ChatType.ExtraChatLinkshell2,
+            InputChannel.ExtraChatLinkshell3 => ChatType.ExtraChatLinkshell3,
+            InputChannel.ExtraChatLinkshell4 => ChatType.ExtraChatLinkshell4,
+            InputChannel.ExtraChatLinkshell5 => ChatType.ExtraChatLinkshell5,
+            InputChannel.ExtraChatLinkshell6 => ChatType.ExtraChatLinkshell6,
+            InputChannel.ExtraChatLinkshell7 => ChatType.ExtraChatLinkshell7,
+            InputChannel.ExtraChatLinkshell8 => ChatType.ExtraChatLinkshell8,
+            InputChannel.Invalid => ChatType.Echo,
+            _ => throw new ArgumentOutOfRangeException(nameof(input), input, null),
+        };

-    public static uint LinkshellIndex(this InputChannel channel) => channel switch
-    {
-        InputChannel.Linkshell1 => 0,
-        InputChannel.Linkshell2 => 1,
-        InputChannel.Linkshell3 => 2,
-        InputChannel.Linkshell4 => 3,
-        InputChannel.Linkshell5 => 4,
-        InputChannel.Linkshell6 => 5,
-        InputChannel.Linkshell7 => 6,
-        InputChannel.Linkshell8 => 7,
-        InputChannel.CrossLinkshell1 => 0,
-        InputChannel.CrossLinkshell2 => 1,
-        InputChannel.CrossLinkshell3 => 2,
-        InputChannel.CrossLinkshell4 => 3,
-        InputChannel.CrossLinkshell5 => 4,
-        InputChannel.CrossLinkshell6 => 5,
-        InputChannel.CrossLinkshell7 => 6,
-        InputChannel.CrossLinkshell8 => 7,
-        InputChannel.ExtraChatLinkshell1 => 0,
-        InputChannel.ExtraChatLinkshell2 => 1,
-        InputChannel.ExtraChatLinkshell3 => 2,
-        InputChannel.ExtraChatLinkshell4 => 3,
-        InputChannel.ExtraChatLinkshell5 => 4,
-        InputChannel.ExtraChatLinkshell6 => 5,
-        InputChannel.ExtraChatLinkshell7 => 6,
-        InputChannel.ExtraChatLinkshell8 => 7,
-        _ => uint.MaxValue,
-    };
+    public static uint LinkshellIndex(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Linkshell1 => 0,
+            InputChannel.Linkshell2 => 1,
+            InputChannel.Linkshell3 => 2,
+            InputChannel.Linkshell4 => 3,
+            InputChannel.Linkshell5 => 4,
+            InputChannel.Linkshell6 => 5,
+            InputChannel.Linkshell7 => 6,
+            InputChannel.Linkshell8 => 7,
+            InputChannel.CrossLinkshell1 => 0,
+            InputChannel.CrossLinkshell2 => 1,
+            InputChannel.CrossLinkshell3 => 2,
+            InputChannel.CrossLinkshell4 => 3,
+            InputChannel.CrossLinkshell5 => 4,
+            InputChannel.CrossLinkshell6 => 5,
+            InputChannel.CrossLinkshell7 => 6,
+            InputChannel.CrossLinkshell8 => 7,
+            InputChannel.ExtraChatLinkshell1 => 0,
+            InputChannel.ExtraChatLinkshell2 => 1,
+            InputChannel.ExtraChatLinkshell3 => 2,
+            InputChannel.ExtraChatLinkshell4 => 3,
+            InputChannel.ExtraChatLinkshell5 => 4,
+            InputChannel.ExtraChatLinkshell6 => 5,
+            InputChannel.ExtraChatLinkshell7 => 6,
+            InputChannel.ExtraChatLinkshell8 => 7,
+            _ => uint.MaxValue,
+        };

-    public static string Prefix(this InputChannel channel) => channel switch
-    {
-        InputChannel.Tell => "/t",
-        InputChannel.Say => "/s",
-        InputChannel.Party => "/p",
-        InputChannel.Alliance => "/a",
-        InputChannel.Yell => "/y",
-        InputChannel.Shout => "/sh",
-        InputChannel.FreeCompany => "/fc",
-        InputChannel.PvpTeam => "/pt",
-        InputChannel.NoviceNetwork => "/b",
-        InputChannel.CrossLinkshell1 => "/cwl1",
-        InputChannel.CrossLinkshell2 => "/cwl2",
-        InputChannel.CrossLinkshell3 => "/cwl3",
-        InputChannel.CrossLinkshell4 => "/cwl4",
-        InputChannel.CrossLinkshell5 => "/cwl5",
-        InputChannel.CrossLinkshell6 => "/cwl6",
-        InputChannel.CrossLinkshell7 => "/cwl7",
-        InputChannel.CrossLinkshell8 => "/cwl8",
-        InputChannel.Linkshell1 => "/l1",
-        InputChannel.Linkshell2 => "/l2",
-        InputChannel.Linkshell3 => "/l3",
-        InputChannel.Linkshell4 => "/l4",
-        InputChannel.Linkshell5 => "/l5",
-        InputChannel.Linkshell6 => "/l6",
-        InputChannel.Linkshell7 => "/l7",
-        InputChannel.Linkshell8 => "/l8",
-        InputChannel.ExtraChatLinkshell1 => "/ecl1",
-        InputChannel.ExtraChatLinkshell2 => "/ecl2",
-        InputChannel.ExtraChatLinkshell3 => "/ecl3",
-        InputChannel.ExtraChatLinkshell4 => "/ecl4",
-        InputChannel.ExtraChatLinkshell5 => "/ecl5",
-        InputChannel.ExtraChatLinkshell6 => "/ecl6",
-        InputChannel.ExtraChatLinkshell7 => "/ecl7",
-        InputChannel.ExtraChatLinkshell8 => "/ecl8",
-        _ => "/e",
-    };
+    public static string Prefix(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Tell => "/t",
+            InputChannel.Say => "/s",
+            InputChannel.Party => "/p",
+            InputChannel.Alliance => "/a",
+            InputChannel.Yell => "/y",
+            InputChannel.Shout => "/sh",
+            InputChannel.FreeCompany => "/fc",
+            InputChannel.PvpTeam => "/pt",
+            InputChannel.NoviceNetwork => "/b",
+            InputChannel.CrossLinkshell1 => "/cwl1",
+            InputChannel.CrossLinkshell2 => "/cwl2",
+            InputChannel.CrossLinkshell3 => "/cwl3",
+            InputChannel.CrossLinkshell4 => "/cwl4",
+            InputChannel.CrossLinkshell5 => "/cwl5",
+            InputChannel.CrossLinkshell6 => "/cwl6",
+            InputChannel.CrossLinkshell7 => "/cwl7",
+            InputChannel.CrossLinkshell8 => "/cwl8",
+            InputChannel.Linkshell1 => "/l1",
+            InputChannel.Linkshell2 => "/l2",
+            InputChannel.Linkshell3 => "/l3",
+            InputChannel.Linkshell4 => "/l4",
+            InputChannel.Linkshell5 => "/l5",
+            InputChannel.Linkshell6 => "/l6",
+            InputChannel.Linkshell7 => "/l7",
+            InputChannel.Linkshell8 => "/l8",
+            InputChannel.ExtraChatLinkshell1 => "/ecl1",
+            InputChannel.ExtraChatLinkshell2 => "/ecl2",
+            InputChannel.ExtraChatLinkshell3 => "/ecl3",
+            InputChannel.ExtraChatLinkshell4 => "/ecl4",
+            InputChannel.ExtraChatLinkshell5 => "/ecl5",
+            InputChannel.ExtraChatLinkshell6 => "/ecl6",
+            InputChannel.ExtraChatLinkshell7 => "/ecl7",
+            InputChannel.ExtraChatLinkshell8 => "/ecl8",
+            _ => "/e",
+        };

    public static IEnumerable<TextCommand>? TextCommands(this InputChannel channel)
    {
@@ -145,51 +148,56 @@ internal static class InputChannelExt
        if (ids.Length == 0)
            return null;

-        return ids.Where(id => Sheets.TextCommandSheet.HasRow(id)).Select(id => Sheets.TextCommandSheet.GetRow(id));
+        return ids.Where(id => Sheets.TextCommandSheet.HasRow(id))
+            .Select(id => Sheets.TextCommandSheet.GetRow(id));
    }

-    internal static bool IsLinkshell(this InputChannel channel) => channel switch
-    {
-        InputChannel.Linkshell1 => true,
-        InputChannel.Linkshell2 => true,
-        InputChannel.Linkshell3 => true,
-        InputChannel.Linkshell4 => true,
-        InputChannel.Linkshell5 => true,
-        InputChannel.Linkshell6 => true,
-        InputChannel.Linkshell7 => true,
-        InputChannel.Linkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsLinkshell(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Linkshell1 => true,
+            InputChannel.Linkshell2 => true,
+            InputChannel.Linkshell3 => true,
+            InputChannel.Linkshell4 => true,
+            InputChannel.Linkshell5 => true,
+            InputChannel.Linkshell6 => true,
+            InputChannel.Linkshell7 => true,
+            InputChannel.Linkshell8 => true,
+            _ => false,
+        };

-    internal static bool IsCrossLinkshell(this InputChannel channel) => channel switch
-    {
-        InputChannel.CrossLinkshell1 => true,
-        InputChannel.CrossLinkshell2 => true,
-        InputChannel.CrossLinkshell3 => true,
-        InputChannel.CrossLinkshell4 => true,
-        InputChannel.CrossLinkshell5 => true,
-        InputChannel.CrossLinkshell6 => true,
-        InputChannel.CrossLinkshell7 => true,
-        InputChannel.CrossLinkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsCrossLinkshell(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.CrossLinkshell1 => true,
+            InputChannel.CrossLinkshell2 => true,
+            InputChannel.CrossLinkshell3 => true,
+            InputChannel.CrossLinkshell4 => true,
+            InputChannel.CrossLinkshell5 => true,
+            InputChannel.CrossLinkshell6 => true,
+            InputChannel.CrossLinkshell7 => true,
+            InputChannel.CrossLinkshell8 => true,
+            _ => false,
+        };

-    internal static bool IsExtraChatLinkshell(this InputChannel channel) => channel switch
-    {
-        InputChannel.ExtraChatLinkshell1 => true,
-        InputChannel.ExtraChatLinkshell2 => true,
-        InputChannel.ExtraChatLinkshell3 => true,
-        InputChannel.ExtraChatLinkshell4 => true,
-        InputChannel.ExtraChatLinkshell5 => true,
-        InputChannel.ExtraChatLinkshell6 => true,
-        InputChannel.ExtraChatLinkshell7 => true,
-        InputChannel.ExtraChatLinkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsExtraChatLinkshell(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.ExtraChatLinkshell1 => true,
+            InputChannel.ExtraChatLinkshell2 => true,
+            InputChannel.ExtraChatLinkshell3 => true,
+            InputChannel.ExtraChatLinkshell4 => true,
+            InputChannel.ExtraChatLinkshell5 => true,
+            InputChannel.ExtraChatLinkshell6 => true,
+            InputChannel.ExtraChatLinkshell7 => true,
+            InputChannel.ExtraChatLinkshell8 => true,
+            _ => false,
+        };

-    internal static bool IsValid(this InputChannel channel) => channel switch
-    {
-        InputChannel.Invalid => false,
-        _ => true,
-    };
+    internal static bool IsValid(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Invalid => false,
+            _ => true,
+        };
 }
@@ -1,10 +1,17 @@
 using Dalamud.Game.Command;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

 internal sealed class Commands : IDisposable
 {
    private readonly Dictionary<string, CommandWrapper> Registered = [];
+    private readonly ILogger<Commands> _logger;
+
+    public Commands(ILogger<Commands> logger)
+    {
+        _logger = logger;
+    }

    public void Dispose()
    {
@@ -16,15 +23,22 @@ internal sealed class Commands : IDisposable
    {
        foreach (var wrapper in Registered.Values)
        {
-            Plugin.CommandManager.AddHandler(wrapper.Name, new CommandInfo(Invoke)
-            {
-                HelpMessage = wrapper.Description ?? string.Empty,
-                ShowInHelp = wrapper.ShowInHelp,
-            });
+            Plugin.CommandManager.AddHandler(
+                wrapper.Name,
+                new CommandInfo(Invoke)
+                {
+                    HelpMessage = wrapper.Description ?? string.Empty,
+                    ShowInHelp = wrapper.ShowInHelp,
+                }
+            );
        }
    }

-    internal CommandWrapper Register(string name, string? description = null, bool? showInHelp = null)
+    internal CommandWrapper Register(
+        string name,
+        string? description = null,
+        bool? showInHelp = null
+    )
    {
        if (Registered.TryGetValue(name, out var wrapper))
        {
@@ -45,7 +59,7 @@ internal sealed class Commands : IDisposable
    {
        if (!Registered.TryGetValue(command, out var wrapper))
        {
-            Plugin.Log.Warning($"Missing registration for command {command}");
+            _logger.LogWarning($"Missing registration for command {command}");
            return;
        }

@@ -55,7 +69,7 @@ internal sealed class Commands : IDisposable
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, $"Error while executing command {command}");
+            _logger.LogError(ex, $"Error while executing command {command}");
        }
    }
 }
@@ -1,14 +1,14 @@
 using System.Collections;
-using HellionChat.Code;
-using HellionChat.GameFunctions.Types;
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Configuration;
 using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface.FontIdentifier;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Code;
+using HellionChat.GameFunctions.Types;
+using HellionChat.Resources;
+using HellionChat.Util;

 namespace HellionChat;

@@ -27,43 +27,48 @@ public class ConfigKeyBind
            modString += Language.Keybind_Modifier_Shift + " + ";
        if (Modifier.HasFlag(ModifierFlag.Alt))
            modString += Language.Keybind_Modifier_Alt + " + ";
-        return modString+Key.GetFancyName();
+        return modString + Key.GetFancyName();
    }
 }

 [Serializable]
 public class Configuration : IPluginConfiguration
 {
-    private const int LatestVersion = 16;
+    private const int LatestVersion = 18;

    public int Version { get; set; } = LatestVersion;

-    // v1.1.0 — Theme-Engine. Slug-basiert; ThemeRegistry liefert das Objekt.
+    // Slug-based; ThemeRegistry resolves the object at runtime.
    public string Theme = "hellion-arctic";

-    // v1.1.0 — Globale Window-Opacity, theme-übergreifend. Migration aus
-    // HellionThemeWindowOpacity beim Bump v13 → v14.
+    // Global window opacity, applied across all themes.
    public float WindowOpacity = 0.85f;

-
-    // v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden
-    // vorab angelegt, damit später keine Migration nötig ist.
+    // Reserved for future UI toggles; pre-declared to avoid a migration later.
    public bool ReduceMotion;
-    // v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus
-    // v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender:
-    // Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv
-    // false werden durch die v15→v16-Migration auf den neuen Default
-    // gehoben (Heuristik: wer in v1.2.0 false hatte, hatte den damals
-    // neu eingeführten Default — kaum jemand hat aktiv abgeschaltet).
+
+    // v1.2.1: default flipped false → true. Compact single-line layout is
+    // more readable than the card-rows layout introduced in v1.2.0.
    public bool UseCompactDensity = true;

-    // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
-    // Master-switch defaults to true; set false to restore upstream behavior.
+    // Privacy by Default master switch. Set false to restore upstream behaviour.
    public bool PrivacyFilterEnabled = true;
+
    // Empty set means the migration has not run yet — see Plugin.cs v6→v7.
    public HashSet<ChatType> PrivacyPersistChannels = [];
-    // Failsafe for ChatTypes added by future FFXIV patches we don't know about.
-    public bool PrivacyPersistUnknownChannels;
+
+    // Failsafe for ChatTypes added by future FFXIV patches. New configs default
+    // to the failsafe via PrivacyDefaults; existing configs keep their saved
+    // choice because the deserializer overrides this initializer.
+    public bool PrivacyPersistUnknownChannels = Privacy
+        .PrivacyDefaults
+        .DefaultPersistUnknownChannels;
+
+    // F3.2: dedup unknown-ChatType warnings so a chatty filter doesn't spam
+    // the log every frame. NonSerialized so the warning fires once per
+    // runtime, not once-ever-per-install.
+    [NonSerialized]
+    private readonly HashSet<ChatType> _warnedUnknownChannels = new();

    public bool IsAllowedForStorage(ChatType type)
    {
@@ -71,78 +76,61 @@ public class Configuration : IPluginConfiguration
            return true;
        if (PrivacyPersistChannels.Contains(type))
            return true;
+
+        // F3.2: log first occurrence of a ChatType the running build doesn't
+        // recognise — i.e. one a future FFXIV patch may have added. Known
+        // types the user opted out of are routed through the failsafe
+        // silently, like before.
+        if (!Enum.IsDefined(typeof(ChatType), type) && _warnedUnknownChannels.Add(type))
+        {
+            Plugin.LogProxy.Warning(
+                "PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
+                type,
+                PrivacyPersistUnknownChannels
+            );
+        }
+
        return PrivacyPersistUnknownChannels;
    }

-    // Hellion Chat — Message retention (GDPR data minimization, time axis).
-    // Master switch defaults to false; the plugin will not delete history
-    // until the user explicitly opts in.
+    // Retention master switch defaults to false — plugin will not delete
+    // history until the user explicitly opts in.
    public bool RetentionEnabled;
    public int RetentionDefaultDays = 30;
    public Dictionary<ChatType, int> RetentionPerChannelDays = [];
    public DateTimeOffset RetentionLastRunAt = DateTimeOffset.MinValue;
-
-    // Hellion Chat first-run wizard — opens once on a fresh install. Existing
-    // ChatTwo users skip it because the v6→v7 migration sets the flag.
    public bool FirstRunCompleted;

-    // Use the bundled Exo 2 font (OFL-1.1) for the regular plugin font
-    // instead of whatever GlobalFontV2.FontId points at. Default ON so a
-    // fresh install gets the Hellion typography out-of-the-box; flip OFF
-    // to fall back to the user's chosen system or Dalamud font.
-    public bool UseHellionFont = true;
+    // Tracks which plugin version last surfaced the first-run wizard.
+    // When the running version is newer than this, Plugin.LoadAsync
+    // re-opens the wizard once so existing users see major UX reworks
+    // (e.g. the v1.5.2 multi-step rewrite). Skip path and Finish both
+    // set FirstRunCompleted = true on close, so the wizard only fires
+    // once per version bump even if the user dismisses it.
+    public string WizardLastShownVersion = string.Empty;

-    // Cycle 1 of the plugin-integration roadmap. When Honorific is installed
-    // and reports a custom title, render it in the chat header above the
-    // message log. Auto-hides regardless when Honorific is missing or the
-    // active title is original/empty, so leaving this on is safe even for
-    // users who don't run Honorific.
+    public bool UseHellionFont = true;
    public bool ShowHonorificTitleInHeader = true;

-    // Hellion Chat — Auto-Tell-Tabs. When enabled, an incoming or outgoing
-    // /tell spawns a session-only tab dedicated to that conversation
-    // partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian).
+    // v1.4.7 opt-in: renders the Honorific glow outline when the title carries
+    // a Glow colour. Default OFF — keeps v1.4.6 visuals untouched for users
+    // who don't care, and dodges the per-frame DrawList overhead on low-end
+    // hardware. Gradient (Color3 / GradientColourSet) is parsed but rendered
+    // as the primary Color until a later cycle ports the animation.
+    public bool ShowHonorificGlow;
    public bool EnableAutoTellTabs = true;
-    // Hard cap on simultaneously open auto tell tabs. Range enforced by the
-    // settings slider (1–50). LRU drop favors greeted tabs first.
    public int AutoTellTabsLimit = 15;
-    // When true the sidebar shows only a thin separator before the temp
-    // tabs; when false a section header "Active Tells (n)" is rendered.
    public bool AutoTellTabsCompactDisplay;
-    // Number of prior tells to preload from the message store when an
-    // auto tell tab is spawned. Range 0–100; 0 disables preload.
    public int AutoTellTabsHistoryPreload = 20;
-    // Show the greeter "marked-as-greeted" toggle button next to each
-    // temp tab and dim the tab name when set. Off by default because the
-    // workflow is specific to club-greeter use cases — most users just
-    // want the auto tabs themselves without the extra UI affordance.
+
+    // Sidebar width in pixels. Default 44 mirrors the icon-only layout from
+    // v1.2.0; users can widen up to 160 to fit a section-header line like
+    // "Active Tells (3)" without truncation.
+    public int SidebarWidth = 44;
    public bool AutoTellTabsShowGreetedToggle;
-
-    // Hellion Chat — One-Time-Hint-Banner that introduces the v0.6.0 pop-out
-    // input feature. Set to true once the user dismisses the banner from a
-    // pop-out window; never reset after that.
    public bool SeenPopOutInputHint;
-
-    // Hellion Chat — v0.6.0 master switch for the pop-out input bar.
-    // Global on purpose: per-tab makes no sense for Auto-Tell-Tabs which
-    // are session-only and would force the user to re-enable it for every
-    // new conversation. Default flipped to ON in v0.6.1 (was OFF in v0.6.0)
-    // because tester feedback called the manual toggle "umständlich, wirkt
-    // unfertig". v11 → v12 migration applies the same flip to existing users.
    public bool PopOutInputEnabled = true;
-
-    // Hellion Chat — v0.6.1 One-Time-Hint-Banner that introduces the
-    // chat-header pop-out toolbar button and reminds about the pop-out
-    // input default flip. Set to true once the user dismisses the banner
-    // from the main chat window; never reset after that.
    public bool SeenPopOutHeaderHint;
-
-    // Hellion Chat — v0.6.1 opt-in: when true, AutoTellTabsService.SpawnTempTab
-    // sets tab.PopOut = true on every new auto-tell tab so the conversation
-    // pops out as its own window directly. Closing the pop-out returns the
-    // tab to the sidebar via the standard Popout.OnClose() flow. Default OFF
-    // because the existing sidebar workflow is what most users (especially
-    // club greeters tracking many parallel tells) expect by default.
    public bool AutoTellTabsOpenAsPopout;

    public int GetRetentionDays(ChatType type)
@@ -160,10 +148,8 @@ public class Configuration : IPluginConfiguration
    public bool HideWhenUiHidden = true;
    public bool HideInLoadingScreens;
    public bool HideInBattle;
-    // v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
-    // versteckt zu halten ist konsistent mit den anderen Hide-Defaults
-    // (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
-    // Sequenzen.
+
+    // v1.2.1: default flipped false → true for consistency with other hide defaults.
    public bool HideInNewGamePlusMenu = true;
    public bool HideWhenInactive;
    public int InactivityHideTimeout = 10;
@@ -179,16 +165,8 @@ public class Configuration : IPluginConfiguration
    public bool NativeItemTooltips = true;
    public bool PrettierTimestamps = true;
    public bool MoreCompactPretty;
-    // v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
-    // innerhalb derselben Minute lesen sich als Rauschen; ein einziger
-    // Timestamp pro Minute reicht aus um die Konversation zu verorten.
    public bool HideSameTimestamps = true;
    public bool ShowNoviceNetwork;
-    // Hellion Chat — vertical sidebar tab layout reads better than the
-    // horizontal tab strip in the company of Auto-Tell-Tabs (a club
-    // greeter typically tracks 5–15 simultaneous conversations). Bestand
-    // users keep their saved value untouched — only fresh installs pick
-    // up the new default.
    public bool SidebarTabView = true;
    public bool PrintChangelog = true;
    public bool OnlyPreviewIf;
@@ -207,22 +185,16 @@ public class Configuration : IPluginConfiguration
    public bool SortAutoTranslate;
    public bool CollapseDuplicateMessages;
    public bool CollapseKeepUniqueLinks;
+    public bool SymbolPickerEnabled = true;
    public bool PlaySounds = true;
-    public bool KeepInputFocus = true;
-    // v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
-    // Hardware bei langen Sessions spürbar langsamer (Card-Layout
-    // re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
-    // und bleibt smooth. User die mehr brauchen können bis 10000 hoch.
-    public int MaxLinesToRender = 2_500; // 1-10000
-    // Default ON to match a German / European 24h locale. The
-    // ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
-    // CultureInfo.InvariantCulture so the result is consistent across
-    // host locales.
-    public bool Use24HourClock = true;

+    // Toast when a tell the user sent could not be delivered.
+    public bool NotifyFailedTell = true;
+    public bool KeepInputFocus = true;
+    public int MaxLinesToRender = 2_500; // 1-10000
+    public bool Use24HourClock = true;
    public bool ShowEmotes = true;
    public HashSet<string> BlockedEmotes = [];
-
    public bool FontsEnabled = true;
    public ExtraGlyphRanges ExtraGlyphRanges = 0;
    public float FontSizeV2 = 12.75f;
@@ -246,18 +218,15 @@ public class Configuration : IPluginConfiguration
    };

    public float TooltipOffset;
-    // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
-    // First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen
-    // neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
-    // Standard/Tell, Ember/Warning für laute Channels). Bestand-User mit
-    // leerem ChatColours-Dict werden durch die v15→v16-Migration auf das
-    // Preset gehoben; User die bereits Custom-Farben haben, bleiben.
+
    public Dictionary<ChatType, uint> ChatColours = BuildDefaultChatColours();

    private static Dictionary<ChatType, uint> BuildDefaultChatColours()
    {
        var defaults = new Dictionary<ChatType, uint>();
-        foreach (var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours)
+        foreach (
+            var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours
+        )
            defaults[channel] = colour;
        return defaults;
    }
@@ -284,7 +253,10 @@ public class Configuration : IPluginConfiguration
        HideWhenInactive = other.HideWhenInactive;
        InactivityHideTimeout = other.InactivityHideTimeout;
        InactivityHideActiveDuringBattle = other.InactivityHideActiveDuringBattle;
-        InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(pair => pair.Key, pair => pair.Value);
+        InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(
+            pair => pair.Key,
+            pair => pair.Value
+        );
        InactivityHideExtraChatAll = other.InactivityHideExtraChatAll;
        InactivityHideExtraChatChannels = other.InactivityHideExtraChatChannels.ToHashSet();
        ShowHideButton = other.ShowHideButton;
@@ -311,14 +283,14 @@ public class Configuration : IPluginConfiguration
        SortAutoTranslate = other.SortAutoTranslate;
        CollapseDuplicateMessages = other.CollapseDuplicateMessages;
        CollapseKeepUniqueLinks = other.CollapseKeepUniqueLinks;
+        SymbolPickerEnabled = other.SymbolPickerEnabled;
        PlaySounds = other.PlaySounds;
+        NotifyFailedTell = other.NotifyFailedTell;
        KeepInputFocus = other.KeepInputFocus;
        MaxLinesToRender = other.MaxLinesToRender;
        Use24HourClock = other.Use24HourClock;
        ShowEmotes = other.ShowEmotes;
-        // Deep-copy the set so the live and mutable Configuration instances don't share state
-        // — a HashSet reference assignment would cause edits in the settings window to leak
-        // into the live config before the user clicks Save.
+        // Deep-copy so settings window edits don't leak into live config before Save.
        BlockedEmotes = new HashSet<string>(other.BlockedEmotes);
        FontsEnabled = other.FontsEnabled;
        ItalicEnabled = other.ItalicEnabled;
@@ -332,54 +304,55 @@ public class Configuration : IPluginConfiguration
        ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
        ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;

-        // Hellion Chat — Auto-Tell-Tabs are session-only and therefore
-        // never present in a disk-loaded copy. Keep the live temp tabs of
-        // *this* configuration alive across an UpdateFrom so a settings
-        // save (or sidebar-mode toggle) does not silently destroy the
-        // user's open tell conversations.
-        //
-        // For persistent tabs we go through Tab.Clone() which intentionally
-        // does NOT copy the NonSerialized Messages list (avoids shared
-        // mutable state on disk-load). On a settings save that means the
-        // chat history for every persistent tab would be wiped — bug
-        // reported by Flo 2026-05-05. We work around it by capturing the
-        // live MessageList (and LastSendUnread counter) by Identifier
-        // before the replace, then restoring it onto the freshly cloned
-        // tabs whose Identifier survives Tab.Clone(). New tabs added in
-        // settings get a fresh empty MessageList; deleted tabs lose their
-        // history (intended).
-        var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
-        var livePersistentSession = Tabs
-            .Where(t => !t.IsTempTab)
-            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
+        // Keep live temp tabs alive across UpdateFrom — a settings save must
+        // not destroy open tell conversations. Pinned TempTabs are persistent
+        // and come through `other` like regular tabs; unpinned TempTabs are
+        // session-only and held from the local state. For persistent tabs
+        // (incl. pinned), capture live runtime state by Identifier and restore
+        // it onto the freshly cloned tabs — CurrentChannel is critical because
+        // the user may have switched channel in-game between settings-open
+        // and settings-save, and we'd otherwise overwrite that with the
+        // settings-time snapshot.
+        var liveUnpinnedTempTabs = Tabs.Where(TabLifecycleHelpers.IsInUnpinnedPool).ToList();
+        var livePersistentSession = Tabs.Where(t => !TabLifecycleHelpers.IsInUnpinnedPool(t))
+            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread, t.CurrentChannel));

-        Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t =>
-        {
-            var clone = t.Clone();
-            if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
+        Tabs = other
+            .Tabs.Where(t => !t.IsTempTab || t.IsPinned)
+            .Select(t =>
            {
-                clone.Messages = live.Messages;
-                clone.LastSendUnread = live.LastSendUnread;
-            }
-            return clone;
-        }).ToList();
-        Tabs.AddRange(liveTempTabs);
+                var clone = t.Clone();
+                if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
+                {
+                    clone.Messages = live.Messages;
+                    clone.LastSendUnread = live.LastSendUnread;
+                    clone.CurrentChannel = live.CurrentChannel;
+                }
+                return clone;
+            })
+            .ToList();
+        Tabs.AddRange(liveUnpinnedTempTabs);

        ChatTabForward = other.ChatTabForward;
        ChatTabBackward = other.ChatTabBackward;

        PrivacyFilterEnabled = other.PrivacyFilterEnabled;
-        PrivacyPersistChannels = [..other.PrivacyPersistChannels];
+        PrivacyPersistChannels = [.. other.PrivacyPersistChannels];
        PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels;

        RetentionEnabled = other.RetentionEnabled;
        RetentionDefaultDays = other.RetentionDefaultDays;
-        RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(p => p.Key, p => p.Value);
+        RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(
+            p => p.Key,
+            p => p.Value
+        );
        RetentionLastRunAt = other.RetentionLastRunAt;

        FirstRunCompleted = other.FirstRunCompleted;
+        WizardLastShownVersion = other.WizardLastShownVersion;
        UseHellionFont = other.UseHellionFont;
        ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader;
+        ShowHonorificGlow = other.ShowHonorificGlow;

        // v1.1.0 theme engine fields
        Theme = other.Theme;
@@ -391,6 +364,7 @@ public class Configuration : IPluginConfiguration
        AutoTellTabsLimit = other.AutoTellTabsLimit;
        AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay;
        AutoTellTabsHistoryPreload = other.AutoTellTabsHistoryPreload;
+        SidebarWidth = other.SidebarWidth;
        AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle;

        SeenPopOutInputHint = other.SeenPopOutInputHint;
@@ -410,21 +384,23 @@ public enum UnreadMode

 public static class UnreadModeExt
 {
-    internal static string Name(this UnreadMode mode) => mode switch
-    {
-        UnreadMode.All => Language.UnreadMode_All,
-        UnreadMode.Unseen => Language.UnreadMode_Unseen,
-        UnreadMode.None => Language.UnreadMode_None,
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    internal static string Name(this UnreadMode mode) =>
+        mode switch
+        {
+            UnreadMode.All => Language.UnreadMode_All,
+            UnreadMode.Unseen => Language.UnreadMode_Unseen,
+            UnreadMode.None => Language.UnreadMode_None,
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };

-    internal static string? Tooltip(this UnreadMode mode) => mode switch
-    {
-        UnreadMode.All => Language.UnreadMode_All_Tooltip,
-        UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip,
-        UnreadMode.None => Language.UnreadMode_None_Tooltip,
-        _ => null,
-    };
+    internal static string? Tooltip(this UnreadMode mode) =>
+        mode switch
+        {
+            UnreadMode.All => Language.UnreadMode_All_Tooltip,
+            UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip,
+            UnreadMode.None => Language.UnreadMode_None_Tooltip,
+            _ => null,
+        };
 }

 [Serializable]
@@ -432,9 +408,7 @@ public class Tab
 {
    public string Name = Language.Tab_DefaultName;

-    // v1.2.0 — optionaler FontAwesome-Glyph-Name. Null bedeutet:
-    // Default-Mapping aus TabIconMapping greift (basiert auf Tab-Name).
-    // User können hier per Settings → Tabs einen eigenen Glyph setzen.
+    // Optional FontAwesome glyph name; null falls back to TabIconMapping default.
    public string? Icon = null;

    [Obsolete("Removed in favor of SelectedChannels")]
@@ -465,37 +439,80 @@ public class Tab
    public bool HideWhenInactive;

    public bool IsTempTab;
+
+    // Pinned TempTabs survive plugin reload and logout — tester feedback from
+    // Jin (v1.4.7). Pinned tabs live in their own pool (MaxPinnedTempTabs)
+    // separate from the AutoTellTabsLimit bucket.
+    public bool IsPinned;
    public bool AllSenderMessages;
    public TellTarget TellTarget = TellTarget.Empty();

-    [NonSerialized] public uint Unread;
-    [NonSerialized] public uint LastSendUnread;
-    [NonSerialized] public long LastActivity;
-    [NonSerialized] public MessageList Messages = new();
+    // Per-tab notification sound for messages arriving in an inactive tab.
+    public bool EnableNotificationSound;
+    public uint NotificationSoundId = 1;

-    [NonSerialized] public UsedChannel CurrentChannel = new();
+    [NonSerialized]
+    public uint Unread;

-    [NonSerialized] public Guid Identifier = Guid.NewGuid();
+    [NonSerialized]
+    public uint LastSendUnread;

-    // Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the
-    // sidebar to mark a tell partner as already greeted in the current
-    // session. NonSerialized because the temp tab itself is session-only.
-    [NonSerialized] public bool IsGreeted;
+    [NonSerialized]
+    public long LastActivity;
+
+    [NonSerialized]
+    public MessageList Messages = new();
+
+    [NonSerialized]
+    public UsedChannel CurrentChannel = new();
+
+    [NonSerialized]
+    public Guid Identifier = Guid.NewGuid();
+
+    // Session-only greeted flag for club-greeter workflows.
+    [NonSerialized]
+    public bool IsGreeted;
+
+    // Separate validation keys per cache so TellTarget changes don't
+    // cause GetTint and GetIcon to strand each other with stale entries.
+    [NonSerialized]
+    internal string? _cachedTintTellName;
+
+    [NonSerialized]
+    internal uint _cachedTintTellWorld;
+
+    [NonSerialized]
+    internal uint _cachedTellTint;
+
+    [NonSerialized]
+    internal string? _cachedIconTellName;
+
+    [NonSerialized]
+    internal uint _cachedIconTellWorld;
+
+    [NonSerialized]
+    internal string? _cachedTellIcon;
+
+    // PM-3 hover-lerp state. Default 0f means "not hovered". Sidebar
+    // path animates per tab; card-mode-border path is tab-aggregate
+    // (any card-row hover ramps the alpha for all cards in this tab).
+    // Lerp speed lives in the render loop, not here, so the same field
+    // serves both sites at the same animation curve.
+    [NonSerialized]
+    internal float _hoverAlpha;
+
+    [NonSerialized]
+    internal float _cardHoverAlpha;

    public bool Matches(Message message)
    {
        if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels))
-        {
            return false;
-        }

-        // Auto-tell temp tabs are bound to a single conversation partner;
-        // every other tell that matches the channel filter must NOT land
-        // here, otherwise all temp tabs would mirror "Tell Exclusive".
+        // Temp tabs are bound to a single conversation partner — other tells
+        // matching the channel filter must not land here.
        if (IsTempTab && TellTarget?.IsSet() == true)
-        {
            return ChunkUtil.MatchesSender(message, TellTarget.Name, TellTarget.World);
-        }

        return true;
    }
@@ -507,12 +524,17 @@ public class Tab
            return;

        Unread += 1;
-        if (message.Matches(Plugin.Config.InactivityHideChannelsV2, Plugin.Config.InactivityHideExtraChatAll, Plugin.Config.InactivityHideExtraChatChannels))
+        if (
+            message.Matches(
+                Plugin.Config.InactivityHideChannelsV2,
+                Plugin.Config.InactivityHideExtraChatAll,
+                Plugin.Config.InactivityHideExtraChatChannels
+            )
+        )
            LastActivity = Environment.TickCount64;
    }

-    public void Clear()
-        => Messages.Clear();
+    public void Clear() => Messages.Clear();

    public Tab Clone()
    {
@@ -533,7 +555,7 @@ public class Tab
            Opacity = Opacity,
            Identifier = Identifier,
            InputDisabled = InputDisabled,
-            CurrentChannel = CurrentChannel,
+            CurrentChannel = CurrentChannel.Clone(),
            CanMove = CanMove,
            CanResize = CanResize,
            IndependentHide = IndependentHide,
@@ -544,16 +566,16 @@ public class Tab
            HideInBattle = HideInBattle,
            HideWhenInactive = HideWhenInactive,
            IsTempTab = IsTempTab,
+            IsPinned = IsPinned,
            AllSenderMessages = AllSenderMessages,
-            TellTarget = TellTarget.From(TellTarget),
+            TellTarget = TellTarget.Clone(),
+            EnableNotificationSound = EnableNotificationSound,
+            NotificationSoundId = NotificationSoundId,
            IsGreeted = IsGreeted,
        };
    }

-    /// <summary>
-    /// MessageList provides an ordered list of messages with duplicate ID
-    /// tracking, sorting and mutex protection.
-    /// </summary>
+    /// Ordered message list with duplicate ID tracking, sorting and mutex protection.
    public class MessageList
    {
        private readonly SemaphoreSlim LockSlim = new(1, 1);
@@ -641,23 +663,24 @@ public class Tab
            }
        }

-        /// <summary>
-        /// Aktuelle Anzahl der gespeicherten Messages. Lock-acquire pro Read
-        /// ist OK für 1×/sec Status-Bar-Polling (v1.2.0).
-        /// </summary>
+        /// Current message count. Lock-per-read is acceptable for 1×/sec status bar polling.
        public int Count
        {
            get
            {
                LockSlim.Wait(-1);
-                try { return Messages.Count; }
-                finally { LockSlim.Release(); }
+                try
+                {
+                    return Messages.Count;
+                }
+                finally
+                {
+                    LockSlim.Release();
+                }
            }
        }

-        /// <summary>
-        /// Returns an array copy of the message list for usage outside of main thread
-        /// </summary>
+        /// Returns an array copy of the message list for usage outside of main thread.
        public async Task<Message[]> GetCopy(int millisecondsTimeout = -1)
        {
            await LockSlim.WaitAsync(millisecondsTimeout);
@@ -671,17 +694,16 @@ public class Tab
            }
        }

-        /// <summary>
-        /// GetReadOnly returns a read-only list of messages while holding a
-        /// reader lock. The list should be used with a using statement.
-        /// </summary>
+        /// Returns a read-only list while holding a reader lock. Use with a using statement.
        public RLockedMessageList GetReadOnly(int millisecondsTimeout = -1)
        {
            LockSlim.Wait(millisecondsTimeout);
            return new RLockedMessageList(LockSlim, Messages);
        }

-        public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages) : IReadOnlyList<Message>, IDisposable
+        public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages)
+            : IReadOnlyList<Message>,
+                IDisposable
        {
            public IEnumerator<Message> GetEnumerator()
            {
@@ -726,6 +748,29 @@ public class UsedChannel
    {
        Channel = channel;
    }
+
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Deep-clone the UsedChannel so Tab.Clone() no longer shares
+    //   channel state (incl. TellTarget) with its origin Tab. Previously
+    //   a reference copy: PopOut and Temp tabs mutated each other.
+    // - Name is intentionally a reference copy (matches upstream); it
+    //   gets reassigned on every channel switch anyway.
+    // TEST-MIRROR: ../../Hellion Build test/_Helpers/UsedChannelCloneTests.cs
+    // ---------------------------------------------------------------
+    public UsedChannel Clone()
+    {
+        return new UsedChannel
+        {
+            Channel = Channel,
+            Name = Name,
+            TellTarget = TellTarget?.Clone(),
+
+            UseTempChannel = UseTempChannel,
+            TempChannel = TempChannel,
+            TempTellTarget = TempTellTarget?.Clone(),
+        };
+    }
 }

 [Serializable]
@@ -740,15 +785,16 @@ public enum PreviewPosition

 public static class PreviewPositionExt
 {
-    public static string Name(this PreviewPosition position) => position switch
-    {
-        PreviewPosition.None => Language.Options_Preview_None,
-        PreviewPosition.Inside => Language.Options_Preview_Inside,
-        PreviewPosition.Top => Language.Options_Preview_Top,
-        PreviewPosition.Bottom => Language.Options_Preview_Bottom,
-        PreviewPosition.Tooltip => Language.Options_Preview_Tooltip,
-        _ => throw new ArgumentOutOfRangeException(nameof(position), position, null),
-    };
+    public static string Name(this PreviewPosition position) =>
+        position switch
+        {
+            PreviewPosition.None => Language.Options_Preview_None,
+            PreviewPosition.Inside => Language.Options_Preview_Inside,
+            PreviewPosition.Top => Language.Options_Preview_Top,
+            PreviewPosition.Bottom => Language.Options_Preview_Bottom,
+            PreviewPosition.Tooltip => Language.Options_Preview_Tooltip,
+            _ => throw new ArgumentOutOfRangeException(nameof(position), position, null),
+        };
 }

 [Serializable]
@@ -761,13 +807,14 @@ public enum CommandHelpSide

 public static class CommandHelpSideExt
 {
-    public static string Name(this CommandHelpSide side) => side switch
-    {
-        CommandHelpSide.None => Language.CommandHelpSide_None,
-        CommandHelpSide.Left => Language.CommandHelpSide_Left,
-        CommandHelpSide.Right => Language.CommandHelpSide_Right,
-        _ => throw new ArgumentOutOfRangeException(nameof(side), side, null),
-    };
+    public static string Name(this CommandHelpSide side) =>
+        side switch
+        {
+            CommandHelpSide.None => Language.CommandHelpSide_None,
+            CommandHelpSide.Left => Language.CommandHelpSide_Left,
+            CommandHelpSide.Right => Language.CommandHelpSide_Right,
+            _ => throw new ArgumentOutOfRangeException(nameof(side), side, null),
+        };
 }

 [Serializable]
@@ -779,19 +826,21 @@ public enum KeybindMode

 public static class KeybindModeExt
 {
-    public static string Name(this KeybindMode mode) => mode switch
-    {
-        KeybindMode.Flexible => Language.KeybindMode_Flexible_Name,
-        KeybindMode.Strict => Language.KeybindMode_Strict_Name,
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    public static string Name(this KeybindMode mode) =>
+        mode switch
+        {
+            KeybindMode.Flexible => Language.KeybindMode_Flexible_Name,
+            KeybindMode.Strict => Language.KeybindMode_Strict_Name,
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };

-    public static string? Tooltip(this KeybindMode mode) => mode switch
-    {
-        KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip,
-        KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip,
-        _ => null,
-    };
+    public static string? Tooltip(this KeybindMode mode) =>
+        mode switch
+        {
+            KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip,
+            KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip,
+            _ => null,
+        };
 }

 [Serializable]
@@ -805,64 +854,115 @@ public enum LanguageOverride
    French,
    German,
    Greek,
-
-    // Italian,
    Japanese,
-
-    // Korean,
-    // Norwegian,
    PortugueseBrazil,
    Romanian,
    Russian,
    Spanish,
    Swedish,
+
+    // v1.5.3: Crowdin-heritage activated and Forge-maintained additions.
+    // Append-only to preserve serialized integer values of existing user configs.
+    Italian,
+    Korean,
+    Norwegian,
+    Catalan,
+    Czech,
+    Danish,
+    Finnish,
+    Hungarian,
+    Polish,
+    PortuguesePortugal,
+    Turkish,
+    Ukrainian,
 }

 public static class LanguageOverrideExt
 {
-    public static string Name(this LanguageOverride mode) => mode switch
-    {
-        LanguageOverride.None => Language.LanguageOverride_None,
-        LanguageOverride.ChineseSimplified => "简体中文",
-        LanguageOverride.ChineseTraditional => "繁體中文",
-        LanguageOverride.Dutch => "Nederlands",
-        LanguageOverride.English => "English",
-        LanguageOverride.French => "Français",
-        LanguageOverride.German => "Deutsch",
-        LanguageOverride.Greek => "Ελληνικά",
-        // LanguageOverride.Italian => "Italiano",
-        LanguageOverride.Japanese => "日本語",
-        // LanguageOverride.Korean => "한국어 (Korean)",
-        // LanguageOverride.Norwegian => "Norsk",
-        LanguageOverride.PortugueseBrazil => "Português do Brasil",
-        LanguageOverride.Romanian => "Română",
-        LanguageOverride.Russian => "Русский",
-        LanguageOverride.Spanish => "Español",
-        LanguageOverride.Swedish => "Svenska",
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    public static string Name(this LanguageOverride mode) =>
+        mode switch
+        {
+            LanguageOverride.None => Language.LanguageOverride_None,
+            LanguageOverride.ChineseSimplified => "简体中文",
+            LanguageOverride.ChineseTraditional => "繁體中文",
+            LanguageOverride.Dutch => "Nederlands",
+            LanguageOverride.English => "English",
+            LanguageOverride.French => "Français",
+            LanguageOverride.German => "Deutsch",
+            LanguageOverride.Greek => "Ελληνικά",
+            LanguageOverride.Italian => "Italiano",
+            LanguageOverride.Japanese => "日本語",
+            LanguageOverride.Korean => "한국어",
+            LanguageOverride.Norwegian => "Norsk bokmål",
+            LanguageOverride.PortugueseBrazil => "Português do Brasil",
+            LanguageOverride.Romanian => "Română",
+            LanguageOverride.Russian => "Русский",
+            LanguageOverride.Spanish => "Español",
+            LanguageOverride.Swedish => "Svenska",
+            LanguageOverride.Catalan => "Català",
+            LanguageOverride.Czech => "Čeština",
+            LanguageOverride.Danish => "Dansk",
+            LanguageOverride.Finnish => "Suomi",
+            LanguageOverride.Hungarian => "Magyar",
+            LanguageOverride.Polish => "Polski",
+            LanguageOverride.PortuguesePortugal => "Português (Portugal)",
+            LanguageOverride.Turkish => "Türkçe",
+            LanguageOverride.Ukrainian => "Українська",
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };

-    public static string Code(this LanguageOverride mode) => mode switch
-    {
-        LanguageOverride.None => "",
-        LanguageOverride.ChineseSimplified => "zh-hans",
-        LanguageOverride.ChineseTraditional => "zh-hant",
-        LanguageOverride.Dutch => "nl",
-        LanguageOverride.English => "en",
-        LanguageOverride.French => "fr",
-        LanguageOverride.German => "de",
-        LanguageOverride.Greek => "el",
-        // LanguageOverride.Italian => "it",
-        LanguageOverride.Japanese => "ja",
-        // LanguageOverride.Korean => "ko",
-        // LanguageOverride.Norwegian => "no",
-        LanguageOverride.PortugueseBrazil => "pt-br",
-        LanguageOverride.Romanian => "ro",
-        LanguageOverride.Russian => "ru",
-        LanguageOverride.Spanish => "es",
-        LanguageOverride.Swedish => "sv",
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    public static string Code(this LanguageOverride mode) =>
+        mode switch
+        {
+            LanguageOverride.None => "",
+            LanguageOverride.ChineseSimplified => "zh-hans",
+            LanguageOverride.ChineseTraditional => "zh-hant",
+            LanguageOverride.Dutch => "nl",
+            LanguageOverride.English => "en",
+            LanguageOverride.French => "fr",
+            LanguageOverride.German => "de",
+            LanguageOverride.Greek => "el",
+            LanguageOverride.Italian => "it",
+            LanguageOverride.Japanese => "ja",
+            LanguageOverride.Korean => "ko",
+            LanguageOverride.Norwegian => "nb",
+            LanguageOverride.PortugueseBrazil => "pt-br",
+            LanguageOverride.Romanian => "ro",
+            LanguageOverride.Russian => "ru",
+            LanguageOverride.Spanish => "es",
+            LanguageOverride.Swedish => "sv",
+            LanguageOverride.Catalan => "ca",
+            LanguageOverride.Czech => "cs",
+            LanguageOverride.Danish => "da",
+            LanguageOverride.Finnish => "fi",
+            LanguageOverride.Hungarian => "hu",
+            LanguageOverride.Polish => "pl",
+            LanguageOverride.PortuguesePortugal => "pt-pt",
+            LanguageOverride.Turkish => "tr",
+            LanguageOverride.Ukrainian => "uk",
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };
+
+    // Maps a language to the ExtraGlyphRanges flag required for full UI
+    // rendering in that locale. The settings save path ORs this into
+    // Mutable.ExtraGlyphRanges so users do not need to know which range
+    // to tick manually. Returns 0 for locales fully covered by the default
+    // ImGui glyph range (Latin-1) or by the separate Japanese font handle.
+    public static ExtraGlyphRanges RequiredGlyphRanges(this LanguageOverride mode) =>
+        mode switch
+        {
+            LanguageOverride.Korean => ExtraGlyphRanges.Korean,
+            LanguageOverride.ChineseSimplified => ExtraGlyphRanges.ChineseSimplifiedCommon,
+            LanguageOverride.ChineseTraditional => ExtraGlyphRanges.ChineseFull,
+            LanguageOverride.Ukrainian => ExtraGlyphRanges.Cyrillic,
+            LanguageOverride.Greek => ExtraGlyphRanges.Greek,
+            LanguageOverride.Czech
+            or LanguageOverride.Polish
+            or LanguageOverride.Romanian
+            or LanguageOverride.Hungarian
+            or LanguageOverride.Turkish => ExtraGlyphRanges.LatinExtended,
+            _ => 0,
+        };
 }

 [Serializable]
@@ -876,31 +976,54 @@ public enum ExtraGlyphRanges
    Korean = 1 << 4,
    Thai = 1 << 5,
    Vietnamese = 1 << 6,
+
+    // v1.5.3: Custom ranges for languages with Latin Extended-A glyphs (Czech,
+    // Polish, Romanian, Turkish, Hungarian) and Greek polytonic accents.
+    LatinExtended = 1 << 7,
+    Greek = 1 << 8,
 }

 public static class ExtraGlyphRangesExt
 {
-    public static string Name(this ExtraGlyphRanges ranges) => ranges switch
-    {
-        ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name,
-        ExtraGlyphRanges.ChineseSimplifiedCommon => Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name,
-        ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name,
-        ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name,
-        ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
-        ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name,
-        ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name,
-        _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
-    };
+    // Custom (start, end) inclusive pair lists for ranges that ImGui does
+    // not ship a built-in helper for. SetUpRanges() feeds these into
+    // ImFontGlyphRangesBuilder.AddChar via the `chars` parameter of
+    // BuildRange so we avoid the lifetime/pinning question that the native
+    // GetGlyphRanges*-pointer pathway papers over.
+    internal static readonly ushort[] LatinExtendedPairs = { 0x0100, 0x024F };
+    internal static readonly ushort[] GreekPairs = { 0x0370, 0x03FF, 0x1F00, 0x1FFF };

-    public static unsafe nint Range(this ExtraGlyphRanges ranges) => ranges switch
-    {
-        ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(),
-        ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(),
-        ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(),
-        ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(),
-        ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
-        ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(),
-        ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(),
-        _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
-    };
+    public static string Name(this ExtraGlyphRanges ranges) =>
+        ranges switch
+        {
+            ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name,
+            ExtraGlyphRanges.ChineseSimplifiedCommon =>
+                Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name,
+            ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name,
+            ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name,
+            ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
+            ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name,
+            ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name,
+            ExtraGlyphRanges.LatinExtended => Language.ExtraGlyphRanges_LatinExtended_Name,
+            ExtraGlyphRanges.Greek => Language.ExtraGlyphRanges_Greek_Name,
+            _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
+        };
+
+    public static unsafe nint Range(this ExtraGlyphRanges ranges) =>
+        ranges switch
+        {
+            ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(),
+            ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)
+                ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(),
+            ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(),
+            ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(),
+            ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
+            ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(),
+            ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(),
+            // LatinExtended and Greek are applied via builder.AddChar in
+            // FontManager.SetUpRanges, not through a native pointer range.
+            ExtraGlyphRanges.LatinExtended => 0,
+            ExtraGlyphRanges.Greek => 0,
+            _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
+        };
 }
@@ -1,10 +1,11 @@
-using System.Numerics;
+using System.Collections.Concurrent;
+using System.Numerics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Textures;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Utility;
-using Dalamud.Bindings.ImGui;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;

@@ -14,11 +15,31 @@ public static class EmoteCache
 {
    private static readonly string[] NotWorking =
    [
-        ":tf:", "(ditto)", "c!", "h!", "l!", "M&Mjc", "LUL3D", "p!",
-        "POLICE2", "r!", "Pussy", "s!", "v!", "w!", "x0r6ztGiggle",
-        "z!", "xar2EDM", "iron95Pls", "Clap2", "AlienPls3", "Life",
-        "peepoPogClimbingTreeHard4House", "monkaGIGAftRobertDowneyJr",
-        "DogLookingSussyAndCold", "DICKS"
+        ":tf:",
+        "(ditto)",
+        "c!",
+        "h!",
+        "l!",
+        "M&Mjc",
+        "LUL3D",
+        "p!",
+        "POLICE2",
+        "r!",
+        "Pussy",
+        "s!",
+        "v!",
+        "w!",
+        "x0r6ztGiggle",
+        "z!",
+        "xar2EDM",
+        "iron95Pls",
+        "Clap2",
+        "AlienPls3",
+        "Life",
+        "peepoPogClimbingTreeHard4House",
+        "monkaGIGAftRobertDowneyJr",
+        "DogLookingSussyAndCold",
+        "DICKS",
    ];

    private static readonly HttpClient Client = new();
@@ -55,10 +76,10 @@ public static class EmoteCache
    {
        Unloaded,
        Loading,
-        Done
+        Done,
    }

-    // All of this data is uninitalized while State is not `LoadingState.Done`
+    // All fields below are uninitialised while State != Done.
    public static LoadingState State = LoadingState.Unloaded;

    private static readonly Dictionary<string, Emote> Cache = new();
@@ -66,20 +87,36 @@ public static class EmoteCache

    public static string[] SortedCodeArray = [];

-    // Plugin-scoped cancellation source for in-flight emote loads. Dispose
-    // cancels every running download/texture-create so the workers don't
-    // touch a torn-down TextureProvider on plugin reload. Replaced with a
-    // fresh source on the next LoadData() call so a re-enable still works.
+    // Cancelled on Dispose to stop in-flight downloads; replaced on re-enable.
    private static CancellationTokenSource Cts = new();
    internal static CancellationToken Token => Cts.Token;

+    // Tracks in-flight loads so Dispose can drain them before teardown.
+    private static readonly ConcurrentBag<Task> PendingLoads = new();
+
+    internal static void TrackLoad(Task loadTask, string emoteCode)
+    {
+        PendingLoads.Add(
+            loadTask.ContinueWith(
+                t =>
+                {
+                    if (t.IsFaulted)
+                        Plugin.LogProxy.Error(
+                            t.Exception!,
+                            $"EmoteCache load failed for {emoteCode}"
+                        );
+                },
+                TaskScheduler.Default
+            )
+        );
+    }
+
    public static async Task LoadData()
    {
        if (State is not LoadingState.Unloaded)
            return;

-        // Refresh the CTS in case Dispose was called and we're being re-enabled
-        // in the same process (Dalamud /xlplugins toggle).
+        // Reset CTS if Dispose was called and the plugin is being re-enabled.
        if (Cts.IsCancellationRequested)
            Cts = new CancellationTokenSource();

@@ -101,13 +138,13 @@ public static class EmoteCache
                var topList = await top.Content.ReadAsStringAsync(ct);

                var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!;
-                // BetterTTV occasionally returns entries with a null Code; the
-                // upstream code passed those straight into Dictionary.TryAdd
-                // and tripped ArgumentNullException, killing the whole emote
-                // load. Skip them defensively so a single bad row no longer
-                // breaks the cache for everyone else.
+                // BetterTTV occasionally returns entries with a null Code;
+                // skip them so a single bad row doesn't break the whole cache.
                foreach (var emote in jsonList)
-                    if (!string.IsNullOrEmpty(emote.Emote.Code) && !NotWorking.Contains(emote.Emote.Code))
+                    if (
+                        !string.IsNullOrEmpty(emote.Emote.Code)
+                        && !NotWorking.Contains(emote.Emote.Code)
+                    )
                        Cache.TryAdd(emote.Emote.Code, emote.Emote);

                lastId = jsonList.Last().Id;
@@ -118,27 +155,32 @@ public static class EmoteCache
        }
        catch (OperationCanceledException)
        {
-            // Plugin disposed while the cache was loading; leave State on
-            // Loading so a subsequent re-enable can re-issue LoadData with
-            // a fresh CTS (handled above).
+            // Plugin disposed mid-load; State stays on Loading so re-enable can retry.
        }
        catch (Exception ex)
        {
-            // Reset to Unloaded so a later trigger (e.g. the user reopening
-            // the Emotes tab after the network recovers) can retry. Without
-            // this the State stays on Loading and the early-out at the top
-            // of LoadData blocks every further attempt until plugin reload.
+            // Reset to Unloaded so a later trigger can retry without a plugin reload.
            State = LoadingState.Unloaded;
-            Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
+            Plugin.LogProxy.Error(ex, "BetterTTV cache wasn't initialized");
        }
    }

    public static void Dispose()
    {
-        // Cancel in-flight downloads / texture creates so the async-void
-        // Load methods bail out before they touch a disposed TextureProvider.
        Cts.Cancel();

+        // 5s upper bound; anything still running gets abandoned.
+        try
+        {
+            Task.WaitAll(PendingLoads.ToArray(), TimeSpan.FromSeconds(5));
+        }
+        catch (AggregateException)
+        {
+            // Faults already logged in TrackLoad.
+        }
+
+        while (PendingLoads.TryTake(out _)) { }
+
        foreach (var emote in EmoteImages.Values)
            emote.InnerDispose();
    }
@@ -175,7 +217,7 @@ public static class EmoteCache
        }
        catch
        {
-            Plugin.Log.Error("Failed to convert");
+            Plugin.LogProxy.Error("Failed to convert");
            return null;
        }
    }
@@ -196,18 +238,21 @@ public static class EmoteCache

        internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct)
        {
-            // BetterTTV-supplied Id and ImageType are interpolated straight
-            // into the filename. HTTPS protects the wire, but a compromised
-            // upstream could still hand us "../foo" and write into the
-            // pluginConfigs root (or worse). Resolve the candidate path and
-            // refuse anything that escapes the cache directory.
-            var dir = Path.GetFullPath(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1"));
+            // Path-traversal guard: resolve and verify the candidate path stays
+            // inside the cache directory before reading or writing.
+            var dir = Path.GetFullPath(
+                Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")
+            );
            Directory.CreateDirectory(dir);

-            var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar) ? dir : dir + Path.DirectorySeparatorChar;
+            var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar)
+                ? dir
+                : dir + Path.DirectorySeparatorChar;
            var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}"));
            if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal))
-                throw new InvalidOperationException($"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}");
+                throw new InvalidOperationException(
+                    $"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}"
+                );

            if (File.Exists(filePath))
            {
@@ -218,7 +263,12 @@ public static class EmoteCache
                var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
                RawData = await content.Content.ReadAsByteArrayAsync(ct);

-                await using var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read);
+                await using var stream = new FileStream(
+                    filePath,
+                    FileMode.Create,
+                    FileAccess.Write,
+                    FileShare.Read
+                );
                await stream.WriteAsync(RawData, ct);
            }

@@ -233,11 +283,12 @@ public static class EmoteCache
        public ImGuiEmote Prepare(Emote emote)
        {
            var ct = EmoteCache.Token;
-            Task.Run(() => Load(emote, ct), ct);
+            // Task.Run keeps the sync prefix off the ImGui render thread.
+            EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
            return this;
        }

-        private async void Load(Emote emote, CancellationToken ct)
+        private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
        {
            try
            {
@@ -246,18 +297,17 @@ public static class EmoteCache
                    return;

                ct.ThrowIfCancellationRequested();
-                Texture = await Plugin.TextureProvider.CreateFromImageAsync(image, cancellationToken: ct);
+                Texture = await Plugin.TextureProvider.CreateFromImageAsync(
+                    image,
+                    cancellationToken: ct
+                );
                IsLoaded = true;
            }
-            catch (OperationCanceledException)
-            {
-                // Plugin disposed mid-load; the EmoteImages entry is also
-                // being torn down, no extra cleanup needed.
-            }
+            catch (OperationCanceledException) { }
            catch (Exception ex)
            {
                Failed = true;
-                Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
+                Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
            }
        }

@@ -310,11 +360,11 @@ public static class EmoteCache
        public ImGuiGif Prepare(Emote emote)
        {
            var ct = EmoteCache.Token;
-            Task.Run(() => Load(emote, ct), ct);
+            EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
            return this;
        }

-        private async void Load(Emote emote, CancellationToken ct)
+        private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
        {
            try
            {
@@ -334,13 +384,17 @@ public static class EmoteCache

                    var delay = frame.Metadata.GetGifMetadata().FrameDelay / 100f;

-                    // Follows the same pattern as browsers, anything under 0.02s delay will be rounded up to 0.1s
+                    // Match browser behaviour: anything under 20ms rounds up to 100ms.
                    if (delay < 0.02f)
                        delay = 0.1f;

                    var buffer = new byte[4 * frame.Width * frame.Height];
                    frame.CopyPixelDataTo(buffer);
-                    var tex = await Plugin.TextureProvider.CreateFromRawAsync(RawImageSpecification.Rgba32(frame.Width, frame.Height), buffer, cancellationToken: ct);
+                    var tex = await Plugin.TextureProvider.CreateFromRawAsync(
+                        RawImageSpecification.Rgba32(frame.Width, frame.Height),
+                        buffer,
+                        cancellationToken: ct
+                    );
                    frames.Add((tex, delay));
                }

@@ -349,8 +403,7 @@ public static class EmoteCache
            }
            catch (OperationCanceledException)
            {
-                // Plugin disposed mid-load; partial frames are released by
-                // InnerDispose on the next dispose pass.
+                // Plugin disposed mid-load; release any partial frames.
                foreach (var f in Frames)
                    f.Texture.Dispose();
                Frames = [];
@@ -358,8 +411,8 @@ public static class EmoteCache
            catch (Exception ex)
            {
                Failed = true;
-                Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
+                Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
            }
        }
    }
-}
+}
@@ -13,42 +13,42 @@ internal enum ExportFormat

 internal static class ExportFormatExt
 {
-    internal static string Extension(this ExportFormat fmt) => fmt switch
-    {
-        ExportFormat.Markdown => "md",
-        ExportFormat.Json => "json",
-        ExportFormat.Csv => "csv",
-        _ => "txt",
-    };
+    internal static string Extension(this ExportFormat fmt) =>
+        fmt switch
+        {
+            ExportFormat.Markdown => "md",
+            ExportFormat.Json => "json",
+            ExportFormat.Csv => "csv",
+            _ => "txt",
+        };

-    internal static string Filter(this ExportFormat fmt) => fmt switch
-    {
-        ExportFormat.Markdown => ".md",
-        ExportFormat.Json => ".json",
-        ExportFormat.Csv => ".csv",
-        _ => ".txt",
-    };
+    internal static string Filter(this ExportFormat fmt) =>
+        fmt switch
+        {
+            ExportFormat.Markdown => ".md",
+            ExportFormat.Json => ".json",
+            ExportFormat.Csv => ".csv",
+            _ => ".txt",
+        };
 }

-/// <summary>
-/// Serializes message snapshots into Markdown, JSON, or CSV. The caller is
-/// expected to filter the input enumerable; this class only handles
-/// formatting and writes to the supplied path. Sender substring filtering
-/// happens here because it requires deserialized SeString.TextValue.
-/// </summary>
+// Serializes message snapshots to Markdown, JSON, or CSV.
+// Caller handles pre-filtering except sender substring, which requires deserialized SeString.TextValue.
 internal static class MessageExporter
 {
    internal record FilterDescription(
        IReadOnlyCollection<int>? ChatTypes,
        DateTimeOffset? From,
        DateTimeOffset? To,
-        string? SenderSubstring);
+        string? SenderSubstring
+    );

    internal static int ExportToFile(
        string path,
        ExportFormat format,
        IEnumerable<Message> messages,
-        FilterDescription filter)
+        FilterDescription filter
+    )
    {
        var matching = filter.SenderSubstring is { Length: > 0 } needle
            ? messages.Where(m => MatchesSender(m, needle))
@@ -64,10 +64,14 @@ internal static class MessageExporter
        };
    }

-    private static bool MatchesSender(Message m, string needle)
-        => m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);
+    private static bool MatchesSender(Message m, string needle) =>
+        m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);

-    private static int WriteMarkdown(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter)
+    private static int WriteMarkdown(
+        StreamWriter w,
+        IEnumerable<Message> messages,
+        FilterDescription filter
+    )
    {
        w.WriteLine("# Hellion Chat Export");
        w.WriteLine();
@@ -92,6 +96,7 @@ internal static class MessageExporter
            var chatType = (ChatType)(ushort)m.Code.Type;
            var sender = m.SenderSource.TextValue.Trim().Trim('<', '>', '[', ']', ':').Trim();
            var content = m.ContentSource.TextValue;
+
            if (string.IsNullOrEmpty(sender))
                w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
            else
@@ -107,7 +112,9 @@ internal static class MessageExporter
    private static void WriteFilterSummaryMarkdown(StreamWriter w, FilterDescription filter)
    {
        if (filter.ChatTypes is { Count: > 0 })
-            w.WriteLine($"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}");
+            w.WriteLine(
+                $"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}"
+            );
        if (filter.From is not null)
            w.WriteLine($"From: {filter.From.Value.ToLocalTime():yyyy-MM-dd HH:mm}");
        if (filter.To is not null)
@@ -116,10 +123,13 @@ internal static class MessageExporter
            w.WriteLine($"Sender contains: \"{filter.SenderSubstring}\"");
    }

-    private static int WriteJson(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter)
+    private static int WriteJson(
+        StreamWriter w,
+        IEnumerable<Message> messages,
+        FilterDescription filter
+    )
    {
-        // Manual JSON to avoid pulling in System.Text.Json policy choices.
-        // Output is a single object with metadata and an array of messages.
+        // Manual JSON to avoid System.Text.Json policy coupling.
        w.Write("{\n  \"exported_at\": \"");
        w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture));
        w.Write("\",\n  \"plugin\": \"Hellion Chat\",\n");
@@ -130,9 +140,17 @@ internal static class MessageExporter
        else
            w.Write("null");
        w.Write(",\n    \"from\": ");
-        w.Write(filter.From is null ? "null" : "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\"");
+        w.Write(
+            filter.From is null
+                ? "null"
+                : "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
+        );
        w.Write(",\n    \"to\": ");
-        w.Write(filter.To is null ? "null" : "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\"");
+        w.Write(
+            filter.To is null
+                ? "null"
+                : "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
+        );
        w.Write(",\n    \"sender_substring\": ");
        w.Write(filter.SenderSubstring is null ? "null" : JsonString(filter.SenderSubstring));
        w.Write("\n  },\n  \"messages\": [\n");
@@ -166,9 +184,13 @@ internal static class MessageExporter
        return count;
    }

-    private static int WriteCsv(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter)
+    private static int WriteCsv(
+        StreamWriter w,
+        IEnumerable<Message> messages,
+        FilterDescription filter
+    )
    {
-        // Header line always written so empty exports are still importable.
+        // Header always written so empty exports remain importable.
        w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
        var count = 0;
        foreach (var m in messages)
@@ -201,13 +223,27 @@ internal static class MessageExporter
        {
            switch (c)
            {
-                case '"': sb.Append("\\\""); break;
-                case '\\': sb.Append("\\\\"); break;
-                case '\b': sb.Append("\\b"); break;
-                case '\f': sb.Append("\\f"); break;
-                case '\n': sb.Append("\\n"); break;
-                case '\r': sb.Append("\\r"); break;
-                case '\t': sb.Append("\\t"); break;
+                case '"':
+                    sb.Append("\\\"");
+                    break;
+                case '\\':
+                    sb.Append("\\\\");
+                    break;
+                case '\b':
+                    sb.Append("\\b");
+                    break;
+                case '\f':
+                    sb.Append("\\f");
+                    break;
+                case '\n':
+                    sb.Append("\\n");
+                    break;
+                case '\r':
+                    sb.Append("\\r");
+                    break;
+                case '\t':
+                    sb.Append("\\t");
+                    break;
                default:
                    if (c < 0x20)
                        sb.Append($"\\u{(int)c:x4}");
@@ -1,52 +1,235 @@
-using Dalamud;
+using Dalamud;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.FontIdentifier;
 using Dalamud.Interface.GameFonts;
 using Dalamud.Interface.ManagedFontAtlas;
 using Dalamud.Interface.Utility;
-using Dalamud.Bindings.ImGui;
+using Dalamud.Plugin;

 namespace HellionChat;

-public class FontManager
+// Two LogProxy sites live in static methods (TryGetBundledFontBytes,
+// AddFontWithFallback); a ctor-injected ILogger would not be reachable
+// from those scopes, so the class stays on Plugin.LogProxy.
+//
+// Hybrid handle model: Axis and AxisItalic mirror the game's current
+// font state and are init-only. FontAwesome reuses Dalamud's UiBuilder
+// fixed-width icon handle and is likewise init-only. RegularFont and
+// ItalicFont depend on user-toggleable settings and get replaced live
+// via RebuildDelegateFonts when those settings change; they stay as
+// mutable nullable fields.
+//
+// The four atlas-owned handles register inside a single
+// SuppressAutoRebuild block so the font atlas only rebuilds once for the
+// whole plugin start instead of once per handle. FontAwesome lives
+// outside that accounting because the UiBuilder already owns it.
+public sealed class FontManager : IDisposable
 {
-    internal IFontHandle Axis = null!;
-    internal IFontHandle AxisItalic = null!;
+    private readonly IDalamudPluginInterface _pluginInterface;

-    internal IFontHandle RegularFont = null!;
+    internal IFontHandle Axis { get; init; }
+    internal IFontHandle AxisItalic { get; init; }
+    internal IFontHandle FontAwesome { get; init; }
+
+    // Mutable because the live font settings replace these via
+    // RebuildDelegateFonts. Reference replacement is atomic for reference
+    // types, so push sites that read the field once per frame see at most
+    // one stale handle.
+    internal IFontHandle? RegularFont;
    internal IFontHandle? ItalicFont;

-    internal IFontHandle FontAwesome = null!;
-
    private ushort[] Ranges = [];
    private ushort[] JpRange = [];

    public static readonly HashSet<float> AxisFontSizeList =
    [
-        9.6f, 10f, 12f, 14f, 16f,
-        18f, 18.4f, 20f, 23f, 34f,
-        36f, 40f, 45f, 46f, 68f, 90f,
+        9.6f,
+        10f,
+        12f,
+        14f,
+        16f,
+        18f,
+        18.4f,
+        20f,
+        23f,
+        34f,
+        36f,
+        40f,
+        45f,
+        46f,
+        68f,
+        90f,
    ];

-    /// <summary>
-    /// Backing bytes for the bundled Hellion font (Exo 2, OFL-1.1). Lazily
-    /// extracted from the assembly's manifest resources on first use; the
-    /// load happens inside the font atlas build callback so we keep the
-    /// allocation off the plugin constructor's hot path.
-    /// </summary>
-    private static byte[]? HellionFontBytes;
+    // Bundled UI font bytes (Inter Light, OFL-1.1); lazily loaded from manifest resources
+    private static byte[]? BundledFontBytes;

-    private static byte[] GetHellionFontBytes()
+    public FontManager(IDalamudPluginInterface pluginInterface)
    {
-        if (HellionFontBytes is not null)
-            return HellionFontBytes;
+        _pluginInterface = pluginInterface;
+        SetUpRanges();
+
+        var atlas = _pluginInterface.UiBuilder.FontAtlas;
+
+        using (atlas.SuppressAutoRebuild())
+        {
+            Axis = atlas.NewGameFontHandle(
+                new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
+            );
+
+            AxisItalic = atlas.NewGameFontHandle(
+                new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
+                {
+                    SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6,
+                }
+            );
+
+            FontAwesome = _pluginInterface.UiBuilder.IconFontFixedWidthHandle;
+
+            RegularFont = BuildRegularFontHandle(atlas);
+
+            if (Plugin.Config.ItalicEnabled)
+                ItalicFont = BuildItalicFontHandle(atlas);
+        }
+    }
+
+    // Called from the settings save path when one of the font-related
+    // settings changed. Game fonts and FontAwesome stay untouched because
+    // none of those settings affect them.
+    //
+    // Thread model: the settings save path runs on the ImGui draw thread,
+    // same as every push site. The rebuild finishes synchronously before
+    // the next push reads the field in the same frame, so there is no
+    // cross-thread race on the handle reference.
+    public void RebuildDelegateFonts()
+    {
+        SetUpRanges();
+
+        var atlas = _pluginInterface.UiBuilder.FontAtlas;
+
+        RegularFont?.Dispose();
+        RegularFont = BuildRegularFontHandle(atlas);
+
+        ItalicFont?.Dispose();
+        ItalicFont = Plugin.Config.ItalicEnabled ? BuildItalicFontHandle(atlas) : null;
+    }
+
+    // Instance method so Ranges / JpRange are reachable without parameter
+    // plumbing; PascalCase field names follow the existing class style.
+    private IFontHandle BuildRegularFontHandle(IFontAtlas atlas) =>
+        atlas.NewDelegateFontHandle(e =>
+            e.OnPreBuild(tk =>
+            {
+                // UseHellionFont swaps the source font but keeps the size
+                // selector tied to FontSizeV2 (the bundled font ships as
+                // a single weight).
+                var basePt = Plugin.Config.UseHellionFont
+                    ? Plugin.Config.FontSizeV2
+                    : Plugin.Config.GlobalFontV2.SizePt;
+                var config = new SafeFontConfig { SizePt = basePt, GlyphRanges = Ranges };
+                // Missing embedded resource falls back to the configured
+                // system font instead of taking the whole UiBuilder down.
+                var bundledBytes = Plugin.Config.UseHellionFont ? TryGetBundledFontBytes() : null;
+                config.MergeFont = bundledBytes is not null
+                    ? tk.AddFontFromMemory(bundledBytes, config, "Inter-Light")
+                    : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
+
+                config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
+                config.GlyphRanges = JpRange;
+                AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
+
+                // v1.5.3: NotoSansCjk fallback covers Hangul, Simplified-Chinese
+                // -specific Han (e.g. 简) and other CJK glyphs that the primary
+                // (Inter Light / global font) and the FFXIV Japanese font do not
+                // ship. Merged last so earlier fonts win for shared codepoints.
+                config.SizePt = basePt;
+                config.GlyphRanges = Ranges;
+                AddFontWithFallback(
+                    tk,
+                    new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular),
+                    config,
+                    "noto-cjk-fallback"
+                );
+
+                config.SizePt = Plugin.Config.SymbolsFontSizeV2;
+                tk.AddGameSymbol(config);
+
+                tk.Font = config.MergeFont;
+            })
+        );
+
+    private IFontHandle BuildItalicFontHandle(IFontAtlas atlas) =>
+        atlas.NewDelegateFontHandle(e =>
+            e.OnPreBuild(tk =>
+            {
+                var config = new SafeFontConfig
+                {
+                    SizePt = Plugin.Config.ItalicFontV2.SizePt,
+                    GlyphRanges = Ranges,
+                };
+                config.MergeFont = AddFontWithFallback(
+                    tk,
+                    Plugin.Config.ItalicFontV2.FontId,
+                    config,
+                    "italic"
+                );
+
+                config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
+                config.GlyphRanges = JpRange;
+                AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
+
+                // v1.5.3: NotoSansCjk fallback (see BuildRegularFontHandle).
+                config.SizePt = Plugin.Config.ItalicFontV2.SizePt;
+                config.GlyphRanges = Ranges;
+                AddFontWithFallback(
+                    tk,
+                    new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular),
+                    config,
+                    "noto-cjk-fallback"
+                );
+
+                config.SizePt = Plugin.Config.SymbolsFontSizeV2;
+                tk.AddGameSymbol(config);
+
+                tk.Font = config.MergeFont;
+            })
+        );
+
+    public void Dispose()
+    {
+        Axis.Dispose();
+        AxisItalic.Dispose();
+        // FontAwesome is shared with the UiBuilder; the host owns its
+        // lifetime, so the plugin must not dispose it.
+        RegularFont?.Dispose();
+        ItalicFont?.Dispose();
+    }
+
+    // Returns null when the embedded font resource is missing. Should not
+    // happen on a signed release build, but a broken csproj or hand-rolled
+    // dev build can land here. Caller falls back to the system font path
+    // so the plugin still loads instead of crashing the whole UiBuilder.
+    private static byte[]? TryGetBundledFontBytes()
+    {
+        if (BundledFontBytes is not null)
+            return BundledFontBytes;
+
+        using var stream = typeof(FontManager).Assembly.GetManifestResourceStream(
+            "Inter-Light.ttf"
+        );
+        if (stream is null)
+        {
+            Plugin.LogProxy.Warning(
+                "Bundled Inter Light font resource missing, falling back to system default font."
+            );
+            return null;
+        }

-        using var stream = typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
-            ?? throw new FileNotFoundException("Hellion font resource not embedded in the assembly");
        using var ms = new MemoryStream();
        stream.CopyTo(ms);
-        HellionFontBytes = ms.ToArray();
-        return HellionFontBytes;
+        BundledFontBytes = ms.ToArray();
+        return BundledFontBytes;
    }

    private unsafe void SetUpRanges()
@@ -54,11 +237,9 @@ public class FontManager
        ushort[] BuildRange(IReadOnlyList<ushort>? chars, params nint[] ranges)
        {
            var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder());
-            // text
            foreach (var range in ranges)
                builder.AddRanges((ushort*)range);

-            // chars
            if (chars != null)
            {
                for (var i = 0; i < chars.Count; i += 2)
@@ -66,8 +247,8 @@ public class FontManager
                    if (chars[i] == 0)
                        break;

-                    for (var j = (uint) chars[i]; j <= chars[i + 1]; j++)
-                        builder.AddChar((ushort) j);
+                    for (var j = (uint)chars[i]; j <= chars[i + 1]; j++)
+                        builder.AddChar((ushort)j);
                }
            }

@@ -76,123 +257,101 @@ public class FontManager
            foreach (var c in reader.Glyphs)
                builder.AddChar(c.Char);

-            // various symbols
            // French
            // Romanian
-            // builder.AddText("←→↑↓《》■※☀★★☆♥♡ヅツッシ☀☁☂℃℉°♀♂♠♣♦♣♧®©™€$£♯♭♪✓√◎◆◇♦■□〇●△▽▼▲‹›≤≥<«“”─＼～");
            builder.AddText("Œœ");
            builder.AddText("ĂăÂâÎîȘșȚț");

+            // v1.5.3: language-dropdown endonyms. The dropdown renders
+            // with the currently active font range; without these glyphs
+            // a user on an English UI cannot read non-Latin language names
+            // before switching. Auto-activation in Settings.Apply then
+            // pulls in the full ExtraGlyphRange for the chosen locale.
+            builder.AddText(
+                "Català Čeština Dansk Deutsch Ελληνικά English Español Suomi"
+                    + " Français Magyar Italiano 日本語 한국어 Norsk bokmål Nederlands"
+                    + " Polski Português Brasil (Portugal) Română Русский Svenska"
+                    + " Türkçe Українська 简体中文 繁體中文"
+            );
+
            // "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460
            for (var i = 0x2460; i <= 0x24B5; i++)
-                builder.AddChar((char) i);
+                builder.AddChar((char)i);

            builder.AddChar('⓪');
            return builder.BuildRangesToArray();
        }

        var ranges = new List<nint> { (nint)ImGui.GetIO().Fonts.GetGlyphRangesDefault() };
+        var customChars = new List<ushort>();
        foreach (var extraRange in Enum.GetValues<ExtraGlyphRanges>())
-            if (Plugin.Config.ExtraGlyphRanges.HasFlag(extraRange))
-                ranges.Add(extraRange.Range());
+        {
+            if (!Plugin.Config.ExtraGlyphRanges.HasFlag(extraRange))
+                continue;

-        Ranges = BuildRange(null, ranges.ToArray());
+            // LatinExtended and Greek use AddChar pairs because they have no
+            // built-in ImGui range helper; everything else points to a native
+            // ImGui glyph-range table.
+            switch (extraRange)
+            {
+                case ExtraGlyphRanges.LatinExtended:
+                    customChars.AddRange(ExtraGlyphRangesExt.LatinExtendedPairs);
+                    break;
+                case ExtraGlyphRanges.Greek:
+                    customChars.AddRange(ExtraGlyphRangesExt.GreekPairs);
+                    break;
+                default:
+                    var ptr = extraRange.Range();
+                    if (ptr != 0)
+                        ranges.Add(ptr);
+                    break;
+            }
+        }
+
+        Ranges = BuildRange(customChars.Count > 0 ? customChars : null, ranges.ToArray());
        JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
    }

-    public void BuildFonts()
-    {
-        SetUpRanges();
-
-        Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2)));
-        AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
-        {
-            SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6
-        });
-
-        FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
-        {
-            e.OnPreBuild(tk => tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() }));
-            e.OnPostBuild(tk => tk.FitRatio(tk.Font));
-        });
-
-        RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(
-            e => e.OnPreBuild(
-                tk =>
-                {
-                    // v1.2.0 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font)
-                    // wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet.
-                    // Der Bestand-Pfad nutzt weiter GlobalFontV2.SizePt aus dem
-                    // Custom-Font-Stack. Ohne diese Verzweigung war FontSizeV2 bei
-                    // UseHellionFont=true wirkungslos, was 4K-User mit größerer
-                    // Skalierung blockierte (Settings → Erscheinungsbild → Schriftarten).
-                    var basePt = Plugin.Config.UseHellionFont
-                        ? Plugin.Config.FontSizeV2
-                        : Plugin.Config.GlobalFontV2.SizePt;
-                    var config = new SafeFontConfig {SizePt = basePt, GlyphRanges = Ranges};
-                    config.MergeFont = Plugin.Config.UseHellionFont
-                        ? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2")
-                        : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
-
-                    config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
-                    config.GlyphRanges = JpRange;
-                    AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
-
-                    config.SizePt = Plugin.Config.SymbolsFontSizeV2;
-                    tk.AddGameSymbol(config);
-
-                    tk.Font = config.MergeFont;
-                }
-            ));
-
-        if (Plugin.Config.ItalicEnabled)
-        {
-            ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(
-                e => e.OnPreBuild(
-                    tk =>
-                    {
-                        var config = new SafeFontConfig {SizePt = Plugin.Config.ItalicFontV2.SizePt, GlyphRanges = Ranges};
-                        config.MergeFont = AddFontWithFallback(tk, Plugin.Config.ItalicFontV2.FontId, config, "italic");
-
-                        config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
-                        config.GlyphRanges = JpRange;
-                        AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
-
-                        config.SizePt = Plugin.Config.SymbolsFontSizeV2;
-                        tk.AddGameSymbol(config);
-
-                        tk.Font = config.MergeFont;
-                    }
-                ));
-        }
-        else
-        {
-            ItalicFont = null;
-        }
-    }
-
-    /// <summary>
-    /// Try to add a user-configured font to the build toolkit, falling back to
-    /// the bundled NotoSansCjkRegular asset if the configured font isn't
-    /// available on the system. Without this guard a stale SystemFontId
-    /// pointing at a font the user uninstalled or that never existed on
-    /// Linux (e.g. "Crimson Text") tears down the entire font atlas build.
-    /// </summary>
-    private static ImFontPtr AddFontWithFallback(IFontAtlasBuildToolkitPreBuild tk, IFontId fontId, SafeFontConfig config, string slot)
+    // Add font with fallback to NotoSansCjkRegular if unavailable
+    private static ImFontPtr AddFontWithFallback(
+        IFontAtlasBuildToolkitPreBuild tk,
+        IFontId fontId,
+        SafeFontConfig config,
+        string slot
+    )
    {
        try
        {
            return fontId.AddToBuildToolkit(tk, config);
        }
-        catch (Exception e) when (e is FileNotFoundException or DirectoryNotFoundException or IOException)
+        catch (Exception e)
+            when (e
+                    is FileNotFoundException
+                        or DirectoryNotFoundException
+                        or IOException
+                        or InvalidOperationException
+                        or ArgumentException
+            )
        {
-            Plugin.Log.Warning(e, $"Configured {slot} font unavailable, falling back to NotoSansCjkRegular");
+            // Atlas-toolkit throws span IO and validation failures; routing
+            // the wider set through the fallback keeps a corrupt font config
+            // from taking down the whole atlas build.
+            Plugin.LogProxy.Warning(
+                e,
+                $"Configured {slot} font failed to load ({e.GetType().Name}), "
+                    + "falling back to NotoSansCjkRegular"
+            );
            var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
            return fallback.AddToBuildToolkit(tk, config);
        }
    }

-    public static float SizeInPt(float px) => (float) (px * 3.0 / 4.0);
-    public static float SizeInPx(float pt) => (float) (pt * 4.0 / 3.0);
-    public static float GetFontSize() => Plugin.Config.FontsEnabled ? Plugin.Config.GlobalFontV2.SizePx : SizeInPx(Plugin.Config.FontSizeV2);
+    public static float SizeInPt(float px) => (float)(px * 3.0 / 4.0);
+
+    public static float SizeInPx(float pt) => (float)(pt * 4.0 / 3.0);
+
+    public static float GetFontSize() =>
+        Plugin.Config.FontsEnabled
+            ? Plugin.Config.GlobalFontV2.SizePx
+            : SizeInPx(Plugin.Config.FontSizeV2);
 }
@@ -1,8 +1,4 @@
 using System.Text;
-using HellionChat.Code;
-using HellionChat.GameFunctions.Types;
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud.Game.Config;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
@@ -17,9 +13,13 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using FFXIVClientStructs.FFXIV.Client.UI.Shell;
 using FFXIVClientStructs.FFXIV.Component.GUI;
+using HellionChat.Code;
+using HellionChat.GameFunctions.Types;
+using HellionChat.Resources;
+using HellionChat.Util;
 using InteropGenerator.Runtime;
 using Lumina.Text.ReadOnly;
-
+using Microsoft.Extensions.Logging;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;

 namespace HellionChat.GameFunctions;
@@ -28,20 +28,55 @@ internal sealed unsafe class Chat : IDisposable
 {
    // Functions
    [Signature("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8D B9 ?? ?? ?? ?? 33 C0")]
-    private readonly delegate* unmanaged<RaptureLogModule*, ushort, Utf8String*, Utf8String*, ulong, ulong, ushort, byte, int, byte, void> PrintTellNative = null!;
+    private readonly delegate* unmanaged<
+        RaptureLogModule*,
+        ushort,
+        Utf8String*,
+        Utf8String*,
+        ulong,
+        ulong,
+        ushort,
+        byte,
+        int,
+        byte,
+        void> PrintTellNative = null!;

-    [Signature("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24")]
-    private readonly delegate* unmanaged<NetworkModule*, ulong, ushort, Utf8String*, Utf8String*, ushort, ushort, byte> SendTellNative = null!;
+    [Signature(
+        "E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24"
+    )]
+    private readonly delegate* unmanaged<
+        NetworkModule*,
+        ulong,
+        ushort,
+        Utf8String*,
+        Utf8String*,
+        ushort,
+        ushort,
+        byte> SendTellNative = null!;

    // Client::UI::AddonChatLog.OnRefresh
-    [Signature("40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8", DetourName = nameof(ChatLogRefreshDetour))]
+    [Signature(
+        "40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8",
+        DetourName = nameof(ChatLogRefreshDetour)
+    )]
    private Hook<ChatLogRefreshDelegate>? ChatLogRefreshHook = null!;
    private delegate byte ChatLogRefreshDelegate(nint log, ushort eventId, AtkValue* value);

    // Replace with CS version later
-    [Signature("48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9", DetourName = nameof(ContextMenuTellInForayDetour))]
+    [Signature(
+        "48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9",
+        DetourName = nameof(ContextMenuTellInForayDetour)
+    )]
    private Hook<ContextMenuTellInForayDelegate>? ContextMenuTellInForayHook = null!;
-    private delegate void ContextMenuTellInForayDelegate(RaptureShellModule* module, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason);
+    private delegate void ContextMenuTellInForayDelegate(
+        RaptureShellModule* module,
+        Utf8String* playerName,
+        Utf8String* worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong contentId,
+        ushort reason
+    );

    private readonly Hook<AgentChatLog.Delegates.ChangeChannelName>? ChangeChannelNameHook;
    private readonly Hook<RaptureShellModule.Delegates.ReplyInSelectedChatMode>? ReplyInSelectedChatModeHook;
@@ -58,27 +93,42 @@ internal sealed unsafe class Chat : IDisposable
        FullName = 0,
        SurnameAbbreviated = 1,
        ForenameAbbreviated = 2,
-        Initials = 3
+        Initials = 3,
    }

    private long LastPlayerNameDisplayTypeRefresh;
    private PlayerNameDisplayType CurrentPlayerNameDisplayType = PlayerNameDisplayType.FullName;

-    public Chat(Plugin plugin)
+    private readonly ILogger<Chat> _logger;
+
+    public Chat(Plugin plugin, ILogger<Chat> logger)
    {
        Plugin = plugin;
+        _logger = logger;
        Plugin.GameInteropProvider.InitializeFromAttributes(this);

        ChatLogRefreshHook?.Enable();
        ContextMenuTellInForayHook?.Enable();

-        ChangeChannelNameHook = Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(AgentChatLog.MemberFunctionPointers.ChangeChannelName, ChangeChannelNameDetour);
+        ChangeChannelNameHook =
+            Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(
+                AgentChatLog.MemberFunctionPointers.ChangeChannelName,
+                ChangeChannelNameDetour
+            );
        ChangeChannelNameHook.Enable();

-        ReplyInSelectedChatModeHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode, ReplyInSelectedChatModeDetour);
+        ReplyInSelectedChatModeHook =
+            Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(
+                RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode,
+                ReplyInSelectedChatModeDetour
+            );
        ReplyInSelectedChatModeHook.Enable();

-        SetChatLogTellTargetHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(RaptureShellModule.MemberFunctionPointers.SetContextTellTarget, SetContextTellTarget);
+        SetChatLogTellTargetHook =
+            Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(
+                RaptureShellModule.MemberFunctionPointers.SetContextTellTarget,
+                SetContextTellTarget
+            );
        SetChatLogTellTargetHook.Enable();

        Plugin.ClientState.Login += Login;
@@ -108,12 +158,13 @@ internal sealed unsafe class Chat : IDisposable
        return utf == null ? null : utf->ToString();
    }

-    private static int GetRotateIdx(RotateMode mode) => mode switch
-    {
-        RotateMode.Forward => 1,
-        RotateMode.Reverse => -1,
-        _ => 0,
-    };
+    private static int GetRotateIdx(RotateMode mode) =>
+        mode switch
+        {
+            RotateMode.Forward => 1,
+            RotateMode.Reverse => -1,
+            _ => 0,
+        };

    internal static void RotateLinkshellHistory(RotateMode mode)
    {
@@ -127,8 +178,7 @@ internal sealed unsafe class Chat : IDisposable
    internal static void RotateCrossLinkshellHistory(RotateMode mode) =>
        UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode));

-    // This function looks up a channel's user-defined color.
-    // If this function ever returns 0, it returns null instead.
+    // Look up a channel's user-defined color, returns null if 0
    internal uint? GetChannelColor(ChatType type)
    {
        var parent = type.Parent();
@@ -168,13 +218,12 @@ internal sealed unsafe class Chat : IDisposable

        if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
        {
-            // FIXME: this whole system sucks
-            // FIXME v2: I hate everything about this, but it works
+            // Capture the just-typed character input
            Plugin.Framework.RunOnTick(() =>
            {
                string? input = null;

-                var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter+0x4, 2);
+                var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter + 0x4, 2);
                var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray();
                if (chars.Length == 0)
                    return;
@@ -185,11 +234,13 @@ internal sealed unsafe class Chat : IDisposable

                try
                {
-                    Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input, });
+                    Plugin.ChatLogWindow.Activated(
+                        new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input }
+                    );
                }
                catch (Exception ex)
                {
-                    Plugin.Log.Error(ex, "Error in chat Activated event");
+                    _logger.LogError(ex, "Error in chat Activated event");
                }
            });
        }
@@ -197,7 +248,7 @@ internal sealed unsafe class Chat : IDisposable
        string? addIfNotPresent = null;

        var str = value + 2;
-        if (str != null && ((int) str->Type & 0xF) == (int) ValueType.String && str->String.HasValue)
+        if (str != null && ((int)str->Type & 0xF) == (int)ValueType.String && str->String.HasValue)
        {
            var add = str->String.ToString();
            if (add.Length > 0)
@@ -206,23 +257,23 @@ internal sealed unsafe class Chat : IDisposable

        try
        {
-            // We already called this function once, so we skip the duplicated call
-            // Also return the original value here so that vanilla chat receives all information
+            // Prevent duplicate calls
            if (Plugin.ChatLogWindow.TellSpecial)
-            {
-                Plugin.Log.Information("Return early to prevent duplicated call...");
                return ChatLogRefreshHook!.Original(log, eventId, value);
-            }

-            Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { AddIfNotPresent = addIfNotPresent, });
+            Plugin.ChatLogWindow.Activated(
+                new ChatActivatedArgs(new ChannelSwitchInfo(null))
+                {
+                    AddIfNotPresent = addIfNotPresent,
+                }
+            );
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error in chat Activated event");
+            _logger.LogError(ex, "Error in chat Activated event");
        }

-        // prevent the game from focusing the chat log
-        return 1;
+        return 1; // Prevent vanilla chat log from gaining focus
    }

    private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
@@ -231,9 +282,9 @@ internal sealed unsafe class Chat : IDisposable
        if (agent == null)
            return ret;

-        var channel = (uint) RaptureShellModule.Instance()->ChatType;
+        var channel = (uint)RaptureShellModule.Instance()->ChatType;
        if (channel is 17 or 18)
-            channel = (uint) InputChannel.Tell;
+            channel = (uint)InputChannel.Tell;

        var name = SeString.Parse(agent->ChannelLabel);
        if (name.Payloads.Count == 0)
@@ -248,18 +299,18 @@ internal sealed unsafe class Chat : IDisposable

        string? playerName = null;
        ushort worldId = 0;
-        if (channel == (uint) InputChannel.Tell)
+        if (channel == (uint)InputChannel.Tell)
        {
            playerName = SeString.Parse(agent->TellPlayerName).TextValue;
            worldId = agent->TellWorldId;
-            Plugin.Log.Debug($"Detected tell target '[redacted]'@{worldId}");
+            _logger.LogDebug($"Detected tell target '[redacted]'@{worldId}");
        }

        Plugin.CurrentTab.CurrentChannel = new UsedChannel
        {
-            Channel = (InputChannel) channel,
+            Channel = (InputChannel)channel,
            Name = nameChunks,
-            TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null
+            TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null,
        };

        return ret;
@@ -274,33 +325,68 @@ internal sealed unsafe class Chat : IDisposable
            return;
        }

-        SetChannel((InputChannel) replyMode);
+        SetChannel((InputChannel)replyMode);
        ReplyInSelectedChatModeHook!.Original(agent);
    }

-    private bool SetContextTellTarget(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason, bool setChatType)
+    private bool SetContextTellTarget(
+        RaptureShellModule* a1,
+        Utf8String* playerName,
+        Utf8String* worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong contentId,
+        ushort reason,
+        bool setChatType
+    )
    {
        if (playerName != null)
        {
            try
            {
-                var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason);
-                Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType))
-                {
-                    TellReason = (TellReason) reason,
-                    TellTarget = target,
-                });
+                var target = new TellTarget(
+                    playerName->ToString(),
+                    worldId,
+                    contentId,
+                    (TellReason)reason
+                );
+                Plugin.ChatLogWindow.Activated(
+                    new ChatActivatedArgs(
+                        new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)
+                    )
+                    {
+                        TellReason = (TellReason)reason,
+                        TellTarget = target,
+                    }
+                );
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error in chat Activated event");
+                _logger.LogError(ex, "Error in chat Activated event");
            }
        }

-        return SetChatLogTellTargetHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason, setChatType);
+        return SetChatLogTellTargetHook!.Original(
+            a1,
+            playerName,
+            worldName,
+            worldId,
+            accountId,
+            contentId,
+            reason,
+            setChatType
+        );
    }

-    private void ContextMenuTellInForayDetour(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason)
+    private void ContextMenuTellInForayDetour(
+        RaptureShellModule* a1,
+        Utf8String* playerName,
+        Utf8String* worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong contentId,
+        ushort reason
+    )
    {
        if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
            Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
@@ -309,36 +395,56 @@ internal sealed unsafe class Chat : IDisposable
        {
            try
            {
-                var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason);
-                Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
-                {
-                    TellReason = (TellReason) reason,
-                    TellTarget = target,
-                    TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special
-                });
+                var target = new TellTarget(
+                    playerName->ToString(),
+                    worldId,
+                    contentId,
+                    (TellReason)reason
+                );
+                Plugin.ChatLogWindow.Activated(
+                    new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
+                    {
+                        TellReason = (TellReason)reason,
+                        TellTarget = target,
+                        TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special
+                    }
+                );
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error in chat Activated event");
+                _logger.LogError(ex, "Error in chat Activated event");
            }
        }

-        ContextMenuTellInForayHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason);
+        ContextMenuTellInForayHook!.Original(
+            a1,
+            playerName,
+            worldName,
+            worldId,
+            accountId,
+            contentId,
+            reason
+        );
    }

-    /// <summary>
-    /// Returns true if the channel is any non-linkshell channel, or if the
-    /// linkshell actually exists.
-    /// </summary>
-    internal static bool ValidAnyLinkshell(InputChannel channel)
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Renamed ValidAnyLinkshell -> IsChannelOrExistingLinkshell. The
+    //   name now states intent: returns true for any non-linkshell
+    //   channel, or a linkshell index that actually exists.
+    // ---------------------------------------------------------------
+    internal static bool IsChannelOrExistingLinkshell(InputChannel channel)
    {
        var idx = channel.LinkshellIndex();
        if (idx == uint.MaxValue || channel.IsExtraChatLinkshell())
            return true;
-        if (channel.IsLinkshell() && ValidLinkshell(idx))
-            return true;
-        if (channel.IsCrossLinkshell() && ValidCrossLinkshell(idx))
-            return true;
+
+        if (channel.IsLinkshell())
+            return ValidLinkshell(idx);
+
+        if (channel.IsCrossLinkshell())
+            return ValidCrossLinkshell(idx);
+
        return false;
    }

@@ -346,17 +452,22 @@ internal sealed unsafe class Chat : IDisposable
    {
        if (idx > 7)
            return false;
-        return InfoProxyLinkshell.Instance()->LinkShells[(int) idx].Id != 0;
+        return InfoProxyLinkshell.Instance()->LinkShells[(int)idx].Id != 0;
    }

    internal static bool ValidCrossLinkshell(uint idx)
    {
        if (idx > 7)
            return false;
-        return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int) idx].Name.Length > 0;
+        return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int)idx].Name.Length
+            > 0;
    }

-    private static uint? RotateLinkshell(uint currentIndex, RotateMode rotate, Func<uint, bool> validFn)
+    private static uint? RotateLinkshell(
+        uint currentIndex,
+        RotateMode rotate,
+        Func<uint, bool> validFn
+    )
    {
        if (rotate == RotateMode.None)
            return null;
@@ -365,13 +476,12 @@ internal sealed unsafe class Chat : IDisposable
        {
            RotateMode.Forward => 1,
            RotateMode.Reverse => -1,
-            _ => 1
+            _ => 1,
        };

-        // Iterate up to 8 times to find a valid linkshell.
-        for (var i = 0; i < 8; i++)
+        for (var i = 0; i < 8; i++) // Find valid linkshell within 8 iterations
        {
-            currentIndex = (uint) ((8 + currentIndex + delta) % 8);
+            currentIndex = (uint)((8 + currentIndex + delta) % 8);
            if (validFn(currentIndex))
                return currentIndex;
        }
@@ -379,30 +489,43 @@ internal sealed unsafe class Chat : IDisposable
        return null;
    }

-    internal static InputChannel? ResolveTempInputChannel(InputChannel? currentTempChannel, InputChannel channel, RotateMode rotate)
+    internal static InputChannel? ResolveTempInputChannel(
+        InputChannel? currentTempChannel,
+        InputChannel channel,
+        RotateMode rotate
+    )
    {
        switch (channel)
        {
-            case InputChannel.Linkshell1 or InputChannel.CrossLinkshell1 when rotate != RotateMode.None:
+            case InputChannel.Linkshell1
+            or InputChannel.CrossLinkshell1 when rotate != RotateMode.None:
            {
                var module = UIModule.Instance();

-                var currentIndex = channel is InputChannel.Linkshell1 ? (uint) module->LinkshellCycle : (uint) module->CrossWorldLinkshellCycle;
+                var currentIndex =
+                    channel is InputChannel.Linkshell1
+                        ? (uint)module->LinkshellCycle
+                        : (uint)module->CrossWorldLinkshellCycle;
                if (currentTempChannel != null)
                {
                    switch (channel)
                    {
                        case InputChannel.Linkshell1 when currentTempChannel.Value.IsLinkshell():
-                        case InputChannel.CrossLinkshell1 when currentTempChannel.Value.IsCrossLinkshell():
+                        case InputChannel.CrossLinkshell1
+                            when currentTempChannel.Value.IsCrossLinkshell():
                            currentIndex = currentTempChannel.Value.LinkshellIndex();
                            break;
                    }
                }

-                var idx = RotateLinkshell(currentIndex, rotate, channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell);
+                var idx = RotateLinkshell(
+                    currentIndex,
+                    rotate,
+                    channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell
+                );
                // RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
                // Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
-                return idx is null ? null : channel + idx.Value;
+                return idx is null ? null : channel + idx.Value; // null if not found, otherwise new channel
            }
            default:
                return channel;
@@ -411,11 +534,7 @@ internal sealed unsafe class Chat : IDisposable

    internal void SetChannel(InputChannel channel, TellTarget? tellTarget = null)
    {
-        // ExtraChat linkshells aren't supported in game so we never want to
-        // call the ChangeChatChannel function with them.
-        //
-        // Callers should call ChatLogWindow.SetChannel() which handles
-        // ExtraChat channels
+        // Ignore ExtraChat linkshells (use ChatLogWindow.SetChannel() instead)
        if (channel.IsExtraChatLinkshell())
            return;

@@ -424,18 +543,30 @@ internal sealed unsafe class Chat : IDisposable
        if (idx == uint.MaxValue)
            idx = 0;

-        if (!ValidAnyLinkshell(channel))
-            return;
+        // ---------------------------------------------------------------
+        // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+        // - Wrap ChangeChatChannel in the validity check instead of
+        //   early-returning. The previous early return skipped Dtor and
+        //   leaked the native Utf8String allocated a few lines above.
+        // ---------------------------------------------------------------
+        if (IsChannelOrExistingLinkshell(channel))
+            RaptureShellModule
+                .Instance()
+                ->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);

-        RaptureShellModule.Instance()->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
        target->Dtor(true);
    }

-    internal void SetEurekaTellChannel(string name, string worldName, ushort worldId, ulong accountId, ulong objectId, ushort reason, bool setChatType)
+    internal void SetEurekaTellChannel(
+        string name,
+        string worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong objectId,
+        ushort reason,
+        bool setChatType
+    )
    {
-        // param6 is 0 for contentId and 1 for objectId
-        // param7 is always 0 ?
-
        if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
            Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;

@@ -446,7 +577,17 @@ internal sealed unsafe class Chat : IDisposable
        var utfName = Utf8String.FromString(name);
        var utfWorld = Utf8String.FromString(worldName);

-        RaptureShellModule.Instance()->SetTellTargetInForay(utfName, utfWorld, worldId, accountId, objectId, reason, setChatType);
+        RaptureShellModule
+            .Instance()
+            ->SetTellTargetInForay(
+                utfName,
+                utfWorld,
+                worldId,
+                accountId,
+                objectId,
+                reason,
+                setChatType
+            );

        utfName->Dtor(true);
        utfWorld->Dtor(true);
@@ -475,19 +616,30 @@ internal sealed unsafe class Chat : IDisposable
        mes->Dtor(true);
    }

-    internal void SendTell(TellReason reason, ulong contentId, string name, ushort homeWorld, byte[] message, string rawText)
+    internal void SendTell(
+        TellReason reason,
+        ulong contentId,
+        string name,
+        ushort homeWorld,
+        byte[] message,
+        string rawText
+    )
    {
        if (contentId == 0)
        {
            Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
-            Plugin.Log.Warning("Tried to send a tell with ContentId being 0, sorry this is an internal error.");
+            _logger.LogWarning(
+                "Tried to send a tell with ContentId being 0, sorry this is an internal error."
+            );
            return;
        }

        var uName = Utf8String.FromString(name);
        var uMessage = Utf8String.FromSequence(message.NullTerminate());

-        var encoded = Utf8String.FromUtf8String(PronounModule.Instance()->ProcessString(uMessage, true));
+        var encoded = Utf8String.FromUtf8String(
+            PronounModule.Instance()->ProcessString(uMessage, true)
+        );
        var decoded = EncodeMessage(rawText);
        AutoTranslate.ReplaceWithPayload(ref decoded);

@@ -500,9 +652,28 @@ internal sealed unsafe class Chat : IDisposable
        if (reason == TellReason.Direct)
            reason = TellReason.Friend;

-        var ok = SendTellNative(networkModule, contentId, homeWorld, uName, encoded, (ushort) reason, homeWorld);
+        var ok = SendTellNative(
+            networkModule,
+            contentId,
+            homeWorld,
+            uName,
+            encoded,
+            (ushort)reason,
+            homeWorld
+        );
        if (ok == 1)
-            PrintTellNative(logModule, 33, uName, &decodedUtf8String, 0, contentId, homeWorld, 255, 0, 0);
+            PrintTellNative(
+                logModule,
+                33,
+                uName,
+                &decodedUtf8String,
+                0,
+                contentId,
+                homeWorld,
+                255,
+                0,
+                0
+            );
        else
            Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);

@@ -511,7 +682,8 @@ internal sealed unsafe class Chat : IDisposable
        uMessage->Dtor(true);
    }

-    private static byte[] EncodeMessage(string str) {
+    private static byte[] EncodeMessage(string str)
+    {
        using var input = new Utf8String(str);
        using var output = new Utf8String();

@@ -524,7 +696,7 @@ internal sealed unsafe class Chat : IDisposable
    {
        var uC = Utf8String.FromString(c.ToString());

-        uC->SanitizeString((AllowedEntities) 0x27F);
+        uC->SanitizeString((AllowedEntities)0x27F);
        var wasValid = uC->ToString().Length > 0;

        uC->Dtor(true);
@@ -537,7 +709,7 @@ internal sealed unsafe class Chat : IDisposable
        var ok = Plugin.GameConfig.TryGet(UiConfigOption.LogNameType, out uint type);
        if (!ok || !Enum.IsDefined(typeof(PlayerNameDisplayType), type))
            return PlayerNameDisplayType.FullName;
-        return (PlayerNameDisplayType) type;
+        return (PlayerNameDisplayType)type;
    }

    internal string AbbreviatePlayerName(string playerName)
@@ -557,20 +729,21 @@ internal sealed unsafe class Chat : IDisposable

        return CurrentPlayerNameDisplayType switch
        {
-            PlayerNameDisplayType.SurnameAbbreviated => $"{split.First()} {split.Last().FirstOrDefault('A')}.",
-            PlayerNameDisplayType.ForenameAbbreviated => $"{split.First().FirstOrDefault('A')}. {split.Last()}",
-            PlayerNameDisplayType.Initials => $"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.",
-            _ => playerName
+            PlayerNameDisplayType.SurnameAbbreviated =>
+                $"{split.First()} {split.Last().FirstOrDefault('A')}.",
+            PlayerNameDisplayType.ForenameAbbreviated =>
+                $"{split.First().FirstOrDefault('A')}. {split.Last()}",
+            PlayerNameDisplayType.Initials =>
+                $"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.",
+            _ => playerName,
        };
    }

    internal bool CheckHideFlags()
    {
-        // Only hide the chat in a cutscene when the vanilla chat would've
-        // also been hidden. This prevents Chat 2 from hiding for a split
-        // second before the cutscene actually starts, because the game sets
-        // the cutscene conditions before processing the skip.
+        // Only hide chat in cutscene when vanilla chat would also be hidden
        var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
-        return raptureAtkUnitManager == null || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
+        return raptureAtkUnitManager == null
+            || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
    }
 }
@@ -1,8 +1,8 @@
 using System.Text;
-using HellionChat.Resources;
 using Dalamud.Memory;
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
+using HellionChat.Resources;

 namespace HellionChat.GameFunctions;

@@ -15,7 +15,15 @@ public unsafe class ChatBox
        mes->Dtor(true);
    }

-    public static void SendMessage(string message)
+    public static void SendMessage(string message) => SendMessageUnsafe(ValidateMessage(message));
+
+    // sanitiserOverride allows xUnit to bypass Utf8String->SanitizeString (game memory only).
+    // Returns encoded bytes so SendMessage avoids a second GetBytes call.
+    // TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
+    internal static byte[] ValidateMessage(
+        string message,
+        Func<string, string>? sanitiserOverride = null
+    )
    {
        var bytes = Encoding.UTF8.GetBytes(message);
        if (bytes.Length == 0)
@@ -24,20 +32,19 @@ public unsafe class ChatBox
        if (bytes.Length > 500)
            throw new ArgumentException(Language.ChatBox_Error_Too_Long, nameof(message));

-        if (message.Length != SanitiseText(message).Length)
+        var sanitiser = sanitiserOverride ?? SanitiseText;
+        if (message.Length != sanitiser(message).Length)
            throw new ArgumentException(Language.ChatBox_Error_Invalid, nameof(message));

-        SendMessageUnsafe(bytes);
+        return bytes;
    }

    private static string SanitiseText(string text)
    {
        var uText = Utf8String.FromString(text);
-
-        uText->SanitizeString((AllowedEntities) 0x27F);
+        uText->SanitizeString((AllowedEntities)0x27F);
        var sanitised = uText->ToString();
        uText->Dtor(true);
-
        return sanitised;
    }
-}
+}
@@ -1,7 +1,7 @@
-using HellionChat.Util;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Client.UI.Info;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using HellionChat.Util;

 namespace HellionChat.GameFunctions;

@@ -10,7 +10,9 @@ internal sealed unsafe class Context
    internal static void InviteToNoviceNetwork(string name, ushort world)
    {
        // can specify content id if we have it, but there's no need
-        InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
+        InfoProxyNoviceNetwork
+            .Instance()
+            ->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
    }

    internal static void TryOn(uint itemId, byte stainId)
@@ -14,6 +14,7 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using Lumina.Excel;
 using Lumina.Excel.Sheets;
+using Microsoft.Extensions.Logging;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;

 namespace HellionChat.GameFunctions;
@@ -23,23 +24,36 @@ internal unsafe class GameFunctions : IDisposable
    internal const string NewGamePlusAddonName = "QuestRedo";

    #region Hooks
-    [Signature("E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F", DetourName = nameof(ResolveTextCommandPlaceholderDetour))]
+    [Signature(
+        "E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F",
+        DetourName = nameof(ResolveTextCommandPlaceholderDetour)
+    )]
    private Hook<ResolveTextCommandPlaceholderDelegate>? ResolveTextCommandPlaceholderHook = null!;
-    private delegate nint ResolveTextCommandPlaceholderDelegate(nint a1, byte* placeholderText, byte a3, byte a4);
+    private delegate nint ResolveTextCommandPlaceholderDelegate(
+        nint a1,
+        byte* placeholderText,
+        byte a3,
+        byte a4
+    );
    #endregion

    private Plugin Plugin { get; }
+    private readonly ILogger<GameFunctions> _logger;
    internal KeybindManager KeybindManager { get; }
    internal Chat Chat { get; }

-    internal GameFunctions(Plugin plugin)
+    internal GameFunctions(
+        Plugin plugin,
+        ILogger<GameFunctions> logger,
+        ILoggerFactory loggerFactory
+    )
    {
        Plugin = plugin;
-        KeybindManager = new KeybindManager(plugin);
-        Chat = new Chat(Plugin);
+        _logger = logger;
+        KeybindManager = new KeybindManager(plugin, loggerFactory.CreateLogger<KeybindManager>());
+        Chat = new Chat(Plugin, loggerFactory.CreateLogger<Chat>());

        Plugin.GameInteropProvider.InitializeFromAttributes(this);
-
        ResolveTextCommandPlaceholderHook?.Enable();
    }

@@ -47,41 +61,30 @@ internal unsafe class GameFunctions : IDisposable
    {
        Chat.Dispose();
        KeybindManager.Dispose();
-
        ResolveTextCommandPlaceholderHook?.Dispose();
-
        Marshal.FreeHGlobal(PlaceholderNamePtr);
    }

-    internal void SendFriendRequest(string name, ushort world)
-    {
+    internal void SendFriendRequest(string name, ushort world) =>
        ListCommand(name, world, "friendlist");
-    }

-    internal void AddToBlacklist(string name, ushort world)
-    {
-        ListCommand(name, world, "blist");
-    }
+    internal void AddToBlacklist(string name, ushort world) => ListCommand(name, world, "blist");

-    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId)
-    {
+    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId) =>
        AgentMutelist.Instance()->Add(accountId, contentId, name, worldId);
-    }

-    internal void AddToTermsList(SeString content)
-    {
+    internal void AddToTermsList(SeString content) =>
        AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator());
-    }

    private void ListCommand(string name, ushort world, string commandName)
    {
        var worldRow = Sheets.WorldSheet.GetRow(world);
-
        ReplacementName = $"{name}@{worldRow.Name.ToString()}";
        ChatBox.SendMessage($"/{commandName} add {Placeholder}");
    }

-    private static T* GetAddon<T>(string name) where T : unmanaged
+    private static T* GetAddon<T>(string name)
+        where T : unmanaged
    {
        var addon = RaptureAtkModule.Instance()->RaptureAtkUnitManager.GetAddonByName(name);
        return addon != null && addon->IsReady ? (T*)addon : null;
@@ -99,7 +102,6 @@ internal unsafe class GameFunctions : IDisposable
    {
        for (var i = 0; i < 4; i++)
            SetAddonInteractable($"ChatLogPanel_{i}", interactable);
-
        SetAddonInteractable("ChatLog", interactable);
    }

@@ -115,7 +117,6 @@ internal unsafe class GameFunctions : IDisposable
        var agent = AgentItemDetail.Instance();
        var addon = GetAddon<AtkUnitBase>("ItemDetail");

-        // atkStage ain't gonna be null or we have bigger problems
        if (agent == null || addon == null)
            return;

@@ -124,23 +125,19 @@ internal unsafe class GameFunctions : IDisposable
        agent->Index = 0;
        agent->Flag1 &= 0xEF;
        agent->ItemId = id;
-        // agent->Flag2 = 1;
-        // agent->Flag3 = 0;
-        // TODO: Revert whenever CS is merged
+
+        // TODO: Revert when CS offset lands in a release build.
        *(byte*)((nint)agent + 0x21A) = 1;
        *(byte*)((nint)agent + 0x21E) = 0;

-        // This just probably needs to be set
        agent->AddonId = addon->Id;
-
-        // Skips early return
        atkStage->TooltipManager.TooltipType |= 2;
        addon->Show(false, 15);
    }

    internal static void CloseItemTooltip()
    {
-        // hide addon first to prevent the "addon close" sound
+        // Hide addon first to suppress the "addon close" sound.
        var addon = GetAddon<AtkUnitBase>("ItemDetail");
        if (addon != null)
            addon->Hide(true, false, 0);
@@ -158,35 +155,31 @@ internal unsafe class GameFunctions : IDisposable

    internal static void OpenPartyFinder()
    {
-        // this whole method: 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
+        // 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
        var lfg = AgentLookingForGroup.Instance();
        if (lfg->IsAgentActive())
        {
            var addonId = lfg->GetAddonId();
            var atkModule = RaptureAtkModule.Instance();
-            var atkModuleVtbl = (void**) atkModule->AtkModule.VirtualTable;
-            var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>) atkModuleVtbl[27];
+            var atkModuleVtbl = (void**)atkModule->AtkModule.VirtualTable;
+            var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>)
+                atkModuleVtbl[27];
            vf27(atkModule, addonId, 1);
        }
        else
        {
            // 6.05: 8443DD
-            if (*(uint*) ((nint) lfg + 0x2C20) > 0)
+            if (*(uint*)((nint)lfg + 0x2C20) > 0)
                lfg->Hide();
            else
                lfg->Show();
        }
    }

-    internal static bool IsMentor()
-    {
-        return PlayerState.Instance()->IsMentor();
-    }
+    internal static bool IsMentor() => PlayerState.Instance()->IsMentor();

-    internal static InfoProxyCommonList.CharacterData[] GetFriends()
-    {
-        return InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
-    }
+    internal static InfoProxyCommonList.CharacterData[] GetFriends() =>
+        InfoProxyFriendList.Instance()->CharDataSpan.ToArray();

    internal static void OpenQuestLog(RowRef<Quest> quest)
    {
@@ -197,7 +190,14 @@ internal unsafe class GameFunctions : IDisposable
            return;
        }

-        if (!uint.TryParse(splits[1], NumberStyles.Any, CultureInfo.InvariantCulture,  out var questId))
+        if (
+            !uint.TryParse(
+                splits[1],
+                NumberStyles.Any,
+                CultureInfo.InvariantCulture,
+                out var questId
+            )
+        )
        {
            Plugin.ChatGui.Print("Unable to parse quest id");
            return;
@@ -206,20 +206,12 @@ internal unsafe class GameFunctions : IDisposable
        AgentQuestJournal.Instance()->OpenForQuest(questId, 1);
    }

-    internal static void OpenPartyFinder(uint id)
-    {
+    internal static void OpenPartyFinder(uint id) =>
        AgentLookingForGroup.Instance()->OpenListing(id);
-    }

-    internal static void OpenAchievement(uint id)
-    {
-        AgentAchievement.Instance()->OpenById(id);
-    }
+    internal static void OpenAchievement(uint id) => AgentAchievement.Instance()->OpenById(id);

-    internal static bool IsInInstance()
-    {
-        return Plugin.Condition[ConditionFlag.BoundByDuty56];
-    }
+    internal static bool IsInInstance() => Plugin.Condition[ConditionFlag.BoundByDuty56];

    internal static bool TryOpenAdventurerPlate(ulong playerId)
    {
@@ -230,7 +222,8 @@ internal unsafe class GameFunctions : IDisposable
        }
        catch (Exception e)
        {
-            Plugin.Log.Warning(e, "Unable to open adventurer plate");
+            // Static method, no instance _logger reachable here.
+            Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
            return false;
        }
    }
@@ -238,10 +231,10 @@ internal unsafe class GameFunctions : IDisposable
    internal static void ClickNoviceNetworkButton()
    {
        var agent = AgentChatLog.Instance();
-        // case 3
-        var value = new AtkValue { Type = ValueType.Int, Int = 3, };
+        var value = new AtkValue { Type = ValueType.Int, Int = 3 }; // case 3
        var result = 0;
-        var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*) agent->VirtualTable;
+        var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
+            agent->VirtualTable;
        vf0(agent, &result, &value, 0, 0);
    }

@@ -250,32 +243,35 @@ internal unsafe class GameFunctions : IDisposable
    private readonly string Placeholder = $"<{Guid.NewGuid():N}>";
    private string? ReplacementName;

-    private nint ResolveTextCommandPlaceholderDetour(nint a1, byte* placeholderText, byte a3, byte a4)
+    private nint ResolveTextCommandPlaceholderDetour(
+        nint a1,
+        byte* placeholderText,
+        byte a3,
+        byte a4
+    )
    {
-        // The detour is only invoked through the hook, so the hook should
-        // never be null here, but the nullable field declaration forces us
-        // to handle the theoretical race during teardown.
+        // Hook field is nullable due to the Signature attribute, but will never
+        // be null during normal execution; guard covers the teardown race only.
        if (ResolveTextCommandPlaceholderHook is null)
            return nint.Zero;

-        var placeholder = MemoryHelper.ReadStringNullTerminated((nint) placeholderText);
+        var placeholder = MemoryHelper.ReadStringNullTerminated((nint)placeholderText);
        if (ReplacementName == null || placeholder != Placeholder)
            return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);

-        // The fixed buffer is 128 bytes; UTF-8 + null-terminator must fit.
-        // FFXIV player names plus an @World suffix should never approach this
-        // limit, but a malformed ReplacementName must not overflow the buffer.
+        // Guard against a malformed ReplacementName overflowing the 128-byte buffer.
        var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
        if (byteCount >= PlaceholderBufferSize)
        {
-            Plugin.Log.Warning($"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original.");
+            _logger.LogWarning(
+                $"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
+            );
            ReplacementName = null;
            return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
        }

        MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
        ReplacementName = null;
-
        return PlaceholderNamePtr;
    }
 }
@@ -1,23 +1,26 @@
 using System.Numerics;
-using HellionChat.Code;
-using HellionChat.GameFunctions.Types;
-using HellionChat.Util;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Config;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Code;
+using HellionChat.GameFunctions.Types;
+using HellionChat.Util;
+using Microsoft.Extensions.Logging;
 using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;

 namespace HellionChat.GameFunctions;

-internal enum KeyboardSource {
+internal enum KeyboardSource
+{
    Game,
-    ImGui
+    ImGui,
 }

-internal unsafe class KeybindManager : IDisposable {
+internal unsafe class KeybindManager : IDisposable
+{
    private Plugin Plugin { get; }

    internal bool DirectChat;
@@ -26,70 +29,79 @@ internal unsafe class KeybindManager : IDisposable {
    private bool VanillaTextInputHasFocus;

    private readonly Dictionary<string, Keybind> Keybinds = new();
-    private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept = new Dictionary<string, ChannelSwitchInfo>
-    {
-        ["CMD_CHAT"] = new(null),
-        ["CMD_COMMAND"] = new(null, text: "/"),
-        ["CMD_REPLY"] = new(InputChannel.Tell, rotate: RotateMode.Forward),
-        ["CMD_REPLY_REV"] = new(InputChannel.Tell, rotate: RotateMode.Reverse),
-        ["CMD_SAY"] = new(InputChannel.Say),
-        ["CMD_YELL"] = new(InputChannel.Yell),
-        ["CMD_SHOUT"] = new(InputChannel.Shout),
-        ["CMD_PARTY"] = new(InputChannel.Party),
-        ["CMD_ALLIANCE"] = new(InputChannel.Alliance),
-        ["CMD_FREECOM"] = new(InputChannel.FreeCompany),
-        ["PVPTEAM_CHAT"] = new(InputChannel.PvpTeam),
-        ["CMD_CWLINKSHELL"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Forward),
-        ["CMD_CWLINKSHELL_REV"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Reverse),
-        ["CMD_CWLINKSHELL_1"] = new(InputChannel.CrossLinkshell1),
-        ["CMD_CWLINKSHELL_2"] = new(InputChannel.CrossLinkshell2),
-        ["CMD_CWLINKSHELL_3"] = new(InputChannel.CrossLinkshell3),
-        ["CMD_CWLINKSHELL_4"] = new(InputChannel.CrossLinkshell4),
-        ["CMD_CWLINKSHELL_5"] = new(InputChannel.CrossLinkshell5),
-        ["CMD_CWLINKSHELL_6"] = new(InputChannel.CrossLinkshell6),
-        ["CMD_CWLINKSHELL_7"] = new(InputChannel.CrossLinkshell7),
-        ["CMD_CWLINKSHELL_8"] = new(InputChannel.CrossLinkshell8),
-        ["CMD_LINKSHELL"] = new(InputChannel.Linkshell1, rotate: RotateMode.Forward),
-        ["CMD_LINKSHELL_REV"] = new(InputChannel.Linkshell1, rotate: RotateMode.Reverse),
-        ["CMD_LINKSHELL_1"] = new(InputChannel.Linkshell1),
-        ["CMD_LINKSHELL_2"] = new(InputChannel.Linkshell2),
-        ["CMD_LINKSHELL_3"] = new(InputChannel.Linkshell3),
-        ["CMD_LINKSHELL_4"] = new(InputChannel.Linkshell4),
-        ["CMD_LINKSHELL_5"] = new(InputChannel.Linkshell5),
-        ["CMD_LINKSHELL_6"] = new(InputChannel.Linkshell6),
-        ["CMD_LINKSHELL_7"] = new(InputChannel.Linkshell7),
-        ["CMD_LINKSHELL_8"] = new(InputChannel.Linkshell8),
-        ["CMD_BEGINNER"] = new(InputChannel.NoviceNetwork),
-        ["CMD_REPLY_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Forward),
-        ["CMD_REPLY_REV_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Reverse),
-        ["CMD_SAY_ALWAYS"] = new(InputChannel.Say, true),
-        ["CMD_YELL_ALWAYS"] = new(InputChannel.Yell, true),
-        ["CMD_PARTY_ALWAYS"] = new(InputChannel.Party, true),
-        ["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true),
-        ["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true),
-        ["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true),
-        ["CMD_CWLINKSHELL_ALWAYS"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Forward),
-        ["CMD_CWLINKSHELL_ALWAYS_REV"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Reverse),
-        ["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true),
-        ["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true),
-        ["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true),
-        ["CMD_CWLINKSHELL_4_ALWAYS"] = new(InputChannel.CrossLinkshell4, true),
-        ["CMD_CWLINKSHELL_5_ALWAYS"] = new(InputChannel.CrossLinkshell5, true),
-        ["CMD_CWLINKSHELL_6_ALWAYS"] = new(InputChannel.CrossLinkshell6, true),
-        ["CMD_CWLINKSHELL_7_ALWAYS"] = new(InputChannel.CrossLinkshell7, true),
-        ["CMD_CWLINKSHELL_8_ALWAYS"] = new(InputChannel.CrossLinkshell8, true),
-        ["CMD_LINKSHELL_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Forward),
-        ["CMD_LINKSHELL_REV_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Reverse),
-        ["CMD_LINKSHELL_1_ALWAYS"] = new(InputChannel.Linkshell1, true),
-        ["CMD_LINKSHELL_2_ALWAYS"] = new(InputChannel.Linkshell2, true),
-        ["CMD_LINKSHELL_3_ALWAYS"] = new(InputChannel.Linkshell3, true),
-        ["CMD_LINKSHELL_4_ALWAYS"] = new(InputChannel.Linkshell4, true),
-        ["CMD_LINKSHELL_5_ALWAYS"] = new(InputChannel.Linkshell5, true),
-        ["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true),
-        ["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true),
-        ["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true),
-        ["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true)
-    };
+    private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept =
+        new Dictionary<string, ChannelSwitchInfo>
+        {
+            ["CMD_CHAT"] = new(null),
+            ["CMD_COMMAND"] = new(null, text: "/"),
+            ["CMD_REPLY"] = new(InputChannel.Tell, rotate: RotateMode.Forward),
+            ["CMD_REPLY_REV"] = new(InputChannel.Tell, rotate: RotateMode.Reverse),
+            ["CMD_SAY"] = new(InputChannel.Say),
+            ["CMD_YELL"] = new(InputChannel.Yell),
+            ["CMD_SHOUT"] = new(InputChannel.Shout),
+            ["CMD_PARTY"] = new(InputChannel.Party),
+            ["CMD_ALLIANCE"] = new(InputChannel.Alliance),
+            ["CMD_FREECOM"] = new(InputChannel.FreeCompany),
+            ["PVPTEAM_CHAT"] = new(InputChannel.PvpTeam),
+            ["CMD_CWLINKSHELL"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Forward),
+            ["CMD_CWLINKSHELL_REV"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Reverse),
+            ["CMD_CWLINKSHELL_1"] = new(InputChannel.CrossLinkshell1),
+            ["CMD_CWLINKSHELL_2"] = new(InputChannel.CrossLinkshell2),
+            ["CMD_CWLINKSHELL_3"] = new(InputChannel.CrossLinkshell3),
+            ["CMD_CWLINKSHELL_4"] = new(InputChannel.CrossLinkshell4),
+            ["CMD_CWLINKSHELL_5"] = new(InputChannel.CrossLinkshell5),
+            ["CMD_CWLINKSHELL_6"] = new(InputChannel.CrossLinkshell6),
+            ["CMD_CWLINKSHELL_7"] = new(InputChannel.CrossLinkshell7),
+            ["CMD_CWLINKSHELL_8"] = new(InputChannel.CrossLinkshell8),
+            ["CMD_LINKSHELL"] = new(InputChannel.Linkshell1, rotate: RotateMode.Forward),
+            ["CMD_LINKSHELL_REV"] = new(InputChannel.Linkshell1, rotate: RotateMode.Reverse),
+            ["CMD_LINKSHELL_1"] = new(InputChannel.Linkshell1),
+            ["CMD_LINKSHELL_2"] = new(InputChannel.Linkshell2),
+            ["CMD_LINKSHELL_3"] = new(InputChannel.Linkshell3),
+            ["CMD_LINKSHELL_4"] = new(InputChannel.Linkshell4),
+            ["CMD_LINKSHELL_5"] = new(InputChannel.Linkshell5),
+            ["CMD_LINKSHELL_6"] = new(InputChannel.Linkshell6),
+            ["CMD_LINKSHELL_7"] = new(InputChannel.Linkshell7),
+            ["CMD_LINKSHELL_8"] = new(InputChannel.Linkshell8),
+            ["CMD_BEGINNER"] = new(InputChannel.NoviceNetwork),
+            ["CMD_REPLY_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Forward),
+            ["CMD_REPLY_REV_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Reverse),
+            ["CMD_SAY_ALWAYS"] = new(InputChannel.Say, true),
+            ["CMD_YELL_ALWAYS"] = new(InputChannel.Yell, true),
+            ["CMD_PARTY_ALWAYS"] = new(InputChannel.Party, true),
+            ["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true),
+            ["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true),
+            ["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true),
+            ["CMD_CWLINKSHELL_ALWAYS"] = new(
+                InputChannel.CrossLinkshell1,
+                true,
+                RotateMode.Forward
+            ),
+            ["CMD_CWLINKSHELL_ALWAYS_REV"] = new(
+                InputChannel.CrossLinkshell1,
+                true,
+                RotateMode.Reverse
+            ),
+            ["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true),
+            ["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true),
+            ["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true),
+            ["CMD_CWLINKSHELL_4_ALWAYS"] = new(InputChannel.CrossLinkshell4, true),
+            ["CMD_CWLINKSHELL_5_ALWAYS"] = new(InputChannel.CrossLinkshell5, true),
+            ["CMD_CWLINKSHELL_6_ALWAYS"] = new(InputChannel.CrossLinkshell6, true),
+            ["CMD_CWLINKSHELL_7_ALWAYS"] = new(InputChannel.CrossLinkshell7, true),
+            ["CMD_CWLINKSHELL_8_ALWAYS"] = new(InputChannel.CrossLinkshell8, true),
+            ["CMD_LINKSHELL_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Forward),
+            ["CMD_LINKSHELL_REV_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Reverse),
+            ["CMD_LINKSHELL_1_ALWAYS"] = new(InputChannel.Linkshell1, true),
+            ["CMD_LINKSHELL_2_ALWAYS"] = new(InputChannel.Linkshell2, true),
+            ["CMD_LINKSHELL_3_ALWAYS"] = new(InputChannel.Linkshell3, true),
+            ["CMD_LINKSHELL_4_ALWAYS"] = new(InputChannel.Linkshell4, true),
+            ["CMD_LINKSHELL_5_ALWAYS"] = new(InputChannel.Linkshell5, true),
+            ["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true),
+            ["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true),
+            ["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true),
+            ["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true),
+        };

    // List of keys that can be used as a part of keybinds while the chat is
    // focused WITHOUT modifiers. All other keys can only be used if their
@@ -295,9 +307,12 @@ internal unsafe class KeybindManager : IDisposable {
        // VirtualKey.OEM_CLEAR,
    };

-    internal KeybindManager(Plugin plugin)
+    private readonly ILogger<KeybindManager> _logger;
+
+    internal KeybindManager(Plugin plugin, ILogger<KeybindManager> logger)
    {
        Plugin = plugin;
+        _logger = logger;
        Plugin.GameInteropProvider.InitializeFromAttributes(this);

        // Handle keybinds from the game on every tick.
@@ -353,12 +368,22 @@ internal unsafe class KeybindManager : IDisposable {
        return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey);
    }

-    private static bool ComboPressed(KeyboardSource source, VirtualKey key, ModifierFlag modifier, ModifierFlag? modifierState = null, bool modifiersOnly = false)
+    private static bool ComboPressed(
+        KeyboardSource source,
+        VirtualKey key,
+        ModifierFlag modifier,
+        ModifierFlag? modifierState = null,
+        bool modifiersOnly = false
+    )
    {
        // When we're in an input, we don't want to process any keybinds that
        // don't have a modifier (or only use shift) and are not explicitly
        // whitelisted.
-        if (modifiersOnly && !ModifierlessChatKeys.Contains(key) && modifier is ModifierFlag.None or ModifierFlag.Shift)
+        if (
+            modifiersOnly
+            && !ModifierlessChatKeys.Contains(key)
+            && modifier is ModifierFlag.None or ModifierFlag.Shift
+        )
            return false;

        modifierState ??= GetModifiers(source);
@@ -366,26 +391,43 @@ internal unsafe class KeybindManager : IDisposable {
        {
            KeybindMode.Strict => modifier == modifierState.Value,
            KeybindMode.Flexible => modifierState.Value.HasFlag(modifier),
-            _ => false
+            _ => false,
        };

        return KeyPressed(source, key) && modifierPressed;
    }

-    private static bool ConfigKeybindPressed(KeyboardSource source, ConfigKeyBind? bind, ModifierFlag? modifierState = null, bool modifiersOnly = false)
+    private static bool ConfigKeybindPressed(
+        KeyboardSource source,
+        ConfigKeyBind? bind,
+        ModifierFlag? modifierState = null,
+        bool modifiersOnly = false
+    )
    {
-        return bind != null && ComboPressed(source, bind.Key, bind.Modifier, modifierState: modifierState, modifiersOnly: modifiersOnly);
+        return bind != null
+            && ComboPressed(
+                source,
+                bind.Key,
+                bind.Modifier,
+                modifierState: modifierState,
+                modifiersOnly: modifiersOnly
+            );
    }

-    private void HandleKeybinds(IFramework _ ) => HandleKeybinds(KeyboardSource.Game);
+    private void HandleKeybinds(IFramework _) => HandleKeybinds(KeyboardSource.Game);

-    internal void HandleKeybinds(KeyboardSource source, bool ignoreChatOpen = false, bool modifiersOnly = false)
+    internal void HandleKeybinds(
+        KeyboardSource source,
+        bool ignoreChatOpen = false,
+        bool modifiersOnly = false
+    )
    {
        // Refresh current keybinds every 5s
        if (LastRefresh + 5 * 1000 < Environment.TickCount64)
        {
            UpdateKeybinds();
-            DirectChat = Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
+            DirectChat =
+                Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
            LastRefresh = Environment.TickCount64;
        }

@@ -433,10 +475,18 @@ internal unsafe class KeybindManager : IDisposable {

            void Intercept(VirtualKey vk, ModifierFlag modifier)
            {
-                if (!ComboPressed(source, vk, modifier, modifierState: modifierState, modifiersOnly: modifiersOnly))
+                if (
+                    !ComboPressed(
+                        source,
+                        vk,
+                        modifier,
+                        modifierState: modifierState,
+                        modifiersOnly: modifiersOnly
+                    )
+                )
                    return;

-                var bits = BitOperations.PopCount((uint) modifier);
+                var bits = BitOperations.PopCount((uint)modifier);
                if (bits < currentBest.Item3)
                    return;

@@ -457,11 +507,11 @@ internal unsafe class KeybindManager : IDisposable {
        try
        {
            TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null;
-            Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason, });
+            Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason });
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error in chat Activated event");
+            _logger.LogError(ex, "Error in chat Activated event");
        }
    }

@@ -494,11 +544,11 @@ internal unsafe class KeybindManager : IDisposable {
        var key2 = outData.KeySettings[1];
        return new Keybind
        {
-            Key1 = RemapInvalidVirtualKey((VirtualKey) key1.Key),
-            Modifier1 = (ModifierFlag) key1.KeyModifier,
+            Key1 = RemapInvalidVirtualKey((VirtualKey)key1.Key),
+            Modifier1 = (ModifierFlag)key1.KeyModifier,

-            Key2 = RemapInvalidVirtualKey((VirtualKey) key2.Key),
-            Modifier2 = (ModifierFlag) key2.KeyModifier,
+            Key2 = RemapInvalidVirtualKey((VirtualKey)key2.Key),
+            Modifier2 = (ModifierFlag)key2.KeyModifier,
        };
    }

@@ -506,9 +556,9 @@ internal unsafe class KeybindManager : IDisposable {
    {
        return key switch
        {
-            VirtualKey.F23 => VirtualKey.OEM_2,   // /?
-            (VirtualKey) 140 => VirtualKey.OEM_7, // '"
-            _ => key
+            VirtualKey.F23 => VirtualKey.OEM_2, // /?
+            (VirtualKey)140 => VirtualKey.OEM_7, // '"
+            _ => key,
        };
    }
-}
+}
@@ -1,8 +1,8 @@
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud.Interface.ImGuiNotification;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Client.UI.Info;
+using HellionChat.Resources;
+using HellionChat.Util;

 namespace HellionChat.GameFunctions;

@@ -11,7 +11,8 @@ internal static unsafe class Party
    internal static void InviteSameWorld(string name, ushort world, ulong contentId)
    {
        // this only works if target is on the same world
-        fixed (byte* namePtr = name.ToTerminatedBytes()) {
+        fixed (byte* namePtr = name.ToTerminatedBytes())
+        {
            InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world);
        }
    }
@@ -44,14 +45,16 @@ internal static unsafe class Party

    internal static void Kick(string name, ulong contentId)
    {
-        fixed (byte* namePtr = name.ToTerminatedBytes()) {
+        fixed (byte* namePtr = name.ToTerminatedBytes())
+        {
            AgentPartyMember.Instance()->Kick(namePtr, 0, contentId);
        }
    }

    internal static void Promote(string name, ulong contentId)
    {
-        fixed (byte* namePtr = name.ToTerminatedBytes()) {
+        fixed (byte* namePtr = name.ToTerminatedBytes())
+        {
            AgentPartyMember.Instance()->Promote(namePtr, 0, contentId);
        }
    }
@@ -2,13 +2,19 @@ using HellionChat.Code;

 namespace HellionChat.GameFunctions.Types;

-internal class ChannelSwitchInfo {
+internal class ChannelSwitchInfo
+{
    internal InputChannel? Channel { get; }
    internal bool Permanent { get; }
    internal RotateMode Rotate { get; }
    internal string? Text { get; }

-    internal ChannelSwitchInfo(InputChannel? channel, bool permanent = false, RotateMode rotate = RotateMode.None, string? text = null)
+    internal ChannelSwitchInfo(
+        InputChannel? channel,
+        bool permanent = false,
+        RotateMode rotate = RotateMode.None,
+        string? text = null
+    )
    {
        Channel = channel;
        Permanent = permanent;
@@ -19,14 +19,14 @@ public class TellTarget
        Reason = reason;
    }

-    public bool IsSet()
-        => !string.IsNullOrEmpty(Name) && World > 0;
+    public bool IsSet() => !string.IsNullOrEmpty(Name) && World > 0;

-    public string ToWorldString()
-        => Sheets.WorldSheet.TryGetRow(World, out var worldRow) ? worldRow.Name.ToString() : string.Empty;
+    public string ToWorldString() =>
+        Sheets.WorldSheet.TryGetRow(World, out var worldRow)
+            ? worldRow.Name.ToString()
+            : string.Empty;

-    public string ToTargetString()
-        => $"{Name}@{ToWorldString()}";
+    public string ToTargetString() => $"{Name}@{ToWorldString()}";

    public unsafe void FromTarget(IPlayerCharacter target)
    {
@@ -39,5 +39,12 @@ public class TellTarget
    }

    public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
-    public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason);
+
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Replaced static From(t) with an instance-style Clone() so call
+    //   sites read like a copy operation, not a factory.
+    // TEST-MIRROR: ../../../Hellion Build test/_Helpers/TellTargetCloneTests.cs
+    // ---------------------------------------------------------------
+    public TellTarget Clone() => new(Name, World, ContentId, Reason);
 }
@@ -1,46 +1,42 @@
 <Project Sdk="Dalamud.NET.Sdk/15.0.0">
    <PropertyGroup>
-        <!-- Hellion Chat versioning runs separately from upstream Chat 2.
-             0.1.0 is our bootstrap release; the underlying Chat 2 base is
-             called out in the yaml changelog so users can see what it
-             derives from. -->
-        <Version>1.3.0</Version>
+        <!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
+        <Version>1.5.5</Version>
        <ImplicitUsings>enable</ImplicitUsings>
        <Nullable>enable</Nullable>
-        <!-- Honor packages.lock.json on restore so floating version ranges
-             don't silently drift between machines or CI runs. -->
+        <!-- Use lock file to pin exact versions -->
        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        <!-- v1.0.0 standalone cut — both AssemblyName and RootNamespace
-             are HellionChat. The plugin no longer maintains source-level
-             cherry-pick compatibility with upstream Infiziert90/ChatTwo;
-             upstream changes are integrated manually if at all. -->
+        <!-- v1.0.0+: standalone fork, no upstream cherry-pick compatibility -->
        <AssemblyName>HellionChat</AssemblyName>
        <RootNamespace>HellionChat</RootNamespace>
    </PropertyGroup>

    <ItemGroup>
-        <!-- Closed ranges on packages with breaking-change history block a
-             surprise major bump when the lock file is regenerated. The
-             lock file pins the exact version per build; the upper bound
-             keeps the unlock path from drifting across major lines. -->
+        <!-- Closed ranges prevent surprise major bumps during lock file regeneration -->
        <PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
-        <!-- Override the transitively-referenced native SQLite build to one
-             that ships SQLite >= 3.50.3 (CVE-2025-6965 memory corruption,
-             CVE-2025-7709 fixed in 3.50.x). Microsoft.Data.Sqlite 10.0.7
-             pulls SQLitePCLRaw 2.1.11 which carries the older lib; pinning
-             the lib package directly forces the newer native binary
-             without a major bump on the managed wrapper. -->
+        <!-- v1.5.0 DI-container foundation; matches Lightless pin (Hosting 10.0.7) -->
+        <PackageReference
+            Include="Microsoft.Extensions.DependencyInjection"
+            Version="[10.0.7, 11.0.0)"
+        />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="[10.0.7, 11.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="[10.0.7, 11.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="[10.0.7, 11.0.0)" />
+        <!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
        <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
        <PackageReference Include="morelinq" Version="4.4.0" />
+        <!-- NAudio.WinMM 2.2.1 MIT - WaveOutEvent/WinMM path is Wine-safe (WaveOut works under Wine,
+             Media-Foundation-based codecs do not). Using the sub-package avoids pulling in
+             NAudio.WinForms (which requires WindowsDesktop and does not build on Linux hosts).
+             WaveOutEvent and WaveFileReader both live in NAudio.WinMM + NAudio.Core. -->
+        <PackageReference Include="NAudio.WinMM" Version="2.2.1" />
        <PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" />
        <PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12, 4.0.0)" />
    </ItemGroup>

    <ItemGroup>
-        <!-- Pure-function test suites in HellionChat.Tests need access to
-             the internal helper classes (StringUtil, UriPayload, Tokenizer
-             etc.). Test assembly does not get redistributed. -->
+        <!-- Test assembly needs access to internal helpers (not redistributed) -->
        <InternalsVisibleTo Include="HellionChat.Tests" />
    </ItemGroup>

@@ -59,40 +55,40 @@
        </EmbeddedResource>
    </ItemGroup>

-    <!-- HellionChat — Hellion-specific resource bundle (HellionStrings.resx
-         + HellionStrings.<lang>.resx) is picked up automatically by the SDK
-         default include. Designer.cs is hand-maintained, no auto-gen needed. -->
-
-    <!-- Bundled Hellion font (Exo 2, OFL-1.1). Embedded as a manifest
-         resource with a fixed LogicalName so FontManager can pull the
-         bytes back at runtime via AddFontFromMemory. The OFL license
-         text travels with it inside the assembly to satisfy the
-         "license must be distributed with the font" clause. -->
+    <!-- Embedded resources: bundled UI font (Inter Light, OFL-1.1) + manifest resource -->
    <ItemGroup>
-        <EmbeddedResource Include="Resources\HellionFont.ttf">
-            <LogicalName>HellionFont.ttf</LogicalName>
+        <EmbeddedResource Include="Resources\Inter-Light.ttf">
+            <LogicalName>Inter-Light.ttf</LogicalName>
        </EmbeddedResource>
-        <EmbeddedResource Include="Resources\HellionFont-OFL.txt">
-            <LogicalName>HellionFont-OFL.txt</LogicalName>
+        <EmbeddedResource Include="Resources\Inter-OFL.txt">
+            <LogicalName>Inter-OFL.txt</LogicalName>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Resources\Branding\fox-banner.png">
+            <LogicalName>HellionChat.Branding.fox-banner.png</LogicalName>
+        </EmbeddedResource>
+        <!-- Bundled custom notification sounds, Mono 44.1 kHz 16-bit PCM WAV (Wine-safe) -->
+        <EmbeddedResource Include="Resources\Sounds\notification-1.wav">
+            <LogicalName>HellionChat.Sounds.notification-1.wav</LogicalName>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Resources\Sounds\notification-2.wav">
+            <LogicalName>HellionChat.Sounds.notification-2.wav</LogicalName>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Resources\Sounds\notification-3.wav">
+            <LogicalName>HellionChat.Sounds.notification-3.wav</LogicalName>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Resources\Branding\fox-mini.txt">
+            <LogicalName>HellionChat.Branding.fox-mini.txt</LogicalName>
        </EmbeddedResource>
        <EmbeddedResource Include="Themes\Builtin\example-theme.json">
            <LogicalName>HellionChat.Themes.Builtin.example-theme.json</LogicalName>
        </EmbeddedResource>
    </ItemGroup>

-
-    <!-- Plugin icon. Copy images/* into the build output so Dalamud
-         finds the icon next to the DLL, and let the SDK default
-         DalamudPackager pipeline include the same path in the
-         release ZIP. Earlier we shipped a custom DalamudPackager
-         targets override that explicitly set HandleImages and
-         ImagesPath; that override conflicted with the SDK 15
-         default and the resulting manifest carried no IconUrl.
-         Removed in v0.5.2. -->
+    <!-- Plugin icon: copy images/* to output for Dalamud discovery. ASCII
+         study folder is source-only material, no need to ship it. -->
    <ItemGroup>
-        <None Include="images\**">
+        <None Include="images\**" Exclude="images\ascii\**">
            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
        </None>
    </ItemGroup>
-
 </Project>
@@ -1,115 +1,216 @@
 name: Hellion Chat
-author: JonKazama-Hellion
-punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2)
+author: Jon Kazama (Hellion Forge)
+punchline: A Hellion Forge plugin — privacy-focused chat replacement for FFXIV, built for EU, US and JP data rules.
 description: |-
-  Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV
-  based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally
-  removed (the optional webinterface) and a stack of privacy controls is
-  added on top. Tabs, channel filters, RGB colours, emotes, screenshot
-  mode, IPC integration and the chat replacement window itself work the
-  same. The webinterface is intentionally not part of Hellion Chat because
-  it serves a different use case from the smaller default footprint this
-  plugin is built around.
+    Chat replacement for FINAL FANTASY XIV with privacy controls built around
+    EU, US and JP data-protection rules.

-  On top of that, Hellion Chat adds privacy and data-handling controls
-  designed to align with the modern data protection rules that apply
-  across the EU, the United States and Japan. By default only your own
-  conversations are stored; messages from strangers, NPCs and system
-  spam stay out of the database. Retention windows are configurable per
-  channel, history can be wiped retroactively, and stored data can be
-  exported on demand.
+    By default only your own conversations are stored. Public chat, NPC
+    dialogue and system messages stay out of the database unless you opt in.
+    Retention windows are configurable per channel, history can be wiped
+    retroactively, and everything can be exported on demand.

-  Key privacy and data-handling features:
+    Features:
+    - Channel whitelist with a Privacy-First default
+    - Per-channel retention with a daily background sweep
+    - Retroactive cleanup (Ctrl+Shift confirm)
+    - Export to Markdown, JSON or CSV
+    - First-run wizard with four preset profiles
+    - Multi-language UI (24 locales) with live language switching
+    - Own config and database — no shared state with other plugins

-  - Channel whitelist with a Privacy-First default
-  - Per-channel retention with a daily background sweep
-  - Retroactive cleanup with a Ctrl+Shift confirm
-  - Export to Markdown, JSON or CSV
-  - First-run wizard with three preset profiles (Privacy-First, Casual,
-    Full History)
-  - Bilingual UI (English and German) with live language switching
-  - Independent plugin state — own config file and database directory,
-    so Hellion Chat does not share state with upstream Chat 2
-
-  v1.1.0 — Theme engine with five built-in themes (Hellion Arctic,
-  Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove) plus
-  JSON-based custom-theme authoring. Settings rebuilt around a card
-  grid with section detail views. See docs/THEME-AUTHORING.md.
-
-  v1.2.3 — Theme catalogue grown to nine built-in themes:
-  Hellion Arctic, Hellion Spectrum (CVD-safe Deuteran/Protan),
-  Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove,
-  Night Blue, Indigo Violet, Forge Merchantman.
-
-  v1.3.0 First plugin integration cycle. Honorific custom titles
-  are shown in the chat header above the message log, with auto-detect
-  and silent fallback when Honorific is not installed.
-
-  Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
-
-  Modding & support: join the Hellion Forge Discord at
-  https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
-  other Hellion Online Media plugins/tools.
-repo_url: https://github.com/JonKazama-Hellion/HellionChat
+    Based on Chat 2 by Infi and Anna (EUPL-1.2).
+    Support: https://discord.gg/X9V7Kcv5gR
+repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
 accepts_feedback: true
-icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png
+icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
 image_urls:
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/chatWindow.png
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/settingsOverview.png
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/themesPicker.png
+    - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
+    - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png
+    - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png
 tags:
-  - Social
-  - UI
-  - Chat
-  - Replacement
-  - Privacy
+    - Social
+    - UI
+    - Chat
+    - Replacement
+    - Privacy
 changelog: |-
-  **Hellion Chat 1.3.0 - Plugin Integrations: Honorific**
+    **v1.5.5 — Upstream-Sync Tab-Features (2026-05-21)**

-  First step on the plugin-integration roadmap. HellionChat now
-  listens to Honorific and shows your custom title in the chat
-  header. The slot auto-hides when Honorific is not installed,
-  when no custom title is active, or when you are using the
-  original FFXIV title.
+    A backlog-sync cycle: inherited tab-feature items plus a new fox
+    banner image and custom notification sounds.

-  - New "Integrations" settings tab
-  - Honorific integration with auto-detection and live updates
-  - "Coming soon" preview of the next five planned integrations:
-    context menu actions, smart notifications, RP status block,
-    ExtraChat channels, and quick DM compose
-  - Maintainer attribution buttons for Honorific repo and Caraxi
-  - New service-class pattern under HellionChat/Integrations/
+    User-visible:

-  Modding and support: join Hellion Forge - https://discord.gg/X9V7Kcv5gR
+    - Failed tells now raise a warning toast when a message you sent
+      could not be delivered (recipient offline, in an instance, or
+      blocking you). Toggle in Settings, Chat tab.
+    - Per-tab notification sound: each tab can play a sound when a
+      message arrives while you are looking at a different tab. Pick
+      one of the 16 game chat sounds or one of three bundled Hellion
+      sounds, with a preview button to hear it. Off by default,
+      respects the global sound toggle.
+    - The tab rename field in the right-click menu now focuses
+      itself when the menu opens and accepts up to 512 characters,
+      matching the settings-tab rename.
+    - A jump-to-latest button appears in the chat log header while
+      you are scrolled up from the live end.
+    - Map flags and item links can be inserted into the chat input
+      from its right-click menu.
+    - The Hellion Forge fox banner in the first-run wizard and the
+      Information tab is now a real image instead of ASCII art.

-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+    Schema bumped to v18 (additive fields only, no data migration).

-  **Hellion Chat 1.2.3 — Theme Expansion**
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).

-  Four new built-in themes round out the picker. No engine changes,
-  no settings touched — just more colour options.
+    ---

-  - **Night Blue** — Royal Blue on deep marine. Cool tech-dashboard
-    mood, distinct from the brand themes.
-  - **Indigo Violet** — Royal Violet on deep indigo with a turquoise-
-    mint counter for an aurora glitter feel. Sister to Event Horizon
-    but darker and denser; the turquoise accent keeps the two
-    distinguishable.
-  - **Forge Merchantman** — Patina bronze on workshop slate, warm
-    amber counter. Hellion Forge given a theme of its own — sister
-    to Hellion Arctic but greener and warmer instead of cold cyan.
-  - **Hellion Spectrum** — Deuteran/Protan-safe channel colours
-    using Wong/Okabe-Ito palette tones. Channel identity (Tell pink,
-    Yell yellow, Shout orange, Party blue, FC green) is preserved;
-    tones are chosen so each channel stays distinguishable under
-    red-green colour vision deficiency. Covers the ~99% of CVD cases
-    that are red-green.
+    **v1.5.4 — Polish and Motion (2026-05-20)**

-  No schema bump, no migration. Default theme is unchanged (Hellion
-  Arctic). Existing custom themes keep working.
+    A polish cycle: smoother theme switching, faster theme and tab
+    access, and subtle hover motion. Three P3 items plus an
+    accessibility toggle.

-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+    User-visible:

-  ---
+    - Theme switches now crossfade smoothly over ~300 ms across every
+      Hellion-rendered surface — sidebar, title, buttons, tabs,
+      scrollbar, separators. The window background snaps deliberately
+      so the per-window opacity override from Dalamud's pinning menu
+      stays untouched.
+    - New header quick-picker: a palette button left of the cog opens
+      a compact popup with two sections — every built-in and custom
+      theme, and every tab. The active entry carries a check glyph;
+      clicking another switches without closing the popup.
+    - Sidebar icons ease their opacity on hover, and card-mode message
+      borders highlight per tab while the cursor is over their rows.
+      Framerate-independent, so a stalled Wine frame cannot overshoot
+      the animation.
+    - New "Reduce motion" toggle in Theme & Layout disables the
+      crossfade, the hover animations and the unread-tab pulse for
+      users who prefer a static UI.

-  Earlier history: https://github.com/JonKazama-Hellion/HellionChat/releases
+    Under the hood:
+
+    - Two pure-helper lerp paths (ThemeAbgrCacheLerp, FrameLerp) with
+      xUnit coverage in the Build Suite, plus a ColourUtil.ApplyAlpha
+      alpha modulator. Two new /xlperf self-test steps pin the
+      crossfade and quick-picker contracts.
+
+    No schema bump, no migration. Migration v17 stays.
+
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+    ---
+
+    **v1.5.3 — Localisation Wave + Bundled-Font Overhaul (2026-05-19)**
+
+    Multi-language pass plus a long-standing first-frame HITCH lands
+    as a side effect of a font-stack rewrite.
+
+    User-visible:
+
+    - 24 selectable UI languages (was 2). Catalan, Czech, Danish,
+      Dutch, English, Finnish, French, German, Greek, Hungarian,
+      Italian, Japanese, Korean, Norsk bokmål, Polish, Portuguese
+      (BR + PT), Romanian, Russian, Spanish, Swedish, Turkish,
+      Ukrainian, Simplified + Traditional Chinese. Sorted by endonym,
+      "None" pinned first. Non-native locales are AI-assisted and
+      flagged for native-speaker review via the Forge Discord.
+    - Bundled Inter Light replaces Exo 2 (SIL OFL 1.1, 343 KB). The
+      Inter font ships Latin Extended-A/B, Greek polytonic and
+      Cyrillic Supplement coverage; NotoSansCjkRegular joins as a
+      third merge layer for Hangul and Simplified-Han glyphs the
+      FFXIV Japanese game font does not ship.
+    - First-frame HITCH dropped from ~74 ms (v1.5.2 baseline that
+      held since v1.4.x) to a median of ~20 ms (5-reload sample
+      17.9-23.6 ms, Linux/Wine). The bundled-font path silently
+      fell back to the FFXIV Axis font for the entire v1.5.x series
+      because of an early-return in the draw loop. The fix that
+      routes RegularFont through draw also lands the defer-pattern
+      win the v1.5.1 cycle was reaching for.
+    - ExtraGlyphRanges auto-activates on language change. Korean,
+      ChineseFull and the two new flags (LatinExtended, Greek) toggle
+      on without a manual visit to Fonts and Colours.
+    - New WarningText under the language dropdown notes FFXIV's
+      chat input only fully supports EN/DE/FR/JA character sets.
+      Other languages render in HellionChat but may garble when
+      typed into in-game chat.
+
+    Under the hood:
+
+    - Three-layer font stack: Inter Light primary, FFXIV
+      JapaneseFont merge 1 for kana/kanji style, NotoSansCjkRegular
+      merge 2 for everything else CJK.
+    - LanguageOverride enum gains ten locales plus three previously
+      commented out (Italian, Korean, Norwegian as `nb`). New
+      values append to the enum so existing config integers stay
+      stable across update.
+    - Crowdin gap closed: four post-sync ChatTwo keys backfilled
+      into 13 legacy locales with per-key AI markers.
+    - Plugin.LoadAsync runs a one-shot migration that ORs in the
+      matching ExtraGlyphRanges flag for users already on a
+      non-default language. Settings.Apply auto-activates on
+      change going forward.
+    - Em-dash sweep across the EN source and 18 translations to the
+      house style. Russian and Ukrainian keep the typographic norm.
+
+    Migration v17 stays. UseHellionFont users transition from Exo 2
+    to Inter Light transparently on first reload.
+
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+    ---
+
+    **v1.5.2 — First-Run Wizard Rework (2026-05-18)**
+
+    UX patch. The first-run wizard becomes a four-step flow with a
+    new Roleplay privacy profile and a power-settings step that
+    surfaces previously-hidden defaults. Existing v1.5.1 users see
+    the new wizard once on first v1.5.2 boot.
+
+    What changes user-visible:
+
+    - Wizard navigation: Welcome → Privacy profile → Power settings
+      → Done. Forge-Bronze pagination dots, dedicated stage for the
+      power settings so they are no longer buried in Settings.
+    - Fourth privacy profile "Roleplay": Privacy-First plus Say and
+      both emote types, with a 30-day window for Say and a 90-day
+      window for emotes. Shout, Yell and Novice Network stay out.
+    - Privacy picker becomes a 2x2 grid. Casual stays the
+      recommended option with a ★ marker.
+    - Power-settings step covers Load Previous Session, Filter
+      Include Previous Sessions, Auto-Tell-Tabs History Preload,
+      Compact Density, Prettier Timestamps and a built-in theme
+      picker. All six map to existing Configuration fields — no new
+      settings introduced.
+    - Staged commit: the wizard only writes to Config on the Finish
+      step. Decide-later or X-close at any point leaves the existing
+      config untouched.
+    - Inline test hint on the done step: "type /tell <Player Name>
+      into chat" surfaces the auto-tell-tab spawn mechanism.
+    - Window starts at 720x480 (was 900x560) and can shrink to
+      600x400; Step 1 keeps the fox banner in a folded TreeNode so
+      the onboarding copy stays primary.
+    - Existing users get the new wizard surfaced once on first boot
+      after the update via the new WizardLastShownVersion config
+      field. Future cycles bump the constant only when the wizard
+      itself changes shape.
+
+    Under the hood:
+
+    - WizardStateSmokeStep added to /xlperf alongside the FontManager
+      and ThemeSwitch self-tests.
+    - Twelve new pure-helper xUnit Facts in the Build Suite cover
+      all four privacy profile sets and their retention overrides.
+
+    Migration v17 stays (no schema bump). The Configuration grows
+    one optional string field (WizardLastShownVersion) which
+    defaults to empty for legacy users.
+
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+    ---
+
+    Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
@@ -0,0 +1,103 @@
+using Dalamud.Plugin;
+using HellionChat.Integrations;
+using HellionChat.Ipc;
+using HellionChat.Themes;
+using Microsoft.Extensions.Hosting;
+
+namespace HellionChat.Infrastructure.Hosting;
+
+// Adapter shells around IHostedService so the host triggers each service's
+// existing init method without touching the service class itself. Empty
+// adapters still earn their place: registering them forces an eager resolve
+// at Build, which runs the service ctor (IPC subscribe etc.) right then
+// instead of lazily on first GetRequiredService.
+
+internal sealed class ThemeRegistryInitHostedService(ThemeRegistry registry) : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        // Materialise the lazy AllCustom enumerable so the slug lookup hits a
+        // warm cache; otherwise the first Switch falls through to the built-in
+        // default when Config.Theme points at a custom slug.
+        foreach (var _ in registry.AllCustom()) { }
+        registry.SwitchSilent(Plugin.Config.Theme);
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+// IPC subscribers do their wiring in the ctor, so StartAsync stays empty —
+// the registration alone forces an eager resolve which runs that wiring.
+
+internal sealed class IpcManagerInitHostedService(IpcManager ipc) : IHostedService
+{
+    private readonly IpcManager _ipc = ipc;
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class TypingIpcInitHostedService(TypingIpc typingIpc) : IHostedService
+{
+    private readonly TypingIpc _typingIpc = typingIpc;
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class ExtraChatInitHostedService(ExtraChat extraChat) : IHostedService
+{
+    private readonly ExtraChat _extraChat = extraChat;
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class MessageManagerInitHostedService(
+    IDalamudPluginInterface pluginInterface,
+    MessageManager manager
+) : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        // FilterAllTabsAsync rebuilds the per-tab view from the message store;
+        // on Boot, tabs come up empty and the first chat events fill them, so
+        // we skip the rebuild to avoid a pointless full-history scan.
+        if (pluginInterface.Reason is not PluginLoadReason.Boot)
+            manager.FilterAllTabsAsync();
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class AutoTellTabsServiceInitHostedService(AutoTellTabsService service)
+    : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        service.Initialize();
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+// Eager-resolve trigger: resolving FailedTellNotifier in this adapter's ctor
+// enables its game hook during host startup. StartAsync itself is a no-op.
+internal sealed class FailedTellNotifierInitHostedService(FailedTellNotifier notifier)
+    : IHostedService
+{
+    // No-op adapter: the ctor dependency above is the actual eager-resolve
+    // trigger. Field kept to match the IpcManager/TypingIpc/ExtraChat no-op
+    // adapters and to avoid the CS9113 unread-parameter warning.
+    private readonly FailedTellNotifier _notifier = notifier;
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
@@ -0,0 +1,64 @@
+using System.Text;
+using Dalamud.Plugin.Services;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat.Infrastructure.Logging;
+
+internal sealed class DalamudLogger : ILogger
+{
+    private readonly string _name;
+    private readonly IPluginLog _pluginLog;
+
+    public DalamudLogger(string name, IPluginLog pluginLog)
+    {
+        _name = name;
+        _pluginLog = pluginLog;
+    }
+
+    IDisposable? ILogger.BeginScope<TState>(TState state) => default!;
+
+    // Filtering happens in Dalamud's /xllog. Letting every level through keeps
+    // the HellionChat side stateless; if we ever want a per-plugin floor we add
+    // a Config.LogLevel and tighten this method.
+    public bool IsEnabled(LogLevel logLevel) => true;
+
+    public void Log<TState>(
+        LogLevel logLevel,
+        EventId eventId,
+        TState state,
+        Exception? exception,
+        Func<TState, Exception?, string> formatter
+    )
+    {
+        if (!IsEnabled(logLevel))
+            return;
+
+        // U+200B between the bracket and the level is a quiet provenance
+        // marker; byte-distinguishable from any 1:1 port of this format.
+        if ((int)logLevel <= (int)LogLevel.Information)
+        {
+            _pluginLog.Information($"[{_name}]{{{(int)logLevel}}} {state}");
+            return;
+        }
+
+        var sb = new StringBuilder();
+        sb.Append($"[{_name}]{{{(int)logLevel}}} {state} {exception?.Message}");
+        if (!string.IsNullOrWhiteSpace(exception?.StackTrace))
+            sb.AppendLine(exception.StackTrace);
+
+        var inner = exception?.InnerException;
+        while (inner != null)
+        {
+            sb.AppendLine($"InnerException {inner}: {inner.Message}");
+            sb.AppendLine(inner.StackTrace);
+            inner = inner.InnerException;
+        }
+
+        if (logLevel == LogLevel.Warning)
+            _pluginLog.Warning(sb.ToString());
+        else if (logLevel == LogLevel.Error)
+            _pluginLog.Error(sb.ToString());
+        else
+            _pluginLog.Fatal(sb.ToString());
+    }
+}
@@ -0,0 +1,84 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using Dalamud.Plugin.Services;
+using HellionChat.Branding;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat.Infrastructure.Logging;
+
+[ProviderAlias("Dalamud")]
+public sealed class DalamudLoggingProvider : ILoggerProvider
+{
+    // Hellion Forge Bronze (#C2410C). Mixed into the bootstrap fingerprint.
+    private const string HellionMarker = "HellionForgeBronzeC2410C";
+
+    private readonly ConcurrentDictionary<string, DalamudLogger> _loggers = new(
+        StringComparer.OrdinalIgnoreCase
+    );
+
+    private readonly IPluginLog _pluginLog;
+
+    public DalamudLoggingProvider(IPluginLog pluginLog)
+    {
+        _pluginLog = pluginLog;
+        EmitBootstrapBanner();
+    }
+
+    // One-shot per plugin load. Intentionally visible in xllog so uncredited
+    // ports of the DalamudLogger trio keep announcing their origin — the
+    // mini fox silhouette goes first, then the textual provenance line.
+    private void EmitBootstrapBanner()
+    {
+        var version =
+            typeof(DalamudLoggingProvider).Assembly.GetName().Version?.ToString() ?? "0.0.0";
+        var fingerprint = ComputeFingerprint(version);
+
+        foreach (var line in HellionForgeAscii.FoxMini.Split('\n'))
+        {
+            var trimmed = line.TrimEnd('\r');
+            if (trimmed.Length > 0)
+                _pluginLog.Information(trimmed);
+        }
+
+        _pluginLog.Information("by Julia Moon - Hellion Forge");
+        _pluginLog.Information(
+            $"HellionChat DI-Logger bootstrap v{version} fingerprint={fingerprint}"
+        );
+    }
+
+    private static string ComputeFingerprint(string version)
+    {
+        var seed = Encoding.UTF8.GetBytes($"{HellionMarker}-{version}");
+        var hash = SHA256.HashData(seed);
+        var sb = new StringBuilder(8);
+        for (var i = 0; i < 4; i++)
+            sb.Append(hash[i].ToString("x2"));
+        return sb.ToString();
+    }
+
+    public ILogger CreateLogger(string categoryName)
+    {
+        // Category-name normalisation mirrors Lightless: take the leaf type
+        // name, then either ellipsis-trim long ones or left-pad short ones to
+        // 15 chars so the xllog column stays aligned across services.
+        var catName = categoryName.Split(".", StringSplitOptions.RemoveEmptyEntries).Last();
+        if (catName.Length > 15)
+            catName = string.Concat(
+                catName.AsSpan(0, 6),
+                "...",
+                catName.AsSpan(catName.Length - 6, 6)
+            );
+        else
+            catName = catName.PadLeft(15);
+
+        return _loggers.GetOrAdd(catName, name => new DalamudLogger(name, _pluginLog));
+    }
+
+    public void Dispose()
+    {
+        _loggers.Clear();
+        GC.SuppressFinalize(this);
+    }
+}
@@ -0,0 +1,23 @@
+using Dalamud.Plugin.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat.Infrastructure.Logging;
+
+public static class DalamudLoggingProviderExtensions
+{
+    public static ILoggingBuilder AddDalamudLogging(
+        this ILoggingBuilder builder,
+        IPluginLog pluginLog
+    )
+    {
+        builder.ClearProviders();
+        builder.Services.TryAddEnumerable(
+            ServiceDescriptor.Singleton<ILoggerProvider, DalamudLoggingProvider>(
+                _ => new DalamudLoggingProvider(pluginLog)
+            )
+        );
+        return builder;
+    }
+}
@@ -2,14 +2,9 @@ using System.Collections.Generic;

 namespace HellionChat;

-// Hellion Chat — v0.6.0 shared input history. Replaces the embedded
-// ChatLogWindow.InputBacklog so that pop-out windows with their own
-// ChatInputBar can navigate the same Up/Down history as the main window.
-// Index semantics are kept identical to the v0.5.x InputBacklog:
-//   index 0          = oldest entry
-//   index Count - 1  = newest entry
-// Push performs move-to-newest deduplication: existing entries are
-// removed before the new one is appended at the end.
+// Shared input history for all ChatInputBars (main and pop-out windows).
+// Push deduplicates: existing entries are moved to the end when re-added.
+// TEST-MIRROR: ../../Hellion Build test/Util/InputHistoryServiceTests.cs
 public static class InputHistoryService
 {
    private const int MaxSize = 30;
@@ -26,8 +21,7 @@ public static class InputHistoryService

        var trimmed = entry.Trim();

-        // Move-to-newest: existing entries are removed before the append
-        // so the same line typed twice does not occupy two history slots.
+        // Move-to-newest: remove existing entry before adding at the end
        for (var i = 0; i < _entries.Count; i++)
        {
            if (_entries[i] == trimmed)
@@ -48,4 +42,12 @@ public static class InputHistoryService
            return null;
        return _entries[cursor];
    }
+
+    // Plugin reload doesn't reset static state automatically. Plugin.DisposeAsync
+    // calls this so the next load starts with an empty history instead of
+    // inheriting the previous session's entries.
+    public static void Reset()
+    {
+        _entries.Clear();
+    }
 }
@@ -0,0 +1,146 @@
+using System;
+using System.IO;
+using Microsoft.Extensions.Logging;
+using NAudio.Wave;
+
+namespace HellionChat.Integrations;
+
+// Plays the three bundled WAV notification sounds via NAudio WaveOutEvent.
+// WaveOutEvent/WinMM is the correct backend for FFXIV on Wine: it works
+// without Media Foundation (which Wine does not support for MP3/AAC).
+//
+// Volume is fixed at 0.8. No per-user slider in this iteration so we can
+// ship quickly and gather feedback before adding UX complexity.
+internal sealed class CustomAudioPlayer : IDisposable
+{
+    // Sound bytes are read once at construction so each Play() wraps a fresh
+    // MemoryStream rather than re-reading the manifest stream (which becomes
+    // unreadable after the first read and would require Seek support).
+    private readonly byte[][] _soundData;
+    private readonly ILogger<CustomAudioPlayer> _logger;
+
+    private WaveOutEvent? _outputDevice;
+    private WaveFileReader? _reader;
+    private readonly object _lock = new();
+
+    public CustomAudioPlayer(ILogger<CustomAudioPlayer> logger)
+    {
+        _logger = logger;
+        _soundData = new byte[3][];
+
+        for (var i = 0; i < 3; i++)
+        {
+            var resourceName = $"HellionChat.Sounds.notification-{i + 1}.wav";
+            using var stream = typeof(CustomAudioPlayer).Assembly.GetManifestResourceStream(
+                resourceName
+            );
+            if (stream is null)
+            {
+                _logger.LogWarning(
+                    "Embedded sound resource not found: {Resource}. "
+                        + "Custom sound {Index} will be silent.",
+                    resourceName,
+                    i + 1
+                );
+                _soundData[i] = Array.Empty<byte>();
+                continue;
+            }
+
+            using var ms = new MemoryStream();
+            stream.CopyTo(ms);
+            _soundData[i] = ms.ToArray();
+        }
+    }
+
+    // customIndex is 1, 2, or 3, matching the sound file suffix.
+    // Stops any currently playing sound before starting the new one.
+    // NAudio playback runs on its own thread; this method returns immediately.
+    public void Play(int customIndex)
+    {
+        if (customIndex < 1 || customIndex > 3)
+        {
+            _logger.LogWarning(
+                "CustomAudioPlayer.Play called with out-of-range index {Index}",
+                customIndex
+            );
+            return;
+        }
+
+        var data = _soundData[customIndex - 1];
+        if (data.Length == 0)
+        {
+            _logger.LogWarning(
+                "Sound data for index {Index} is empty; skipping playback",
+                customIndex
+            );
+            return;
+        }
+
+        lock (_lock)
+        {
+            try
+            {
+                StopCurrent();
+
+                var ms = new MemoryStream(data, writable: false);
+                _reader = new WaveFileReader(ms);
+
+                _outputDevice = new WaveOutEvent();
+                // Init opens the device and creates the WinMM handle. Volume
+                // must be set after Init, otherwise waveOutSetVolume fails with
+                // InvalidHandle.
+                _outputDevice.Init(_reader);
+                _outputDevice.Volume = 0.8f;
+                _outputDevice.Play();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(
+                    ex,
+                    "Failed to play custom notification sound {Index}",
+                    customIndex
+                );
+                StopCurrent();
+            }
+        }
+    }
+
+    // Stops and tears down the active WaveOutEvent + WaveFileReader without
+    // throwing. Called on Play (to interrupt previous sound) and from Dispose.
+    // Guards Stop() with a PlaybackState check because waveOutReset blocks even
+    // when playback already finished; under Wine this can stall the WinMM
+    // callback thread if many sounds arrive in quick succession.
+    private void StopCurrent()
+    {
+        try
+        {
+            if (_outputDevice?.PlaybackState == PlaybackState.Playing)
+                _outputDevice.Stop();
+            _outputDevice?.Dispose();
+            _outputDevice = null;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Exception while stopping current WaveOutEvent");
+        }
+
+        try
+        {
+            _reader?.Dispose();
+            _reader = null;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Exception while disposing WaveFileReader");
+        }
+    }
+
+    // At plugin unload the PendingMessageThread is already cancelled and the
+    // draw loop is gone, so _lock is uncontended here. Calling StopCurrent
+    // outside the lock avoids holding it across the blocking waveOutReset /
+    // WaveOutEvent.Dispose, which can freeze on Wine during unload.
+    public void Dispose()
+    {
+        StopCurrent();
+    }
+}
@@ -0,0 +1,74 @@
+using System;
+using Dalamud.Hooking;
+using Dalamud.Interface.ImGuiNotification;
+using FFXIVClientStructs.FFXIV.Client.System.String;
+using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using HellionChat._Helpers;
+using HellionChat.Resources;
+using HellionChat.Util;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat.Integrations;
+
+// A minimal, failed-tell-specific game hook. A locale-robust "tell failed"
+// signal is not reachable over the processed message stream (Message carries
+// no LogMessage row id, ChatCode 60 is too broad). This hooks the one
+// ShowLogMessageString overload and toasts on a pinned id set. It is NOT the
+// broad ad-block hook layer.
+internal sealed class FailedTellNotifier : IDisposable
+{
+    private readonly ILogger<FailedTellNotifier> _logger;
+    private readonly Hook<RaptureLogModule.Delegates.ShowLogMessageString>? _hook;
+
+    public unsafe FailedTellNotifier(ILogger<FailedTellNotifier> logger)
+    {
+        _logger = logger;
+
+        // Creating/enabling a hook is safe off the framework thread (the
+        // ctor runs during host startup on the framework thread,
+        // eager-resolved via FailedTellNotifierInitHostedService).
+        _hook =
+            Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.ShowLogMessageString>(
+                RaptureLogModule.MemberFunctionPointers.ShowLogMessageString,
+                ShowLogMessageStringDetour
+            );
+        _hook.Enable();
+    }
+
+    private unsafe void ShowLogMessageStringDetour(
+        RaptureLogModule* module,
+        uint logMessageId,
+        Utf8String* value
+    )
+    {
+        try
+        {
+            if (
+                FailedTellMatcher.ShouldNotify(
+                    logMessageId,
+                    Plugin.Config.NotifyFailedTell,
+                    FailedTellMatcher.FailedTellLogMessageIds
+                )
+            )
+            {
+                var recipient = value is null ? string.Empty : value->ToString();
+                var content = string.IsNullOrEmpty(recipient)
+                    ? HellionStrings.FailedTell_Notification_Generic
+                    : string.Format(HellionStrings.FailedTell_Notification_Named, recipient);
+                WrapperUtil.AddNotification(content, NotificationType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "FailedTellNotifier detour threw");
+        }
+
+        _hook!.Original(module, logMessageId, value);
+    }
+
+    public void Dispose()
+    {
+        _hook?.Disable();
+        _hook?.Dispose();
+    }
+}
@@ -2,75 +2,60 @@ using System;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Ipc;
 using Dalamud.Plugin.Services;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;

 namespace HellionChat.Integrations;

-// We pull Newtonsoft.Json into this single file for IPC compatibility:
-// Honorific serialises its TitleData with Newtonsoft (see
-// Honorific-master/IpcProvider.cs:9 and CustomTitle.cs:12). Using the
-// same library guarantees identical handling of System.Numerics.Vector3?
-// and the enum fields we ignore. Newtonsoft is a transitive dependency
-// via Dalamud, so no new NuGet entry is needed. The rest of HellionChat
-// keeps using System.Text.Json.
+// Newtonsoft.Json is used here for IPC compatibility with Honorific, which
+// serialises TitleData with it. It's a transitive Dalamud dependency — no
+// new NuGet entry needed. The rest of HellionChat uses System.Text.Json.
 internal sealed class HonorificService : IDisposable
 {
    private const string IpcNamespace = "Honorific";

-    // Major version of the Honorific IPC contract HellionChat is built against.
-    // Used both by the runtime compatibility check and by the settings tab when
-    // it tells the user which major version we expected, so the literal lives
-    // in exactly one place.
+    // Major version of the Honorific IPC contract we're built against.
    internal const uint ExpectedApiMajor = 3;

-    // IPC gates we subscribe to. Keep them as fields so Dispose can
-    // unsubscribe the same instances we subscribed in the constructor.
+    // IPC gates — kept as fields so Dispose can unsubscribe the same instances.
    private readonly ICallGateSubscriber<(uint, uint)> _apiVersion;
    private readonly ICallGateSubscriber<string> _getLocalCharacterTitle;
    private readonly ICallGateSubscriber<string, object> _localCharacterTitleChanged;
    private readonly ICallGateSubscriber<object> _ready;
    private readonly ICallGateSubscriber<object> _disposing;

-    private readonly IPluginLog _log;
+    private readonly ILogger<HonorificService> _logger;
    private readonly IFramework _framework;
    private bool _versionWarningLogged;

+    // Thread: framework only — IPC delivery + ImGui render both run there.
    public HonorificTitleData? CurrentTitle { get; private set; }
    public bool IsAvailable { get; private set; }
    public (uint Major, uint Minor)? DetectedApiVersion { get; private set; }

-    public HonorificService(IDalamudPluginInterface pluginInterface, IPluginLog log, IFramework framework)
+    public HonorificService(
+        IDalamudPluginInterface pluginInterface,
+        ILogger<HonorificService> logger,
+        IFramework framework
+    )
    {
        _framework = framework;
-        _log = log;
+        _logger = logger;

-        // Dalamud caches gate objects per-name for the lifetime of the
-        // plugin interface, so we can register subscribers even when
-        // Honorific isn't loaded yet — the gate just won't fire. Calling
-        // InvokeFunc before Honorific is up will throw, which is why the
-        // initial pull below is wrapped in try-catch.
-        //
-        // Thread-context: plugin constructors run on Dalamud's plugin-loader
-        // thread, NOT the framework thread. Honorific's IPC handlers read
-        // ObjectTable.LocalPlayer (Honorific IpcProvider.cs:61), which throws
-        // "Not on main thread!" outside the framework thread. If Honorific is
-        // already loaded when HellionChat starts, a synchronous InvokeFunc
-        // here would surface that exception, the broad catch below would
-        // mark IsAvailable=false, and OnTitleChanged's `if (!IsAvailable)`
-        // gate would block every subsequent title update. We therefore
-        // schedule the initial pull onto the framework thread via
-        // IFramework.RunOnFrameworkThread so the IPC call sees the right
-        // thread context.
-        _apiVersion = pluginInterface
-            .GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
-        _getLocalCharacterTitle = pluginInterface
-            .GetIpcSubscriber<string>($"{IpcNamespace}.GetLocalCharacterTitle");
-        _localCharacterTitleChanged = pluginInterface
-            .GetIpcSubscriber<string, object>($"{IpcNamespace}.LocalCharacterTitleChanged");
-        _ready = pluginInterface
-            .GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
-        _disposing = pluginInterface
-            .GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
+        // Gate objects are cached per-name by Dalamud and safe to register
+        // before Honorific loads — they just won't fire until it does.
+        // Initial pull is scheduled on the framework thread because plugin
+        // constructors run on the loader thread, and Honorific's IPC handlers
+        // read ObjectTable.LocalPlayer which throws off the framework thread.
+        _apiVersion = pluginInterface.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
+        _getLocalCharacterTitle = pluginInterface.GetIpcSubscriber<string>(
+            $"{IpcNamespace}.GetLocalCharacterTitle"
+        );
+        _localCharacterTitleChanged = pluginInterface.GetIpcSubscriber<string, object>(
+            $"{IpcNamespace}.LocalCharacterTitleChanged"
+        );
+        _ready = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
+        _disposing = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");

        _localCharacterTitleChanged.Subscribe(OnTitleChanged);
        _ready.Subscribe(OnReady);
@@ -81,16 +66,14 @@ internal sealed class HonorificService : IDisposable

    public void Dispose()
    {
-        // Honorific may already be gone by the time we dispose. Wrap each
-        // unsubscribe so a missing gate doesn't prevent the others from
-        // unsubscribing — leaking even one subscription leaves a callback
-        // alive that captures `this`, which keeps the whole service alive
-        // and breaks plugin reload.
+        // Wrap each unsubscribe — a missing gate must not block the others.
+        // Leaking a subscription keeps this service alive across plugin reloads.
        TryUnsubscribe(() => _localCharacterTitleChanged.Unsubscribe(OnTitleChanged));
        TryUnsubscribe(() => _ready.Unsubscribe(OnReady));
        TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing));
    }

+    // Thread: framework (scheduled from ctor and OnReady).
    private void TryInitialPull()
    {
        try
@@ -102,10 +85,12 @@ internal sealed class HonorificService : IDisposable
            {
                if (!_versionWarningLogged)
                {
-                    _log.Warning(
-                        "Honorific API version mismatch — expected major 3, " +
-                        "found {Major}.{Minor}. Disabling Honorific integration.",
-                        version.Item1, version.Item2);
+                    _logger.LogWarning(
+                        "Honorific API version mismatch — expected major 3, "
+                            + "found {Major}.{Minor}. Disabling Honorific integration.",
+                        version.Item1,
+                        version.Item2
+                    );
                    _versionWarningLogged = true;
                }
                IsAvailable = false;
@@ -114,67 +99,47 @@ internal sealed class HonorificService : IDisposable

            IsAvailable = true;
            _versionWarningLogged = false;
-            // Pull the current title once at startup; from here on we rely
-            // on LocalCharacterTitleChanged events.
            var json = _getLocalCharacterTitle.InvokeFunc();
            CurrentTitle = ParseTitleJson(json);
        }
        catch (Exception ex)
        {
-            // Honorific isn't installed or hasn't initialised yet. The Ready
-            // event will give us a second chance later. Log at Debug so
-            // users without Honorific don't see noise on every reload.
-            _log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
+            // Honorific not installed or not yet initialised — Ready will retry.
+            _logger.LogDebug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
            IsAvailable = false;
            CurrentTitle = null;
        }
    }

-    // Honorific fires LocalCharacterTitleChanged through its nameplate hook
-    // (Honorific-master/Plugin.cs:665), which means we get title updates on
-    // character switches automatically as soon as the new character is
-    // rendered. While the user is in the character-select menu, HellionChat's
-    // window is hidden by default via HideWhenNotLoggedIn (Configuration.cs:152),
-    // so the stale-title window between logout and login isn't user-visible.
+    // Thread: framework (Dalamud IPC delivery contract).
    private void OnTitleChanged(string json)
    {
-        // Don't update cached state when we've already decided we can't trust
-        // Honorific (e.g. version mismatch). Subscription stays live in case a
-        // compatible Honorific reloads, in which case Ready triggers TryInitialPull
-        // and sets IsAvailable back to true.
-        if (!IsAvailable) return;
+        // Skip updates on version mismatch; subscription stays live for reload.
+        if (!IsAvailable)
+            return;
        CurrentTitle = ParseTitleJson(json);
    }

+    // Thread: any (Honorific dispatches NotifyReady from its own thread).
    private void OnReady()
    {
-        // Honorific loaded after HellionChat; redo the version check and
-        // initial pull. Idempotent on purpose — Honorific can fire Ready
-        // more than once across reloads.
-        //
-        // Honorific's NotifyReady may dispatch from any thread, and
-        // TryInitialPull eventually calls IPC handlers that read
-        // ObjectTable.LocalPlayer — same "Not on main thread!" hazard as
-        // the constructor path. Schedule onto the framework thread.
        _framework.RunOnFrameworkThread(TryInitialPull);
    }

+    // Thread: framework (IPC delivery contract); idempotent — Disposing fires once.
    private void OnDisposing()
    {
-        // Honorific is unloading. Drop our cached state so the header
-        // hides on the next frame; subscriptions stay registered because
-        // the gates may come back later (Honorific reload).
-        //
-        // Race-note: Honorific's NotifyDisposing calls ChangedLocalCharacterTitle(null)
-        // BEFORE SendMessage on the Disposing gate (IpcProvider.cs:109-111),
-        // so OnTitleChanged is expected to fire first and already null out
-        // CurrentTitle. We re-clear here as belt-and-braces; should the
-        // ordering ever flip, ShouldRenderSlot would still gate on IsAvailable.
+        // Honorific unloading — clear cached state so the header hides next frame.
+        // Subscriptions stay registered in case Honorific reloads.
+        // CurrentTitle is already nulled by OnTitleChanged before this fires,
+        // re-clearing here is belt-and-braces.
        CurrentTitle = null;
        IsAvailable = false;
        DetectedApiVersion = null;
    }

+    // Thread: framework (called from Dispose, which runs on the framework
+    // cleanup block in Plugin.DisposeAsync).
    private void TryUnsubscribe(Action unsubscribe)
    {
        try
@@ -183,33 +148,15 @@ internal sealed class HonorificService : IDisposable
        }
        catch (Exception ex)
        {
-            _log.Debug(ex, "Honorific unsubscribe failed (likely already gone).");
+            // Warning not Debug — a silent unsubscribe failure leaks a live
+            // subscription across plugin reloads.
+            _logger.LogWarning(
+                ex,
+                "Honorific unsubscribe failed (likely API break or gate already gone)."
+            );
        }
    }

-    // Threading note: Dalamud fires IPC events on the framework thread and
-    // ImGui renders on the framework thread, so OnTitleChanged and the
-    // render path that reads CurrentTitle never race — OnTitleChanged is
-    // safe to keep direct (no RunOnFrameworkThread wrap needed) because
-    // LocalCharacterTitleChanged delivery is framework-thread by Dalamud
-    // contract. If a future change moves either side onto a worker thread,
-    // switch to volatile/Interlocked for the CurrentTitle field.
-    //
-    // The constructor's initial pull and OnReady, on the other hand, are
-    // explicitly scheduled via IFramework.RunOnFrameworkThread because
-    // they run outside that contract: the constructor executes on the
-    // plugin-loader thread, and Honorific's NotifyReady can dispatch from
-    // any thread. Both call paths eventually invoke IPC handlers that read
-    // ObjectTable.LocalPlayer, which throws "Not on main thread!" off the
-    // framework thread — see the constructor comment block for context.
-    //
-    // Divergence from ChatTwo/Ipc/ExtraChat.cs: that file uses `volatile`
-    // on its state fields out of caution. We don't, because the framework-
-    // thread delivery is the documented Dalamud contract. If the two files
-    // ever need to share a threading audit, this is the place to revisit.
-
-    // --- Pure-logic helpers below; tested via HellionChat.Tests/Integrations. ---
-
    internal static HonorificTitleData? ParseTitleJson(string json)
    {
        if (string.IsNullOrEmpty(json))
@@ -233,13 +180,19 @@ internal sealed class HonorificService : IDisposable
    internal static bool ShouldRenderSlot(
        bool toggleEnabled,
        bool isAvailable,
-        HonorificTitleData? title)
+        HonorificTitleData? title
+    )
    {
-        if (!toggleEnabled) return false;
-        if (!isAvailable) return false;
-        if (title is null) return false;
-        if (title.IsOriginal) return false;
-        if (string.IsNullOrEmpty(title.Title)) return false;
+        if (!toggleEnabled)
+            return false;
+        if (!isAvailable)
+            return false;
+        if (title is null)
+            return false;
+        if (title.IsOriginal)
+            return false;
+        if (string.IsNullOrEmpty(title.Title))
+            return false;
        return true;
    }
 }
@@ -2,16 +2,21 @@ using System.Numerics;

 namespace HellionChat.Integrations;

-// Local DTO mirroring Honorific's TitleData shape. We replicate the structure
-// instead of referencing Honorific.dll because a hard build-time dependency
-// would couple the two assemblies and break HellionChat at load time when
-// Honorific is missing. Glow, Color3, GradientColourSet and GradientAnimationStyle
-// are intentionally omitted — Cycle 1 renders text in the primary Color only;
-// the "Honorific Full Fidelity" backlog item adds them later as a pure
-// extension that won't break this DTO's existing consumers.
+// Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
+// so HellionChat loads cleanly when Honorific is absent.
+//
+// Only Glow is rendered. Color3, GradientColourSet and GradientAnimationStyle
+// are parsed but unused — the animated gradient lives entirely inside Honorific
+// and is not exposed over IPC, so reproducing it here would mean shipping our
+// own copy of Honorific's colour palette. The fields stay in the DTO so the
+// JSON roundtrip remains lossless.
 internal sealed record HonorificTitleData(
    string? Title,
    bool IsPrefix,
    bool IsOriginal,
-    Vector3? Color
+    Vector3? Color,
+    Vector3? Glow,
+    Vector3? Color3,
+    int? GradientColourSet,
+    string? GradientAnimationStyle
 );
@@ -1,12 +1,20 @@
+using System.Runtime.CompilerServices;
+using HellionChat.Util;
+
 namespace HellionChat.Integrations;

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

 namespace HellionChat.Ipc;

 public sealed class ExtraChat : IDisposable
 {
+    private readonly ILogger<ExtraChat> _logger;
+
 #pragma warning disable CS0649 // Assigned through IPC
    [Serializable]
    private struct OverrideInfo
@@ -15,30 +18,46 @@ public sealed class ExtraChat : IDisposable
 #pragma warning restore CS0649

    private ICallGateSubscriber<OverrideInfo, object> OverrideChannelGate { get; }
-    private ICallGateSubscriber<Dictionary<string, uint>, Dictionary<string, uint>> ChannelCommandColoursGate { get; }
-    private ICallGateSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>> ChannelNamesGate { get; }
+    private ICallGateSubscriber<
+        Dictionary<string, uint>,
+        Dictionary<string, uint>
+    > ChannelCommandColoursGate { get; }
+    private ICallGateSubscriber<
+        Dictionary<Guid, string>,
+        Dictionary<Guid, string>
+    > ChannelNamesGate { get; }

    internal (string, uint)? ChannelOverride { get; set; }

-    // Volatile reference: IPC callbacks (OnChannelCommandColours/OnChannelNames) fire on a
-    // Dalamud-dispatcher thread while the ImGui thread reads the IReadOnlyDictionary projections.
-    // Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs
-    // the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01].
+    // volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
+    // Reference assignment is atomic on x64, but the barrier ensures visibility
+    // across threads (especially Mono/Wine). See AUDIT-2026-05-05 [SEC-01].
    private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
-    internal IReadOnlyDictionary<string, uint> ChannelCommandColours => ChannelCommandColoursInternal;
+    internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
+        ChannelCommandColoursInternal;

    private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
    internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;

-    internal ExtraChat()
+    internal ExtraChat(ILogger<ExtraChat> logger)
    {
-        OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>("ExtraChat.OverrideChannelColour");
-        ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<Dictionary<string, uint>, Dictionary<string, uint>>("ExtraChat.ChannelCommandColours");
-        ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>>("ExtraChat.ChannelNames");
+        _logger = logger;
+        OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
+            "ExtraChat.OverrideChannelColour"
+        );
+        ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<
+            Dictionary<string, uint>,
+            Dictionary<string, uint>
+        >("ExtraChat.ChannelCommandColours");
+        ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<
+            Dictionary<Guid, string>,
+            Dictionary<Guid, string>
+        >("ExtraChat.ChannelNames");

        OverrideChannelGate.Subscribe(OnOverrideChannel);
        ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
        ChannelNamesGate.Subscribe(OnChannelNames);
+
        try
        {
            ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
@@ -46,8 +65,8 @@ public sealed class ExtraChat : IDisposable
        }
        catch (Exception ex)
        {
-            // ExtraChat is optional; missing IPC peer is normal when the plugin isn't loaded.
-            Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
+            // ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
+            _logger.LogTrace(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
        }
    }

@@ -60,22 +79,11 @@ public sealed class ExtraChat : IDisposable

    private void OnOverrideChannel(OverrideInfo info)
    {
-        if (info.Channel == null)
-        {
-            ChannelOverride = null;
-            return;
-        }
-
-        ChannelOverride = (info.Channel, info.Rgba);
+        ChannelOverride = info.Channel == null ? null : (info.Channel, info.Rgba);
    }

-    private void OnChannelCommandColours(Dictionary<string, uint> obj)
-    {
+    private void OnChannelCommandColours(Dictionary<string, uint> obj) =>
        ChannelCommandColoursInternal = obj;
-    }

-    private void OnChannelNames(Dictionary<Guid, string> obj)
-    {
-        ChannelNamesInternal = obj;
-    }
+    private void OnChannelNames(Dictionary<Guid, string> obj) => ChannelNamesInternal = obj;
 }
@@ -1,9 +1,17 @@
-using HellionChat.Code;
 using Dalamud.Plugin.Ipc;
+using HellionChat.Code;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ipc;

-using ChatInputState = (bool InputVisible, bool InputFocused, bool HasText, bool IsTyping, int TextLength, ChatType ChannelType);
+using ChatInputState = (
+    bool InputVisible,
+    bool InputFocused,
+    bool HasText,
+    bool IsTyping,
+    int TextLength,
+    ChatType ChannelType
+);

 internal sealed class TypingIpc : IDisposable
 {
@@ -12,17 +20,44 @@ internal sealed class TypingIpc : IDisposable
    private ICallGateProvider<ChatInputState> StateQueryGate { get; }
    private ICallGateProvider<ChatInputState, object?> StateChangedGate { get; }

+    // v1.4.9 R4: ChatTwo IPC compatibility mirror. Some third-party plugins
+    // have a no-fork policy and subscribe only to ChatTwo.*-prefixed IPC
+    // gates. HellionChat replaces ChatTwo (conflict detection prevents
+    // parallel loading), so mirroring the ChatTwo provider slots lets those
+    // plugins keep working without code changes on their side. The tuple
+    // shape is textually identical to ChatTwo's IPC surface (same member
+    // order, same underlying types — ChatType is `ushort` in both repos)
+    // so Dalamud's IPC marshalling matches across plugin boundaries.
+    private ICallGateProvider<ChatInputState> ChatTwoStateQueryGate { get; }
+    private ICallGateProvider<ChatInputState, object?> ChatTwoStateChangedGate { get; }
+
    private ChatInputState LastState;
    private bool HasState;

-    internal TypingIpc(Plugin plugin)
+    private readonly ILogger<TypingIpc> _logger;
+
+    internal TypingIpc(Plugin plugin, ILogger<TypingIpc> logger)
    {
        Plugin = plugin;
+        _logger = logger;

-        StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>("HellionChat.GetChatInputState");
-        StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>("HellionChat.ChatInputStateChanged");
+        StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
+            "HellionChat.GetChatInputState"
+        );
+        StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>(
+            "HellionChat.ChatInputStateChanged"
+        );
+
+        // v1.4.9 R4: ChatTwo-prefixed compatibility slots (see class-level comment).
+        ChatTwoStateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
+            "ChatTwo.GetChatInputState"
+        );
+        ChatTwoStateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>(
+            "ChatTwo.ChatInputStateChanged"
+        );

        StateQueryGate.RegisterFunc(GetState);
+        ChatTwoStateQueryGate.RegisterFunc(GetState);
    }

    private ChatInputState BuildState()
@@ -30,19 +65,22 @@ internal sealed class TypingIpc : IDisposable
        var log = Plugin.ChatLogWindow;

        var usedChannel = Plugin.CurrentTab.CurrentChannel;
-        var inputChannel = usedChannel.UseTempChannel ? usedChannel.TempChannel : usedChannel.Channel;
+        var inputChannel = usedChannel.UseTempChannel
+            ? usedChannel.TempChannel
+            : usedChannel.Channel;
        var channelType = inputChannel.ToChatType();

-        return (InputVisible: !log.IsHidden,
+        return (
+            InputVisible: !log.IsHidden,
            log.InputFocused,
            HasText: log.Chat.Length > 0,
            IsTyping: log is { InputFocused: true, Chat.Length: > 0 },
            TextLength: log.Chat.Length,
-            ChannelType: channelType);
+            ChannelType: channelType
+        );
    }

-    private ChatInputState GetState()
-        => BuildState();
+    private ChatInputState GetState() => BuildState();

    internal void Update()
    {
@@ -53,10 +91,13 @@ internal sealed class TypingIpc : IDisposable
        HasState = true;
        LastState = state;
        StateChangedGate.SendMessage(state);
+        // v1.4.9 R4: mirror on ChatTwo-prefixed slot for no-fork-policy plugins.
+        ChatTwoStateChangedGate.SendMessage(state);
    }

    public void Dispose()
    {
        StateQueryGate.UnregisterFunc();
+        ChatTwoStateQueryGate.UnregisterFunc();
    }
 }
@@ -1,20 +1,52 @@
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Plugin.Ipc;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

 internal sealed class IpcManager : IDisposable
 {
+    private readonly ILogger<IpcManager> _logger;
+
    private ICallGateProvider<string> RegisterGate { get; }
    private ICallGateProvider<string, object?> UnregisterGate { get; }
    private ICallGateProvider<object?> AvailableGate { get; }
-    private ICallGateProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?> InvokeGate { get; }
+    private ICallGateProvider<
+        string,
+        PlayerPayload?,
+        ulong,
+        Payload?,
+        SeString?,
+        SeString?,
+        object?
+    > InvokeGate { get; }
+
+    // v1.4.9 R4: ChatTwo IPC compatibility mirror. Third-party plugins with
+    // a no-fork policy (e.g. Artisan, AllaganTools) only subscribe to the
+    // ChatTwo.*-prefixed context-menu integration gates. Mirroring all four
+    // provider slots under the ChatTwo namespace lets those plugins keep
+    // working without code changes on their side. Conflict detection
+    // prevents ChatTwo and HellionChat from loading in parallel, so no slot
+    // collision risk.
+    private ICallGateProvider<string> ChatTwoRegisterGate { get; }
+    private ICallGateProvider<string, object?> ChatTwoUnregisterGate { get; }
+    private ICallGateProvider<object?> ChatTwoAvailableGate { get; }
+    private ICallGateProvider<
+        string,
+        PlayerPayload?,
+        ulong,
+        Payload?,
+        SeString?,
+        SeString?,
+        object?
+    > ChatTwoInvokeGate { get; }

    internal List<string> Registered { get; } = [];

-    public IpcManager()
+    public IpcManager(ILogger<IpcManager> logger)
    {
+        _logger = logger;
        RegisterGate = Plugin.Interface.GetIpcProvider<string>("HellionChat.Register");
        RegisterGate.RegisterFunc(Register);

@@ -23,14 +55,56 @@ internal sealed class IpcManager : IDisposable
        UnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>("HellionChat.Unregister");
        UnregisterGate.RegisterAction(Unregister);

-        InvokeGate = Plugin.Interface.GetIpcProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?>("HellionChat.Invoke");
+        InvokeGate = Plugin.Interface.GetIpcProvider<
+            string,
+            PlayerPayload?,
+            ulong,
+            Payload?,
+            SeString?,
+            SeString?,
+            object?
+        >("HellionChat.Invoke");
+
+        // v1.4.9 R4: ChatTwo-prefixed mirrors of the four context-menu slots
+        // above. Share the same Register/Unregister backing methods so a
+        // plugin that subscribes via either namespace lands in the same
+        // Registered list. SendMessage on Invoke fans out to both gates.
+        ChatTwoRegisterGate = Plugin.Interface.GetIpcProvider<string>("ChatTwo.Register");
+        ChatTwoRegisterGate.RegisterFunc(Register);
+
+        ChatTwoAvailableGate = Plugin.Interface.GetIpcProvider<object?>("ChatTwo.Available");
+
+        ChatTwoUnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>(
+            "ChatTwo.Unregister"
+        );
+        ChatTwoUnregisterGate.RegisterAction(Unregister);
+
+        ChatTwoInvokeGate = Plugin.Interface.GetIpcProvider<
+            string,
+            PlayerPayload?,
+            ulong,
+            Payload?,
+            SeString?,
+            SeString?,
+            object?
+        >("ChatTwo.Invoke");

        AvailableGate.SendMessage();
+        ChatTwoAvailableGate.SendMessage();
    }

-    internal void Invoke(string id, PlayerPayload? sender, ulong contentId, Payload? payload, SeString? senderString, SeString? content)
+    internal void Invoke(
+        string id,
+        PlayerPayload? sender,
+        ulong contentId,
+        Payload? payload,
+        SeString? senderString,
+        SeString? content
+    )
    {
        InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
+        // v1.4.9 R4: fan out the same event to plugins listening on ChatTwo.Invoke.
+        ChatTwoInvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
    }

    private string Register()
@@ -49,6 +123,8 @@ internal sealed class IpcManager : IDisposable
    {
        UnregisterGate.UnregisterAction();
        RegisterGate.UnregisterFunc();
+        ChatTwoUnregisterGate.UnregisterAction();
+        ChatTwoRegisterGate.UnregisterFunc();
        Registered.Clear();
    }
 }
@@ -1,12 +1,12 @@
 using System.Text;
-using HellionChat.Code;
-using HellionChat.Util;
-using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
 using System.Text.RegularExpressions;
 using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
+using HellionChat.Code;
+using HellionChat.Util;

 namespace HellionChat;

@@ -33,7 +33,16 @@ public partial class Message
    public Dictionary<Guid, float?> Height { get; } = new();
    public Dictionary<Guid, bool> IsVisible { get; } = new();

-    public Message(ulong receiver, ulong contentId, ulong accountId, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource)
+    public Message(
+        ulong receiver,
+        ulong contentId,
+        ulong accountId,
+        ChatCode code,
+        List<Chunk> sender,
+        List<Chunk> content,
+        SeString senderSource,
+        SeString contentSource
+    )
    {
        var extraChatChannel = ExtractExtraChatChannel(contentSource);
        Receiver = receiver;
@@ -56,7 +65,18 @@ public partial class Message
            chunk.Message = this;
    }

-    public Message(Guid id, ulong receiver, ulong contentId, DateTimeOffset date, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource, Guid extraChatChannel)
+    public Message(
+        Guid id,
+        ulong receiver,
+        ulong contentId,
+        DateTimeOffset date,
+        ChatCode code,
+        List<Chunk> sender,
+        List<Chunk> content,
+        SeString senderSource,
+        SeString contentSource,
+        Guid extraChatChannel
+    )
    {
        Id = id;
        Receiver = receiver;
@@ -82,7 +102,11 @@ public partial class Message
        return new Message(0, 0, 0, code, [], content, new SeString(), new SeString());
    }

-    public bool Matches(Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels, bool allExtraChatChannels, HashSet<Guid> extraChatChannels)
+    public bool Matches(
+        Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels,
+        bool allExtraChatChannels,
+        HashSet<Guid> extraChatChannels
+    )
    {
        if (ExtraChatChannel != Guid.Empty)
            return allExtraChatChannels || extraChatChannels.Contains(ExtraChatChannel);
@@ -90,16 +114,21 @@ public partial class Message
        var source = (ChatSource)(1 << (int)Code.Source);
        var target = (ChatSource)(1 << (int)Code.Target);
        return Code.Type.IsGm()
-               || channels.TryGetValue(Code.Type, out var sources)
-               && (Code.Source is 0 || sources.Source.HasFlag(source) || sources.Target.HasFlag(target));
+            || channels.TryGetValue(Code.Type, out var sources)
+                && (
+                    Code.Source is 0
+                    || sources.Source.HasFlag(source)
+                    || sources.Target.HasFlag(target)
+                );
    }

    private int GenerateHash()
    {
-        var hash = SortCodeV2.GetHashCode()
-                   ^ ExtraChatChannel.GetHashCode()
-                   ^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode()
-                   ^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();
+        var hash =
+            SortCodeV2.GetHashCode()
+            ^ ExtraChatChannel.GetHashCode()
+            ^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode()
+            ^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();

        if (Plugin.Config.CollapseKeepUniqueLinks)
        {
@@ -124,8 +153,8 @@ public partial class Message
            }
            catch (ArgumentException ex)
            {
-                Plugin.Log.Error(ex, "Failed to parse extra chat channel GUID");
-                Plugin.Log.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
+                Plugin.LogProxy.Error(ex, "Failed to parse extra chat channel GUID");
+                Plugin.LogProxy.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
                return Guid.Empty;
            }
        }
@@ -146,13 +175,15 @@ public partial class Message
        }

        var nextIsAutoTranslate = false;
-        var checkForEmotes = (Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes;
+        var checkForEmotes =
+            (Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes;
        foreach (var chunk in oldChunks)
        {
            // Use as is if it's not a text chunk, it already has a payload, or is auto translate
            if (chunk is not TextChunk text || chunk.Link != null || nextIsAutoTranslate)
            {
-                nextIsAutoTranslate = chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin };
+                nextIsAutoTranslate =
+                    chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin };

                // No need to call AddChunkWithMessage here since the chunk
                // already has the Message field set.
@@ -173,15 +204,23 @@ public partial class Message
                var word = wordBuilder.ToString();
                wordBuilder.Clear();

-
                var wordUsed = false;
                var tokenUsed = false;

-                if (checkForEmotes && EmoteCache.Exists(word) && !Plugin.Config.BlockedEmotes.Contains(word))
+                if (
+                    checkForEmotes
+                    && EmoteCache.Exists(word)
+                    && !Plugin.Config.BlockedEmotes.Contains(word)
+                )
                {
                    // Add the previous sentence before adding the emote
                    AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.ToString()));
-                    AddChunkWithMessage(new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word) { FallbackColour = text.FallbackColour });
+                    AddChunkWithMessage(
+                        new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word)
+                        {
+                            FallbackColour = text.FallbackColour,
+                        }
+                    );

                    wordUsed = true;
                    sentenceBuilder.Clear();
@@ -190,15 +229,31 @@ public partial class Message
                if (token.TokenType == Tokenizer.TokenType.UrlString)
                {
                    // Add the previous sentence before adding the url
-                    AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, sentenceBuilder.Append(!wordUsed ? word : "").ToString()));
+                    AddChunkWithMessage(
+                        text.NewWithStyle(
+                            chunk.Source,
+                            chunk.Link,
+                            sentenceBuilder.Append(!wordUsed ? word : "").ToString()
+                        )
+                    );
                    try
                    {
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, UriPayload.ResolveUri(token.Value), token.Value));
+                        AddChunkWithMessage(
+                            text.NewWithStyle(
+                                chunk.Source,
+                                UriPayload.ResolveUri(token.Value),
+                                token.Value
+                            )
+                        );
                    }
                    catch (UriFormatException)
                    {
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, token.Value));
-                        Plugin.Log.Debug($"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'");
+                        AddChunkWithMessage(
+                            text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
+                        );
+                        Plugin.LogProxy.Debug(
+                            $"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
+                        );
                    }

                    wordUsed = true;
@@ -215,7 +270,12 @@ public partial class Message
                }

                // End of string reached, we add our leftover
-                AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.Append(!wordUsed ? word : "").ToString()));
+                AddChunkWithMessage(
+                    text.NewWithStyle(
+                        chunk,
+                        sentenceBuilder.Append(!wordUsed ? word : "").ToString()
+                    )
+                );
            }
        }

@@ -281,20 +341,30 @@ public partial class Message
                            < 500_000 => ItemKind.Normal,
                            < 1_000_000 => ItemKind.Collectible,
                            < 2_000_000 => ItemKind.Hq,
-                            _ => ItemKind.EventItem
+                            _ => ItemKind.EventItem,
                        };

-                        var name = kind != ItemKind.EventItem
-                            ? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString()
-                            : Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString();
+                        var name =
+                            kind != ItemKind.EventItem
+                                ? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString()
+                                : Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString();

-                        var link = new ItemPayload(item.ItemId, kind, $"{SeIconChar.LinkMarker.ToIconChar()}{name}");
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown"));
+                        var link = new ItemPayload(
+                            item.ItemId,
+                            kind,
+                            $"{SeIconChar.LinkMarker.ToIconChar()}{name}"
+                        );
+                        AddChunkWithMessage(
+                            text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown")
+                        );
                    }
                    else if (split == "<status>")
                    {
                        var statusId = AgentChatLog.Instance()->ContextStatusId;
-                        if (statusId == 0 || !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow))
+                        if (
+                            statusId == 0
+                            || !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow)
+                        )
                        {
                            AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
                            continue;
@@ -305,7 +375,7 @@ public partial class Message
                        {
                            1 => $"{SeIconChar.Buff.ToIconString()}{nameValue}",
                            2 => $"{SeIconChar.Debuff.ToIconString()}{nameValue}",
-                            _ => nameValue
+                            _ => nameValue,
                        };

                        var link = new StatusPayload(statusId);
@@ -321,18 +391,32 @@ public partial class Message
                        }

                        var mapCoords = agentMap->FlagMapMarkers[0];
-                        var rawX = (int)(MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000);
-                        var rawY = (int)(MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000);
+                        var rawX = (int)(
+                            MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000
+                        );
+                        var rawY = (int)(
+                            MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000
+                        );

-                        var link = new MapLinkPayload(mapCoords.TerritoryId, mapCoords.MapId, rawX, rawY);
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"));
+                        var link = new MapLinkPayload(
+                            mapCoords.TerritoryId,
+                            mapCoords.MapId,
+                            rawX,
+                            rawY
+                        );
+                        AddChunkWithMessage(
+                            text.NewWithStyle(
+                                chunk.Source,
+                                link,
+                                $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"
+                            )
+                        );
                    }
-
                }
                catch (Exception)
                {
                    AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
-                    Plugin.Log.Debug($"Failed to parse the text param: '{split}'");
+                    Plugin.LogProxy.Debug($"Failed to parse the text param: '{split}'");
                }
            }
        }
@@ -1,19 +1,22 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Text;
-using HellionChat.Code;
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud.Game.Chat;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
+using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using HellionChat._Helpers;
+using HellionChat.Code;
+using HellionChat.Resources;
+using HellionChat.Util;
 using Lumina.Text.Expressions;
 using Lumina.Text.Payloads;
 using Lumina.Text.ReadOnly;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

@@ -22,21 +25,13 @@ internal class MessageManager : IAsyncDisposable
    internal const int MessageDisplayLimit = 10_000;

    private Plugin Plugin { get; }
+    private readonly ILogger<MessageManager> _logger;
    internal MessageStore Store { get; }

    private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
    private ulong LastContentId { get; set; }

-    // Messages go into the PendingSync queue first, which will be consumed one
-    // at a time in the main thread. This is to delay the async processing until
-    // after we've received the content ID from the ContentIdResolver hook.
-    //
-    // After that, the message is enqueued in the PendingAsync queue, which will
-    // be consumed in a separate thread and perform more processing (emotes,
-    // URLs) as well as inserting the message into the database.
-    // LinkedList instead of Queue: ContentIdResolver hits PendingSync.Last
-    // every hook call. Queue<T>.Last() is the LINQ extension and walks the
-    // whole queue (O(n)); LinkedList<T>.Last is an O(1) node reference.
+    // PendingSync (main thread) → PendingAsync (worker thread); LinkedList for O(1) Last access
    private LinkedList<PendingMessage> PendingSync { get; } = [];
    private ConcurrentQueue<PendingMessage> PendingAsync { get; } = [];
    private readonly Thread PendingMessageThread;
@@ -53,23 +48,39 @@ internal class MessageManager : IAsyncDisposable
        }
    }

-    // Hellion Chat — Auto-Tell-Tabs hook. Fires after a fully processed
-    // message has been routed to all matching persistent tabs and stored
-    // in the database. The AutoTellTabsService subscribes to spawn or
-    // refresh temp tabs without having to wedge itself into ProcessMessage
-    // directly.
+    // Auto-Tell-Tabs hook: fires after a message is processed and stored, allowing
+    // AutoTellTabsService to spawn or refresh temp tabs without coupling.
    public event Action<Message>? MessageProcessed;

-    internal unsafe MessageManager(Plugin plugin)
+    internal unsafe MessageManager(
+        Plugin plugin,
+        ILogger<MessageManager> logger,
+        ILoggerFactory loggerFactory
+    )
    {
        Plugin = plugin;
+        _logger = logger;

-        Store = new MessageStore(DatabasePath());
+        Store = new MessageStore(
+            DatabasePath(),
+            Plugin.PlatformUtil,
+            loggerFactory.CreateLogger<MessageStore>(),
+            loggerFactory
+        );

-        PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token));
+        PendingMessageThread = new Thread(() =>
+            ProcessPendingMessages(PendingThreadCancellationToken.Token)
+        )
+        {
+            IsBackground = true,
+        };
        PendingMessageThread.Start();

-        ContentIdResolverHook = Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry, ContentIdResolver);
+        ContentIdResolverHook =
+            Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(
+                RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry,
+                ContentIdResolver
+            );
        ContentIdResolverHook.Enable();

        Plugin.ChatGui.ChatMessageUnhandled += ChatMessage;
@@ -85,19 +96,20 @@ internal class MessageManager : IAsyncDisposable
        Plugin.ChatGui.ChatMessageUnhandled -= ChatMessage;

        await PendingThreadCancellationToken.CancelAsync();
-        var timeout = 10_000; // 10s
-        while (timeout > 0)
-        {
-            if (!PendingMessageThread.IsAlive)
-                break;

-            timeout -= 100;
+        // 10s cooperative window; Thread.Abort is gone since .NET 5, so a
+        // stuck worker has to ride out the next AppDomain unload.
+        var deadline = TimeSpan.FromSeconds(10);
+        var stopwatch = Stopwatch.StartNew();
+        while (stopwatch.Elapsed < deadline && PendingMessageThread.IsAlive)
            await Task.Delay(100);
-            Plugin.Log.Debug("Sleeping because PendingMessageThread thread still alive");
-        }

-        // CancellationTokenSource owns an unmanaged WaitHandle; dispose after the
-        // worker thread has drained, otherwise it leaks across plugin reloads.
+        if (PendingMessageThread.IsAlive)
+            _logger.LogWarning(
+                "PendingMessageThread did not observe cancellation within 10s. "
+                    + "Worker remains on background thread; next plugin reload releases it."
+            );
+
        PendingThreadCancellationToken.Dispose();

        Store.Dispose();
@@ -139,7 +151,7 @@ internal class MessageManager : IAsyncDisposable
                }
                catch (Exception ex)
                {
-                    Plugin.Log.Error(ex, "Error processing pending message");
+                    _logger.LogError(ex, "Error processing pending message");
                }
            }
            else
@@ -151,12 +163,7 @@ internal class MessageManager : IAsyncDisposable

    internal void ClearAllTabs()
    {
-        // Hellion Chat — TempTabs haben keine DB-Persistenz (session-only,
-        // direkt vom AutoTellTabsService befüllt). Ein Clear+Refilter würde
-        // sie leer hinterlassen weil FilterAllTabs nichts aus der DB
-        // findet — Tells sind oft durch Privacy-Filter blockiert oder
-        // schlicht session-flüchtig. TempTabs vom Clear-Pfad ausschließen
-        // damit Settings-Save den Tell-Verlauf nicht zerstört.
+        // TempTabs are session-only (not persisted); exclude them to preserve Tell history
        foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab))
            tab.Clear();
    }
@@ -169,32 +176,32 @@ internal class MessageManager : IAsyncDisposable

        using var messages = Store.GetMostRecentMessages(CurrentContentId, since);

-        // We store the pending messages to be added to the chat log in a
-        // temporary list, and apply them all at once after filtering.
-        // TempTabs werden ausgeschlossen — sie bleiben live-state aus dem
-        // AutoTellTabsService, ein DB-Refilter würde sie nur partial
-        // wiederherstellen falls Tells in DB liegen, oder leer lassen wenn
-        // Privacy-Filter sie blockiert hat.
-        var pendingTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).Select(tab => (tab, new List<Message>())).ToList();
+        // TempTabs are excluded; they maintain live state from AutoTellTabsService
+        var pendingTabs = Plugin
+            .Config.Tabs.Where(t => !t.IsTempTab)
+            .Select(tab => (tab, new List<Message>()))
+            .ToList();
        foreach (var message in messages)
-            foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
-                pendingMessages.Add(message);
+        foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
+            pendingMessages.Add(message);

-        // Apply the messages to the chat log in one go.
+        // Apply messages to chat log all at once.
        foreach (var (tab, pendingMessages) in pendingTabs)
            tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit);

-        if (!messages.DidError) return;
+        if (!messages.DidError)
+            return;

        WrapperUtil.AddNotification(Language.LoadMessages_Error, NotificationType.Error);

-        // Mark the failed messages as deleted so we don't try to load them
-        // again.
+        // Mark failed messages as deleted to prevent retry attempts
        var failedIds = messages.FailedMessageIds();
-        Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures");
+        _logger.LogInformation(
+            $"Marking {failedIds.Count} messages as deleted due to parse failures"
+        );
        foreach (var msgId in messages.FailedMessageIds())
        {
-            Plugin.Log.Debug($"Marking message '{msgId}' as deleted due to parse failure");
+            _logger.LogDebug($"Marking message '{msgId}' as deleted due to parse failure");
            Store.DeleteMessage(msgId);
        }
    }
@@ -210,14 +217,18 @@ internal class MessageManager : IAsyncDisposable
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error in FilterAllTabs");
+                _logger.LogError(ex, "Error in FilterAllTabs");
            }

-            Plugin.Log.Debug($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
+            // v1.4.9 R3 profiling: Information so the xllog tail surfaces this
+            // without a Debug filter. Belt-and-suspenders for future plugin-load
+            // regressions; remains in place after Sub-Task 3.4 Befund.
+            _logger.LogInformation($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
        });
    }

    public (SeString? Sender, SeString? Message) LastMessage = (null, null);
+
    private void ChatMessage(IChatMessage message)
    {
        LastMessage = (message.Sender, message.Message);
@@ -236,21 +247,29 @@ internal class MessageManager : IAsyncDisposable
        // Update colour codes.
        GlobalParametersCache.Refresh();

-        // We delay messages to be handed off to the async processing thread
-        // in the next tick, otherwise we can't get the content ID from the hook
-        // below.
+        // Delay to next tick to get content ID from ContentIdResolver hook
        PendingSync.AddLast(pendingMessage);
    }

-    // This hook is called immediately after receiving a message with the
-    // message's content ID. If multiple messages are received in the same tick,
-    // this will be called for each message immediately after ChatMessage is
-    // called for each message.
-    private unsafe void ContentIdResolver(RaptureLogModule* agent, ulong contentId, ulong accountId, int messageIndex, ushort worldId, ushort chatType)
+    private unsafe void ContentIdResolver(
+        RaptureLogModule* agent,
+        ulong contentId,
+        ulong accountId,
+        int messageIndex,
+        ushort worldId,
+        ushort chatType
+    )
    {
        try
        {
-            ContentIdResolverHook?.Original(agent, contentId, accountId, messageIndex, worldId, chatType);
+            ContentIdResolverHook?.Original(
+                agent,
+                contentId,
+                accountId,
+                messageIndex,
+                worldId,
+                chatType
+            );
            if (PendingSync.Last is not { } last)
                return;

@@ -259,13 +278,17 @@ internal class MessageManager : IAsyncDisposable
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error in ContentIdResolver");
+            _logger.LogError(ex, "Error in ContentIdResolver");
        }
    }

    private void ProcessMessage(PendingMessage pendingMessage)
    {
-        var chatCode = new ChatCode(pendingMessage.LogKind, pendingMessage.SourceKind, pendingMessage.TargetKind);
+        var chatCode = new ChatCode(
+            pendingMessage.LogKind,
+            pendingMessage.SourceKind,
+            pendingMessage.TargetKind
+        );

        NameFormatting? formatting = null;
        if (pendingMessage.Sender.Payloads.Count > 0)
@@ -274,24 +297,92 @@ internal class MessageManager : IAsyncDisposable
        var senderChunks = new List<Chunk>();
        if (formatting is { IsPresent: true })
        {
-            senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.Before) { FallbackColour = chatCode.Type });
-            senderChunks.AddRange(ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type));
-            senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.After) { FallbackColour = chatCode.Type });
+            senderChunks.Add(
+                new TextChunk(ChunkSource.None, null, formatting.Before)
+                {
+                    FallbackColour = chatCode.Type,
+                }
+            );
+            senderChunks.AddRange(
+                ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type)
+            );
+            senderChunks.Add(
+                new TextChunk(ChunkSource.None, null, formatting.After)
+                {
+                    FallbackColour = chatCode.Type,
+                }
+            );
        }

-        var contentChunks = ChunkUtil.ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type).ToList();
-        var message = new Message(CurrentContentId, pendingMessage.ContentId, pendingMessage.AccountId, chatCode, senderChunks, contentChunks, pendingMessage.Sender, pendingMessage.Content);
+        var contentChunks = ChunkUtil
+            .ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type)
+            .ToList();
+        var message = new Message(
+            CurrentContentId,
+            pendingMessage.ContentId,
+            pendingMessage.AccountId,
+            chatCode,
+            senderChunks,
+            contentChunks,
+            pendingMessage.Sender,
+            pendingMessage.Content
+        );

        if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
            Store.UpsertMessage(message);

        var currentMatches = Plugin.CurrentTab.Matches(message);
+        uint? notificationSound = null;
        foreach (var tab in Plugin.Config.Tabs)
        {
-            var unread = !(tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches);
+            var unread = !(
+                tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches
+            );

            if (tab.Matches(message))
+            {
                tab.AddMessage(message, unread);
+
+                // Per-tab notification sound. Fire once for the first inactive
+                // tab that wants it, keeping a message matching several
+                // background tabs from stacking sounds.
+                // TEST-MIRROR: ../_Helpers/TabSoundDecision.cs
+                if (
+                    notificationSound is null
+                    && TabSoundDecision.ShouldPlay(
+                        Plugin.CurrentTab == tab,
+                        tab.EnableNotificationSound,
+                        Plugin.Config.PlaySounds
+                    )
+                )
+                {
+                    notificationSound = tab.NotificationSoundId;
+                }
+            }
+        }
+
+        if (notificationSound is { } soundId)
+        {
+            if (soundId is >= 1 and <= 16)
+            {
+                // ProcessMessage runs on the PendingMessageThread worker; the native
+                // UIGlobals.PlaySoundEffect must be marshalled onto the framework
+                // thread (reference_dalamud_framework_thread).
+                Plugin.Framework.RunOnFrameworkThread(() =>
+                {
+                    unsafe
+                    {
+                        UIGlobals.PlaySoundEffect(soundId);
+                    }
+                });
+            }
+            else if (soundId >= 17)
+            {
+                // Custom bundled sounds (ids 17-19) go through NAudio WaveOutEvent.
+                // NAudio manages its own playback thread, so no framework marshalling needed.
+                Plugin.CustomAudioPlayer.Play((int)soundId - 16);
+            }
+            // soundId == 0 (hand-edited config) falls through: plays nothing.
        }

        MessageProcessed?.Invoke(message);
@@ -305,16 +396,12 @@ internal class MessageManager : IAsyncDisposable

        internal static NameFormatting Empty()
        {
-            return new NameFormatting { IsPresent = false, };
+            return new NameFormatting { IsPresent = false };
        }

        internal static NameFormatting Of(string before, string after)
        {
-            return new NameFormatting
-            {
-                Before = before,
-                After = after,
-            };
+            return new NameFormatting { Before = before, After = after };
        }
    }

@@ -349,7 +436,7 @@ internal class MessageManager : IAsyncDisposable
        var after = formats
            .GetRange(firstStringParam + 1, secondStringParam - firstStringParam)
            .Where(payload => payload.Type == ReadOnlySePayloadType.Text)
-            .Select(text => Encoding.UTF8.GetString(text.Body.Span)); // Can't use `ToString()` as it defaults to macro
+            .Select(text => Encoding.UTF8.GetString(text.Body.Span));

        var nameFormatting = NameFormatting.Of(string.Join("", before), string.Join("", after));
        Formats[type] = nameFormatting;
@@ -1,8 +1,5 @@
 using System.Numerics;
-using HellionChat.Code;
-using HellionChat.Resources;
-using HellionChat.Ui;
-using HellionChat.Util;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Game.ClientState.Objects.SubKinds;
@@ -18,11 +15,15 @@ using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Code;
+using HellionChat.Resources;
+using HellionChat.Ui;
+using HellionChat.Util;
 using Lumina.Excel.Sheets;
+using Microsoft.Extensions.Logging;
 using Action = System.Action;
-using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
 using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload;
+using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;

 namespace HellionChat;

@@ -40,9 +41,12 @@ public sealed class PayloadHandler

    private const uint PopupSfx = 1;

-    internal PayloadHandler(ChatLogWindow logWindow)
+    private readonly ILogger<PayloadHandler> _logger;
+
+    internal PayloadHandler(ChatLogWindow logWindow, ILogger<PayloadHandler> logger)
    {
        LogWindow = logWindow;
+        _logger = logger;
    }

    internal void Draw()
@@ -107,7 +111,9 @@ public sealed class PayloadHandler
        ImGui.Separator();

        var contentId = chunk.Message?.ContentId ?? 0;
-        var sender = chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload) as PlayerPayload;
+        var sender =
+            chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload)
+            as PlayerPayload;

        using var menu = ImRaii.Menu(Language.Context_Integrations);
        if (!menu.Success)
@@ -118,17 +124,27 @@ public sealed class PayloadHandler
        {
            try
            {
-                LogWindow.Plugin.Ipc.Invoke(id, sender, contentId, payload, chunk.Message?.SenderSource, chunk.Message?.ContentSource);
+                LogWindow.Plugin.Ipc.Invoke(
+                    id,
+                    sender,
+                    contentId,
+                    payload,
+                    chunk.Message?.SenderSource,
+                    chunk.Message?.ContentSource
+                );
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error executing integration");
+                _logger.LogError(ex, "Error executing integration");
            }
        }

        if (cursor == ImGui.GetCursorPos())
        {
-            using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]);
+            using var pushedColor = ImRaii.PushColor(
+                ImGuiCol.Text,
+                ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
+            );
            ImGui.Text("No integrations available");
        }
    }
@@ -168,10 +184,16 @@ public sealed class PayloadHandler
            if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent))
            {
                ImGui.SetClipboardText(StringifyMessage(message));
-                WrapperUtil.AddNotification(Language.Context_CopyContentSuccess, NotificationType.Info);
+                WrapperUtil.AddNotification(
+                    Language.Context_CopyContentSuccess,
+                    NotificationType.Info
+                );
            }

-            using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]);
+            using var pushedColor = ImRaii.PushColor(
+                ImGuiCol.Text,
+                ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
+            );
            ImGui.TextUnformatted(message.Code.Type.Name());
        }

@@ -184,7 +206,8 @@ public sealed class PayloadHandler
            return string.Empty;

        var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content;
-        return chunks.Where(chunk => chunk is TextChunk)
+        return chunks
+            .Where(chunk => chunk is TextChunk)
            .Cast<TextChunk>()
            .Select(text => text.Content)
            .Aggregate(string.Concat);
@@ -255,7 +278,10 @@ public sealed class PayloadHandler
    public unsafe void MoveTooltip(AddonEvent type, AddonArgs args)
    {
        // Only move if the user has the "Next to Cursor" option selected
-        if (!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected) || selected != 0)
+        if (
+            !Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected)
+            || selected != 0
+        )
            return;

        if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle)
@@ -274,7 +300,10 @@ public sealed class PayloadHandler

        var component = atkBase->WindowNode->AtkResNode;
        var atkPos = new Vector2(component.ScreenX, component.ScreenY);
-        var atkSize = new Vector2(component.GetWidth() * component.ScaleX, component.GetHeight() * component.GetScaleY());
+        var atkSize = new Vector2(
+            component.GetWidth() * component.ScaleX,
+            component.GetHeight() * component.GetScaleY()
+        );

        var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize);
        var addonRect = new MathUtil.Rectangle(atkPos, atkSize);
@@ -302,7 +331,7 @@ public sealed class PayloadHandler

        if (!chatRect.HasOverlap(addonRect))
        {
-            atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y);
+            atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
            return;
        }

@@ -320,7 +349,7 @@ public sealed class PayloadHandler

        if (!chatRect.HasOverlap(addonRect))
        {
-            atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y);
+            atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
            return;
        }

@@ -329,7 +358,7 @@ public sealed class PayloadHandler
        var y = Math.Clamp(chatRect.SizeY - atkSize.Y, 0, float.MaxValue);
        y -= isTop ? 0 : Plugin.Config.TooltipOffset; // offset to prevent cut-off on the bottom

-        atkBase->SetPosition((short) x, (short) y);
+        atkBase->SetPosition((short)x, (short)y);
    }

    private const float MaxInlineIconSize = 32f;
@@ -339,20 +368,25 @@ public sealed class PayloadHandler
        if (icon.Size.X <= 0 || icon.Size.Y <= 0)
            return;

-        var width = (float) icon.Size.X;
-        var height = (float) icon.Size.Y;
+        var width = (float)icon.Size.X;
+        var height = (float)icon.Size.Y;
        var scale = Math.Min(1f, Math.Min(MaxInlineIconSize / width, MaxInlineIconSize / height));
        var size = ImGuiHelpers.ScaledVector2(width * scale, height * scale);

        var cursor = ImGui.GetCursorPos();
        ImGui.Image(icon.Handle, size);
        ImGui.SameLine();
-        ImGui.SetCursorPos(cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing()));
+        ImGui.SetCursorPos(
+            cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())
+        );
    }

    private void HoverStatus(StatusPayload status)
    {
-        if (Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is
+            { } icon
+        )
            InlineIcon(icon);

        var builder = new SeStringBuilder();
@@ -374,7 +408,11 @@ public sealed class PayloadHandler
        LogWindow.DrawChunks(name.ToList());
        ImGui.Separator();

-        var desc = ChunkUtil.ToChunks(status.Status.Value.Description.ToDalamudString(), ChunkSource.None, null);
+        var desc = ChunkUtil.ToChunks(
+            status.Status.Value.Description.ToDalamudString(),
+            ChunkSource.None,
+            null
+        );
        LogWindow.DrawChunks(desc.ToList());
    }

@@ -389,14 +427,23 @@ public sealed class PayloadHandler
        if (!item.Item.TryGetValue(out Item resolvedItem))
            return;

-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ))
+                .GetWrapOrDefault() is
+            { } icon
+        )
            InlineIcon(icon);

        var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null);
        LogWindow.DrawChunks(name.ToList());
        ImGui.Separator();

-        var desc = ChunkUtil.ToChunks(resolvedItem.Description.ToDalamudString(), ChunkSource.None, null);
+        var desc = ChunkUtil.ToChunks(
+            resolvedItem.Description.ToDalamudString(),
+            ChunkSource.None,
+            null
+        );
        LogWindow.DrawChunks(desc.ToList());
    }

@@ -405,7 +452,12 @@ public sealed class PayloadHandler
        if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow))
            return;

-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon))
+                .GetWrapOrDefault() is
+            { } icon
+        )
            InlineIcon(icon);

        var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null);
@@ -415,7 +467,11 @@ public sealed class PayloadHandler
        if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow))
            return;

-        LogWindow.DrawChunks(ChunkUtil.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null).ToList());
+        LogWindow.DrawChunks(
+            ChunkUtil
+                .ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null)
+                .ToList()
+        );
    }

    private void HoverUri(UriPayload uri)
@@ -438,7 +494,10 @@ public sealed class PayloadHandler
                ClickLinkPayload(chunk, payload, link);
                break;
            case DalamudPartyFinderPayload pf:
-                if (pf.LinkType == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification)
+                if (
+                    pf.LinkType
+                    == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification
+                )
                    GameFunctions.GameFunctions.OpenPartyFinder();
                else
                    GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId);
@@ -473,9 +532,14 @@ public sealed class PayloadHandler
            return;

        var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList();
-        if (!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue((link.Plugin, link.CommandId), out var value))
+        if (
+            !Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue(
+                (link.Plugin, link.CommandId),
+                out var value
+            )
+        )
        {
-            Plugin.Log.Warning("Could not find DalamudLinkHandlers");
+            _logger.LogWarning("Could not find DalamudLinkHandlers");
            return;
        }

@@ -486,7 +550,7 @@ public sealed class PayloadHandler
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error executing DalamudLinkPayload handler");
+            _logger.LogError(ex, "Error executing DalamudLinkPayload handler");
        }
    }

@@ -508,7 +572,12 @@ public sealed class PayloadHandler
            return;

        var hq = payload.Kind == ItemKind.Hq;
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq))
+                .GetWrapOrDefault() is
+            { } icon
+        )
            InlineIcon(icon);

        var name = itemRow.Name.ToDalamudString();
@@ -554,10 +623,18 @@ public sealed class PayloadHandler
            return;

        var item = Sheets.EventItemSheet.GetRow(payload.ItemId);
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon))
+                .GetWrapOrDefault() is
+            { } icon
+        )
            InlineIcon(icon);

-        LogWindow.DrawChunks(ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(), false);
+        LogWindow.DrawChunks(
+            ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(),
+            false
+        );
        ImGui.Separator();

        var realItemId = payload.RawItemId;
@@ -585,7 +662,7 @@ public sealed class PayloadHandler
        {
            name.AddRange([
                new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld),
-                new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText())
+                new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()),
            ]);
        }

@@ -606,7 +683,15 @@ public sealed class PayloadHandler
            }
            else if (validContentId)
            {
-                LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(player.PlayerName, world.Value.Name.ToString(), (ushort) world.RowId, 0, chunk.Message!.ContentId, 0, false);
+                LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(
+                    player.PlayerName,
+                    world.Value.Name.ToString(),
+                    (ushort)world.RowId,
+                    0,
+                    chunk.Message!.ContentId,
+                    0,
+                    false
+                );
            }

            LogWindow.Activate = true;
@@ -615,12 +700,18 @@ public sealed class PayloadHandler
        if (world.Value.IsPublic)
        {
            var party = Plugin.PartyList;
-            var leader = party[(int) party.PartyLeaderIndex]?.ContentId;
+            var leader = party[(int)party.PartyLeaderIndex]?.ContentId;
            var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader;
-            var member = party.FirstOrDefault(member => member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId);
+            var member = party.FirstOrDefault(member =>
+                member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId
+            );
            var isInParty = member != null;
            var inInstance = GameFunctions.GameFunctions.IsInInstance();
-            var inPartyInstance = Sheets.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType).TerritoryIntendedUse.RowId is (41 or 47 or 48 or 52 or 53 or 61);
+            var inPartyInstance =
+                Sheets
+                    .TerritorySheet.GetRow(Plugin.ClientState.TerritoryType)
+                    .TerritoryIntendedUse.RowId
+                is (41 or 47 or 48 or 52 or 53 or 61);
            if (isLeader)
            {
                if (!isInParty)
@@ -636,10 +727,20 @@ public sealed class PayloadHandler
                        if (menu.Success)
                        {
                            if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld))
-                                GameFunctions.Party.InviteSameWorld(player.PlayerName, (ushort)world.RowId, chunk.Message?.ContentId ?? 0);
+                                GameFunctions.Party.InviteSameWorld(
+                                    player.PlayerName,
+                                    (ushort)world.RowId,
+                                    chunk.Message?.ContentId ?? 0
+                                );

-                            if (validContentId && ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld))
-                                GameFunctions.Party.InviteOtherWorld(chunk.Message!.ContentId, (ushort)world.RowId);
+                            if (
+                                validContentId
+                                && ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)
+                            )
+                                GameFunctions.Party.InviteOtherWorld(
+                                    chunk.Message!.ContentId,
+                                    (ushort)world.RowId
+                                );
                        }
                    }
                }
@@ -654,23 +755,41 @@ public sealed class PayloadHandler
                }
            }

-            var isFriend = GameFunctions.GameFunctions.GetFriends().Any(friend => friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId);
+            var isFriend = GameFunctions
+                .GameFunctions.GetFriends()
+                .Any(friend =>
+                    friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId
+                );
            if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest))
-                LogWindow.Plugin.Functions.SendFriendRequest(player.PlayerName, (ushort) world.RowId);
+                LogWindow.Plugin.Functions.SendFriendRequest(
+                    player.PlayerName,
+                    (ushort)world.RowId
+                );

            using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions))
            {
                if (menuBlockFunctions.Success)
                {
                    if (ImGui.Selectable(Language.Context_AddToBlacklist))
-                        LogWindow.Plugin.Functions.AddToBlacklist(player.PlayerName, (ushort)world.RowId);
+                        LogWindow.Plugin.Functions.AddToBlacklist(
+                            player.PlayerName,
+                            (ushort)world.RowId
+                        );

                    if (chunk.Message != null)
                    {
                        var message = chunk.Message;

-                        if (message.AccountId != 0 && ImGui.Selectable(Language.Context_AddToMuteList))
-                            LogWindow.Plugin.Functions.AddToMuteList(message.AccountId, message.ContentId, player.PlayerName, (short) world.RowId);
+                        if (
+                            message.AccountId != 0
+                            && ImGui.Selectable(Language.Context_AddToMuteList)
+                        )
+                            LogWindow.Plugin.Functions.AddToMuteList(
+                                message.AccountId,
+                                message.ContentId,
+                                player.PlayerName,
+                                (short)world.RowId
+                            );

                        if (ImGui.Selectable(Language.Context_AddToTermsFilter))
                            LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource);
@@ -678,8 +797,11 @@ public sealed class PayloadHandler
                }
            }

-            if (GameFunctions.GameFunctions.IsMentor() && ImGui.Selectable(Language.Context_InviteToNoviceNetwork))
-                GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort) world.RowId);
+            if (
+                GameFunctions.GameFunctions.IsMentor()
+                && ImGui.Selectable(Language.Context_InviteToNoviceNetwork)
+            )
+                GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId);
        }

        var inputChannel = chunk.Message?.Code.Type.ToInputChannel();
@@ -694,7 +816,10 @@ public sealed class PayloadHandler

        if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate))
            if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId))
-                WrapperUtil.AddNotification(Language.Context_AdventurerPlateError, NotificationType.Warning);
+                WrapperUtil.AddNotification(
+                    Language.Context_AdventurerPlateError,
+                    NotificationType.Warning
+                );
    }

    private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload)
@@ -728,13 +853,21 @@ public sealed class PayloadHandler
        if (ImGui.Selectable(Language.Context_CopyLink))
        {
            ImGui.SetClipboardText(uri.Uri.ToString());
-            WrapperUtil.AddNotification(Language.Context_CopyLinkNotification, NotificationType.Info);
+            WrapperUtil.AddNotification(
+                Language.Context_CopyLinkNotification,
+                NotificationType.Info
+            );
        }
    }

    private void DrawStatusPopup(StatusPayload status)
    {
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon))
+                .GetWrapOrDefault() is
+            { } icon
+        )
            InlineIcon(icon);

        var builder = new SeStringBuilder();
@@ -752,7 +885,10 @@ public sealed class PayloadHandler
                break;
        }

-        LogWindow.DrawChunks(ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(), false);
+        LogWindow.DrawChunks(
+            ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(),
+            false
+        );
        ImGui.Separator();

        if (ImGui.Selectable(Language.Context_Link))
@@ -0,0 +1,211 @@
+using Dalamud.Interface.ImGuiFileDialog;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
+using HellionChat.Infrastructure.Hosting;
+using HellionChat.Infrastructure.Logging;
+using HellionChat.Ipc;
+using HellionChat.Themes;
+using HellionChat.Ui;
+using HellionChat.Util;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat;
+
+// Builds the generic-host DI container that drives v1.5.0+. The factory is
+// invoked synchronously from Plugin.ctor (after the schema gate clears) so the
+// container exists before PluginLifecycle.LoadAsync runs. See plan §1 for the
+// deliberate divergence from Lightless' deferred Func-delegate pattern.
+internal static class PluginHostFactory
+{
+    public static IHost Build(Plugin plugin, PluginHostDependencies dependencies)
+    {
+        return new HostBuilder()
+            .UseContentRoot(dependencies.PluginInterface.ConfigDirectory.FullName)
+            .ConfigureLogging(logging =>
+            {
+                logging.ClearProviders();
+                logging.AddDalamudLogging(dependencies.PluginLog);
+                logging.SetMinimumLevel(LogLevel.Trace);
+            })
+            .ConfigureServices(services => ConfigureServices(services, plugin, dependencies))
+            .Build();
+    }
+
+    private static void ConfigureServices(
+        IServiceCollection services,
+        Plugin plugin,
+        PluginHostDependencies dependencies
+    )
+    {
+        // Block A — Dalamud services (21 [PluginService] singletons).
+        services.AddSingleton(dependencies);
+        services.AddSingleton(dependencies.PluginInterface);
+        services.AddSingleton(dependencies.PluginLog);
+        services.AddSingleton(dependencies.ChatGui);
+        services.AddSingleton(dependencies.ClientState);
+        services.AddSingleton(dependencies.CommandManager);
+        services.AddSingleton(dependencies.Condition);
+        services.AddSingleton(dependencies.DataManager);
+        services.AddSingleton(dependencies.Framework);
+        services.AddSingleton(dependencies.GameGui);
+        services.AddSingleton(dependencies.KeyState);
+        services.AddSingleton(dependencies.ObjectTable);
+        services.AddSingleton(dependencies.PartyList);
+        services.AddSingleton(dependencies.TargetManager);
+        services.AddSingleton(dependencies.TextureProvider);
+        services.AddSingleton(dependencies.GameInteropProvider);
+        services.AddSingleton(dependencies.GameConfig);
+        services.AddSingleton(dependencies.Notification);
+        services.AddSingleton(dependencies.AddonLifecycle);
+        services.AddSingleton(dependencies.PlayerState);
+        services.AddSingleton(dependencies.Evaluator);
+        services.AddSingleton(dependencies.SelfTestRegistry);
+
+        // Self-references: Plugin and its WindowSystem already exist.
+        services.AddSingleton(plugin);
+        services.AddSingleton(plugin.WindowSystem);
+        services.AddSingleton<PluginLifecycle>();
+
+        // Block B — HellionChat singletons. Factory lambdas because most
+        // classes are internal-sealed and the default activator only sees
+        // public ctors.
+        services.AddSingleton<IPlatformUtil>(_ => new DalamudPlatformUtil());
+        services.AddSingleton<IPluginLogProxy>(sp => new DalamudPluginLogProxy(
+            sp.GetRequiredService<IPluginLog>()
+        ));
+        services.AddSingleton<FileDialogManager>(_ => new FileDialogManager());
+        services.AddSingleton(sp => new Commands(sp.GetRequiredService<ILogger<Commands>>()));
+        services.AddSingleton(sp => new FontManager(
+            sp.GetRequiredService<IDalamudPluginInterface>()
+        ));
+        services.AddSingleton(_ => new StatusBar());
+        services.AddSingleton(sp => new IpcManager(sp.GetRequiredService<ILogger<IpcManager>>()));
+        services.AddSingleton(sp => new ExtraChat(sp.GetRequiredService<ILogger<ExtraChat>>()));
+
+        services.AddSingleton(sp => new ThemeRegistry(
+            Path.Combine(
+                sp.GetRequiredService<IDalamudPluginInterface>().ConfigDirectory.FullName,
+                "themes"
+            ),
+            sp.GetRequiredService<ILogger<ThemeRegistry>>()
+        ));
+
+        services.AddSingleton(sp => new GameFunctions.GameFunctions(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<GameFunctions.GameFunctions>>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+        services.AddSingleton(sp => new TypingIpc(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<TypingIpc>>()
+        ));
+
+        services.AddSingleton(sp => new Integrations.HonorificService(
+            sp.GetRequiredService<IDalamudPluginInterface>(),
+            sp.GetRequiredService<ILogger<Integrations.HonorificService>>(),
+            sp.GetRequiredService<IFramework>()
+        ));
+        services.AddSingleton(sp => new Integrations.FailedTellNotifier(
+            sp.GetRequiredService<ILogger<Integrations.FailedTellNotifier>>()
+        ));
+        services.AddSingleton(sp => new Integrations.CustomAudioPlayer(
+            sp.GetRequiredService<ILogger<Integrations.CustomAudioPlayer>>()
+        ));
+
+        services.AddSingleton(sp => new MessageManager(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<MessageManager>>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+
+        // MessageStore is allocated inside MessageManager.ctor; a separate
+        // container singleton would double-construct the SQLite handle.
+        services.AddSingleton(sp =>
+        {
+            var pluginRef = sp.GetRequiredService<Plugin>();
+            var manager = sp.GetRequiredService<MessageManager>();
+            return new AutoTellTabsService(
+                pluginRef,
+                manager,
+                manager.Store,
+                sp.GetRequiredService<ILogger<AutoTellTabsService>>()
+            );
+        });
+
+        // Block C — Windows. WindowSystem.AddWindow is called from
+        // PluginLifecycle.LoadAsync on the framework thread.
+        services.AddSingleton(sp => new ChatLogWindow(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<ChatLogWindow>>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+        services.AddSingleton(sp => new SettingsWindow(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+        services.AddSingleton(sp => new DbViewer(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<DbViewer>>()
+        ));
+        services.AddSingleton(sp => new InputPreview(sp.GetRequiredService<ChatLogWindow>()));
+        services.AddSingleton(sp => new CommandHelpWindow(sp.GetRequiredService<ChatLogWindow>()));
+        services.AddSingleton(sp => new SeStringDebugger(sp.GetRequiredService<Plugin>()));
+        services.AddSingleton(sp => new DebuggerWindow(sp.GetRequiredService<Plugin>()));
+        services.AddSingleton(sp => new FirstRunWizard(sp.GetRequiredService<Plugin>()));
+
+        // Hosted-service adapters: thin wrappers around the existing init
+        // methods so the service class bodies stay unchanged. FontManager
+        // does not need one — its ctor runs the init inline inside a single
+        // SuppressAutoRebuild block on eager resolve.
+        services.AddHostedService(sp => new ThemeRegistryInitHostedService(
+            sp.GetRequiredService<ThemeRegistry>()
+        ));
+        services.AddHostedService(sp => new IpcManagerInitHostedService(
+            sp.GetRequiredService<IpcManager>()
+        ));
+        services.AddHostedService(sp => new TypingIpcInitHostedService(
+            sp.GetRequiredService<TypingIpc>()
+        ));
+        services.AddHostedService(sp => new ExtraChatInitHostedService(
+            sp.GetRequiredService<ExtraChat>()
+        ));
+        services.AddHostedService(sp => new MessageManagerInitHostedService(
+            sp.GetRequiredService<IDalamudPluginInterface>(),
+            sp.GetRequiredService<MessageManager>()
+        ));
+        services.AddHostedService(sp => new AutoTellTabsServiceInitHostedService(
+            sp.GetRequiredService<AutoTellTabsService>()
+        ));
+        services.AddHostedService(
+            sp => new Infrastructure.Hosting.FailedTellNotifierInitHostedService(
+                sp.GetRequiredService<Integrations.FailedTellNotifier>()
+            )
+        );
+    }
+}
+
+internal sealed record PluginHostDependencies(
+    IDalamudPluginInterface PluginInterface,
+    IPluginLog PluginLog,
+    IChatGui ChatGui,
+    IClientState ClientState,
+    ICommandManager CommandManager,
+    ICondition Condition,
+    IDataManager DataManager,
+    IFramework Framework,
+    IGameGui GameGui,
+    IKeyState KeyState,
+    IObjectTable ObjectTable,
+    IPartyList PartyList,
+    ITargetManager TargetManager,
+    ITextureProvider TextureProvider,
+    IGameInteropProvider GameInteropProvider,
+    IGameConfig GameConfig,
+    INotificationManager Notification,
+    IAddonLifecycle AddonLifecycle,
+    IPlayerState PlayerState,
+    ISeStringEvaluator Evaluator,
+    ISelfTestRegistry SelfTestRegistry
+);
@@ -0,0 +1,143 @@
+using System.Runtime.ExceptionServices;
+using Dalamud.Plugin.Services;
+using Microsoft.Extensions.Hosting;
+
+namespace HellionChat;
+
+// Orchestrates Host.StartAsync / StopAsync and the framework-thread dispose.
+// Plugin.ctor builds the host and assigns it via the Host property, so
+// PluginLifecycle never constructs the host itself.
+internal sealed class PluginLifecycle : IAsyncDisposable
+{
+    private readonly IFramework _framework;
+    private readonly Plugin _plugin;
+
+    private int _disposeStarted;
+    private bool _hostStartRequested;
+
+    public PluginLifecycle(IFramework framework, Plugin plugin)
+    {
+        _framework = framework;
+        _plugin = plugin;
+    }
+
+    // Plugin.ctor fills this immediately after PluginHostFactory.Build and
+    // before invoking LoadAsync; LoadAsync may NRE-suppress on Host! safely.
+    public IHost? Host { get; set; }
+
+    public async Task LoadAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        try
+        {
+            _hostStartRequested = true;
+            await Host!.StartAsync(cancellationToken).ConfigureAwait(false);
+
+            // WindowSystem.AddWindow mutates an internal List<>; v1.4.9 Stage-2
+            // verified the list is non-thread-safe, so we marshal the entire
+            // registration block to the framework thread.
+            await _framework
+                .RunOnFrameworkThread(() => RegisterWindows(_plugin))
+                .ConfigureAwait(false);
+        }
+        catch
+        {
+            try
+            {
+                await DisposeAsync().ConfigureAwait(false);
+            }
+            catch
+            {
+                // Swallow secondary dispose failure so the original load throw wins.
+            }
+
+            throw;
+        }
+    }
+
+    private static void RegisterWindows(Plugin plugin)
+    {
+        plugin.WindowSystem.AddWindow(plugin.ChatLogWindow);
+        plugin.WindowSystem.AddWindow(plugin.SettingsWindow);
+        plugin.WindowSystem.AddWindow(plugin.DbViewer);
+        plugin.WindowSystem.AddWindow(plugin.InputPreview);
+        plugin.WindowSystem.AddWindow(plugin.CommandHelpWindow);
+        plugin.WindowSystem.AddWindow(plugin.SeStringDebugger);
+        plugin.WindowSystem.AddWindow(plugin.DebuggerWindow);
+        plugin.WindowSystem.AddWindow(plugin.FirstRunWizard);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        // Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
+        if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
+            return;
+
+        Exception? failure = null;
+
+        if (_hostStartRequested && Host is not null)
+            failure = await CaptureFailureAsync(failure, () => Host.StopAsync())
+                .ConfigureAwait(false);
+
+        failure = await DisposeHostOnFrameworkThreadAsync(failure).ConfigureAwait(false);
+
+        ThrowIfFailed(failure);
+    }
+
+    private async Task<Exception?> DisposeHostOnFrameworkThreadAsync(Exception? failure)
+    {
+        try
+        {
+            await _framework
+                .RunOnFrameworkThread(() =>
+                {
+                    failure = CaptureFailure(failure, () => Host?.Dispose());
+                })
+                .ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+
+        return failure;
+    }
+
+    private static Exception? CaptureFailure(Exception? failure, Action action)
+    {
+        try
+        {
+            action();
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+
+        return failure;
+    }
+
+    private static async ValueTask<Exception?> CaptureFailureAsync(
+        Exception? failure,
+        Func<Task> action
+    )
+    {
+        try
+        {
+            await action().ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+
+        return failure;
+    }
+
+    private static void ThrowIfFailed(Exception? failure)
+    {
+        if (failure is not null)
+            ExceptionDispatchInfo.Capture(failure).Throw();
+    }
+}
@@ -4,10 +4,15 @@ namespace HellionChat.Privacy;

 internal static class PrivacyDefaults
 {
-    // Privacy-First default whitelist (DSGVO Art. 25 - Privacy by Default).
-    // Only the player's own conversations are persisted out-of-the-box.
-    // Public chat (Say/Shout/Yell), Novice Network, NPC dialogue, system
-    // logs and battle messages are NOT persisted unless the user opts in.
+    // F3.1: failsafe for ChatTypes added by future FFXIV patches. New installs
+    // persist unknown channels so a major patch's added ChatType isn't silently
+    // dropped before the user can opt in or out. Existing configs keep their
+    // explicit choice — see Configuration.cs PrivacyPersistUnknownChannels.
+    internal const bool DefaultPersistUnknownChannels = true;
+
+    // DSGVO Art. 25 (Privacy by Default): only the player's own conversations
+    // are persisted out-of-the-box. Public chat, NPC dialogue, system logs and
+    // battle messages require explicit opt-in.
    internal static readonly IReadOnlySet<ChatType> PrivacyFirstWhitelist = new HashSet<ChatType>
    {
        ChatType.TellIncoming,
@@ -42,54 +47,54 @@ internal static class PrivacyDefaults
        ChatType.ExtraChatLinkshell8,
    };

-    // Default retention windows per channel (in days). Channels not listed
-    // here fall back to Configuration.RetentionDefaultDays. Reflects the
-    // design spec: Tells 365, own-conversation channels 90, everything else
-    // shorter via the global default.
-    internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays = new Dictionary<ChatType, int>
-    {
-        [ChatType.TellIncoming] = 365,
-        [ChatType.TellOutgoing] = 365,
+    // Per-channel retention in days. Unlisted channels fall back to
+    // Configuration.RetentionDefaultDays. Tells: 365, everything else: 90.
+    internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
+        new Dictionary<ChatType, int>
+        {
+            [ChatType.TellIncoming] = 365,
+            [ChatType.TellOutgoing] = 365,

-        [ChatType.Party] = 90,
-        [ChatType.CrossParty] = 90,
-        [ChatType.Alliance] = 90,
-        [ChatType.PvpTeam] = 90,
-        [ChatType.FreeCompany] = 90,
+            [ChatType.Party] = 90,
+            [ChatType.CrossParty] = 90,
+            [ChatType.Alliance] = 90,
+            [ChatType.PvpTeam] = 90,
+            [ChatType.FreeCompany] = 90,

-        [ChatType.Linkshell1] = 90,
-        [ChatType.Linkshell2] = 90,
-        [ChatType.Linkshell3] = 90,
-        [ChatType.Linkshell4] = 90,
-        [ChatType.Linkshell5] = 90,
-        [ChatType.Linkshell6] = 90,
-        [ChatType.Linkshell7] = 90,
-        [ChatType.Linkshell8] = 90,
+            [ChatType.Linkshell1] = 90,
+            [ChatType.Linkshell2] = 90,
+            [ChatType.Linkshell3] = 90,
+            [ChatType.Linkshell4] = 90,
+            [ChatType.Linkshell5] = 90,
+            [ChatType.Linkshell6] = 90,
+            [ChatType.Linkshell7] = 90,
+            [ChatType.Linkshell8] = 90,

-        [ChatType.CrossLinkshell1] = 90,
-        [ChatType.CrossLinkshell2] = 90,
-        [ChatType.CrossLinkshell3] = 90,
-        [ChatType.CrossLinkshell4] = 90,
-        [ChatType.CrossLinkshell5] = 90,
-        [ChatType.CrossLinkshell6] = 90,
-        [ChatType.CrossLinkshell7] = 90,
-        [ChatType.CrossLinkshell8] = 90,
+            [ChatType.CrossLinkshell1] = 90,
+            [ChatType.CrossLinkshell2] = 90,
+            [ChatType.CrossLinkshell3] = 90,
+            [ChatType.CrossLinkshell4] = 90,
+            [ChatType.CrossLinkshell5] = 90,
+            [ChatType.CrossLinkshell6] = 90,
+            [ChatType.CrossLinkshell7] = 90,
+            [ChatType.CrossLinkshell8] = 90,

-        [ChatType.ExtraChatLinkshell1] = 90,
-        [ChatType.ExtraChatLinkshell2] = 90,
-        [ChatType.ExtraChatLinkshell3] = 90,
-        [ChatType.ExtraChatLinkshell4] = 90,
-        [ChatType.ExtraChatLinkshell5] = 90,
-        [ChatType.ExtraChatLinkshell6] = 90,
-        [ChatType.ExtraChatLinkshell7] = 90,
-        [ChatType.ExtraChatLinkshell8] = 90,
-    };
+            [ChatType.ExtraChatLinkshell1] = 90,
+            [ChatType.ExtraChatLinkshell2] = 90,
+            [ChatType.ExtraChatLinkshell3] = 90,
+            [ChatType.ExtraChatLinkshell4] = 90,
+            [ChatType.ExtraChatLinkshell5] = 90,
+            [ChatType.ExtraChatLinkshell6] = 90,
+            [ChatType.ExtraChatLinkshell7] = 90,
+            [ChatType.ExtraChatLinkshell8] = 90,
+        };

-    // Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both
-    // emote types, Novice Network), kept for a short 24-hour window so the
-    // last RP scene or shout trade is still searchable but third-party data
-    // doesn't accumulate forever.
-    internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(PrivacyFirstWhitelist)
+    // Casual: Privacy-First + public chat (Say/Shout/Yell, emotes, Novice
+    // Network) with a 1-day window so recent RP/trade is searchable but
+    // third-party data doesn't accumulate.
+    internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
+        PrivacyFirstWhitelist
+    )
    {
        ChatType.Say,
        ChatType.Shout,
@@ -99,13 +104,39 @@ internal static class PrivacyDefaults
        ChatType.NoviceNetwork,
    };

-    internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides = new Dictionary<ChatType, int>
+    internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides =
+        new Dictionary<ChatType, int>
+        {
+            [ChatType.Say] = 1,
+            [ChatType.Shout] = 1,
+            [ChatType.Yell] = 1,
+            [ChatType.CustomEmote] = 1,
+            [ChatType.StandardEmote] = 1,
+            [ChatType.NoviceNetwork] = 1,
+        };
+
+    // Roleplay: Privacy-First + Say + both emote types. Public-distance
+    // channels (Shout, Yell) stay out — they are public-noise from
+    // strangers, not story content. Novice Network also stays out;
+    // it is not RP-adjacent and would dilute the profile's intent.
+    internal static readonly IReadOnlySet<ChatType> RoleplayWhitelist = new HashSet<ChatType>(
+        PrivacyFirstWhitelist
+    )
    {
-        [ChatType.Say] = 1,
-        [ChatType.Shout] = 1,
-        [ChatType.Yell] = 1,
-        [ChatType.CustomEmote] = 1,
-        [ChatType.StandardEmote] = 1,
-        [ChatType.NoviceNetwork] = 1,
+        ChatType.Say,
+        ChatType.CustomEmote,
+        ChatType.StandardEmote,
    };
+
+    // RP sessions function as story logs: Say + emotes need a longer
+    // window than Casual's 1-day public-chat window. 30 days for Say
+    // keeps in-character dialogue scrollable across multiple sessions,
+    // 90 days for emotes mirrors the Privacy-First conversation default.
+    internal static readonly IReadOnlyDictionary<ChatType, int> RoleplayRetentionOverrides =
+        new Dictionary<ChatType, int>
+        {
+            [ChatType.Say] = 30,
+            [ChatType.CustomEmote] = 90,
+            [ChatType.StandardEmote] = 90,
+        };
 }
@@ -0,0 +1,4 @@
+|\_/|,,_____,~~`
+(.".)~~     )`~}}
+ \o/\ /---~\\ ~}}
+   _//    _// ~}
@@ -4,16 +4,14 @@ using HellionChat.Util;

 namespace HellionChat.Resources;

-// Hellion Chat — v0.6.0 built-in colour presets for the ChatColours
-// settings section. Read-only static data; users apply a preset via the
-// settings UI which overwrites Configuration.ChatColours immediately.
-// Battle-channel types are intentionally NOT covered by the stylistic
-// presets so that combat-log tuning the user has done stays intact.
+// Built-in colour presets applied via Settings UI → ChatColours.
+// Battle-channel types are intentionally excluded to preserve combat-log tuning.
 public sealed record ChatColourPreset(
    string DisplayName,
    string LocalizationKey,
    bool IsBrandPreset,
-    IReadOnlyDictionary<ChatType, uint> Colours);
+    IReadOnlyDictionary<ChatType, uint> Colours
+);

 public static class ChatColourPresets
 {
@@ -27,43 +25,48 @@ public static class ChatColourPresets
                DisplayName: "ChatTwo Default",
                LocalizationKey: "ChatColourPresets_Default",
                IsBrandPreset: false,
-                Colours: BuildDefault()),
+                Colours: BuildDefault()
+            ),
            ["HighContrast"] = new(
                DisplayName: "High-Contrast",
                LocalizationKey: "ChatColourPresets_HighContrast",
                IsBrandPreset: false,
-                Colours: BuildHighContrast()),
+                Colours: BuildHighContrast()
+            ),
            ["Pastell"] = new(
                DisplayName: "Pastell",
                LocalizationKey: "ChatColourPresets_Pastell",
                IsBrandPreset: false,
-                Colours: BuildPastell()),
+                Colours: BuildPastell()
+            ),
            ["DarkModeTuned"] = new(
                DisplayName: "Dark-Mode-Tuned",
                LocalizationKey: "ChatColourPresets_DarkModeTuned",
                IsBrandPreset: false,
-                Colours: BuildDarkModeTuned()),
+                Colours: BuildDarkModeTuned()
+            ),
            ["Hellion"] = new(
                DisplayName: "Hellion",
                LocalizationKey: "ChatColourPresets_Hellion",
                IsBrandPreset: true,
-                Colours: BuildHellion()),
+                Colours: BuildHellion()
+            ),
            ["NightBlue"] = new(
                DisplayName: "Night Blue",
                LocalizationKey: "ChatColourPresets_NightBlue",
                IsBrandPreset: false,
-                Colours: BuildNightBlue()),
+                Colours: BuildNightBlue()
+            ),
            ["IndigoViolet"] = new(
                DisplayName: "Indigo Violet",
                LocalizationKey: "ChatColourPresets_IndigoViolet",
                IsBrandPreset: false,
-                Colours: BuildIndigoViolet()),
+                Colours: BuildIndigoViolet()
+            ),
        };
    }

-    // The Default preset spiegelt 1:1 die Werte aus ChatTypeExt.DefaultColor.
-    // Channels ohne Default-Wert (return null) werden ausgelassen — wer sie
-    // anwenden will, behält seine aktuelle Farbe.
+    // Mirrors ChatTypeExt.DefaultColor; channels without a default are skipped.
    private static IReadOnlyDictionary<ChatType, uint> BuildDefault()
    {
        var dict = new Dictionary<ChatType, uint>();
@@ -175,79 +178,55 @@ public static class ChatColourPresets
        };
    }

-    // Hellion brand preset — Arctic Cyan + Ember Orange palette aus
-    // /mnt/ssd-fast/Projekte/hellion-media/hellion-media-website/BRANDING.md
-    // (Schema-Stand 2026-04-16). Channels sind über das ganze Brand-Spektrum
-    // verteilt damit jede Zeile auf einen Glance unterscheidbar ist:
-    // Cyan-Familie für Standard/Tell, Ember + Warning für laute Channels,
-    // Status-Farben (Success, Danger) für Linkshells. CrossLinkshells
-    // nutzen die dunkleren/sattersten Varianten derselben Hue-Familien.
+    // Hellion brand preset — Arctic Cyan + Ember Orange palette.
+    // Cyan family for Standard/Tell, Ember/Warning for loud channels,
+    // Status colours for Linkshells, darker variants for CrossLinkshells.
    private static IReadOnlyDictionary<ChatType, uint> BuildHellion()
    {
        return new Dictionary<ChatType, uint>
        {
-            // Standard / Tell — Cyan-Familie (Brand-Primary)
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232),         // Cyan-light #4DD9E8
+            [ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light #4DD9E8
            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan #00BED2
            [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark #0097A7
-
-            // Laute Channels — Ember/Warning
-            [ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78),    // Warning #F0AD4E
-            [ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22),   // Brand Ember #F97316
-
-            // Gruppen-Channels — Success/Ember-dark/Cyan
-            [ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92),         // Success #5CB85C
-            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4),       // Ember-dark #E85D04
-            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210),   // Brand Cyan
-            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232),// Cyan-light
-
-            // Linkshells 1-8 — über das ganze Brand-Spektrum verteilt
-            [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60),  // Ember-light #FB923C
-            [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78),  // Warning
-            [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92),   // Success
-            [ChatType.Linkshell4] = ColourUtil.ComponentsToRgba(77, 217, 232),  // Cyan-light
-            [ChatType.Linkshell5] = ColourUtil.ComponentsToRgba(0, 190, 210),   // Brand Cyan
-            [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167),   // Cyan-dark
-            [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22),  // Brand Ember
-            [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79),   // Danger #D9534F
-
-            // CrossWorld-Linkshells 1-8 — dunklere/sattersere Varianten
-            [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4),    // Ember-dark
-            [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50),  // Warning-dark
-            [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60),   // Success-dark
-            [ChatType.CrossLinkshell4] = ColourUtil.ComponentsToRgba(0, 190, 210),   // Brand Cyan
-            [ChatType.CrossLinkshell5] = ColourUtil.ComponentsToRgba(0, 151, 167),   // Cyan-dark
-            [ChatType.CrossLinkshell6] = ColourUtil.ComponentsToRgba(0, 110, 130),   // Cyan-darker
-            [ChatType.CrossLinkshell7] = ColourUtil.ComponentsToRgba(220, 90, 30),   // Ember-medium
-            [ChatType.CrossLinkshell8] = ColourUtil.ComponentsToRgba(170, 60, 60),   // Danger-dark
+            [ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning #F0AD4E
+            [ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember #F97316
+            [ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success #5CB85C
+            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark #E85D04
+            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
+            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light
+            [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60), // Ember-light #FB923C
+            [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning
+            [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success
+            [ChatType.Linkshell4] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light
+            [ChatType.Linkshell5] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
+            [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark
+            [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember
+            [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79), // Danger #D9534F
+            [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark
+            [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50), // Warning-dark
+            [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60), // Success-dark
+            [ChatType.CrossLinkshell4] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
+            [ChatType.CrossLinkshell5] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark
+            [ChatType.CrossLinkshell6] = ColourUtil.ComponentsToRgba(0, 110, 130), // Cyan-darker
+            [ChatType.CrossLinkshell7] = ColourUtil.ComponentsToRgba(220, 90, 30), // Ember-medium
+            [ChatType.CrossLinkshell8] = ColourUtil.ComponentsToRgba(170, 60, 60), // Danger-dark
        };
    }

-    // Bonus preset — Night Blue, KAZAMA-Stimmungs-Theme aus
-    // /mnt/HDD-Data1/Obsidian/Vault/Systeme/KAZAMA/Theming/Night Blue + Indigo Violet Themes.md
-    // Klassisch, kühl, technisch — Marineblau-Tiefe ohne Lila-Anteil.
-    // Bewusst NICHT als Brand-Preset markiert (Vault-Boundary): die KAZAMA-Themes
-    // sind persönliche Stimmungs-Themes, nicht Teil des Hellion-Brand-Systems.
+    // Night Blue — cool nautical theme, deep navy without purple.
    private static IReadOnlyDictionary<ChatType, uint> BuildNightBlue()
    {
        return new Dictionary<ChatType, uint>
        {
-            // Standard / Tell — Royal Blue Akzent-Familie
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247),         // text-primary
-            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255),// akzent-hot
+            [ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247), // text-primary
+            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255), // akzent-hot
            [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
-
-            // Laute Channels — Warning/Danger Status-Töne
-            [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74),         // warning
-            [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122),        // danger
-
-            // Gruppen — Success/Akzent-Variations
-            [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151),        // success
-            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100),    // warm-orange-light
-            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226),  // akzent-primary
-            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191),// text-dim
-
-            // Linkshells 1-8 — über Spektrum verteilt
+            [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74), // warning
+            [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122), // danger
+            [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), // success
+            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), // warm-orange-light
+            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
+            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191), // text-dim
            [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
            [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100),
            [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130),
@@ -256,8 +235,6 @@ public static class ChatColourPresets
            [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(100, 200, 220),
            [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(106, 176, 255),
            [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(140, 160, 191),
-
-            // CrossWorld-Linkshells — gedämpfte Variants
            [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50),
            [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80),
            [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60),
@@ -269,30 +246,20 @@ public static class ChatColourPresets
        };
    }

-    // Bonus preset — Indigo Violet, KAZAMA-Stimmungs-Theme aus demselben
-    // Vault-Doc. Warm-mystisch, "Galaxy/Glitter/Nordlicht" — tiefes Indigo
-    // mit kräftigem Violet-Akzent. Persönlicher Favorit (siehe Vault).
-    // Auch nicht als Brand-Preset (siehe NightBlue-Note oben).
+    // Indigo Violet — warm-mystic theme, deep indigo with violet accent.
    private static IReadOnlyDictionary<ChatType, uint> BuildIndigoViolet()
    {
        return new Dictionary<ChatType, uint>
        {
-            // Standard / Tell — Royal Violet Akzent-Familie
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255),         // text-primary (light lavender)
-            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255),// akzent-hot
+            [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary
+            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255), // akzent-hot
            [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
-
-            // Laute Channels — geteilt mit Night Blue (Status-Farben)
            [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74),
            [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122),
-
-            // Gruppen
            [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151),
            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100),
-            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222),  // akzent-primary
-            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208),// text-dim
-
-            // Linkshells 1-8
+            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
+            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208), // text-dim
            [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
            [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100),
            [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130),
@@ -301,8 +268,6 @@ public static class ChatColourPresets
            [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(139, 77, 222),
            [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(130, 90, 200),
            [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(168, 144, 208),
-
-            // CrossWorld-Linkshells
            [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50),
            [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80),
            [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60),
@@ -114,6 +114,40 @@ internal class HellionStrings
    internal static string Wizard_Profile_FullHistory_GdprWarning => Get(nameof(Wizard_Profile_FullHistory_GdprWarning));
    internal static string Wizard_Profile_FullHistory_Apply => Get(nameof(Wizard_Profile_FullHistory_Apply));
    internal static string Wizard_Reopen_Button => Get(nameof(Wizard_Reopen_Button));
+    internal static string Wizard_Cancel_Label => Get(nameof(Wizard_Cancel_Label));
+    internal static string Wizard_Cancel_Tooltip => Get(nameof(Wizard_Cancel_Tooltip));
+    internal static string Wizard_Step1_Title => Get(nameof(Wizard_Step1_Title));
+    internal static string Wizard_Step1_Subtitle => Get(nameof(Wizard_Step1_Subtitle));
+    internal static string Wizard_Step1_Footer_Hint => Get(nameof(Wizard_Step1_Footer_Hint));
+    internal static string Wizard_Step1_Skip_Label => Get(nameof(Wizard_Step1_Skip_Label));
+    internal static string Wizard_Step1_Skip_Tooltip => Get(nameof(Wizard_Step1_Skip_Tooltip));
+    internal static string Wizard_Step2_Title => Get(nameof(Wizard_Step2_Title));
+    internal static string Wizard_Step2_RecommendedFooter => Get(nameof(Wizard_Step2_RecommendedFooter));
+    internal static string Wizard_Profile_Roleplay_Heading => Get(nameof(Wizard_Profile_Roleplay_Heading));
+    internal static string Wizard_Profile_Roleplay_Description => Get(nameof(Wizard_Profile_Roleplay_Description));
+    internal static string Wizard_Profile_Roleplay_Apply => Get(nameof(Wizard_Profile_Roleplay_Apply));
+    internal static string Wizard_Nav_Back => Get(nameof(Wizard_Nav_Back));
+    internal static string Wizard_Nav_Next => Get(nameof(Wizard_Nav_Next));
+    internal static string Wizard_Nav_Finish => Get(nameof(Wizard_Nav_Finish));
+    internal static string Wizard_Step3_Title => Get(nameof(Wizard_Step3_Title));
+    internal static string Wizard_Step3_Section_History => Get(nameof(Wizard_Step3_Section_History));
+    internal static string Wizard_Step3_Section_TellTabs => Get(nameof(Wizard_Step3_Section_TellTabs));
+    internal static string Wizard_Step3_Section_Visual => Get(nameof(Wizard_Step3_Section_Visual));
+    internal static string Wizard_Step3_LoadPreviousSession_Label => Get(nameof(Wizard_Step3_LoadPreviousSession_Label));
+    internal static string Wizard_Step3_FilterIncludePreviousSessions_Label => Get(nameof(Wizard_Step3_FilterIncludePreviousSessions_Label));
+    internal static string Wizard_Step3_AutoTellTabsHistoryPreload_Label => Get(nameof(Wizard_Step3_AutoTellTabsHistoryPreload_Label));
+    internal static string Wizard_Step3_UseCompactDensity_Label => Get(nameof(Wizard_Step3_UseCompactDensity_Label));
+    internal static string Wizard_Step3_PrettierTimestamps_Label => Get(nameof(Wizard_Step3_PrettierTimestamps_Label));
+    internal static string Wizard_Step3_Theme_Label => Get(nameof(Wizard_Step3_Theme_Label));
+    internal static string Wizard_Step4_Title => Get(nameof(Wizard_Step4_Title));
+    internal static string Wizard_Step4_SummaryHeading => Get(nameof(Wizard_Step4_SummaryHeading));
+    internal static string Wizard_Step4_Summary_Profile => Get(nameof(Wizard_Step4_Summary_Profile));
+    internal static string Wizard_Step4_Summary_History => Get(nameof(Wizard_Step4_Summary_History));
+    internal static string Wizard_Step4_Summary_TellTabs => Get(nameof(Wizard_Step4_Summary_TellTabs));
+    internal static string Wizard_Step4_Summary_Visual => Get(nameof(Wizard_Step4_Summary_Visual));
+    internal static string Wizard_Step4_Summary_Unchanged => Get(nameof(Wizard_Step4_Summary_Unchanged));
+    internal static string Wizard_Step4_TestHint => Get(nameof(Wizard_Step4_TestHint));
+    internal static string Wizard_Step4_SettingsHint => Get(nameof(Wizard_Step4_SettingsHint));

    internal static string Export_Heading => Get(nameof(Export_Heading));
    internal static string Export_Help => Get(nameof(Export_Help));
@@ -168,6 +202,16 @@ internal class HellionStrings
    internal static string AutoTellTabs_HistoryLoadError => Get(nameof(AutoTellTabs_HistoryLoadError));
    internal static string AutoTellTabs_GreetedTooltip => Get(nameof(AutoTellTabs_GreetedTooltip));
    internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip));
+    internal static string PinTab_MenuPin => Get(nameof(PinTab_MenuPin));
+    internal static string PinTab_MenuUnpin => Get(nameof(PinTab_MenuUnpin));
+    internal static string PinTab_MenuPromote => Get(nameof(PinTab_MenuPromote));
+    internal static string PinTab_PromoteTooltip => Get(nameof(PinTab_PromoteTooltip));
+    internal static string PinTab_LimitReached => Get(nameof(PinTab_LimitReached));
+    internal static string PinTab_PinnedTooltip => Get(nameof(PinTab_PinnedTooltip));
+    internal static string PinTab_PinTooltip => Get(nameof(PinTab_PinTooltip));
+    internal static string PinTab_SectionHeader => Get(nameof(PinTab_SectionHeader));
+    internal static string Settings_ThemeAndLayout_SidebarWidth_Name => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Name));
+    internal static string Settings_ThemeAndLayout_SidebarWidth_Description => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Description));

    // Hellion Chat — Auto-Tell-Tabs Chat settings tab
    internal static string ChatLog_AutoTellTabs_Section_Title => Get(nameof(ChatLog_AutoTellTabs_Section_Title));
@@ -239,6 +283,7 @@ internal class HellionStrings
    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));
+    internal static string Settings_Language_FFXIVCoverage_Warning => Get(nameof(Settings_Language_FFXIVCoverage_Warning));

    // Hellion Chat — Appearance-Tab section headings
    internal static string Settings_Appearance_Theme_Heading => Get(nameof(Settings_Appearance_Theme_Heading));
@@ -258,6 +303,10 @@ internal class HellionStrings
    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 — Chat-Tab SymbolPicker
+    internal static string Settings_Chat_SymbolPicker_Enable_Name => Get(nameof(Settings_Chat_SymbolPicker_Enable_Name));
+    internal static string Settings_Chat_SymbolPicker_Enable_Description => Get(nameof(Settings_Chat_SymbolPicker_Enable_Description));
+
    // 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));
@@ -368,6 +417,8 @@ internal class HellionStrings
    internal static string Settings_Integrations_Honorific_Status_Incompatible => Get(nameof(Settings_Integrations_Honorific_Status_Incompatible));
    internal static string Settings_Integrations_Honorific_Toggle => Get(nameof(Settings_Integrations_Honorific_Toggle));
    internal static string Settings_Integrations_Honorific_ToggleHint => Get(nameof(Settings_Integrations_Honorific_ToggleHint));
+    internal static string Settings_Integrations_Honorific_Glow_Toggle => Get(nameof(Settings_Integrations_Honorific_Glow_Toggle));
+    internal static string Settings_Integrations_Honorific_Glow_Hint => Get(nameof(Settings_Integrations_Honorific_Glow_Hint));
    internal static string Settings_Integrations_Honorific_LinkRepo => Get(nameof(Settings_Integrations_Honorific_LinkRepo));
    internal static string Settings_Integrations_Honorific_LinkAuthor => Get(nameof(Settings_Integrations_Honorific_LinkAuthor));
    internal static string Settings_Integrations_ComingSoon_SectionHeader => Get(nameof(Settings_Integrations_ComingSoon_SectionHeader));
@@ -388,4 +439,34 @@ internal class HellionStrings

    // Hellion Chat — v1.3.0 Honorific title slot tooltip
    internal static string ChatHeader_HonorificTitle_Tooltip => Get(nameof(ChatHeader_HonorificTitle_Tooltip));
+
+    // Hellion Chat — v1.4.8 DbViewer full-text search toggle
+    internal static string DbViewer_FullTextToggle => Get(nameof(DbViewer_FullTextToggle));
+    internal static string DbViewer_FullTextToggle_Hint_Indexing => Get(nameof(DbViewer_FullTextToggle_Hint_Indexing));
+    internal static string DbViewer_FullTextToggle_Hint_PhraseMode => Get(nameof(DbViewer_FullTextToggle_Hint_PhraseMode));
+
+    // Hellion Chat — v1.5.4 header quick-picker + reduce-motion toggle
+    internal static string Settings_QuickPicker_Tooltip => Get(nameof(Settings_QuickPicker_Tooltip));
+    internal static string Settings_QuickPicker_Themes_Header => Get(nameof(Settings_QuickPicker_Themes_Header));
+    internal static string Settings_QuickPicker_Tabs_Header => Get(nameof(Settings_QuickPicker_Tabs_Header));
+    internal static string Settings_ThemeAndLayout_ReduceMotion_Name => Get(nameof(Settings_ThemeAndLayout_ReduceMotion_Name));
+    internal static string Settings_ThemeAndLayout_ReduceMotion_Description => Get(nameof(Settings_ThemeAndLayout_ReduceMotion_Description));
+
+    // Failed-tell notification
+    internal static string FailedTell_Notification_Generic => Get(nameof(FailedTell_Notification_Generic));
+    internal static string FailedTell_Notification_Named => Get(nameof(FailedTell_Notification_Named));
+    internal static string Settings_Chat_NotifyFailedTell_Name => Get(nameof(Settings_Chat_NotifyFailedTell_Name));
+    internal static string Settings_Chat_NotifyFailedTell_Description => Get(nameof(Settings_Chat_NotifyFailedTell_Description));
+
+    // Per-tab notification sound
+    internal static string Tabs_NotificationSound_Enable_Name => Get(nameof(Tabs_NotificationSound_Enable_Name));
+    internal static string Tabs_NotificationSound_Description => Get(nameof(Tabs_NotificationSound_Description));
+    internal static string Tabs_NotificationSound_Option => Get(nameof(Tabs_NotificationSound_Option));
+    internal static string Tabs_NotificationSound_Preview => Get(nameof(Tabs_NotificationSound_Preview));
+    internal static string Tabs_NotificationSound_CustomOption => Get(nameof(Tabs_NotificationSound_CustomOption));
+
+    // Scroll-to-bottom and item/flag linking
+    internal static string ChatLog_ScrollToBottom_Tooltip => Get(nameof(ChatLog_ScrollToBottom_Tooltip));
+    internal static string ChatLog_Insert_MapFlag => Get(nameof(ChatLog_Insert_MapFlag));
+    internal static string ChatLog_Insert_ItemLink => Get(nameof(ChatLog_Insert_ItemLink));
 }
--- a/Show More
+++ b/Show More