feat(gui): Phase 2.2+2.5 — keyboard shortcuts, enhanced context menu, Phase2Tests (v6.18.0)

RajwanYair · RajwanYair · commit 983d68e82c60 · 2026-04-06T17:13:17.000+03:00
KeyboardShortcutsDialog (F1): 19 shortcuts, 4 groups, filterable, themed
ProcessCmdKey: F1/F5/Ctrl+F/Ctrl+L/Escape handling
Context menu: 6→11 items — ⭐ Toggle Favorite, Copy Reg Path, Open in Regedit, Show Dependencies, View History
Phase2Tests.cs: 24 new Core.Tests (+24 from 3,166 → 3,190 total)
Total: 7,189 tweaks, 3,190 tests (24/24 passing)
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -2,7 +2,7 @@
 
 > Auto-loaded by GitHub Copilot on every chat/agent session in this workspace.
 > Keep this file accurate — it is the fastest path to project understanding.
-> Last verified: 2026-04-07 (v6.17.0, ~7,189 tweaks, 122 categories, 3,166 tests).
+> Last verified: 2026-04-06 (v6.18.0, ~7,189 tweaks, 122 categories, 3,190 tests).
 
 ## Companion Instruction Files
 
@@ -79,12 +79,12 @@ Rules:
 | -------- | ------------------------------------------------------------------------ |
 | Language | C# 13 / .NET 10.0-windows (x64)                                          |
 | Build    | `dotnet build` / MSBuild via `RegiLattice.sln`                           |
-| Test     | xUnit 2.9.3 — 3,166 tests (0 failures)                                   |
+| Test     | xUnit 2.9.3 — 3,190 tests (0 failures)                                   |
 | GUI      | WinForms with 11 themes (Catppuccin Mocha/Latte, Nord, Dracula + 7 more) |
-| Version  | 6.17.0                                                                   |
+| Version  | 6.18.0                                                                   |
 | Install  | `dotnet build RegiLattice.sln -c Release`                                |
 | Tweaks   | 7,189 across 122 categories (146 files)                                 |
-| Tests    | 3160 passing (0 consistent failures)                                     |
+| Tests    | 3,190 passing (0 consistent failures)                                    |
 | NuGet    | System.Management 10.0.5, Microsoft.NET.Test.Sdk 17.14.1                 |
 
 ## Git Workflow (IMPORTANT — STANDING RULE)
diff --git a/.github/instructions/lessons-learned.instructions.md b/.github/instructions/lessons-learned.instructions.md
@@ -7,7 +7,7 @@ applyTo: "**/*.cs,**/tests/**,**/*Tests/**"
 > Accumulated hard-won insights from the Python → C# migration, test coverage sprints,
 > the 453-tweak restoration campaign, and the large-file splitting campaign.
 > These rules are **as important as the coding standards** — they prevent recurring mistakes.
