Embed PowerShell terminal and polish file panels

Refs #8

AGENTS.md

@@ -33,3 +33,9 @@ Wiki: https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki
 
 Updating only the release notes or changing only the Wiki version number does
 not satisfy this rule; the current functionality must also be reviewed.
+
+## KSwitcher Files UI
+
+Before changing the file manager UI, read [FILES-UI.md](FILES-UI.md).
+Reuse the shared dialog rendering and layout helpers. Update the document
+when an agreed UI requirement changes.

CMakeLists.txt

@@ -1,10 +1,26 @@
 cmake_minimum_required(VERSION 3.24)
-project(KSwitcher VERSION 0.6.64 LANGUAGES CXX RC)
+project(KSwitcher VERSION 0.6.77 LANGUAGES CXX RC)
 if(NOT WIN32)
   message(FATAL_ERROR "KSwitcher uses native Windows APIs")
 endif()
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+add_executable(KSwitcherFiles WIN32 src/files_main.cpp resources/files.rc)
+set_target_properties(KSwitcherFiles PROPERTIES OUTPUT_NAME "KSwitcher.Files")
+target_compile_definitions(KSwitcherFiles PRIVATE UNICODE _UNICODE NOMINMAX _WIN32_WINNT=0x0A00)
+find_program(KSWITCHER_POWERSHELL NAMES pwsh powershell REQUIRED)
+add_custom_target(KSwitcherTerminalAssets
+  COMMAND "${KSWITCHER_POWERSHELL}" -NoProfile -File "${CMAKE_CURRENT_SOURCE_DIR}/tools/stage-files-terminal.ps1"
+          -Destination "$<TARGET_FILE_DIR:KSwitcherFiles>"
+  VERBATIM)
+add_dependencies(KSwitcherFiles KSwitcherTerminalAssets)
+target_include_directories(KSwitcherFiles PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/build/terminal-deps/sdk/build/native/include")
+target_link_libraries(KSwitcherFiles PRIVATE user32 gdi32 comctl32 shell32 comdlg32 advapi32 ole32 uuid)
+if(MSVC)
+  target_compile_options(KSwitcherFiles PRIVATE /utf-8)
+else()
+  target_link_options(KSwitcherFiles PRIVATE -municode -static)
+endif()
 add_executable(StayHere WIN32 utilities/StayHere/main.cpp)
 add_executable(StayHereTest WIN32 utilities/StayHere/main.cpp)
 target_compile_definitions(StayHereTest PRIVATE STAYHERE_TEST_INSTANCE)
@@ -173,7 +189,7 @@ add_test(NAME screenshot-ui-regressions COMMAND KSwitcherScreenshotUITests)
 add_test(NAME screenshot-save-regressions COMMAND KSwitcherScreenshotUITests --save-only)
 add_test(NAME updater-regressions COMMAND powershell.exe -NoProfile -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_SOURCE_DIR}/tests/update.ps1" -Executable "$<TARGET_FILE:KSwitcher>")
 set_tests_properties(native-regressions PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
-install(TARGETS KSwitcher KSwitcherConfig KSwitcherScreenshot RUNTIME DESTINATION .)
+install(TARGETS KSwitcher KSwitcherConfig KSwitcherScreenshot KSwitcherFiles RUNTIME DESTINATION .)
 install(FILES LICENSE vendor/json-LICENSE.txt DESTINATION .)
 
 add_custom_command(TARGET KSwitcher POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/dictionaries" "$<TARGET_FILE_DIR:KSwitcher>/dictionaries")

FILES-UI.md

@@ -0,0 +1,56 @@
+# Оформлення KSwitcher Files
+
+Far Manager є зразком для оформлення файлового менеджера. Основне вікно використовує системний заголовок Windows. Панелі, меню й діалоги операцій використовують моноширинний шрифт менеджера та оформлення в стилі Far.
+
+## Панелі
+
+- Після F5 або F6 успішно оброблені елементи коротко підсвічуються в панелі, що показує папку призначення. Підсвітка тексту відрізняється від курсора й не переносить фокус.
+
+- У широкому режимі ширина під вирівняні розширення залежить від найдовшого розширення в поточній панелі. За вузької панелі залишай місце для імені та колонки Size.
+
+- Бірюзовий курсор поточного рядка видно лише в активній панелі. Кожна панель зберігає свою позицію курсора.
+
+- Поточний шлях відображається по центру верхньої подвійної лінії панелі. Лінію видно з обох боків напису. Бірюзове тло активної панелі охоплює лише напис шляху з невеликими відступами. Довгий шлях скорочується в межах панелі.
+
+## Спільні елементи діалогів
+
+- Enter активує кнопку у фокусі. Для кнопок із власним малюванням використовуй спільний обробник `dialogButtonEnter`. У підтвердженні скасування початковий фокус стоїть на No.
+
+- При перенесенні вікна між моніторами з різним DPI оновлюй шрифт, висоту рядків панелей і компонування відкритого прогресу копіювання. Перевір перенесення під час активного копіювання.
+- Для власних діалогів використовуй подвійну рамку з одним заголовком у верхній лінії. Звичайний діалог має сіре тло, попередження — темно-червоне тло та білий текст.
+- У ресурсі чи виклику задавай назву кнопки й клавішу доступу. Спільна функція `paintDialogButton` центрує текст, підсвічує фокус і додає фігурні дужки для дії за замовчуванням та квадратні для решти кнопок.
+- Нижні секції з кнопками у Copy, Warning і вікні прогресу мають однакову висоту, прив’язану до висоти рядка шрифту. Використовуй `layoutDialogButtons` для такої секції та `centerDialogRow` для інших рядків між роздільниками. Межі секції визначають положення рядка.
+- Поля вводу й випадаючі списки використовують бірюзове тло палітри менеджера. Текст і стрілку вирівнюй вертикально по центру. Прапорці в діалогах операцій використовують позначки `[ ]` та `[x]` і видимий клавіатурний фокус.
+- Повторно використовуй спільне оформлення. Текст, дії та стан операції передавай із коду конкретної операції. Наприклад, Warning повертає відповідь і стан прапорця, а копіювання вирішує, чи застосувати відповідь до наступних конфліктів.
+
+## Діалог Copy
+
+- Вирівнюй підпис Existing files по вертикальному центру списку. Ширше поле списку починається ближче до підпису, а його правий край збігається з правим краєм поля імені.
+- Зберігай однакові проміжки від верхнього роздільника до поля імені й до списку. Підпис, поля та прапорець мають читатися повністю.
+- Відступ після прапорця до нижнього роздільника дорівнює відступу від верхнього роздільника до списку.
+- Кнопки Copy та Cancel стоять по центру компактної нижньої секції. Висота кнопок має вміщати весь текст поточного шрифту.
+
+## Вікно прогресу копіювання
+
+- F6 використовує спільне оформлення діалогів Copy і прогресу. Заголовок підтвердження — Rename/Move, кнопка за замовчуванням — Rename, заголовок прогресу — Move.
+- Поле призначення F6 початково містить шлях іншої панелі. Для одного елемента просте ім’я задає перейменування в поточній папці. Для кількох елементів діалог показує їх кількість і приймає один шлях до папки.
+
+- Секції поточного файла й загального прогресу мають однаковий вертикальний відступ від вмісту до верхньої та нижньої ліній. Cancel стоїть по центру спільної нижньої секції.
+- Обидві шкали займають усю ширину вмісту. Відсотки показуються по центру шкали, а її висота враховує поточний шрифт.
+
+## Попередження про конфлікт
+
+- Після розрахунку остаточної висоти центр Warning збігається з центром вікна прогресу.
+- Remember choice стоїть по вертикальному центру власної секції. Кнопки Overwrite, Skip і Cancel стоять по центру нижньої секції.
+- Tab проходить Remember choice, Overwrite, Skip і Cancel. Стрілки вліво та вправо циклічно перемикають три кнопки в порядку їх розташування.
+- Стрілки вгору й вниз переходять між сусідніми секціями з інтерактивними елементами. У Warning стрілка вгору з ряду кнопок переводить фокус на Remember choice, а вниз із прапорця — на Overwrite.
+
+## Видалення
+
+- F8 показує сіре підтвердження з дією Move. Shift+Delete і підтвердження непорожньої папки мають темно-червоне тло. Вікно прогресу видалення має сіре тло, як у Copy.
+- F8 переміщує підтверджені елементи в кошик Windows. Shift+Delete видаляє підтверджене дерево від вкладених елементів до батьківської папки. Прогрес і підсумок окремо показують успішні, пропущені й невдалі дії.
+- Cancel і Esc у вікні прогресу відкривають спільне червоне підтвердження скасування. Yes зупиняє операцію, а No або Esc у підтвердженні повертає до прогресу. Початковий фокус стоїть на No.
+
+## Перевірка змін
+
+Відкрий Copy і Warning в одній збірці та порівняй висоту нижніх секцій, центрування, повноту підписів і видимість фокуса. Перевір Tab, стрілки й Esc. Після узгодження нового правила онови відповідний розділ цього документа.

LAN-PREVIEW.md

@@ -5,13 +5,39 @@ code on both computers, and shares mouse and keyboard through a screen edge.
 The module runs inside the resident process. Multiple paired computers can be
 arranged on a monitor grid. Mouse and keyboard follow neighboring cells, including
 A → B → C, without relaying input through B. New text and images are also shared
-with all online paired computers: history and the active clipboard. File transfer
-is not implemented by clipboard synchronization.
+with all online paired computers: history and the active clipboard.
+
+## Files and diagnostic logs
+
+In **Settings → Computers → Manage computers…**, select an online paired
+computer and choose **Send file…**. Both computers need a build with file transfer.
+Files up to 16 MiB travel over encrypted LAN. On the destination, open
+**Incoming files…** to save or discard each file. The save dialog suggests the
+original filename. KSwitcher shows a Windows notification when a file is ready
+to save, and its tray tooltip shows the pending count. Pending files are held
+in memory until saved, discarded, or KSwitcher closes.
+
+To retrieve the current or rotated diagnostic log, enable **Allow paired
+computers to download diagnostic logs** on the computer that owns the logs.
+This setting defaults to off. On the requesting PC, select that computer and
+choose **Download log…** or **Previous log…**. Diagnostic logs may contain
+text copied from applications.
+
+### MCP
+
+In **Settings → MCP**, choose **Copy configuration** and paste the block into
+Codex's `~/.codex/config.toml`. It starts the MCP server over stdio with the
+absolute path to `KSwitcher.Config.exe` and the `--mcp` argument.
+`list_log_computers` returns paired computer IDs and availability.
+`read_diagnostic_log` reads the latest 100 lines by default (1–500 with
+`lines`). Use `offset` to skip newer lines and page backward. Set `previous` to read the rotated log. Omit `peer` for the
+local log or pass a paired computer ID for a remote log. Remote reads need
+the local resident process running and log downloads enabled on the remote PC.
 
 ## Set up multiple computers
 
 1. Install the v0.6.58 or newer on every participating PC. Input protocol v2 requires all participants to update; earlier one-pair builds cannot connect. Preserve local data; do not copy pairing identities between PCs.
-2. Open Settings → Tools → KSwitcher computers and enable discovery on both PCs.
+2. Open **Settings → Computers → Manage computers…** and enable discovery on both PCs.
    Only running LAN-enabled KSwitcher instances appear, not generic network devices.
 3. Match the computer name and instance-ID prefix displayed on the other PC.
    Select each other, generate one code, enter that same code on both, then click

README.md

@@ -6,6 +6,15 @@ The original [Typlo](https://github.com/bitcodepro/Typlo) project and its data r
 
 **[User guide / Wiki](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki)** — setup, features, shortcuts, dictionaries, screenshots and troubleshooting in **English** and **[Українська](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Home-uk)**. Each wiki page links to its translation.
 
+From v0.6.72, use **Settings → Snippets** to edit snippets in place and
+**Save snippets** to save them independently. **Clipboard** contains OCR
+options. **Sync**, **Computers**, and **Diagnostics** have their own tabs.
+
+**Українською.** З v0.6.72 сніпети редагуються у **Settings → Snippets**
+і зберігаються окремою кнопкою **Save snippets**. OCR розміщено у
+**Clipboard**, а для синхронізації, ПК та журналу є окремі вкладки
+**Sync**, **Computers** і **Diagnostics**.
+
 [![Support KSwitcher development — buy the developer a coffee](resources/support/donate-en.png)](https://send.monobank.ua/jar/88h2TddKfS)
 
 [Donate via Monobank](https://send.monobank.ua/jar/88h2TddKfS) · Thank you for supporting KSwitcher.
@@ -43,6 +52,15 @@ In **Settings → Mouse**, put the pointer over **Test mouse buttons here** and
 press the buttons you want to test. The page shows the last detected button and
 counts presses separately for ordinary window events and Windows Raw Input.
 
+Use **+** beside **Mouse events** to capture and name a wheel direction.
+If Windows reports an existing button or an already added direction, the
+dialog selects that event in the list. Extra device controls need to emit a
+supported Windows mouse signal before KSwitcher can bind them.
+
+When you move the pointer to another PC using KSwitcher Computers or Mouse Without
+Borders, the receiving PC uses its own mouse profiles. Configure the actions in
+**Settings → Mouse** on that PC.
+
 Choose **Global** to set up fallback actions. Use **+** beside **Profiles** to create
 a named profile and set its applications. Double-click a profile or choose
 **Edit…** in its context menu to change its name or applications. The
@@ -99,7 +117,7 @@ Double-click the tray icon to open Settings, the bold default menu item.
 Closing Settings with unsaved changes (including accepted auto-correction or OCR options)
 asks whether to save, discard changes, or keep editing. Unchanged settings close without a prompt.
 If saving fails, the window stays open with your edits intact.
-Settings displays **No unsaved changes** with **Save** disabled until an edit is made.
+Settings displays **No unsaved settings** when the draft matches the saved settings. If **Start with Windows** is enabled, **Save** remains available to recheck the autostart path.
 The Computers window applies and saves network changes immediately, separately from Settings.
 Pairing shows the target computer and remaining wait time; enter the same code and click **Pair** on both PCs.
 The code stays visible for copying or retry until the pair is saved. A saved pair still requires input sharing to be enabled on both PCs.
@@ -144,8 +162,14 @@ In Settings, enable **Start with Windows** and **Start with Windows as administr
 to use a per-user Task Scheduler logon task with highest privileges. Enabling or changing
 the elevated task requests UAC approval if the app is not already elevated. No password is stored;
 the task runs in the signed-in user's interactive session, including on battery power.
-Disabling the administrator option restores ordinary per-user startup; disabling startup stops
-future automatic launches. Saving unrelated settings does not recreate startup entries.
+With both options enabled, opening the regular `KSwitcher.exe` after exiting a development
+build requests administrator approval if needed. Development builds keep their current launch privileges.
+Disabling the administrator option restores ordinary per-user startup. Disabling startup stops
+future automatic launches. On launch and after clicking **Save** in Settings, KSwitcher checks whether the
+enabled autostart entry still points to its current location. If the previous file is missing and
+KSwitcher has the required privileges, it updates the path automatically. If the previous path may
+still be in use or the repair requires administrator approval, KSwitcher shows both paths and asks
+before updating the entry.
 `KSwitcher.exe --settings` opens Settings, including when the app is already running.
 Exit [Typlo](https://github.com/bitcodepro/Typlo) when using overlapping shortcuts to avoid competing keyboard hooks.
 
@@ -432,6 +456,32 @@ Recognition uses Chrome accessibility: the address bar and active document must
 
 **Українською.** З v0.6.51 підтримано Telegram Web K у Chrome. Відкрий чат, потім **Settings → Languages → Languages for a chat...**, вибери **Telegram Web: ім’я**, мови та **Use languages → Save**. Набір діє для Alt+Shift, Win+Space, Win+Shift+Space і Next layout. Вебпрофілі окремі від Telegram Desktop; однакові назви в різних акаунтах/профілях браузера мають спільний вебпрофіль. Адреса й назва беруться через accessibility, без OCR, таймера, розширення та читання історії повідомлень. В адресному рядку, на головній сторінці й для непідтримуваних адрес профіль не діє. Web A та інші браузери не перевірені й не заявлені як підтримувані.
 
+### Snippet autocomplete — v0.6.69
+
+Starting with v0.6.71, **Enter** accepts a suggestion after you navigate
+the list with **↑ / ↓**. Without arrow navigation, **Enter** goes to the
+editor. З v0.6.71 **Enter** після вибору стрілками вставляє сніпет. Без
+переміщення списком **Enter** надходить до редактора.
+
+Starting with v0.6.70, suggestions open at the text caret. If the editor
+provides no caret position, you can still type the complete trigger to
+expand the snippet.
+
+Type `;` at the start of a trigger to open suggestions near the caret, or
+type the first three characters of another trigger. The list filters as you
+type and fits the widest matching trigger. Use **↑ / ↓** and **Tab** or click
+an entry. **Esc** dismisses the list. Full triggers still expand
+automatically. See the [snippet guide](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Snippets).
+
+**Українською.** Введіть `;` на початку тригера або три перші символи іншого
+тригера, щоб відкрити підказки біля курсора. Список фільтрується під час набору
+й підлаштовує ширину під найдовший збіг. Для вибору натисніть **↑ / ↓** і
+**Tab** або клацніть рядок. **Esc** закриває список. Повні тригери й далі
+спрацьовують автоматично. Дивіться [посібник зі сніпетів](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Snippets-uk).
+
+З v0.6.70 підказки відкриваються біля текстового курсора. Якщо редактор не
+надає його позицію, введіть повний тригер для розгортання сніпета.
+
 ### Desktop chat snippet selection — v0.6.55
 
 ChatGPT and Codex desktop editors use paced selection for snippet triggers. If only a verified suffix is selected, KSwitcher extends the selection and verifies the full trigger before replacement. Unrelated text or changed focus cancels the operation. Triggers remain recognized across keyboard layouts. One snippet can target multiple applications: add each with **Add app**, or enter comma-separated process names. These existing application scopes also synchronize.
@@ -440,13 +490,13 @@ ChatGPT and Codex desktop editors use paced selection for snippet triggers. If o
 
 ### Application-specific snippets — v0.6.51
 
-In **Tools → Snippets**, select a snippet and enable **Only in these applications**. Enter executable names separated by commas, or select a currently open application's process and choose **Add app**. For example: `ms-teams.exe, outlook.exe`. Uncheck the option for a global snippet. A checked but empty restriction cannot be saved. Save applies the changes; Cancel discards them.
+In **Settings → Snippets**, select a snippet and enable **Only in these applications**. Enter executable names separated by commas, or select a currently open application's process and choose **Add app**. For example: `ms-teams.exe, outlook.exe`. Uncheck the option for a global snippet. A checked but empty restriction cannot be saved. Use **Save snippets** to apply the changes.
 
 A matching application-specific snippet takes precedence over a global snippet with the same trigger. The same trigger can be used for different applications; overlapping scopes for the same trigger are rejected. Existing snippets without a scope remain global. Matching is case-insensitive by process name, with or without `.exe`, and is checked before insertion. No OCR or timer is involved. Chrome scope means the entire browser, not one website.
 
 Scopes are saved with snippets and included in manual import/export and synchronization; merge conflicts consider the application scopes. Use v0.6.51 or newer on every synchronizing PC before sharing scoped snippets: older versions do not understand the restriction and may treat the snippet as global.
 
-**Українською.** У **Tools → Snippets** вибери сніпет, увімкни **Only in these applications** та задай назви процесів через кому або вибери відкриту програму зі списку й натисни **Add app**. Наприклад: `ms-teams.exe, outlook.exe`. Вимкнений прапорець означає всі програми. Увімкнений прапорець із порожнім списком не можна зберегти. **Save** зберігає, **Cancel** відкидає зміни.
+**Українською.** У **Settings → Snippets** вибери сніпет, увімкни **Only in these applications** та задай назви процесів через кому або вибери відкриту програму зі списку й натисни **Add app**. Наприклад: `ms-teams.exe, outlook.exe`. Вимкнений прапорець означає всі програми. Увімкнений прапорець із порожнім списком не можна зберегти. Натисни **Save snippets**, щоб застосувати зміни.
 
 Сніпет конкретної програми має пріоритет над глобальним із тим самим тригером. Для різних програм однакові тригери дозволені, для перетинних областей — ні. Старі сніпети залишаються глобальними. Зіставлення за назвою процесу не залежить від регістру та суфікса `.exe`; OCR і таймерів немає. Для Chrome це весь браузер, а не окремий сайт. Обмеження входять до експорту/імпорту та синхронізації. Перед синхронізацією онови всі ПК до v0.6.51 або новішої: старі версії не розуміють обмеження та можуть застосувати сніпет глобально.
 ### Existing features
@@ -559,9 +609,9 @@ Windows exposes them; selection offsets are available for native EDIT controls a
 marked unavailable for other editors. Input interruptions identify keyboard, mouse, settings
 or layout-refresh events during an operation. Failed selection verification includes the expected
 selection and actual copied text in the operation details, without implying that a paste occurred.
-Only problem operations write a structured summary to `kswitcher.log`, with their preceding
+Problem operations write a structured summary to `kswitcher.log`, with their preceding
 context. Successful operations stay in that bounded memory buffer and are included only when
-a subsequent problem flushes it; they do not create separate rows. Flushed context is discarded. Ordinary application
+a subsequent problem flushes it. Verified pastes that take at least two seconds also write a summary without the copied text. Flushed context is discarded. Ordinary application
 errors are also logged when logging is enabled. This works in normal Release builds.
 Incident context contains tracked physical input, the expected word, copied text, conversion result,
 and layout IDs, correlated by request ID even when verification fails. Text fields use quoted,
@@ -680,10 +730,13 @@ required for ordinary conflicts. Every server write uses the version just read a
 condition, including explicit Upload. A racing write is rejected rather than silently overwritten.
 Deleted server versions are not silently recreated.
 
-Hotkeys, snippets, application exclusions, layout order, conversion, screenshot and autocorrection
-preferences are shared. Startup/elevation, keep-awake, logging, history enablement/limits,
-Tesseract executable/engine selection, connection details and credentials stay local. Clipboard
-history, screenshots and dictionary files are never uploaded. Full synchronization identifies
+The server profile includes all settings from KSwitcher Settings, including mouse events and
+bindings, application language profiles, startup, keep-awake, logging, history limits and OCR.
+Update the clients that use the same server profile before syncing the expanded format.
+Older server backups preserve the local values for fields they never stored. Restored executable
+paths refer to the same locations and may need updating on a fresh installation.
+Connection details and credentials stay local so you can sign in again after reinstalling.
+Clipboard history, screenshots and dictionary files are never uploaded. Full synchronization identifies
 missing keyboard layouts by language (when Windows can identify it) and exact ID.
 Install the same layout variant, or select **Keep this PC's layouts and layout shortcuts (sync
 other settings)** and click **Save / Sign in / Sync**. This device-local option keeps the entire
@@ -780,13 +833,13 @@ default and require the main **Automatic correction (experimental)** checkbox to
 
 - **Use custom replacements**: enter one `typo=correction` pair per line, for example
   `првиіт=привіт` or `helo=hello`. Entries are normalized to lowercase; duplicate source words
-  are rejected. The typo must contain 1–32 letters. The correction may contain several words
+  are rejected. The typo must be one word of 1–32 characters with at least one letter. It can contain digits and internal apostrophes. The correction may contain several words
   separated by single spaces, for example `мамамила=мама мила`, up to 32 characters including
   spaces. Corrections also allow apostrophes (`'`, `’`, `ʼ`) between letters, for example
   `ревю=рев'ю`. Both sides must use the same supported language, without other punctuation; leading,
   trailing and repeated spaces are not allowed. Explicit pairs take priority over dictionary recognition, including
   already valid words, and do not require dictionary membership or satisfy the frequency limit.
-  Update every synchronizing PC to v0.6.60 or newer before sharing apostrophe pairs; older clients reject them.
+  Update every synchronizing PC to v0.6.75 before sharing pairs with digits or apostrophes in the typo.
 - **Correct spelling typos using dictionaries**: checks unknown words in the current language
   after no layout correction is found. It accepts exactly one dictionary candidate reachable
   by inserting, deleting or replacing one letter, or swapping two adjacent letters. Both input
@@ -988,8 +1041,8 @@ subset is returned to the first available allowed language by a periodic check
 with an excluded language active or selecting one via Windows or a direct shortcut.
 Languages remain installed and visible in Windows' language picker. Unavailable
 layouts are skipped; if the entire selection is unavailable, the default cycle is
-used. Profiles stay local to this PC, survive cloud sync and are included in manual
-settings export/import.
+used. Application language profiles are included in server synchronization and
+manual settings export/import.
 
 **Українською.** Відкрий **Settings → Languages → Languages for applications…**.
 Обери програму зліва та познач дозволені мови справа. Вибір для кожної програми
@@ -1012,5 +1065,5 @@ settings export/import.
 Це діє і при вході в програму, і після ручного перемикання через Windows чи пряму
 комбінацію. Мови залишаються встановленими й видимими в меню Windows.
 Недоступні розкладки пропускаються; якщо недоступні всі вибрані мови, діє
-загальний цикл. Профілі локальні, зберігаються під час хмарної синхронізації
+загальний цикл. Профілі входять до серверної синхронізації
 та входять до ручного експорту/імпорту налаштувань.

Release/README.md

@@ -1,5 +1,188 @@
 # Latest Windows release
 
+## v0.6.77 — 2026-11-13
+
+The screenshot editor remembers the local pencil smoothing default across
+restarts. Adjust the slider with no pencil stroke selected, or use **Apply to
+all**, to save the value for new strokes. Adjusting a selected stroke changes
+only that stroke.
+
+**Українською.** Редактор скріншотів зберігає типове згладжування олівця на
+цьому ПК та відновлює його після перезапуску. Змініть повзунок без виділеного
+штриха олівця або натисніть **Apply to all**, щоб запам’ятати значення для
+нових штрихів. Зміна виділеного штриха впливає лише на нього.
+
+## v0.6.76 — 2026-11-13
+
+Incoming LAN files suggest their original filename when saved. KSwitcher shows
+a Windows tray notification when a file is ready to save, and the tray tooltip
+shows the pending count.
+
+**Українською.** Під час збереження вхідного LAN-файлу пропонується його
+оригінальна назва. KSwitcher показує сповіщення в треї, коли файл готовий
+до збереження. Підказка іконки показує кількість файлів у черзі.
+
+## v0.6.75 — 2026-11-13
+
+Conversion cancels earlier when input changes and skips restoring an untouched
+clipboard. Diagnostic records identify the active conversion behind `busy`,
+separate clipboard and paste verification timings, and retain a text-free
+summary of verified pastes that take at least two seconds. MCP log reads
+support `offset` to page backward.
+
+**Українською.** Конвертація раніше скасовується після зміни вводу й пропускає
+відновлення буфера, якщо його не змінювала. Діагностика показує активну спробу
+для `busy`, окремий час роботи з буфером і перевірки вставки, а також зберігає
+підсумок перевірених вставок від двох секунд без скопійованого тексту. У MCP
+параметр `offset` дає змогу читати старіші рядки.
+
+Explicit replacements now accept digits and internal apostrophes in the source word, for example нав1язав=навʼязав. Invalid entries identify the offending pair.
+
+**Українською.** Явні заміни підтримують цифри й внутрішні апострофи у вихідному слові, наприклад нав1язав=навʼязав. Повідомлення про помилку показує проблемну пару.
+
+## v0.6.74 — 2026-11-13
+
+- Send files up to 16 MiB to a selected paired PC over encrypted LAN. Save or discard them from **Incoming files**.
+- Download current and previous diagnostic logs from paired PCs that explicitly allow remote log downloads.
+- Copy the Codex configuration from **Settings → MCP**. The MCP server lists paired PCs and reads local or remote diagnostic logs.
+- Search contacts in the **Languages for a chat** table. **Copy selected** in Diagnostics now uses normal clipboard synchronization.
+
+**Українською.** Передавайте файли до 16 МіБ вибраному спареному ПК зашифрованою локальною мережею. У **Incoming files** можна зберегти або відхилити файл. Поточний і попередній журнали доступні для завантаження після ввімкнення відповідного дозволу на віддаленому ПК. У **Settings → MCP** можна скопіювати конфігурацію Codex для читання локальних і віддалених журналів. У таблиці **Languages for a chat** додано пошук контактів, а **Copy selected** у діагностиці тепер проходить через звичайну синхронізацію буфера.
+
+## v0.6.73 — 2026-11-13
+
+After moving KSwitcher, launch it from its current folder. If Windows autostart
+still points to the old location, KSwitcher updates the path automatically when
+the previous executable is missing and the process has sufficient rights. If
+the previous copy may still be in use or the repair needs administrator approval,
+choose **Update autostart path** and confirm UAC if prompted. To check again,
+click **Save** in Settings without changing the autostart options.
+
+**Українською.** Після перенесення KSwitcher запустіть його з нової папки.
+Якщо автозапуск і далі вказує на старий шлях, KSwitcher виправить його
+автоматично, коли старий файл відсутній і прав достатньо. Якщо стара копія
+ще може використовуватися або потрібні права адміністратора, натисніть
+**Update autostart path** і підтвердьте UAC, якщо з’явиться запит. Для повторної
+перевірки натисніть **Save** у налаштуваннях без зміни параметрів автозапуску.
+
+## v0.6.72 — 2026-11-12
+
+Edit snippets directly in **Settings → Snippets**. **Save snippets** applies
+snippet edits independently of the settings draft. Find OCR options in
+**Clipboard** and open backup and synchronization, paired computers, and
+logging from **Sync**, **Computers**, and **Diagnostics**, respectively.
+
+**Українською.** Редагуйте сніпети безпосередньо у **Settings → Snippets**.
+Кнопка **Save snippets** зберігає їх окремо від чернетки налаштувань.
+Параметри OCR тепер у **Clipboard**. Для синхронізації, спарених ПК та
+журналу є вкладки **Sync**, **Computers** і **Diagnostics**.
+
+## v0.6.71 — 2026-11-12
+
+After navigating snippet suggestions with **↑ / ↓**, press **Enter** to
+insert the selected snippet and close the list. The editor does not receive
+that keypress. If you have not navigated the list, **Enter** still goes to
+the editor. **Tab** and mouse selection also work.
+
+KSwitcher skips suggestions when VS Code's EditContext supplies the bounds
+of the whole line in place of the text caret. See the [FAQ](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/FAQ)
+for the VS Code workaround.
+
+**Українською.** Після вибору підказки клавішами **↑ / ↓** натисніть
+**Enter**, щоб вставити сніпет і закрити список. Редактор не отримує це
+натискання. Якщо ви не переміщалися списком, **Enter** і далі надходить
+до редактора. Також можна вибрати сніпет через **Tab** або мишею.
+
+KSwitcher приховує підказки, коли EditContext у VS Code повертає координати
+всього рядка замість текстового курсора. Обхідний шлях описано у [FAQ українською](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/FAQ-uk).
+
+## v0.6.70 — 2026-11-12
+
+Snippet suggestions are anchored to the text caret. KSwitcher uses the
+editor's caret location or text accessibility information, including for
+thin carets and wrapped text. If the editor provides no caret position,
+the list stays hidden. Full triggers continue to expand automatically.
+
+**Українською.** Підказки сніпетів прив’язані до текстового курсора.
+KSwitcher використовує координати курсора або дані доступності редактора,
+зокрема для тонкого курсора й перенесених рядків. Якщо редактор не надає
+позицію текстового курсора, список не відкривається. Повні тригери й далі
+спрацьовують автоматично.
+
+## v0.6.69 — 2026-11-12
+
+Snippet autocomplete opens beside the text caret as soon as you type `;` at
+the start of a trigger. Other triggers offer suggestions after three
+characters. The list stays open while you type, resizes to fit the matching
+triggers, and respects application restrictions. Use **↑ / ↓** and **Tab** or
+click a suggestion to insert it. Press **Esc** to dismiss the list. Full
+triggers still expand automatically.
+
+**Українською.** Автодоповнення сніпетів відкривається біля текстового курсора,
+щойно ви вводите `;` на початку тригера. Для інших тригерів підказки
+з’являються після трьох символів. Список залишається відкритим під час набору,
+підлаштовує ширину під відповідні тригери й враховує обмеження за програмами.
+Виберіть сніпет клавішами **↑ / ↓** і **Tab** або мишею. **Esc** закриває
+список. Повні тригери й далі спрацьовують автоматично.
+
+## v0.6.68 — 2026-11-12
+
+With **Start with Windows** and **Start with Windows as administrator** enabled,
+opening the regular KSwitcher after exiting a development build requests
+administrator approval when needed. UAC prompts on the secure desktop still
+require local input.
+
+**Українською.** Якщо ввімкнено **Start with Windows** і **Start with Windows as administrator**,
+звичайний KSwitcher після закриття dev-збірки за потреби запитує запуск від
+адміністратора. Запити UAC на захищеному робочому столі підтверджуйте
+безпосередньо на цьому ПК.
+
+## v0.6.67 — 2026-11-12
+
+Mouse buttons and wheel actions now use the profiles on the PC receiving
+input through KSwitcher Computers or Mouse Without Borders. Update the
+receiving PC and configure its actions in **Settings → Mouse**.
+
+**Українською.** Кнопки й коліщатко тепер працюють за профілями ПК,
+який отримує ввід через KSwitcher Computers або Mouse Without Borders.
+Оновіть цей ПК і налаштуйте дії в **Settings → Mouse**.
+
+## v0.6.66 — 2026-11-12
+
+If Windows rejects registration of the notification-area icon at sign-in or
+after Explorer restarts, KSwitcher retries about once a second until the
+icon is registered. Settings become accessible from the icon without
+restarting KSwitcher.
+
+**Українською.** Якщо Windows не приймає значок KSwitcher в області
+сповіщень під час входу або після перезапуску Провідника, KSwitcher
+повторює спробу приблизно щосекунди. Коли значок з’явиться, з нього
+можна відкрити налаштування без перезапуску KSwitcher.
+
+## v0.6.65 — 2026-11-12
+
+Use **Settings → Mouse → +** beside **Mouse events** to capture and name a
+vertical or horizontal wheel direction. Capturing a known button or an
+already registered direction selects its existing row. A new signal is
+accepted only when Windows delivers it through both the test and runtime
+input paths. A configured wheel action replaces scrolling for that direction
+where the profile applies.
+
+OpenBao now backs up all KSwitcher Settings, including mouse events, bindings,
+application profiles, startup, clipboard history limits, and OCR preferences.
+Update all clients that share a server profile before syncing. Downloading an
+older backup preserves local settings for fields it never included. After
+reinstalling Windows, reconnect to OpenBao and choose **Download remote**.
+Executable paths and optional OCR software must still be available on the
+restored PC. Clipboard contents and Windows credentials stay on the device.
+
+**Українською.** У **Settings → Mouse** натисни **+** біля **Mouse events**,
+щоб додати напрямок прокручування. Відомий сигнал виділить наявний рядок.
+OpenBao тепер зберігає всі налаштування KSwitcher, зокрема профілі миші,
+OCR й автозапуск. Перед синхронізацією онови всі клієнти спільного профілю.
+Після перевстановлення Windows підключись до OpenBao й натисни
+**Download remote**.
+
 ## v0.6.64 — 2026-11-12
 
 The new **Settings → Mouse** tab lets you assign actions to mouse buttons and supported double-clicks. Use **Global** for fallback actions and create profiles for one or more applications. Edit a profile with a double-click, and enable or disable it with the **Active** checkbox. Choose applications by pointing at a window or opening an executable or shortcut.

Release/SHA256SUMS.txt

@@ -1 +1 @@
-8fdd701d2ed9223056f7e624e888ef459c919f605c624d5f35c3dbd3652a430b  KSwitcher-win-x64.zip
+51d95639527590b36453a5ef485532a7d2135950222fa197eb431a5309f1a45c  KSwitcher-win-x64.zip

Release/release-files.json

@@ -1,20 +1,20 @@
 {
-  "version": "0.6.64",
+  "version": "0.6.77",
   "files": [
     {
       "path": "KSwitcher.exe",
-      "size": 2185728,
-      "sha256": "81ccb50fd3ac8a4768f0be9a4b70ef21c2a1f11e73b57871cb5123f29bfbd503"
+      "size": 2249216,
+      "sha256": "f1c79d337d746efcda03946cc833b7b5588ef4e739f1dff7d3afa15d0465469f"
     },
     {
       "path": "KSwitcher.Config.exe",
-      "size": 2120192,
-      "sha256": "83d76af6ff44f56532d2537e57dfb7e3859d72f34180d3c7c02497e71763378e"
+      "size": 2251776,
+      "sha256": "016edc389007e0d15ee365fff7115fc91a820b46080cb39a3fb362f3b463bae7"
     },
     {
       "path": "KSwitcher.Screenshot.exe",
-      "size": 3207168,
-      "sha256": "6e93963d4252a87bd6ea9d53ccd2e602c9c2709ca3fe835dc90a633b77b00193"
+      "size": 3247616,
+      "sha256": "c8ef070ad01acc410802c62e0df6a96cb299fe036fe8e99f0cf6a398b7324ec6"
     },
     {
       "path": "LICENSE",
@@ -28,13 +28,13 @@
     },
     {
       "path": "README.md",
-      "size": 89826,
-      "sha256": "9148049aa80595e0de30ecc9af1478572f85a8076da981ea80dafd5bb9c4815b"
+      "size": 93885,
+      "sha256": "df6d40d0eb66ad7da8db1cffe6bd211de70dfee474cc228e041c821b3940718b"
     },
     {
       "path": "LAN-PREVIEW.md",
-      "size": 9900,
-      "sha256": "6dcb0efabec6898965bbbd31ba68e06276fd0f098ac9a8649bc1f7d7de21d63e"
+      "size": 11418,
+      "sha256": "2c13d3ed4761e679c352fb1ade24a1ec3060ad2862376ede801cdee5fcc3bada"
     },
     {
       "path": "dictionaries/en.txt",

build.ps1

@@ -46,6 +46,14 @@ try {
     & $compiler -mwindows -municode -static -s '-Wl,--gc-sections' build/lan_channel.o build/lan_input.o build/lan.o build/lan_pairing.o 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
+    $filesPath = Join-Path (Split-Path $executablePath) 'KSwitcher.Files.exe'
+    $terminalIncludes = & "$root/tools/stage-files-terminal.ps1" -Destination (Split-Path $filesPath)
+    & "$root/tools/stage-files-terminal.ps1" -Destination build/release | Out-Null
+    & windres resources/files.rc -O coff -o build/files-res.o
+    if ($LASTEXITCODE) { throw 'File manager resource compilation failed' }
+    & $compiler @common "-I$terminalIncludes" -mwindows -municode -static -s src/files_main.cpp build/files-res.o -luser32 -lgdi32 -lcomctl32 -lshell32 -lcomdlg32 -ladvapi32 -lole32 -luuid -o $filesPath
+    if ($LASTEXITCODE) { throw 'File manager build failed' }
+    Copy-Item -LiteralPath $filesPath -Destination build/release/KSwitcher.Files.exe -Force
     if ($Test) {
         & $compiler @common -Werror tests/settings_merge.cpp build/sync.o build/storage.o build/core.o build/platform.o build/ocr.o @libs -static -s -o build/KSwitcherSettingsMergeTests.exe
         if ($LASTEXITCODE) { throw 'Settings merge test build failed' }

package.ps1

@@ -6,6 +6,9 @@ New-Item -ItemType Directory -Force $destination | Out-Null
 Copy-Item -LiteralPath (Join-Path $root 'build\release\KSwitcher.exe') -Destination $destination
 Copy-Item -LiteralPath (Join-Path $root 'build\release\KSwitcher.Config.exe') -Destination $destination
 Copy-Item -LiteralPath (Join-Path $root 'build\release\KSwitcher.Screenshot.exe') -Destination $destination
+Copy-Item -LiteralPath (Join-Path $root 'build\release\KSwitcher.Files.exe') -Destination $destination
+Copy-Item -LiteralPath (Join-Path $root 'build\release\WebView2Loader.dll') -Destination $destination
+Copy-Item -LiteralPath (Join-Path $root 'build\release\terminal') -Destination $destination -Recurse -Force
 Copy-Item -LiteralPath (Join-Path $root 'LICENSE') -Destination $destination
 Copy-Item -LiteralPath (Join-Path $root 'vendor\json-LICENSE.txt') -Destination $destination
 Copy-Item -LiteralPath (Join-Path $root 'README.md') -Destination $destination
@@ -16,7 +19,7 @@ Copy-Item -LiteralPath (Join-Path $root 'resources\portable-tools-README.txt') -
 Copy-Item -LiteralPath (Join-Path $root 'build\release\tools\StayHere.exe') -Destination (Join-Path $destination 'tools\StayHere.exe') -Force
 Copy-Item -LiteralPath (Join-Path $root 'utilities\StayHere\README.md') -Destination (Join-Path $destination 'tools\StayHere-README.md') -Force
 # Enumerate the distributable files explicitly; do not include a user's data directory.
-$files = @('KSwitcher.exe','KSwitcher.Config.exe','KSwitcher.Screenshot.exe','LICENSE','json-LICENSE.txt','README.md','LAN-PREVIEW.md','dictionaries','tools\README.txt','tools\StayHere.exe','tools\StayHere-README.md') | ForEach-Object { Join-Path $destination $_ }
+$files = @('KSwitcher.exe','KSwitcher.Config.exe','KSwitcher.Screenshot.exe','KSwitcher.Files.exe','WebView2Loader.dll','terminal','LICENSE','json-LICENSE.txt','README.md','LAN-PREVIEW.md','dictionaries','tools\README.txt','tools\StayHere.exe','tools\StayHere-README.md') | ForEach-Object { Join-Path $destination $_ }
 $entries = foreach ($path in $files) {
     foreach ($file in @(Get-ChildItem -LiteralPath $path -File -Recurse)) {
         @{path=$file.FullName.Substring($destination.Length+1).Replace('\','/'); size=$file.Length; sha256=(Get-FileHash -LiteralPath $file.FullName -Algorithm SHA256).Hash.ToLowerInvariant()}

resources/app.rc

@@ -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,64,0
- PRODUCTVERSION 0,6,64,0
+ FILEVERSION 0,6,77,0
+ PRODUCTVERSION 0,6,77,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.64"
+   VALUE "FileVersion", "0.6.77"
   END
  END
  BLOCK "VarFileInfo"

resources/files.rc

@@ -0,0 +1,107 @@
+#include <windows.h>
+
+1 ICON "kswitcher-files.ico"
+1 RT_MANIFEST "app.manifest"
+
+101 DIALOGEX 0, 0, 256, 141
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Wide panel mode"
+FONT 9, "Segoe UI"
+BEGIN
+    GROUPBOX "Panel columns — Name, Size", -1, 8, 6, 240, 59
+    LTEXT "Size column &width (6-16 characters)", -1, 17, 22, 166, 10
+    EDITTEXT 201, 196, 18, 41, 14, ES_NUMBER | ES_AUTOHSCROLL
+    AUTOCHECKBOX "&Align file extensions", 202, 17, 42, 104, 12
+    AUTOCHECKBOX "Align &folder extensions", 204, 130, 42, 108, 12
+    GROUPBOX "Status line columns", -1, 8, 72, 240, 39
+    AUTOCHECKBOX "Show &details", 203, 17, 83, 94, 11
+    AUTOCHECKBOX "Name", 205, 17, 96, 47, 11
+    AUTOCHECKBOX "Size", 206, 72, 96, 42, 11
+    AUTOCHECKBOX "Date", 207, 128, 96, 45, 11
+    AUTOCHECKBOX "Time", 208, 185, 96, 45, 11
+    DEFPUSHBUTTON "OK", IDOK, 139, 119, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 196, 119, 50, 14
+END
+
+102 DIALOGEX 0, 0, 350, 114
+STYLE DS_SETFONT | DS_CENTER | WS_POPUP
+CAPTION "Copy"
+FONT 10, "Consolas"
+BEGIN
+    LTEXT "Copy to", 210, 14, 15, 322, 12, SS_PATHELLIPSIS
+    CONTROL "", 211, "Edit", ES_MULTILINE | ES_AUTOHSCROLL | WS_TABSTOP, 14, 29, 322, 18
+    LTEXT "Existing files:", 212, 14, 61, 122, 14, SS_CENTERIMAGE
+    COMBOBOX 213, 140, 61, 196, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL "Also ask on read-only files", 214, "Button", BS_OWNERDRAW | WS_TABSTOP, 14, 81, 322, 14
+    CONTROL "&Copy", IDOK, "Button", BS_OWNERDRAW | WS_TABSTOP, 87, 96, 86, 18
+    CONTROL "&Cancel", IDCANCEL, "Button", BS_OWNERDRAW | WS_TABSTOP, 177, 96, 86, 18
+END
+
+103 DIALOGEX 0, 0, 460, 126
+STYLE DS_SETFONT | DS_CENTER | WS_POPUP
+CAPTION "Copying"
+FONT 10, "Consolas"
+BEGIN
+    LTEXT "Counting files...", 220, 12, 16, 436, 12, SS_OWNERDRAW
+    LTEXT "", 221, 12, 31, 436, 12, SS_OWNERDRAW
+    CONTROL "", 222, "msctls_progress32", PBS_SMOOTH, 12, 46, 436, 14
+    LTEXT "Files:", 224, 12, 63, 436, 12
+    LTEXT "Bytes:", 225, 12, 77, 436, 12
+    CONTROL "", 226, "msctls_progress32", PBS_SMOOTH, 12, 91, 436, 14
+    LTEXT "", 228, 12, 60, 1, 1
+    LTEXT "", 229, 12, 104, 1, 1
+    CONTROL "&Cancel", IDCANCEL, "Button", BS_OWNERDRAW | WS_TABSTOP, 187, 106, 86, 18
+END
+
+104 DIALOGEX 0, 0, 360, 106
+STYLE DS_SETFONT | DS_CENTER | WS_POPUP
+CAPTION "Warning"
+FONT 10, "Consolas"
+BEGIN
+    LTEXT "", 230, 12, 16, 336, 12
+    LTEXT "", 231, 12, 33, 336, 12, SS_PATHELLIPSIS
+    LTEXT "", 233, 12, 55, 1, 1
+    LTEXT "", 234, 12, 81, 1, 1
+    CONTROL "Remember choice", 232, "Button", BS_OWNERDRAW | WS_TABSTOP, 12, 57, 336, 18
+    CONTROL "&Overwrite", IDYES, "Button", BS_OWNERDRAW | WS_TABSTOP, 42, 89, 110, 18
+    CONTROL "&Skip", IDNO, "Button", BS_OWNERDRAW | WS_TABSTOP, 158, 89, 68, 18
+    CONTROL "&Cancel", IDCANCEL, "Button", BS_OWNERDRAW | WS_TABSTOP, 232, 89, 86, 18
+END
+
+105 DIALOGEX 0, 0, 310, 65
+STYLE DS_SETFONT | DS_CENTER | WS_POPUP
+CAPTION "Cancel copy"
+FONT 10, "Consolas"
+BEGIN
+    CTEXT "Do you really want to cancel copying?", 235, 12, 17, 286, 16, SS_CENTERIMAGE
+    LTEXT "", 236, 12, 38, 1, 1
+    CONTROL "&Yes", IDYES, "Button", BS_OWNERDRAW | WS_TABSTOP, 83, 42, 68, 18
+    CONTROL "&No", IDNO, "Button", BS_OWNERDRAW | WS_TABSTOP, 159, 42, 68, 18
+END
+
+106 DIALOGEX 0, 0, 400, 190
+STYLE DS_SETFONT | DS_CENTER | WS_POPUP
+CAPTION "Delete"
+FONT 10, "Consolas"
+BEGIN
+    LTEXT "", 240, 14, 14, 372, 16
+    LTEXT "", 241, 14, 32, 372, 122, SS_NOPREFIX
+    LTEXT "", 243, 14, 177, 1, 1
+    CONTROL "&Move", IDYES, "Button", BS_OWNERDRAW | WS_TABSTOP, 37, 178, 86, 18
+    CONTROL "&All", 244, "Button", BS_OWNERDRAW | WS_TABSTOP, 129, 178, 63, 18
+    CONTROL "&Skip", IDNO, "Button", BS_OWNERDRAW | WS_TABSTOP, 197, 178, 63, 18
+    CONTROL "Skip a&ll", 249, "Button", BS_OWNERDRAW | WS_TABSTOP, 197, 178, 94, 18
+    CONTROL "&Cancel", IDCANCEL, "Button", BS_OWNERDRAW | WS_TABSTOP, 265, 178, 79, 18
+END
+
+107 DIALOGEX 0, 0, 400, 82
+STYLE DS_SETFONT | DS_CENTER | WS_POPUP
+CAPTION "Deleting"
+FONT 10, "Consolas"
+BEGIN
+    LTEXT "Scanning...", 245, 14, 15, 372, 14, SS_PATHELLIPSIS | SS_NOPREFIX
+    LTEXT "", 246, 14, 31, 372, 14
+    CONTROL "", 247, "msctls_progress32", PBS_SMOOTH, 14, 48, 372, 18
+    LTEXT "", 248, 14, 73, 1, 1
+    CONTROL "&Cancel", IDCANCEL, "Button", BS_OWNERDRAW | WS_TABSTOP, 157, 74, 86, 18
+END

resources/terminal/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<meta charset="utf-8">
+<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'">
+<title>PowerShell terminal</title>
+<link rel="stylesheet" href="xterm.css">
+<style>
+html, body, #terminal { width:100%; height:100%; margin:0; overflow:hidden; background:#181818; }
+</style>
+<div id="terminal"></div>
+<script src="xterm.js"></script>
+<script src="addon-fit.js"></script>
+<script src="terminal.js"></script>
+</html>

resources/terminal/terminal.js

@@ -0,0 +1,89 @@
+const bridge = window.chrome.webview;
+const terminal = new Terminal({
+  fontFamily: 'Consolas, monospace',
+  fontSize: 16,
+  cursorBlink: false,
+  stdinDisabled: true,
+  theme: { background: '#181818', foreground: '#e8e8e8' },
+});
+const fit = new FitAddon.FitAddon();
+terminal.loadAddon(fit);
+const host = document.getElementById('terminal');
+terminal.open(host);
+host.addEventListener('pointerup', () => bridge.postMessage('focus-input'), true);
+const screen = host.querySelector('.xterm-screen');
+let traceEnabled = false;
+let traceBudget = 4096;
+let currentOffset = 0;
+function trace(phase) {
+  if (!traceEnabled || traceBudget <= 0) return;
+  traceBudget--;
+  const buffer = terminal.buffer.active;
+  bridge.postMessage(`trace:${phase},${host.clientHeight},${terminal.rows},${buffer.viewportY},${buffer.baseY},${Math.round(currentOffset)}`);
+}
+function anchorOutput() {
+  const buffer = terminal.buffer.active;
+  let offset = 0;
+  if (buffer.type === 'normal' && buffer.viewportY === buffer.baseY) {
+    let last = 0;
+    for (let row = terminal.rows - 1; row >= 0; row--) {
+      if (buffer.getLine(buffer.baseY + row)?.translateToString(true)) {
+        last = row;
+        break;
+      }
+    }
+    offset = Math.max(0, terminal.rows - 1 - last) * screen.offsetHeight / terminal.rows;
+  }
+  screen.style.transform = `translateY(${offset}px)`;
+  currentOffset = offset;
+  trace(2);
+}
+terminal.attachCustomKeyEventHandler(event => {
+  if (event.type !== 'keydown' || !event.ctrlKey || event.altKey || event.shiftKey) return true;
+  if (event.code === 'KeyO') bridge.postMessage('toggle');
+  else if (event.code === 'ArrowUp') bridge.postMessage('grow');
+  else if (event.code === 'ArrowDown') bridge.postMessage('shrink');
+  else return true;
+  event.preventDefault();
+  return false;
+});
+const reportSize = () => bridge.postMessage(`size:${terminal.cols},${terminal.rows}`);
+terminal.onResize(reportSize);
+terminal.onScroll(() => {
+  trace(3);
+  anchorOutput();
+});
+bridge.addEventListener('message', ({ data }) => {
+  if (data === 'trace:on') {
+    traceEnabled = true;
+    trace(2);
+    return;
+  }
+  const font = /^font:(\d+):(\d+):([01]):(.*)$/u.exec(data);
+  if (font) {
+    const [, points, weight, italic, family] = font;
+    const quotedFamily = family.replace(/["\\]/g, '\\$&');
+    terminal.options.fontFamily = `"${quotedFamily}", monospace`;
+    terminal.options.fontSize = Number(points) * 96 / 720;
+    terminal.options.fontWeight = Number(weight);
+    host.style.fontStyle = italic === '1' ? 'italic' : 'normal';
+    fit.fit();
+    anchorOutput();
+    return;
+  }
+  const bytes = new Uint8Array(data.length / 2);
+  for (let i = 0; i < bytes.length; i++) bytes[i] = parseInt(data.slice(2*i, 2*i+2), 16);
+  terminal.write(bytes, anchorOutput);
+});
+new ResizeObserver(() => {
+  const buffer = terminal.buffer.active;
+  const wasAtBottom = buffer.viewportY === buffer.baseY;
+  trace(0);
+  fit.fit();
+  trace(1);
+  if (wasAtBottom) terminal.scrollToBottom();
+  requestAnimationFrame(anchorOutput);
+}).observe(host);
+bridge.postMessage('ready');
+fit.fit();
+reportSize();

src/app.h

@@ -69,7 +69,7 @@ class App
     ~App();
     int execute();
     void dispatch(int);
-    void transform(int, int snippet = -1);
+    void transform(int, int snippet = -1, size_t snippetLength = 0, HWND snippetEditor = nullptr);
     void pasteEntry(std::wstring, bool plain);
     void recognizeEntry(std::wstring);
     void captureHistory();
@@ -106,6 +106,9 @@ class App
   private:
     friend struct InputRegressionAccess;
     void releaseIdleMemory(ULONGLONG now);
+    void applySettings(const Settings &, bool validateOcrInstallation);
+    void checkAutostartPath();
+    bool checkingAutostartPath{};
     HHOOK keyboardHook{}, mouseHook{};
     struct MousePress
     {
@@ -118,6 +121,8 @@ class App
     std::array<MousePress, std::size(MouseButtonNames)> mousePresses{};
     std::array<MousePress, std::size(MouseButtonNames)> pendingMouseClicks{};
     std::deque<MousePress> mouseActions;
+    HWND mouseWheelTarget{};
+    int mouseWheelSignal{-1}, mouseWheelRemainder{};
     void queueMouseAction(MousePress);
     void flushMouseClicks();
     void beginMouseVolume(int button);
@@ -155,7 +160,11 @@ class App
     bool (*updateNotifier)(const std::wstring &){};
     bool stop{};
     UINT taskbarCreated{};
+    bool trayRetryPending{};
     uint64_t transformAttempt{}, previousAttemptVersion{};
+    size_t incomingLanFileCount{};
+    bool incomingFileBalloon{};
+    std::atomic<uint64_t> activeTransformAttempt{};
     ULONGLONG previousAttemptAt{};
     HWND previousAttemptWindow{};
     int previousAttemptCommand{}, repeatAttempts{};
@@ -169,7 +178,29 @@ class App
     HWND typingTarget{};
     bool autoPending{};
     int snippetPending = -1;
+    size_t snippetPendingLength{};
+    HWND snippetPendingEditor{};
     bool snippetTyping{};
+    HWND snippetPopup{}, snippetTarget{}, snippetFocus{};
+    uint64_t snippetPopupVersion{};
+    size_t snippetPrefixLength{}, snippetSelection{};
+    bool snippetNavigated{};
+    int snippetRowHeight{};
+    UINT snippetDpi{96};
+    RECT snippetPopupAnchor{};
+    bool snippetCaretPending{};
+    std::optional<RECT> snippetCaret;
+    std::vector<size_t> snippetMatches;
+    std::array<bool, 256> snippetKeys{};
+    void matchSnippets(HWND, bool expandExact);
+    bool queueSnippet(HWND, size_t index, size_t length, HWND editor = nullptr);
+    void showSnippetPopup();
+    void placeSnippetPopup(RECT);
+    void hideSnippetPopup();
+    bool snippetPopupCurrent() const;
+    bool handleSnippetKey(DWORD, UINT);
+    void selectSnippet(size_t);
+    static LRESULT CALLBACK snippetPopupProc(HWND, UINT, WPARAM, LPARAM);
     std::vector<INPUT> deferredTyping;
     bool beginTypingDeferral(HWND, uint64_t, bool snippet = false);
     void replayTyping();

src/app_sync.inl

@@ -79,7 +79,8 @@ void App::pollSync()
                 if (encodeSettings(next) != snapshot)
                 {
                     atomicWrite(data / L"settings-before-sync.bin", protect(snapshot));
-                    applySettings(next);
+                    // A restored OCR configuration can precede the optional local installation.
+                    applySettings(next, false);
                     syncStatus += L" Changes applied on this PC; local backup saved.";
                 }
                 else syncStatus += result.conflicts.empty() ? L" This PC's settings are already up to date; no local changes needed." :

src/autocorrect.cpp

@@ -245,18 +245,20 @@ std::optional<AutoSuggestion> AutoCorrector::suggest(const std::wstring &typed,
     const std::wstring alphabet = sourceLanguage == L"en" ? L"abcdefghijklmnopqrstuvwxyz" :
         sourceLanguage == L"uk" ? L"абвгґдеєжзиіїйклмнопрстуфхцчшщьюя" : L"абвгдеёжзийклмнопрстуфхцчшщъыьэюя";
     auto small = lower(word);
+    bool inCycle = std::find(settings.cycle.begin(), settings.cycle.end(), layouts[source].id) != settings.cycle.end();
     bool sameLanguage = safeAutoWord(word, settings.autoMinLength) &&
-        small.find_first_not_of(alphabet) == small.npos &&
-        std::find(settings.cycle.begin(), settings.cycle.end(), layouts[source].id) != settings.cycle.end();
+        small.find_first_not_of(alphabet) == small.npos && inCycle;
     auto sameLayout = [&](std::wstring text)
     {
         if (word != small) text[0] = upper(text.substr(0, 1))[0];
         return AutoSuggestion{source, source, prefix + text + suffix};
     };
-    if (settings.autoReplace && sameLanguage)
+    if (settings.autoReplace && inCycle)
     {
         auto replacement = settings.autoReplacements.find(small);
         if (replacement != settings.autoReplacements.end() &&
+            (word == small || (word.substr(1) == small.substr(1) && word != upper(word))) &&
+            validAutoReplacementSource(small, alphabet) &&
             validAutoCorrection(replacement->second, alphabet))
             return sameLayout(replacement->second);
     }

src/autostart.cpp

@@ -27,6 +27,7 @@ template <class T> struct Com
 struct Str
 {
     BSTR value;
+    Str() : value(nullptr) {}
     Str(const wchar_t *s) : value(SysAllocString(s))
     {
         if (!value)
@@ -51,10 +52,108 @@ bool missing(HRESULT hr)
 {
     return hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
 }
+constexpr wchar_t RunKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
+
+HRESULT openTaskFolder(Com<ITaskService> &service, Com<ITaskFolder> &folder)
+{
+    HRESULT hr = CoCreateInstance(CLSID_TaskScheduler, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskService,
+                                  (void **)service.out());
+    VARIANT empty;
+    VariantInit(&empty);
+    if (SUCCEEDED(hr))
+        hr = service->Connect(empty, empty, empty, empty);
+    if (SUCCEEDED(hr))
+        hr = service->GetFolder(Str(L"\\"), folder.out());
+    return hr;
+}
+
+bool sameAccount(const wchar_t *account)
+{
+    auto sid = currentUserSid();
+    if (sid == account)
+        return true;
+    DWORD sidSize{}, domainSize{};
+    SID_NAME_USE use{};
+    LookupAccountNameW(nullptr, account, nullptr, &sidSize, nullptr, &domainSize, &use);
+    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+        return false;
+    Bytes accountSid(sidSize);
+    std::wstring domain(domainSize, L'\0');
+    if (!LookupAccountNameW(nullptr, account, accountSid.data(), &sidSize, domain.data(), &domainSize, &use))
+        return false;
+    LPWSTR accountSidText{};
+    if (!ConvertSidToStringSidW(accountSid.data(), &accountSidText))
+        return false;
+    bool same = sid == accountSidText;
+    LocalFree(accountSidText);
+    return same;
+}
+
+std::wstring registeredTaskPath()
+{
+    Com<ITaskService> service;
+    Com<ITaskFolder> folder;
+    check(openTaskFolder(service, folder));
+    Com<IRegisteredTask> task;
+    auto hr = folder->GetTask(Str(L"KSwitcher"), task.out());
+    if (missing(hr))
+        return {};
+    check(hr);
+    VARIANT_BOOL enabled{};
+    check(task->get_Enabled(&enabled));
+    if (!enabled)
+        return {};
+
+    Com<ITaskDefinition> definition;
+    Com<IPrincipal> principal;
+    Str user;
+    check(task->get_Definition(definition.out()));
+    check(definition->get_Principal(principal.out()));
+    check(principal->get_UserId(&user.value));
+    if (!user.value || !sameAccount(user.value))
+        return {};
+
+    Com<IActionCollection> actions;
+    LONG count{};
+    check(definition->get_Actions(actions.out()));
+    check(actions->get_Count(&count));
+    if (count != 1)
+        return {};
+    Com<IAction> action;
+    check(actions->get_Item(1, action.out()));
+    TASK_ACTION_TYPE type{};
+    check(action->get_Type(&type));
+    if (type != TASK_ACTION_EXEC)
+        return {};
+    Com<IExecAction> exec;
+    Str path, arguments;
+    check(action->QueryInterface(IID_IExecAction, (void **)exec.out()));
+    check(exec->get_Arguments(&arguments.value));
+    check(exec->get_Path(&path.value));
+    return path.value && (!arguments.value || !*arguments.value) ? path.value : L"";
+}
+
+std::wstring registeredRunPath()
+{
+    DWORD size{};
+    auto status = RegGetValueW(HKEY_CURRENT_USER, RunKey, L"KSwitcher", RRF_RT_REG_SZ, nullptr, nullptr, &size);
+    if (status == ERROR_FILE_NOT_FOUND || status == ERROR_UNSUPPORTED_TYPE)
+        return {};
+    check(HRESULT_FROM_WIN32(status));
+    std::wstring command(size / sizeof(wchar_t), L'\0');
+    check(HRESULT_FROM_WIN32(RegGetValueW(HKEY_CURRENT_USER, RunKey, L"KSwitcher", RRF_RT_REG_SZ, nullptr,
+                                         command.data(), &size)));
+    command.resize(wcslen(command.c_str()));
+    // KSwitcher writes a quoted executable path with no arguments.
+    if (command.size() >= 2 && command.front() == L'"' && command.find(L'"', 1) == command.size() - 1)
+        return command.substr(1, command.size() - 2);
+    return {};
+}
+
 void runEntry(bool enabled)
 {
     HKEY key{};
-    if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", 0, nullptr,
+    if (RegCreateKeyExW(HKEY_CURRENT_USER, RunKey, 0, nullptr,
                         0, KEY_SET_VALUE, nullptr, &key, nullptr) != ERROR_SUCCESS)
         throw std::runtime_error("Cannot access autostart settings");
     auto command = L"\"" + executable() + L"\"";
@@ -66,6 +165,27 @@ void runEntry(bool enabled)
         throw std::runtime_error("Cannot save autostart settings");
 }
 } // namespace
+std::wstring staleAutostartPath(bool elevated)
+{
+    auto registered = elevated ? registeredTaskPath() : registeredRunPath();
+    auto path = std::filesystem::path(registered);
+    if (!path.is_absolute() || _wcsicmp(path.filename().c_str(), L"KSwitcher.exe") != 0)
+        return {};
+    auto current = executable();
+    std::error_code error;
+    if (_wcsicmp(registered.c_str(), current.c_str()) == 0 || std::filesystem::equivalent(path, current, error))
+        return {};
+    return registered;
+}
+
+void repairAutostartPath(bool elevated)
+{
+    if (elevated)
+        setAutostart(true, true);
+    else
+        runEntry(true);
+}
+
 std::wstring currentUserSid()
 {
     HANDLE token{};
@@ -88,13 +208,10 @@ std::wstring currentUserSid()
 void configureAutostart(int mode)
 {
     Com<ITaskService> service;
-    check(CoCreateInstance(CLSID_TaskScheduler, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskService,
-                           (void **)service.out()));
+    Com<ITaskFolder> folder;
+    check(openTaskFolder(service, folder));
     VARIANT empty;
     VariantInit(&empty);
-    check(service->Connect(empty, empty, empty, empty));
-    Com<ITaskFolder> folder;
-    check(service->GetFolder(Str(L"\\"), folder.out()));
     Com<IRegisteredTask> existing;
     HRESULT found = folder->GetTask(Str(L"KSwitcher"), existing.out());
     if (FAILED(found) && !missing(found))
@@ -158,16 +275,9 @@ void setAutostart(bool enabled, bool elevated)
     if (mode != 2)
     {
         Com<ITaskService> service;
-        HRESULT hr = CoCreateInstance(CLSID_TaskScheduler, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskService,
-                                      (void **)service.out());
-        VARIANT empty;
-        VariantInit(&empty);
         Com<ITaskFolder> folder;
+        HRESULT hr = openTaskFolder(service, folder);
         Com<IRegisteredTask> task;
-        if (SUCCEEDED(hr))
-            hr = service->Connect(empty, empty, empty, empty);
-        if (SUCCEEDED(hr))
-            hr = service->GetFolder(Str(L"\\"), folder.out());
         if (SUCCEEDED(hr))
             hr = folder->GetTask(Str(L"KSwitcher"), task.out());
         if (missing(hr))

src/config_main.cpp

@@ -1,6 +1,7 @@
 #include "configuration.h"
 #include <commctrl.h>
 #include <cstring>
+#include "mcp_logs.h"
 
 namespace ks
 {
@@ -156,6 +157,26 @@ void App::setHotkeyCapture(HWND field)
 }
 void App::clearLog(bool previous) { request(*this, ConfigClearLog, Bytes{static_cast<unsigned char>(previous)}); }
 
+int runMcpConfigurator(HINSTANCE instance)
+{
+    App app(instance);
+    WNDCLASSW cls{};
+    cls.lpfnWndProc = controller;
+    cls.hInstance = instance;
+    cls.lpszClassName = L"KSwitcher.Config.MCP";
+    RegisterClassW(&cls);
+    app.window = CreateWindowExW(0, cls.lpszClassName, L"", 0, 0, 0, 0, 0,
+                                 HWND_MESSAGE, nullptr, instance, nullptr);
+    auto result = runLogMcp([&](const Bytes &payload)
+    {
+        service = FindWindowW(L"KSwitcher.Main", L"KSwitcher");
+        if (!app.window || !service) throw std::runtime_error("Start KSwitcher before reading remote logs.");
+        return request(app, ConfigLan, payload);
+    });
+    if (app.window) DestroyWindow(app.window);
+    return result;
+}
+
 int runConfigurator(HINSTANCE instance, bool snippets, bool logs)
 {
     HANDLE singleton = CreateMutexW(nullptr, TRUE, L"Local\\KSwitcher.Config.Singleton");
@@ -236,8 +257,9 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
         int count{}; auto args = CommandLineToArgvW(GetCommandLineW(), &count);
         bool snippets = count > 1 && std::wstring(args[1]) == L"--snippets";
         bool logs = count > 1 && std::wstring(args[1]) == L"--logs";
+        bool mcp = count > 1 && std::wstring(args[1]) == L"--mcp";
         LocalFree(args);
-        result = ks::runConfigurator(instance, snippets, logs);
+        result = mcp ? ks::runMcpConfigurator(instance) : ks::runConfigurator(instance, snippets, logs);
     }
     catch (const std::exception &e)
     {

src/core.cpp

@@ -35,6 +35,11 @@ bool validAutoCorrection(const std::wstring &text, const std::wstring &alphabet)
     }
     return true;
 }
+bool validAutoReplacementSource(const std::wstring &text, const std::wstring &alphabet)
+{
+    return text.find(L' ') == text.npos && text.find_first_of(alphabet) != text.npos &&
+           validAutoCorrection(text, alphabet + L"0123456789");
+}
 int HotkeyHook::update(UINT key, bool down, UINT modifiers,
                        const std::vector<std::pair<int, Hotkey>> &bindings)
 {

src/core.h

@@ -21,6 +21,7 @@ struct Layout
 };
 bool letter(wchar_t ch);
 bool validAutoCorrection(const std::wstring &text, const std::wstring &alphabet);
+bool validAutoReplacementSource(const std::wstring &text, const std::wstring &alphabet);
 std::wstring lower(std::wstring text);
 std::wstring upper(std::wstring text);
 std::wstring convert(const std::wstring &, const Layout &, const Layout &, bool force = false);
@@ -101,6 +102,7 @@ struct Settings
     std::map<std::wstring, std::vector<std::wstring>> chatCycles;
     std::map<std::wstring, AppLanguageSet> appLanguageSets;
     std::map<std::wstring, std::map<std::wstring, MouseAction>> mouseBindings;
+    std::map<std::wstring, std::wstring> customMouseEvents;
     std::set<std::wstring> disabledMouseProfiles;
     std::map<std::wstring, std::set<std::wstring>> mouseProfileApplications;
     std::vector<std::wstring> excluded{L"KeePass", L"KeePassXC", L"1Password", L"Bitwarden"};

src/files_terminal.h

@@ -0,0 +1,110 @@
+#pragma once
+
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+// The reader keeps draining the output pipe while ClosePseudoConsole shuts down.
+class FilesTerminal
+{
+public:
+    ~FilesTerminal() { close(); }
+
+    bool start(const wchar_t *directory, COORD size)
+    {
+        if(alive()) return true;
+        close();
+        pending.clear();
+        HANDLE inputRead{}, outputWrite{};
+        if(!CreatePipe(&inputRead,&input,nullptr,0)) return false;
+        if(!CreatePipe(&output,&outputWrite,nullptr,0))
+        {
+            CloseHandle(inputRead);
+            close();
+            return false;
+        }
+        const auto created=CreatePseudoConsole(size,inputRead,outputWrite,0,&console);
+        CloseHandle(inputRead);
+        CloseHandle(outputWrite);
+        if(FAILED(created)) { close(); return false; }
+        reader=std::thread([this]
+        {
+            char buffer[4096];
+            DWORD count{};
+            while(ReadFile(output,buffer,sizeof(buffer),&count,nullptr) && count)
+            {
+                std::lock_guard lock(mutex);
+                pending.append(buffer,count);
+                if(pending.size()>1024*1024) pending.erase(0,pending.size()-1024*1024);
+            }
+        });
+
+        SIZE_T bytes{};
+        InitializeProcThreadAttributeList(nullptr,1,0,&bytes);
+        std::vector<unsigned char> storage(bytes);
+        auto attributes=reinterpret_cast<LPPROC_THREAD_ATTRIBUTE_LIST>(storage.data());
+        if(!InitializeProcThreadAttributeList(attributes,1,0,&bytes)) { close(); return false; }
+        STARTUPINFOEXW startup{};
+        startup.StartupInfo.cb=sizeof(startup);
+        startup.lpAttributeList=attributes;
+        PROCESS_INFORMATION info{};
+        wchar_t command[]=L"powershell.exe -NoLogo -NoProfile -NoExit -Command \"Remove-Module PSReadLine -ErrorAction SilentlyContinue; function global:prompt { ([string][char]27) + '[?25l' }; Clear-Host\"";
+        wchar_t system[MAX_PATH]{};
+        const auto length=GetSystemDirectoryW(system,MAX_PATH);
+        const auto shell=std::wstring(system)+L"\\WindowsPowerShell\\v1.0\\powershell.exe";
+        const bool started=length && length<MAX_PATH &&
+            UpdateProcThreadAttribute(attributes,0,PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE,
+                console,sizeof(console),nullptr,nullptr) &&
+            CreateProcessW(shell.c_str(),command,nullptr,nullptr,FALSE,EXTENDED_STARTUPINFO_PRESENT,
+                nullptr,directory,&startup.StartupInfo,&info);
+        DeleteProcThreadAttributeList(attributes);
+        if(!started) { close(); return false; }
+        process=info.hProcess;
+        CloseHandle(info.hThread);
+        return true;
+    }
+
+    bool alive() const { return process && WaitForSingleObject(process,0)==WAIT_TIMEOUT; }
+
+    bool write(const std::wstring &value)
+    {
+        if(!alive()) return false;
+        const int length=WideCharToMultiByte(CP_UTF8,0,value.data(),static_cast<int>(value.size()),
+            nullptr,0,nullptr,nullptr);
+        if(!length) return false;
+        std::string utf8(length,'\0');
+        WideCharToMultiByte(CP_UTF8,0,value.data(),static_cast<int>(value.size()),
+            utf8.data(),length,nullptr,nullptr);
+        DWORD written{};
+        return WriteFile(input,utf8.data(),length,&written,nullptr) && written==utf8.size();
+    }
+
+    void resize(COORD size) { if(console) ResizePseudoConsole(console,size); }
+
+    std::string takeOutput()
+    {
+        std::lock_guard lock(mutex);
+        std::string result;
+        result.swap(pending);
+        return result;
+    }
+
+    void close()
+    {
+        if(input) CloseHandle(input);
+        if(console) ClosePseudoConsole(console);
+        if(reader.joinable()) reader.join();
+        if(output) CloseHandle(output);
+        if(process) CloseHandle(process);
+        input=output=process=nullptr;
+        console=nullptr;
+    }
+
+private:
+    HPCON console{};
+    HANDLE input{},output{},process{};
+    std::thread reader;
+    std::mutex mutex;
+    std::string pending;
+};

src/files_terminal_view.h

@@ -0,0 +1,186 @@
+#pragma once
+#include <WebView2.h>
+
+#ifdef __MINGW32__
+__CRT_UUID_DECL(ICoreWebView2_3, 0xA0D6DF20, 0x3B92, 0x416D, 0xAA, 0x0C, 0x43, 0x7A, 0x9C, 0x72, 0x78, 0x57)
+__CRT_UUID_DECL(ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler, 0x4e8a3389, 0xc9d8, 0x4bd2, 0xb6, 0xb5, 0x12, 0x4f, 0xee, 0x6c, 0xc1, 0x4d)
+__CRT_UUID_DECL(ICoreWebView2CreateCoreWebView2ControllerCompletedHandler, 0x6c4819f3, 0xc9b7, 0x4260, 0x81, 0x27, 0xc9, 0xf5, 0xbd, 0xe7, 0xf6, 0x8c)
+__CRT_UUID_DECL(ICoreWebView2WebMessageReceivedEventHandler, 0x57213f19, 0x00e6, 0x49fa, 0x8e, 0x07, 0x89, 0x8e, 0xa0, 0x1e, 0xcb, 0xd2)
+__CRT_UUID_DECL(ICoreWebView2NewWindowRequestedEventHandler, 0xd4c185fe, 0xc81c, 0x4989, 0x97, 0xaf, 0x2d, 0x3f, 0xa7, 0xab, 0x56, 0x51)
+__CRT_UUID_DECL(ICoreWebView2NavigationStartingEventHandler, 0x9adbe429, 0xf36d, 0x432b, 0x9d, 0xdc, 0xf8, 0x88, 0x1f, 0xbd, 0x76, 0xe3)
+#endif
+#include <wrl/client.h>
+#include <functional>
+#include <memory>
+#include <utility>
+
+template<class Interface, class... Args>
+class TerminalCallback final : public Interface
+{
+    ULONG refs=1;
+    std::function<HRESULT(Args...)> invoke;
+public:
+    explicit TerminalCallback(std::function<HRESULT(Args...)> fn):invoke(std::move(fn)) {}
+    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,void **value) override
+    {
+        if(iid!=IID_IUnknown && iid!=__uuidof(Interface)) { *value=nullptr; return E_NOINTERFACE; }
+        *value=static_cast<Interface*>(this);
+        AddRef();
+        return S_OK;
+    }
+    ULONG STDMETHODCALLTYPE AddRef() override { return ++refs; }
+    ULONG STDMETHODCALLTYPE Release() override
+    {
+        const auto remaining=--refs;
+        if(!remaining) delete this;
+        return remaining;
+    }
+    HRESULT STDMETHODCALLTYPE Invoke(Args... args) override { return invoke(args...); }
+};
+
+template<class Interface,class... Args,class Fn>
+auto terminalCallback(Fn fn)
+{
+    Microsoft::WRL::ComPtr<Interface> result;
+    result.Attach(new TerminalCallback<Interface,Args...>(std::move(fn)));
+    return result;
+}
+
+class FilesTerminalView
+{
+    Microsoft::WRL::ComPtr<ICoreWebView2Controller> controller;
+    Microsoft::WRL::ComPtr<ICoreWebView2> web;
+    HMODULE loader{};
+    bool ready{};
+    bool visible{};
+    int viewportHeight{};
+public:
+    bool initialized() const { return ready; }
+    void enableTrace() { if(ready) web->PostWebMessageAsString(L"trace:on"); }
+    void setFont(const LOGFONTW &font,int points)
+    {
+        if(!ready) return;
+        const auto message=L"font:"+std::to_wstring(points)+L":"+
+            std::to_wstring(font.lfWeight?font.lfWeight:FW_NORMAL)+L":"+
+            std::to_wstring(font.lfItalic!=0)+L":"+font.lfFaceName;
+        web->PostWebMessageAsString(message.c_str());
+    }
+    void layout(HWND host,bool show,int fullHeight)
+    {
+        visible=show;
+        viewportHeight=fullHeight;
+        if(!controller) return;
+        RECT bounds{};
+        GetClientRect(host,&bounds);
+        bounds.top=bounds.bottom-viewportHeight;
+        RECT current{};
+        if(FAILED(controller->get_Bounds(&current)) || !EqualRect(&current,&bounds))
+            controller->put_Bounds(bounds);
+        BOOL currentVisibility{};
+        if(FAILED(controller->get_IsVisible(&currentVisibility)) || !!currentVisibility!=show)
+            controller->put_IsVisible(show);
+    }
+    void close()
+    {
+        if(controller) controller->Close();
+        web.Reset();
+        controller.Reset();
+        ready=false;
+    }
+    bool send(const std::string &bytes)
+    {
+        if(!ready) return false;
+        constexpr wchar_t hex[]=L"0123456789abcdef";
+        std::wstring message;
+        message.reserve(bytes.size()*2);
+        for(unsigned char c:bytes)
+        {
+            message+=hex[c>>4];
+            message+=hex[c&15];
+        }
+        return SUCCEEDED(web->PostWebMessageAsString(message.c_str()));
+    }
+    bool create(HWND host,std::function<void(const std::wstring&)> receive,std::function<void()> failed)
+    {
+        wchar_t exe[MAX_PATH]{};
+        if(!GetModuleFileNameW(nullptr,exe,MAX_PATH)) return false;
+        const auto folder=std::filesystem::path(exe).parent_path();
+        loader=LoadLibraryExW((folder/L"WebView2Loader.dll").c_str(),nullptr,LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR|LOAD_LIBRARY_SEARCH_SYSTEM32);
+        if(!loader) return false;
+        using Create=HRESULT (STDAPICALLTYPE*)(PCWSTR,PCWSTR,ICoreWebView2EnvironmentOptions*,
+            ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler*);
+        const auto createEnvironment=reinterpret_cast<Create>(
+            reinterpret_cast<void*>(GetProcAddress(loader,"CreateCoreWebView2EnvironmentWithOptions")));
+        if(!createEnvironment) return false;
+        wchar_t local[MAX_PATH]{};
+        const auto length=GetEnvironmentVariableW(L"LOCALAPPDATA",local,MAX_PATH);
+        if(!length || length>=MAX_PATH) return false;
+        const auto profile=std::filesystem::path(local)/L"KSwitcher"/L"TerminalWebView";
+        const auto assets=folder/L"terminal";
+        auto environment=terminalCallback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler,
+            HRESULT,ICoreWebView2Environment*>([=,this](HRESULT hr,ICoreWebView2Environment *env)
+        {
+            if(!IsWindow(host)) return S_OK;
+            if(FAILED(hr) || !env) { failed(); return S_OK; }
+            auto completed=terminalCallback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler,
+                HRESULT,ICoreWebView2Controller*>([=,this](HRESULT result,ICoreWebView2Controller *view)
+            {
+                if(!IsWindow(host)) return S_OK;
+                if(FAILED(result) || !view) { failed(); return S_OK; }
+                controller=view;
+                view->get_CoreWebView2(&web);
+                Microsoft::WRL::ComPtr<ICoreWebView2_3> mapped;
+                if(!web || FAILED(web.As(&mapped)) || FAILED(mapped->SetVirtualHostNameToFolderMapping(
+                    L"kswitcher-terminal.invalid",assets.c_str(),COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND_DENY)))
+                { failed(); return S_OK; }
+                Microsoft::WRL::ComPtr<ICoreWebView2Settings> settings;
+                if(SUCCEEDED(web->get_Settings(&settings)))
+                {
+                    settings->put_AreDevToolsEnabled(FALSE);
+                    settings->put_AreDefaultContextMenusEnabled(FALSE);
+                    settings->put_AreHostObjectsAllowed(FALSE);
+                }
+                EventRegistrationToken token{};
+                auto navigation=terminalCallback<ICoreWebView2NavigationStartingEventHandler,
+                    ICoreWebView2*,ICoreWebView2NavigationStartingEventArgs*>([](auto*,auto *args)
+                {
+                    PWSTR uri{};
+                    if(SUCCEEDED(args->get_Uri(&uri)))
+                    {
+                        args->put_Cancel(wcscmp(uri,L"https://kswitcher-terminal.invalid/index.html")!=0);
+                        CoTaskMemFree(uri);
+                    }
+                    return S_OK;
+                });
+                auto newWindow=terminalCallback<ICoreWebView2NewWindowRequestedEventHandler,
+                    ICoreWebView2*,ICoreWebView2NewWindowRequestedEventArgs*>([](auto*,auto *args)
+                { args->put_Handled(TRUE); return S_OK; });
+                auto messages=terminalCallback<ICoreWebView2WebMessageReceivedEventHandler,
+                    ICoreWebView2*,ICoreWebView2WebMessageReceivedEventArgs*>([=,this](auto*,auto *args)
+                {
+                    PWSTR source{}, value{};
+                    if(SUCCEEDED(args->get_Source(&source)) &&
+                        wcscmp(source,L"https://kswitcher-terminal.invalid/index.html")==0 &&
+                        SUCCEEDED(args->TryGetWebMessageAsString(&value)))
+                    {
+                        if(wcscmp(value,L"ready")==0) ready=true;
+                        if(ready) receive(value);
+                    }
+                    CoTaskMemFree(value);
+                    CoTaskMemFree(source);
+                    return S_OK;
+                });
+                if(FAILED(web->add_NavigationStarting(navigation.Get(),&token)) ||
+                    FAILED(web->add_NewWindowRequested(newWindow.Get(),&token)) ||
+                    FAILED(web->add_WebMessageReceived(messages.Get(),&token)) ||
+                    FAILED(web->Navigate(L"https://kswitcher-terminal.invalid/index.html")))
+                    failed();
+                layout(host,visible,viewportHeight);
+                return S_OK;
+            });
+            if(FAILED(env->CreateCoreWebView2Controller(host,completed.Get()))) failed();
+            return S_OK;
+        });
+        return SUCCEEDED(createEnvironment(nullptr,profile.c_str(),nullptr,environment.Get()));
+    }
+};

src/lan.cpp

@@ -55,6 +55,11 @@ struct LanService::Impl
     Json trusted=Json::object(),positions=Json::object();
     std::unique_ptr<lan::Pairing> pending;
     std::unique_ptr<lan::ClipboardExchange> clipboard;
+    std::unique_ptr<lan::ClipboardExchange> transfers;
+    std::deque<lan::ClipboardExchange::Delivery> incomingFiles;
+    struct LogDownload {std::string peer, id; uint64_t deadline; Bytes bytes;};
+    std::optional<LogDownload> logDownload;
+    bool shareLogs{};
     bool enabled{};
     std::atomic<bool> stopping{false};
     std::mutex mutex;
@@ -83,6 +88,7 @@ struct LanService::Impl
             id=j.at("id"); enabled=j.value("enabled",false); trusted=j.at("trusted");
             positions=j.value("positions",Json::object());
             shareInput=j.value("shareInput",false);inputPeer=j.value("inputPeer","");inputEdge=j.value("inputEdge",1);
+            shareLogs=j.value("shareLogs",false);
             if(inputEdge<0||inputEdge>3||(shareInput&&trusted.empty()))throw std::runtime_error("Invalid input sharing configuration.");
             if(!trusted.is_object()||trusted.size()>64) throw std::runtime_error("Invalid paired computer list.");
             for(auto &[key,entry]:trusted.items())
@@ -93,12 +99,13 @@ struct LanService::Impl
         else id=lan::randomHex(16);
         lan::fillPositions(positions,trusted,inputPeer,inputEdge);
         clipboard=std::make_unique<lan::ClipboardExchange>(id);
+        transfers=std::make_unique<lan::ClipboardExchange>(id,"file-transfer");
         configureRouter();
         if(enabled) start();
     }
     ~Impl() { stop(); }
     void save() { atomicWrite(path,protect(encoded({{"version",1},{"id",id},{"enabled",enabled},{"trusted",trusted},
-        {"shareInput",shareInput},{"inputPeer",inputPeer},{"inputEdge",inputEdge},{"positions",positions}}))); }
+        {"shareInput",shareInput},{"shareLogs",shareLogs},{"inputPeer",inputPeer},{"inputEdge",inputEdge},{"positions",positions}}))); }
     bool queue(const std::string &peer,lan::InputFrame frame)
     {
         std::lock_guard lock(inputMutex);
@@ -153,6 +160,8 @@ struct LanService::Impl
         inputConnected=false;++inputEpoch;
         {std::lock_guard lock(inputMutex);inputOut.clear();inputIn.clear();inputReady.clear();}
         std::lock_guard lock(mutex); pending.reset(); peers.clear();clipboard=std::make_unique<lan::ClipboardExchange>(id);
+        transfers=std::make_unique<lan::ClipboardExchange>(id,"file-transfer");incomingFiles.clear();logDownload.reset();
+        if(inputWindow)PostMessageW(inputWindow,LanFilesChangedMessage,0,FALSE);
     }
     void send(SOCKET socket,const sockaddr_in &address,const Json &j)
     {
@@ -161,6 +170,41 @@ struct LanService::Impl
     }
     std::string heartbeat(const std::string &from,const std::string &to,const std::string &a,const std::string &b)
     { return "KSwitcher LAN v1|presence|"+from+"|"+to+"|"+a+"|"+b; }
+    void receiveTransfers(uint64_t now)
+    {
+        for(auto &item:transfers->deliveries)
+        {
+            if(item.app=="file")
+            {
+                auto end=std::find(item.bytes.begin(),item.bytes.end(),0);
+                if(end!=item.bytes.begin() && end!=item.bytes.end() && end-item.bytes.begin()<=1024 &&
+                   item.bytes.end()-end-1<=16*1024*1024)
+                {
+                    incomingFiles.push_back(std::move(item));
+                    if(inputWindow)PostMessageW(inputWindow,LanFilesChangedMessage,incomingFiles.size(),TRUE);
+                }
+            }
+            else if(item.app=="log-request" && item.bytes.size()==33)
+            {
+                std::string request(item.bytes.begin()+1,item.bytes.end());
+                if(!lan::identifier(request)||item.bytes[0]>1)continue;
+                Bytes response{2};
+                if(shareLogs)try
+                {
+                    auto log=readFile(path.parent_path()/(item.bytes[0]?L"kswitcher.log.1":L"kswitcher.log"),2*1024*1024);
+                    response[0]=0;
+                    response.insert(response.end(),log.begin(),log.end());
+                }
+                catch(const std::exception &){response={1};}
+                try{transfers->queue({item.peer},std::move(response),"log-reply-"+request,now);}
+                catch(const std::exception &){}
+            }
+            else if(logDownload && now<logDownload->deadline && logDownload->peer==item.peer &&
+                    item.app=="log-reply-"+logDownload->id && item.bytes.size()<=2*1024*1024+1 && logDownload->bytes.empty())
+                logDownload->bytes=std::move(item.bytes);
+        }
+        transfers->deliveries.clear();
+    }
     void receive(SOCKET socket,const sockaddr_in &address,const Json &j,uint64_t now)
     {
         if(j.value("app","")!="KSwitcher-LAN" || j.value("version",0)!=1) return;
@@ -180,6 +224,7 @@ struct LanService::Impl
             // announcements cannot extend its PeerLifetime expiry.
             if(peer.address.sin_addr.s_addr!=address.sin_addr.s_addr) peer.verified=0;
             clipboard->peerSession(other,j.value("clipboardSession",""));
+            transfers->peerSession(other,j.value("fileSession",""));
             peer.name=display; peer.epoch=session; peer.address=address; peer.seen=now;
             if(trusted.contains(other))
             {
@@ -192,6 +237,17 @@ struct LanService::Impl
         if(!peers.contains(other)||j.value("to","")!=id) return;
         auto &peer=peers.at(other);
         if(peer.address.sin_addr.s_addr!=address.sin_addr.s_addr) return;
+        if(type=="file-transfer" && trusted.contains(other))
+        {
+            size_t retainedBytes=0;
+            for(const auto &item:incomingFiles)retainedBytes+=item.bytes.size();
+            try {transfers->receive(other,trusted.at(other).at("key"),j,now,0,
+                [&](const auto &target,const auto &packet){send(socket,peers.at(target).address,packet);},
+                incomingFiles.size(),retainedBytes);}
+            catch(const std::exception &){return;}
+            receiveTransfers(now);
+            return;
+        }
         if(type=="clipboard" && trusted.contains(other))
         {
             try {clipboard->receive(other,trusted.at(other).at("key"),j,now,GetClipboardSequenceNumber(),
@@ -246,13 +302,17 @@ struct LanService::Impl
                     clipboard->poll(trusted,now,[&](const auto &target,const auto &packet){
                         if(peers.contains(target))send(socket,peers.at(target).address,packet);
                     });
-                    clipboardActive=clipboard->active();
+                    transfers->poll(trusted,now,[&](const auto &target,const auto &packet){
+                        if(peers.contains(target))send(socket,peers.at(target).address,packet);
+                    });
+                    clipboardActive=clipboard->active()||transfers->active();
                     if(shareInput)for(auto &[peer,entry]:trusted.items())
                         endpoints.push_back({peer,entry.at("key"),peers.contains(peer)?peers.at(peer).address.sin_addr.s_addr:0});
                     if(now>=nextHello)
                     {
                         epoch=lan::randomHex(16); // Fresh challenge prevents replayed presence from staying online.
                         auto hello=lan::envelope("hello",id); hello["name"]=name; hello["epoch"]=epoch;hello["clipboardSession"]=clipboard->session();
+                        hello["fileSession"]=transfers->session();
                         for(auto ip:broadcasts()) { auto address=bound; address.sin_addr.s_addr=ip; send(socket,address,hello); }
                         nextHello=now+3000;
                     }
@@ -324,6 +384,76 @@ struct LanService::Impl
             if(enabled) start(); else status="Disabled. No discovery sockets or worker thread.";
         }
         std::lock_guard lock(mutex);
+        auto now=GetTickCount64();
+        if(action=="shareLogs")
+        {
+            bool previous=shareLogs;
+            shareLogs=j.at("enabled");
+            try {save();} catch(...) {shareLogs=previous;throw;}
+            if(!shareLogs)
+                for(const auto &[peer,entry]:trusted.items())transfers->cancel(peer,"log-reply-");
+        }
+        if(action=="sendFile" || action=="requestLog")
+        {
+            auto peer=j.at("peer").get<std::string>();
+            if(!enabled||!trusted.contains(peer)||!peers.contains(peer)||!peers.at(peer).verified||
+               now-peers.at(peer).verified>=lan::PeerLifetime)
+                throw std::runtime_error("Select an online paired computer.");
+            if(!transfers->hasSession(peer))throw std::runtime_error("Update KSwitcher on the selected computer to use file transfers.");
+            if(action=="sendFile")
+            {
+                auto file=std::filesystem::path(wide(j.at("path").get<std::string>()));
+                auto name=utf8(file.filename().wstring());
+                if(name.empty()||name.size()>1024)throw std::runtime_error("Invalid file name.");
+                Bytes payload(name.begin(),name.end());
+                payload.push_back(0);
+                constexpr size_t fileLimit=16*1024*1024;
+                if(std::filesystem::file_size(file)>fileLimit)throw std::runtime_error("File size limit is 16 MiB.");
+                auto bytes=readFile(file,fileLimit);
+                payload.insert(payload.end(),bytes.begin(),bytes.end());
+                transfers->queue({peer},std::move(payload),"file",now);
+                return encoded({{"queued",true}});
+            }
+            if(logDownload && now<logDownload->deadline)
+                throw std::runtime_error("A remote log download is already pending.");
+            auto request=lan::randomHex(16);
+            Bytes payload{static_cast<unsigned char>(j.value("previous",false))};
+            payload.insert(payload.end(),request.begin(),request.end());
+            transfers->queue({peer},std::move(payload),"log-request",now);
+            logDownload=LogDownload{peer,request,now+30000,{}};
+            return encoded({{"request",request}});
+        }
+        if(action=="takeLog")
+        {
+            if(!logDownload||logDownload->id!=j.at("request").get<std::string>()||now>=logDownload->deadline)
+                return encoded({{"state","expired"}});
+            if(logDownload->bytes.empty())return encoded({{"state","waiting"}});
+            auto bytes=std::move(logDownload->bytes);
+            logDownload.reset();
+            if(bytes.front()!=0)return encoded({{"state",bytes.front()==2?"denied":"unavailable"}});
+            std::string hex;
+            hex.reserve((bytes.size()-1)*2);
+            for(auto it=bytes.begin()+1;it!=bytes.end();++it)
+            {
+                hex+="0123456789abcdef"[*it>>4];
+                hex+="0123456789abcdef"[*it&15];
+            }
+            return encoded({{"state","ready"},{"logHex",hex}});
+        }
+        if(action=="saveFile"||action=="discardFile")
+        {
+            auto found=std::find_if(incomingFiles.begin(),incomingFiles.end(),[&](const auto &file){
+                return file.id==j.at("id").get<std::string>() && file.peer==j.at("peer").get<std::string>();
+            });
+            if(found==incomingFiles.end())throw std::runtime_error("This file is no longer available.");
+            if(action=="saveFile")
+            {
+                auto start=std::find(found->bytes.begin(),found->bytes.end(),0)+1;
+                atomicWrite(wide(j.at("path").get<std::string>()),Bytes(start,found->bytes.end()));
+            }
+            incomingFiles.erase(found);
+            if(inputWindow)PostMessageW(inputWindow,LanFilesChangedMessage,incomingFiles.size(),FALSE);
+        }
         if(action=="position")
         {
             auto peer=j.at("peer").get<std::string>();int x=j.at("x"),y=j.at("y");
@@ -368,6 +498,9 @@ struct LanService::Impl
             auto peer=j.at("peer").get<std::string>();auto oldTrusted=trusted;auto oldPositions=positions;bool oldSharing=shareInput;
             trusted.erase(peer);positions.erase(peer);if(trusted.empty())shareInput=false;
             try{save();}catch(...){trusted=std::move(oldTrusted);positions=std::move(oldPositions);shareInput=oldSharing;throw;}
+            std::erase_if(incomingFiles,[&](const auto &file){return file.peer==peer;});
+            if(inputWindow)PostMessageW(inputWindow,LanFilesChangedMessage,incomingFiles.size(),FALSE);
+            if(logDownload && logDownload->peer==peer)logDownload.reset();
             if(pending&&pending->peer==peer)pending.reset();
             configureRouter();
             status="Pair removed on this computer.";
@@ -376,7 +509,16 @@ struct LanService::Impl
             {"positions",positions},{"shareInput",shareInput},{"inputPeer",inputPeer},{"controlPeer",router?router->peer():std::string{}},{"inputEdge",inputEdge},{"inputConnected",inputConnected.load()},
             {"inputStatus",enabled&&shareInput?inputStatus:"Input sharing disabled."},{"inputNeedsHelp",enabled&&shareInput&&inputNeedsHelp},{"controlMode",router?int(router->mode()):0}};
         {std::lock_guard inputLock(inputMutex);result["inputReady"]=inputReady;}
-        auto now=GetTickCount64();
+        result["shareLogs"]=shareLogs;
+        result["files"]=Json::array();
+        result["transferStatus"]=transfers->status;
+        for(const auto &file:incomingFiles)
+        {
+            auto end=std::find(file.bytes.begin(),file.bytes.end(),0);
+            auto filename=utf8(wide(std::string(file.bytes.begin(),end)));
+            result["files"].push_back({{"id",file.id},{"peer",file.peer},{"sender",trusted.at(file.peer).at("name")},
+                {"name",filename},{"size",file.bytes.end()-end-1}});
+        }
         result["pendingPeer"]=pending&&!pending->confirmed ? pending->peer : "";
         result["pairSecondsRemaining"]=pending&&!pending->confirmed&&!pending->expired(now)
             ? (lan::PairLifetime-(now-pending->started)+999)/1000 : 0;
@@ -384,7 +526,8 @@ struct LanService::Impl
         {
             char ip[INET_ADDRSTRLEN]{}; InetNtopA(AF_INET,(void*)&p.address.sin_addr,ip,sizeof(ip));
             result["peers"].push_back({{"id",peer},{"name",p.name},{"address",ip},{"paired",trusted.contains(peer)},
-                {"verified",p.verified && now-p.verified<lan::PeerLifetime},{"online",true}});
+                {"verified",p.verified && now-p.verified<lan::PeerLifetime},{"online",true},
+                {"fileTransfer",transfers->hasSession(peer)}});
         }
         for(const auto &[peer,p]:trusted.items()) if(!peers.contains(peer))
             result["peers"].push_back({{"id",peer},{"name",p.at("name")},{"address",""},{"paired",true},{"verified",false},{"online",false}});

src/lan.h

@@ -5,6 +5,7 @@
 namespace ks
 {
 inline constexpr UINT LanInputReadyMessage=WM_APP+67, LanClipboardReadyMessage=WM_APP+68, LanClipboardPublishMessage=WM_APP+69;
+inline constexpr UINT LanFilesChangedMessage=WM_APP+70;
 struct LanClipboard {std::string peer,name,app;Bytes data;DWORD sequence{};};
 // Discovery, pairing and optional encrypted input within the resident process.
 class LanService

src/lan_clipboard.h

@@ -6,8 +6,8 @@
 
 namespace ks::lan
 {
-// Reliable bounded clipboard messages over the existing discovery socket.
-// Every datagram has a fresh directional AES-GCM key; no plaintext clipboard
+// Reliable bounded messages over the existing discovery socket.
+// Every datagram has a fresh directional AES-GCM key; no plaintext transfer
 // metadata or contents appear outside the encrypted CBOR body.
 class ClipboardExchange
 {
@@ -15,7 +15,7 @@ class ClipboardExchange
     struct Item {std::string id,app;Bytes bytes;};
     struct Sending {std::deque<std::shared_ptr<Item>> queue;size_t ack{};bool begun{};uint64_t last{},progress{};};
     struct Receiving {std::string id,app;Bytes bytes;size_t size{};uint64_t last{};DWORD sequence{};};
-    std::string local, boot=randomHex(16);
+    std::string local, type, domain, boot=randomHex(16);
     std::map<std::string,std::string> sessions;
     std::map<std::string,Sending> sending;
     std::map<std::string,Receiving> receiving;
@@ -31,33 +31,53 @@ class ClipboardExchange
     Json seal(const std::string &peer,const std::string &key,const Json &body)
     {
         auto nonce=randomHex(16);auto number=++nextPacket;
-        InputCipher cipher(mac(key,"KSwitcher clipboard v1|"+local+"|"+peer+"|"+boot+"|"+sessions.at(peer)+"|"+std::to_string(number)+"|"+nonce));
-        auto packet=envelope("clipboard",local);packet["to"]=peer;packet["nonce"]=nonce;packet["session"]=sessions.at(peer);packet["fromSession"]=boot;packet["number"]=number;
+        InputCipher cipher(mac(key,domain+local+"|"+peer+"|"+boot+"|"+sessions.at(peer)+"|"+std::to_string(number)+"|"+nonce));
+        auto packet=envelope(type,local);packet["to"]=peer;packet["nonce"]=nonce;packet["session"]=sessions.at(peer);packet["fromSession"]=boot;packet["number"]=number;
         packet["data"]=hex(cipher.encryptPayload(Json::to_cbor(body)));return packet;
     }
   public:
     struct Delivery {std::string peer,id,app;Bytes bytes;DWORD sequence{};};
     std::vector<Delivery> deliveries;
     std::string status="Clipboard sharing ready.";
-    explicit ClipboardExchange(std::string id):local(std::move(id)){}
+    explicit ClipboardExchange(std::string id,std::string messageType="clipboard")
+        :local(std::move(id)),type(std::move(messageType)),domain("KSwitcher "+type+" v1|")
+    {
+        if(type!="clipboard")status.clear();
+    }
     const std::string &session()const{return boot;}
     bool active()const{return !sending.empty();}
+    bool hasSession(const std::string &peer)const{return sessions.contains(peer);}
+    void cancel(const std::string &peer,const std::string &prefix)
+    {
+        auto found=sending.find(peer);
+        if(found==sending.end())return;
+        auto &s=found->second;
+        if(s.queue.empty())return;
+        bool reset=s.queue.front()->app.starts_with(prefix);
+        std::erase_if(s.queue,[&](const auto &item){return item->app.starts_with(prefix);});
+        if(reset){s.ack=0;s.begun=false;s.last=0;s.progress=GetTickCount64();}
+    }
     void peerSession(const std::string &peer,const std::string &value){
         if(!identifier(value))return;
         if(sessions.contains(peer)&&sessions.at(peer)!=value){
             auto found=sending.find(peer);if(found!=sending.end()){found->second.ack=0;found->second.begun=false;found->second.last=0;}
+            if(type!="clipboard"){
+                auto previous=receiving.find(peer);
+                if(previous!=receiving.end()){incomingBytes-=previous->second.size;receiving.erase(previous);}
+                receivedPackets.erase(peer);
+            }
         }
         sessions[peer]=value;
     }
     void queue(const std::vector<std::string> &peers,Bytes bytes,std::string app,uint64_t now)
     {
-        if(bytes.empty()||bytes.size()>Limit)throw std::runtime_error("LAN clipboard limit is 32 MiB.");
+        if(bytes.empty()||bytes.size()>Limit)throw std::runtime_error("LAN transfer limit is 32 MiB.");
         size_t total=bytes.size();std::set<const Item*> counted;
         for(auto &[peer,s]:sending)for(auto &item:s.queue)if(counted.insert(item.get()).second)total+=item->bytes.size();
         if(total>2*Limit)throw std::runtime_error("LAN clipboard queue is full.");
         auto item=std::make_shared<Item>(Item{randomHex(16),app.size()>128?std::string("Application"):app,std::move(bytes)});
-        for(auto &peer:peers){auto &s=sending[peer];if(s.queue.size()>=8)continue;if(s.queue.empty()){s.ack=0;s.begun=false;s.last=0;s.progress=now;}s.queue.push_back(item);}
-        if(!peers.empty())status="Sending clipboard to "+std::to_string(peers.size())+" paired computers...";
+        for(auto &peer:peers){auto &s=sending[peer];if(s.queue.size()>=8){if(type!="clipboard")throw std::runtime_error("LAN transfer queue is full.");continue;}if(s.queue.empty()){s.ack=0;s.begun=false;s.last=0;s.progress=now;}s.queue.push_back(item);}
+        if(!peers.empty())status=type=="clipboard"?"Sending clipboard to "+std::to_string(peers.size())+" paired computers...":"Sending…";
     }
     template<class Send>void poll(const Json &trusted,uint64_t now,Send send)
     {
@@ -67,7 +87,7 @@ class ClipboardExchange
         {
             auto &peer=it->first;auto &s=it->second;
             if(!trusted.contains(peer)||s.queue.empty()){it=sending.erase(it);continue;}
-            if(now-s.progress>30000){status="Clipboard transfer timed out.";it=sending.erase(it);continue;}
+            if(now-s.progress>30000){status="Transfer timed out.";it=sending.erase(it);continue;}
             if(sessions.contains(peer)&&(!s.last||now-s.last>=100))
             {
                 auto &item=*s.queue.front();auto key=trusted.at(peer).at("key").template get<std::string>();
@@ -80,14 +100,16 @@ class ClipboardExchange
             ++it;
         }
     }
-    template<class Send>void receive(const std::string &peer,const std::string &key,const Json &packet,uint64_t now,DWORD sequence,Send send)
+    template<class Send>void receive(const std::string &peer,const std::string &key,const Json &packet,uint64_t now,DWORD sequence,Send send,
+        size_t retained=0,size_t retainedBytes=0)
     {
         if(packet.value("session","")!=boot||!sessions.contains(peer)||packet.value("to","")!=local||!identifier(packet.value("nonce","")))return;
         auto senderBoot=packet.value("fromSession","");auto number=packet.value("number",uint64_t{});
         if(!identifier(senderBoot)||!number)return;
+        if(type!="clipboard"&&senderBoot!=sessions.at(peer))return;
         auto &seen=receivedPackets[peer];
         if((seen.contains(senderBoot)&&number<=seen.at(senderBoot))||(!seen.contains(senderBoot)&&seen.size()>=1024))return;
-        InputCipher cipher(mac(key,"KSwitcher clipboard v1|"+peer+"|"+local+"|"+senderBoot+"|"+boot+"|"+std::to_string(number)+"|"+packet.at("nonce").get<std::string>()));
+        InputCipher cipher(mac(key,domain+peer+"|"+local+"|"+senderBoot+"|"+boot+"|"+std::to_string(number)+"|"+packet.at("nonce").get<std::string>()));
         auto body=Json::from_cbor(cipher.decryptPayload(unhex(packet.at("data").get<std::string>())));
         seen[senderBoot]=number; // Retransmissions use new numbers; reordered old packets are retried.
         auto id=body.value("item","");if(!identifier(id))return;
@@ -100,7 +122,7 @@ class ClipboardExchange
             if(item.id!=id||offset>item.bytes.size()||offset<s.ack||offset>s.ack+Window*Chunk||(offset!=item.bytes.size()&&offset%Chunk))return;
             if(offset==s.ack&&s.begun)return;
             s.begun=true;s.ack=offset;s.progress=now;s.last=0;
-            if(offset==item.bytes.size()){s.queue.pop_front();s.ack=0;s.begun=false;status="Clipboard delivered.";}
+            if(offset==item.bytes.size()){s.queue.pop_front();s.ack=0;s.begun=false;status=type=="clipboard"?"Clipboard delivered.":"Transfer delivered.";}
             return;
         }
         for(auto &done:completed[peer])if(done.first==id){ack(done.second);return;}
@@ -111,7 +133,8 @@ class ClipboardExchange
             auto found=receiving.find(peer);
             if(found!=receiving.end()){if(found->second.id==id)ack(found->second.bytes.size());return;}
             size_t waiting=0;for(auto &d:deliveries)waiting+=d.bytes.size();
-            if(incomingBytes+waiting+size>2*Limit||deliveries.size()>=8)return;
+            if(incomingBytes+waiting+retainedBytes+size>2*Limit||deliveries.size()+retained>=8||
+               (type!="clipboard"&&receiving.size()+retained>=8))return;
             receiving.emplace(peer,Receiving{id,app,{},size,now,sequence});incomingBytes+=size;ack(0);return;
         }
         if(op!="chunk")return;
@@ -126,7 +149,7 @@ class ClipboardExchange
         {
             deliveries.push_back({peer,r.id,r.app,std::move(r.bytes),r.sequence});
             auto &done=completed[peer];done.push_back({id,r.size});if(done.size()>64)done.pop_front();
-            incomingBytes-=r.size;receiving.erase(found);status="Clipboard received.";
+            incomingBytes-=r.size;receiving.erase(found);status=type=="clipboard"?"Clipboard received.":"Transfer received.";
         }
     }
 };

src/lan_log.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "core.h"
+
+namespace ks
+{
+inline Bytes decodeLanLog(const std::string &hex)
+{
+    auto digit = [](char value) -> unsigned
+    {
+        if (value >= '0' && value <= '9') return value - '0';
+        if (value >= 'a' && value <= 'f') return value - 'a' + 10;
+        throw std::runtime_error("Invalid diagnostic log response.");
+    };
+    if (hex.size() % 2) throw std::runtime_error("Invalid diagnostic log response.");
+    Bytes bytes;
+    bytes.reserve(hex.size() / 2);
+    for (size_t i = 0; i < hex.size(); i += 2)
+        bytes.push_back(static_cast<unsigned char>(digit(hex[i]) * 16 + digit(hex[i + 1])));
+    return bytes;
+}
+}

src/main.cpp

@@ -2,6 +2,40 @@
 #include <shellapi.h>
 #include <shlobj.h>
 #include "configuration.h"
+#include "storage.h"
+
+namespace
+{
+constexpr std::wstring_view elevatedRestart = L"--elevated-restart=";
+
+bool shouldElevateOnLaunch()
+{
+    if (ks::isLocalBuild() || IsUserAnAdmin())
+        return false;
+    try
+    {
+        auto settings = ks::loadSettings(ks::dataDirectory() / L"settings.json", {});
+        if (!settings.autostart || !settings.elevatedAutostart)
+            return false;
+    }
+    catch (const std::exception &)
+    {
+        // The normal startup path handles unreadable settings and reports them.
+        return false;
+    }
+    try
+    {
+        // Let the resident explain the stale path before asking to elevate the repair.
+        return ks::staleAutostartPath(true).empty();
+    }
+    catch (const std::exception &)
+    {
+        // The elevated resident can retry reading the task.
+        return true;
+    }
+}
+}
+
 int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
 {
     CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
@@ -43,8 +77,28 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
         CoUninitialize();
         return result;
     }
+    if (arg.starts_with(elevatedRestart))
+    {
+        bool approved = false;
+        try
+        {
+            approved = argc == 2 && IsUserAnAdmin() && arg.substr(elevatedRestart.size()) == ks::currentUserSid();
+        }
+        catch (const std::exception &) {}
+        if (!approved)
+        {
+            MessageBoxW(nullptr, L"Administrator approval for the same Windows account is required.",
+                        L"KSwitcher", MB_OK | MB_ICONERROR);
+            LocalFree(argv);
+            CoUninitialize();
+            return 1;
+        }
+        arg.clear();
+    }
     HANDLE mutex = CreateMutexW(nullptr, TRUE, L"Local\\KSwitcher.Native.Singleton");
-    bool existing = GetLastError() == ERROR_ALREADY_EXISTS;
+    const DWORD mutexError = GetLastError();
+    // Opening an existing elevated instance's mutex can be denied to a normal process.
+    bool existing = mutexError == ERROR_ALREADY_EXISTS || (!mutex && mutexError == ERROR_ACCESS_DENIED);
     int cmd = ks::ShowHistory;
     if (arg == L"--capture")
         cmd = ks::Screenshot;
@@ -73,7 +127,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
             DWORD_PTR result{};
             SendMessageTimeoutW(window, WM_COPYDATA, 0, (LPARAM)&data, SMTO_ABORTIFHUNG, 1000, &result);
         }
-        CloseHandle(mutex);
+        if (mutex) CloseHandle(mutex);
         CoUninitialize();
         return 0;
     }
@@ -86,13 +140,36 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int)
     int result = 0;
     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")
-            app.startCommand = cmd;
-        result = app.execute();
+        if (argc == 1 && mutex && shouldElevateOnLaunch())
+        {
+            auto file = ks::executable();
+            auto parameters = std::wstring(elevatedRestart) + ks::currentUserSid();
+            // Let the elevated process acquire the singleton before it starts.
+            ReleaseMutex(mutex);
+            CloseHandle(mutex);
+            mutex = nullptr;
+            SHELLEXECUTEINFOW request{sizeof(request)};
+            request.lpVerb = L"runas";
+            request.lpFile = file.c_str();
+            request.lpParameters = parameters.c_str();
+            request.nShow = SW_HIDE;
+            if (!ShellExecuteExW(&request))
+            {
+                if (GetLastError() != ERROR_CANCELLED)
+                    throw std::runtime_error("Windows could not restart KSwitcher as administrator.");
+                result = 1;
+            }
+        }
+        else
+        {
+            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")
+                app.startCommand = cmd;
+            result = app.execute();
+        }
     }
     catch (const std::exception &e)
     {

src/mcp_logs.h

@@ -0,0 +1,113 @@
+#pragma once
+
+#include "../vendor/json.hpp"
+#include "lan_log.h"
+#include <iostream>
+
+namespace ks
+{
+inline int runLogMcp(const std::function<Bytes(const Bytes &)> &lan)
+{
+    using Json = nlohmann::json;
+    auto command = [&](const Json &request)
+    {
+        auto text = request.dump();
+        return Json::parse(lan(Bytes(text.begin(), text.end())));
+    };
+    const Json tools = Json::parse(R"({"tools":[
+        {"name":"list_log_computers","description":"List paired computers that support remote log downloads.","inputSchema":{"type":"object","properties":{}},"annotations":{"readOnlyHint":true}},
+        {"name":"read_diagnostic_log","description":"Read KSwitcher diagnostic log lines. Omit peer for the local computer. Use offset to page backward from the newest line.","inputSchema":{"type":"object","properties":{"peer":{"type":"string"},"previous":{"type":"boolean"},"lines":{"type":"integer","minimum":1,"maximum":500,"default":100},"offset":{"type":"integer","minimum":0,"default":0}}},"annotations":{"readOnlyHint":true}}
+    ]})");
+    std::string line;
+    while (std::getline(std::cin, line))
+    {
+        Json id, reply;
+        try
+        {
+            auto message = Json::parse(line);
+            if (!message.contains("id")) continue;
+            id = message.at("id");
+            auto method = message.at("method").get<std::string>();
+            if (method == "initialize")
+            {
+                auto version = message.at("params").value("protocolVersion", "");
+                if (version != "2025-03-26" && version != "2025-06-18" && version != "2025-11-25")
+                    version = "2025-11-25";
+                reply["result"] = {{"protocolVersion", version}, {"capabilities", {{"tools", Json::object()}}},
+                    {"serverInfo", {{"name", "kswitcher-logs"}, {"version", "1.0.0"}}}};
+            }
+            else if (method == "ping") reply["result"] = Json::object();
+            else if (method == "tools/list") reply["result"] = tools;
+            else if (method == "tools/call")
+            {
+                std::string output;
+                bool failed = false;
+                try
+                {
+                    auto params = message.at("params");
+                    auto arguments = params.value("arguments", Json::object());
+                    auto name = params.at("name").get<std::string>();
+                    if (name == "list_log_computers")
+                    {
+                        auto peers = Json::array();
+                        for (const auto &peer : command({{"action", "status"}}).at("peers").get<Json::array_t>())
+                            if (peer.value("paired", false))
+                                peers.push_back({{"id", peer.at("id")}, {"name", peer.at("name")},
+                                    {"available", peer.value("verified", false) && peer.value("fileTransfer", false)}});
+                        output = peers.dump();
+                    }
+                    else if (name == "read_diagnostic_log")
+                    {
+                        auto peer = arguments.value("peer", "");
+                        bool previous = arguments.value("previous", false);
+                        int lines = arguments.value("lines", 100);
+                        if (lines < 1 || lines > 500) throw std::runtime_error("lines must be between 1 and 500.");
+                        int offset = arguments.value("offset", 0);
+                        if (offset < 0) throw std::runtime_error("offset must be nonnegative.");
+                        if (peer.empty()) output = utf8(readDiagnosticLog(previous));
+                        else
+                        {
+                            auto request = command({{"action", "requestLog"}, {"peer", peer}, {"previous", previous}}).at("request");
+                            for (;;)
+                            {
+                                auto result = command({{"action", "takeLog"}, {"request", request}});
+                                auto state = result.at("state").get<std::string>();
+                                if (state == "ready")
+                                {
+                                    auto bytes = decodeLanLog(result.at("logHex"));
+                                    output.assign(bytes.begin(), bytes.end());
+                                    break;
+                                }
+                                if (state == "denied") throw std::runtime_error("Remote log downloads are disabled on that computer.");
+                                if (state == "unavailable") throw std::runtime_error("The remote log is unavailable.");
+                                if (state != "waiting") throw std::runtime_error("The remote log download timed out.");
+                                Sleep(250);
+                            }
+                        }
+                        auto previousLine = [&](size_t end)
+                        {
+                            if (!end) return size_t{};
+                            if (output[end - 1] == '\n') --end;
+                            return end ? output.rfind('\n', end - 1) + 1 : size_t{};
+                        };
+                        size_t end = output.size();
+                        while (offset-- > 0 && end) end = previousLine(end);
+                        size_t start = end;
+                        while (lines-- > 0 && start) start = previousLine(start);
+                        output = output.substr(start, end - start);
+                    }
+                    else throw std::runtime_error("Unknown tool.");
+                }
+                catch (const std::exception &error) { output = error.what(); failed = true; }
+                reply["result"] = {{"content", Json::array({{{"type", "text"}, {"text", output}}})}, {"isError", failed}};
+            }
+            else reply["error"] = {{"code", -32601}, {"message", "Method not found"}};
+        }
+        catch (const std::exception &) { reply["error"] = {{"code", -32600}, {"message", "Invalid request"}}; }
+        reply["jsonrpc"] = "2.0";
+        reply["id"] = id;
+        std::cout << reply.dump(-1, ' ', false, Json::error_handler_t::replace) << std::endl;
+    }
+    return 0;
+}
+}

src/mouse_buttons.h

@@ -6,7 +6,54 @@ namespace ks
 {
 inline constexpr const wchar_t *MouseButtonNames[] = {L"Left", L"Right", L"Middle", L"XButton1", L"XButton2"};
 inline constexpr const wchar_t *MouseEvents[] = {L"Left", L"Right", L"Middle", L"XButton1", L"XButton2",
-                                                L"Double left", L"Double right", L"Double middle"};
+                                                L"Double left", L"Double right", L"Double middle",
+                                                L"Wheel up", L"Wheel down", L"Wheel left", L"Wheel right"};
+inline constexpr int BuiltInMouseEventCount = 8;
+
+inline int mouseWheelEvent(UINT message, SHORT delta)
+{
+    if (!delta) return -1;
+    if (message == WM_MOUSEWHEEL) return BuiltInMouseEventCount + (delta < 0);
+    if (message == WM_MOUSEHWHEEL) return BuiltInMouseEventCount + 2 + (delta > 0);
+    return -1;
+}
+
+inline int rawMouseSignal(const RAWMOUSE &mouse)
+{
+    constexpr USHORT downFlags[] = {RI_MOUSE_LEFT_BUTTON_DOWN, RI_MOUSE_RIGHT_BUTTON_DOWN,
+                                    RI_MOUSE_MIDDLE_BUTTON_DOWN, RI_MOUSE_BUTTON_4_DOWN, RI_MOUSE_BUTTON_5_DOWN};
+    int signal = -1;
+    for (int button = 0; button < static_cast<int>(std::size(downFlags)); ++button)
+    {
+        if (!(mouse.usButtonFlags & downFlags[button])) continue;
+        if (signal >= 0) return -1;
+        signal = button;
+    }
+    const auto wheel = mouse.usButtonFlags & (RI_MOUSE_WHEEL | RI_MOUSE_HWHEEL);
+    if (!wheel) return signal;
+    if (signal >= 0 || wheel == (RI_MOUSE_WHEEL | RI_MOUSE_HWHEEL)) return -1;
+    return mouseWheelEvent(wheel == RI_MOUSE_WHEEL ? WM_MOUSEWHEEL : WM_MOUSEHWHEEL,
+                          static_cast<SHORT>(mouse.usButtonData));
+}
+
+inline int mouseWheelSteps(int &remainder, SHORT delta)
+{
+    const int total = remainder + std::abs(static_cast<int>(delta));
+    remainder = total % WHEEL_DELTA;
+    return total / WHEEL_DELTA;
+}
+
+inline bool mouseEventEnabled(const Settings &settings, int event)
+{
+    return event >= 0 && event < static_cast<int>(std::size(MouseEvents)) &&
+           (event < BuiltInMouseEventCount || settings.customMouseEvents.contains(MouseEvents[event]));
+}
+
+inline std::wstring mouseEventName(const Settings &settings, int event)
+{
+    auto name = settings.customMouseEvents.find(MouseEvents[event]);
+    return name == settings.customMouseEvents.end() ? MouseEvents[event] : name->second;
+}
 inline constexpr const wchar_t *MouseActions[] = {L"Standard behavior", L"Send key combination", L"Back", L"Forward",
                                                  L"Volume up", L"Volume down", L"Mute", L"Launch application"};
 inline constexpr wchar_t GlobalMouseProfile[] = L"*";
@@ -67,6 +114,7 @@ inline const MouseAction *effectiveMouseAction(const Settings &settings, const s
                                                bool foreground = true, bool *profileScoped = nullptr)
 {
     if (profileScoped) *profileScoped = false;
+    if (!mouseEventEnabled(settings, event)) return nullptr;
     auto *action = mouseBinding(settings, app, event);
     if (!action)
     {

src/paste_probe.h

@@ -90,15 +90,22 @@ class PasteProbe
             return {};
         }
         IUIAutomationElement *focused{};
-        BOOL same = FALSE;
-        if (SUCCEEDED(automation->GetFocusedElement(&focused)) && focused)
+        if (FAILED(automation->GetFocusedElement(&focused)) || !focused)
         {
-            automation->CompareElements(element, focused, &same);
+            if (focused) focused->Release();
+            status = L"accessibility-focus-unavailable";
+            return {};
+        }
+        BOOL same = FALSE;
+        if (FAILED(automation->CompareElements(element, focused, &same)))
+        {
+            focused->Release();
+            status = L"accessibility-focus-comparison-failed";
+            return {};
         }
         if (!same)
         {
-            if (focused)
-                focused->Release();
+            focused->Release();
             status = L"focused-control-changed";
             return {};
         }

src/platform.cpp

@@ -816,6 +816,13 @@ void diagnosticOperation(const std::string &json)
     auto record = nlohmann::json::parse(json);
     if (!record.value("problem", true))
     {
+        if (record.value("elapsedMs", 0ULL) >= 2000 && record.value("outcome", "") == "Paste verified")
+        {
+            auto summary = record;
+            for (auto field : {"original", "expected", "actual", "selectionExpected"})
+                summary.erase(field);
+            log(L"Operation " + wide(summary.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace)));
+        }
         // Keep successful operations only in the bounded, short-lived context.
         // They are persisted with a subsequent failure, never as standalone rows.
         diagnosticBuffer.record(L"Completed operation " + wide(record.dump(-1, ' ', true,

src/platform.h

@@ -8,7 +8,7 @@
 
 namespace ks
 {
-inline std::wstring localBuildTitle(const std::wstring &title)
+inline bool isLocalBuild()
 {
     static const bool development=[] {
         wchar_t path[32768]{};
@@ -16,7 +16,11 @@ inline std::wstring localBuildTitle(const std::wstring &title)
         std::error_code error;
         return std::filesystem::exists(std::filesystem::path(path).parent_path()/L".local-dev",error);
     }();
-    return development?title+L" [LOCAL DEV]":title;
+    return development;
+}
+inline std::wstring localBuildTitle(const std::wstring &title)
+{
+    return isLocalBuild()?title+L" [LOCAL DEV]":title;
 }
 using Bytes = std::vector<unsigned char>;
 struct Format
@@ -72,6 +76,8 @@ Bytes readFile(const std::filesystem::path &, size_t limit);
 Bytes protect(const Bytes &);
 Bytes unprotect(const Bytes &);
 void setAutostart(bool, bool elevated = false);
+std::wstring staleAutostartPath(bool elevated);
+void repairAutostartPath(bool elevated);
 std::wstring currentUserSid();
 void configureAutostart(int mode);
 std::wstring executable();

src/screenshot.cpp

@@ -180,6 +180,7 @@ struct Capture
     LineStyle lineStyle=LineStyle::Solid;
     int smoothing=25;
     bool smoothingDrag=false;
+    bool smoothingPreferenceDirty=false;
     LineEnds arrowEnds=LineEnds::End, freehandEnds=LineEnds::None;
     COLORREF currentColor=RGB(225,42,50);
     COLORREF customColors[16]{};
@@ -221,8 +222,24 @@ struct Capture
     MarkPart hoveredPart=MarkPart::None;
     std::wstring statusText;
     std::filesystem::path savedPath;
-    explicit Capture(ScreenshotHost &a) : app(a), autoOpenEditor(a.autoOpenEditor) {}
+    explicit Capture(ScreenshotHost &a) : app(a), autoOpenEditor(a.autoOpenEditor)
+    {
+        if(a.smoothingPreference.empty()) return;
+        try {
+            auto stored=readFile(a.smoothingPreference,1);
+            if(stored.size()==1 && stored.front()<=100) smoothing=stored.front();
+        } catch(const std::exception &) {} // Missing or unreadable preference uses the default.
+    }
+    void saveSmoothingPreference()
+    {
+        if(!smoothingPreferenceDirty || app.smoothingPreference.empty()) return;
+        try {
+            atomicWrite(app.smoothingPreference,Bytes{static_cast<unsigned char>(smoothing)});
+            smoothingPreferenceDirty=false;
+        } catch(const std::exception &) {} // A failed preference write must not interrupt editing.
+    }
     ~Capture() {
+        saveSmoothingPreference();
         if(pencilCursor) DestroyCursor(pencilCursor);
         for(auto cursor:drawingCursors) if(cursor) DestroyCursor(cursor);
         if (font) DeleteObject(font);
@@ -1170,8 +1187,14 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                     setScreenshotSmoothing(c->marks[c->selected],amount);
                     resolveScreenshotLinks(c->marks);
                     c->smoothingDrag=LOWORD(wp)==TB_THUMBTRACK;
-                } else if(!pencil) c->smoothing=amount;
-                if(LOWORD(wp)!=TB_THUMBTRACK) c->smoothingDrag=false;
+                } else if(!pencil && c->smoothing!=amount) {
+                    c->smoothing=amount;
+                    c->smoothingPreferenceDirty=true;
+                }
+                if(LOWORD(wp)!=TB_THUMBTRACK) {
+                    c->smoothingDrag=false;
+                    c->saveSmoothingPreference();
+                }
                 syncLineOptions(w,*c); InvalidateRect(w,nullptr,FALSE);
                 return 0;
             }
@@ -1185,7 +1208,11 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             if (c->dragging) return 0;
             if(LOWORD(wp)==44) {
                 int amount=int(SendDlgItemMessageW(w,41,TBM_GETPOS,0,0));
-                c->smoothing=amount;
+                if(c->smoothing!=amount) {
+                    c->smoothing=amount;
+                    c->smoothingPreferenceDirty=true;
+                }
+                c->saveSmoothingPreference();
                 if(std::any_of(c->marks.begin(),c->marks.end(),[&](const Mark &m){return m.freehand && m.smoothing!=amount;})) {
                     c->remember(c->marks);
                     for(auto &mark:c->marks) if(mark.freehand) setScreenshotSmoothing(mark,amount);

src/screenshot.h

@@ -9,6 +9,7 @@ struct ScreenshotHost {
     unsigned windows{};
     bool (*notify)(const Clip &){};
     bool autoOpenEditor = false;
+    std::filesystem::path smoothingPreference;
 };
 inline constexpr UINT ScreenshotRequest=WM_APP+71, ScreenshotIdle=WM_APP+72;
 void showScreenshot(ScreenshotHost &);

src/screenshot_main.cpp

@@ -110,6 +110,8 @@ int WINAPI wWinMain(HINSTANCE instance,HINSTANCE,PWSTR,int)
     InitCommonControlsEx(&controls);
     ks::ScreenshotHost host{instance};
     host.notify=ks::notifyScreenshot;
+    try { host.smoothingPreference=ks::dataDirectory()/L"screenshot-smoothing"; }
+    catch(const std::exception &) {} // The editor can still run without local preferences.
     WNDCLASSW cls{}; cls.hInstance=instance; cls.lpfnWndProc=controller; cls.lpszClassName=ControllerClass;
     RegisterClassW(&cls);
     host.window=CreateWindowW(ControllerClass,L"KSwitcher Screenshot",0,0,0,0,0,nullptr,nullptr,instance,&host);

src/storage.cpp

@@ -108,6 +108,15 @@ static void validateMouseProfileConflicts(const Settings &s)
 
 void validateSettings(const Settings &s)
 {
+    std::set<std::wstring> eventNames;
+    for (int event = 0; event < BuiltInMouseEventCount; ++event) eventNames.insert(lower(MouseEvents[event]));
+    for (const auto &[signal, name] : s.customMouseEvents)
+    {
+        if (std::find(std::begin(MouseEvents) + BuiltInMouseEventCount, std::end(MouseEvents), signal) == std::end(MouseEvents) ||
+            name.empty() || name.size() > 80 || name.find_first_of(L"\r\n\t") != name.npos ||
+            !eventNames.insert(lower(name)).second)
+            throw std::runtime_error("Enter a unique event name (up to 80 characters) for a supported signal.");
+    }
     if (s.mouseBindings.size() > 1000) throw std::runtime_error("Too many mouse profiles.");
     for (const auto &[app, bindings] : s.mouseBindings)
     {
@@ -124,7 +133,8 @@ void validateSettings(const Settings &s)
             if (action.applications.size() > 1000 ||
                 !std::all_of(action.applications.begin(), action.applications.end(), validMouseApplication))
                 throw std::runtime_error("Enter valid target application executable names.");
-            if (std::find(std::begin(MouseEvents), std::end(MouseEvents), event) == std::end(MouseEvents) ||
+            const auto signal = std::find(std::begin(MouseEvents), std::end(MouseEvents), event);
+            if (!mouseEventEnabled(s, static_cast<int>(signal - std::begin(MouseEvents))) ||
                 static_cast<size_t>(action.type) >= std::size(MouseActions))
                 throw std::runtime_error("Invalid mouse event or action.");
             if (isMouseVolumeStep(action.type) && (action.volumeStep < 1 || action.volumeStep > 100))
@@ -243,10 +253,12 @@ void validateSettings(const Settings &s)
                               L"абвгдеёжзийклмнопрстуфхцчшщъыьэюя"})
             valid |= !from.empty() && !to.empty() && from.size() <= 32 && to.size() <= 32 &&
                      from == lower(from) && to == lower(to) && from != to &&
-                     from.find_first_not_of(alphabet) == from.npos &&
+                     validAutoReplacementSource(from, alphabet) &&
                      validAutoCorrection(to, alphabet);
         if (!valid)
-            throw std::runtime_error("Use a lowercase typo of 1-32 letters and a different correction of 1-32 characters in the same language. Single spaces between words and apostrophes between letters are allowed.");
+            throw std::runtime_error("Invalid replacement: " + utf8(from.substr(0, 32)) + "=" +
+                utf8(to.substr(0, 32)) + "\n\nUse one lowercase word of 1-32 characters. The typo may include "
+                "digits and internal apostrophes. Use a different correction of 1-32 characters in the same language.");
     }
     for (const auto &[language, words] : s.autoWords)
     {
@@ -382,6 +394,13 @@ Settings decodeSettings(const Bytes &bytes, const std::vector<Layout> &layouts)
             s.appLanguageSets[wide(name)] = std::move(set);
         }
     }
+    if (j.contains("customMouseEvents"))
+    {
+        const auto &events = j.at("customMouseEvents");
+        if (!events.is_object()) throw std::runtime_error("Invalid custom mouse events.");
+        for (const auto &[signal, name] : events.items())
+            s.customMouseEvents.emplace(wide(signal), wide(name.get<std::string>()));
+    }
     if (j.contains("mouseBindings"))
     {
         const auto &profiles = j.at("mouseBindings");
@@ -520,6 +539,8 @@ Bytes encodeSettings(const Settings &s)
         for (const auto &id : set.languages) item["languages"].push_back(utf8(id));
         for (const auto &app : set.applications) item["applications"].push_back(utf8(app));
     }
+    j["customMouseEvents"] = Json::object();
+    for (const auto &[signal, name] : s.customMouseEvents) j["customMouseEvents"][utf8(signal)] = utf8(name);
     j["mouseBindings"] = Json::object();
     for (const auto &[app, bindings] : s.mouseBindings)
     {

src/sync.cpp

@@ -216,7 +216,20 @@ std::unique_ptr<SyncProvider> makeSyncProvider(const SyncConfig &c, SyncTranspor
 {
     return std::make_unique<OpenBao>(c, std::move(transport));
 }
-namespace { Json canonicalProfile(Json); }
+namespace {
+Json canonicalProfile(Json);
+constexpr const char *PreviouslyLocalSettings[] = {
+    "startWithSystem", "autostartAsAdministrator", "tesseractPath", "useTesseract",
+    "historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock",
+    "appLanguageSets", "mouseBindings", "disabledMouseProfiles", "mouseProfileApplications", "customMouseEvents"
+};
+
+void preserveMissingSettings(Json &profile, const Json &fallback)
+{
+    for (auto key : PreviouslyLocalSettings)
+        if (!profile.contains(key) && fallback.contains(key)) profile[key] = fallback.at(key);
+}
+}
 Bytes sharedSyncSettings(const Settings &s)
 {
     auto j = parse(encodeSettings(s));
@@ -226,14 +239,12 @@ Bytes sharedSyncSettings(const Settings &s)
     std::sort(bindings.begin(), bindings.end(), [](const Json &a, const Json &b) {
         return a.at("layoutId").get<std::string>() < b.at("layoutId").get<std::string>();
     });
-    for (auto key : {"startWithSystem", "autostartAsAdministrator", "tesseractPath", "useTesseract",
-        "historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock",
-        "appLanguageSets", "mouseBindings", "disabledMouseProfiles", "mouseProfileApplications"}) j.erase(key);
     return bytes(canonicalProfile(j));
 }
 Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const std::vector<Layout> &layouts, bool keepLocalLayouts)
 {
     auto j = parse(shared), original = parse(encodeSettings(local));
+    preserveMissingSettings(j, original);
     if (!j.contains("snippetTombstones")) j["snippetTombstones"] = Json::array();
     if (!j.contains("autoCorrectReplace")) j["autoCorrectReplace"] = false;
     if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false;
@@ -245,7 +256,7 @@ Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const s
     if (!j.is_object() || j.value("format", "") != "kswitcher-settings" || j.value("schemaVersion", 0) != 1)
         throw std::runtime_error("Unsupported synchronized settings format.");
     for (auto it = j.begin(); it != j.end(); ++it)
-        if (!allowed.contains(it.key())) throw std::runtime_error("Remote profile contains unsupported or local-only fields.");
+        if (!allowed.contains(it.key())) throw std::runtime_error("Remote profile contains unsupported fields.");
     if (j.size() != allowed.size()) throw std::runtime_error("Remote profile is incomplete.");
     std::set<std::string> installed;
     for (const auto &layout : layouts) installed.insert(utf8(layout.id));
@@ -307,7 +318,9 @@ SyncResult synchronize(SyncProvider &provider, const Bytes &base, const Bytes &l
     else
     {
         auto profile = parse(action == SyncAction::Download ? remote.settings : mergeLocal);
-        if (!profile.contains("chatCycles")) profile["chatCycles"] = parse(local).value("chatCycles", Json::object());
+        const auto current = parse(local);
+        if (!profile.contains("chatCycles")) profile["chatCycles"] = current.value("chatCycles", Json::object());
+        preserveMissingSettings(profile, current);
         auto selected = bytes(normalizeProfile(profile));
         merged = {selected, selected, selected, {}};
     }

src/sync_merge.inl

@@ -72,6 +72,14 @@ Json flatProfile(Json j)
             else ++profile;
         }
     }
+    if (j.contains("customMouseEvents"))
+    {
+        auto &events = j.at("customMouseEvents");
+        for (auto event = events.begin(); event != events.end();)
+            if (event.value().is_null()) event = events.erase(event);
+            else ++event;
+        if (events.is_null()) j.erase("customMouseEvents");
+    }
     Json snippets = Json::array(), deleted = Json::array();
     for (const auto &[id, item] : j.at("snippets").items())
     {
@@ -215,6 +223,10 @@ SyncMerge mergeSyncProfile(const Bytes &base, const Bytes &local, const Bytes &r
     // client's chat profiles until both copies understand this field.
     if (!remoteProfile.contains("chatCycles")) remoteProfile["chatCycles"] = localProfile.value("chatCycles", Json::object());
     if (!localProfile.contains("chatCycles")) localProfile["chatCycles"] = remoteProfile.at("chatCycles");
+    // Older server backups omit the newly synchronized fields. An explicit
+    // empty value from a current client still means the user cleared it.
+    preserveMissingSettings(remoteProfile, localProfile);
+    preserveMissingSettings(localProfile, remoteProfile);
     auto l = treeProfile(localProfile), r = treeProfile(remoteProfile);
     // With no common history, union independent entries; differing scalar values
     // remain on their respective devices until the user resolves the conflict.

src/ui.cpp

@@ -1,6 +1,7 @@
 #include "lan_layout.h"
 #include "../resources/resource.h"
 #include "app.h"
+#include "lan_log.h"
 #include "history_preview.h"
 #include "ui_scroll.h"
 #include "configuration.h"
@@ -270,6 +271,53 @@ LRESULT CALLBACK layoutProc(HWND w, UINT msg, WPARAM wp, LPARAM lp, UINT_PTR, DW
     }
     return DefSubclassProc(w, msg, wp, lp);
 }
+LRESULT CALLBACK listHeaderDraw(HWND list, UINT message, WPARAM wp, LPARAM lp, UINT_PTR, DWORD_PTR)
+{
+    if (message != WM_NOTIFY) return DefSubclassProc(list, message, wp, lp);
+    const auto *notice = reinterpret_cast<const NMHDR *>(lp);
+    auto header = ListView_GetHeader(list);
+    if (notice->hwndFrom != header || notice->code != NM_CUSTOMDRAW)
+        return DefSubclassProc(list, message, wp, lp);
+    const auto &draw = *reinterpret_cast<const NMCUSTOMDRAW *>(lp);
+    auto background = GetSysColorBrush(COLOR_3DFACE);
+    auto border = GetSysColorBrush(COLOR_3DSHADOW);
+    if (draw.dwDrawStage == CDDS_PREPAINT)
+    {
+        FillRect(draw.hdc, &draw.rc, background);
+        return CDRF_NOTIFYITEMDRAW | CDRF_NOTIFYPOSTPAINT;
+    }
+    if (draw.dwDrawStage == CDDS_ITEMPREPAINT)
+    {
+        RECT cell = draw.rc;
+        FillRect(draw.hdc, &cell, background);
+        RECT divider{cell.right - 1, cell.top, cell.right, cell.bottom};
+        FillRect(draw.hdc, &divider, border);
+        wchar_t title[64]{};
+        HDITEMW item{HDI_TEXT | HDI_FORMAT};
+        item.pszText = title;
+        item.cchTextMax = std::size(title);
+        Header_GetItem(header, static_cast<int>(draw.dwItemSpec), &item);
+        cell.left += scale(list, 5);
+        cell.right -= scale(list, 5);
+        int dc = SaveDC(draw.hdc);
+        auto font = SendMessageW(header, WM_GETFONT, 0, 0);
+        if (font) SelectObject(draw.hdc, reinterpret_cast<HFONT>(font));
+        SetTextColor(draw.hdc, GetSysColor(COLOR_BTNTEXT));
+        SetBkMode(draw.hdc, TRANSPARENT);
+        UINT alignment = (item.fmt & HDF_RIGHT) ? DT_RIGHT : (item.fmt & HDF_CENTER) ? DT_CENTER : DT_LEFT;
+        DrawTextW(draw.hdc, title, -1, &cell, alignment | DT_SINGLELINE | DT_VCENTER | DT_END_ELLIPSIS | DT_NOPREFIX);
+        RestoreDC(draw.hdc, dc);
+        return CDRF_SKIPDEFAULT;
+    }
+    if (draw.dwDrawStage == CDDS_POSTPAINT)
+    {
+        RECT line{};
+        GetClientRect(header, &line);
+        line.top = line.bottom - 1;
+        FillRect(draw.hdc, &line, border);
+    }
+    return CDRF_DODEFAULT;
+}
 HWND control(HWND parent, const wchar_t *cls, const wchar_t *title, DWORD style, int id, int x, int y,
              int width, int height)
 {
@@ -278,6 +326,8 @@ HWND control(HWND parent, const wchar_t *cls, const wchar_t *title, DWORD style,
                              scale(parent, width), scale(parent, height), parent, (HMENU)(INT_PTR)id,
                              GetModuleHandleW(nullptr), nullptr);
     SendMessageW(w, WM_SETFONT, (WPARAM)GetPropW(parent, L"Font"), TRUE);
+    if (wcscmp(cls, WC_LISTVIEWW) == 0 && (style & LVS_TYPEMASK) == LVS_REPORT && !(style & LVS_NOCOLUMNHEADER))
+        SetWindowSubclass(w, listHeaderDraw, 3, 0);
     if(wcscmp(cls,L"LISTBOX")==0 || wcscmp(cls,WC_LISTVIEWW)==0 ||
        wcscmp(cls,L"COMBOBOX")==0 || (wcscmp(cls,L"EDIT")==0 && (style&ES_MULTILINE)))
         enableWheelBatching(w,wcscmp(cls,L"LISTBOX")==0);
@@ -1087,6 +1137,13 @@ LRESULT CALLBACK historyProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 
 #endif
 #ifndef KS_RESIDENT_APP
+constexpr int SnippetsPage = 4, SaveSnippets = 318;
+struct SnippetView
+{
+    App *app{};
+    std::vector<Snippet> snippets, saved;
+    int selection = -1;
+};
 struct SettingsView
 {
     App *app{};
@@ -1099,7 +1156,11 @@ struct SettingsView
     std::vector<std::wstring> mouseProfiles;
     unsigned mouseEvents{}, rawMouseEvents{};
     bool rawMouseRegistered{};
+    SnippetView snippets;
 };
+bool snippetCommand(HWND, SnippetView *, WPARAM, bool embedded);
+bool confirmSnippetClose(HWND, SnippetView *);
+void refreshSnippetDraft(HWND, SnippetView *);
 void updateSettingsState(HWND w, SettingsView *v);
 void selectSettingsPage(HWND w, SettingsView *v)
 {
@@ -1116,6 +1177,8 @@ struct ChatLanguagesView
     Settings draft;
     int selection = -1;
     bool dirty{};
+    bool updatingList{};
+    std::wstring search;
 };
 void collectChatLanguages(HWND w, ChatLanguagesView *v)
 {
@@ -1130,9 +1193,17 @@ void collectChatLanguages(HWND w, ChatLanguagesView *v)
 }
 void fillChatLanguages(HWND w, ChatLanguagesView *v)
 {
-    int index = (int)SendDlgItemMessageW(w, 710, LB_GETCURSEL, 0, 0);
-    if (index < 0 || index >= (int)v->keys.size()) return;
-    v->selection = index;
+    int index = v->selection;
+    EnableWindow(GetDlgItem(w, 711), index >= 0);
+    EnableWindow(GetDlgItem(w, IDOK), index >= 0);
+    if (index < 0)
+    {
+        SendDlgItemMessageW(w, 711, LB_SETSEL, FALSE, -1);
+        EnableWindow(GetDlgItem(w, 713), FALSE);
+        value(w, 712, v->keys.empty() ? L"Open a chat, then reopen this dialog to add it." :
+            L"No contacts match your search.");
+        return;
+    }
     const auto &draft = v->draft;
     auto saved = draft.chatCycles.find(v->keys[index]);
     const auto &cycle = saved == draft.chatCycles.end() ? draft.cycle : saved->second;
@@ -1146,26 +1217,103 @@ void fillChatLanguages(HWND w, ChatLanguagesView *v)
         L"Chat profile. Select languages, or remove it to use the defaults.");
     EnableWindow(GetDlgItem(w, 713), saved != draft.chatCycles.end());
 }
+void selectChatRow(HWND list, int index)
+{
+    int row = -1;
+    if (index >= 0)
+    {
+        LVFINDINFOW find{LVFI_PARAM};
+        find.lParam = index;
+        row = ListView_FindItem(list, -1, &find);
+    }
+    ListView_SetItemState(list, -1, 0, LVIS_SELECTED | LVIS_FOCUSED);
+    if (row >= 0)
+    {
+        ListView_SetItemState(list, row, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
+        ListView_EnsureVisible(list, row, FALSE);
+    }
+}
+void filterChatRows(HWND w, ChatLanguagesView *v)
+{
+    auto list = GetDlgItem(w, 710);
+    auto search = lower(v->search);
+    int selection = -1;
+    v->updatingList = true;
+    SendMessageW(list, WM_SETREDRAW, FALSE, 0);
+    ListView_DeleteAllItems(list);
+    for (size_t i = 0; i < v->keys.size(); ++i)
+    {
+        const auto &key = v->keys[i];
+        auto contact = key.substr(key.find(L'\n') + 1);
+        if (lower(contact).find(search) == std::wstring::npos) continue;
+        auto app = key.starts_with(L"telegram\n") ? L"Telegram" :
+            key.starts_with(L"telegram-web\n") ? L"Telegram Web" :
+            key.starts_with(L"viber\n") ? L"Viber (inactive)" : L"Teams";
+        LVITEMW item{LVIF_TEXT | LVIF_PARAM};
+        item.iItem = ListView_GetItemCount(list);
+        item.pszText = contact.data();
+        item.lParam = static_cast<LPARAM>(i);
+        int row = ListView_InsertItem(list, &item);
+        if (row < 0) continue;
+        ListView_SetItemText(list, row, 1, const_cast<wchar_t *>(app));
+        if (selection < 0 || static_cast<int>(i) == v->selection) selection = static_cast<int>(i);
+    }
+    selectChatRow(list, selection);
+    SendMessageW(list, WM_SETREDRAW, TRUE, 0);
+    InvalidateRect(list, nullptr, TRUE);
+    v->updatingList = false;
+    v->selection = selection;
+    fillChatLanguages(w, v);
+}
 LRESULT CALLBACK chatLanguagesProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 {
     auto *v = (ChatLanguagesView *)GetWindowLongPtrW(w, GWLP_USERDATA);
     if (!v) return DefWindowProcW(w, msg, wp, lp);
     try
     {
+        if (msg == WM_NOTIFY && !v->updatingList)
+        {
+            auto *change = reinterpret_cast<const NMLISTVIEW *>(lp);
+            if (change->hdr.idFrom == 710 && change->hdr.code == LVN_ITEMCHANGED &&
+                (change->uNewState & LVIS_SELECTED) && !(change->uOldState & LVIS_SELECTED))
+            {
+                int selected = static_cast<int>(change->lParam);
+                if (selected == v->selection) return 0;
+                try { collectChatLanguages(w, v); }
+                catch (...)
+                {
+                    v->updatingList = true;
+                    selectChatRow(change->hdr.hwndFrom, v->selection);
+                    v->updatingList = false;
+                    throw;
+                }
+                v->selection = selected;
+                fillChatLanguages(w, v);
+                return 0;
+            }
+        }
         if (msg == WM_COMMAND)
         {
             int id = LOWORD(wp);
             if (id == 711 && HIWORD(wp) == LBN_SELCHANGE) { v->dirty = true; return 0; }
-            if (id == 710 && HIWORD(wp) == LBN_SELCHANGE)
+            if (id == 714 && HIWORD(wp) == EN_CHANGE && !v->updatingList)
             {
                 try { collectChatLanguages(w, v); }
-                catch (...) { SendDlgItemMessageW(w, 710, LB_SETCURSEL, v->selection, 0); throw; }
-                fillChatLanguages(w, v);
+                catch (...)
+                {
+                    v->updatingList = true;
+                    value(w, 714, v->search);
+                    v->updatingList = false;
+                    throw;
+                }
+                v->search = value(w, 714);
+                filterChatRows(w, v);
                 return 0;
             }
             if (id == IDOK || id == 713)
             {
-                int selected = (int)SendDlgItemMessageW(w, 710, LB_GETCURSEL, 0, 0);
+                int selected = v->selection;
+                if (id == IDOK && selected < 0) return 0;
                 if (selected < 0 || selected >= (int)v->keys.size())
                     throw std::runtime_error("Open a Telegram or Teams chat, then reopen this dialog.");
                 if (id == 713)
@@ -1184,7 +1332,14 @@ LRESULT CALLBACK chatLanguagesProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             if (id == IDCANCEL) { DestroyWindow(w); return 0; }
         }
         if (msg == WM_CLOSE) { DestroyWindow(w); return 0; }
-        if (msg == WM_DPICHANGED) { resizeForDpi(w, wp, lp); return 0; }
+        if (msg == WM_DPICHANGED)
+        {
+            resizeForDpi(w, wp, lp);
+            auto list = GetDlgItem(w, 710);
+            ListView_SetColumnWidth(list, 0, scale(w, 442));
+            ListView_SetColumnWidth(list, 1, scale(w, 140));
+            return 0;
+        }
         if (msg == WM_NCDESTROY)
         {
             EnableWindow(v->parent, TRUE);
@@ -1210,19 +1365,25 @@ void showChatLanguages(HWND parent, SettingsView *settings)
         if (!key.empty()) data.keys.insert(std::move(key));
         return TRUE;
     }, (LPARAM)&context);
+    INITCOMMONCONTROLSEX controls{sizeof(controls), ICC_LISTVIEW_CLASSES};
+    InitCommonControlsEx(&controls);
     HWND w = makeWindow(*settings->app, L"KSwitcher.ChatLanguages", L"Languages for a chat", chatLanguagesProc, 640, 524);
     auto *v = new ChatLanguagesView{parent, settings, {keys.begin(), keys.end()}};
     v->draft = settings->draft;
+    v->updatingList = true;
     SetWindowLongPtrW(w, GWLP_HWNDPARENT, (LONG_PTR)parent);
     SetWindowLongPtrW(w, GWLP_USERDATA, (LONG_PTR)v);
-    label(w, L"Telegram / Telegram Web (Chrome) / Teams; Viber inactive", 18, 16, 604);
-    control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER,
-            710, 18, 44, 604, 140);
-    for (const auto &key : v->keys)
+    label(w, L"&Find contact", 18, 19, 106);
+    edit(w, 714, 130, 14, 492);
+    auto list = control(w, WC_LISTVIEWW, L"", WS_TABSTOP | WS_BORDER | LVS_REPORT | LVS_SINGLESEL |
+        LVS_SHOWSELALWAYS | LVS_NOSORTHEADER, 710, 18, 48, 604, 136);
+    ListView_SetExtendedListViewStyle(list, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_LABELTIP);
+    for (const auto &[title, width] : {std::pair{L"Contact", 442}, std::pair{L"App", 140}})
     {
-        auto split = key.find(L'\n');
-        auto name = std::wstring(key.starts_with(L"telegram\n") ? L"Telegram: " : key.starts_with(L"telegram-web\n") ? L"Telegram Web: " : key.starts_with(L"viber\n") ? L"Viber (inactive): " : L"Teams: ") + key.substr(split + 1);
-        SendDlgItemMessageW(w, 710, LB_ADDSTRING, 0, (LPARAM)name.c_str());
+        LVCOLUMNW column{LVCF_TEXT | LVCF_WIDTH};
+        column.pszText = const_cast<wchar_t *>(title);
+        column.cx = scale(w, width);
+        ListView_InsertColumn(list, Header_GetItemCount(ListView_GetHeader(list)), &column);
     }
     control(w, L"STATIC", L"Open a chat, then reopen this dialog to add it.", 0, 712, 18, 194, 604, 26);
     label(w, L"Click languages to include (saved in the order shown)", 18, 228, 604);
@@ -1235,12 +1396,10 @@ void showChatLanguages(HWND parent, SettingsView *settings)
     button(w, L"&Remove profile", 713, 18, 476, 170);
     button(w, L"&Use languages", IDOK, 300, 476, 170);
     button(w, L"&Cancel", IDCANCEL, 486, 476, 136);
-    EnableWindow(GetDlgItem(w, IDOK), !keys.empty());
-    EnableWindow(GetDlgItem(w, 713), FALSE);
-    if (!keys.empty()) { SendDlgItemMessageW(w, 710, LB_SETCURSEL, 0, 0); fillChatLanguages(w, v); }
+    filterChatRows(w, v);
     EnableWindow(parent, FALSE);
     showRequestedWindow(w);
-    SetFocus(GetDlgItem(w, 710));
+    SetFocus(GetDlgItem(w, 714));
 }
 #include "ui_app_languages.inl"
 #include "ui_mouse_buttons.inl"
@@ -1700,9 +1859,9 @@ void updateSettingsState(HWND w, SettingsView *v)
     if (!v || !v->ready || v->filling || v->refreshing) return;
     v->refreshing = true;
     bool changed = settingsChanged(w, v);
-    EnableWindow(GetDlgItem(w, IDOK), changed);
-    const wchar_t *text = changed ? L"Unsaved changes — click Save to apply." :
-        v->visitedLan ? L"No unsaved settings. Network changes save automatically in the Computers window." : L"No unsaved changes.";
+    EnableWindow(GetDlgItem(w, IDOK), changed || (v->app->settings.autostart && !isLocalBuild()));
+    const wchar_t *text = changed ? L"Unsaved settings — click Save to apply." :
+        v->visitedLan ? L"No unsaved settings. Network changes save automatically in the Computers window." : L"No unsaved settings.";
     if (value(w, 261) != text) value(w, 261, text);
     v->refreshing = false;
 }
@@ -1742,7 +1901,8 @@ void closeSettings(HWND w, SettingsView *v)
             }
         }
     }
-    DestroyWindow(w);
+    if (confirmSnippetClose(w, &v->snippets))
+        DestroyWindow(w);
 }
 LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 {
@@ -1766,18 +1926,28 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
         switch (msg)
         {
         case WM_DRAWITEM:
-            if (wp == AddMouseProfile || wp == RenameMouseProfile || wp == DeleteMouseProfile)
+            if (wp == AddMouseProfile || wp == RenameMouseProfile || wp == DeleteMouseProfile || wp == AddMouseEvent)
             {
                 drawActionApplicationIcon(w, *reinterpret_cast<const DRAWITEMSTRUCT *>(lp));
                 return TRUE;
             }
             break;
+        case WM_CTLCOLORSTATIC:
+            if (reinterpret_cast<HWND>(lp) == GetDlgItem(w, 281))
+            {
+                auto dc = reinterpret_cast<HDC>(wp);
+                SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT));
+                SetBkColor(dc, GetSysColor(COLOR_WINDOW));
+                return reinterpret_cast<LRESULT>(GetSysColorBrush(COLOR_WINDOW));
+            }
+            break;
         case WM_INPUT:
             readMouseTestInput(w, *v, reinterpret_cast<HRAWINPUT>(lp));
             return DefWindowProcW(w, msg, wp, lp);
         case ConfigSettingsDownloaded:
             v->draft = v->app->settings;
             fillSettings(w, v);
+            refreshSnippetDraft(w, &v->snippets);
             return 0;
         case WM_ENABLE:
             if (wp) updateSettingsState(w, v);
@@ -1801,7 +1971,7 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             if (((NMHDR *)lp)->idFrom == 733 && ((NMHDR *)lp)->code == NM_DBLCLK)
             {
                 const auto &click = *reinterpret_cast<const NMITEMACTIVATE *>(lp);
-                showMouseActionEditor(w, *v, click.iItem);
+                showMouseActionEditor(w, *v, mouseEventAtRow(click.hdr.hwndFrom, click.iItem));
                 return 0;
             }
             if (((NMHDR *)lp)->idFrom == 260 && ((NMHDR *)lp)->code == TCN_SELCHANGE)
@@ -1814,6 +1984,14 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
         {
             SettingsStateRefresh refresh{w};
             int id = LOWORD(wp);
+            if (id == 282 && HIWORD(wp) == BN_CLICKED)
+            {
+                writeClipboard(w, textClip(value(w, 281)));
+                value(w, 283, L"Copied to clipboard.");
+                return 0;
+            }
+            if (id >= 301 && id <= SaveSnippets && snippetCommand(w, &v->snippets, wp, true))
+                return 0;
             if (id == 220 && HIWORD(wp) == LBN_SELCHANGE && !v->filling)
             {
                 collectLayout(w, v);
@@ -1851,7 +2029,8 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             }
             if (id == IDOK)
             {
-                if (!settingsChanged(w, v)) return 0;
+                if (!settingsChanged(w, v) && (!v->app->settings.autostart || isLocalBuild())) return 0;
+                if (!confirmSnippetClose(w, &v->snippets)) return 0;
                 if (v->app->busy)
                     throw std::runtime_error("Wait for the current text operation to finish");
                 v->app->applySettings(collectSettings(w, v));
@@ -1886,11 +2065,6 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                 showAutoOptions(w, v);
                 return 0;
             }
-            if (id == 252)
-            {
-                showSnippets(*v->app);
-                return 0;
-            }
             if (id == 253)
             {
                 if (v->app->busy)
@@ -1927,12 +2101,6 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
     }
     return DefWindowProcW(w, msg, wp, lp);
 }
-struct SnippetView
-{
-    App *app;
-    std::vector<Snippet> snippets;
-    int selection = -1;
-};
 void updateSnippetEditor(HWND w, SnippetView *v)
 {
     bool selected = v->selection >= 0 && v->selection < (int)v->snippets.size();
@@ -1985,6 +2153,168 @@ void collectSnippet(HWND w, SnippetView *v)
         }
     }
 }
+bool sameSnippets(const std::vector<Snippet> &left, const std::vector<Snippet> &right)
+{
+    return std::equal(left.begin(), left.end(), right.begin(), right.end(), [](const Snippet &a, const Snippet &b) {
+        return a.id == b.id && a.trigger == b.trigger && a.text == b.text && a.apps == b.apps;
+    });
+}
+void refreshSnippetDraft(HWND w, SnippetView *v)
+{
+    collectSnippet(w, v);
+    if (!sameSnippets(v->snippets, v->saved) || sameSnippets(v->saved, v->app->settings.snippets))
+        return;
+    v->snippets = v->saved = v->app->settings.snippets;
+    v->selection = -1;
+    fillSnippets(w, v);
+    value(w, 319, L"");
+}
+void saveSnippetDraft(HWND w, SnippetView *v)
+{
+    collectSnippet(w, v);
+    if (sameSnippets(v->snippets, v->saved)) return;
+    auto settings = v->app->settings;
+    if (v->app->busy)
+        throw std::runtime_error("Wait for the current operation");
+    if (!sameSnippets(settings.snippets, v->saved) && !sameSnippets(settings.snippets, v->snippets))
+        throw std::runtime_error("Snippets changed elsewhere. Reopen Settings to load the current snippets.");
+    settings.snippets = v->snippets;
+    v->app->applySettings(settings);
+    v->snippets = v->saved = v->app->settings.snippets;
+    if (v->selection >= (int)v->snippets.size()) v->selection = -1;
+    if (auto parent = v->app->settingsWindow)
+    {
+        auto *view = reinterpret_cast<SettingsView *>(GetWindowLongPtrW(parent, GWLP_USERDATA));
+        view->draft.snippets = v->saved;
+        view->draft.snippetTombstones = v->app->settings.snippetTombstones;
+        updateSettingsState(parent, view);
+    }
+}
+bool confirmSnippetClose(HWND w, SnippetView *v)
+{
+    collectSnippet(w, v);
+    if (sameSnippets(v->snippets, v->saved)) return true;
+    const int choice = MessageBoxW(w, L"Save your snippet changes before closing?",
+                                  L"KSwitcher — Unsaved snippets", MB_YESNOCANCEL | MB_ICONWARNING | MB_DEFBUTTON3);
+    if (choice == IDYES) saveSnippetDraft(w, v);
+    return choice == IDYES || choice == IDNO;
+}
+bool snippetCommand(HWND w, SnippetView *v, WPARAM wp, bool embedded)
+{
+    const int id = LOWORD(wp);
+    if (embedded && ((HIWORD(wp) == EN_CHANGE && (id == 302 || id == 303 || id == 315)) ||
+                     id == 310 || id == 311 || id == 314))
+        value(w, 319, L"");
+    if (id == 314)
+    {
+        bool restricted = IsDlgButtonChecked(w, 314) == BST_CHECKED;
+        for (int field : {315, 316, 317}) EnableWindow(GetDlgItem(w, field), restricted);
+        return true;
+    }
+    if (id == 317)
+    {
+        auto app = value(w, 316);
+        if (!app.empty())
+        {
+            auto current = value(w, 315);
+            std::wistringstream input(current); std::wstring entry;
+            while (std::getline(input, entry, L',')) if (snippetAppName(entry) == snippetAppName(app)) return true;
+            value(w, 315, current.empty() ? app : current + L", " + app);
+        }
+        return true;
+    }
+    if (id == 301 && HIWORD(wp) == LBN_SELCHANGE)
+    {
+        collectSnippet(w, v);
+        v->selection = (int)SendDlgItemMessageW(w, 301, LB_GETCURSEL, 0, 0);
+        updateSnippetEditor(w, v);
+        return true;
+    }
+    if (id == 310)
+    {
+        collectSnippet(w, v);
+        v->snippets.push_back({L";new", L"", newSnippetId()});
+        v->selection = (int)v->snippets.size() - 1;
+        fillSnippets(w, v);
+        SetFocus(GetDlgItem(w, 302));
+        return true;
+    }
+    if (id == 311)
+    {
+        if (v->selection >= 0)
+        {
+            v->snippets.erase(v->snippets.begin() + v->selection);
+            v->selection = -1;
+            fillSnippets(w, v);
+            SetFocus(GetDlgItem(w, 301));
+        }
+        return true;
+    }
+    if (id == 312 || id == 313)
+    {
+        if (v->selection < 0 || v->selection >= (int)v->snippets.size()) return true;
+        SendDlgItemMessageW(w, 303, EM_REPLACESEL, TRUE, (LPARAM)(id == 312 ? L"{cursor}" : L"{enter}"));
+        return true;
+    }
+    if (id == (embedded ? SaveSnippets : IDOK))
+    {
+        saveSnippetDraft(w, v);
+        if (embedded)
+        {
+            fillSnippets(w, v);
+            value(w, 319, L"Snippets saved.");
+        }
+        else DestroyWindow(w);
+        return true;
+    }
+    if (!embedded && id == IDCANCEL)
+    {
+        DestroyWindow(w);
+        return true;
+    }
+    return false;
+}
+void createSnippetEditor(HWND w, SnippetView *view, bool embedded)
+{
+    const int top = embedded ? 60 : 16;
+    const int textHeight = embedded ? 106 : 240;
+    const int actions = top + 201 + textHeight;
+    label(w, L"Triggers", 24, top, 186);
+    control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER,
+            301, 24, top + 24, 186, 170 + textHeight);
+    button(w, L"&Add", 310, 24, actions, 86);
+    button(w, L"&Delete", 311, 120, actions, 90);
+    label(w, L"&Trigger (for example ;addr)", 232, top, 452);
+    edit(w, 302, 232, top + 24, 452);
+    checkbox(w, L"Only in these &applications (unchecked: everywhere)", 314, 232, top + 55, 452);
+    edit(w, 315, 232, top + 83, 452);
+    control(w, L"COMBOBOX", L"", WS_TABSTOP | CBS_DROPDOWNLIST | WS_VSCROLL, 316, 232, top + 113, 330, 200);
+    button(w, L"Add a&pp", 317, 572, top + 110, 112);
+    label(w, L"Process names, comma-separated (for example chrome.exe)", 232, top + 144, 452);
+    label(w, L"&Replacement text", 232, top + 170, 452);
+    edit(w, 303, 232, top + 194, 452, textHeight, ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL);
+    button(w, L"Insert cursor &marker", 312, 232, actions, 190);
+    button(w, L"Insert &Enter marker", 313, 432, actions, 190);
+    if (embedded)
+    {
+        control(w, L"STATIC", L"", 0, 319, 232, actions + 35, 286, 24);
+        button(w, L"Sa&ve snippets", SaveSnippets, 530, actions + 30, 154);
+    }
+    else
+    {
+        control(w, L"STATIC", L"Use {{cursor}} / {{enter}} for literal markers.", 0, 0, 232, actions + 35, 452, 22);
+        button(w, L"&Save", IDOK, 474, actions + 65, 100);
+        button(w, L"&Cancel", IDCANCEL, 584, actions + 65, 100);
+    }
+    std::set<std::wstring> apps;
+    EnumWindows([](HWND candidate, LPARAM context)->BOOL {
+        if (IsWindowVisible(candidate)) { auto name = processName(candidate); if (!name.empty()) ((std::set<std::wstring>*)context)->insert(lower(name) + L".exe"); }
+        return TRUE;
+    }, (LPARAM)&apps);
+    for (const auto &name : apps) SendDlgItemMessageW(w, 316, CB_ADDSTRING, 0, (LPARAM)name.c_str());
+    SendDlgItemMessageW(w, 316, CB_SETCURSEL, 0, 0);
+    fillSnippets(w, view);
+}
 LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 {
     if (msg == WM_DPICHANGED)
@@ -1996,102 +2326,24 @@ LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
     if (msg == WM_NCCREATE)
     {
         auto *app = (App *)((CREATESTRUCTW *)lp)->lpCreateParams;
-        v = new SnippetView{app, app->settings.snippets};
+        v = new SnippetView{app, app->settings.snippets, app->settings.snippets};
         SetWindowLongPtrW(w, GWLP_USERDATA, (LONG_PTR)v);
         return TRUE;
     }
-    if (!v)
-        return DefWindowProcW(w, msg, wp, lp);
+    if (!v) return DefWindowProcW(w, msg, wp, lp);
     try
     {
-        switch (msg)
+        if (msg == WM_COMMAND && snippetCommand(w, v, wp, false)) return 0;
+        if (msg == WM_CLOSE)
         {
-        case WM_COMMAND:
-        {
-            int id = LOWORD(wp);
-            if (id == 314)
-            {
-                bool restricted = IsDlgButtonChecked(w, 314) == BST_CHECKED;
-                for (int field : {315, 316, 317}) EnableWindow(GetDlgItem(w, field), restricted);
-                return 0;
-            }
-            if (id == 317)
-            {
-                auto app = value(w, 316);
-                if (!app.empty())
-                {
-                    auto current = value(w, 315);
-                    std::wistringstream input(current); std::wstring entry;
-                    while (std::getline(input, entry, L',')) if (snippetAppName(entry) == snippetAppName(app)) return 0;
-                    value(w, 315, current.empty() ? app : current + L", " + app);
-                }
-                return 0;
-            }
-            if (id == 301 && HIWORD(wp) == LBN_SELCHANGE)
-            {
-                collectSnippet(w, v);
-                v->selection = (int)SendDlgItemMessageW(w, 301, LB_GETCURSEL, 0, 0);
-                updateSnippetEditor(w, v);
-                return 0;
-            }
-            if (id == 310)
-            {
-                collectSnippet(w, v);
-                v->snippets.push_back({L";new", L"", newSnippetId()});
-                v->selection = (int)v->snippets.size() - 1;
-                fillSnippets(w, v);
-                SetFocus(GetDlgItem(w, 302));
-                return 0;
-            }
-            if (id == 311)
-            {
-                if (v->selection >= 0)
-                {
-                    v->snippets.erase(v->snippets.begin() + v->selection);
-                    v->selection = -1;
-                    fillSnippets(w, v);
-                    SetFocus(GetDlgItem(w, 301));
-                }
-                return 0;
-            }
-            if (id == 312 || id == 313)
-            {
-                if (v->selection < 0 || v->selection >= (int)v->snippets.size()) return 0;
-                SendDlgItemMessageW(w, 303, EM_REPLACESEL, TRUE, (LPARAM)(id == 312 ? L"{cursor}" : L"{enter}"));
-                return 0;
-            }
-            if (id == IDOK)
-            {
-                collectSnippet(w, v);
-                auto s = v->app->settings;
-                s.snippets = v->snippets;
-                if (v->app->busy)
-                    throw std::runtime_error("Wait for the current operation");
-                v->app->applySettings(s);
-                if (v->app->settingsWindow)
-                {
-                    auto *parent = (SettingsView *)GetWindowLongPtrW(v->app->settingsWindow, GWLP_USERDATA);
-                    parent->draft.snippets = s.snippets;
-                    updateSettingsState(v->app->settingsWindow, parent);
-                }
-                DestroyWindow(w);
-                return 0;
-            }
-            if (id == IDCANCEL)
-            {
-                DestroyWindow(w);
-                return 0;
-            }
-            break;
-        }
-        case WM_CLOSE:
             DestroyWindow(w);
             return 0;
-        case WM_NCDESTROY:
+        }
+        if (msg == WM_NCDESTROY)
+        {
             disposeFont(w);
             v->app->snippetsWindow = nullptr;
             delete v;
-            return DefWindowProcW(w, msg, wp, lp);
         }
     }
     catch (const std::exception &e)
@@ -2227,7 +2479,9 @@ void showSettings(App &app, bool visible)
     INITCOMMONCONTROLSEX tabsInit{sizeof(tabsInit), ICC_TAB_CLASSES};
     InitCommonControlsEx(&tabsInit);
     HWND tabs = control(w, WC_TABCONTROLW, L"", WS_TABSTOP, 260, 18, 16, 684, 32);
-    const wchar_t *tabNames[] = {L"General", L"Languages", L"Shortcuts", L"Clipboard", L"Tools", L"Mouse"};
+    TabCtrl_SetPadding(tabs, scale(w, 3), scale(w, 3));
+    const wchar_t *tabNames[] = {L"General", L"Languages", L"Shortcuts", L"Clipboard", L"Snippets", L"Mouse",
+                                 L"Sync", L"Computers", L"Diagnostics", L"MCP"};
     for (int i = 0; i < (int)std::size(tabNames); ++i)
     {
         TCITEMW item{}; item.mask = TCIF_TEXT; item.pszText = const_cast<wchar_t *>(tabNames[i]);
@@ -2288,26 +2542,41 @@ void showSettings(App &app, bool visible)
     button(w, L"Clear &history...", 254, 24, 258, 200);
     label(w, L"Exclude applications (process names, comma-separated)", 24, 330, 660);
     edit(w, 243, 24, 362, 660);
+    button(w, L"OCR op&tions...", 257, 24, 394, 200);
     page();
 
-    label(w, L"Additional tools and preferences", 24, 76, 660);
-    button(w, L"S&nippets...", 252, 24, 116, 210);
-    label(w, L"Manage reusable text and expansion triggers.", 254, 120, 430);
-    button(w, L"OCR op&tions...", 257, 24, 170, 210);
-    label(w, L"Configure text recognition from images.", 254, 174, 430);
-    button(w, L"S&ync...", 258, 24, 224, 210);
-    label(w, L"Synchronize preferences between computers.", 254, 228, 430);
-    button(w, L"KSwitcher &computers...", 262, 24, 278, 210);
-    label(w, L"Share mouse and keyboard with paired computers.", 254, 282, 430);
-    button(w, L"View l&og...", 256, 24, 332, 210);
-    label(w, L"Inspect recent operations and diagnostics.", 254, 336, 430);
-    checkbox(w, L"Write lo&g", 208, 24, 378, 210);
+    v->snippets = {&app, app.settings.snippets, app.settings.snippets};
+    createSnippetEditor(w, &v->snippets, true);
     page();
 
     createMousePage(w, *v);
     page();
 
-    control(w, L"STATIC", L"No unsaved changes.", 0, 261, 18, 430, 684, 24);
+    label(w, L"Back up and synchronize settings through OpenBao.", 24, 76, 660);
+    button(w, L"S&ync settings...", 258, 24, 110, 210);
+    page();
+
+    label(w, L"Share mouse and keyboard with paired computers.", 24, 76, 660);
+    button(w, L"Manage &computers...", 262, 24, 110, 210);
+    page();
+
+    checkbox(w, L"Write lo&g", 208, 24, 76, 210);
+    button(w, L"View l&og...", 256, 24, 110, 210);
+    page();
+
+    label(w, L"Codex configuration", 24, 76, 660);
+    label(w, L"Paste this block into ~/.codex/config.toml to connect Codex to KSwitcher.", 24, 108, 660);
+    edit(w, 281, 24, 140, 660, 108, ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | WS_HSCROLL | WS_BORDER);
+    const auto server = std::filesystem::path(executable()).parent_path() / L"KSwitcher.Config.exe";
+    value(w, 281, L"[mcp_servers.kswitcher]\r\ncommand = " +
+        wide(nlohmann::json(utf8(server.wstring())).dump()) + L"\r\nargs = [\"--mcp\"]\r\n");
+    label(w, L"Select text and press Ctrl+C, or copy the entire block below.", 24, 258, 660);
+    button(w, L"&Copy configuration", 282, 24, 288, 190);
+    control(w, L"STATIC", L"", 0, 283, 232, 293, 452, 24);
+    label(w, L"For remote logs, enable diagnostic log downloads on the paired computer.", 24, 338, 660);
+    page();
+
+    control(w, L"STATIC", L"No unsaved settings.", 0, 261, 18, 430, 684, 24);
     button(w, L"Impo&rt...", 250, 18, 466, 125);
     button(w, L"&Export...", 251, 155, 466, 125);
     button(w, L"&Save", IDOK, 490, 466, 100);
@@ -2325,40 +2594,22 @@ void showSettings(App &app, bool visible)
 }
 void showSnippets(App &app)
 {
+    if (app.settingsWindow)
+    {
+        HWND w = app.settingsWindow;
+        TabCtrl_SetCurSel(GetDlgItem(w, 260), SnippetsPage);
+        selectSettingsPage(w, reinterpret_cast<SettingsView *>(GetWindowLongPtrW(w, GWLP_USERDATA)));
+        activateWindow(w);
+        return;
+    }
     if (app.snippetsWindow)
     {
         SetForegroundWindow(app.snippetsWindow);
         return;
     }
-    HWND w = makeWindow(app, L"KSwitcher.Snippets", L"Text snippets", snippetProc, 740, 620);
+    HWND w = makeWindow(app, L"KSwitcher.Snippets", L"Text snippets", snippetProc, 720, 565);
     app.snippetsWindow = w;
-    label(w, L"Triggers", 16, 16);
-    control(w, L"LISTBOX", L"", WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_BORDER, 301,
-            16, 44, 200, 480);
-    button(w, L"&Add", 310, 16, 538, 90);
-    button(w, L"&Delete", 311, 116, 538, 100);
-    label(w, L"&Trigger (for example ;addr)", 236, 16, 470);
-    edit(w, 302, 236, 44, 488);
-    control(w, L"BUTTON", L"Only in these &applications (unchecked: everywhere)", WS_TABSTOP | BS_AUTOCHECKBOX, 314, 236, 82, 488, 24);
-    edit(w, 315, 236, 112, 488);
-    control(w, L"COMBOBOX", L"", WS_TABSTOP | CBS_DROPDOWNLIST | WS_VSCROLL, 316, 236, 148, 364, 200);
-    button(w, L"Add a&pp", 317, 612, 145, 112);
-    std::set<std::wstring> apps;
-    EnumWindows([](HWND candidate, LPARAM context)->BOOL {
-        if (IsWindowVisible(candidate)) { auto name = processName(candidate); if (!name.empty()) ((std::set<std::wstring>*)context)->insert(lower(name) + L".exe"); }
-        return TRUE;
-    }, (LPARAM)&apps);
-    for (const auto &name : apps) SendDlgItemMessageW(w, 316, CB_ADDSTRING, 0, (LPARAM)name.c_str());
-    SendDlgItemMessageW(w, 316, CB_SETCURSEL, 0, 0);
-    label(w, L"Process names, comma-separated; e.g. chrome.exe, ms-teams.exe", 236, 182, 488);
-    label(w, L"&Replacement text", 236, 212, 480);
-    edit(w, 303, 236, 240, 488, 240, ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL);
-    control(w, L"STATIC", L"{cursor}: caret; {enter}: press Enter after insertion.\nUse {{cursor}} / {{enter}} for literal markers.", 0, 0, 236, 492, 488, 36);
-    button(w, L"Insert cursor &marker", 312, 236, 530, 190);
-    button(w, L"Insert &Enter marker", 313, 436, 530, 190);
-    button(w, L"&Save", IDOK, 510, 578, 100);
-    button(w, L"&Cancel", IDCANCEL, 624, 578, 100);
-    fillSnippets(w, (SnippetView *)GetWindowLongPtrW(w, GWLP_USERDATA));
+    createSnippetEditor(w, reinterpret_cast<SnippetView *>(GetWindowLongPtrW(w, GWLP_USERDATA)), false);
     showRequestedWindow(w);
     SetForegroundWindow(w);
 }

src/ui_lan.inl

@@ -9,6 +9,9 @@ struct LanView
     std::string dragPeer;POINT dragStart{},dragPoint{};bool dragMoved{};
     std::string gridState;
     std::vector<std::wstring> rows;
+    std::string logRequest;
+    std::filesystem::path logDestination;
+    std::wstring transferMessage;
 };
 nlohmann::json lanRequest(App &app,const nlohmann::json &request)
 {
@@ -20,6 +23,19 @@ std::string selectedLan(HWND w,LanView &v)
     auto index=SendDlgItemMessageW(w,702,LB_GETCURSEL,0,0);
     return index>=0 && size_t(index)<v.ids.size() ? v.ids[size_t(index)] : "";
 }
+std::filesystem::path pickLanFile(HWND owner, bool save, const wchar_t *suggestion=L"")
+{
+    wchar_t path[32768]{};
+    wcsncpy_s(path,suggestion,_TRUNCATE);
+    OPENFILENAMEW dialog{sizeof(dialog)};
+    dialog.hwndOwner=owner;
+    dialog.lpstrFilter=L"All files\0*.*\0";
+    dialog.lpstrFile=path;
+    dialog.nMaxFile=std::size(path);
+    dialog.Flags=OFN_EXPLORER|OFN_NOCHANGEDIR|OFN_PATHMUSTEXIST|(save?OFN_OVERWRITEPROMPT:OFN_FILEMUSTEXIST);
+    if(save?GetSaveFileNameW(&dialog):GetOpenFileNameW(&dialog))return path;
+    return {};
+}
 LRESULT CALLBACK lanHelpProc(HWND w,UINT msg,WPARAM wp,LPARAM lp)
 {
     if(msg==WM_DPICHANGED){resizeForDpi(w,wp,lp);return 0;}
@@ -42,6 +58,25 @@ void showLanHelp(HWND parent,App &app)
 }
 void refreshLan(HWND w,LanView &v)
 {
+    if(!v.logRequest.empty())
+    {
+        auto reply=lanRequest(*v.app,{{"action","takeLog"},{"request",v.logRequest}});
+        auto state=reply.at("state").get<std::string>();
+        if(state!="waiting")
+        {
+            if(state=="ready")
+            {
+                v.logRequest.clear();
+                v.transferMessage.clear();
+                atomicWrite(v.logDestination,decodeLanLog(reply.at("logHex")));
+                v.transferMessage=L"Diagnostic log saved.";
+            }
+            else if(state=="denied")v.transferMessage=L"Remote diagnostic downloads are disabled on that PC.";
+            else if(state=="unavailable")v.transferMessage=L"The selected log is unavailable on that PC.";
+            else v.transferMessage=L"The remote log download timed out.";
+            v.logRequest.clear();
+        }
+    }
     auto selected=selectedLan(w,v);
     auto next=lanRequest(*v.app,{{"action","status"}});
     if(selected.empty())
@@ -104,6 +139,18 @@ void refreshLan(HWND w,LanView &v)
     EnableWindow(GetDlgItem(w,705),enabled&&online&&!pending&&!paired);
     EnableWindow(GetDlgItem(w,706),pending);
     EnableWindow(GetDlgItem(w,707),paired);
+    bool canTransfer=false;
+    for(const auto &peer:v.snapshot["peers"])
+        if(peer.at("id")==selected)canTransfer=paired&&peer.value("verified",false)&&peer.value("fileTransfer",false);
+    EnableWindow(GetDlgItem(w,726),canTransfer);
+    EnableWindow(GetDlgItem(w,727),canTransfer&&v.logRequest.empty());
+    EnableWindow(GetDlgItem(w,728),canTransfer&&v.logRequest.empty());
+    EnableWindow(GetDlgItem(w,730),!v.snapshot["files"].empty());
+    CheckDlgButton(w,729,v.snapshot.value("shareLogs",false)?BST_CHECKED:BST_UNCHECKED);
+    auto fileCount=v.snapshot["files"].size();
+    auto transferStatus=v.transferMessage;
+    if(transferStatus.empty())transferStatus=wide(v.snapshot.value("transferStatus",std::string{}));
+    value(w,731,fileCount?L"Incoming files: "+std::to_wstring(fileCount):transferStatus);
     for(int id:{703,704}) EnableWindow(GetDlgItem(w,id),enabled&&!pending&&!paired);
     auto positions=v.snapshot.value("positions",nlohmann::json::object());
     EnableWindow(GetDlgItem(w,715),enabled&&!positions.empty()&&!v.snapshot.value("shareInput",false));
@@ -154,6 +201,49 @@ LRESULT CALLBACK lanProc(HWND w,UINT msg,WPARAM wp,LPARAM lp)
             if(id==705) lanRequest(*v->app,{{"action","pair"},{"peer",peer},{"code",utf8(value(w,703))}});
             if(id==706) lanRequest(*v->app,{{"action","cancel"}});
             if(id==707) lanRequest(*v->app,{{"action","forget"},{"peer",peer}});
+            if(id==726)
+            {
+                auto file=pickLanFile(w,false);
+                if(!file.empty())
+                {
+                    lanRequest(*v->app,{{"action","sendFile"},{"peer",peer},{"path",utf8(file.wstring())}});
+                    v->transferMessage.clear();
+                }
+            }
+            if(id==727||id==728)
+            {
+                auto destination=pickLanFile(w,true,id==728?L"kswitcher-previous.log":L"kswitcher-remote.log");
+                if(!destination.empty())
+                {
+                    auto reply=lanRequest(*v->app,{{"action","requestLog"},{"peer",peer},{"previous",id==728}});
+                    v->logDestination=std::move(destination);
+                    v->logRequest=reply.at("request").get<std::string>();
+                    v->transferMessage=L"Downloading diagnostic log...";
+                }
+            }
+            if(id==729)lanRequest(*v->app,{{"action","shareLogs"},{"enabled",IsDlgButtonChecked(w,729)==BST_CHECKED}});
+            if(id==730 && !v->snapshot["files"].empty())
+            {
+                const auto file=v->snapshot["files"].front();
+                auto name=wide(file.at("name").get<std::string>());
+                auto question=wide(file.at("sender").get<std::string>())+L" sent "+name+L" ("+
+                    std::to_wstring(file.at("size").get<size_t>())+L" bytes).\n\nSave this file? Choose No to discard it.";
+                auto answer=MessageBoxW(w,question.c_str(),L"Incoming file",MB_YESNOCANCEL|MB_ICONQUESTION);
+                if(answer==IDYES || answer==IDNO)
+                {
+                    // A peer supplies the display name. Only offer it as a plain Windows filename.
+                    const bool validName = !name.empty() && name.size() <= 255 &&
+                        name.find_first_of(L"<>:\"/\\|?*") == name.npos &&
+                        name.back() != L'.' && name.back() != L' ' &&
+                        std::none_of(name.begin(), name.end(), [](wchar_t c) { return c < L' '; });
+                    auto destination=answer==IDYES?pickLanFile(w,true,validName?name.c_str():L"received-file"):
+                        std::filesystem::path{};
+                    if(answer==IDNO||!destination.empty())
+                        lanRequest(*v->app,{{"action",answer==IDYES?"saveFile":"discardFile"},{"id",file.at("id")},
+                            {"peer",file.at("peer")},{"path",utf8(destination.wstring())}});
+                }
+                v->transferMessage.clear();
+            }
             if(id==715)
             {
                 lanRequest(*v->app,{{"action","input"},{"enabled",true}});
@@ -167,7 +257,7 @@ LRESULT CALLBACK lanProc(HWND w,UINT msg,WPARAM wp,LPARAM lp)
 }
 void showLan(HWND parent,App &app)
 {
-    HWND w=makeWindow(app,L"KSwitcher.LAN",L"KSwitcher computers — mouse and keyboard",lanProc,740,908,0,false);
+    HWND w=makeWindow(app,L"KSwitcher.LAN",L"KSwitcher computers",lanProc,740,908,0,false);
     SetWindowLongPtrW(w,GWLP_HWNDPARENT,(LONG_PTR)parent);
     auto v=new LanView{parent,&app};SetWindowLongPtrW(w,GWLP_USERDATA,(LONG_PTR)v);
     label(w,L"Changes here save automatically. No need to click Save in Settings.",18,16,700);
@@ -190,8 +280,13 @@ void showLan(HWND parent,App &app)
     control(w,L"STATIC",L"",0,719,18,674,700,24);
     button(w,L"Enable &input sharing",715,18,706,330);
     button(w,L"&Stop input sharing",716,370,706,240);
-    control(w,L"STATIC",L"",0,718,18,744,700,64);
-    control(w,L"STATIC",L"Arrange the same physical layout on every PC. Pair each input source with every destination and enable input on all PCs. Clipboard goes to all paired PCs.",0,720,18,816,580,40);
+    control(w,L"STATIC",L"",0,718,18,744,700,30);
+    button(w,L"Send file…",726,18,774,144);
+    button(w,L"Incoming files…",730,174,774,160);
+    button(w,L"Download log…",727,346,774,164);
+    button(w,L"Previous log…",728,522,774,196);
+    control(w,L"BUTTON",L"Allow paired computers to download diagnostic logs",BS_AUTOCHECKBOX|WS_TABSTOP,729,18,808,700,24);
+    control(w,L"STATIC",L"",0,731,18,835,700,24);
     button(w,L"Connection &help",722,18,864,300);
     button(w,L"&Close",IDCANCEL,618,864,100);
     EnableWindow(parent,FALSE);showRequestedWindow(w);SetForegroundWindow(w);

src/ui_log.inl

@@ -177,11 +177,7 @@ void copyLogRows(HWND w, App &app)
                   L" -> " + entry.target + L"\t" + entry.outcome + L"\r\n" + entry.details + L"\r\n\r\n";
     }
     if (!copied.empty())
-    {
-        auto clip = textClip(copied);
-        clip.formats.push_back({0, L"ExcludeClipboardContentFromMonitorProcessing", {1, 0, 0, 0}});
-        app.ownSequence = writeClipboard(app.window, clip);
-    }
+        writeClipboard(app.window, textClip(copied));
 }
 LRESULT CALLBACK logProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 {

src/ui_mouse_buttons.inl

@@ -5,6 +5,7 @@ std::wstring selectedMouseProfile(HWND w, const SettingsView &view)
 }
 
 constexpr int RenameMouseProfile = 757, DeleteMouseProfile = 758;
+constexpr int AddMouseEvent = 762, MouseEventCapture = 763, MouseEventNameField = 764, MouseEventStatus = 765;
 
 std::wstring mouseActionLabel(const MouseAction &action)
 {
@@ -14,11 +15,23 @@ std::wstring mouseActionLabel(const MouseAction &action)
     return MouseActions[static_cast<size_t>(action.type)];
 }
 
+int mouseEventAtRow(HWND list, int row)
+{
+    if (row < 0) return -1;
+    LVITEMW item{LVIF_PARAM};
+    item.iItem = row;
+    return ListView_GetItem(list, &item) ? static_cast<int>(item.lParam) : -1;
+}
+
 void selectMouseEvent(HWND w, int event)
 {
     HWND list = GetDlgItem(w, 733);
-    ListView_SetItemState(list, event, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
-    ListView_EnsureVisible(list, event, FALSE);
+    LVFINDINFOW search{LVFI_PARAM};
+    search.lParam = event;
+    const int row = ListView_FindItem(list, -1, &search);
+    if (row < 0) return;
+    ListView_SetItemState(list, row, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
+    ListView_EnsureVisible(list, row, FALSE);
 }
 
 void fillMouseEvents(HWND w, SettingsView &view, int selection = 0)
@@ -27,8 +40,17 @@ void fillMouseEvents(HWND w, SettingsView &view, int selection = 0)
     EnableWindow(GetDlgItem(w, RenameMouseProfile), isNamedMouseProfile(profile));
     EnableWindow(GetDlgItem(w, DeleteMouseProfile), isNamedMouseProfile(profile));
     HWND list = GetDlgItem(w, 733);
+    ListView_DeleteAllItems(list);
     for (int event = 0; event < static_cast<int>(std::size(MouseEvents)); ++event)
     {
+        if (!mouseEventEnabled(view.draft, event)) continue;
+        auto name = mouseEventName(view.draft, event);
+        LVITEMW item{LVIF_TEXT | LVIF_PARAM};
+        item.iItem = ListView_GetItemCount(list);
+        item.lParam = event;
+        item.pszText = name.data();
+        const int row = ListView_InsertItem(list, &item);
+        if (row < 0) continue;
         auto *action = mouseBinding(view.draft, profile, event);
         std::wstring text;
         if (profile != GlobalMouseProfile && !action)
@@ -37,7 +59,7 @@ void fillMouseEvents(HWND w, SettingsView &view, int selection = 0)
             action = mouseBinding(view.draft, GlobalMouseProfile, event);
         }
         text += action ? mouseActionLabel(*action) : MouseActions[0];
-        ListView_SetItemText(list, event, 1, text.data());
+        ListView_SetItemText(list, row, 1, text.data());
     }
     selectMouseEvent(w, selection);
 }
@@ -97,6 +119,7 @@ bool blockMouseProfileStateChange(HWND w, SettingsView &view, const NMLISTVIEW &
     {
         Settings candidate;
         candidate.mouseBindings = view.draft.mouseBindings;
+        candidate.customMouseEvents = view.draft.customMouseEvents;
         candidate.disabledMouseProfiles = view.draft.disabledMouseProfiles;
         candidate.mouseProfileApplications = view.draft.mouseProfileApplications;
         candidate.disabledMouseProfiles.erase(profile);
@@ -309,7 +332,7 @@ void drawActionApplicationIcon(HWND editor, const DRAWITEMSTRUCT &item)
         RECT horizontal{x - half, y - weight / 2, x + half, y - weight / 2 + weight};
         FillRect(item.hDC, &horizontal, ink);
     }
-    if (item.CtlID == AddActionApp || item.CtlID == AddMouseProfile)
+    if (item.CtlID == AddActionApp || item.CtlID == AddMouseProfile || item.CtlID == AddMouseEvent)
     {
         RECT vertical{x - weight / 2, y - half, x - weight / 2 + weight, y + half};
         FillRect(item.hDC, &vertical, ink);
@@ -391,6 +414,7 @@ void saveMouseAction(HWND w, MouseActionEditor &editor)
     const auto *event = MouseEvents[editor.event];
     Settings check;
     check.mouseBindings = editor.view->draft.mouseBindings;
+    check.customMouseEvents = editor.view->draft.customMouseEvents;
     check.disabledMouseProfiles = editor.view->draft.disabledMouseProfiles;
     check.mouseProfileApplications = editor.view->draft.mouseProfileApplications;
     if (type < 0 || (type == static_cast<int>(MouseActionType::Standard) && profile == GlobalMouseProfile))
@@ -487,7 +511,7 @@ LRESULT CALLBACK mouseActionEditorProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
 
 void showMouseActionEditor(HWND parent, SettingsView &view, int event)
 {
-    if (event < 0 || event >= static_cast<int>(std::size(MouseEvents)) || !IsWindowEnabled(parent)) return;
+    if (!mouseEventEnabled(view.draft, event) || !IsWindowEnabled(parent)) return;
     const auto profile = selectedMouseProfile(parent, view);
     const bool application = profile != GlobalMouseProfile;
     const auto *action = mouseBinding(view.draft, profile, event);
@@ -496,7 +520,7 @@ void showMouseActionEditor(HWND parent, SettingsView &view, int event)
                         480, MouseActionEditorHeight, 0, false, parent);
     auto *editor = new MouseActionEditor{parent, &view, profile, event};
     SetWindowLongPtrW(w, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(editor));
-    label(w, std::wstring(MouseEvents[event]).append(L"  ·  ").append(mouseProfileName(profile)).c_str(),
+    label(w, mouseEventName(view.draft, event).append(L"  ·  ").append(mouseProfileName(profile)).c_str(),
           18, 14, 444);
     label(w, L"&Action", 18, 43, 330);
     windowLayoutState(w)->fixedClient = true;
@@ -578,7 +602,7 @@ void showMouseListMenu(HWND list, POINT point, bool profiles)
         hit.pt = point;
         ScreenToClient(list, &hit.pt);
         event = ListView_SubItemHitTest(list, &hit);
-        if (event < 0) return;
+        if (event < 0 && profiles) return;
     }
     auto &view = *reinterpret_cast<SettingsView *>(GetWindowLongPtrW(w, GWLP_USERDATA));
     HMENU menu = CreatePopupMenu();
@@ -592,9 +616,11 @@ void showMouseListMenu(HWND list, POINT point, bool profiles)
     }
     else
     {
-        selectMouseEvent(w, event);
-        const bool canReset = mouseBinding(view.draft, selectedMouseProfile(w, view), event) != nullptr;
-        AppendMenuW(menu, MF_STRING, EditMouseEvent, L"&Edit…");
+        event = mouseEventAtRow(list, event);
+        if (event >= 0) selectMouseEvent(w, event);
+        const bool canReset = event >= 0 && mouseBinding(view.draft, selectedMouseProfile(w, view), event) != nullptr;
+        AppendMenuW(menu, MF_STRING, AddMouseEvent, L"＋  &Add mouse event…");
+        AppendMenuW(menu, MF_STRING | (event >= 0 ? MF_ENABLED : MF_GRAYED), EditMouseEvent, L"✎  &Edit…");
         AppendMenuW(menu, MF_STRING | (canReset ? MF_ENABLED : MF_GRAYED), ResetMouseEvent, L"&Reset to default");
     }
     const auto command = TrackPopupMenu(menu, TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTBUTTON,
@@ -687,6 +713,7 @@ LRESULT CALLBACK mouseProfileNameProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             const auto key = std::wstring(NamedMouseProfilePrefix) + name;
             Settings check;
             check.mouseBindings = view.draft.mouseBindings;
+            check.customMouseEvents = view.draft.customMouseEvents;
             check.disabledMouseProfiles = view.draft.disabledMouseProfiles;
             check.mouseProfileApplications = view.draft.mouseProfileApplications;
             if (!previous.empty() && key != previous)
@@ -768,9 +795,204 @@ void showMouseProfileName(HWND owner, SettingsView &view, bool renaming)
     SetFocus(GetDlgItem(w, MouseProfileName));
 }
 
+struct AddMouseEventView
+{
+    HWND parent{};
+    SettingsView *settings{};
+    int signal{-1}, lastButton{-1};
+    DWORD lastPress{};
+    POINT lastPoint{};
+    bool rawRegistered{};
+    HHOOK mouseHook{};
+    int rawWheel{-1}, hookWheel{-1};
+    ULONGLONG rawWheelAt{}, hookWheelAt{};
+};
+
+constexpr UINT CapturedMouseWheel = WM_APP + 86;
+constexpr UINT_PTR MouseSignalTimeout = 1;
+HWND mouseEventCaptureWindow{};
+
+bool inMouseEventCapture(HWND w, POINT point)
+{
+    RECT area{};
+    return GetWindowRect(GetDlgItem(w, MouseEventCapture), &area) && PtInRect(&area, point);
+}
+
+LRESULT CALLBACK captureMouseWheelProc(int code, WPARAM wp, LPARAM lp)
+{
+    if (code == HC_ACTION && mouseEventCaptureWindow && GetForegroundWindow() == mouseEventCaptureWindow)
+    {
+        const auto &mouse = *reinterpret_cast<const MSLLHOOKSTRUCT *>(lp);
+        const int signal = mouseWheelEvent(static_cast<UINT>(wp), static_cast<SHORT>(HIWORD(mouse.mouseData)));
+        if (signal >= 0 && inMouseEventCapture(mouseEventCaptureWindow, mouse.pt))
+            PostMessageW(mouseEventCaptureWindow, CapturedMouseWheel, signal, 0);
+    }
+    return CallNextHookEx(nullptr, code, wp, lp);
+}
+
+void showCapturedMouseSignal(HWND w, AddMouseEventView &view, int signal)
+{
+    view.signal = signal;
+    const auto &draft = view.settings->draft;
+    const bool duplicate = mouseEventEnabled(draft, signal);
+    EnableWindow(GetDlgItem(w, IDOK), !duplicate);
+    if (duplicate)
+    {
+        selectMouseEvent(view.parent, signal);
+        value(w, MouseEventStatus, L"Already in the list: " + mouseEventName(draft, signal));
+        value(w, IDCANCEL, L"Close");
+    }
+    else
+    {
+        value(w, MouseEventStatus, std::wstring(L"Detected: ") + MouseEvents[signal]);
+        if (value(w, MouseEventNameField).empty()) value(w, MouseEventNameField, MouseEvents[signal]);
+        value(w, IDCANCEL, L"Cancel");
+    }
+}
+
+void matchCapturedMouseWheel(HWND w, AddMouseEventView &view, ULONGLONG now)
+{
+    if (view.rawWheel >= 0 && view.rawWheel == view.hookWheel &&
+        now - view.rawWheelAt <= 500 && now - view.hookWheelAt <= 500)
+    {
+        showCapturedMouseSignal(w, view, view.rawWheel);
+        view.rawWheel = view.hookWheel = -1;
+        KillTimer(w, MouseSignalTimeout);
+    }
+}
+
+void readNewMouseSignal(HWND w, AddMouseEventView &view, HRAWINPUT handle)
+{
+    POINT point{};
+    if (!GetCursorPos(&point) || !inMouseEventCapture(w, point)) return;
+    RAWINPUT input{};
+    UINT size = sizeof(input);
+    const auto bytes = GetRawInputData(handle, RID_INPUT, &input, &size, sizeof(RAWINPUTHEADER));
+    if (bytes == UINT(-1) || bytes < offsetof(RAWINPUT, data) + sizeof(RAWMOUSE) ||
+        input.header.dwType != RIM_TYPEMOUSE || !input.header.hDevice)
+        return;
+    int signal = rawMouseSignal(input.data.mouse);
+    if (signal < 0) return;
+    if (signal >= BuiltInMouseEventCount)
+    {
+        view.signal = -1;
+        EnableWindow(GetDlgItem(w, IDOK), FALSE);
+        value(w, MouseEventStatus, view.mouseHook ? L"Checking whether Windows delivers this wheel signal…" :
+                                                   L"Windows mouse hook is unavailable.");
+        view.rawWheel = signal;
+        view.rawWheelAt = GetTickCount64();
+        if (view.mouseHook) SetTimer(w, MouseSignalTimeout, 550, nullptr);
+        matchCapturedMouseWheel(w, view, view.rawWheelAt);
+        return;
+    }
+    view.rawWheel = view.hookWheel = -1;
+    KillTimer(w, MouseSignalTimeout);
+    const DWORD now = static_cast<DWORD>(GetMessageTime());
+    const bool second = signal < 3 && view.lastButton == signal &&
+                        doubleMouseClick(view.lastPoint, point, now - view.lastPress);
+    view.lastButton = second ? -1 : signal;
+    view.lastPress = now;
+    view.lastPoint = point;
+    if (second) signal += 5;
+    showCapturedMouseSignal(w, view, signal);
+}
+
+LRESULT CALLBACK addMouseEventProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
+{
+    auto *view = reinterpret_cast<AddMouseEventView *>(GetWindowLongPtrW(w, GWLP_USERDATA));
+    if (!view) return DefWindowProcW(w, msg, wp, lp);
+    try
+    {
+        if (msg == WM_INPUT)
+            readNewMouseSignal(w, *view, reinterpret_cast<HRAWINPUT>(lp));
+        else if (msg == CapturedMouseWheel)
+        {
+            view->hookWheel = static_cast<int>(wp);
+            view->hookWheelAt = GetTickCount64();
+            matchCapturedMouseWheel(w, *view, view->hookWheelAt);
+            return 0;
+        }
+        else if (msg == WM_TIMER && wp == MouseSignalTimeout)
+        {
+            KillTimer(w, MouseSignalTimeout);
+            view->rawWheel = view->hookWheel = -1;
+            value(w, MouseEventStatus, L"Raw Input saw this signal, but the Windows mouse hook did not.");
+            return 0;
+        }
+        else if (msg == WM_COMMAND)
+        {
+            if (LOWORD(wp) == IDOK)
+            {
+                const int signal = view->signal;
+                auto &settings = *view->settings;
+                if (signal < BuiltInMouseEventCount || signal >= static_cast<int>(std::size(MouseEvents)) ||
+                    mouseEventEnabled(settings.draft, signal)) return 0;
+                auto candidate = settings.draft;
+                candidate.customMouseEvents.emplace(MouseEvents[signal], trimApplicationText(value(w, MouseEventNameField)));
+                validateSettings(candidate);
+                settings.draft.customMouseEvents = std::move(candidate.customMouseEvents);
+                fillMouseEvents(view->parent, settings, signal);
+                DestroyWindow(w);
+                return 0;
+            }
+            if (LOWORD(wp) == IDCANCEL) { DestroyWindow(w); return 0; }
+        }
+        else if (msg == WM_CLOSE) { DestroyWindow(w); return 0; }
+        else if (msg == WM_DPICHANGED) { resizeForDpi(w, wp, lp); return 0; }
+        else if (msg == WM_NCDESTROY)
+        {
+            const HWND parent = view->parent;
+            mouseEventCaptureWindow = nullptr;
+            if (view->mouseHook) UnhookWindowsHookEx(view->mouseHook);
+            if (view->rawRegistered)
+            {
+                if (IsWindow(parent) && view->settings->rawMouseRegistered) registerMouseTestInput(parent);
+                else registerMouseTestInput(nullptr);
+            }
+            SetWindowLongPtrW(w, GWLP_USERDATA, 0);
+            delete view;
+            disposeFont(w);
+            if (IsWindow(parent))
+            {
+                EnableWindow(parent, TRUE);
+                SetForegroundWindow(parent);
+                SetFocus(GetDlgItem(parent, 733));
+            }
+        }
+    }
+    catch (const std::exception &e) { error(w, e); }
+    return DefWindowProcW(w, msg, wp, lp);
+}
+
+void showAddMouseEvent(HWND parent, SettingsView &settings)
+{
+    if (!IsWindowEnabled(parent)) return;
+    HWND w = makeWindow(*settings.app, L"KSwitcher.AddMouseEvent", L"Add mouse event", addMouseEventProc, 500, 275);
+    auto *view = new AddMouseEventView{parent, &settings};
+    SetWindowLongPtrW(w, GWLP_HWNDPARENT, reinterpret_cast<LONG_PTR>(parent));
+    SetWindowLongPtrW(w, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(view));
+    label(w, L"&Name", 18, 16, 464);
+    edit(w, MouseEventNameField, 18, 39, 464);
+    control(w, L"STATIC", L"Press a mouse button or move the wheel here",
+            WS_BORDER | SS_CENTER | SS_CENTERIMAGE, MouseEventCapture, 18, 78, 464, 92);
+    view->rawRegistered = registerMouseTestInput(w);
+    mouseEventCaptureWindow = w;
+    view->mouseHook = SetWindowsHookExW(WH_MOUSE_LL, captureMouseWheelProc, settings.app->instance, 0);
+    control(w, L"STATIC", view->rawRegistered ? L"Waiting for a supported mouse signal…" : L"Windows Raw Input is unavailable.",
+            0, MouseEventStatus, 18, 181, 464, 22);
+    label(w, L"Buttons that send no Windows mouse event cannot be added.", 18, 205, 464);
+    control(w, L"BUTTON", L"&Add", WS_TABSTOP | BS_DEFPUSHBUTTON, IDOK, 270, 239, 100, 28);
+    button(w, L"Cancel", IDCANCEL, 382, 239, 100);
+    EnableWindow(GetDlgItem(w, IDOK), FALSE);
+    EnableWindow(parent, FALSE);
+    showRequestedWindow(w);
+    SetFocus(GetDlgItem(w, MouseEventNameField));
+}
+
 bool handleMouseBindings(HWND w, SettingsView &view, WPARAM wp)
 {
     const int id = LOWORD(wp);
+    if (id == AddMouseEvent) { showAddMouseEvent(w, view); return true; }
     if (id == AddMouseProfile) { showMouseProfileName(w, view, false); return true; }
     if (id == RenameMouseProfile || id == DeleteMouseProfile)
     {
@@ -788,7 +1010,8 @@ bool handleMouseBindings(HWND w, SettingsView &view, WPARAM wp)
         return true;
     }
     if (id != EditMouseEvent && id != ResetMouseEvent) return false;
-    const int event = ListView_GetNextItem(GetDlgItem(w, 733), -1, LVNI_SELECTED);
+    const HWND list = GetDlgItem(w, 733);
+    const int event = mouseEventAtRow(list, ListView_GetNextItem(list, -1, LVNI_SELECTED));
     if (event < 0) return true;
     if (id == EditMouseEvent) showMouseActionEditor(w, view, event);
     else if (auto profile = view.draft.mouseBindings.find(selectedMouseProfile(w, view));
@@ -817,7 +1040,9 @@ void createMousePage(HWND w, SettingsView &view)
     constexpr int profilesLeft = 18, actionsLeft = 369, tableWidth = 333;
     constexpr int profilesRight = profilesLeft + tableWidth;
     label(w, L"Profiles", 18, 64, 120);
-    label(w, L"Mouse events", actionsLeft, 64, tableWidth);
+    label(w, L"Mouse events", actionsLeft, 64, tableWidth - 30);
+    control(w, L"BUTTON", L"Add mouse event", WS_TABSTOP | BS_OWNERDRAW, AddMouseEvent,
+            actionsLeft + tableWidth - 24, 61, 24, 24);
     control(w, L"BUTTON", L"Delete profile", WS_TABSTOP | BS_OWNERDRAW, DeleteMouseProfile, profilesRight - 80, 61, 24, 24);
     control(w, L"BUTTON", L"Edit profile", WS_TABSTOP | BS_OWNERDRAW, RenameMouseProfile, profilesRight - 52, 61, 24, 24);
     control(w, L"BUTTON", L"Add profile", WS_TABSTOP | BS_OWNERDRAW, AddMouseProfile, profilesRight - 24, 61, 24, 24);
@@ -827,6 +1052,7 @@ void createMousePage(HWND w, SettingsView &view)
     addActionApplicationTooltip(tips, w, AddMouseProfile, L"Add profile");
     addActionApplicationTooltip(tips, w, RenameMouseProfile, L"Edit profile");
     addActionApplicationTooltip(tips, w, DeleteMouseProfile, L"Delete profile");
+    addActionApplicationTooltip(tips, w, AddMouseEvent, L"Add mouse event");
     constexpr int listTop = 90, listHeight = 224;
     INITCOMMONCONTROLSEX controls{sizeof(controls), ICC_LISTVIEW_CLASSES};
     InitCommonControlsEx(&controls);
@@ -859,13 +1085,6 @@ void createMousePage(HWND w, SettingsView &view)
     column.pszText = actionTitle;
     column.cx = scale(w, tableWidth - 120);
     ListView_InsertColumn(list, 1, &column);
-    for (int event = 0; event < static_cast<int>(std::size(MouseEvents)); ++event)
-    {
-        LVITEMW item{LVIF_TEXT};
-        item.iItem = event;
-        item.pszText = const_cast<wchar_t *>(MouseEvents[event]);
-        ListView_InsertItem(list, &item);
-    }
     control(w, L"STATIC", MouseEventHint, 0, 740, actionsLeft, 324, tableWidth, 22);
     control(w, L"BUTTON", L"Test mouse buttons here", WS_TABSTOP | BS_PUSHBUTTON,
             737, profilesLeft, listTop + listHeight + 10, tableWidth, 56);

src/update.h

@@ -2,7 +2,7 @@
 #include "platform.h"
 namespace ks
 {
-inline constexpr wchar_t AppVersion[] = L"0.6.64";
+inline constexpr wchar_t AppVersion[] = L"0.6.77";
 inline constexpr UINT UpdateMessage = WM_APP + 7;
 inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
 inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;

tests/chat_profiles.cpp

@@ -134,13 +134,13 @@ int main()
             HWND parent = app.settingsWindow;
             auto saveEnabled=[&] { return IsWindowEnabled(GetDlgItem(parent,IDOK))!=FALSE; };
             auto status=[&] { wchar_t text[256]{}; GetDlgItemTextW(parent,261,text,256); return std::wstring(text); };
-            require(!saveEnabled() && status()==L"No unsaved changes.","new Settings shows clean state with Save disabled");
+            require(!saveEnabled() && status()==L"No unsaved settings.","new Settings shows clean state with Save disabled");
             SendMessageW(parent,WM_COMMAND,IDOK,0);
             require(IsWindow(parent),"Save command with no changes does not apply or close Settings");
             bool originalLog=IsDlgButtonChecked(parent,208)==BST_CHECKED;
             CheckDlgButton(parent,208,originalLog?BST_UNCHECKED:BST_CHECKED);
             SendMessageW(parent,WM_COMMAND,MAKEWPARAM(208,BN_CLICKED),0);
-            require(saveEnabled() && status().find(L"Unsaved changes") == 0,"checkbox edit immediately marks Settings dirty");
+            require(saveEnabled() && status().find(L"Unsaved settings") == 0,"checkbox edit immediately marks Settings dirty");
             CheckDlgButton(parent,208,originalLog?BST_CHECKED:BST_UNCHECKED);
             SendMessageW(parent,WM_COMMAND,MAKEWPARAM(208,BN_CLICKED),0);
             require(!saveEnabled(),"reverting checkbox disables Save again");
@@ -179,7 +179,13 @@ int main()
             SendMessageW(automatic,WM_COMMAND,IDOK,0);
             require(!saveEnabled(),"reverting auto-correction draft disables Save");
             HWND tabs = GetDlgItem(parent, 260);
-            require(tabs && TabCtrl_GetItemCount(tabs) == 6, "six settings categories");
+            require(tabs && TabCtrl_GetItemCount(tabs) == 10, "ten settings categories");
+            wchar_t mcpConfig[4096]{};
+            GetDlgItemTextW(parent, 281, mcpConfig, std::size(mcpConfig));
+            const std::wstring config(mcpConfig);
+            require(config.starts_with(L"[mcp_servers.kswitcher]\r\ncommand = \"") &&
+                    config.find(L"KSwitcher.Config.exe\"\r\nargs = [\"--mcp\"]") != std::wstring::npos,
+                    "MCP tab shows a Codex stdio configuration");
             for (int page = 0; page < TabCtrl_GetItemCount(tabs); ++page)
             {
                 TabCtrl_SetCurSel(tabs, page);
@@ -212,10 +218,18 @@ int main()
             SendMessageW(parent, WM_COMMAND, 259, 0);
             HWND dialog = findTestWindow(L"KSwitcher.ChatLanguages", nullptr);
             require(dialog && !IsWindowEnabled(parent), "chat dialog opens with disabled parent");
-            int index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
-            require(index >= 0, "saved chat listed");
-            SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0);
-            SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0);
+            auto findFixtureChat = [&](HWND chatDialog) {
+                SetDlgItemTextW(chatDialog, 714, L"! fIXTURE CHAT");
+                HWND list = GetDlgItem(chatDialog, 710);
+                require(ListView_GetItemCount(list) == 1, "case-insensitive contact search finds saved chat");
+                wchar_t appName[32]{};
+                ListView_GetItemText(list, 0, 1, appName, std::size(appName));
+                require(std::wstring(appName) == L"Telegram", "chat list shows the source app separately");
+            };
+            SetDlgItemTextW(dialog, 714, L"No matching fixture 8031");
+            require(ListView_GetItemCount(GetDlgItem(dialog, 710)) == 0 &&
+                    !IsWindowEnabled(GetDlgItem(dialog, IDOK)), "empty search results disable profile actions");
+            findFixtureChat(dialog);
             require(SendDlgItemMessageW(dialog, 711, LB_GETSELCOUNT, 0, 0) == 1, "saved single language selected");
             RedrawWindow(dialog, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN);
             RECT rect{}; GetClientRect(dialog, &rect);
@@ -231,9 +245,7 @@ int main()
             require(!saveEnabled(),"cancelled chat edits do not enable Save");
             SendMessageW(parent, WM_COMMAND, 259, 0);
             dialog = findTestWindow(L"KSwitcher.ChatLanguages", nullptr);
-            index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
-            SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0);
-            SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0);
+            findFixtureChat(dialog);
             require(SendDlgItemMessageW(dialog, 711, LB_GETSELCOUNT, 0, 0) == 1, "cancel discards language edits");
             SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1);
             SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(711, LBN_SELCHANGE), 0);
@@ -248,13 +260,11 @@ int main()
             require(!saveEnabled(),"reopened saved Settings is clean");
             SendMessageW(parent, WM_COMMAND, 259, 0);
             dialog = findTestWindow(L"KSwitcher.ChatLanguages", nullptr);
-            index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
-            SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0);
-            SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0);
+            findFixtureChat(dialog);
             SendMessageW(dialog, WM_COMMAND, 713, 0);
             require(IsWindow(dialog), "chat reset keeps dialog open");
             SendMessageW(dialog, WM_COMMAND, IDOK, 0);
-            require(saveEnabled() && status().find(L"Unsaved changes")==0,"removing child profile immediately marks parent dirty");
+            require(saveEnabled() && status().find(L"Unsaved settings")==0,"removing child profile immediately marks parent dirty");
             RedrawWindow(parent,nullptr,nullptr,RDW_INVALIDATE|RDW_UPDATENOW|RDW_ALLCHILDREN);
             GetClientRect(parent,&rect); dc=GetDC(parent);
             clip=ks::screenshotClip(dc,rect.right,rect.bottom,{}); ReleaseDC(parent,dc);
@@ -357,7 +367,9 @@ int main()
             ks::showSettings(app); parent=app.settingsWindow;
             require(!saveEnabled(),"Settings starts clean before separately saved snippet edit");
             ks::showSnippets(app);
-            HWND snippets = app.snippetsWindow;
+            HWND snippets = parent;
+            require(!app.snippetsWindow && IsWindowVisible(GetDlgItem(snippets, 301)),
+                    "opening Snippets from Settings selects its inline editor");
             SendDlgItemMessageW(snippets,301,LB_SETCURSEL,0,0);
             SendMessageW(snippets,WM_COMMAND,MAKEWPARAM(301,LBN_SELCHANGE),0);
             require(IsDlgButtonChecked(snippets,314)==BST_UNCHECKED, "old snippet shows everywhere");
@@ -371,20 +383,20 @@ int main()
             wchar_t appList[128]{};
             GetDlgItemTextW(snippets,315,appList,128);
             require(std::wstring(appList)==L"Notepad.exe, MS-Teams.EXE", "Add app appends a second application without duplicates");
-            SendMessageW(snippets,WM_COMMAND,IDOK,0);
-            require(!app.snippetsWindow && app.settings.snippets[0].apps==std::vector<std::wstring>{L"notepad",L"ms-teams"}, "snippet editor saves selected applications");
-            require(!saveEnabled() && status()==L"No unsaved changes.","separately saved snippet edit leaves Settings clean");
-            SendMessageW(parent,WM_COMMAND,IDCANCEL,0);
-            ks::showSnippets(app);snippets=app.snippetsWindow;
-            SendDlgItemMessageW(snippets,301,LB_SETCURSEL,0,0);
-            SendMessageW(snippets,WM_COMMAND,MAKEWPARAM(301,LBN_SELCHANGE),0);
-            require(IsDlgButtonChecked(snippets,314)==BST_CHECKED, "scope restored when reopening editor");
+            SendMessageW(snippets,WM_COMMAND,318,0);
+            require(IsWindow(snippets) && app.settings.snippets[0].apps==std::vector<std::wstring>{L"notepad",L"ms-teams"}, "inline snippet editor saves selected applications");
+            require(!saveEnabled() && status()==L"No unsaved settings.","separately saved snippet edit leaves Settings clean");
             RedrawWindow(snippets,nullptr,nullptr,RDW_INVALIDATE|RDW_UPDATENOW|RDW_ALLCHILDREN);
             RECT snippetRect{};GetClientRect(snippets,&snippetRect);
             HDC snippetDc=GetDC(snippets);
             auto snippetImage=ks::screenshotClip(snippetDc,snippetRect.right,snippetRect.bottom,{});
             ReleaseDC(snippets,snippetDc);
             ks::atomicWrite(std::filesystem::path(ks::executable()).parent_path()/L"snippet-scopes.png",ks::encodePng(ks::decodeImage(snippetImage)));
+            SendMessageW(parent,WM_COMMAND,IDCANCEL,0);
+            ks::showSnippets(app);snippets=app.snippetsWindow;
+            SendDlgItemMessageW(snippets,301,LB_SETCURSEL,0,0);
+            SendMessageW(snippets,WM_COMMAND,MAKEWPARAM(301,LBN_SELCHANGE),0);
+            require(IsDlgButtonChecked(snippets,314)==BST_CHECKED, "scope restored when reopening editor");
             SetDlgItemTextW(snippets,315,L"chrome.exe");
             SendMessageW(snippets,WM_COMMAND,IDCANCEL,0);
             require(app.settings.snippets[0].apps==std::vector<std::wstring>{L"notepad",L"ms-teams"}, "cancel preserves existing scope");

tests/files_panel_frame.ps1

@@ -0,0 +1,78 @@
+param([string]$Executable = "$PSScriptRoot/../build/files-dev/KSwitcher.Files.exe")
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Drawing
+Add-Type @'
+using System;
+using System.Runtime.InteropServices;
+public static class PanelFrameWindow {
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Rect { public int Left, Top, Right, Bottom; }
+    [DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr window, out Rect rect);
+    [DllImport("user32.dll")] public static extern IntPtr GetDlgItem(IntPtr window, int id);
+    [DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr window);
+    [DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
+    [DllImport("user32.dll")] public static extern IntPtr SetThreadDpiAwarenessContext(IntPtr context);
+}
+'@
+
+function Get-Bounds($Window) {
+    $bounds = [PanelFrameWindow+Rect]::new()
+    if (![PanelFrameWindow]::GetWindowRect($Window, [ref]$bounds)) { throw 'Missing panel control.' }
+    $bounds
+}
+
+function Read-Strip($X, $Y, $Width, $Height) {
+    $bitmap = [Drawing.Bitmap]::new($Width, $Height)
+    try {
+        $graphics = [Drawing.Graphics]::FromImage($bitmap)
+        try { $graphics.CopyFromScreen($X, $Y, 0, 0, $bitmap.Size) }
+        finally { $graphics.Dispose() }
+        for ($row = 0; $row -lt $Height; $row++) {
+            for ($column = 0; $column -lt $Width; $column++) {
+                $bitmap.GetPixel($column, $row).ToArgb()
+            }
+        }
+    } finally { $bitmap.Dispose() }
+}
+
+$process = Start-Process -FilePath (Resolve-Path $Executable) -PassThru
+$previousDpi = [PanelFrameWindow]::SetThreadDpiAwarenessContext([IntPtr](-4))
+try {
+    $keyboard = New-Object -ComObject WScript.Shell
+    for ($attempt = 0; $attempt -lt 50; $attempt++) {
+        $process.Refresh()
+        $window = $process.MainWindowHandle
+        if ($window -and $keyboard.AppActivate($process.Id)) { break }
+        Start-Sleep -Milliseconds 100
+    }
+    Start-Sleep -Milliseconds 300
+    if (!$window -or [PanelFrameWindow]::GetForegroundWindow() -ne $window) {
+        throw 'The test window must be visible and in the foreground.'
+    }
+    foreach ($panel in 0, 1) {
+        $heading = [PanelFrameWindow]::GetDlgItem($window, 140 + $panel)
+        if (![PanelFrameWindow]::IsWindowVisible($heading)) {
+            throw 'Both panels must use Wide mode for the frame test.'
+        }
+        $header = Get-Bounds $heading
+        $list = Get-Bounds ([PanelFrameWindow]::GetDlgItem($window, 102 + $panel))
+        $path = Get-Bounds ([PanelFrameWindow]::GetDlgItem($window, 142 + $panel))
+        $middle = [int](($header.Top + $header.Bottom) / 2)
+        $side = @(Read-Strip ($list.Left - 4) ($header.Top - 2) 4 1)
+        $atHeading = @(Read-Strip ($list.Left - 4) $middle 4 1)
+        if ($side[0] -ne $side[3] -or $side[1] -ne $side[2] -or $side[0] -eq $side[1] -or
+            ($atHeading -join ',') -ne ($side -join ',')) {
+            throw "Panel $panel has a broken double frame beside the column header."
+        }
+        $x = $list.Left + 16
+        $top = @(Read-Strip $x ($path.Top + [Math]::Floor(($path.Bottom - $path.Top) / 2) - 2) 1 4)
+        if (($top -join ',') -ne ($side -join ',')) { throw "Panel $panel has an inconsistent top frame." }
+        $bottom = @(Read-Strip $x ($list.Bottom + 4) 1 ($header.Bottom - $header.Top + 6))
+        $bottom = $bottom[($bottom.Count - 4)..($bottom.Count - 1)]
+        if (($bottom -join ',') -ne ($side -join ',')) { throw "Panel $panel has an inconsistent bottom frame." }
+        Write-Output "Panel $panel double frame verified on screen."
+    }
+} finally {
+    if ($previousDpi) { [void][PanelFrameWindow]::SetThreadDpiAwarenessContext($previousDpi) }
+    if (!$process.HasExited) { [void]$process.CloseMainWindow() }
+}

tests/files_terminal_resize.ps1

@@ -0,0 +1,174 @@
+param([string]$Executable = "$PSScriptRoot/../build/files-dev/KSwitcher.Files.exe", [switch]$GeometryOnly)
+$ErrorActionPreference = 'Stop'
+
+if (!$GeometryOnly) {
+    Add-Type -AssemblyName System.Drawing
+    Add-Type -ReferencedAssemblies @([Drawing.Bitmap].Assembly.Location, [Drawing.Color].Assembly.Location,
+        [Drawing.Graphics].Assembly.Location, [Drawing.Point].Assembly.Location, "System.Collections", "System.Runtime", "System.Threading.Thread", "System.Runtime.InteropServices", "System.Diagnostics.TraceSource", "System.Private.Windows.GdiPlus", "System.Private.Windows.Core") -TypeDefinition @'
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+public static class TerminalFrames
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Rect { public int Left, Top, Right, Bottom; }
+    [DllImport("user32.dll")]
+    public static extern bool GetWindowRect(IntPtr window, out Rect rect);
+
+    [DllImport("user32.dll")]
+    private static extern void keybd_event(byte key, byte scan, uint flags, UIntPtr extra);
+    [DllImport("user32.dll")]
+    private static extern bool SetCursorPos(int x, int y);
+    [DllImport("user32.dll")]
+    private static extern void mouse_event(uint flags, uint x, uint y, uint data, UIntPtr extra);
+    [DllImport("user32.dll", CharSet=CharSet.Unicode)]
+    private static extern IntPtr FindWindowEx(IntPtr parent, IntPtr after, string kind, string title);
+    [DllImport("user32.dll", CharSet=CharSet.Unicode)]
+    private static extern IntPtr SendMessage(IntPtr window, int message, IntPtr length, System.Text.StringBuilder text);
+
+    public static void ClickOutput(IntPtr window)
+    {
+        Rect bounds;
+        if (!GetWindowRect(window, out bounds)) throw new InvalidOperationException("Missing test window.");
+        SetCursorPos((bounds.Left + bounds.Right) / 2, (bounds.Top + bounds.Bottom) / 2);
+        mouse_event(2, 0, 0, 0, UIntPtr.Zero);
+        mouse_event(4, 0, 0, 0, UIntPtr.Zero);
+    }
+
+    public static string ReadCommand(IntPtr window)
+    {
+        var input = FindWindowEx(window, IntPtr.Zero, "Edit", null);
+        var text = new System.Text.StringBuilder(256);
+        SendMessage(input, 13, new IntPtr(text.Capacity), text);
+        return text.ToString();
+    }
+
+    public static int[] Capture(IntPtr window, byte direction, int repeats)
+    {
+        Rect bounds;
+        if (!GetWindowRect(window, out bounds)) throw new InvalidOperationException("Missing test window.");
+        var positions = new List<int>();
+        var clock = Stopwatch.StartNew();
+        using (var bitmap = new Bitmap(150, 320))
+        using (var graphics = Graphics.FromImage(bitmap))
+        {
+            var trigger = new Thread(() => {
+                Thread.Sleep(100);
+                keybd_event(17, 0, 0, UIntPtr.Zero);
+                for (int i = 0; i < repeats; i++)
+                {
+                    keybd_event(direction, 0, 1, UIntPtr.Zero);
+                    if (i + 1 < repeats) Thread.Sleep(30);
+                }
+                keybd_event(direction, 0, 3, UIntPtr.Zero);
+                keybd_event(17, 0, 2, UIntPtr.Zero);
+            });
+            trigger.Start();
+            while (clock.ElapsedMilliseconds < 650)
+            {
+                graphics.CopyFromScreen(bounds.Left + 4, bounds.Bottom - 340, 0, 0, bitmap.Size);
+                int marker = -1;
+                for (int y = 0; y < bitmap.Height && marker < 0; y++)
+                    for (int x = 0; x < bitmap.Width; x++)
+                    {
+                        var color = bitmap.GetPixel(x, y);
+                        if (color.R > 140 && color.B > 140 && color.R - color.G > 35 && color.B - color.G > 35) { marker = y; break; }
+                    }
+                positions.Add(marker);
+                Thread.Sleep(4);
+            }
+            trigger.Join();
+        }
+        return positions.ToArray();
+    }
+}
+'@
+}
+function Wait-ForTrace([string]$Pattern, [int]$After = 0) {
+    for ($attempt = 0; $attempt -lt 100; $attempt++) {
+        $lines = @(Get-Content -LiteralPath $trace -ErrorAction SilentlyContinue)
+        $match = $lines | Select-Object -Skip $After | Where-Object { $_ -match $Pattern } | Select-Object -First 1
+        if ($match) { return $match }
+        Start-Sleep -Milliseconds 100
+    }
+    throw "Missing terminal event: $Pattern"
+}
+
+$process = Start-Process -FilePath (Resolve-Path $Executable) -ArgumentList '--terminal-trace' -PassThru
+$trace = Join-Path ([IO.Path]::GetTempPath()) "KSwitcher.Files.terminal-trace-$($process.Id).log"
+try {
+    $keyboard = New-Object -ComObject WScript.Shell
+    for ($attempt = 0; $attempt -lt 50 -and !$keyboard.AppActivate($process.Id); $attempt++) {
+        Start-Sleep -Milliseconds 100
+    }
+    if (!$keyboard.AppActivate($process.Id)) { throw 'Could not focus the test window.' }
+    Wait-ForTrace ' layout ' | Out-Null
+    for ($attempt = 0; $attempt -lt 20; $attempt++) {
+        $lines = @(Get-Content -LiteralPath $trace)
+        if ($lines -match ' layout \d+ \d+ \d+ 1 1$') { break }
+        if ($keyboard.AppActivate($process.Id)) { $keyboard.SendKeys('^o') }
+        Start-Sleep -Milliseconds 250
+    }
+    Wait-ForTrace ' web-anchor ' | Out-Null
+    if (!$GeometryOnly) {
+        [TerminalFrames]::ClickOutput($process.MainWindowHandle)
+        Start-Sleep -Milliseconds 200
+        $keyboard.SendKeys('focus-check')
+        Start-Sleep -Milliseconds 200
+        if ([TerminalFrames]::ReadCommand($process.MainWindowHandle) -ne 'focus-check') {
+            throw 'Typing after clicking terminal output did not reach the command line.'
+        }
+        $keyboard.SendKeys('^a{BACKSPACE}')
+        $keyboard.SendKeys('alpha beta gamma^{BACKSPACE}^{BACKSPACE}')
+        Start-Sleep -Milliseconds 150
+        if ([TerminalFrames]::ReadCommand($process.MainWindowHandle) -ne 'alpha ') {
+            throw 'Ctrl+Backspace did not delete one word per press.'
+        }
+        $keyboard.SendKeys('^a{BACKSPACE}')
+        Write-Output 'Typing after clicking terminal output reached the command line.'
+    }
+    $keyboard.SendKeys('[Console]::WriteLine{(}{[}char{]}27 {+} "{[}95mMMMMMMMM" {+} {[}char{]}27 {+} "{[}0m"{)}{ENTER}')
+    Start-Sleep -Milliseconds 500
+    $keyboard.SendKeys('^o')
+    for ($row = 0; $row -lt 5; $row++) { $keyboard.SendKeys('^{UP}') }
+    Start-Sleep -Milliseconds 500
+
+    foreach ($scenario in @(@{Key='UP'; Count=1}, @{Key='DOWN'; Count=1}, @{Key='UP'; Count=10})) {
+        $direction = $scenario.Key
+        $repeats = $scenario.Count
+        $after = @(Get-Content -LiteralPath $trace).Count
+        $event = if ($direction -eq 'UP') { 'grow' } else { 'shrink' }
+        $frames = $null
+        if ($GeometryOnly) {
+            $keyboard.SendKeys("^{$direction $repeats}")
+        } else {
+            $key = if ($direction -eq 'UP') { 38 } else { 40 }
+            $frames = [TerminalFrames]::Capture($process.MainWindowHandle, $key, $repeats)
+        }
+        Wait-ForTrace " key-$event " $after | Out-Null
+        Wait-ForTrace ' layout ' $after | Out-Null
+        Start-Sleep -Milliseconds 250
+        $events = @(Get-Content -LiteralPath $trace | Select-Object -Skip $after)
+        if (@($events -match " key-$event ").Count -lt $repeats) {
+            throw "Did not deliver all $repeats Ctrl+$direction events."
+        }
+        if ($events -match ' web-after-fit ') { throw "Terminal grid resized after Ctrl+$direction." }
+        if (!$GeometryOnly) {
+            $baseline = $frames[0]
+            if ($baseline -lt 0 -or $frames[-1] -lt 0) {
+                throw "Terminal marker was not visible at rest for Ctrl+$direction."
+            }
+            $shifted = @($frames | Where-Object { $_ -lt 0 -or [Math]::Abs($_ - $baseline) -gt 2 })
+            if ($shifted.Count) {
+                throw "Ctrl+$direction shifted or hid the marker in $($shifted.Count) of $($frames.Count) frames (rest Y=$baseline, sampled Y=$($frames | Sort-Object -Unique))."
+            }
+        }
+        Write-Output "Ctrl+$direction x$repeats kept the terminal grid stable."
+    }
+} finally {
+    if (!$process.HasExited) { $null = $process.CloseMainWindow() }
+}

tests/input.cpp

@@ -125,6 +125,27 @@ struct InputRegressionAccess {
         return a.notifiedUpdate;
     }
     static void click() { MSLLHOOKSTRUCT m{}; m.flags=LLMHF_INJECTED; App::mouseProc(HC_ACTION,WM_LBUTTONDOWN,(LPARAM)&m); }
+    static bool wheelQueuesAction(App &app)
+    {
+        MSLLHOOKSTRUCT mouse{};
+        if (!GetCursorPos(&mouse.pt) || !WindowFromPoint(mouse.pt)) return false;
+        auto previous = app.settings;
+        app.settings.customMouseEvents[L"Wheel down"] = L"Wheel test";
+        app.settings.mouseBindings[GlobalMouseProfile][L"Wheel down"] = {MouseActionType::Mute};
+        mouse.mouseData = MAKEWPARAM(0, static_cast<WORD>(-30));
+        const auto wheel = [&] { return App::mouseProc(HC_ACTION, WM_MOUSEWHEEL, reinterpret_cast<LPARAM>(&mouse)); };
+        mouse.flags = LLMHF_INJECTED;
+        wheel();
+        const bool ignoredInjection = app.mouseActions.empty();
+        mouse.flags = 0;
+        const bool partial = wheel() == 1 && app.mouseActions.empty();
+        mouse.mouseData = MAKEWPARAM(0, static_cast<WORD>(-90));
+        const bool queued = wheel() == 1 && app.mouseActions.size() == 1 &&
+                            app.mouseActions.front().action.type == MouseActionType::Mute;
+        app.mouseActions.clear();
+        app.settings = std::move(previous);
+        return ignoredInjection && partial && queued;
+    }
     static bool volumeHoldStopsOnRelease(App &app)
     {
         constexpr int button = 3;
@@ -203,6 +224,8 @@ int main(int argc, char **argv) {
             require(app.window!=nullptr,"message-only test window");
             require(ks::InputRegressionAccess::volumeHoldStopsOnRelease(app),
                     "volume hold repeats after its delay and stops on release without an extra step");
+            require(ks::InputRegressionAccess::wheelQueuesAction(app),
+                    "a registered physical wheel signal queues one action per detent");
             require(ks::mouseVolumeRepeatInterval(350) > ks::mouseVolumeRepeatInterval(1000) &&
                     ks::mouseVolumeRepeatInterval(1000) > ks::mouseVolumeRepeatInterval(2000) &&
                     !ks::isMouseVolumeStep(ks::MouseActionType::Mute),
@@ -777,12 +800,52 @@ int main(int argc, char **argv) {
             require(fitted.left==0&&fitted.top==0&&fitted.right==1200&&fitted.bottom==800,"oversized disconnected-monitor window fits work area");
             fitted=ks::fitWindowRect({2000,2000,2600,2400},{-1920,0,0,1080});
             require(fitted.left==-600&&fitted.top==680&&fitted.right==0,"negative-coordinate monitor supported");
+            // The fixture has a message-only window and no keyboard hook.
+            app.settings.toggle = app.settings.casing = app.settings.translit =
+                app.settings.undo = app.settings.clipboard = app.settings.screenshot = L"";
+            std::fill(app.settings.direct.begin(), app.settings.direct.end(), L"");
             ks::showSettings(app,false);
             {
                 auto settings = app.settingsWindow;
                 auto tabs = GetDlgItem(settings, 260);
                 auto capture = GetDlgItem(settings, 737);
                 auto events = GetDlgItem(settings, 733);
+                auto visible = [&](int id) { return (GetWindowLongPtrW(GetDlgItem(settings, id), GWL_STYLE) & WS_VISIBLE) != 0; };
+                auto selectPage = [&](int index) {
+                    TabCtrl_SetCurSel(tabs, index);
+                    NMHDR changed{tabs, 260, TCN_SELCHANGE};
+                    SendMessageW(settings, WM_NOTIFY, 260, reinterpret_cast<LPARAM>(&changed));
+                };
+                RECT lastTab{}, tabClient{};
+                GetClientRect(tabs, &tabClient);
+                require(TabCtrl_GetItemCount(tabs) == 10 && TabCtrl_GetItemRect(tabs, 9, &lastTab) &&
+                        lastTab.right <= tabClient.right, "all Settings tabs fit in one row");
+                selectPage(3);
+                require(visible(257) && !visible(301), "OCR options are in Clipboard");
+                selectPage(6);
+                require(visible(258) && !visible(262), "Sync has its own tab");
+                selectPage(7);
+                require(visible(262) && !visible(258), "Computers has its own tab");
+                selectPage(8);
+                require(visible(208) && visible(256), "logging controls are in Diagnostics");
+                selectPage(4);
+                require(visible(301) && visible(303) && visible(318), "Snippets has an inline editor and its own Save button");
+                const bool awake = app.settings.awake;
+                SendDlgItemMessageW(settings, 205, BM_SETCHECK, awake ? BST_UNCHECKED : BST_CHECKED, 0);
+                SendMessageW(settings, WM_COMMAND, 310, 0);
+                SetDlgItemTextW(settings, 302, L";inline-fixture");
+                SetDlgItemTextW(settings, 303, L"inline snippet");
+                selectPage(0);
+                selectPage(4);
+                SendMessageW(settings, WM_COMMAND, 318, 0);
+                require(app.settings.awake == awake && IsWindowEnabled(GetDlgItem(settings, IDOK)) &&
+                        std::any_of(app.settings.snippets.begin(), app.settings.snippets.end(), [](const ks::Snippet &snippet) {
+                            return snippet.trigger == L";inline-fixture" && snippet.text == L"inline snippet";
+                        }), "saving inline snippets preserves the unsaved settings draft across tab changes");
+                SendDlgItemMessageW(settings, 205, BM_SETCHECK, awake ? BST_CHECKED : BST_UNCHECKED, 0);
+                SendMessageW(settings, WM_COMMAND, 311, 0);
+                SendMessageW(settings, WM_COMMAND, 318, 0);
+                selectPage(0);
                 require(!(GetWindowLongPtrW(capture, GWL_STYLE) & WS_VISIBLE),
                         "mouse detection is hidden on General");
                 TabCtrl_SetCurSel(tabs, 5);
@@ -828,6 +891,14 @@ int main(int argc, char **argv) {
                 require(!IsWindowEnabled(GetDlgItem(settings, IDOK)), "button detection is not a settings edit");
                 require(ListView_GetItemCount(events) == 8 && Header_GetItemCount(ListView_GetHeader(events)) == 2,
                         "mouse events have eight rows and two columns");
+                SendMessageW(settings, WM_COMMAND, 762, 0);
+                const auto addEvent = FindWindowW(L"KSwitcher.AddMouseEvent", nullptr);
+                require(addEvent && GetDlgItem(addEvent, 764) && GetDlgItem(addEvent, 763) &&
+                        !IsWindowEnabled(GetDlgItem(addEvent, IDOK)), "Add mouse event waits for a physical signal");
+                SendMessageW(addEvent, WM_COMMAND, IDOK, 0);
+                require(IsWindow(addEvent) && ListView_GetItemCount(events) == 8,
+                        "the event editor cannot save an uncaptured signal");
+                SendMessageW(addEvent, WM_COMMAND, IDCANCEL, 0);
                 NMITEMACTIVATE click{};
                 click.hdr = {events, 733, NM_DBLCLK};
                 click.iItem = 7;

tests/integration.cpp

@@ -10,6 +10,41 @@ namespace ks
 struct InputRegressionAccess
 {
     static bool hasLast(App &app) { return app.last.has_value(); }
+    static bool suggestionsVisible(const App &app)
+    {
+        return app.snippetPopup && IsWindowVisible(app.snippetPopup);
+    }
+    static bool suggestionsNearCaret(const App &app)
+    {
+        GUITHREADINFO info{sizeof(info)};
+        RECT popup{};
+        if (!GetGUIThreadInfo(GetCurrentThreadId(), &info) || !info.hwndCaret ||
+            !GetWindowRect(app.snippetPopup, &popup))
+            return false;
+        POINT caret{info.rcCaret.left, info.rcCaret.bottom};
+        return ClientToScreen(info.hwndCaret, &caret) &&
+               caret.x >= popup.left && caret.x <= popup.right &&
+               std::min(std::abs(caret.y - popup.top), std::abs(caret.y - popup.bottom)) <= 32;
+    }
+    static LONG suggestionsWidth(const App &app)
+    {
+        RECT popup{};
+        GetWindowRect(app.snippetPopup, &popup);
+        return popup.right - popup.left;
+    }
+    static bool findingSuggestionCaret(const App &app) { return app.snippetCaretPending; }
+    static void watchSuggestions(App &app, int &hideCount)
+    {
+        SetWindowSubclass(app.snippetPopup, [](HWND window, UINT message, WPARAM wp, LPARAM lp,
+                                             UINT_PTR, DWORD_PTR context) -> LRESULT {
+            if (message == WM_WINDOWPOSCHANGING &&
+                (reinterpret_cast<const WINDOWPOS *>(lp)->flags & SWP_HIDEWINDOW))
+                ++*reinterpret_cast<int *>(context);
+            return DefSubclassProc(window, message, wp, lp);
+        }, 1, reinterpret_cast<DWORD_PTR>(&hideCount));
+        std::lock_guard lock(app.stateMutex);
+        app.run.at = GetTickCount64() - 2500;
+    }
     static bool deferring(App &app)
     {
         std::lock_guard lock(app.stateMutex);
@@ -23,6 +58,8 @@ ks::App *app{};
 HWND host{}, field{};
 ks::Clip saved;
 bool snippetRecoveryOnly = false;
+LONG unfilteredSnippetWidth{};
+int snippetPopupHides{};
 bool captured = false, failed = false;
 bool conversionOnly = false;
 bool typosOnly = false;
@@ -185,6 +222,19 @@ void record(const std::wstring &keys)
     for (wchar_t c : keys)
         app->run.record(c, host, app->layouts[en].handle, GetTickCount64());
 }
+void typeKeys(std::initializer_list<WORD> keys)
+{
+    std::vector<INPUT> inputs;
+    for (WORD key : keys)
+        for (DWORD flags : {DWORD(0), DWORD(KEYEVENTF_KEYUP)})
+        {
+            auto input = ks::keyboardInput(key, flags);
+            input.ki.dwExtraInfo = 123; // Traverse the real keyboard hook.
+            inputs.push_back(input);
+        }
+    require(SendInput(static_cast<UINT>(inputs.size()), inputs.data(), sizeof(INPUT)) == inputs.size(),
+            "snippet autocomplete keyboard input submitted");
+}
 void finish()
 {
     KillTimer(host, 1);
@@ -589,6 +639,75 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                 require(ks::readClipboard(app->window).text() == sentinel, "selected and repeated conversions restore clipboard");
                 finish();
                 break;
+            case 66:
+                saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
+                captured = true;
+                app->ownSequence = ks::writeClipboard(app->window, ks::textClip(sentinel));
+                app->settings.snippets = {{L";qz-first", L"first"}, {L";qz-second", L"second"},
+                    {L";other-much-longer-trigger", L"unrelated"},
+                    {L";qz-unavailable", L"unavailable", L"", {L"kswitcher-no-such-process"}}};
+                ActivateKeyboardLayout(app->layouts[en].handle, 0);
+                prepare(L"prefix ", false);
+                typeKeys({VK_OEM_1});
+                break;
+            case 67:
+                require(ks::InputRegressionAccess::suggestionsVisible(*app) && GetFocus() == field,
+                        "semicolon alone shows suggestions without moving focus");
+                require(ks::InputRegressionAccess::suggestionsNearCaret(*app),
+                        "suggestions open beside the editor caret");
+                unfilteredSnippetWidth = ks::InputRegressionAccess::suggestionsWidth(*app);
+                ks::InputRegressionAccess::watchSuggestions(*app, snippetPopupHides);
+                typeKeys({'Q', 'Z'});
+                break;
+            case 68:
+                require(ks::InputRegressionAccess::suggestionsVisible(*app) && snippetPopupHides == 0,
+                        "typing after a pause filters suggestions without hiding the popup");
+                require(ks::InputRegressionAccess::suggestionsNearCaret(*app),
+                        "filtering keeps suggestions beside the updated editor caret");
+                require(ks::InputRegressionAccess::suggestionsWidth(*app) < unfilteredSnippetWidth,
+                        "suggestions narrow when the longest trigger is filtered out");
+                typeKeys({VK_ESCAPE});
+                break;
+            case 69:
+                require(!ks::InputRegressionAccess::suggestionsVisible(*app) && text() == L"prefix ;qz",
+                        "Escape dismisses suggestions and preserves typed text");
+                typeKeys({VK_BACK, 'Z'});
+                break;
+            case 70:
+                require(ks::InputRegressionAccess::suggestionsVisible(*app), "editing the prefix reopens suggestions");
+                enterPresses = 0;
+                typeKeys({VK_UP, VK_RETURN});
+                break;
+            case 71:
+                require(text() == L"prefix second", "Up wraps to the last eligible snippet and Enter replaces only the prefix");
+                require(enterPresses == 0 && !ks::InputRegressionAccess::suggestionsVisible(*app),
+                        "confirming with Enter closes suggestions without sending Enter to the editor");
+                require(ks::readClipboard(app->window).text() == sentinel, "autocomplete restores the clipboard");
+                prepare(L"prefix ", false);
+                typeKeys({VK_OEM_1, 'Q', 'Z'});
+                break;
+            case 72:
+                require(ks::InputRegressionAccess::suggestionsVisible(*app), "suggestions reopen for a new prefix");
+                typeKeys({VK_RETURN});
+                break;
+            case 73:
+                require(enterPresses == 1 && text() == L"prefix ;qz\r\n" &&
+                        !ks::InputRegressionAccess::suggestionsVisible(*app),
+                        "Enter without arrow navigation reaches the editor");
+                app->resetInput();
+                SetFocus(host);
+                typeKeys({VK_OEM_1});
+                break;
+            case 74:
+                if (ks::InputRegressionAccess::findingSuggestionCaret(*app))
+                {
+                    stage = 74;
+                    break;
+                }
+                require(!ks::InputRegressionAccess::suggestionsVisible(*app),
+                        "suggestions stay hidden when the focused window has no text caret");
+                finish();
+                break;
             case 64:
                 saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
                 captured = true;
@@ -1061,6 +1180,8 @@ int main(int argc, char **argv)
             snippetRecoveryOnly = argc > 1 && std::string(argv[1]) == "--snippet-recovery-only";
             if (snippetRecoveryOnly || (argc > 1 && std::string(argv[1]) == "--snippets-only"))
                 stage = 64;
+            if (argc > 1 && std::string(argv[1]) == "--snippet-autocomplete")
+                stage = 66;
             SetTimer(host, 1, 100, nullptr);
             auto forwarding = SetWindowsHookExW(WH_KEYBOARD_LL,forwardingHook,GetModuleHandleW(nullptr),0);
             require(forwarding!=nullptr,"downstream forwarding fixture installed before application hook");

tests/lan_clipboard.cpp

@@ -48,6 +48,37 @@ int main(){try{
     check(restarted.deliveries.size()==1&&restarted.deliveries[0].bytes==Bytes({1,2,3}),"clipboard works after peer restart");
     bool limited=false;try{a.queue({bid},Bytes(32*1024*1024+1),"large",12000);}catch(...){limited=true;}
     check(limited,"oversized clipboard bounded");
+    {
+        ClipboardExchange sender(aid,"file-transfer"),receiver(bid,"file-transfer"),clipboard(bid);
+        sender.peerSession(bid,receiver.session());receiver.peerSession(aid,sender.session());
+        clipboard.peerSession(aid,sender.session());
+        sender.queue({bid},payload,"file",1);
+        Json first;
+        for(uint64_t now=10;now<1000&&receiver.deliveries.empty();now+=10)
+        {
+            sender.poll(trusted,now,[&](const auto &to,const Json &packet){
+                check(to==bid && packet.at("type")=="file-transfer" && packet.dump().size()<=2048,
+                    "file transfer targets a single peer on its own channel");
+                if(first.is_null())first=packet;
+                packets.push_back({to,packet});
+            });
+            while(!packets.empty())
+            {
+                auto packet=std::move(packets.front().second);packets.pop_front();
+                receiver.receive(aid,key,packet,now,0,ack);
+            }
+            while(!acks.empty())
+            {
+                auto packet=std::move(acks.front().second);acks.pop_front();
+                sender.receive(bid,key,packet,now,0,output);
+            }
+        }
+        check(receiver.deliveries.size()==1&&receiver.deliveries.front().bytes==payload,"file payload arrives intact");
+        first["session"]=clipboard.session();
+        bool isolated=false;
+        try{clipboard.receive(aid,key,first,1001,0,ack);}catch(...){isolated=true;}
+        check(isolated&&acks.empty(),"file ciphertext cannot be injected into the clipboard channel");
+    }
     {
         WSADATA startup{};check(WSAStartup(MAKEWORD(2,2),&startup)==0,"UDP benchmark starts");
         SOCKET sa=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP),sb=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);

tests/screenshot_ui.cpp

@@ -14,7 +14,18 @@ int main(int argc, char **argv)
             std::filesystem::create_directories(root);
             struct Cleanup {std::filesystem::path root; ~Cleanup(){std::error_code ec; std::filesystem::remove_all(root,ec);}} cleanup{root};
             ks::ScreenshotHost app{GetModuleHandleW(nullptr)};
+            app.smoothingPreference=root/L"screenshot-smoothing";
             ks::Capture c(app);
+            require(c.smoothing==25,"missing preference uses default smoothing");
+            c.smoothing=61;
+            c.smoothingPreferenceDirty=true;
+            c.saveSmoothingPreference();
+            ks::Capture reopened(app);
+            require(reopened.smoothing==61,"new editor restores saved smoothing");
+            ks::atomicWrite(app.smoothingPreference,ks::Bytes{101});
+            ks::Capture invalidPreference(app);
+            require(invalidPreference.smoothing==25,"invalid preference uses default smoothing");
+            std::filesystem::remove(app.smoothingPreference);
             c.image=std::make_unique<ks::Surface>(320,240);
             PatBlt(c.image->dc,0,0,320,240,WHITENESS);
             c.marks={ks::Mark{{40,40},{180,140},0}};

tests/settings_merge.cpp

@@ -27,9 +27,9 @@ int main(){try{
     if (merged.mouseBindings.at(L"chrome").size() != 2)
         throw std::runtime_error("independent mouse bindings lost");
     auto shared = sharedSyncSettings(merged);
-    if (shared != sharedSyncSettings(base) ||
-        restoreSyncSettings(shared, merged, {}, false).mouseBindings != merged.mouseBindings)
-        throw std::runtime_error("mouse profiles must stay local during sync");
+    if (shared == sharedSyncSettings(base) ||
+        restoreSyncSettings(shared, Settings{}, {}, false).mouseBindings != merged.mouseBindings)
+        throw std::runtime_error("mouse profiles must restore from a synchronized backup");
     auto withButtons = merged;
     draft = current = withButtons;
     draft.mouseBindings.at(L"chrome").erase(L"XButton1");
@@ -100,5 +100,38 @@ int main(){try{
     try { validateSettings(profiles); }
     catch (const std::runtime_error &e) { rejected = std::string(e.what()).starts_with("Mouse action conflict:"); }
     if (!rejected) throw std::runtime_error("overlapping active profiles must be rejected");
+    Settings wheel;
+    const int down = mouseWheelEvent(WM_MOUSEWHEEL, -WHEEL_DELTA);
+    RAWMOUSE raw{};
+    raw.usButtonFlags = RI_MOUSE_WHEEL;
+    raw.usButtonData = static_cast<USHORT>(-WHEEL_DELTA);
+    if (rawMouseSignal(raw) != down || mouseEventEnabled(wheel, down))
+        throw std::runtime_error("wheel capture must match the runtime signal and be opt-in");
+    raw.usButtonFlags = RI_MOUSE_HWHEEL;
+    if (rawMouseSignal(raw) != mouseWheelEvent(WM_MOUSEHWHEEL, -WHEEL_DELTA))
+        throw std::runtime_error("horizontal wheel capture must match the runtime signal");
+    int remainder{};
+    if (mouseWheelSteps(remainder, -30) != 0 || mouseWheelSteps(remainder, -90) != 1 ||
+        mouseWheelSteps(remainder, 240) != 2 || remainder != 0)
+        throw std::runtime_error("high-resolution wheel deltas must accumulate by detent");
+    wheel.customMouseEvents.emplace(MouseEvents[down], L"Lower volume");
+    wheel.mouseBindings[GlobalMouseProfile][MouseEvents[down]] = {MouseActionType::VolumeDown};
+    wheel.mouseBindings[L"name:Browser"][L"XButton1"] = {MouseActionType::Back};
+    wheel.mouseProfileApplications[L"name:Browser"] = {L"chrome"};
+    wheel.disabledMouseProfiles.insert(L"name:Browser");
+    wheel.appLanguageSets[L"Browser"] = {{L"win:00000409"}, {L"chrome"}};
+    const auto restoredWheel = decodeSettings(encodeSettings(wheel), {});
+    const auto syncedWheel = restoreSyncSettings(sharedSyncSettings(wheel), Settings{}, {});
+    if (mouseEventName(restoredWheel, down) != L"Lower volume" ||
+        !effectiveMouseAction(restoredWheel, L"explorer", down) ||
+        sharedSyncSettings(syncedWheel) != sharedSyncSettings(wheel))
+        throw std::runtime_error("custom wheel event and action must restore from a synchronized backup");
+    if (!restoreSyncSettings(sharedSyncSettings(Settings{}), wheel, {}).customMouseEvents.empty())
+        throw std::runtime_error("an explicit empty backup must clear custom mouse events");
+    wheel.customMouseEvents.clear();
+    rejected = false;
+    try { validateSettings(wheel); }
+    catch (const std::runtime_error &) { rejected = true; }
+    if (!rejected) throw std::runtime_error("unregistered mouse signals cannot have bindings");
     std::cout<<"Settings-save merge checks passed\n";
 }catch(const std::exception &e){std::cerr<<e.what()<<'\n';return 1;}}

tests/sync.cpp

@@ -155,11 +155,25 @@ int main()
             rightScope["snippets"].back()["apps"]=Json::array({"NOTEPAD.exe"});
             rejects([&]{mergeSyncSettings(base,bytes(leftScope),bytes(rightScope));}, "sync detects overlapping application scopes");
         }
-        require(!j.contains("startWithSystem") && !j.contains("tesseractPath") && !j.contains("historyEnabled"), "local-only fields excluded");
-        auto restored = restoreSyncSettings(base, local, {});
-        require(restored.autostart && restored.elevatedAutostart && !restored.history && restored.tesseractPath == local.tesseractPath, "preserve device settings");
-        auto hostile = j; hostile["startWithSystem"] = false;
-        rejects([&] { restoreSyncSettings(bytes(hostile), local, {}); }, "reject injected device setting");
+        require(j.contains("startWithSystem") && j.contains("tesseractPath") && j.contains("historyEnabled"),
+                "server backup includes startup, OCR and history settings");
+        auto restored = restoreSyncSettings(base, Settings{}, {});
+        require(sharedSyncSettings(restored) == base, "restore all settings onto a fresh installation");
+        auto legacySettings = j;
+        for (auto key : {"startWithSystem", "autostartAsAdministrator", "tesseractPath", "useTesseract",
+                         "historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock",
+                         "appLanguageSets", "mouseBindings", "disabledMouseProfiles", "mouseProfileApplications", "customMouseEvents"})
+            legacySettings.erase(key);
+        FakeProvider legacyProvider;
+        legacyProvider.remote = {3, bytes(legacySettings)};
+        auto recovered = synchronize(legacyProvider, {}, base, SyncAction::Download);
+        require(sharedSyncSettings(restoreSyncSettings(recovered.settings, local, {})) == base &&
+                legacyProvider.writes == 0, "older server backup preserves fields it never stored");
+        auto upgraded = synchronize(legacyProvider, bytes(legacySettings), base, SyncAction::Automatic);
+        require(legacyProvider.writes == 1 && parse(upgraded.settings) == j,
+                "automatic sync upgrades an older server backup");
+        auto hostile = j; hostile["unknownSetting"] = false;
+        rejects([&] { restoreSyncSettings(bytes(hostile), local, {}); }, "reject unsupported settings");
         hostile = j; hostile["schemaVersion"] = 2;
         rejects([&] { restoreSyncSettings(bytes(hostile), local, {}); }, "reject future schema");
         hostile = j; hostile["layouts"] = Json::array({"00000422"});

tests/tests.cpp

@@ -592,6 +592,10 @@ int main(int argc, char **argv)
             require(!edited.suggest(L"hlelo ", 0, layouts, options), "never-correct overrides explicit pairs");
             options.autoNever.clear();
             options.autoReplacements[L"мамамила"] = L"мама мила";
+            options.autoReplacements[L"нав1язав"] = L"нав’язав";
+            ks::validateSettings(options);
+            correction = edited.suggest(L"Нав1язав ", 2, layouts, options);
+            require(correction && correction->text == L"Нав’язав ", "explicit replacements accept digits in the typo");
             for (const auto *text : {L"рев'ю", L"рев’ю", L"ревʼю", L"моє рев'ю"})
             {
                 options.autoReplacements[L"ревю"] = text;

tools/stage-files-terminal.ps1

@@ -0,0 +1,28 @@
+param([Parameter(Mandatory)][string]$Destination)
+$ErrorActionPreference = 'Stop'
+$root = Split-Path $PSScriptRoot
+$deps = New-Item -ItemType Directory -Force (Join-Path $root 'build/terminal-deps')
+$version = '1.0.4314.35'
+if (!(Test-Path "$deps/sdk/build/native/include/WebView2.h")) {
+    Invoke-WebRequest "https://api.nuget.org/v3-flatcontainer/microsoft.web.webview2/$version/microsoft.web.webview2.$version.nupkg" -OutFile "$deps/sdk.zip"
+    Expand-Archive "$deps/sdk.zip" "$deps/sdk" -Force
+}
+$assets = New-Item -ItemType Directory -Force (Join-Path $Destination 'terminal')
+foreach ($package in @(
+    @{ Name='xterm'; Spec='@xterm/[email protected]'; Archive='xterm-xterm-6.0.0.tgz'; Files=@{'lib/xterm.js'='xterm.js'; 'css/xterm.css'='xterm.css'; 'LICENSE'='xterm-LICENSE.txt'} },
+    @{ Name='fit'; Spec='@xterm/[email protected]'; Archive='xterm-addon-fit-0.11.0.tgz'; Files=@{'lib/addon-fit.js'='addon-fit.js'; 'LICENSE'='addon-fit-LICENSE.txt'} }
+)) {
+    if (!(Test-Path "$deps/$($package.Archive)")) {
+        & npm.cmd pack $package.Spec --pack-destination $deps.FullName --silent | Out-Host
+        if ($LASTEXITCODE) { throw "Could not download $($package.Spec)" }
+    }
+    $unpacked = New-Item -ItemType Directory -Force "$deps/$($package.Name)"
+    & tar -xf "$deps/$($package.Archive)" -C $unpacked.FullName
+    if ($LASTEXITCODE) { throw "Could not unpack $($package.Spec)" }
+    foreach ($file in $package.Files.Keys) {
+        Copy-Item "$unpacked/package/$file" "$assets/$($package.Files[$file])" -Force
+    }
+}
+Copy-Item "$root/resources/terminal/*" $assets -Force
+Copy-Item "$deps/sdk/build/native/x64/WebView2Loader.dll" $Destination -Force
+"$deps/sdk/build/native/include"