Release v0.6.40: align tagged source and Windows version metadata

Release v0.6.39: isolate history UI and image clipboard memory
Release v0.6.38: avoid unnecessary RichEdit and cancel hidden history previews
2026-11-04 19:45:52 +02:00 · 2026-11-04 19:40:54 +02:00 · 2026-11-04 17:24:57 +02:00 · 2026-11-04 16:58:34 +02:00
28 changed files with 1225 additions and 81 deletions
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.24)
-project(KSwitcher VERSION 0.6.36 LANGUAGES CXX RC)
+project(KSwitcher VERSION 0.6.40 LANGUAGES CXX RC)
 if(NOT WIN32)
  message(FATAL_ERROR "KSwitcher uses native Windows APIs")
 endif()
@@ -48,6 +48,7 @@ else()
 endif()
 add_executable(KSwitcherOcrTests tests/ocr.cpp src/screenshot_launcher.cpp src/screenshot_activation.cpp src/app.cpp src/screenshot_notifications.cpp src/screenshot.cpp src/configuration.cpp src/ui.cpp resources/app.rc)
 target_link_libraries(KSwitcherOcrTests PRIVATE kscore)
 add_dependencies(KSwitcherOcrTests KSwitcherScreenshot)
 if(MSVC)
  set_property(TARGET kscore KSwitcher KSwitcherConfig KSwitcherScreenshot KSwitcherTests KSwitcherScrollTests KSwitcherIntegration KSwitcherInputTests KSwitcherOcrTests PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
  target_compile_options(kscore PRIVATE /W4 /utf-8)
@@ -65,6 +66,40 @@ else()
  target_link_options(KSwitcherOcrTests PRIVATE -static -static-libgcc -static-libstdc++)
 endif()
 enable_testing()
 add_executable(KSwitcherHistoryHostTests tests/history_host.cpp)
 target_link_libraries(KSwitcherHistoryHostTests PRIVATE kscore psapi)
 set_target_properties(KSwitcherHistoryHostTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/history-host-fixture-$<CONFIG>")
 add_dependencies(KSwitcherHistoryHostTests KSwitcher KSwitcherScreenshot)
 add_custom_command(TARGET KSwitcherHistoryHostTests POST_BUILD
  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:KSwitcher>" "$<TARGET_FILE_DIR:KSwitcherHistoryHostTests>/KSwitcher.exe"
  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:KSwitcherScreenshot>" "$<TARGET_FILE_DIR:KSwitcherHistoryHostTests>/KSwitcher.Screenshot.exe"
  COMMAND ${CMAKE_COMMAND} -E touch "$<TARGET_FILE_DIR:KSwitcherHistoryHostTests>/.local-dev")
 if(MSVC)
  target_compile_options(KSwitcherHistoryHostTests PRIVATE /utf-8)
  set_property(TARGET KSwitcherHistoryHostTests PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 else()
  target_link_options(KSwitcherHistoryHostTests PRIVATE -static -static-libgcc -static-libstdc++)
 endif()
 add_executable(KSwitcherClipboardSnapshotTests tests/clipboard_snapshot.cpp)
 target_link_libraries(KSwitcherClipboardSnapshotTests PRIVATE kscore psapi)
 add_dependencies(KSwitcherClipboardSnapshotTests KSwitcherScreenshot)
 if(MSVC)
  target_compile_options(KSwitcherClipboardSnapshotTests PRIVATE /utf-8)
  set_property(TARGET KSwitcherClipboardSnapshotTests PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 else()
  target_link_options(KSwitcherClipboardSnapshotTests PRIVATE -static -static-libgcc -static-libstdc++)
 endif()
 add_executable(KSwitcherImageCaptureTests tests/image_capture.cpp)
 target_link_libraries(KSwitcherImageCaptureTests PRIVATE kscore)
 add_dependencies(KSwitcherImageCaptureTests KSwitcherScreenshot)
 if(MSVC)
  target_compile_options(KSwitcherImageCaptureTests PRIVATE /utf-8)
  set_property(TARGET KSwitcherImageCaptureTests PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 else()
  target_link_options(KSwitcherImageCaptureTests PRIVATE -static -static-libgcc -static-libstdc++)
 endif()
 # Explicit interactive test: stop the resident first so its clipboard listener
 # does not capture the test fixtures. Like KSwitcherIntegration, not part of ctest.
 add_executable(KSwitcherDictionaryTests tests/dictionary.cpp)
 target_link_libraries(KSwitcherDictionaryTests PRIVATE kscore psapi)
 if(MSVC)
@@ -711,3 +711,19 @@ From v0.6.31, KSwitcher recovers trailing ordinary spaces omitted by Ctrl+C only
 ### Notification registration and Viber — v0.6.36
 Notification registration runs in KSwitcher.Screenshot.exe; keep all three executables together. Startup registration is asynchronous. Viber pastes allow 75 ms for clipboard notifications before Ctrl+V, retaining focus, ownership and selection checks. This mitigates an intermittent clipboard timing issue; it does not guarantee all Viber failures are resolved. UI Automation is unchanged.
 ### Image history, OCR and duplicate fingerprints — v0.6.37
 Image clipboard capture and automatic/uncached manual history OCR run in short-lived KSwitcher.Screenshot.exe processes. Keep all three executables together. Original clipboard formats, image limits, privacy exclusions, Windows OCR, optional Tesseract and searchable encrypted OCR results are preserved. Background OCR is cancelled on shutdown or an OCR-profile change; late results do not recreate deleted entries.
 Consecutive duplicates use SHA-256 fingerprints inside the encrypted history index, including pixel fingerprints for equivalent image encodings. Older entries acquire fingerprints on first comparison without a bulk migration. Pins and OCR caches survive duplicate detection; non-consecutive copies still create separate entries. New text no longer loads the preceding image to rule out a duplicate. No shortcut, setting or default changed.
 Moving OCR isolates its temporary memory rather than reducing the combined processing peak. A controlled three-run comparison retained about 0.8 MiB less private RAM in the caller after recognition; combined peak RAM was about 55.6 MiB before and 56.6 MiB with the helper. Results depend on the image, OCR engine and system.
 ### History process and clipboard memory — v0.6.40
 History opens in a separate, short-lived instance of **KSwitcher.exe**. **Esc** closes it even when focus is on the window or an action button, releasing Windows UI allocations with the process. The resident keeps keyboard hooks, clipboard capture and history storage. Search, selection and the top entry are preserved in encrypted view state. If a full-text item viewer is still open, the helper stays alive until the last viewer closes. Pin/delete, formatted/plain paste and OCR remain available; settings and default shortcuts are unchanged.
 Image thumbnails are decoded in **KSwitcher.Screenshot.exe**, returning only bounded preview pixels. Image clipboard backup/restore also uses that helper and encrypted temporary files, with clipboard-sequence checks before restoring. Selection reads avoid loading image formats. Keep all three executables together; no fourth executable is required. Paste allows a brief foreground handoff after history closes while preserving cancellation checks. UI Automation remains in the resident.
 A live development-build test measured **4.37 MiB before history and 4.35 MiB after two open/Esc cycles**, compared with an earlier roughly 8–9 MiB plateau. A same-image clipboard-backup benchmark retained **12.78 MiB before versus 0.05 MiB after**. These measure private working set, not a guaranteed total footprint. Include all helpers when measuring active use: combined memory can be higher while history is open. No forced working-set trimming is used. Existing screenshots and shortcuts remain applicable. The v0.6.38 approach of retaining a hidden history window/RichEdit control is superseded by process termination.
@@ -1,22 +1,24 @@
 # Latest Windows release
-## v0.6.36 — 2026-11-04
+## v0.6.40 — 2026-11-04
 v0.6.40 supersedes v0.6.39 to align Windows resource version metadata in the tagged source with the shipped binaries. Functional memory fixes are unchanged.
 ## Changes
- Notification registration now runs in the existing KSwitcher.Screenshot.exe helper. Startup launches it asynchronously and checks its exit status without blocking keyboard work; update notification registration waits in its background worker. Keep all three executables together. UI Automation and notification activation routes remain unchanged.
+- Clipboard history runs in a separate, short-lived instance of KSwitcher.exe. Closing history with Esc releases its UI process instead of retaining Windows UI allocations in the resident. Esc also works when the window itself or an action button has focus.
- Viber paste now allows 75 ms for clipboard notifications to settle before sending Ctrl+V, then rechecks input, focus and clipboard ownership. This mitigates a suspected clipboard timing race: an intermittent corrupted Cyrillic paste was reproduced on the prior build. It is not a guarantee that every Viber timing issue is resolved; no blind paste retries or relaxed selection checks were added.
+- Search, selected/top entry, pinning, deletion, formatted/plain paste and OCR remain available. Search and selection are saved in encrypted view state. An open full-text viewer keeps the history process alive until that viewer closes.
- Added regression coverage for an explicitly selected middle range followed by a repeated shortcut without selection, preserving surrounding text, trailing spaces and the original clipboard. Updated the integration fixture to initialize shared predictor dictionaries.
+- Large image clipboard backups and image thumbnail decoding run in KSwitcher.Screenshot.exe. Encrypted temporary files and clipboard-sequence checks preserve the clipboard without keeping full backup images in the resident. Selection reads avoid unnecessary image copies.
- Added reproducible standalone COM, UI Automation and Shell memory measurement tools. No shortcuts, settings or defaults changed.
+- History paste waits briefly for the target application's foreground activation after the history process closes, while retaining input and clipboard ownership checks. Settings and default shortcuts are unchanged; UI Automation remains in the resident.
-## Validation
+## Validation and memory
-Full staged build and tests cover dictionary equivalence for all 140,939 words, 105 sync checks, wheel batching, 304 native checks, 559 input checks, screenshot UI/PNG/registration, 48 updater checks and updater progress UI. Conversion integration passed 43 assertions. Eight actual Viber conversions passed on the development build, including two complete long-text layout cycles and selected/repeated middle-word conversion; test messages were not sent.
+The complete staged build passed dictionary equivalence (140,939 words), 105 sync checks, 315 native checks, 561 input checks, screenshot UI/save/registration, 48 updater checks and progress UI, clipboard snapshot/image capture integration, conversion/snippet integration and Windows OCR. Dedicated 500-entry history tests cover repeated Esc, search persistence, pin/delete, full-viewer lifetime, text/image paste, clipboard restoration, rejected foreign requests and helper shutdown. Actual selected/repeated Viber conversion and live Esc were also checked during development.
-A controlled fresh-launch before/after comparison (five private-working-set samples each, same installation and settings) measured 4.69 → 4.18 MiB, about 0.51 MiB saved. This is one local comparison, not a fixed memory limit or a long-term idle guarantee. The prior compact dictionaries and cache/idle memory reductions remain included.
+A local live development-build comparison measured **4.37 MiB before opening history and 4.35 MiB after two open/Esc cycles**, versus an earlier roughly 8–9 MiB plateau after closing history. A same-image backup benchmark reduced retained private resident memory from 12.78 MiB to 0.05 MiB. These are workload-specific observations, not a guaranteed footprint. Count all helper processes while history/OCR is active: combined active memory can be higher. No forced working-set trimming was used.
 ## Upgrade
 Choose **Update** in the tray menu. Legacy v0.3.0–v0.4.1 clients first receive the v0.4.2 compatibility bridge, then the current full release. v0.2.3 and earlier require manual installation.
 For manual installation, exit KSwitcher, close screenshot editors and extract the entire ZIP into its installation folder. Keep personal `data/` and customized dictionaries.
-Download **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**. Keep all three executables together. The package contains no personal settings, credentials or clipboard history.
+Download **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**. Keep all three executables together; history uses another instance of KSwitcher.exe, so no fourth executable is required. The package contains no personal settings, credentials or clipboard history.
 Publish stable `release-vX.Y.Z` tags matching the executable version. Keep `v0.4.2` as the last legacy tag.
@@ -1 +1 @@
-794d74113bddf13ffee7317cadee9c472bca3b84b3361796db58ff8023f66571  KSwitcher-win-x64.zip
+cbe7839c849758b4623939dc025ec246a9fb97f5587df37ca6c3bd8eec244136  KSwitcher-win-x64.zip
@@ -37,7 +37,7 @@ try {
    if ($LASTEXITCODE) { throw 'Configurator link failed' }
    Copy-Item -LiteralPath $configPath -Destination build/release/KSwitcher.Config.exe -Force
    $screenshotPath = Join-Path (Split-Path $executablePath) 'KSwitcher.Screenshot.exe'
-    & $compiler -mwindows -municode -static -s '-Wl,--gc-sections' build/core.o build/platform.o build/ocr.o build/screenshot.o build/screenshot_notifications.o build/screenshot_activation.o build/screenshot_main.o build/screenshot-res.o @libs -o $screenshotPath
+    & $compiler -mwindows -municode -static -s '-Wl,--gc-sections' build/core.o build/platform.o build/storage.o build/ocr.o build/screenshot.o build/screenshot_notifications.o build/screenshot_activation.o build/screenshot_main.o build/screenshot-res.o @libs -o $screenshotPath
    if ($LASTEXITCODE) { throw 'Screenshot link failed' }
    Copy-Item -LiteralPath $screenshotPath -Destination build/release/KSwitcher.Screenshot.exe -Force
    if ($Test) {
@@ -81,15 +81,35 @@ try {
        if ($LASTEXITCODE) { throw 'Updater progress UI tests failed' }
    }
    if ($Integration) {
        $historyFixture = Join-Path (Resolve-Path build) ('history-host-fixture-' + [guid]::NewGuid().ToString('N'))
        New-Item -ItemType Directory $historyFixture | Out-Null
        Copy-Item $executablePath,(Join-Path (Split-Path $executablePath) 'KSwitcher.Screenshot.exe') -Destination $historyFixture
        Set-Content (Join-Path $historyFixture '.local-dev') 'Isolated history integration test'
        $historyTest = Join-Path $historyFixture 'KSwitcherHistoryHostTests.exe'
        & $compiler @common tests/history_host.cpp build/core.o build/platform.o build/storage.o build/ocr.o @libs -lpsapi -static -s -o $historyTest
        if ($LASTEXITCODE) { throw 'History host test build failed' }
        & $historyTest
        if ($LASTEXITCODE) { throw 'History host tests failed' }
        $snapshotTest = Join-Path (Split-Path $executablePath) 'KSwitcherClipboardSnapshotTests.exe'
        & $compiler @common tests/clipboard_snapshot.cpp build/core.o build/platform.o build/storage.o build/ocr.o @libs -lpsapi -static -s -o $snapshotTest
        if ($LASTEXITCODE) { throw 'Clipboard snapshot test build failed' }
        & $snapshotTest
        if ($LASTEXITCODE) { throw 'Clipboard snapshot tests failed' }
        $captureTest = Join-Path (Split-Path $executablePath) 'KSwitcherImageCaptureTests.exe'
        & $compiler @common tests/image_capture.cpp build/core.o build/platform.o build/storage.o build/ocr.o @libs -static -s -o $captureTest
        if ($LASTEXITCODE) { throw 'Image capture test build failed' }
        & $captureTest
        if ($LASTEXITCODE) { throw 'Image capture tests failed' }
        & $compiler @common tests/integration.cpp build/core.o build/platform.o build/autostart.o build/autocorrect.o build/storage.o build/sync.o build/ocr.o build/richtext.o build/update.o build/screenshot.o build/screenshot_launcher.o build/screenshot_activation.o build/screenshot_notifications.o build/app.o build/configuration.o build/ui.o build/screenshot-res.o @libs -static -s -o build/KSwitcherIntegration.exe
        if ($LASTEXITCODE) { throw 'Integration test build failed' }
        & .\build\KSwitcherIntegration.exe
        if ($LASTEXITCODE) { throw 'Integration tests failed' }
    }
    if ($Ocr) {
-        & $compiler @common tests/ocr.cpp build/core.o build/platform.o build/autostart.o build/autocorrect.o build/storage.o build/sync.o build/ocr.o build/richtext.o build/update.o build/screenshot.o build/screenshot_launcher.o build/screenshot_activation.o build/screenshot_notifications.o build/app.o build/configuration.o build/ui.o build/screenshot-res.o @libs -static -s -o build/KSwitcherOcrTests.exe
+        $ocrTest = Join-Path (Split-Path $executablePath) 'KSwitcherOcrTests.exe'
        & $compiler @common tests/ocr.cpp build/core.o build/platform.o build/autostart.o build/autocorrect.o build/storage.o build/sync.o build/ocr.o build/richtext.o build/update.o build/screenshot.o build/screenshot_launcher.o build/screenshot_activation.o build/screenshot_notifications.o build/app.o build/configuration.o build/ui.o build/screenshot-res.o @libs -static -s -o $ocrTest
        if ($LASTEXITCODE) { throw 'OCR test build failed' }
-        & .\build\KSwitcherOcrTests.exe
+        & $ocrTest
        if ($LASTEXITCODE) { throw 'OCR tests failed' }
    }
    foreach ($folder in @('build/dictionaries','build/release/dictionaries','build/staged/dictionaries')) {
@@ -9,8 +9,8 @@ IDC_SCREENSHOT_PENCIL CURSOR "icons/lucide/pencil.cur"
 1 RT_MANIFEST "app.manifest"
 201 RCDATA "update.ps1"
 1 VERSIONINFO
- FILEVERSION 0,6,36,0
+ FILEVERSION 0,6,40,0
- PRODUCTVERSION 0,6,36,0
+ PRODUCTVERSION 0,6,40,0
 FILEOS VOS_NT_WINDOWS32
 FILETYPE VFT_APP
 BEGIN
@@ -20,7 +20,7 @@ BEGIN
  BEGIN
   VALUE "FileDescription", "KSwitcher — native keyboard and clipboard utility"
   VALUE "ProductName", "KSwitcher"
-   VALUE "FileVersion", "0.6.36"
+   VALUE "FileVersion", "0.6.40"
  END
 END
 BLOCK "VarFileInfo"
@@ -15,6 +15,7 @@ namespace ks
 {
 #include "app_sync.inl"
 App *App::current = nullptr;
 #include "app_history.inl"
 namespace
 {
 const char *transformCommandName(int command)
@@ -71,7 +72,7 @@ class Transaction
    App &app;
    HWND target;
    uint64_t version;
-    Clip snapshot;
+    ClipboardSnapshot snapshot;
    DWORD expected{};
    bool captured{};
    mutable bool invalidLogged{};
@@ -87,7 +88,7 @@ class Transaction
        try
        {
            expected = GetClipboardSequenceNumber();
-            snapshot = readClipboard(app.window, 64 * 1024 * 1024);
+            snapshot.capture(app.window, expected);
            if (expected != GetClipboardSequenceNumber())
                throw std::runtime_error("Clipboard changed while taking snapshot");
            captured = true;
@@ -103,7 +104,7 @@ class Transaction
        if (captured && GetClipboardSequenceNumber() == expected)
            try
            {
-                app.ownSequence = writeClipboard(app.window, snapshot);
+                app.ownSequence = snapshot.restore(app.window, expected);
            }
            catch (...)
            {
@@ -131,7 +132,7 @@ class Transaction
        if (GetClipboardSequenceNumber() != expected)
        {
            auto now = GetClipboardSequenceNumber();
-            if (adopted.empty() || !ownsClipboard(target) || readClipboard(app.window).text() != adopted ||
+            if (adopted.empty() || !ownsClipboard(target) || readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection).text() != adopted ||
                GetClipboardSequenceNumber() != now)
                throw std::runtime_error("Operation cancelled: another application changed the clipboard");
            expected = now;
@@ -153,7 +154,7 @@ class Transaction
        if (GetClipboardOwner() != app.window)
            throw std::runtime_error("Clipboard changed immediately after writing");
        auto text = c.text();
-        if ((!text.empty() && readClipboard(app.window).text() != text) ||
+        if ((!text.empty() && readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection).text() != text) ||
            GetClipboardSequenceNumber() != expected)
            throw std::runtime_error("Clipboard changed while verifying our write");
    }
@@ -227,7 +228,7 @@ class Transaction
            changed != GetClipboardSequenceNumber())
            throw std::runtime_error("Operation cancelled: copy did not belong to the target application");
        expected = changed;
-        auto clip = readClipboard(app.window);
+        auto clip = readClipboard(app.window, 32 * 1024 * 1024, ClipboardRead::Selection);
        auto text = clip.text();
        diagnosticEvent(L"Copy result number=" + std::to_wstring(number) + L" attempts=" +
            std::to_wstring(attempts) + L" elapsedMs=" + std::to_wstring(GetTickCount64() - started) +
@@ -405,7 +406,8 @@ class Transaction
    }
 };
 } // namespace
-App::App(HINSTANCE h, bool test, const std::filesystem::path &dataRoot) : instance(h), smoke(test)
+App::App(HINSTANCE h, bool test, const std::filesystem::path &dataRoot, HWND service)
    : historyService(service), instance(h), smoke(test)
 {
    updateNotifier = notifyUpdateAvailable;
    current = this;
@@ -422,7 +424,7 @@ App::App(HINSTANCE h, bool test, const std::filesystem::path &dataRoot) : instan
        registrationWarning = L"Settings were not loaded: " + wide(e.what());
    }
    setLoggingEnabled(settings.writeLog);
-    if (settings.autoCorrect)
+    if (settings.autoCorrect && !historyService)
        try { autoPredictor.configure(std::filesystem::path(executable()).parent_path() / L"dictionaries", settings.autoLanguages); }
        catch (const std::exception &e)
        {
@@ -441,6 +443,8 @@ App::App(HINSTANCE h, bool test, const std::filesystem::path &dataRoot) : instan
 }
 App::~App()
 {
    if (auto host = historyController(historyProcess)) PostMessageW(host, WM_CLOSE, 0, 0);
    if (historyProcess) CloseHandle(historyProcess);
    if (notificationRegistration) CloseHandle(notificationRegistration);
    if (syncWorker.joinable()) syncWorker.join();
    if (updateWorker.joinable())
@@ -536,7 +540,10 @@ void App::scheduleHistoryOcr(const Settings &config)
                        if (!entry.image || (entry.ocrState != 1 && entry.ocrProfile == profile)) continue;
                        try
                        {
-                            auto text = recognizeText(history->load(entry.id), config);
+                            auto text = history->recognizeImage(entry.id, config, [this, &profile] {
                                std::lock_guard lock(jobsMutex);
                                return stop || ocrProfile(historyOcrSettings) != profile;
                            });
                            std::lock_guard lock(jobsMutex);
                            if (stop || ocrProfile(historyOcrSettings) != profile) continue;
                            if (history->saveOcr(entry.id, text, config))
@@ -685,6 +692,7 @@ void App::reloadLayouts()
 }
 void App::clearHistory()
 {
    if (historyService) { remoteHistory("clear"); history->reload(); return; }
    if (busy) throw std::runtime_error("Wait for the current operation to finish.");
    if (history) history->clear();
    if (historyWindow) refreshHistory(*this);
@@ -1520,6 +1528,7 @@ void App::transform(int command, int snippet)
 }
 void App::pasteEntry(std::wstring id, bool plain)
 {
    if (historyService) { remoteHistory("paste", id, plain); return; }
    if (installingUpdate) return;
    if (!history || busy.exchange(true))
        return;
@@ -1541,10 +1550,20 @@ void App::pasteEntry(std::wstring id, bool plain)
            } reset{busy};
            try
            {
-                for (int i = 0; i < 20 && !modifiersReleased(); ++i)
+                // Foreground activation crosses a process boundary when the
                // history UI closes. Let the destination finish activation,
                // while retaining the same input-version cancellation guard.
                for (int i = 0; i < 20 && inputVersion == version &&
                     (!modifiersReleased() || GetForegroundWindow() != target); ++i)
                    Sleep(10);
                if (!modifiersReleased() || GetForegroundWindow() != target || inputVersion != version)
                {
                    log(L"History paste cancelled before transaction: foreground=" +
                        std::to_wstring(GetForegroundWindow() == target) + L" modifiers=" +
                        std::to_wstring(modifiersReleased()) + L" expectedVersion=" + std::to_wstring(version) +
                        L" actualVersion=" + std::to_wstring(inputVersion.load()));
                    return;
                }
                auto clip = history->load(id);
                if (plain)
                {
@@ -1554,7 +1573,7 @@ void App::pasteEntry(std::wstring id, bool plain)
                    clip = textClip(text);
                }
                Transaction tx(*this, target, version);
-                tx.paste(clip);
+                log(tx.paste(clip) ? L"History paste: simulated paste completed" : L"History paste cancelled before simulated paste");
            }
            catch (const std::exception &e)
            {
@@ -1585,7 +1604,19 @@ void App::captureHistory()
                for (auto &name : config.excluded)
                    if (lower(name) == lower(app))
                        return;
-                auto clip = readClipboard(window, (size_t)config.maxImageMiB * 1024 * 1024);
+                if (IsClipboardFormatAvailable(CF_DIB) || IsClipboardFormatAvailable(CF_DIBV5) ||
                    IsClipboardFormatAvailable(CF_BITMAP) ||
                    IsClipboardFormatAvailable(RegisterClipboardFormatW(L"PNG")))
                {
                    if (history->captureImage(sequence, app, config))
                    {
                        scheduleHistoryOcr(config);
                        PostMessageW(window, HistoryMessage, 0, 0);
                    }
                    return;
                }
                auto clip = readClipboard(window, (size_t)config.maxImageMiB * 1024 * 1024,
                                          ClipboardRead::WithoutImages, sequence);
                if (sequence != GetClipboardSequenceNumber())
                    return;
                for (auto &f : clip.formats)
@@ -1604,6 +1635,7 @@ void App::captureHistory()
 }
 void App::recognizeEntry(std::wstring id)
 {
    if (historyService) { remoteHistory("ocr", id); return; }
    if (!history || busy.exchange(true))
        return;
    auto sequence = GetClipboardSequenceNumber();
@@ -1622,7 +1654,9 @@ void App::recognizeEntry(std::wstring id)
            try
            {
                auto cached = history->ocrText(id, ocrProfile(config));
-                auto text = cached ? *cached : recognizeText(history->load(id), config);
+                auto text = cached ? *cached : history->recognizeImage(id, config, [this] {
                    std::lock_guard lock(jobsMutex); return stop;
                });
                if (!cached) history->saveOcr(id, text, config);
                if (text.empty())
                {
@@ -1772,7 +1806,37 @@ LRESULT CALLBACK App::windowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
    auto *app = current;
    if (!app)
        return DefWindowProcW(hwnd, msg, wp, lp);
-    if (msg == app->taskbarCreated && app->taskbarCreated)
+    if (app->historyService) {
        if (msg == HistoryHostShow || msg == HistoryHostRefresh) {
            try {
                app->history->reload();
                if (msg == HistoryHostShow) showHistory(*app);
                else if (IsWindowVisible(app->historyWindow)) refreshHistory(*app);
            } catch (const std::exception &e) { app->report(wide(e.what())); }
            return 0;
        }
        if (msg == WM_TIMER) {
            if (!IsWindow(app->historyService)) PostMessageW(hwnd, WM_CLOSE, 0, 0);
            return 0;
        }
        if (msg == WM_CLOSE) {
            EnumThreadWindows(GetCurrentThreadId(), [](HWND child, LPARAM) -> BOOL {
                wchar_t name[64]{}; GetClassNameW(child, name, 64);
                if (std::wstring(name) == L"KSwitcher.Entry" || std::wstring(name) == L"KSwitcher.History")
                    DestroyWindow(child);
                return TRUE;
            }, 0);
            DestroyWindow(hwnd);
            return 0;
        }
        if (msg == WM_DESTROY) { PostQuitMessage(0); return 0; }
        if (msg == ErrorMessage) {
            std::unique_ptr<std::wstring> text(reinterpret_cast<std::wstring *>(lp));
            MessageBoxW(app->historyWindow, text->c_str(), L"Clipboard history", MB_OK | MB_ICONWARNING);
            return 0;
        }
    }
    if (!app->historyService && msg == app->taskbarCreated && app->taskbarCreated)
    {
        app->addTray();
        return 0;
@@ -1886,6 +1950,7 @@ LRESULT CALLBACK App::windowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
    case WM_COPYDATA:
    {
        auto *data = (COPYDATASTRUCT *)lp;
        if (data && data->dwData == HistoryRequest) return app->historyRequest((HWND)wp, *data);
        if (data && data->dwData >= ConfigRead && data->dwData < ConfigEnd)
        {
            if (app->installingUpdate) return FALSE;
@@ -1972,7 +2037,7 @@ int App::execute()
    WNDCLASSW cls{};
    cls.hInstance = instance;
    cls.lpfnWndProc = windowProc;
-    cls.lpszClassName = L"KSwitcher.Main";
+    cls.lpszClassName = historyService ? HistoryHostClass : L"KSwitcher.Main";
    cls.hIcon = LoadIconW(instance, MAKEINTRESOURCEW(IDI_KSWITCHER));
    RegisterClassW(&cls);
    window = CreateWindowExW(WS_EX_TOOLWINDOW, cls.lpszClassName, L"KSwitcher", WS_POPUP, 0, 0, 0, 0, nullptr,
@@ -2006,6 +2071,29 @@ int App::execute()
            }
            CoUninitialize();
        });
    if (historyService) {
        try {
            auto bytes = unprotect(readFile(data / L"history-view.bin", 4 * 1024 * 1024));
            auto state = HistoryJson::parse(bytes);
            historySelection = wide(state.value("selection", std::string{}));
            historyTop = wide(state.value("top", std::string{}));
            historyQuery = wide(state.value("query", std::string{}));
        } catch (...) {}
        showHistory(*this);
        remoteHistory("ready", std::to_wstring(reinterpret_cast<uintptr_t>(historyWindow)));
        SetTimer(window, 1, 1000, nullptr);
        MSG message{};
        while (GetMessageW(&message, nullptr, 0, 0) > 0) {
            if (message.message == WM_KEYDOWN && message.wParam == VK_ESCAPE && historyWindow &&
                (message.hwnd == historyWindow || IsChild(historyWindow, message.hwnd))) {
                SendMessageW(historyWindow, WM_CLOSE, 0, 0);
                continue;
            }
            if (historyWindow && message.message == WM_SYSCHAR && IsDialogMessageW(historyWindow, &message)) continue;
            TranslateMessage(&message); DispatchMessageW(&message);
        }
        return int(message.wParam);
    }
    keyboardHook = SetWindowsHookExW(WH_KEYBOARD_LL, keyProc, instance, 0);
    mouseHook = SetWindowsHookExW(WH_MOUSE_LL, mouseProc, instance, 0);
    registerHotkeys(settings);
@@ -2042,7 +2130,7 @@ int App::execute()
                continue;
        }
        // Preserve history-specific Enter/Shift+Enter and Ctrl+digit handling.
-        if (historyWindow && msg.message == WM_SYSCHAR && IsDialogMessageW(historyWindow, &msg))
+        if (!isolateHistory && historyWindow && msg.message == WM_SYSCHAR && IsDialogMessageW(historyWindow, &msg))
            continue;
        if (settingsWindow && IsDialogMessageW(settingsWindow, &msg))
            continue;
@@ -33,6 +33,10 @@ class App
 {
  public:
    HWND window{}, historyWindow{}, settingsWindow{}, snippetsWindow{};
    HWND historyService{}; // Non-null only in the short-lived history UI process.
    bool isolateHistory{};
    unsigned historyEntryWindows{};
    std::wstring historySelection, historyTop, historyQuery;
    HINSTANCE instance{};
    std::filesystem::path data;
    std::vector<Layout> layouts;
@@ -55,7 +59,7 @@ class App
    bool smoke{};
    int startCommand{};
    std::wstring updateStartupEvent;
-    App(HINSTANCE, bool = false, const std::filesystem::path &dataRoot = {});
+    App(HINSTANCE, bool = false, const std::filesystem::path &dataRoot = {}, HWND historyService = nullptr);
    ~App();
    int execute();
    void dispatch(int);
@@ -72,6 +76,11 @@ class App
    void applySettings(const Settings &);
    void reloadLayouts();
    void clearHistory();
    void openHistoryProcess();
    void refreshHistoryProcess();
    void remoteHistory(const char *action, const std::wstring &id = {}, bool plain = false);
    LRESULT historyRequest(HWND, const COPYDATASTRUCT &);
    void saveHistoryView(const std::wstring &, const std::wstring &, const std::wstring &);
    void clearLog(bool previous);
    void setHotkeyCapture(HWND);
    bool isHotkey(DWORD, UINT);
@@ -88,6 +97,7 @@ class App
    friend struct InputRegressionAccess;
    void releaseIdleMemory(ULONGLONG now);
    HHOOK keyboardHook{}, mouseHook{};
    HANDLE historyProcess{};
    std::mutex jobsMutex;
    std::condition_variable jobsReady;
    std::deque<std::function<void()>> jobs;
@@ -0,0 +1,100 @@
 // History UI has no clipboard listener or hooks. The resident remains the only writer.
 namespace {
 constexpr ULONG_PTR HistoryRequest = 0x4b530200;
 constexpr UINT HistoryHostShow = WM_APP + 71, HistoryHostRefresh = WM_APP + 72;
 constexpr wchar_t HistoryHostClass[] = L"KSwitcher.HistoryHost";
 using HistoryJson = nlohmann::json;
 HWND historyController(HANDLE process)
 {
    if (!process || WaitForSingleObject(process, 0) == WAIT_OBJECT_0) return nullptr;
    auto window = FindWindowW(HistoryHostClass, nullptr);
    DWORD pid{}; GetWindowThreadProcessId(window, &pid);
    return pid == GetProcessId(process) ? window : nullptr;
 }
 }
 void App::openHistoryProcess()
 {
    auto foreground = GetForegroundWindow();
    if (foreground != window && foreground != historyWindow) pasteTarget = foreground;
    if (historyProcess && WaitForSingleObject(historyProcess, 0) == WAIT_OBJECT_0) {
        CloseHandle(historyProcess); historyProcess = nullptr; historyWindow = nullptr;
    }
    if (historyProcess) {
        if (auto host = historyController(historyProcess)) {
            AllowSetForegroundWindow(GetProcessId(historyProcess));
            PostMessageW(host, HistoryHostShow, 0, 0);
        }
        return;
    }
    auto path = executable();
    auto command = L"\"" + path + L"\" --history-host=" + std::to_wstring(reinterpret_cast<uintptr_t>(window));
    STARTUPINFOW startup{sizeof(startup)};
    startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_HIDE;
    PROCESS_INFORMATION child{};
    if (!CreateProcessW(path.c_str(), command.data(), nullptr, nullptr, FALSE, CREATE_NO_WINDOW,
                        nullptr, std::filesystem::path(path).parent_path().c_str(), &startup, &child))
        throw std::runtime_error("Cannot start clipboard history window");
    CloseHandle(child.hThread);
    historyProcess = child.hProcess;
    AllowSetForegroundWindow(child.dwProcessId);
 }
 void App::refreshHistoryProcess()
 {
    if (auto host = historyController(historyProcess)) PostMessageW(host, HistoryHostRefresh, 0, 0);
 }
 void App::remoteHistory(const char *action, const std::wstring &id, bool plain)
 {
    if (!historyService || !configurationPeer(historyService, L"KSwitcher.exe"))
        throw std::runtime_error("KSwitcher has stopped. Reopen clipboard history.");
    auto text = HistoryJson{{"action", action}, {"id", utf8(id)}, {"plain", plain}}.dump();
    if (std::string_view(action) == "paste") {
        DWORD residentPid{}; GetWindowThreadProcessId(historyService, &residentPid);
        AllowSetForegroundWindow(residentPid);
    }
    COPYDATASTRUCT message{HistoryRequest, DWORD(text.size()), text.data()};
    DWORD_PTR result{};
    if (!SendMessageTimeoutW(historyService, WM_COPYDATA, reinterpret_cast<WPARAM>(window),
                             reinterpret_cast<LPARAM>(&message), SMTO_ABORTIFHUNG | SMTO_ERRORONEXIT,
                             15000, &result) || result != 1)
        throw std::runtime_error("KSwitcher could not complete the history request. Reopen history and retry.");
 }
 LRESULT App::historyRequest(HWND sender, const COPYDATASTRUCT &message)
 {
    DWORD pid{}; GetWindowThreadProcessId(sender, &pid);
    if (!historyProcess || pid != GetProcessId(historyProcess) ||
        !configurationPeer(sender, L"KSwitcher.exe") || message.cbData > 4096 ||
        !message.cbData || !message.lpData || installingUpdate) return FALSE;
    try {
        const auto *first = static_cast<const char *>(message.lpData);
        auto job = HistoryJson::parse(first, first + message.cbData);
        auto action = job.at("action").get<std::string>();
        auto id = wide(job.at("id").get<std::string>());
        if (id.size() > 128) return FALSE;
        if (action == "ready") {
            auto ui = reinterpret_cast<HWND>(uintptr_t(std::stoull(id)));
            DWORD uiPid{}; GetWindowThreadProcessId(ui, &uiPid);
            wchar_t name[64]{}; GetClassNameW(ui, name, 64);
            if (uiPid != pid || std::wstring(name) != L"KSwitcher.History") return FALSE;
            historyWindow = ui;
        } else if (action == "paste") {
            if (busy || !history) return FALSE;
            pasteEntry(id, job.at("plain").get<bool>());
        } else if (action == "ocr") {
            if (busy || !history) return FALSE;
            recognizeEntry(id);
        } else if (action == "clear") clearHistory();
        else if (action == "pin" || action == "remove") {
            if (busy || !history) return FALSE;
            if (action == "pin") history->pin(id); else history->remove(id);
        } else return FALSE;
        return TRUE;
    } catch (...) { return FALSE; }
 }
 void App::saveHistoryView(const std::wstring &selection, const std::wstring &top, const std::wstring &query)
 {
    if (!historyService) return;
    try {
        auto text = HistoryJson{{"selection", utf8(selection)}, {"top", utf8(top)}, {"query", utf8(query)}}.dump();
        atomicWrite(data / L"history-view.bin", protect(Bytes(text.begin(), text.end())));
    } catch (...) {} // Closing the UI must still release its process if state cannot be saved.
 }
@@ -79,7 +79,7 @@ LRESULT CALLBACK controller(HWND window, UINT message, WPARAM wp, LPARAM lp)
 }
 // The configurator owns no history store, dictionaries, worker or input hooks.
 // All mutations are validated and committed by the resident process.
-App::App(HINSTANCE h, bool, const std::filesystem::path &) : instance(h)
+App::App(HINSTANCE h, bool, const std::filesystem::path &, HWND) : instance(h)
 {
    current = this;
    data = dataDirectory();
@@ -1,12 +1,27 @@
 #include "app.h"
 #include <shellapi.h>
 #include <shlobj.h>
 #include "configuration.h"
 int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
 {
    CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
    int argc{};
    auto argv = CommandLineToArgvW(GetCommandLineW(), &argc);
    std::wstring arg = argc > 1 ? argv[1] : L"";
    if (argc == 2 && arg.starts_with(L"--history-host=")) {
        LocalFree(argv);
        int result = 1;
        try {
            auto service = reinterpret_cast<HWND>(uintptr_t(std::stoull(arg.substr(15))));
            wchar_t name[64]{}; GetClassNameW(service, name, 64);
            if (std::wstring(name) != L"KSwitcher.Main" || !ks::configurationPeer(service, L"KSwitcher.exe"))
                throw std::runtime_error("Invalid history service");
            ks::App app(instance, true, {}, service);
            result = app.execute();
        } catch (...) {}
        CoUninitialize();
        return result;
    }
    if (arg.starts_with(L"--configure-autostart="))
    {
        int result = 1;
@@ -72,6 +87,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
    try
    {
        ks::App app(instance, arg == L"--smoke-test");
        app.isolateHistory = !app.smoke;
        if (arg.starts_with(L"--update-ready-event="))
            app.updateStartupEvent = arg.substr(std::wstring(L"--update-ready-event=").size());
        else if (!arg.empty() && arg != L"--smoke-test")
@@ -265,15 +265,27 @@ std::wstring processName(HWND window)
    CloseHandle(h);
    return ok ? std::filesystem::path(std::wstring(path, n)).stem().wstring() : L"";
 }
-Clip readClipboard(HWND window, size_t limit)
+Clip readClipboard(HWND window, size_t limit, ClipboardRead mode, std::optional<DWORD> expected)
 {
    ClipboardLock lock(window);
    if (expected && *expected != GetClipboardSequenceNumber())
        throw std::runtime_error("Clipboard changed while taking snapshot");
    if (mode == ClipboardRead::WithoutImages &&
        (IsClipboardFormatAvailable(CF_DIB) || IsClipboardFormatAvailable(CF_DIBV5) ||
         IsClipboardFormatAvailable(CF_BITMAP) || IsClipboardFormatAvailable(RegisterClipboardFormatW(L"PNG"))))
        throw std::runtime_error("Clipboard changed to an image");
    Clip c;
    size_t total = 0;
    for (UINT f = EnumClipboardFormats(0); f; f = EnumClipboardFormats(f))
    {
        if (!globalFormat(f))
            continue;
        wchar_t name[256]{};
        if (f >= 0xc000) GetClipboardFormatNameW(f, name, 256);
        if (mode == ClipboardRead::Selection && f != CF_UNICODETEXT &&
            std::wstring_view(name) != L"VisualStudioEditorOperationsLineCutCopyClipboardTag" &&
            std::wstring_view(name) != L"MSDEVLineSelect" && std::wstring_view(name) != L"vscode-editor-data")
            continue;
        HANDLE handle = GetClipboardData(f);
        if (!handle)
            continue;
@@ -291,8 +303,6 @@ Clip readClipboard(HWND window, size_t limit)
        GlobalUnlock(handle);
        if (f >= 0xc000)
        {
            wchar_t name[256]{};
            GetClipboardFormatNameW(f, name, 256);
            format.name = name;
        }
        total += size;
@@ -300,7 +310,8 @@ Clip readClipboard(HWND window, size_t limit)
    }
    return c;
 }
-DWORD writeClipboard(HWND window, const Clip &c)
+DWORD writeClipboard(HWND window, const Clip &c) { return writeClipboardGuarded(window, c, {}); }
 DWORD writeClipboardGuarded(HWND window, const Clip &c, std::optional<DWORD> expected)
 {
    // Allocate all blocks before replacing any existing data.
    std::vector<std::pair<UINT, HGLOBAL>> blocks;
@@ -327,6 +338,8 @@ DWORD writeClipboard(HWND window, const Clip &c)
            blocks.emplace_back(id, h);
        }
        ClipboardLock lock(window);
        if (expected && *expected != GetClipboardSequenceNumber())
            throw std::runtime_error("Clipboard changed before restoring snapshot");
        if (!EmptyClipboard())
            throw std::runtime_error("Cannot replace clipboard");
        for (auto &[id, h] : blocks)
@@ -43,8 +43,11 @@ bool ownsClipboard(HWND);
 bool webViewDescendant(DWORD owner, DWORD host,
                       const std::function<std::optional<std::pair<DWORD, std::wstring>>(DWORD)> &read);
 std::wstring processName(HWND);
-Clip readClipboard(HWND, size_t limit = 32 * 1024 * 1024);
+enum class ClipboardRead { All, Selection, WithoutImages };
 Clip readClipboard(HWND, size_t limit = 32 * 1024 * 1024,
                   ClipboardRead = ClipboardRead::All, std::optional<DWORD> expected = {});
 DWORD writeClipboard(HWND, const Clip &);
 DWORD writeClipboardGuarded(HWND, const Clip &, std::optional<DWORD> expected);
 Clip textClip(const std::wstring &);
 bool chord(WORD key, UINT modifiers = 0);
 // Process-local marker, shared by every KSwitcher input producer (not an authentication token).
@@ -252,7 +252,7 @@ DWORD CALLBACK readStream(DWORD_PTR cookie, LPBYTE buffer, LONG size, LONG *read
    return 0;
 }
 } // namespace
-std::string richPreview(const Clip &clip)
+std::string richPreview(const Clip &clip, bool plainFallback)
 {
    for (const auto &f : clip.formats)
        if (f.name == L"Rich Text Format" && f.data.size() <= 65536)
@@ -276,6 +276,7 @@ std::string richPreview(const Clip &clip)
            {
            }
        }
    if (!plainFallback) return {};
    auto text = clip.text();
    if (text.size() > 4096)
        text.resize(4096);
@@ -2,7 +2,7 @@
 #include "platform.h"
 namespace ks
 {
-std::string richPreview(const Clip &);
+std::string richPreview(const Clip &, bool plainFallback = true);
 HWND createRichText(HWND parent, int id, bool visible);
 bool setRichText(HWND, const std::string &);
 } // namespace ks
@@ -1,5 +1,6 @@
 #include "screenshot.h"
 #include "screenshot_notifications.h"
 #include "storage.h"
 #include <commctrl.h>
 #include <shellapi.h>
 #include <roapi.h>
@@ -49,6 +50,18 @@ int WINAPI wWinMain(HINSTANCE instance,HINSTANCE,PWSTR,int)
    std::wstring token;
    bool autoOpenEditor=false, writeLog=false;
    int argc{}; auto argv=CommandLineToArgvW(GetCommandLineW(),&argc);
    if(argc==3 && std::wstring(argv[1])==L"--clipboard-snapshot") {
        std::filesystem::path request=argv[2]; LocalFree(argv);
        return ks::runClipboardSnapshot(request);
    }
    if(argc==3 && (std::wstring(argv[1])==L"--capture-history" || std::wstring(argv[1])==L"--history-ocr")) {
        bool ocr=std::wstring(argv[1])==L"--history-ocr";
        std::filesystem::path request=argv[2]; LocalFree(argv);
        auto initialized=CoInitializeEx(nullptr,COINIT_MULTITHREADED);
        if(FAILED(initialized)) return 1;
        int result=ocr ? ks::runHistoryOcr(request) : ks::runImageHistoryCapture(request);
        CoUninitialize(); return result;
    }
    if(argc>1 && std::wstring(argv[argc-1])==L"--write-log") {
        writeLog=true; --argc;
        ks::setLoggingEnabled(true);
@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <set>
 #include <sstream>
 #include <wincrypt.h>
 namespace ks
 {
@@ -374,9 +375,17 @@ Clip decodeClip(const Bytes &b)
 History::History(const std::filesystem::path &folder) : folder_(folder)
 {
    std::filesystem::create_directories(folder_);
    loadIndex();
 }
 void History::loadIndex()
 {
    std::vector<Entry> loaded;
    auto index = folder_ / L"index.dat";
    if (!std::filesystem::exists(index))
    {
        entries_.clear();
        return;
    }
    auto j = parse(unprotect(readFile(index, 16 * 1024 * 1024)));
    if (!j.is_array() || j.size() > 10000)
        throw std::runtime_error("Invalid history index");
@@ -391,8 +400,169 @@ History::History(const std::filesystem::path &folder) : folder_(folder)
                   e.value("image", false),
                   e.value("files", false), e.value("ocrState", e.value("image", false) ? 1 : 0),
                   str(e, "ocrProfile", L"windows")};
        if (e.value("fingerprintVersion", 0) == 1) {
            item.contentHash = e.value("contentHash", std::string{});
            item.imageHash = e.value("imageHash", std::string{});
            item.pixelHash = e.value("pixelHash", std::string{});
        }
        if (validId(item.id) && std::filesystem::exists(folder_ / (item.id + L".dat")))
-            entries_.push_back(std::move(item));
+            loaded.push_back(std::move(item));
    }
    entries_ = std::move(loaded);
 }
 void History::reload() { std::lock_guard lock(mutex_); loadIndex(); }
 void ClipboardSnapshot::cleanup() noexcept
 {
    if (request_.empty()) return;
    std::error_code ignored;
    for (const auto *suffix : {L"", L".snapshot", L".result"})
        std::filesystem::remove(std::filesystem::path(request_.wstring() + suffix), ignored);
    request_.clear();
 }
 ClipboardSnapshot::~ClipboardSnapshot() { cleanup(); }
 DWORD ClipboardSnapshot::run(bool restore, DWORD sequence)
 {
    atomicWrite(request_, protect(jsonBytes(Json{{"schema", 1}, {"restore", restore}, {"sequence", sequence}})));
    auto helper = std::filesystem::path(executable()).parent_path() / L"KSwitcher.Screenshot.exe";
    auto command = L"\"" + helper.wstring() + L"\" --clipboard-snapshot \"" + request_.wstring() + L"\"";
    STARTUPINFOW startup{sizeof(startup)};
    startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_HIDE;
    PROCESS_INFORMATION process{};
    if (!CreateProcessW(helper.c_str(), command.data(), nullptr, nullptr, FALSE, CREATE_NO_WINDOW,
                        nullptr, helper.parent_path().c_str(), &startup, &process))
        throw std::runtime_error("Cannot start clipboard snapshot helper");
    CloseHandle(process.hThread);
    auto wait = WaitForSingleObject(process.hProcess, 10000);
    DWORD result = ERROR_GEN_FAILURE;
    if (wait != WAIT_OBJECT_0)
    {
        TerminateProcess(process.hProcess, ERROR_TIMEOUT);
        WaitForSingleObject(process.hProcess, INFINITE);
    }
    GetExitCodeProcess(process.hProcess, &result);
    CloseHandle(process.hProcess);
    if (wait != WAIT_OBJECT_0 || result) throw std::runtime_error("Clipboard snapshot helper failed");
    return parse(unprotect(readFile(request_.wstring() + L".result", 4096))).at("sequence").get<DWORD>();
 }
 void ClipboardSnapshot::capture(HWND window, DWORD sequence)
 {
    cleanup();
    clip_ = {};
    if (!IsClipboardFormatAvailable(CF_DIB) && !IsClipboardFormatAvailable(CF_DIBV5) &&
        !IsClipboardFormatAvailable(CF_BITMAP) && !IsClipboardFormatAvailable(RegisterClipboardFormatW(L"PNG")))
    {
        clip_ = readClipboard(window, 64 * 1024 * 1024, ClipboardRead::WithoutImages, sequence);
        return;
    }
    request_ = std::filesystem::temp_directory_path() / (L"ks-clipboard-" + newSnippetId() + L".request");
    try { run(false, sequence); }
    catch (...) { cleanup(); throw; }
 }
 DWORD ClipboardSnapshot::restore(HWND window, DWORD sequence)
 {
    return request_.empty() ? writeClipboardGuarded(window, clip_, sequence) : run(true, sequence);
 }
 int runClipboardSnapshot(const std::filesystem::path &request)
 {
    try
    {
        if (!request.is_absolute() || !request.filename().wstring().starts_with(L"ks-clipboard-") ||
            request.extension() != L".request") return 1;
        auto job = parse(unprotect(readFile(request, 4096)));
        if (job.at("schema") != 1) return 1;
        auto sequence = job.at("sequence").get<DWORD>();
        const auto snapshot = request.wstring() + L".snapshot";
        if (job.at("restore").get<bool>())
        {
            auto clip = decodeClip(unprotect(readFile(snapshot, 70 * 1024 * 1024)));
            HWND window = CreateWindowExW(0, L"STATIC", L"", 0, 0, 0, 0, 0, HWND_MESSAGE, nullptr, nullptr, nullptr);
            if (!window) return 1;
            struct WindowCleanup { HWND window; ~WindowCleanup() { DestroyWindow(window); } } cleanup{window};
            sequence = writeClipboardGuarded(window, clip, sequence);
        }
        else
        {
            auto clip = readClipboard(nullptr, 64 * 1024 * 1024, ClipboardRead::All, sequence);
            if (sequence != GetClipboardSequenceNumber()) return 2;
            atomicWrite(snapshot, protect(encodeClip(clip)));
        }
        atomicWrite(request.wstring() + L".result", protect(jsonBytes(Json{{"sequence", sequence}})));
        return 0;
    }
    catch (...) { return 1; }
 }
 bool History::captureImage(DWORD sequence, const std::wstring &app, const Settings &settings)
 {
    // Serialize helper index changes with all resident history mutations. Only
    // metadata is reloaded: GetClipboardData's image allocations die with the child.
    std::lock_guard lock(mutex_);
    if (sequence != GetClipboardSequenceNumber()) return false;
    auto request = std::filesystem::absolute(folder_) / (L"capture-" + newSnippetId() + L".request");
    struct Cleanup {
        std::filesystem::path path;
        ~Cleanup() { std::error_code ignored; std::filesystem::remove(path, ignored); }
    } cleanup{request};
    Json job{{"schema", 1}, {"sequence", sequence}, {"app", utf8(app)},
             {"settings", Json::parse(encodeSettings(settings))}};
    atomicWrite(request, protect(jsonBytes(job)));
    auto helper = std::filesystem::path(executable()).parent_path() / L"KSwitcher.Screenshot.exe";
    auto command = L"\"" + helper.wstring() + L"\" --capture-history \"" + request.wstring() + L"\"";
    STARTUPINFOW startup{sizeof(startup)};
    startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_HIDE;
    PROCESS_INFORMATION process{};
    if (!CreateProcessW(helper.c_str(), command.data(), nullptr, nullptr, FALSE, CREATE_NO_WINDOW,
                        nullptr, helper.parent_path().c_str(), &startup, &process))
        throw std::runtime_error(utf8(lastError(L"Cannot start image history helper")));
    CloseHandle(process.hThread);
    auto wait = WaitForSingleObject(process.hProcess, 30000);
    DWORD result = ERROR_GEN_FAILURE;
    if (wait != WAIT_OBJECT_0)
    {
        // Never release the index lock while a timed-out child can still write it.
        TerminateProcess(process.hProcess, ERROR_TIMEOUT);
        WaitForSingleObject(process.hProcess, INFINITE);
    }
    GetExitCodeProcess(process.hProcess, &result);
    CloseHandle(process.hProcess);
    loadIndex(); // Also reconcile any completed atomic save before a child failure.
    if (wait != WAIT_OBJECT_0) throw std::runtime_error("Image history helper timed out");
    if (result == 2) return false;
    if (result == 3) throw std::runtime_error("Clipboard exceeds the configured size limit");
    if (result) throw std::runtime_error("Image history helper failed: " + std::to_string(result));
    return true;
 }
 int runImageHistoryCapture(const std::filesystem::path &request)
 {
    try
    {
        if (!request.is_absolute() || !request.filename().wstring().starts_with(L"capture-") ||
            request.extension() != L".request") return 1;
        auto job = parse(unprotect(readFile(request, 4 * 1024 * 1024)));
        if (job.at("schema") != 1) return 1;
        auto sequence = job.at("sequence").get<DWORD>();
        auto settings = decodeSettings(jsonBytes(job.at("settings")), readLayouts());
        auto valid = [&] {
            return settings.history && sequence == GetClipboardSequenceNumber() &&
                !IsClipboardFormatAvailable(RegisterClipboardFormatW(L"ExcludeClipboardContentFromMonitorProcessing")) &&
                !IsClipboardFormatAvailable(RegisterClipboardFormatW(L"Clipboard Viewer Ignore"));
        };
        if (!valid()) return 2;
        if (!IsClipboardFormatAvailable(CF_DIB) && !IsClipboardFormatAvailable(CF_DIBV5) &&
            !IsClipboardFormatAvailable(CF_BITMAP) &&
            !IsClipboardFormatAvailable(RegisterClipboardFormatW(L"PNG"))) return 2;
        auto clip = readClipboard(nullptr, size_t(settings.maxImageMiB) * 1024 * 1024);
        if (!valid()) return 2;
        for (const auto &format : clip.formats)
            if (format.name == L"CanIncludeInClipboardHistory" && format.data.size() >= 4 &&
                !format.data[0] && !format.data[1] && !format.data[2] && !format.data[3]) return 2;
        History history(request.parent_path());
        if (!valid()) return 2;
        history.add(clip, str(job, "app"), settings);
        return 0;
    }
    catch (const std::exception &e)
    {
        return std::string(e.what()) == "Clipboard exceeds the configured size limit" ? 3 : 1;
    }
 }
 void History::saveIndex()
@@ -406,7 +576,9 @@ void History::saveIndex()
                     {"at", e.at},
                     {"pinned", e.pinned},
                     {"image", e.image},
-                     {"files", e.files}, {"ocrState", e.ocrState}, {"ocrProfile", utf8(e.ocrProfile)}});
+                     {"files", e.files}, {"ocrState", e.ocrState}, {"ocrProfile", utf8(e.ocrProfile)},
                     {"fingerprintVersion", 1}, {"contentHash", e.contentHash},
                     {"imageHash", e.imageHash}, {"pixelHash", e.pixelHash}});
    atomicWrite(folder_ / L"index.dat", protect(jsonBytes(j)));
 }
 std::vector<Entry> History::entries() const
@@ -439,12 +611,10 @@ void History::prune(const Settings &s)
        entries_.erase(entries_.begin() + i);
    }
 }
-bool sameClipboardImage(const Clip &a, const Clip &b)
+static const Format *clipboardImageFormat(const Clip &c)
 {
    // OLE DataObject / Ole Private Data change when Snipping Tool republishes
    // the same capture. They are transport metadata, not image identity.
    auto image = [](const Clip &c) -> const Format *
    {
        if (!c.text().empty())
            return nullptr;
        for (const auto &f : c.formats)
@@ -458,8 +628,42 @@ bool sameClipboardImage(const Clip &a, const Clip &b)
                if (f.id == id && !f.data.empty())
                    return &f;
        return nullptr;
-    };
+}
-    const auto *left = image(a), *right = image(b);
+static std::string clipboardHash(const Bytes &bytes)
 {
    struct Hash {
        HCRYPTPROV provider{}; HCRYPTHASH hash{};
        ~Hash() { if (hash) CryptDestroyHash(hash); if (provider) CryptReleaseContext(provider, 0); }
    } state;
    if (!CryptAcquireContextW(&state.provider, nullptr, nullptr, PROV_RSA_AES, CRYPT_VERIFYCONTEXT) ||
        !CryptCreateHash(state.provider, CALG_SHA_256, 0, 0, &state.hash) ||
        !CryptHashData(state.hash, bytes.data(), static_cast<DWORD>(bytes.size()), 0))
        throw std::runtime_error("Cannot hash clipboard data");
    BYTE digest[32]{}; DWORD size = sizeof(digest);
    if (!CryptGetHashParam(state.hash, HP_HASHVAL, digest, &size, 0) || size != sizeof(digest))
        throw std::runtime_error("Cannot read clipboard hash");
    static constexpr char hex[] = "0123456789abcdef";
    std::string result; result.reserve(64);
    for (auto b : digest) { result += hex[b >> 4]; result += hex[b & 15]; }
    return result;
 }
 static void imageFingerprints(Entry &entry, const Clip &clip, bool decodePixels = true)
 {
    const auto *image = clipboardImageFormat(clip);
    if (!image) return;
    if (entry.imageHash.empty())
        entry.imageHash = std::to_string(image->id) + ":" + utf8(image->name) + ":" + clipboardHash(image->data);
    if (!decodePixels) return;
    try {
        auto pixels = decodeImage(clip);
        entry.pixelHash = std::to_string(pixels.width) + "x" + std::to_string(pixels.height) + ":" + clipboardHash(pixels.bgra);
    } catch (const std::exception &) {
        // Undecodable images can still be compared by their original bytes.
    }
 }
 bool sameClipboardImage(const Clip &a, const Clip &b)
 {
    const auto *left = clipboardImageFormat(a), *right = clipboardImageFormat(b);
    if (!left || !right)
        return false;
    if (left->id == right->id && left->name == right->name && left->data == right->data)
@@ -483,15 +687,40 @@ void History::add(const Clip &clip, const std::wstring &app, const Settings &s)
    auto data = encodeClip(clip);
    if (data.size() > uint64_t(s.maxImageMiB) * 1024 * 1024)
        return;
    bool image = false, files = false;
    for (const auto &f : clip.formats)
    {
        image |= f.id == CF_DIB || f.id == CF_DIBV5 || f.name == L"PNG";
        files |= f.id == CF_HDROP;
    }
    std::lock_guard lock(mutex_);
-    // Compare only the newest record; never keep image payloads in the resident index.
+    Entry fingerprints;
-    if (!entries_.empty())
+    fingerprints.contentHash = clipboardHash(data);
    if (!entries_.empty() && entries_.front().contentHash == fingerprints.contentHash)
        return;
    imageFingerprints(fingerprints, clip, false);
    if (!entries_.empty() && !fingerprints.imageHash.empty() && entries_.front().imageHash == fingerprints.imageHash)
        return;
    imageFingerprints(fingerprints, clip);
    // Different payload kinds cannot be duplicates. Consult the index first so
    // copying text after a screenshot never loads/decrypts the previous image.
    if (!entries_.empty() && entries_.front().image == image && entries_.front().files == files)
    {
        try
        {
-            auto previous = load(entries_.front().id);
+            auto &previous = entries_.front();
-            if (encodeClip(previous) == data || sameClipboardImage(previous, clip))
+            bool migrated = previous.contentHash.empty();
            if (migrated) {
                auto oldClip = load(previous.id);
                previous.contentHash = clipboardHash(encodeClip(oldClip));
                imageFingerprints(previous, oldClip);
            }
            if (previous.contentHash == fingerprints.contentHash ||
                (!fingerprints.imageHash.empty() && previous.imageHash == fingerprints.imageHash) ||
                (!fingerprints.pixelHash.empty() && previous.pixelHash == fingerprints.pixelHash)) {
                if (migrated) saveIndex();
                return;
            }
        }
        catch (...)
        {
@@ -506,12 +735,6 @@ void History::add(const Clip &clip, const std::wstring &app, const Settings &s)
    auto encrypted = protect(data);
    atomicWrite(folder_ / (id + L".dat"), encrypted);
    auto text = clip.text();
    bool image = false, files = false;
    for (auto &f : clip.formats)
    {
        image |= f.id == CF_DIB || f.id == CF_DIBV5 || f.name == L"PNG";
        files |= f.id == CF_HDROP;
    }
    if (text.empty())
        text = files ? L"[Files]" : image ? L"[Image]" : L"[Clipboard data]";
    for (auto &c : text)
@@ -524,7 +747,8 @@ void History::add(const Clip &clip, const std::wstring &app, const Settings &s)
    entries_.insert(entries_.begin(),
                    Entry{id, text, app, encrypted.size(),
                          (uint64_t(now.dwHighDateTime) << 32) | now.dwLowDateTime, false, image, files,
-                          image ? 1 : 0, ocrProfile(s)});
+                          image ? 1 : 0, ocrProfile(s), std::move(fingerprints.contentHash),
                          std::move(fingerprints.imageHash), std::move(fingerprints.pixelHash)});
    prune(s);
    saveIndex();
 }
@@ -563,6 +787,103 @@ void History::clear()
        std::filesystem::remove(folder_ / (e.id + L".ocr"), ec);
    }
 }
 static Bytes historyImageJob(const std::filesystem::path &folder, const std::wstring &id,
                             const Json &job, const std::function<bool()> &cancelled)
 {
    if (!validId(id)) throw std::runtime_error("Invalid history ID");
    if (cancelled && cancelled()) throw std::runtime_error("History OCR cancelled");
    auto request = std::filesystem::absolute(folder) / (L"ocr-" + newSnippetId() + L".request");
    auto response = request; response += L".result";
    struct Cleanup {
        std::filesystem::path request, response;
        ~Cleanup() {
            std::error_code ignored;
            std::filesystem::remove(request, ignored);
            std::filesystem::remove(response, ignored);
        }
    } cleanup{request, response};
    atomicWrite(request, protect(jsonBytes(job)));
    auto helper = std::filesystem::path(executable()).parent_path() / L"KSwitcher.Screenshot.exe";
    auto command = L"\"" + helper.wstring() + L"\" --history-ocr \"" + request.wstring() + L"\"";
    STARTUPINFOW startup{sizeof(startup)};
    startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_HIDE;
    PROCESS_INFORMATION process{};
    if (!CreateProcessW(helper.c_str(), command.data(), nullptr, nullptr, FALSE, CREATE_NO_WINDOW,
                        nullptr, helper.parent_path().c_str(), &startup, &process))
        throw std::runtime_error(utf8(lastError(L"Cannot start history OCR helper")));
    CloseHandle(process.hThread);
    struct Child {
        HANDLE handle;
        ~Child() {
            if (WaitForSingleObject(handle, 0) != WAIT_OBJECT_0) {
                TerminateProcess(handle, ERROR_CANCELLED);
                WaitForSingleObject(handle, INFINITE);
            }
            CloseHandle(handle);
        }
    } child{process.hProcess};
    auto deadline = GetTickCount64() + 60000;
    for (;;) {
        auto wait = WaitForSingleObject(child.handle, 100);
        if (wait == WAIT_OBJECT_0) break;
        if (wait != WAIT_TIMEOUT) throw std::runtime_error("Cannot wait for history OCR helper");
        if (cancelled && cancelled()) throw std::runtime_error("History OCR cancelled");
        if (GetTickCount64() >= deadline) throw std::runtime_error("History OCR helper timed out");
    }
    DWORD result{};
    if (!GetExitCodeProcess(child.handle, &result) || result)
        throw std::runtime_error("History OCR helper failed: " + std::to_string(result));
    return unprotect(readFile(response, 8 * 1024 * 1024));
 }
 std::wstring History::recognizeImage(const std::wstring &id, const Settings &settings,
                                    const std::function<bool()> &cancelled) const
 {
    Json job{{"schema", 1}, {"id", utf8(id)}, {"tesseract", settings.useTesseract},
             {"path", utf8(settings.tesseractPath)}, {"languages", utf8(settings.tesseractLanguages)}};
    auto reply = parse(historyImageJob(folder_, id, job, cancelled));
    if (reply.at("schema") != 1 || str(reply, "id") != id)
        throw std::runtime_error("Invalid history OCR response");
    return str(reply, "text");
 }
 Pixels History::thumbnail(const std::wstring &id, const std::function<bool()> &cancelled) const
 {
    auto bytes = historyImageJob(folder_, id, Json{{"schema", 1}, {"id", utf8(id)}, {"thumbnail", true}}, cancelled);
    size_t at = 0;
    auto width = get32(bytes, at), height = get32(bytes, at);
    if (!width || !height || width > 208 || height > 128 || bytes.size() - at != width * height * 4)
        throw std::runtime_error("Invalid history thumbnail response");
    bytes.erase(bytes.begin(), bytes.begin() + at);
    return Pixels{width, height, std::move(bytes)};
 }
 int runHistoryOcr(const std::filesystem::path &request)
 {
    try {
        if (!request.is_absolute() || !request.filename().wstring().starts_with(L"ocr-") ||
            request.extension() != L".request") return 1;
        auto job = parse(unprotect(readFile(request, 1024 * 1024)));
        auto id = str(job, "id");
        if (job.at("schema") != 1 || !validId(id)) return 1;
        auto clip = decodeClip(unprotect(readFile(request.parent_path() / (id + L".dat"), 80 * 1024 * 1024)));
        if (job.value("thumbnail", false)) {
            auto pixels = decodeImage(clip, 208, 128);
            if (!pixels.width || !pixels.height) return 1;
            Bytes reply;
            put32(reply, pixels.width); put32(reply, pixels.height);
            reply.insert(reply.end(), pixels.bgra.begin(), pixels.bgra.end());
            atomicWrite(request.wstring() + L".result", protect(reply));
            return 0;
        }
        Settings settings;
        settings.useTesseract = job.at("tesseract").get<bool>();
        settings.tesseractPath = str(job, "path");
        settings.tesseractLanguages = str(job, "languages");
        auto text = utf8(recognizeText(clip, settings));
        if (text.size() > 1024 * 1024) return 1;
        auto response = request; response += L".result";
        atomicWrite(response, protect(jsonBytes(Json{{"schema", 1}, {"id", utf8(id)}, {"text", text}})));
        return 0;
    } catch (...) { return 1; }
 }
 bool History::saveOcr(const std::wstring &id, const std::optional<std::wstring> &text, const Settings &settings)
 {
    std::lock_guard lock(mutex_);
@@ -1,8 +1,10 @@
 #pragma once
 #include "platform.h"
 #include <mutex>
 #include <functional>
 namespace ks
 {
 struct Pixels;
 Settings loadSettings(const std::filesystem::path &, const std::vector<Layout> &);
 Settings decodeSettings(const Bytes &, const std::vector<Layout> &);
 Bytes encodeSettings(const Settings &);
@@ -15,6 +17,7 @@ struct Entry
    bool pinned{}, image{}, files{};
    int ocrState{}; // 0: legacy/not applicable, 1: pending, 2: saved, 3: failed
    std::wstring ocrProfile = L"windows";
    std::string contentHash, imageHash, pixelHash;
 };
 class History
 {
@@ -22,13 +25,19 @@ class History
    std::vector<Entry> entries_;
    mutable std::mutex mutex_;
    void saveIndex();
    void loadIndex();
    void prune(const Settings &);
  public:
    explicit History(const std::filesystem::path &);
    void reload();
    std::vector<Entry> entries() const;
    Clip load(const std::wstring &id) const;
    void add(const Clip &, const std::wstring &app, const Settings &);
    bool captureImage(DWORD sequence, const std::wstring &app, const Settings &);
    std::wstring recognizeImage(const std::wstring &id, const Settings &,
                                const std::function<bool()> &cancelled = {}) const;
    Pixels thumbnail(const std::wstring &id, const std::function<bool()> &cancelled = {}) const;
    bool saveOcr(const std::wstring &id, const std::optional<std::wstring> &, const Settings &);
    std::optional<std::wstring> ocrText(const std::wstring &id, const std::wstring &profile = L"") const;
    void remove(const std::wstring &);
@@ -39,4 +48,22 @@ class History
 Bytes encodeClip(const Clip &);
 Clip decodeClip(const Bytes &);
 bool sameClipboardImage(const Clip &, const Clip &);
 int runImageHistoryCapture(const std::filesystem::path &request);
 int runHistoryOcr(const std::filesystem::path &request);
 // Image backups stay encrypted on disk and are read/written only by a short-lived helper.
 class ClipboardSnapshot
 {
    Clip clip_;
    std::filesystem::path request_;
    void cleanup() noexcept;
    DWORD run(bool restore, DWORD sequence);
  public:
    ClipboardSnapshot() = default;
    ClipboardSnapshot(const ClipboardSnapshot &) = delete;
    ClipboardSnapshot &operator=(const ClipboardSnapshot &) = delete;
    ~ClipboardSnapshot();
    void capture(HWND, DWORD sequence);
    DWORD restore(HWND, DWORD sequence);
 };
 int runClipboardSnapshot(const std::filesystem::path &request);
 } // namespace ks
@@ -468,12 +468,17 @@ struct SearchResult
    uint64_t generation;
    std::vector<Entry> items;
 };
 struct TextPreview
 {
    std::string rtf;
    std::wstring plain;
 };
 struct PreviewResult
 {
    uint64_t generation;
    std::wstring id;
    Pixels pixels;
-    std::string rtf;
+    TextPreview text;
 };
 struct HistoryView
 {
@@ -481,8 +486,9 @@ struct HistoryView
    std::vector<Entry> items;
    std::wstring rememberedSelection, rememberedTop;
    uint64_t generation{};
    std::shared_ptr<std::atomic<bool>> previewActive = std::make_shared<std::atomic<bool>>(true);
    std::map<std::wstring, Pixels> thumbnails;
-    std::map<std::wstring, std::string> richTexts;
+    std::map<std::wstring, TextPreview> richTexts;
    HWND rich{};
    std::set<std::wstring> pending;
    bool scrolling{};
@@ -504,6 +510,8 @@ std::wstring selected(HWND w, HistoryView *v)
 }
 void search(HWND w, HistoryView *v)
 {
    v->previewActive->store(false);
    v->previewActive = std::make_shared<std::atomic<bool>>(true);
    v->closed = false;
    auto q = value(w, 101);
    auto generation = ++v->generation;
@@ -532,23 +540,31 @@ void requestPreview(HWND w, HistoryView *v, const Entry &entry)
    if (v->thumbnails.contains(id) || v->richTexts.contains(id) || !v->pending.insert(id).second)
        return;
    auto generation = v->generation;
    auto active = v->previewActive;
    auto *app = v->app;
    app->enqueue(
-        [w, app, id, generation, image]
+        [w, app, id, generation, image, active]
        {
            if (!active->load()) return;
            auto result = new PreviewResult{generation, id, {}, {}};
            try
            {
                auto clip = app->history->load(id);
                if (image)
-                    result->pixels = decodeImage(clip, 208, 128);
+                    result->pixels = app->history->thumbnail(id, [active] { return !active->load(); });
-                else
+                else {
-                    result->rtf = richPreview(clip);
+                    auto clip = app->history->load(id);
                    if (!active->load()) { delete result; return; }
                    result->text.rtf = richPreview(clip, false);
                    if (result->text.rtf.empty()) {
                        result->text.plain = clip.text();
                        if (result->text.plain.size() > 4096) result->text.plain.resize(4096);
                    }
                }
            }
            catch (const std::exception &)
            {
            }
-            if (!PostMessageW(w, PreviewMessage, 0, (LPARAM)result))
+            if (!active->load() || !PostMessageW(w, PreviewMessage, 0, (LPARAM)result))
                delete result;
        });
 }
@@ -602,9 +618,13 @@ void drawHistoryRow(HWND w, HistoryView *v, const DRAWITEMSTRUCT &draw)
    if (!entry.image && !entry.files)
    {
        auto rich = v->richTexts.find(entry.id);
-        if (rich != v->richTexts.end() && v->rich && !rich->second.empty())
+        if (rich != v->richTexts.end() && rich->second.rtf.empty())
            text = (entry.pinned ? L"★  " : L"") + rich->second.plain;
        if (rich != v->richTexts.end() && !rich->second.rtf.empty() && !v->rich)
            v->rich = createRichText(w, 105, false);
        if (rich != v->richTexts.end() && v->rich && !rich->second.rtf.empty())
        {
-            setRichText(v->rich, rich->second);
+            setRichText(v->rich, rich->second.rtf);
            CHARFORMAT2W format{};
            format.cbSize = sizeof(format);
            format.dwMask = CFM_COLOR;
@@ -751,7 +771,10 @@ LRESULT CALLBACK historyProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
            {
                if (!entry.empty())
                {
-                    if (id == 112)
+                    if (v->app->historyService) {
                        v->app->remoteHistory(id == 112 ? "pin" : "remove", entry);
                        v->app->history->reload();
                    } else if (id == 112)
                        v->app->history->pin(entry);
                    else
                        v->app->history->remove(entry);
@@ -825,14 +848,14 @@ LRESULT CALLBACK historyProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                visible.insert(v->items[i].id);
                if(v->items[i].id==result->id) { changed=intersection; repaint=true; }
            }
-            if (!result->rtf.empty())
+            if (!result->text.rtf.empty() || !result->text.plain.empty())
-                v->richTexts[result->id] = std::move(result->rtf);
+                v->richTexts[result->id] = std::move(result->text);
            else
                v->thumbnails[result->id] = std::move(result->pixels);
            trimHistoryPreviews(v->thumbnails,visible,32,HistoryThumbnailBudget,
                                [](const Pixels &p) { return p.bgra.capacity(); });
            trimHistoryPreviews(v->richTexts,visible,32,HistoryRichTextBudget,
-                                [](const std::string &s) { return s.capacity(); });
+                                [](const TextPreview &s) { return s.rtf.capacity() + s.plain.capacity() * sizeof(wchar_t); });
            if(repaint) InvalidateRect(list,&changed,FALSE);
            return 0;
        }
@@ -887,20 +910,24 @@ LRESULT CALLBACK historyProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
            v->rememberedSelection = selected(w, v);
            int top = (int)SendDlgItemMessageW(w,102,LB_GETTOPINDEX,0,0);
            v->rememberedTop = top >= 0 && top < (int)v->items.size() ? v->items[top].id : L"";
            v->app->saveHistoryView(v->rememberedSelection, v->rememberedTop, value(w, 101));
            KillTimer(w, 1);
            v->closed = true;
            v->previewActive->store(false);
            ++v->generation; // Discard search/preview results queued before closing.
            ShowWindow(w, SW_HIDE);
            SendDlgItemMessageW(w,102,LB_RESETCONTENT,0,0);
            std::vector<Entry>().swap(v->items);
            v->thumbnails.clear();
            v->richTexts.clear();
-            if (v->rich)
+            if (v->rich) SetWindowTextW(v->rich, L"");
                SetWindowTextW(v->rich, L"");
            v->pending.clear();
            if (v->app->historyService && !v->app->historyEntryWindows)
                PostMessageW(v->app->window, WM_CLOSE, 0, 0);
            return 0;
        }
        case WM_NCDESTROY:
            v->previewActive->store(false);
            disposeFont(w);
            v->app->historyWindow = nullptr;
            delete v;
@@ -1660,13 +1687,19 @@ LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 #ifndef KS_CONFIG_APP
 LRESULT CALLBACK entryProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 {
    if (msg == WM_NCCREATE)
        SetWindowLongPtrW(w, GWLP_USERDATA, (LONG_PTR)((CREATESTRUCTW *)lp)->lpCreateParams);
    if (msg == WM_SIZE)
    {
        MoveWindow(GetDlgItem(w, 1), 10, 10, LOWORD(lp) - 20, HIWORD(lp) - 20, TRUE);
        return 0;
    }
-    if (msg == WM_NCDESTROY)
+    if (msg == WM_NCDESTROY) {
        disposeFont(w);
        auto *app = (App *)GetWindowLongPtrW(w, GWLP_USERDATA);
        if (app && app->historyService && app->historyEntryWindows && !--app->historyEntryWindows &&
            !IsWindowVisible(app->historyWindow)) PostMessageW(app->window, WM_CLOSE, 0, 0);
    }
    return DefWindowProcW(w, msg, wp, lp);
 }
 #endif
@@ -1674,6 +1707,7 @@ LRESULT CALLBACK entryProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 #ifndef KS_CONFIG_APP
 void refreshHistory(App &app)
 {
    if (app.isolateHistory) { app.refreshHistoryProcess(); return; }
    if (app.historyWindow)
    {
        auto *v = (HistoryView *)GetWindowLongPtrW(app.historyWindow, GWLP_USERDATA);
@@ -1682,6 +1716,7 @@ void refreshHistory(App &app)
 }
 void showHistory(App &app, bool visible)
 {
    if (app.isolateHistory) { if (visible) app.openHistoryProcess(); return; }
    if (!app.history)
    {
        app.report(L"Clipboard history is unavailable. See the log in the data folder.");
@@ -1702,7 +1737,6 @@ void showHistory(App &app, bool visible)
        HWND w = makeWindow(app, L"KSwitcher.History", L"Clipboard history", historyProc, 760, 500);
        app.historyWindow = w;
        windowLayoutState(w)->history = true;
        ((HistoryView *)GetWindowLongPtrW(w, GWLP_USERDATA))->rich = createRichText(w, 105, false);
        label(w, L"&Search clipboard history", 16, 12, 500);
        edit(w, 101, 16, 38, 728);
        auto list = control(w, L"LISTBOX", L"",
@@ -1718,6 +1752,12 @@ void showHistory(App &app, bool visible)
        button(w, L"Clear &history…", 116, 546, 452, 150);
        SetWindowSubclass(list, historyKey, 1, (DWORD_PTR)w);
        SetWindowSubclass(GetDlgItem(w, 101), historyKey, 1, (DWORD_PTR)w);
        if (app.historyService) {
            auto *v = (HistoryView *)GetWindowLongPtrW(w, GWLP_USERDATA);
            v->rememberedSelection = app.historySelection;
            v->rememberedTop = app.historyTop;
            SetDlgItemTextW(w, 101, app.historyQuery.c_str());
        }
    }
    if (!visible) return;
    POINT cursor;
@@ -1874,6 +1914,7 @@ void showEntry(App &app, const std::wstring &id)
        }
        HWND w = makeWindow(app, L"KSwitcher.Entry", L"Clipboard item", entryProc, 720, 500,
                            WS_THICKFRAME | WS_MAXIMIZEBOX);
        if (app.historyService) ++app.historyEntryWindows;
        auto field = edit(w, 1, 10, 10, 700, 480, ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL | WS_VSCROLL);
        SetWindowTextW(field, text.c_str());
        showRequestedWindow(w);
@@ -2,7 +2,7 @@
 #include "platform.h"
 namespace ks
 {
-inline constexpr wchar_t AppVersion[] = L"0.6.36";
+inline constexpr wchar_t AppVersion[] = L"0.6.40";
 inline constexpr UINT UpdateMessage = WM_APP + 7;
 inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
 inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;
@@ -0,0 +1,108 @@
 // Run with the resident stopped. The suite restores the original clipboard.
 #include "storage.h"
 #include "ocr.h"
 #include <psapi.h>
 #include <iostream>
 #include <algorithm>
 static void require(bool ok, const char *name) {
    if (!ok) throw std::runtime_error(name);
    std::cout << "PASS " << name << '\n';
 }
 static HWND owner() {
    return CreateWindowExW(0,L"STATIC",L"Snapshot test",0,0,0,0,0,HWND_MESSAGE,nullptr,nullptr,nullptr);
 }
 static void child(const std::wstring &argument) {
    auto exe=ks::executable(), command=L"\""+exe+L"\" "+argument;
    STARTUPINFOW startup{sizeof(startup)}; startup.dwFlags=STARTF_USESHOWWINDOW; startup.wShowWindow=SW_HIDE;
    PROCESS_INFORMATION p{};
    if(!CreateProcessW(exe.c_str(),command.data(),nullptr,nullptr,FALSE,CREATE_NO_WINDOW,nullptr,nullptr,&startup,&p))
        throw std::runtime_error("start fixture process");
    CloseHandle(p.hThread);
    auto wait=WaitForSingleObject(p.hProcess,30000); DWORD code=1;
    if(wait!=WAIT_OBJECT_0) {TerminateProcess(p.hProcess,1);WaitForSingleObject(p.hProcess,INFINITE);}
    GetExitCodeProcess(p.hProcess,&code); CloseHandle(p.hProcess);
    if(code) throw std::runtime_error("fixture process failed");
 }
 static size_t resident() {
    ks::Bytes b(1024*1024); auto ws=reinterpret_cast<PSAPI_WORKING_SET_INFORMATION*>(b.data());
    if(!QueryWorkingSet(GetCurrentProcess(),ws,DWORD(b.size()))) throw std::runtime_error("working set query");
    size_t pages=0; for(size_t i=0;i<ws->NumberOfEntries;++i) if(!ws->WorkingSetInfo[i].Shared) ++pages;
    return pages*4096;
 }
 static void verifyImage(HWND w) {
    auto c=ks::readClipboard(w,64*1024*1024);
    for(auto id:{CF_DIB,CF_DIBV5}) {
        auto it=std::find_if(c.formats.begin(),c.formats.end(),[&](const auto &f){return f.id==UINT(id);});
        require(it!=c.formats.end(),"restores image representation");
        auto pixels=ks::decodeImage(ks::Clip{{*it}});
        require(pixels.width==1566 && pixels.height==1068 && pixels.bgra.front()==77,"preserves image pixels");
    }
    require(c.text()==L"Snapshot mixed text","preserves accompanying text");
 }
 int main(int argc,char**argv) {
    CoInitializeEx(nullptr,COINIT_MULTITHREADED);
    HWND w=owner(); int result=0; ks::Clip original; bool saved=false;
    try {
        std::string mode=argc>1?argv[1]:"suite";
        if(mode=="publish") {
            ks::Pixels p{1566,1068,ks::Bytes(1566*1068*4,255)}; p.bgra[0]=77;
            auto dib=ks::imageDib(p); auto v5=dib;
            BITMAPV5HEADER h{}; h.bV5Size=sizeof(h); h.bV5Width=p.width; h.bV5Height=-p.height;
            h.bV5Planes=1; h.bV5BitCount=32; h.bV5Compression=BI_BITFIELDS;
            h.bV5RedMask=0xff0000; h.bV5GreenMask=0xff00; h.bV5BlueMask=0xff; h.bV5AlphaMask=0xff000000;
            v5.id=CF_DIBV5; v5.data.resize(sizeof(h)+p.bgra.size());
            memcpy(v5.data.data(),&h,sizeof(h)); memcpy(v5.data.data()+sizeof(h),p.bgra.data(),p.bgra.size());
            auto clip=ks::textClip(L"Snapshot mixed text"); clip.formats.push_back(dib); clip.formats.push_back(v5);
            ks::writeClipboard(w,clip);
        } else if(mode=="old" || mode=="new") {
            child(L"publish"); auto baseline=resident();
            if(mode=="old") {
                auto clip=ks::readClipboard(w,64*1024*1024);
                ks::writeClipboard(w,ks::textClip(L"temporary")); ks::writeClipboard(w,clip);
            } else {
                ks::ClipboardSnapshot snapshot; snapshot.capture(w,GetClipboardSequenceNumber());
                auto seq=ks::writeClipboard(w,ks::textClip(L"temporary"));
                require(snapshot.restore(w,seq)==GetClipboardSequenceNumber(),"helper returns current sequence");
            }
            auto after=resident();
            auto report="baseline="+std::to_string(baseline)+" after="+std::to_string(after)+" delta="+std::to_string(int64_t(after)-int64_t(baseline))+"\n";
            auto path=std::filesystem::path(ks::executable()).parent_path()/(L"snapshot-memory-"+ks::wide(mode)+L".txt");
            ks::atomicWrite(path,ks::Bytes(report.begin(),report.end()));
            verifyImage(w); // Only after measuring: verification intentionally reads images.
        } else {
            original=ks::readClipboard(w,128*1024*1024); saved=true;
            child(L"old"); child(L"new"); child(L"publish");
            auto seq=GetClipboardSequenceNumber();
            auto selected=ks::readClipboard(w,32*1024*1024,ks::ClipboardRead::Selection);
            require(selected.formats.size()==1 && selected.text()==L"Snapshot mixed text","selection read excludes image data");
            bool rejected=false;
            try {ks::readClipboard(w,32*1024*1024,ks::ClipboardRead::WithoutImages,seq);} catch(...) {rejected=true;}
            require(rejected,"resident rejects images before reading their data");
            {
                ks::ClipboardSnapshot snapshot; snapshot.capture(w,seq);
                auto stale=ks::writeClipboard(w,ks::textClip(L"temporary"));
                ks::writeClipboard(w,ks::textClip(L"external copy")); rejected=false;
                try {snapshot.restore(w,stale);} catch(...) {rejected=true;}
                require(rejected && ks::readClipboard(w).text()==L"external copy","stale image restore preserves external copy");
            }
            {
                ks::ClipboardSnapshot snapshot; snapshot.capture(w,GetClipboardSequenceNumber());
                auto temporary=ks::writeClipboard(w,ks::textClip(L"temporary"));
                snapshot.restore(w,temporary);
                require(ks::readClipboard(w).text()==L"external copy","text snapshot fast path restores clipboard");
            }
            {
                ks::Clip empty; auto seqEmpty=ks::writeClipboard(w,empty);
                ks::ClipboardSnapshot snapshot; snapshot.capture(w,seqEmpty);
                snapshot.restore(w,ks::writeClipboard(w,ks::textClip(L"temporary")));
                require(ks::readClipboard(w).formats.empty(),"empty clipboard restored");
            }
            auto marked=ks::textClip(L"line"); marked.formats.push_back({0,L"MSDEVLineSelect",ks::Bytes{1}});
            ks::writeClipboard(w,marked);
            require(ks::readClipboard(w,1024,ks::ClipboardRead::Selection).formats.size()==2,"selection reader preserves editor guard metadata");
            std::cout<<"PASS clipboard snapshot suite\n";
        }
    } catch(const std::exception &e) {std::cerr<<"FAIL "<<e.what()<<'\n';result=1;}
    if(saved) try {ks::writeClipboard(w,original);} catch(...) {result=1;}
    DestroyWindow(w); CoUninitialize(); return result;
 }
@@ -0,0 +1,169 @@
 // Run from an isolated fixture folder containing KSwitcher.exe and Screenshot.exe,
 // with the normal resident stopped. Never points at the installed user's data.
 #include "storage.h"
 #include "ocr.h"
 #include "json.hpp"
 #include <commctrl.h>
 #include <psapi.h>
 #include <iostream>
 static HWND editor{};
 static bool pastedImage{};
 static LRESULT CALLBACK targetProc(HWND w,UINT message,WPARAM wp,LPARAM lp) {
    if(message==WM_SETFOCUS && editor) {SetFocus(editor);return 0;}
    return DefWindowProcW(w,message,wp,lp);
 }
 static void require(bool ok,const char *what) {if(!ok)throw std::runtime_error(what);std::cout<<"PASS "<<what<<'\n';}
 static void pump() {MSG m;while(PeekMessageW(&m,nullptr,0,0,PM_REMOVE)){TranslateMessage(&m);DispatchMessageW(&m);}}
 template<class F> static void until(F condition,const char *what,DWORD timeout=10000) {
    auto end=GetTickCount64()+timeout;
    while(!condition()){if(GetTickCount64()>=end)throw std::runtime_error(what);pump();Sleep(10);}
 }
 static LRESULT send(HWND w,UINT message,WPARAM wp=0,LPARAM lp=0) {
    DWORD_PTR result{};
    if(!SendMessageTimeoutW(w,message,wp,lp,SMTO_ABORTIFHUNG,5000,&result))throw std::runtime_error("window request timed out");
    return LRESULT(result);
 }
 static void command(HWND resident,int cmd) {
    COPYDATASTRUCT data{1,sizeof(cmd),&cmd};send(resident,WM_COPYDATA,0,LPARAM(&data));
 }
 static size_t memory(HANDLE process) {
    ks::Bytes bytes(1024*1024);auto ws=reinterpret_cast<PSAPI_WORKING_SET_INFORMATION*>(bytes.data());
    if(!QueryWorkingSet(process,ws,DWORD(bytes.size())))throw std::runtime_error("memory query failed");
    size_t pages=0;for(size_t i=0;i<ws->NumberOfEntries;++i)if(!ws->WorkingSetInfo[i].Shared)++pages;
    return pages*4096;
 }
 static std::wstring editorText() {wchar_t text[256]{};GetWindowTextW(editor,text,256);return text;}
 static LRESULT CALLBACK editProc(HWND w,UINT message,WPARAM wp,LPARAM lp,UINT_PTR,DWORD_PTR) {
    if(message==WM_PASTE && IsClipboardFormatAvailable(CF_DIB)) {pastedImage=true;return 0;}
    return DefSubclassProc(w,message,wp,lp);
 }
 static ks::Clip excluded(ks::Clip clip) {
    clip.formats.push_back({0,L"ExcludeClipboardContentFromMonitorProcessing",ks::Bytes{0}});return clip;
 }
 int main() {
    CoInitializeEx(nullptr,COINIT_APARTMENTTHREADED);
    PROCESS_INFORMATION process{};HWND resident{},target{};ks::Clip saved;bool captured=false;int result=0;
    try {
        auto folder=std::filesystem::path(ks::executable()).parent_path();
        require(folder.filename().wstring().starts_with(L"history-host-fixture-"),"isolated fixture directory");
        require(!FindWindowW(L"KSwitcher.Main",nullptr),"normal resident is stopped");
        WNDCLASSW targetClass{};targetClass.lpfnWndProc=targetProc;targetClass.hInstance=GetModuleHandleW(nullptr);
        targetClass.lpszClassName=L"KSwitcher.HistoryTestDestination";RegisterClassW(&targetClass);
        target=CreateWindowExW(0,targetClass.lpszClassName,L"KSwitcher history test destination",WS_OVERLAPPEDWINDOW|WS_VISIBLE,
                               50,50,500,250,nullptr,nullptr,nullptr,nullptr);
        editor=CreateWindowExW(0,L"EDIT",L"",WS_CHILD|WS_VISIBLE|ES_MULTILINE,10,10,450,180,target,nullptr,nullptr,nullptr);
        SetWindowSubclass(editor,editProc,1,0);
        saved=ks::readClipboard(target,128*1024*1024);captured=true;
        ks::writeClipboard(target,excluded(ks::textClip(L"fixture clipboard")));
        auto settings=ks::loadSettings(folder/L"missing.json",ks::readLayouts());
        settings.autoCorrect=false;settings.writeLog=true;settings.history=true;settings.maxItems=500;settings.maxMiB=100;
        std::filesystem::create_directories(folder/L"data");
        ks::saveSettings(folder/L"data/settings.json",settings);
        ks::History history(folder/L"data/history");
        history.clear(); // This executable only runs in its dedicated fixture directory.
        ks::Pixels pixels{1566,1068,ks::Bytes(1566*1068*4,255)};
        auto image=ks::Clip{{ks::imageDib(pixels)}};
        history.add(image,L"test",settings);
        auto imageId=history.entries().front().id;
        // Seed once rather than rewriting the encrypted index 500 times. This
        // also avoids measuring fixture creation in the resident under test.
        auto indexPath=folder/L"data/history/index.dat";
        auto rows=nlohmann::json::parse(ks::unprotect(ks::readFile(indexPath,1024*1024)));
        for(int i=0;i<499;++i) {
            auto id=ks::lower(ks::newSnippetId().substr(1,36)),text=L"History fixture "+std::to_wstring(i);
            auto bytes=ks::protect(ks::encodeClip(ks::textClip(text)));
            ks::atomicWrite(folder/L"data/history"/(id+L".dat"),bytes);
            rows.insert(rows.begin(),nlohmann::json{{"id",ks::utf8(id)},{"preview",ks::utf8(text)},
                {"app","test"},{"bytes",bytes.size()},{"at",i+1},{"pinned",false},{"image",false},{"files",false}});
        }
        auto encoded=rows.dump();ks::atomicWrite(indexPath,ks::protect(ks::Bytes(encoded.begin(),encoded.end())));
        history.reload();
        auto textId=history.entries().front().id;
        auto exe=folder/L"KSwitcher.exe";auto line=L"\""+exe.wstring()+L"\"";
        STARTUPINFOW startup{sizeof(startup)};startup.dwFlags=STARTF_USESHOWWINDOW;startup.wShowWindow=SW_HIDE;
        require(CreateProcessW(exe.c_str(),line.data(),nullptr,nullptr,FALSE,CREATE_NO_WINDOW,nullptr,folder.c_str(),&startup,&process),"start isolated resident");
        CloseHandle(process.hThread);process.hThread=nullptr;
        until([&]{resident=FindWindowW(L"KSwitcher.Main",nullptr);return resident!=nullptr;},"resident startup");
        auto base=memory(process.hProcess);
        std::string forged="{\"action\":\"clear\",\"id\":\"\",\"plain\":false}";
        COPYDATASTRUCT forgedRequest{0x4b530200,DWORD(forged.size()),forged.data()};
        require(send(resident,WM_COPYDATA,WPARAM(target),LPARAM(&forgedRequest))==0,
                "history rejects requests from an untrusted process");
        auto open=[&] {
            require(ks::activateWindow(target),"destination foreground");SetFocus(editor);command(resident,5);
            HWND window{};
            until([&]{window=FindWindowW(L"KSwitcher.History",nullptr);return window&&IsWindowVisible(window);},"history startup");
            until([&]{return send(GetDlgItem(window,102),LB_GETCOUNT)>0;},"history rows");
            DWORD pid{};GetWindowThreadProcessId(window,&pid);
            require(pid!=process.dwProcessId,"history belongs to a separate process");
            return window;
        };
        auto close=[&](HWND window) {
            DWORD pid{};GetWindowThreadProcessId(window,&pid);HANDLE child=OpenProcess(SYNCHRONIZE,FALSE,pid);
            PostMessageW(window,WM_KEYDOWN,VK_ESCAPE,0); // Escape also works with focus on the window itself.
            until([&]{return WaitForSingleObject(child,0)==WAIT_OBJECT_0;},"history helper exits after Escape");
            CloseHandle(child);
            require(!FindWindowW(L"KSwitcher.History",nullptr),"Escape destroys history window");
        };
        for(int i=0;i<3;++i){auto w=open();until([&]{return send(GetDlgItem(w,102),LB_GETCOUNT)==500;},"all history rows loaded");require(true,"all history entries visible");close(w);}
        auto idle=memory(process.hProcess);
        std::cout<<"MEMORY resident_before="<<base<<" after_three_closes="<<idle<<'\n';
        require(idle<base+2*1024*1024,"repeated history does not retain UI heap in resident");
        auto w=open();send(w,WM_COMMAND,112);
        until([&]{history.reload();return history.entries().front().pinned;},"resident pin mutation");
        require(history.entries().front().id==textId,"pin preserves history identity");
        send(GetDlgItem(w,101),WM_SETTEXT,0,LPARAM(L"History fixture 498"));
        until([&]{return send(GetDlgItem(w,102),LB_GETCOUNT)==1;},"history search");
        close(w);w=open();
        wchar_t query[100]{};send(GetDlgItem(w,101),WM_GETTEXT,100,LPARAM(query));
        require(std::wstring(query)==L"History fixture 498","search survives helper restart");
        send(w,WM_COMMAND,114);
        HWND entry{};until([&]{entry=FindWindowW(L"KSwitcher.Entry",nullptr);return entry!=nullptr;},"full item opens");
        DWORD childPid{};GetWindowThreadProcessId(w,&childPid);HANDLE child=OpenProcess(SYNCHRONIZE,FALSE,childPid);
        send(GetDlgItem(w,101),WM_KEYDOWN,VK_ESCAPE);
        require(WaitForSingleObject(child,0)==WAIT_TIMEOUT && IsWindow(entry),"full item remains usable after closing history");
        send(entry,WM_CLOSE);
        until([&]{return WaitForSingleObject(child,0)==WAIT_OBJECT_0;},"helper exits after last full item closes");CloseHandle(child);
        w=open();send(GetDlgItem(w,101),WM_SETTEXT,0,LPARAM(L""));
        until([&]{return send(GetDlgItem(w,102),LB_GETCOUNT)==500;},"clear search");close(w);
        ks::writeClipboard(target,excluded(image));
        w=open();send(w,WM_COMMAND,111);
        until([&]{return editorText()==L"History fixture 498";},"paste plain text into native editor");
        until([&]{return IsClipboardFormatAvailable(CF_DIB)&&!FindWindowW(L"KSwitcher.HistoryHost",nullptr);},"image clipboard restored after paste");
        require(ks::decodeImage(ks::readClipboard(target,64*1024*1024)).width==pixels.width,"image clipboard survives history paste");
        auto afterPaste=memory(process.hProcess);
        std::cout<<"MEMORY after_paste_with_image_backup="<<afterPaste<<'\n';
        require(afterPaste<base+2*1024*1024,"image clipboard backup stays outside resident");
        ks::writeClipboard(target,excluded(ks::textClip(L"keep clipboard")));
        w=open();send(GetDlgItem(w,101),WM_SETTEXT,0,LPARAM(L"Image"));
        until([&]{return send(GetDlgItem(w,102),LB_GETCOUNT)==1;},"image search");
        pastedImage=false;send(w,WM_COMMAND,110);
        until([&]{return pastedImage;},"image paste reaches destination");
        until([&]{return ks::readClipboard(target).text()==L"keep clipboard";},"clipboard restored after image paste");
        std::cout<<"MEMORY after_image_paste="<<memory(process.hProcess)<<'\n';
        require(memory(process.hProcess)<base+2*1024*1024,"image paste does not retain full bitmap in resident");
        until([&]{return !FindWindowW(L"KSwitcher.HistoryHost",nullptr);},"image paste helper exits");
        w=open();send(w,WM_COMMAND,113);
        until([&]{history.reload();return history.entries().size()==499;},"resident removes selected image");
        GetWindowThreadProcessId(w,&childPid);child=OpenProcess(SYNCHRONIZE,FALSE,childPid);
        // Startup update checks temporarily reject exit; retry after that
        // operation finishes instead of treating its guard as a host leak.
        ULONGLONG nextExit{};
        until([&]{
            if(WaitForSingleObject(process.hProcess,0)==WAIT_OBJECT_0) return true;
            if(GetTickCount64()>=nextExit) {
                command(resident,99);nextExit=GetTickCount64()+500;
            }
            return false;
        },"resident accepts exit after startup update check",30000);
        until([&]{return WaitForSingleObject(child,0)==WAIT_OBJECT_0;},"resident shutdown closes history helper");
        CloseHandle(child);resident=nullptr;
        std::cout<<"PASS isolated history host suite\n";
    } catch(const std::exception &e){std::cerr<<"FAIL "<<e.what()<<" editor="<<ks::utf8(editorText())<<" foreground="<<(GetForegroundWindow()==target)<<'\n';result=1;}
    if(resident)try{command(resident,99);}catch(...){}
    if(process.hProcess){if(WaitForSingleObject(process.hProcess,10000)!=WAIT_OBJECT_0){TerminateProcess(process.hProcess,1);WaitForSingleObject(process.hProcess,INFINITE);}CloseHandle(process.hProcess);}
    if(captured)try{ks::writeClipboard(target,saved);}catch(...){result=1;}
    if(target) DestroyWindow(target);
    CoUninitialize();
    return result;
 }
@@ -0,0 +1,84 @@
 // Interactive clipboard test. Run with the resident stopped; the original
 // clipboard is restored. The helper must be beside this test executable.
 #include "storage.h"
 #include "ocr.h"
 #include <algorithm>
 #include <iostream>
 static void require(bool ok,const char *name) {
    if(!ok) throw std::runtime_error(name);
    std::cout << "PASS " << name << '\n';
 }
 int main() {
    CoInitializeEx(nullptr,COINIT_MULTITHREADED);
    HWND owner=CreateWindowExW(0,L"STATIC",L"Capture test",0,0,0,0,0,HWND_MESSAGE,nullptr,nullptr,nullptr);
    ks::Clip saved; bool captured=false; int result=0;
    auto folder=std::filesystem::temp_directory_path()/(L"KSwitcher-image-capture-"+std::to_wstring(GetCurrentProcessId()));
    try {
        saved=ks::readClipboard(owner,128*1024*1024); captured=true;
        ks::Settings settings; settings.history=true;
        ks::History history(folder);
        history.add(ks::textClip(L"keep pinned"),L"test",settings);
        auto pinned=history.entries().front().id; history.pin(pinned);
        ks::Pixels pixels{32,16,ks::Bytes(32*16*4,255)};
        ks::Clip image{{ks::imageDib(pixels),{0,L"PNG",ks::encodePng(pixels)}}};
        auto sequence=ks::writeClipboard(owner,image);
        require(history.captureImage(sequence,L"capture test",settings),"helper captures image");
        auto entries=history.entries();
        require(entries.size()==2 && entries.front().image && entries.front().ocrState==1,"resident reloads metadata with pending OCR");
        require(entries.front().contentHash.size()==64 && !entries.front().pixelHash.empty(),
                "helper persists fingerprints and resident reloads them");
        require(entries.back().id==pinned && entries.back().pinned,"helper preserves existing pinned entry");
        auto restored=history.load(entries.front().id);
        auto thumbnail=history.thumbnail(entries.front().id);
        require(thumbnail.width==pixels.width && thumbnail.height==pixels.height && thumbnail.bgra==pixels.bgra,
                "helper thumbnail preserves small image pixels");
        bool thumbnailCancelled=false;
        try {history.thumbnail(entries.front().id,[]{return true;});} catch(...) {thumbnailCancelled=true;}
        require(thumbnailCancelled,"closed history cancels thumbnail work");
        auto has=[&](const ks::Format &expected) {
            return std::any_of(restored.formats.begin(),restored.formats.end(),[&](const ks::Format &actual) {
                return (expected.name.empty()?actual.id==expected.id:actual.name==expected.name) && actual.data==expected.data;
            });
        };
        require(has(image.formats[0]) && has(image.formats[1]),
                "encrypted history preserves both image representations");
        require(ks::readFile(folder/(entries.front().id+L".dat"),1024*1024)!=ks::encodeClip(restored),"saved image is encrypted");
        require(GetClipboardSequenceNumber()==sequence,"capture leaves clipboard unchanged");
        require(history.captureImage(sequence,L"capture test",settings) && history.entries().size()==2,"duplicate capture is not added");
        ks::writeClipboard(owner,ks::textClip(L"new clipboard"));
        require(!history.captureImage(sequence,L"stale",settings) && history.entries().size()==2,"stale request does not save another clipboard");
        for(auto name : {L"ExcludeClipboardContentFromMonitorProcessing",L"Clipboard Viewer Ignore",L"CanIncludeInClipboardHistory"}) {
            auto blocked=image; blocked.formats.push_back({0,name,ks::Bytes(4,0)});
            sequence=ks::writeClipboard(owner,blocked);
            require(!history.captureImage(sequence,L"excluded",settings) && history.entries().size()==2,"clipboard privacy flag prevents capture");
        }
        pixels={1024,512,ks::Bytes(1024*512*4,255)};
        sequence=ks::writeClipboard(owner,ks::Clip{{ks::imageDib(pixels)}});
        settings.maxImageMiB=1;
        bool rejected=false;
        try {history.captureImage(sequence,L"oversized",settings);} catch(const std::exception &e) {
            rejected=std::string(e.what())=="Clipboard exceeds the configured size limit";
        }
        require(rejected && history.entries().size()==2,"oversized image is rejected without changing index");
        require(GetClipboardSequenceNumber()==sequence,"rejection leaves clipboard unchanged");
        settings.maxImageMiB=20;
        history.add(ks::Clip{{ks::imageDib(pixels)}},L"thumbnail fixture",settings);
        auto largeId=history.entries().front().id;
        thumbnail=history.thumbnail(largeId);
        require(thumbnail.width==208 && thumbnail.height==104 && thumbnail.bgra.size()==208*104*4,
                "large image returns only bounded thumbnail pixels");
        history.remove(largeId);
        bool missingRejected=false;
        try {history.thumbnail(largeId);} catch(...) {missingRejected=true;}
        require(missingRejected,"deleted image cannot be previewed or recreated");
        for(const auto &file:std::filesystem::directory_iterator(folder))
            require(file.path().extension()!=L".request","encrypted capture request is cleaned up");
    } catch(const std::exception &e) {std::cerr << "FAIL " << e.what() << '\n';result=1;}
    if(captured) try {ks::writeClipboard(owner,saved);} catch(...) {result=1;}
    DestroyWindow(owner); CoUninitialize();
    // Remove only the exact PID-specific fixture under the system temp directory.
    std::error_code ignored;
    if(std::filesystem::weakly_canonical(folder).parent_path()==std::filesystem::weakly_canonical(std::filesystem::temp_directory_path()))
        std::filesystem::remove_all(folder,ignored);
    return result;
 }
@@ -912,6 +912,7 @@ int main(int argc, char **argv) {
            ks::showHistory(app,false);
            auto history=app.historyWindow;
            require(history&&!IsWindowVisible(history),"history layout tested without changing focus");
            require(!GetDlgItem(history,105),"history creates no RichEdit control before formatted content is displayed");
            {
                app.history=std::make_unique<ks::History>(temp/L"history-search");
                app.history->add(ks::textClip(L"згенеруй приклад"),L"test",app.settings);
@@ -941,7 +942,9 @@ int main(int argc, char **argv) {
                require(GetFocus()==originalFocus,"history search preserves focus");
                SendDlgItemMessageW(history,102,LB_SETCURSEL,1,0);
                ks::refreshHistory(app); // A result may still be in flight when closing.
-                SendMessageW(history,WM_CLOSE,0,0);
+                SendDlgItemMessageW(history,101,WM_KEYDOWN,VK_ESCAPE,0);
                require(!IsWindowVisible(history) && !GetDlgItem(history,105),
                        "Escape closes history and leaves no RichEdit control");
                SendMessageW(history,WM_TIMER,1,0); // KillTimer cannot retract a posted timer message.
                require(pumpUntil(0),"closing history releases list strings");
                auto until=GetTickCount64()+250;
@@ -309,6 +309,8 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                app->settings.autoCorrect = true;
                app->settings.switchLayout = true;
                app->settings.autoLanguages = {L"en", L"ru"};
                // Direct fixture mutations bypass applySettings' dictionary preload.
                app->autoPredictor.configure(L"dictionaries", app->settings.autoLanguages);
                app->settings.cycle = {app->layouts[en].id, app->layouts[ru].id};
                ActivateKeyboardLayout(app->layouts[en].handle, 0);
                prepare(L"ghbdtn ", false);
@@ -682,6 +684,7 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                app->settings.autoCorrect = true;
                app->settings.switchLayout = true;
                app->settings.autoLanguages = {L"en", L"ru"};
                app->autoPredictor.configure(L"dictionaries", app->settings.autoLanguages);
                app->settings.cycle = {app->layouts[en].id, app->layouts[ru].id};
                app->autoCorrector = ks::AutoCorrector{};
                ActivateKeyboardLayout(app->layouts[en].handle, 0);
@@ -731,6 +734,7 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                });
                require(uk != app->layouts.end(), "Ukrainian layout available for punctuation-key regression");
                app->settings.autoLanguages = {L"en", L"uk"};
                app->autoPredictor.configure(L"dictionaries", app->settings.autoLanguages);
                app->settings.cycle = {app->layouts[en].id, uk->id};
                app->settings.autoWords[L"uk"] = {L"робить"};
                app->autoCorrector = ks::AutoCorrector{};
@@ -59,6 +59,24 @@ int main(int argc, char **argv)
            app.settings.history = true;
            app.history->add(clip, L"OCR fixture", app.settings);
            auto id = app.history->entries().front().id;
            auto isolated = app.history->recognizeImage(id, config);
            if (isolated != text) throw std::runtime_error("Helper and in-process OCR results differ");
            bool cancelled = false;
            try { app.history->recognizeImage(id, config, [] { return true; }); }
            catch (const std::exception &) { cancelled = true; }
            if (!cancelled) throw std::runtime_error("Cancelled OCR request was executed");
            auto invalid = config;
            invalid.useTesseract = true;
            invalid.tesseractPath = (temp / L"missing-tesseract.exe").wstring();
            bool failed = false;
            try { app.history->recognizeImage(id, invalid); }
            catch (const std::exception &) { failed = true; }
            if (!failed || app.history->entries().front().ocrState != 1)
                throw std::runtime_error("Failed helper modified history metadata");
            for (const auto &file : std::filesystem::directory_iterator(temp / L"history"))
                if (file.path().filename().wstring().starts_with(L"ocr-"))
                    throw std::runtime_error("OCR helper left temporary files");
            std::cout << "PASS isolated OCR equivalence, cancellation, failure and encrypted IPC cleanup\n";
            if (tesseract)
            {
                app.history->saveOcr(id, L"old Windows result", app.settings);
@@ -4,6 +4,7 @@
 #include "richtext.h"
 #include "storage.h"
 #include "diagnostics.h"
 #include "json.hpp"
 #include <algorithm>
 #include <iostream>
 #include <map>
@@ -189,6 +190,8 @@ int main(int argc, char **argv)
                "HTML entities and Unicode survive without script text");
        require((effects(0, 6) & CFE_BOLD) != 0, "inline CSS bold is rendered");
        auto plain = ks::textClip(L"{\\literal} Привіт");
        require(ks::richPreview(plain, false).empty(), "plain history preview does not require RichEdit");
        require(!ks::richPreview(styled, false).empty(), "formatted history preview retains HTML rendering");
        ks::setRichText(rich, ks::richPreview(plain));
        GetWindowTextW(rich, rendered, 256);
        require(std::wstring(rendered) == plain.text(), "plain Unicode and RTF metacharacters are escaped");
@@ -635,6 +638,55 @@ int main(int argc, char **argv)
                    "Snipping Tool republish retains one pinned history entry");
            history.add(changedImage, L"SnippingTool", defaults);
            require(history.entries().size() == 2, "a new screenshot is retained");
            auto copiedText = ks::textClip(L"text after screenshot");
            history.add(copiedText, L"Editor", defaults);
            history.add(copiedText, L"Editor", defaults);
            require(history.entries().size() == 3 && !history.entries().front().image,
                    "text after screenshot is retained and consecutive text duplicates are skipped");
            history.add(changedImage, L"SnippingTool", defaults);
            history.add(changedImage, L"SnippingTool", defaults);
            require(history.entries().size() == 4 && history.entries().front().image,
                    "image after text is retained and consecutive image duplicates are skipped");
            history.add(withText, L"Editor", defaults);
            require(history.entries().size() == 5,
                    "mixed image and text payload is not discarded by metadata prefilter");
        }
        {
            auto folder = temp / L"fingerprints";
            ks::Settings defaults;
            ks::History history(folder);
            history.add(firstImage, L"test", defaults);
            auto id = history.entries().front().id;
            history.pin(id);
            history.saveOcr(id, L"retained OCR", defaults);
            ks::History reopened(folder);
            require(reopened.entries().front().contentHash.size() == 64,
                    "SHA-256 fingerprint survives encrypted index reload");
            // Deny payload reads: duplicates must still be detected using only the index.
            auto handle = CreateFileW((folder / (id + L".dat")).c_str(), GENERIC_READ, 0, nullptr,
                                      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
            require(handle != INVALID_HANDLE_VALUE, "lock image payload for no-read regression");
            reopened.add(firstImage, L"test", defaults);
            reopened.add(secondImage, L"test", defaults);
            reopened.add(recoded, L"test", defaults);
            CloseHandle(handle);
            require(reopened.entries().size() == 1 && reopened.entries().front().pinned &&
                    reopened.ocrText(id) == std::optional<std::wstring>(L"retained OCR"),
                    "exact, OLE and pixel-equivalent duplicates need no payload read and retain pin/OCR");
            auto index = nlohmann::json::parse(ks::unprotect(ks::readFile(folder / L"index.dat", 1024*1024)));
            for (auto &entry : index)
                for (auto key : {"fingerprintVersion", "contentHash", "imageHash", "pixelHash"}) entry.erase(key);
            auto legacy = index.dump();
            ks::atomicWrite(folder / L"index.dat", ks::protect(ks::Bytes(legacy.begin(), legacy.end())));
            ks::History migrated(folder);
            migrated.add(secondImage, L"test", defaults);
            ks::History persisted(folder);
            require(persisted.entries().size() == 1 && persisted.entries().front().contentHash.size() == 64,
                    "legacy duplicate migrates fingerprints without adding or losing an entry");
            persisted.add(changedImage, L"test", defaults);
            require(persisted.entries().size() == 2, "pixel fingerprint preserves genuinely changed images");
            persisted.add(firstImage, L"test", defaults);
            require(persisted.entries().size() == 3, "hash deduplication remains consecutive rather than global");
        }
        ks::Settings settings;
        settings.writeLog = false;
Author	SHA1	Message	Date
agrynco	524a836cc0	Release v0.6.40: align tagged source and Windows version metadata	2026-11-04 19:45:52 +02:00
agrynco	00c9cb0ee4	Release v0.6.39: isolate history UI and image clipboard memory	2026-11-04 19:40:54 +02:00
agrynco	fa2f6d2ce4	Release v0.6.38: avoid unnecessary RichEdit and cancel hidden history previews	2026-11-04 17:24:57 +02:00
agrynco	30e70192dc	Release v0.6.37: isolate image capture and OCR, fingerprint history duplicates	2026-11-04 16:58:34 +02:00
`@@ -1 +1 @@`
	`794d74113bddf13ffee7317cadee9c472bca3b84b3361796db58ff8023f66571 KSwitcher-win-x64.zip`	`cbe7839c849758b4623939dc025ec246a9fb97f5587df37ca6c3bd8eec244136 KSwitcher-win-x64.zip`