-> Last updated: 2026-04-07 (v6.17.0, C# 13 / .NET 10.0-windows, ~7,189 tweaks, 122 categories, 3,166 tests)
+> Last updated: 2026-04-06 (v6.18.0, C# 13 / .NET 10.0-windows, ~7,189 tweaks, 122 categories, 3,190 tests)
 
 ---
 
diff --git a/.github/instructions/testing.instructions.md b/.github/instructions/testing.instructions.md
@@ -15,10 +15,10 @@ applyTo: "**/tests/**,**/*Tests/**,**/*Tests.csproj,**/test_*.py,**/conftest.py"
 
 | Project                  | Tests     | Covers                                                                                                                                                                         |
 | ------------------------ | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `RegiLattice.Core.Tests` | 2,369+    | TweakDef, TweakEngine, RegistrySession, Services, Plugins, Locale, SnapshotManager, TweakValidator, DependencyResolver, Favorites, TweakHistory, ConfigExporter, SystemMonitor, BatchImpactEstimator |
+| `RegiLattice.Core.Tests` | 2,393+    | TweakDef, TweakEngine, RegistrySession, Services, Plugins, Locale, SnapshotManager, TweakValidator, DependencyResolver, Favorites, TweakHistory, ConfigExporter, SystemMonitor, BatchImpactEstimator |
 | `RegiLattice.CLI.Tests`  | 434+      | CLI argument parsing (ParseArgs, CliArgs, ConsoleColorizer)                                                                                                                    |
 | `RegiLattice.GUI.Tests`  | 363+      | Theme, PackageManagerValidation, PackageNameValidator, AppIcons                                                                                                                |
-| **Total**                | **3,166+**|                                                                                                                                                                                |
+| **Total**                | **3,190+**|                                                                                                                                                                                |
 
 ## Running Tests
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
-﻿# Changelog
+# Changelog
 
 For the complete version history, see **[docs/CHANGELOG.md](docs/CHANGELOG.md)**.
 
-Latest: **v6.17.0** (2026-04-07) — Phase 3.2 batch recipe executor (`--batch-recipe`), Phase 3.5 watch mode drift detection (`--watch`), Phase 4.1 E2E scenario tests. 34 new tests (28 CLI + 6 GUI), 3,166 total.
+Latest: **v6.18.0** (2026-04-07) — Phase 3.2 batch recipe executor (`--batch-recipe`), Phase 3.5 watch mode drift detection (`--watch`), Phase 4.1 E2E scenario tests. 34 new tests (28 CLI + 6 GUI), 3,166 total.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,10 +19,10 @@
          Configuration Manager to the x64 platform.  Both are required. -->
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
-          <Version>6.17.0</Version>
-          <AssemblyVersion>6.17.0.0</AssemblyVersion>
-          <FileVersion>6.17.0.0</FileVersion>
-          <InformationalVersion>6.17.0</InformationalVersion>
+          <Version>6.18.0</Version>
+          <AssemblyVersion>6.18.0.0</AssemblyVersion>
+          <FileVersion>6.18.0.0</FileVersion>
+          <InformationalVersion>6.18.0</InformationalVersion>
     <Deterministic>true</Deterministic>
     <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
     <TieredCompilation>true</TieredCompilation>
diff --git a/README.md b/README.md
@@ -23,15 +23,15 @@
 ![Tests](https://img.shields.io/badge/tests-3166%20passing-brightgreen)
 ![Platform](https://img.shields.io/badge/platform-Windows%20x64-0078D6?logo=windows&logoColor=white)
 ![License](https://img.shields.io/badge/license-MIT-green)
-![Version](https://img.shields.io/badge/version-6.17.0-blue)
+![Version](https://img.shields.io/badge/version-6.18.0-blue)
 
 A comprehensive **Windows 10 / Windows 11 registry tweak toolkit** and system optimizer — debloater · privacy hardening tool · performance optimizer · security hardening · group policy alternative — with **7,189 verified tweaks** across **122 categories**, a **declarative RegOp engine**, a **full CLI** with 25+ commands, an **interactive console menu**, and a **WinForms GUI** with **11 switchable themes**. Built on **.NET 10 (C# 13)** for native performance on Windows 10/11 x64.
 
 ## Download & Install
 
 **Pre-built installer (recommended):**
 
-👉 **[Download RegiLattice v6.17.0](https://github.com/RajwanYair/RegiLattice/releases/latest)** (MSI installer + portable EXE) from the [Releases page](https://github.com/RajwanYair/RegiLattice/releases)
+👉 **[Download RegiLattice v6.18.0](https://github.com/RajwanYair/RegiLattice/releases/latest)** (MSI installer + portable EXE) from the [Releases page](https://github.com/RajwanYair/RegiLattice/releases)
 
 The MSI installer:
 - Installs **GUI** (`RegiLattice.GUI.exe`) under `Program Files\RegiLattice\GUI\`
diff --git a/chocolatey/regilattice.nuspec b/chocolatey/regilattice.nuspec
@@ -14,7 +14,7 @@
   <metadata>
     <id>regilattice</id>
     <!-- Version is replaced by the release workflow during choco pack -->
-    <version>6.17.0</version>
+    <version>6.18.0</version>
     <packageSourceUrl>https://github.com/RajwanYair/RegiLattice/tree/main/chocolatey</packageSourceUrl>
     <owners>RajwanYair</owners>
     <title>RegiLattice</title>
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,6 +4,37 @@ All notable changes to RegiLattice are documented here.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [6.18.0] — 2026-04-06
+
+### Added — Phase 2.2 + Phase 2.5: Keyboard Shortcuts & Enhanced Context Menu
+
+- **Keyboard shortcuts (Phase 2.2)**: `ProcessCmdKey` override in MainForm handles five
+  global shortcuts: F1 opens the new `KeyboardShortcutsDialog` (non-modal cheatsheet with
+  19 shortcuts in 4 groups, filterable search bar), F5 refreshes tweak status, Ctrl+F
+  focuses the search box, Ctrl+L toggles the log panel, Escape clears the search box.
+
+- **KeyboardShortcutsDialog**: New dialog in `Forms/KeyboardShortcutsDialog.cs` (174 lines).
+  Lists all keyboard shortcuts in a themed 3-column ListView (Keys / Action / Group).
+  Filterable by typing in the filter box. Closes with Escape or OK button. Non-modal so
+  the main window remains interactive while it is open.
+
+- **Enhanced context menu (Phase 2.5)**: `_listContextMenu` expanded from 6 to 11 items with
+  logical separator groups:
+  - Apply / Remove
+  - ⭐ Toggle Favorite (adds/removes from `Favorites`, appends ⭐/🗑 log line)
+  - Copy ID / Copy Registry Keys / Copy Registry Path / Open in Registry Editor
+  - Show Dependencies… (`TweakEngine.ResolveDependencies` → MessageBox with dep chain)
+  - View History… (`TweakHistory.ForTweak` → MessageBox showing apply/remove log per tweak)
+  - Select All / Deselect All
+
+#### Stats
+
+- Tests: 3,166 → **3,190** (+24; Phase2Tests.cs: 24 new Core tests for ctx menu, Favorites, TweakHistory, RegOp, ResolveDependencies)
+- Tweaks: 7,189 (unchanged)
+- Categories: 122 (unchanged)
+
+---
+
 ## [6.17.0] — 2026-04-07
 
 ### Added — Phase 3.2 + 3.5 + 4.1: Batch Recipes, Watch Mode, E2E Tests
diff --git a/docs/assets/architecture.svg b/docs/assets/architecture.svg
@@ -213,5 +213,5 @@
   </g>
 
   <!-- Version credit -->
-  <text x="1060" y="620" text-anchor="end" font-family="'Cascadia Code', monospace" font-size="10" fill="#45475a">RegiLattice v6.17.0</text>
+  <text x="1060" y="620" text-anchor="end" font-family="'Cascadia Code', monospace" font-size="10" fill="#45475a">RegiLattice v6.18.0</text>
 </svg>
diff --git a/docs/assets/banner.svg b/docs/assets/banner.svg
@@ -109,7 +109,7 @@
     <!-- Tests pill -->
     <rect x="610" y="430" width="160" height="36" rx="18" fill="#316044"/>
     <text x="627" y="454" font-size="13" font-weight="600" fill="#f9e2af">&#x2605;</text>
-    <text x="643" y="454" font-size="14" font-weight="600" fill="#cdd6f4">3 166 Tests</text>
+    <text x="643" y="454" font-size="14" font-weight="600" fill="#cdd6f4">3 190 Tests</text>
 
     <!-- Themes pill -->
     <rect x="790" y="430" width="155" height="36" rx="18" fill="#316044"/>
diff --git a/docs/assets/stats.svg b/docs/assets/stats.svg
@@ -35,7 +35,7 @@
   <g filter="url(#sh)" transform="translate(380, 30)">
     <rect width="150" height="140" rx="10" fill="#316044"/>
     <rect width="150" height="3" rx="2" fill="#f9e2af"/>
-    <text x="75" y="55" text-anchor="middle" font-family="'Segoe UI', Arial, sans-serif" font-weight="800" font-size="36" fill="#f9e2af">3 166</text>
+    <text x="75" y="55" text-anchor="middle" font-family="'Segoe UI', Arial, sans-serif" font-weight="800" font-size="36" fill="#f9e2af">3 190</text>
     <text x="75" y="80" text-anchor="middle" font-family="'Segoe UI', Arial, sans-serif" font-weight="600" font-size="14" fill="#cdd6f4">Tests</text>
     <text x="75" y="100" text-anchor="middle" font-family="'Cascadia Code', monospace" font-size="10" fill="#585b70">xUnit &#x2022; 0 failures</text>
     <text x="75" y="125" text-anchor="middle" font-size="28">&#x2705;</text>
diff --git a/gem/lib/regilattice/version.rb b/gem/lib/regilattice/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Regilattice
-  VERSION = '6.17.0'
+  VERSION = '6.18.0'
 end
diff --git a/installer/Package.wxs b/installer/Package.wxs
@@ -2,7 +2,7 @@
     <Package
         Name="RegiLattice"
         Manufacturer="YairRajwan"
-        Version="6.17.0"
+        Version="6.18.0"
         UpgradeCode="AC51EAE9-CC0B-4A17-92E0-070A64E83988"
         Compressed="yes"
         InstallerVersion="500">
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>com.rajwanyair</groupId>
   <artifactId>regilattice</artifactId>
-  <version>6.17.0</version>
+  <version>6.18.0</version>
   <packaging>pom</packaging>
 
   <name>RegiLattice</name>
diff --git a/npm/package.json b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rajwanyair/regilattice",
-  "version": "6.17.0",
+  "version": "6.18.0",
   "description": "RegiLattice — Windows registry tweak toolkit (7,189 tweaks across 122 categories)",
   "keywords": ["windows", "registry", "tweaks", "performance", "privacy", "security", "debloat"],
   "homepage": "https://github.com/RajwanYair/RegiLattice",
diff --git a/powershell/RegiLattice.psd1 b/powershell/RegiLattice.psd1
@@ -3,7 +3,7 @@
     # Auto-generated by PowerShellModuleGenerator.cs; hand-editable.
 
     # Module identity
-    ModuleVersion     = '6.17.0'
+    ModuleVersion     = '6.18.0'
     GUID              = 'a1b2c3d4-e5f6-7890-abcd-ef1234567890'
     Author            = 'YairRajwan'
     CompanyName       = 'RegiLattice'
diff --git a/scoop/regilattice.json b/scoop/regilattice.json
@@ -1,11 +1,11 @@
 {
-    "version": "6.17.0",
+    "version": "6.18.0",
     "description": "Windows registry tweak toolkit with 7,189 tweaks across 122 categories. GUI + CLI.",
     "homepage": "https://github.com/RajwanYair/RegiLattice",
     "license": "MIT",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/RajwanYair/RegiLattice/releases/download/v6.17.0/RegiLattice-v6.17.0-win-x64.zip",
+            "url": "https://github.com/RajwanYair/RegiLattice/releases/download/v6.18.0/RegiLattice-v6.17.0-win-x64.zip",
             "hash": "0000000000000000000000000000000000000000000000000000000000000000"
         }
     },
diff --git a/src/RegiLattice.GUI/Forms/KeyboardShortcutsDialog.cs b/src/RegiLattice.GUI/Forms/KeyboardShortcutsDialog.cs
@@ -0,0 +1,162 @@
+#nullable enable
+using System;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace RegiLattice.GUI.Forms;
+
+/// <summary>
+/// Phase 2.2 — Keyboard shortcut cheatsheet.
+/// Non-modal, themed, filterable two-column grid of all keyboard shortcuts.
+/// </summary>
+internal sealed class KeyboardShortcutsDialog : Form
+{
+    // ── Shortcut data ─────────────────────────────────────────────────────
+    private static readonly (string Keys, string Action, string Group)[] _shortcuts =
+    [
+        // Navigation & Search
+        ("Ctrl+F",          "Focus search box",             "Navigation"),
+        ("Esc",             "Clear search / close dialog",  "Navigation"),
+        ("F5",              "Refresh tweak status",          "Navigation"),
+        ("Ctrl+A",          "Select all tweaks",             "Navigation"),
+        ("Ctrl+D",          "Deselect all tweaks",           "Navigation"),
+        ("Ctrl+I",          "Invert selection",              "Navigation"),
+
+        // Tweak Operations
+        ("Ctrl+Enter",      "Apply selected tweaks",         "Operations"),
+        ("Ctrl+Delete",     "Remove selected tweaks",        "Operations"),
+        ("Ctrl+Z",          "Undo last operation",           "Operations"),
+        ("Ctrl+Y",          "Redo last operation",           "Operations"),
+        ("Space",           "Toggle checked state",          "Operations"),
+
+        // View & Panels
+        ("F1",              "Show keyboard shortcuts",       "View"),
+        ("Ctrl+L",          "Toggle log panel",              "View"),
+        ("Ctrl+Shift+P",    "Open Preferences",              "View"),
+
+        // File & Export
+        ("Ctrl+Shift+E",    "Export as PowerShell (.ps1)",   "File"),
+        ("Ctrl+Shift+J",    "Export selected IDs as JSON",   "File"),
+        ("Ctrl+Shift+R",    "Export as .REG file",           "File"),
+        ("Ctrl+Shift+I",    "Import tweak IDs from JSON",    "File"),
+    ];
+
+    // ── Controls ──────────────────────────────────────────────────────────
+    private readonly TextBox _filterBox;
+    private readonly ListView _listView;
+
+    internal KeyboardShortcutsDialog()
+    {
+        Text = "Keyboard Shortcuts — RegiLattice";
+        Size = new Size(640, 480);
+        MinimumSize = new Size(480, 360);
+        FormBorderStyle = FormBorderStyle.Sizable;
+        StartPosition = FormStartPosition.CenterParent;
+        BackColor = AppTheme.Bg;
+        ForeColor = AppTheme.Fg;
+        ShowInTaskbar = false;
+        KeyPreview = true;
+
+        // Filter box
+        var filterLabel = new Label
+        {
+            Text = "Filter:",
+            AutoSize = true,
+            Location = new Point(12, 14),
+            ForeColor = AppTheme.Fg,
+            Font = AppTheme.Regular,
+        };
+
+        _filterBox = new TextBox
+        {
+            Location = new Point(60, 10),
+            Width = 220,
+            BackColor = AppTheme.Surface,
+            ForeColor = AppTheme.Fg,
+            BorderStyle = BorderStyle.FixedSingle,
+            Font = AppTheme.Regular,
+        };
+        _filterBox.TextChanged += (_, _) => ApplyFilter();
+
+        // ListView
+        _listView = new ListView
+        {
+            Location = new Point(12, 44),
+            Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right,
+            View = View.Details,
+            FullRowSelect = true,
+            GridLines = false,
+            BorderStyle = BorderStyle.None,
+            BackColor = AppTheme.Surface,
+            ForeColor = AppTheme.Fg,
+            Font = AppTheme.Regular,
+            HeaderStyle = ColumnHeaderStyle.Nonclickable,
+        };
+        _listView.Columns.AddRange(new[]
+        {
+            new ColumnHeader { Text = "Keys",   Width = 160 },
+            new ColumnHeader { Text = "Action", Width = 280 },
+            new ColumnHeader { Text = "Group",  Width = 120 },
+        });
+
+        // Close button
+        var btnClose = new Button
+        {
+            Text = "Close",
+            DialogResult = DialogResult.OK,
+            Anchor = AnchorStyles.Bottom | AnchorStyles.Right,
+            BackColor = AppTheme.Surface2,
+            ForeColor = AppTheme.Fg,
+            FlatStyle = FlatStyle.Flat,
+            Font = AppTheme.Regular,
+        };
+        btnClose.FlatAppearance.BorderColor = AppTheme.Border;
+
+        Controls.AddRange(new Control[] { filterLabel, _filterBox, _listView, btnClose });
+        AcceptButton = btnClose;
+        CancelButton = btnClose;
+
+        // Position close button after controls are added
+        Resize += (_, _) => btnClose.Location = new Point(Width - btnClose.Width - 20, Height - btnClose.Height - 45);
+        btnClose.Size = new Size(80, 28);
+
+        KeyDown += (_, e) =>
+        {
+            if (e.KeyCode == Keys.Escape)
+                Close();
+        };
+
+        PopulateList(_shortcuts);
+        btnClose.Location = new Point(Width - btnClose.Width - 20, Height - btnClose.Height - 45);
+    }
+
+    private void ApplyFilter()
+    {
+        var q = _filterBox.Text.Trim();
+        var filtered = string.IsNullOrEmpty(q)
+            ? _shortcuts
+            : _shortcuts.Where(s =>
+                s.Keys.Contains(q, StringComparison.OrdinalIgnoreCase) ||
+                s.Action.Contains(q, StringComparison.OrdinalIgnoreCase) ||
+                s.Group.Contains(q, StringComparison.OrdinalIgnoreCase))
+              .ToArray();
+        PopulateList(filtered);
+    }
+
+    private void PopulateList((string Keys, string Action, string Group)[] items)
+    {
+        _listView.BeginUpdate();
+        _listView.Items.Clear();
+        foreach (var (k, a, g) in items)
+        {
+            var lvi = new ListViewItem([k, a, g])
+            {
+                BackColor = AppTheme.Surface,
+                ForeColor = AppTheme.Fg,
+            };
+            _listView.Items.Add(lvi);
+        }
+        _listView.EndUpdate();
+    }
+}
diff --git a/src/RegiLattice.GUI/Forms/MainForm.Designer.cs b/src/RegiLattice.GUI/Forms/MainForm.Designer.cs
diff --git a/src/RegiLattice.GUI/Forms/MainForm.cs b/src/RegiLattice.GUI/Forms/MainForm.cs
diff --git a/tests/RegiLattice.Core.Tests/Phase2Tests.cs b/tests/RegiLattice.Core.Tests/Phase2Tests.cs
diff --git a/winget/RegiLattice.RegiLattice.installer.yaml b/winget/RegiLattice.RegiLattice.installer.yaml
diff --git a/winget/RegiLattice.RegiLattice.locale.en-US.yaml b/winget/RegiLattice.RegiLattice.locale.en-US.yaml
diff --git a/winget/RegiLattice.RegiLattice.yaml b/winget/RegiLattice.RegiLattice.yaml
