feat: type hints green [bracketed] notation, workspace cleanup, unique naming

- Type inference hints now show value-first with bracketed type in comment
  green: "0x7ff718570000 [ptr64]", "6, 16 [int32_t×2]"
- Raise hint threshold to strong-only (score >= 75%)
- Remove Bool inference, widen Int16 range to ±16384
- Workspace: remove dead WorkspaceProxy, fix null deref, debounce search,
  cache icons, add pinning support
- Unique naming: UnnamedClass0/UnnamedEnum1 with global counter
- Footer buttons: +10h +100h +1000h replacing +1024
- MCP: project lifecycle API, snapshot provider fix

.github/workflows/build.yml

@@ -2,7 +2,8 @@ name: Build
 
 on:
   push:
-    branches: [main]
+    branches:
+      - "**"
   pull_request:
     branches: [main]
 
@@ -21,9 +22,9 @@ jobs:
       - name: Install Qt6 and MinGW
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.8.1'
-          arch: 'win64_mingw'
-          tools: 'tools_mingw1310,qt.tools.win64_mingw1310'
+          version: "6.8.1"
+          arch: "win64_mingw"
+          tools: "tools_mingw1310,qt.tools.win64_mingw1310"
           cache: true
 
       - name: Configure
@@ -83,7 +84,7 @@ jobs:
       - name: Install Qt6
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.8.1'
+          version: "6.8.1"
           cache: true
 
       - name: Install dependencies
@@ -140,9 +141,66 @@ jobs:
           name: Reclass-linux64-qt6
           path: Reclass-linux64-qt6.AppImage
 
+  macos:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-15
+            qt_arch: clang_arm64
+            artifact_name: Reclass-macos-arm64-qt6
+            zip_name: Reclass-macos-arm64-qt6.zip
+          - os: macos-15-intel
+            qt_arch: clang_64
+            artifact_name: Reclass-macos-x86_64-qt6
+            zip_name: Reclass-macos-x86_64-qt6.zip
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install cmake ninja qt
+
+      - name: Configure Qt paths
+        run: |
+          QT_PREFIX="$(brew --prefix qt)"
+          echo "QT_PREFIX=$QT_PREFIX" >> "$GITHUB_ENV"
+          echo "PATH=$QT_PREFIX/bin:$PATH" >> "$GITHUB_ENV"
+
+      - name: Configure
+        run: cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_UI_TESTS=OFF -DCMAKE_PREFIX_PATH="$QT_PREFIX"
+
+      - name: Build
+        run: cmake --build build
+
+      - name: Test
+        run: ctest --test-dir build --output-on-failure
+
+      - name: Package app zip
+        run: |
+          MACDEPLOYQT_BIN="$QT_PREFIX/bin/macdeployqt"
+          if [ ! -x "$MACDEPLOYQT_BIN" ]; then
+            MACDEPLOYQT_BIN=$(which macdeployqt 2>/dev/null || find "$RUNNER_WORKSPACE" -name macdeployqt -path "*/bin/*" | head -1)
+          fi
+          echo "Found macdeployqt at: $MACDEPLOYQT_BIN"
+          "$MACDEPLOYQT_BIN" build/Reclass.app -always-overwrite
+          codesign --force --deep --sign - build/Reclass.app
+          ditto -c -k --sequesterRsrc --keepParent build/Reclass.app "${{ matrix.zip_name }}"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact_name }}
+          path: ${{ matrix.zip_name }}
+
   release:
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    needs: [windows, linux]
+    needs: [windows, linux, macos]
     runs-on: ubuntu-latest
 
     steps:
@@ -167,5 +225,7 @@ jobs:
           files: |
             artifacts/Reclass-win64-qt6/Reclass-win64-qt6.zip
             artifacts/Reclass-linux64-qt6/Reclass-linux64-qt6.AppImage
+            artifacts/Reclass-macos-arm64-qt6/Reclass-macos-arm64-qt6.zip
+            artifacts/Reclass-macos-x86_64-qt6/Reclass-macos-x86_64-qt6.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -14,3 +14,4 @@ CMakeUserPresets.json
 plugins/RcNetPluginCompatLayer/bridge/obj
 plugins/RcNetPluginCompatLayer/bridge/bin
 .cache
+*.DS_Store

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "third_party/qscintilla"]
 	path = third_party/qscintilla
 	url = https://github.com/brCreate/QScintilla.git
+[submodule "third_party/raw_pdb"]
+	path = third_party/raw_pdb
+	url = https://github.com/MolecularMatters/raw_pdb.git
+[submodule "third_party/fadec"]
+	path = third_party/fadec
+	url = https://github.com/aengelke/fadec.git

CMakeLists.txt

@@ -22,6 +22,32 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${_QT_COMPONENTS})
 set(QT Qt${QT_VERSION_MAJOR})
 message(STATUS "Using ${QT}: ${${QT}_DIR}")
 
+# ── ABI sanity check: prevent MSVC ↔ MinGW Qt mismatch ──
+# Building with MSVC against MinGW Qt (or vice versa) compiles fine but
+# crashes immediately at runtime (ABI mismatch in QString/QSettings internals).
+if(MSVC AND "${${QT}_DIR}" MATCHES "mingw")
+    message(FATAL_ERROR
+        "Qt installation was built with MinGW but this project is being compiled with MSVC.\n"
+        "  Qt found at: ${${QT}_DIR}\n"
+        "This will compile but crash at startup due to ABI mismatch.\n"
+        "Fix: install Qt for MSVC (e.g. msvc2019_64) and set CMAKE_PREFIX_PATH to it:\n"
+        "  cmake -DCMAKE_PREFIX_PATH=C:/Qt/6.5.2/msvc2019_64 ..")
+elseif(MINGW AND "${${QT}_DIR}" MATCHES "msvc")
+    message(FATAL_ERROR
+        "Qt installation was built with MSVC but this project is being compiled with MinGW.\n"
+        "  Qt found at: ${${QT}_DIR}\n"
+        "This will compile but crash at startup due to ABI mismatch.\n"
+        "Fix: install Qt for MinGW and set CMAKE_PREFIX_PATH to it:\n"
+        "  cmake -DCMAKE_PREFIX_PATH=C:/Qt/6.5.2/mingw_64 ..")
+endif()
+
+# ── MSVC compile flags ──
+if(MSVC)
+    # /utf-8: treat source and execution character sets as UTF-8
+    # /MP: multi-processor compilation
+    add_compile_options(/utf-8 /MP)
+endif()
+
 # Qt5 on Windows needs WinExtras for HICON conversion
 set(_QT_WINEXTRAS "")
 if(QT_VERSION_MAJOR EQUAL 5 AND WIN32)
@@ -36,10 +62,35 @@ file(GLOB RAW_PDB_SRCS third_party/raw_pdb/src/*.cpp)
 add_library(raw_pdb STATIC ${RAW_PDB_SRCS})
 target_include_directories(raw_pdb PUBLIC third_party/raw_pdb/src)
 target_compile_features(raw_pdb PRIVATE cxx_std_11)
+# PDB_CRT.h forward-declares printf/memcmp/etc with __cdecl which conflicts
+# with non-MSVC compilers (GCC, Clang, MinGW).  Force-include a prefix header
+# that pulls in the real CRT headers and strips __cdecl.
+if(NOT MSVC)
+    target_compile_options(raw_pdb PUBLIC
+        -include "${CMAKE_CURRENT_SOURCE_DIR}/cmake/raw_pdb_prefix.h")
+endif()
 if(WIN32)
     target_link_libraries(raw_pdb PRIVATE rpcrt4)
 endif()
 
+# Fadec — generate decode tables (.inc files) from instrs.txt at configure time
+find_package(Python3 3.9 REQUIRED)
+set(FADEC_DIR "${CMAKE_SOURCE_DIR}/third_party/fadec")
+if(NOT EXISTS "${FADEC_DIR}/fadec-decode-public.inc")
+    message(STATUS "Generating fadec decode tables...")
+    execute_process(
+        COMMAND ${Python3_EXECUTABLE} "${FADEC_DIR}/parseinstrs.py" decode
+                "${FADEC_DIR}/instrs.txt"
+                "${FADEC_DIR}/fadec-decode-public.inc"
+                "${FADEC_DIR}/fadec-decode-private.inc"
+                --32 --64
+        RESULT_VARIABLE _fadec_result
+    )
+    if(NOT _fadec_result EQUAL 0)
+        message(FATAL_ERROR "Failed to generate fadec decode tables")
+    endif()
+endif()
+
 add_executable(Reclass
     src/main.cpp
     src/editor.h
@@ -79,11 +130,19 @@ add_executable(Reclass
     src/imports/import_pdb.cpp
     src/imports/import_pdb_dialog.h
     src/imports/import_pdb_dialog.cpp
+    src/scanner.h
+    src/scanner.cpp
+    src/scannerpanel.h
+    src/scannerpanel.cpp
     src/mainwindow.h
+    src/startpage.h
+    src/dock_tab_buttons.h
     src/optionsdialog.h
     src/optionsdialog.cpp
     src/titlebar.h
     src/titlebar.cpp
+    src/macos_titlebar.h
+    $<$<PLATFORM_ID:Darwin>:src/macos_titlebar.mm>
     src/mcp/mcp_bridge.h
     src/mcp/mcp_bridge.cpp
     src/addressparser.h
@@ -95,6 +154,16 @@ add_executable(Reclass
     $<$<PLATFORM_ID:Windows>:src/app.rc>
 )
 
+if(APPLE)
+    set_target_properties(Reclass PROPERTIES
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "class.icns"
+    )
+    target_sources(Reclass PRIVATE src/icons/class.icns)
+    set_source_files_properties(src/icons/class.icns
+        PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+endif()
+
 target_include_directories(Reclass PRIVATE src third_party/fadec)
 
 target_link_libraries(Reclass PRIVATE
@@ -108,27 +177,98 @@ target_link_libraries(Reclass PRIVATE
 )
 if(WIN32)
     target_link_libraries(Reclass PRIVATE dbghelp dwmapi psapi raw_pdb)
+
+    # Copy Debugging Tools dbghelp.dll next to Reclass.exe so the Windows
+    # loader picks it up (app dir > System32).  The system dbghelp.dll
+    # lacks StackWalk2 which the tools dbgeng.dll needs for remote debug.
+    set(_DBG_TOOLS_DIRS
+        "C:/Program Files (x86)/Windows Kits/10/Debuggers/x64"
+        "C:/Program Files/Windows Kits/10/Debuggers/x64")
+    foreach(_dir ${_DBG_TOOLS_DIRS})
+        if(EXISTS "${_dir}/dbghelp.dll")
+            foreach(_dll dbghelp.dll dbgcore.dll symsrv.dll)
+                if(EXISTS "${_dir}/${_dll}")
+                    add_custom_command(TARGET Reclass POST_BUILD
+                        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                            "${_dir}/${_dll}" $<TARGET_FILE_DIR:Reclass>
+                        COMMENT "Copying ${_dll} from Debugging Tools")
+                endif()
+            endforeach()
+            break()
+        endif()
+    endforeach()
 endif()
 
 add_executable(ReclassMcpBridge tools/rcx-mcp-stdio.cpp)
 target_link_libraries(ReclassMcpBridge PRIVATE ${QT}::Core ${QT}::Network)
+if(APPLE)
+    add_custom_command(TARGET ReclassMcpBridge POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+            $<TARGET_FILE:ReclassMcpBridge>
+            $<TARGET_FILE_DIR:Reclass>/ReclassMcpBridge
+        COMMENT "Bundling ReclassMcpBridge into Reclass.app"
+    )
+endif()
 
-# Copy built-in theme JSON files to build directory
+# Copy built-in theme JSON files next to the executable.
+# For single-config generators (Ninja/Make) the exe is in ${CMAKE_BINARY_DIR},
+# for multi-config generators (MSVC/Xcode) it's in ${CMAKE_BINARY_DIR}/<config>.
+# Using a post-build copy with $<TARGET_FILE_DIR:Reclass> handles both.
 file(GLOB _theme_files "${CMAKE_SOURCE_DIR}/src/themes/defaults/*.json")
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/themes")
+
+# Single-config: configure_file for IDE convenience (available before first build)
+if(NOT CMAKE_CONFIGURATION_TYPES)
+    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/themes")
+    foreach(_tf ${_theme_files})
+        get_filename_component(_name ${_tf} NAME)
+        configure_file(${_tf} "${CMAKE_BINARY_DIR}/themes/${_name}" COPYONLY)
+    endforeach()
+endif()
+
+# Post-build: always copy to the actual exe directory (works for all generators)
+add_custom_command(TARGET Reclass POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:Reclass>/themes"
+    COMMENT "Creating themes directory next to executable")
 foreach(_tf ${_theme_files})
     get_filename_component(_name ${_tf} NAME)
-    configure_file(${_tf} "${CMAKE_BINARY_DIR}/themes/${_name}" COPYONLY)
+    add_custom_command(TARGET Reclass POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${_tf}" "$<TARGET_FILE_DIR:Reclass>/themes/${_name}")
 endforeach()
 
-# Copy example .rcx files to build directory
+if(APPLE)
+    target_sources(Reclass PRIVATE ${_theme_files})
+    set_source_files_properties(${_theme_files}
+        PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/themes")
+endif()
+
+# Copy example .rcx files next to the executable (same logic as themes)
 file(GLOB _example_files "${CMAKE_SOURCE_DIR}/src/examples/*.rcx")
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/examples")
+
+if(NOT CMAKE_CONFIGURATION_TYPES)
+    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/examples")
+    foreach(_ef ${_example_files})
+        get_filename_component(_name ${_ef} NAME)
+        configure_file(${_ef} "${CMAKE_BINARY_DIR}/examples/${_name}" COPYONLY)
+    endforeach()
+endif()
+
+add_custom_command(TARGET Reclass POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:Reclass>/examples"
+    COMMENT "Creating examples directory next to executable")
 foreach(_ef ${_example_files})
     get_filename_component(_name ${_ef} NAME)
-    configure_file(${_ef} "${CMAKE_BINARY_DIR}/examples/${_name}" COPYONLY)
+    add_custom_command(TARGET Reclass POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${_ef}" "$<TARGET_FILE_DIR:Reclass>/examples/${_name}")
 endforeach()
 
+if(APPLE)
+    target_sources(Reclass PRIVATE ${_example_files})
+    set_source_files_properties(${_example_files}
+        PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/examples")
+endif()
+
 include(deploy)
 
 
@@ -174,6 +314,11 @@ if(BUILD_TESTING)
     target_link_libraries(test_core PRIVATE ${QT}::Core ${QT}::Test)
     add_test(NAME test_core COMMAND test_core)
 
+    add_executable(test_typeinfer tests/test_typeinfer.cpp)
+    target_include_directories(test_typeinfer PRIVATE src)
+    target_link_libraries(test_typeinfer PRIVATE ${QT}::Core ${QT}::Test)
+    add_test(NAME test_typeinfer COMMAND test_typeinfer)
+
     add_executable(test_format tests/test_format.cpp src/format.cpp src/addressparser.cpp)
     target_include_directories(test_format PRIVATE src)
     target_link_libraries(test_format PRIVATE ${QT}::Core ${QT}::Test)
@@ -230,6 +375,25 @@ if(BUILD_TESTING)
     target_link_libraries(test_addressparser PRIVATE ${QT}::Core ${QT}::Test)
     add_test(NAME test_addressparser COMMAND test_addressparser)
 
+    add_executable(test_static_fields tests/test_static_fields.cpp src/compose.cpp src/format.cpp src/addressparser.cpp)
+    target_include_directories(test_static_fields PRIVATE src)
+    target_link_libraries(test_static_fields PRIVATE ${QT}::Core ${QT}::Test)
+    add_test(NAME test_static_fields COMMAND test_static_fields)
+
+    add_executable(test_scanner tests/test_scanner.cpp src/scanner.cpp)
+    target_include_directories(test_scanner PRIVATE src)
+    target_link_libraries(test_scanner PRIVATE ${QT}::Core ${QT}::Concurrent ${QT}::Test)
+    add_test(NAME test_scanner COMMAND test_scanner)
+
+    add_executable(test_32bit_support tests/test_32bit_support.cpp
+        src/generator.cpp src/imports/import_source.cpp src/imports/import_reclass_xml.cpp
+        src/compose.cpp src/format.cpp src/addressparser.cpp)
+    target_include_directories(test_32bit_support PRIVATE src
+        ${CMAKE_SOURCE_DIR}/plugins/RemoteProcessMemory)
+    target_link_libraries(test_32bit_support PRIVATE ${QT}::Core ${QT}::Widgets ${QT}::Test)
+    add_test(NAME test_32bit_support COMMAND test_32bit_support)
+    set_tests_properties(test_32bit_support PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=offscreen")
+
     if(WIN32)
         add_executable(test_import_pdb tests/test_import_pdb.cpp
             src/imports/import_pdb.cpp src/format.cpp src/compose.cpp src/addressparser.cpp)
@@ -250,169 +414,158 @@ if(BUILD_TESTING)
     option(BUILD_UI_TESTS "Build tests that require a display (Qt Widgets)" ON)
     if(BUILD_UI_TESTS)
 
-    add_executable(test_controller tests/test_controller.cpp
+        add_executable(test_controller tests/test_controller.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
         src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
         src/typeselectorpopup.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_controller PRIVATE src third_party/fadec)
-    target_link_libraries(test_controller PRIVATE
+        target_include_directories(test_controller PRIVATE src third_party/fadec)
+        target_link_libraries(test_controller PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
         QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_controller PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_controller COMMAND test_controller)
+        if(WIN32)
+            target_link_libraries(test_controller PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME test_controller COMMAND test_controller)
 
-    add_executable(test_validation tests/test_validation.cpp
+        add_executable(test_context_menu tests/test_context_menu.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
         src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
         src/typeselectorpopup.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_validation PRIVATE src third_party/fadec)
-    target_link_libraries(test_validation PRIVATE
+        target_include_directories(test_context_menu PRIVATE src third_party/fadec)
+        target_link_libraries(test_context_menu PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
         QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_validation PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_validation COMMAND test_validation)
+        if(WIN32)
+            target_link_libraries(test_context_menu PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME test_context_menu COMMAND test_context_menu)
 
-    add_executable(test_context_menu tests/test_context_menu.cpp
+        add_executable(test_source_management tests/test_source_management.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
         src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
         src/typeselectorpopup.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_context_menu PRIVATE src third_party/fadec)
-    target_link_libraries(test_context_menu PRIVATE
+        target_include_directories(test_source_management PRIVATE src third_party/fadec)
+        target_link_libraries(test_source_management PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
         QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_context_menu PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_context_menu COMMAND test_context_menu)
+        if(WIN32)
+            target_link_libraries(test_source_management PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME test_source_management COMMAND test_source_management)
 
-    add_executable(test_source_management tests/test_source_management.cpp
-        src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
-        src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
-        src/typeselectorpopup.cpp
-        src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_source_management PRIVATE src third_party/fadec)
-    target_link_libraries(test_source_management PRIVATE
-        ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
-        QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_source_management PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_source_management COMMAND test_source_management)
-
-    add_executable(test_editor tests/test_editor.cpp
+        add_executable(test_editor tests/test_editor.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp
         src/providerregistry.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_editor PRIVATE src third_party/fadec)
-    target_link_libraries(test_editor PRIVATE
+        target_include_directories(test_editor PRIVATE src third_party/fadec)
+        target_link_libraries(test_editor PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Test
         QScintilla::QScintilla)
-    add_test(NAME test_editor COMMAND test_editor)
+        add_test(NAME test_editor COMMAND test_editor)
 
-    add_executable(test_rendered_view tests/test_rendered_view.cpp
+        add_executable(test_rendered_view tests/test_rendered_view.cpp
         src/generator.cpp src/compose.cpp src/format.cpp src/addressparser.cpp)
-    target_include_directories(test_rendered_view PRIVATE src)
-    target_link_libraries(test_rendered_view PRIVATE
+        target_include_directories(test_rendered_view PRIVATE src)
+        target_link_libraries(test_rendered_view PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Test
         QScintilla::QScintilla)
-    add_test(NAME test_rendered_view COMMAND test_rendered_view)
+        add_test(NAME test_rendered_view COMMAND test_rendered_view)
 
-    add_executable(test_new_features tests/test_new_features.cpp
-        src/generator.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
-        src/editor.cpp src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
-        src/typeselectorpopup.cpp
-        src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_new_features PRIVATE src third_party/fadec)
-    target_link_libraries(test_new_features PRIVATE
-        ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
-        QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_new_features PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_new_features COMMAND test_new_features)
-
-    add_executable(test_type_selector tests/test_type_selector.cpp
+        add_executable(test_type_selector tests/test_type_selector.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
         src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
         src/typeselectorpopup.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_type_selector PRIVATE src third_party/fadec)
-    target_link_libraries(test_type_selector PRIVATE
+        target_include_directories(test_type_selector PRIVATE src third_party/fadec)
+        target_link_libraries(test_type_selector PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
         QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_type_selector PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_type_selector COMMAND test_type_selector)
+        if(WIN32)
+            target_link_libraries(test_type_selector PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME test_type_selector COMMAND test_type_selector)
 
-    add_executable(test_type_visibility tests/test_type_visibility.cpp
+        add_executable(test_type_visibility tests/test_type_visibility.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
         src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
         src/typeselectorpopup.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(test_type_visibility PRIVATE src third_party/fadec)
-    target_link_libraries(test_type_visibility PRIVATE
+        target_include_directories(test_type_visibility PRIVATE src third_party/fadec)
+        target_link_libraries(test_type_visibility PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
         QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_type_visibility PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_type_visibility COMMAND test_type_visibility)
+        if(WIN32)
+            target_link_libraries(test_type_visibility PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME test_type_visibility COMMAND test_type_visibility)
 
-    add_executable(test_options_dialog tests/test_options_dialog.cpp
+        add_executable(test_options_dialog tests/test_options_dialog.cpp
         src/optionsdialog.cpp src/themes/theme.cpp src/themes/thememanager.cpp)
-    target_include_directories(test_options_dialog PRIVATE src)
-    target_link_libraries(test_options_dialog PRIVATE ${QT}::Widgets ${QT}::Test)
-    add_test(NAME test_options_dialog COMMAND test_options_dialog)
+        target_include_directories(test_options_dialog PRIVATE src)
+        target_link_libraries(test_options_dialog PRIVATE ${QT}::Widgets ${QT}::Test)
+        add_test(NAME test_options_dialog COMMAND test_options_dialog)
 
-    add_executable(test_source_provider tests/test_source_provider.cpp
+        add_executable(test_source_provider tests/test_source_provider.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp src/controller.cpp
         src/processpicker.cpp src/processpicker.ui src/providerregistry.cpp
         src/typeselectorpopup.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS}
         src/resources.qrc)
-    target_include_directories(test_source_provider PRIVATE src third_party/fadec)
-    target_link_libraries(test_source_provider PRIVATE
+        target_include_directories(test_source_provider PRIVATE src third_party/fadec)
+        target_link_libraries(test_source_provider PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test ${QT}::Svg
         QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(test_source_provider PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME test_source_provider COMMAND test_source_provider)
+        if(WIN32)
+            target_link_libraries(test_source_provider PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME test_source_provider COMMAND test_source_provider)
 
-    if(WIN32)
-        add_executable(test_windbg_provider tests/test_windbg_provider.cpp
-            plugins/WinDbgMemory/WinDbgMemoryPlugin.cpp)
-        target_include_directories(test_windbg_provider PRIVATE src plugins/WinDbgMemory)
-        target_link_libraries(test_windbg_provider PRIVATE
+        add_executable(test_scanner_ui tests/test_scanner_ui.cpp
+        src/scanner.cpp src/scannerpanel.cpp src/addressparser.cpp
+        src/themes/theme.cpp src/themes/thememanager.cpp)
+        target_include_directories(test_scanner_ui PRIVATE src)
+        target_link_libraries(test_scanner_ui PRIVATE
+        ${QT}::Widgets ${QT}::Concurrent ${QT}::Test)
+        add_test(NAME test_scanner_ui COMMAND test_scanner_ui)
+
+        if(WIN32)
+            add_executable(test_windbg_provider tests/test_windbg_provider.cpp
+            plugins/WinDbgMemory/WinDbgMemoryPlugin.cpp
+            src/scanner.cpp)
+            target_include_directories(test_windbg_provider PRIVATE src plugins/WinDbgMemory)
+            target_link_libraries(test_windbg_provider PRIVATE
             ${QT}::Widgets ${QT}::Concurrent ${QT}::Test dbgeng ole32)
-        add_test(NAME test_windbg_provider COMMAND test_windbg_provider)
-    endif()
+            add_test(NAME test_windbg_provider COMMAND test_windbg_provider)
+        endif()
 
-    add_executable(bench_large_class tests/bench_large_class.cpp
+        add_executable(bench_large_class tests/bench_large_class.cpp
         src/editor.cpp src/compose.cpp src/format.cpp src/addressparser.cpp
         src/providerregistry.cpp
         src/themes/theme.cpp src/themes/thememanager.cpp ${DISASM_SRCS})
-    target_include_directories(bench_large_class PRIVATE src third_party/fadec)
-    target_link_libraries(bench_large_class PRIVATE
+        target_include_directories(bench_large_class PRIVATE src third_party/fadec)
+        target_link_libraries(bench_large_class PRIVATE
         ${QT}::Widgets ${QT}::PrintSupport ${QT}::Concurrent ${QT}::Test
         QScintilla::QScintilla)
-    if(WIN32)
-        target_link_libraries(bench_large_class PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
-    endif()
-    add_test(NAME bench_large_class COMMAND bench_large_class)
+        if(WIN32)
+            target_link_libraries(bench_large_class PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME bench_large_class COMMAND bench_large_class)
 
-    # Deploy Qt runtime DLLs for tests (run windeployqt on a representative test exe
-    # that links the broadest set of Qt modules; all test exes share the same output dir)
-    if(TARGET ${QT}::windeployqt)
-        add_custom_target(deploy_tests ALL
+        add_executable(bench_project tests/bench_project.cpp)
+        target_include_directories(bench_project PRIVATE src)
+        target_link_libraries(bench_project PRIVATE ${QT}::Widgets ${QT}::Test)
+        if(WIN32)
+            target_link_libraries(bench_project PRIVATE dbghelp psapi ${_QT_WINEXTRAS})
+        endif()
+        add_test(NAME bench_project COMMAND bench_project)
+
+        # Deploy Qt runtime DLLs for tests (run windeployqt on a representative test exe
+        # that links the broadest set of Qt modules; all test exes share the same output dir)
+        if(TARGET ${QT}::windeployqt)
+            add_custom_target(deploy_tests ALL
             COMMAND $<TARGET_FILE:${QT}::windeployqt>
                 --no-compiler-runtime --no-translations
                 --no-opengl-sw --no-system-d3d-compiler
@@ -420,12 +573,14 @@ if(BUILD_TESTING)
             DEPENDS test_controller
             COMMENT "Deploying Qt runtime DLLs for tests..."
         )
-    endif()
+        endif()
 
     endif() # BUILD_UI_TESTS
 endif()
-add_subdirectory(plugins/ProcessMemory)
-add_subdirectory(plugins/RemoteProcessMemory)
+if(NOT APPLE)
+    add_subdirectory(plugins/ProcessMemory)
+    add_subdirectory(plugins/RemoteProcessMemory)
+endif()
 if(WIN32)
     add_subdirectory(plugins/WinDbgMemory)
     add_subdirectory(plugins/RcNetPluginCompatLayer)

README.md

@@ -1,65 +1,120 @@
 <div align="center">
 
-# Reclass
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="docs/RECLASS_LIGHTMODE.svg" height="170">
+  <img src="docs/RECLASS_DARKMODE.svg" alt="Reclass" height="170" />
+</picture>
 
-**A structured binary editor for reverse engineering — inspect raw bytes as typed structs, arrays, and pointers.<p>A complete overhaul of the popular "reclassing" tools**
+**A structured binary editor for reverse engineering — inspect raw bytes as typed structs, arrays, and pointers.<p>Built from scratch as a modern replacement for ReClass.NET and ReClassEx**
 
 [Download](https://github.com/IChooseYou/Reclass/releases) · [Build Instructions](#build) · [MCP Integration](#mcp-integration) · [Alternatives](#alternatives)
 
 [![Build](https://github.com/IChooseYou/Reclass/actions/workflows/build.yml/badge.svg)](https://github.com/IChooseYou/Reclass/actions/workflows/build.yml)
 [![License](https://img.shields.io/github/license/IChooseYou/Reclass)](LICENSE)
 [![Release](https://img.shields.io/github/v/release/IChooseYou/Reclass?label=snapshot)](https://github.com/IChooseYou/Reclass/releases)
-[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux-blue)]()
+[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-blue)]()
 
 </div>
 
----
+Reclass helps you inspect raw bytes and interpret them as types (structs, arrays, primitives, pointers, padding) instead of just hex. It is a debugging tool for figuring out unknown data structures — either at runtime from a live process, or from a static source like a binary file or crash dump.
 
-Reclass helps you inspect raw bytes and interpret them as types (structs, arrays, primitives, pointers, padding) instead of just hex. It is essentially a debugging tool for figuring out unknown data structures — either at runtime from a live process, or from a static source like a binary file or crash dump.
+Built with C++17, Qt 6 (Qt 5 also supported), and QScintilla. The entire editor surface is rendered as formatted plain text with inline editing, fold markers, and hex/ASCII previews.
 
-Built with C++17, Qt 6, and QScintilla. The entire editor surface is rendered as formatted plain text with inline editing, fold markers, and hex/ASCII previews.
+## Screenshots
 
----
+![Windows — VTable with value history popup](docs/README_PIC1.png)
+
+![macOS — project tree with kernel struct inspection](docs/README_PIC2.png)
+
+![Memory scanner](docs/README_PIC3.png)
 
 ## Features
 
-- **Structured binary view** — render raw bytes as typed fields (integers, floats, pointers, vectors, matrices, strings, booleans, padding)
-- **Struct & array nesting** — define nested structs and arrays with collapsible fold regions
-- **Inline editing** — click to edit type names, field names, values, and base addresses directly in the editor
-- **Undo/redo** — full undo history for all mutations via command stack
-- **Split views** — multiple synchronized editor panes over the same document
-- **Type autocomplete** — popup type picker when changing field kinds
-- **Hex + ASCII margins** — raw byte previews alongside the structured view
-- **MCP bridge** — expose all tool functionality to AI clients via Model Context Protocol
-- **Plugin system** — extend with custom data source providers via DLL plugins; following ship by default
-  - **Process plugin** — access memory of live processes on Windows and Linux
-  - **WinDbg plugin** — access data sources live in WinDbg debugging sessions
-  - **ReClass.NET compatibility layer** — load existing .NET and native ReClass.NET plugins
+### Editor
 
----
+- **Structured binary view** — render raw bytes as typed fields with columnar alignment
+- **Inline editing** — click to edit type names, field names, values, base addresses, array metadata, pointer targets, enum members, bitfield members, static expressions, and comments — all with real-time validation
+- **Tab-cycling** — tab through editable fields within a line
+- **Type autocomplete** — cached popup type picker with search/filter for struct targets
+- **Multi-select** — Ctrl+click individual nodes or Shift+click for range selection
+- **Split views** — multiple synchronized editor panes over the same document
+- **Find bar** — Ctrl+F in-editor search with indicator highlighting
+- **Fold/collapse** — expand and collapse structs, arrays, and pointer expansions with embedded fold indicators
+- **Hex + ASCII columns** — raw byte previews alongside the structured view with per-byte change highlighting
+
+### Live Memory Analysis
+
+- **Auto-refresh** — configurable interval (default 660ms) with async page-based reads for non-blocking UI
+- **Value history & heatmap** — per-node ring buffer (10 samples with timestamps), color-coded heat indicators (static/cold/warm/hot) based on change frequency
+- **Changed-byte highlighting** — per-byte change indicators within hex preview lines
+- **Memory write-back** — edit values inline, writes propagate through the provider to live process memory
+- **Pointer chasing** — automatic reads of dereferenced memory regions across pointer chains
+- **Address parser** — formula expressions like `<module.exe>+0x1A0`, pointer dereference chains, symbol resolution
+
+### Undo / Redo
+
+Full command stack with 15 undoable operations: ChangeKind, Rename, Collapse, Insert, Remove, ChangeBase, WriteBytes, ChangeArrayMeta, ChangePointerRef, ChangeStructTypeName, ChangeClassKeyword, ChangeOffset, ChangeEnumMembers, ChangeOffsetExpr, ToggleStatic. Batch macro support for multi-node operations.
+
+### Import / Export
+
+| Format | Import | Export |
+|--------|:------:|:------:|
+| **Native JSON (.rcx)** | Full tree + metadata | Full tree + metadata |
+| **C/C++ source** | Struct/class/union/enum parsing with offset comments | Header generation with optional static asserts |
+| **ReClass XML** | Full compatibility with ReClass Classic | Full compatibility |
+| **PDB symbols (Windows)** | UDT enumeration with selective recursive import via raw_pdb — no DIA SDK dependency | |
+
+### Workspace & Navigation
+
+- **Multi-document tabs** — MDI interface, one document per tab
+- **Workspace dock** — project explorer tree with struct/enum/union icons, sorted by field count, quick navigation to members
+- **Scanner dock** — integrated memory search panel
+- **Dual view mode** — switch between ReClass tree view and rendered C/C++ output per tab
+- **View root** — focus on a specific struct, hiding all others
+- **Scroll to node** — programmatic navigation to any node by ID
 
 ## Data Sources
 
 - **File** — open any binary file and inspect its contents as structured data
-- **Process** — attach to a live process and read its memory in real time
-- **Remote Process** — read another process's memory via shared memory
-- **WinDbg** — load `.dmp` crash dump files or connect to live debugging sessions
+- **Process** — attach to a live process and read its memory in real time (Windows/Linux)
+- **Remote Process** — read another process's memory over TCP with cross-architecture 32/64-bit support
+- **WinDbg** — connect to live WinDbg debugging sessions or load crash dumps
+- **Saved sources** — quick-switch between recently used data sources per tab
 
----
+## Plugin System
 
-## Screenshots
+DLL plugins loaded from a `Plugins` folder, auto or manual.
 
-![Type chooser and struct inspection](docs/README_PIC1.png)
+**Bundled plugins:**
 
-![VTable pointer expansion with disassembly preview](docs/README_PIC2.png)
-
-![Split view with rendered C/C++ output](docs/README_PIC3.png)
-
----
+| Plugin | Description |
+|--------|-------------|
+| **Process memory** | Attach to local processes on Windows and Linux — PID-based, with symbol resolution and module/region enumeration |
+| **WinDbg** | Access data from live WinDbg debugging sessions |
+| **Remote process memory** | TCP RPC-based remote process access with cross-architecture support |
+| **ReClass.NET compatibility** | Load existing ReClass.NET native DLL plugins directly; optional .NET CLR hosting for managed plugins |
 
 ## MCP Integration
 
-Built-in [Model Context Protocol](https://modelcontextprotocol.io/) bridge via `ReclassMcpBridge`. The server does not start by default and can be toggled from the File menu. It exposes all tool functionality to any MCP-compatible client (e.g. Claude Code) and falls back to UI prompts when the client requests something not yet covered by tools. To connect, add this to your MCP client config (e.g. `.mcp.json`):
+Built-in [Model Context Protocol](https://modelcontextprotocol.io/) bridge via `ReclassMcpBridge` — the first reverse engineering tool with native AI/LLM integration. The server uses JSON-RPC 2.0 over named pipes and can be toggled from the Tools menu or auto-started on launch.
+
+**Available tools:**
+
+| Tool | Description |
+|------|-------------|
+| `projectState` | Read current tree structure, base address, tab state |
+| `treeApply` | Apply structural command deltas to the node tree |
+| `sourceSwitch` | Switch the active data source |
+| `hexRead` | Read bytes at an address |
+| `hexWrite` | Write bytes at an address |
+| `statusSet` | Update the status bar text |
+| `uiAction` | Trigger menu actions programmatically |
+| `treeSearch` | Search nodes by name or type |
+| `nodeHistory` | Query value change history for a node |
+
+**Notifications:** `notifyTreeChanged`, `notifyDataChanged`
+
+A standalone stdio-to-pipe bridge binary is built alongside the main application. To connect, add this to your MCP client config (e.g. `.mcp.json`):
 
 ```json
 {
@@ -72,13 +127,11 @@ Built-in [Model Context Protocol](https://modelcontextprotocol.io/) bridge via `
 }
 ```
 
----
-
 ## Build
 
 ### Prerequisites
 
-- **Qt 6** with MinGW — [Qt Online Installer](https://doc.qt.io/qt-6/qt-online-installation.html) (select MinGW kit + CMake/Ninja from the Tools section)
+- **Qt 6** (or Qt 5) with MinGW — [Qt Online Installer](https://doc.qt.io/qt-6/qt-online-installation.html) (select MinGW kit + CMake/Ninja from the Tools section)
 - **CMake 3.20+** — [cmake.org](https://cmake.org/download/) (bundled with Qt)
 - **Ninja** — bundled with the Qt installer
 
@@ -93,7 +146,17 @@ cd Reclass
 
 The build script auto-detects your Qt install location.
 
-### Manual Build
+### macOS Build
+
+```bash
+./scripts/build_macos.sh --qt-dir /opt/homebrew/opt/qt --build-type Release --package
+```
+
+If you installed Qt via Homebrew, `--qt-dir /opt/homebrew/opt/qt` is typical on Apple Silicon. You can also set `QTDIR` or `Qt6_DIR` instead of passing `--qt-dir`.
+
+Note: macOS Gatekeeper may block unsigned apps. If the app won't open, go to **System Settings > Privacy & Security** and click **Open Anyway**.
+
+### Manual Build (MinGW)
 
 1. Clone with `--recurse-submodules` (or run `git submodule update --init --recursive` after cloning)
 2. Build QScintilla: `qmake` + `mingw32-make` in `third_party/qscintilla/src`
@@ -104,21 +167,23 @@ The build script auto-detects your Qt install location.
    ```
 4. Optionally run `windeployqt` on the output executable
 
+### Visual Studio 2022+
+
+The `msvc/` folder contains a ready-made solution (`Reclass.slnx`) with projects for the main application, all plugins, and third-party libraries. Requires the [Qt Visual Studio Tools](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2022) extension with a Qt 6 MSVC kit configured.
+
 ### Running Tests
 
 ```bash
 ctest --test-dir build --output-on-failure
 ```
 
----
+30 tests covering composition, serialization, undo/redo, import/export, provider switching, type visibility, validation, scanning, and rendering.
 
 ## Alternatives
 
 - [ReClass.NET](https://github.com/ReClassNET/ReClass.NET)
 - [ReClassEx](https://github.com/ajkhoury/ReClassEx)
 
----
-
 <div align="center">
 <sub>MIT License</sub>
 </div>

cmake/deploy.cmake

@@ -1,7 +1,7 @@
 # cmake/deploy.cmake - Dual-mode script for deploying Qt runtime DLLs
 #
 # Script mode:  cmake -P deploy.cmake <target_exe> <windeployqt>
-# Include mode: include(deploy) from CMakeLists.txt (creates "deploy" target)
+# Include mode: include(deploy) from CMakeLists.txt (creates "deploy" target + post-build)
 
 if(CMAKE_SCRIPT_MODE_FILE)
     set(TARGET_EXE ${CMAKE_ARGV3})
@@ -17,7 +17,6 @@ if(CMAKE_SCRIPT_MODE_FILE)
 
     execute_process(
         COMMAND ${WINDEPLOYQT}
-            --pdb
             --no-compiler-runtime
             --no-translations
             --no-opengl-sw
@@ -67,6 +66,7 @@ if(NOT TARGET ${QT}::windeployqt AND TARGET ${QT}::qmake)
 endif()
 
 if(TARGET ${QT}::windeployqt)
+    # Standalone "deploy" target (can still be invoked manually)
     add_custom_target(deploy
         COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_LIST_DIR}/deploy.cmake
             $<TARGET_FILE:Reclass>
@@ -79,4 +79,13 @@ if(TARGET ${QT}::windeployqt)
     set_target_properties(deploy PROPERTIES
         ADDITIONAL_CLEAN_FILES $<TARGET_FILE_DIR:Reclass>/.qt_deployed
     )
+
+    # Auto-deploy as post-build step so the correct Qt DLLs are always next
+    # to the exe.  Without this, MSVC builds load whatever Qt DLLs happen to
+    # be in PATH (often MinGW ones), causing instant ABI-mismatch crashes.
+    add_custom_command(TARGET Reclass POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_LIST_DIR}/deploy.cmake
+            $<TARGET_FILE:Reclass>
+            $<TARGET_FILE:${QT}::windeployqt>
+        COMMENT "Auto-deploying Qt runtime DLLs...")
 endif()

cmake/raw_pdb_prefix.h

@@ -0,0 +1,29 @@
+// Force-included before every raw_pdb translation unit (and consumers).
+// PDB_CRT.h forward-declares printf/memcmp/etc with extern "C" __cdecl,
+// which conflicts with MinGW's CRT headers (C++ linkage, no __cdecl).
+//
+// Fix: include the real CRT headers, then include PDB_CRT.h with function
+// names macro-renamed to harmless dummies.  This triggers #pragma once so
+// no raw_pdb source file ever processes PDB_CRT.h's conflicting declarations.
+//
+// Guarded with __cplusplus because PUBLIC propagation applies this to C
+// sources (fadec) where PDB_CRT.h is irrelevant and <cstdio> doesn't exist.
+#ifdef __cplusplus
+#include <cstdio>
+#include <cstring>
+
+#undef  __cdecl
+#define __cdecl
+
+#define printf  _pdb_crt_unused_printf
+#define memcmp  _pdb_crt_unused_memcmp
+#define memcpy  _pdb_crt_unused_memcpy
+#define strlen  _pdb_crt_unused_strlen
+#define strcmp  _pdb_crt_unused_strcmp
+#include "Foundation/PDB_CRT.h"
+#undef printf
+#undef memcmp
+#undef memcpy
+#undef strlen
+#undef strcmp
+#endif

docs/RECLASS_DARKMODE.svg

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 186.01 52.79">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: url(#Unbenannter_Verlauf_130-2);
+      }
+
+      .cls-2 {
+        fill: url(#Unbenannter_Verlauf_236-2);
+      }
+
+      .cls-3 {
+        fill: url(#Unbenannter_Verlauf_225-2);
+      }
+
+      .cls-4 {
+        fill: #1f2939;
+      }
+
+      .cls-5 {
+        fill: #5d9bd4;
+      }
+
+      .cls-6 {
+        fill: #1e3e88;
+      }
+
+      .cls-7 {
+        fill: #6e809a;
+      }
+
+      .cls-8 {
+        fill: url(#Unbenannter_Verlauf_225);
+      }
+
+      .cls-9 {
+        fill: url(#Unbenannter_Verlauf_236);
+      }
+
+      .cls-10 {
+        fill: url(#Unbenannter_Verlauf_130);
+      }
+
+      .cls-11 {
+        fill: url(#Unbenannter_Verlauf_170);
+      }
+
+      .cls-12 {
+        fill: url(#Unbenannter_Verlauf_161);
+      }
+
+      .cls-13 {
+        fill: url(#Unbenannter_Verlauf_183);
+      }
+
+      .cls-14 {
+        fill: #b06ba9;
+      }
+
+      .cls-15 {
+        fill: #826415;
+      }
+
+      .cls-16 {
+        fill: #e2aa11;
+      }
+
+      .cls-17 {
+        fill: #893089;
+      }
+    </style>
+    <linearGradient id="Unbenannter_Verlauf_161" data-name="Unbenannter Verlauf 161" x1="8.33" y1="8.33" x2="18.11" y2="18.11" gradientTransform="translate(13.22 -5.47) rotate(45)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#f3db78"/>
+      <stop offset=".19" stop-color="#f4e188"/>
+      <stop offset=".34" stop-color="#f4e38d"/>
+      <stop offset=".38" stop-color="#f4df81"/>
+      <stop offset=".47" stop-color="#f5d86f"/>
+      <stop offset=".57" stop-color="#f5d463"/>
+      <stop offset=".67" stop-color="#f6d360"/>
+      <stop offset=".89" stop-color="#f1cc53"/>
+      <stop offset="1" stop-color="#efbe33"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_130" data-name="Unbenannter Verlauf 130" x1=".41" y1="15.46" x2="10.98" y2="26.03" gradientTransform="translate(-4.95 39.45) rotate(-135)" gradientUnits="userSpaceOnUse">
+      <stop offset=".18" stop-color="#e2aa11"/>
+      <stop offset=".91" stop-color="#826415"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_130-2" data-name="Unbenannter Verlauf 130" x1="15.46" y1=".41" x2="26.03" y2="10.98" gradientTransform="translate(31.39 24.39) rotate(-135)" xlink:href="#Unbenannter_Verlauf_130"/>
+    <linearGradient id="Unbenannter_Verlauf_170" data-name="Unbenannter Verlauf 170" x1="34.97" y1="15.65" x2="42.34" y2="23.02" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#deb0d3"/>
+      <stop offset=".15" stop-color="#e1b5d6"/>
+      <stop offset=".3" stop-color="#e3b8d7"/>
+      <stop offset=".4" stop-color="#d7a8cd"/>
+      <stop offset=".53" stop-color="#cf9cc7"/>
+      <stop offset=".67" stop-color="#cd99c5"/>
+      <stop offset=".89" stop-color="#c68abc"/>
+      <stop offset="1" stop-color="#bb7db4"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_225" data-name="Unbenannter Verlauf 225" x1="28.78" y1="20.14" x2="36.87" y2="28.24" gradientTransform="translate(.63 .63) rotate(-.12) skewX(-.25)" gradientUnits="userSpaceOnUse">
+      <stop offset=".19" stop-color="#b06ba9"/>
+      <stop offset=".87" stop-color="#893089"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_225-2" data-name="Unbenannter Verlauf 225" x1="39.45" y1="9.43" x2="47.55" y2="17.53" xlink:href="#Unbenannter_Verlauf_225"/>
+    <linearGradient id="Unbenannter_Verlauf_183" data-name="Unbenannter Verlauf 183" x1="34.88" y1="39.45" x2="42.29" y2="46.86" gradientTransform="translate(41.82 -14.64) rotate(45)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#91c4eb"/>
+      <stop offset=".2" stop-color="#9dc9ed"/>
+      <stop offset=".33" stop-color="#96c6ec"/>
+      <stop offset=".35" stop-color="#91c3ea"/>
+      <stop offset=".45" stop-color="#7fb8e5"/>
+      <stop offset=".56" stop-color="#73b2e2"/>
+      <stop offset=".67" stop-color="#70b0e1"/>
+      <stop offset=".89" stop-color="#60a7dc"/>
+      <stop offset="1" stop-color="#4d9bd5"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_236" data-name="Unbenannter Verlauf 236" x1="28.83" y1="43.9" x2="36.92" y2="51.99" gradientTransform="translate(22.68 105.31) rotate(-135.12) skewX(-.25)" gradientUnits="userSpaceOnUse">
+      <stop offset=".19" stop-color="#5d9bd4"/>
+      <stop offset=".87" stop-color="#1e3e88"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_236-2" data-name="Unbenannter Verlauf 236" x1="39.51" y1="33.23" x2="47.59" y2="41.32" gradientTransform="translate(48.45 94.63) rotate(-135.12) skewX(-.25)" xlink:href="#Unbenannter_Verlauf_236"/>
+  </defs>
+  <g>
+    <rect class="cls-7" x="22.48" y="16.85" width="1.76" height="25.1"/>
+    <rect class="cls-7" x="17.08" y="16.85" width="19.7" height="1.82"/>
+    <rect class="cls-7" x="22.48" y="40.19" width="11.9" height="1.76"/>
+    <g>
+      <rect class="cls-12" x="2.56" y="6.31" width="21.31" height="13.82" transform="translate(-5.48 13.22) rotate(-45)"/>
+      <rect class="cls-15" x="17.52" y="6.88" width="1.15" height="22.44" transform="translate(18.1 -7.49) rotate(45)"/>
+      <g>
+        <rect class="cls-16" x="7.76" y="-2.88" width="1.15" height="22.44" transform="translate(8.34 -3.45) rotate(45)"/>
+        <rect class="cls-10" x="5.12" y="13.27" width="1.15" height="14.95" transform="translate(24.39 31.39) rotate(135)"/>
+        <rect class="cls-1" x="20.17" y="-1.78" width="1.15" height="14.95" transform="translate(39.45 -4.95) rotate(135)"/>
+      </g>
+    </g>
+    <g>
+      <polygon class="cls-11" points="40.33 10.29 29.64 21.02 36.98 28.38 47.67 17.66 40.33 10.29"/>
+      <polygon class="cls-17" points="37.01 29.1 36.29 28.38 47.68 16.96 48.39 17.68 37.01 29.1"/>
+      <polygon class="cls-14" points="29.67 21.74 28.95 21.02 40.34 9.6 41.05 10.31 29.67 21.74"/>
+      <polygon class="cls-8" points="28.95 21.02 29.67 20.3 37.72 28.38 37 29.1 28.95 21.02"/>
+      <polygon class="cls-3" points="39.63 10.31 40.34 9.6 48.39 17.67 47.68 18.39 39.63 10.31"/>
+    </g>
+    <g>
+      <rect class="cls-13" x="30.96" y="37.92" width="15.26" height="10.48" transform="translate(-19.21 39.92) rotate(-45)"/>
+      <g>
+        <rect class="cls-9" x="32.83" y="42.71" width="1.01" height="11.38" transform="translate(91.13 59.06) rotate(135)"/>
+        <rect class="cls-2" x="43.5" y="32.04" width="1.01" height="11.38" transform="translate(101.81 33.29) rotate(135)"/>
+        <rect class="cls-6" x="41.84" y="38.69" width="1.01" height="16.1" transform="translate(45.45 -16.25) rotate(45)"/>
+        <rect class="cls-5" x="34.5" y="31.35" width="1.01" height="16.1" transform="translate(38.11 -13.21) rotate(45)"/>
+      </g>
+    </g>
+  </g>
+  <g>
+    <path class="cls-4" d="M53.66,30.51v11.46h-2.57v-25.13h9.36c5.04,0,7.72,2.72,7.72,6.65,0,3.22-1.89,5.26-4.51,5.89,2.34.58,4.09,2.2,4.09,6.5v1.02c0,1.74-.11,4.07.33,5.07h-2.54c-.46-1.08-.39-3.1-.39-5.34v-.6c0-3.87-1.12-5.52-5.79-5.52h-5.7ZM53.66,28.26h5.79c4.15,0,6.03-1.56,6.03-4.64,0-2.9-1.89-4.54-5.57-4.54h-6.25v9.18Z"/>
+    <path class="cls-4" d="M86.55,29.87h-12.65v9.79h13.88l-.35,2.3h-16.06v-25.12h15.81v2.27h-13.28v8.49h12.65v2.27Z"/>
+    <path class="cls-4" d="M109.12,35.04c-1.15,4.11-4.2,7.19-9.68,7.19-7.34,0-11.13-5.72-11.13-12.79s3.76-12.96,11.21-12.96c5.64,0,8.84,3.18,9.63,7.37h-2.56c-1.04-3.02-3.01-5.13-7.18-5.13-5.92,0-8.38,5.4-8.38,10.66s2.39,10.62,8.52,10.62c3.99,0,5.89-2.16,7.01-4.95h2.57Z"/>
+    <path class="cls-4" d="M111.62,16.84h2.56v22.82h13.3l-.41,2.27h-15.46v-25.09Z"/>
+    <path class="cls-4" d="M133.03,33.77l-2.97,8.16h-2.58l9.09-25.09h3.11l9.48,25.09h-2.76l-3.05-8.16h-10.32ZM142.61,31.5c-2.61-7.07-3.99-10.62-4.51-12.4h-.04c-.61,2-2.16,6.36-4.27,12.4h8.82Z"/>
+    <path class="cls-4" d="M151.68,35.08c.72,3.19,2.87,5,6.77,5,4.28,0,5.95-2.09,5.95-4.65,0-2.69-1.25-4.29-6.55-5.59-5.58-1.38-7.76-3.23-7.76-6.81s2.56-6.55,8.04-6.55,8.11,3.41,8.44,6.57h-2.63c-.52-2.48-2.11-4.37-5.93-4.37-3.37,0-5.22,1.55-5.22,4.16s1.54,3.59,6.07,4.7c7.1,1.75,8.24,4.56,8.24,7.67,0,3.85-2.83,7.03-8.78,7.03-6.29,0-8.78-3.56-9.27-7.15h2.63Z"/>
+    <path class="cls-4" d="M170.59,35.08c.72,3.19,2.87,5,6.77,5,4.28,0,5.95-2.09,5.95-4.65,0-2.69-1.25-4.29-6.55-5.59-5.58-1.38-7.76-3.23-7.76-6.81s2.56-6.55,8.04-6.55,8.11,3.41,8.44,6.57h-2.63c-.52-2.48-2.11-4.37-5.93-4.37-3.37,0-5.22,1.55-5.22,4.16s1.54,3.59,6.07,4.7c7.1,1.75,8.25,4.56,8.25,7.67,0,3.85-2.83,7.03-8.78,7.03-6.29,0-8.78-3.56-9.27-7.15h2.63Z"/>
+  </g>
+</svg>

docs/RECLASS_LIGHTMODE.svg

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 185.55 52.66">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: url(#Unbenannter_Verlauf_130-2);
+      }
+
+      .cls-2 {
+        fill: url(#Unbenannter_Verlauf_236-2);
+      }
+
+      .cls-3 {
+        fill: url(#Unbenannter_Verlauf_225-2);
+      }
+
+      .cls-4 {
+        fill: #5d9bd4;
+      }
+
+      .cls-5 {
+        fill: #e3e8f0;
+      }
+
+      .cls-6 {
+        fill: #1e3e88;
+      }
+
+      .cls-7 {
+        fill: #6e809a;
+      }
+
+      .cls-8 {
+        fill: url(#Unbenannter_Verlauf_225);
+      }
+
+      .cls-9 {
+        fill: url(#Unbenannter_Verlauf_236);
+      }
+
+      .cls-10 {
+        fill: url(#Unbenannter_Verlauf_130);
+      }
+
+      .cls-11 {
+        fill: url(#Unbenannter_Verlauf_170);
+      }
+
+      .cls-12 {
+        fill: url(#Unbenannter_Verlauf_161);
+      }
+
+      .cls-13 {
+        fill: url(#Unbenannter_Verlauf_183);
+      }
+
+      .cls-14 {
+        fill: #b06ba9;
+      }
+
+      .cls-15 {
+        fill: #826415;
+      }
+
+      .cls-16 {
+        fill: #e2aa11;
+      }
+
+      .cls-17 {
+        fill: #893089;
+      }
+    </style>
+    <linearGradient id="Unbenannter_Verlauf_161" data-name="Unbenannter Verlauf 161" x1="8.31" y1="8.31" x2="18.06" y2="18.06" gradientTransform="translate(13.19 -5.46) rotate(45)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#f3db78"/>
+      <stop offset=".19" stop-color="#f4e188"/>
+      <stop offset=".34" stop-color="#f4e38d"/>
+      <stop offset=".38" stop-color="#f4df81"/>
+      <stop offset=".47" stop-color="#f5d86f"/>
+      <stop offset=".57" stop-color="#f5d463"/>
+      <stop offset=".67" stop-color="#f6d360"/>
+      <stop offset=".89" stop-color="#f1cc53"/>
+      <stop offset="1" stop-color="#efbe33"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_130" data-name="Unbenannter Verlauf 130" x1=".41" y1="15.42" x2="10.95" y2="25.97" gradientTransform="translate(-4.94 39.35) rotate(-135)" gradientUnits="userSpaceOnUse">
+      <stop offset=".18" stop-color="#e2aa11"/>
+      <stop offset=".91" stop-color="#826415"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_130-2" data-name="Unbenannter Verlauf 130" x1="15.42" y1=".41" x2="25.97" y2="10.95" gradientTransform="translate(31.32 24.33) rotate(-135)" xlink:href="#Unbenannter_Verlauf_130"/>
+    <linearGradient id="Unbenannter_Verlauf_170" data-name="Unbenannter Verlauf 170" x1="34.88" y1="15.61" x2="42.24" y2="22.97" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#deb0d3"/>
+      <stop offset=".15" stop-color="#e1b5d6"/>
+      <stop offset=".3" stop-color="#e3b8d7"/>
+      <stop offset=".4" stop-color="#d7a8cd"/>
+      <stop offset=".53" stop-color="#cf9cc7"/>
+      <stop offset=".67" stop-color="#cd99c5"/>
+      <stop offset=".89" stop-color="#c68abc"/>
+      <stop offset="1" stop-color="#bb7db4"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_225" data-name="Unbenannter Verlauf 225" x1="28.7" y1="20.09" x2="36.78" y2="28.17" gradientTransform="translate(.63 .63) rotate(-.12) skewX(-.25)" gradientUnits="userSpaceOnUse">
+      <stop offset=".19" stop-color="#b06ba9"/>
+      <stop offset=".87" stop-color="#893089"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_225-2" data-name="Unbenannter Verlauf 225" x1="39.35" y1="9.41" x2="47.43" y2="17.49" xlink:href="#Unbenannter_Verlauf_225"/>
+    <linearGradient id="Unbenannter_Verlauf_183" data-name="Unbenannter Verlauf 183" x1="34.79" y1="39.35" x2="42.18" y2="46.74" gradientTransform="translate(41.71 -14.61) rotate(45)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#91c4eb"/>
+      <stop offset=".2" stop-color="#9dc9ed"/>
+      <stop offset=".33" stop-color="#96c6ec"/>
+      <stop offset=".35" stop-color="#91c3ea"/>
+      <stop offset=".45" stop-color="#7fb8e5"/>
+      <stop offset=".56" stop-color="#73b2e2"/>
+      <stop offset=".67" stop-color="#70b0e1"/>
+      <stop offset=".89" stop-color="#60a7dc"/>
+      <stop offset="1" stop-color="#4d9bd5"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_236" data-name="Unbenannter Verlauf 236" x1="28.76" y1="43.79" x2="36.83" y2="51.86" gradientTransform="translate(22.62 105.05) rotate(-135.12) skewX(-.25)" gradientUnits="userSpaceOnUse">
+      <stop offset=".19" stop-color="#5d9bd4"/>
+      <stop offset=".87" stop-color="#1e3e88"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_236-2" data-name="Unbenannter Verlauf 236" x1="39.41" y1="33.15" x2="47.47" y2="41.21" gradientTransform="translate(48.33 94.4) rotate(-135.12) skewX(-.25)" xlink:href="#Unbenannter_Verlauf_236"/>
+  </defs>
+  <g>
+    <rect class="cls-7" x="22.43" y="16.81" width="1.75" height="25.04"/>
+    <rect class="cls-7" x="17.04" y="16.81" width="19.66" height="1.82"/>
+    <rect class="cls-7" x="22.43" y="40.09" width="11.87" height="1.75"/>
+    <g>
+      <rect class="cls-12" x="2.56" y="6.29" width="21.26" height="13.79" transform="translate(-5.46 13.19) rotate(-45)"/>
+      <rect class="cls-15" x="17.48" y="6.87" width="1.15" height="22.38" transform="translate(18.06 -7.47) rotate(45)"/>
+      <g>
+        <rect class="cls-16" x="7.74" y="-2.87" width="1.15" height="22.38" transform="translate(8.32 -3.45) rotate(45)"/>
+        <rect class="cls-10" x="5.1" y="13.24" width="1.15" height="14.92" transform="translate(24.33 31.32) rotate(135)"/>
+        <rect class="cls-1" x="20.12" y="-1.78" width="1.15" height="14.92" transform="translate(39.35 -4.94) rotate(135)"/>
+      </g>
+    </g>
+    <g>
+      <polygon class="cls-11" points="40.23 10.26 29.56 20.96 36.89 28.31 47.56 17.61 40.23 10.26"/>
+      <polygon class="cls-17" points="36.91 29.03 36.2 28.31 47.56 16.92 48.27 17.63 36.91 29.03"/>
+      <polygon class="cls-14" points="29.59 21.68 28.88 20.97 40.24 9.57 40.95 10.29 29.59 21.68"/>
+      <polygon class="cls-8" points="28.88 20.97 29.59 20.25 37.62 28.31 36.91 29.02 28.88 20.97"/>
+      <polygon class="cls-3" points="39.53 10.29 40.24 9.57 48.27 17.63 47.56 18.34 39.53 10.29"/>
+    </g>
+    <g>
+      <rect class="cls-13" x="30.88" y="37.82" width="15.22" height="10.45" transform="translate(-19.17 39.82) rotate(-45)"/>
+      <g>
+        <rect class="cls-9" x="32.75" y="42.61" width="1.01" height="11.36" transform="translate(90.91 58.91) rotate(135)"/>
+        <rect class="cls-2" x="43.4" y="31.96" width="1.01" height="11.36" transform="translate(101.56 33.21) rotate(135)"/>
+        <rect class="cls-6" x="41.73" y="38.59" width="1.01" height="16.06" transform="translate(45.34 -16.21) rotate(45)"/>
+        <rect class="cls-4" x="34.41" y="31.27" width="1.01" height="16.06" transform="translate(38.02 -13.18) rotate(45)"/>
+      </g>
+    </g>
+  </g>
+  <g>
+    <path class="cls-5" d="M53.53,30.44v11.43h-2.56v-25.07h9.34c5.03,0,7.7,2.71,7.7,6.63,0,3.21-1.88,5.24-4.5,5.87,2.33.58,4.08,2.19,4.08,6.49v1.01c0,1.74-.11,4.06.33,5.06h-2.54c-.46-1.08-.39-3.09-.39-5.33v-.59c0-3.87-1.12-5.51-5.78-5.51h-5.68ZM53.53,28.19h5.77c4.14,0,6.02-1.55,6.02-4.63,0-2.89-1.88-4.53-5.55-4.53h-6.24v9.16Z"/>
+    <path class="cls-5" d="M86.34,29.8h-12.62v9.77h13.84l-.35,2.3h-16.02v-25.06h15.77v2.26h-13.25v8.47h12.62v2.26Z"/>
+    <path class="cls-5" d="M108.85,34.96c-1.15,4.09-4.19,7.17-9.65,7.17-7.32,0-11.11-5.7-11.11-12.76s3.75-12.93,11.18-12.93c5.63,0,8.82,3.17,9.6,7.35h-2.56c-1.03-3.02-3-5.12-7.16-5.12-5.91,0-8.36,5.39-8.36,10.63s2.38,10.6,8.5,10.6c3.98,0,5.88-2.16,6.99-4.94h2.56Z"/>
+    <path class="cls-5" d="M111.34,16.8h2.56v22.77h13.27l-.4,2.26h-15.42v-25.03Z"/>
+    <path class="cls-5" d="M132.69,33.69l-2.96,8.14h-2.57l9.07-25.03h3.1l9.45,25.03h-2.75l-3.04-8.14h-10.3ZM142.25,31.43c-2.61-7.05-3.98-10.59-4.5-12.37h-.04c-.61,2-2.15,6.34-4.26,12.37h8.8Z"/>
+    <path class="cls-5" d="M151.31,34.99c.72,3.18,2.86,4.99,6.75,4.99,4.27,0,5.93-2.08,5.93-4.64,0-2.68-1.24-4.28-6.53-5.57-5.57-1.37-7.75-3.23-7.75-6.8s2.55-6.54,8.02-6.54,8.09,3.4,8.42,6.55h-2.62c-.52-2.48-2.11-4.36-5.91-4.36-3.36,0-5.21,1.54-5.21,4.15s1.54,3.58,6.05,4.69c7.09,1.75,8.22,4.55,8.22,7.65,0,3.84-2.82,7.02-8.76,7.02-6.27,0-8.75-3.55-9.24-7.13h2.62Z"/>
+    <path class="cls-5" d="M170.17,34.99c.72,3.18,2.86,4.99,6.75,4.99,4.27,0,5.93-2.08,5.93-4.64,0-2.68-1.24-4.28-6.53-5.57-5.57-1.37-7.75-3.23-7.75-6.8s2.55-6.54,8.02-6.54,8.09,3.4,8.42,6.55h-2.62c-.52-2.48-2.11-4.36-5.91-4.36-3.36,0-5.21,1.54-5.21,4.15s1.54,3.58,6.05,4.69c7.09,1.75,8.22,4.55,8.22,7.65,0,3.84-2.82,7.02-8.76,7.02-6.27,0-8.75-3.55-9.24-7.13h2.62Z"/>
+  </g>
+</svg>

msvc/ProcessMemoryPlugin.vcxproj

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8792F51B-4951-4BAD-B130-2F0EFDEFF64B}</ProjectGuid>
+    <Keyword>QtVS_v304</Keyword>
+    <RootNamespace>ProcessMemoryPlugin</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>debug</QtBuildConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>release</QtBuildConfig>
+  </PropertyGroup>
+  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
+    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
+  </Target>
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <QtMoc Include="..\src\processpicker.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtUic Include="..\src\processpicker.ui" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\plugins\ProcessMemory\ProcessMemoryPlugin.h" />
+    <ClInclude Include="..\src\iplugin.h" />
+    <ClInclude Include="..\src\providers\provider.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\plugins\ProcessMemory\ProcessMemoryPlugin.cpp" />
+    <ClCompile Include="..\src\processpicker.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
+    <Import Project="$(QtMsBuild)\qt.targets" />
+  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

msvc/RcNetCompatPlugin.vcxproj

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6B775E9C-9CB6-45FD-86A0-BE948A778969}</ProjectGuid>
+    <Keyword>QtVS_v304</Keyword>
+    <RootNamespace>RcNetCompatPlugin</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>debug</QtBuildConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>release</QtBuildConfig>
+  </PropertyGroup>
+  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
+    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
+  </Target>
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>HAS_CLR_BRIDGE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>HAS_CLR_BRIDGE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <QtMoc Include="..\src\processpicker.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtUic Include="..\src\processpicker.ui" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\plugins\RcNetPluginCompatLayer\RcNetCompatPlugin.h" />
+    <ClInclude Include="..\plugins\RcNetPluginCompatLayer\RcNetCompatProvider.h" />
+    <ClInclude Include="..\plugins\RcNetPluginCompatLayer\ReClassNET_Plugin.hpp" />
+    <ClInclude Include="..\plugins\RcNetPluginCompatLayer\ClrHost.h" />
+    <ClInclude Include="..\src\iplugin.h" />
+    <ClInclude Include="..\src\providers\provider.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\plugins\RcNetPluginCompatLayer\RcNetCompatPlugin.cpp" />
+    <ClCompile Include="..\plugins\RcNetPluginCompatLayer\RcNetCompatProvider.cpp" />
+    <ClCompile Include="..\plugins\RcNetPluginCompatLayer\ClrHost.cpp" />
+    <ClCompile Include="..\src\processpicker.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
+    <Import Project="$(QtMsBuild)\qt.targets" />
+  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

msvc/Reclass.slnx

@@ -0,0 +1,17 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Folder Name="/plugins/">
+    <Project Path="ProcessMemoryPlugin.vcxproj" Id="8792f51b-4951-4bad-b130-2f0efdeff64b" />
+    <Project Path="WinDbgMemoryPlugin.vcxproj" Id="e25d358e-20f0-448b-bb2f-55e9d1f8e7ca" />
+    <Project Path="RemoteProcessMemoryPlugin.vcxproj" Id="39e2ddf6-cb76-4063-b957-66ecf1252010" />
+    <Project Path="RcNetCompatPlugin.vcxproj" Id="6b775e9c-9cb6-45fd-86a0-be948a778969" />
+  </Folder>
+  <Folder Name="/third_party/">
+    <Project Path="../third_party/raw_pdb/build/RawPDB.vcxproj" Id="fbe3dbfa-20a7-4f99-9326-ed82c8b7b910" />
+    <Project Path="fadec.vcxproj" Id="6a30a4f0-1a8d-4c6e-82d4-0a0d9693aa40" />
+    <Project Path="qscintilla.vcxproj" Id="f7124b57-7682-4702-b725-4d844dc41ada" />
+  </Folder>
+  <Project Path="Reclass.vcxproj" Id="c369f1fe-37c2-4c66-ac6d-ecb2b2b4ad5e" />
+</Solution>

msvc/Reclass.vcxproj

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="18.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C369F1FE-37C2-4C66-AC6D-ECB2B2B4AD5E}</ProjectGuid>
+    <Keyword>QtVS_v304</Keyword>
+    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0</WindowsTargetPlatformVersion>
+    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets;concurrent;network;svg</QtModules>
+    <QtBuildConfig>debug</QtBuildConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets;concurrent;network;svg</QtModules>
+    <QtBuildConfig>release</QtBuildConfig>
+  </PropertyGroup>
+  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
+    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
+  </Target>
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\third_party\fadec\;..\third_party\raw_pdb\src\;..\third_party\qscintilla\src\;..\src\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dwmapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>$(QtToolsPath)/windeployqt $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).exe
+xcopy /Y /I "$(SolutionDir)..\src\examples\*.rcx" "$(SolutionDir)$(Platform)\$(Configuration)\examples\"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <AdditionalDependencies>dwmapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\third_party\fadec\;..\third_party\raw_pdb\src\;..\third_party\qscintilla\src\;..\src\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>$(QtToolsPath)/windeployqt $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).exe
+xcopy /Y /I "$(SolutionDir)..\src\examples\*.rcx" "$(SolutionDir)$(Platform)\$(Configuration)\examples\"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ClCompile>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ClCompile>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <QtRcc Include="..\src\resources.qrc" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtUic Include="..\src\processpicker.ui" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtMoc Include="..\src\controller.h" />
+    <QtMoc Include="..\src\editor.h" />
+    <QtMoc Include="..\src\mainwindow.h" />
+    <QtMoc Include="..\src\optionsdialog.h" />
+    <QtMoc Include="..\src\processpicker.h" />
+    <QtMoc Include="..\src\scanner.h" />
+    <QtMoc Include="..\src\scannerpanel.h" />
+    <QtMoc Include="..\src\titlebar.h" />
+    <QtMoc Include="..\src\typeselectorpopup.h" />
+    <QtMoc Include="..\src\imports\import_pdb_dialog.h" />
+    <QtMoc Include="..\src\mcp\mcp_bridge.h" />
+    <QtMoc Include="..\src\themes\themeeditor.h" />
+    <QtMoc Include="..\src\themes\thememanager.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\addressparser.h" />
+    <ClInclude Include="..\src\core.h" />
+    <ClInclude Include="..\src\disasm.h" />
+    <QtMoc Include="..\src\dock_tab_buttons.h" />
+    <ClInclude Include="..\src\generator.h" />
+    <ClInclude Include="..\src\iplugin.h" />
+    <ClInclude Include="..\src\pluginmanager.h" />
+    <ClInclude Include="..\src\providerregistry.h" />
+    <QtMoc Include="..\src\startpage.h" />
+    <ClInclude Include="..\src\workspace_model.h" />
+    <ClInclude Include="..\src\imports\export_reclass_xml.h" />
+    <ClInclude Include="..\src\imports\import_pdb.h" />
+    <ClInclude Include="..\src\imports\import_reclass_xml.h" />
+    <ClInclude Include="..\src\imports\import_source.h" />
+    <ClInclude Include="..\src\providers\buffer_provider.h" />
+    <ClInclude Include="..\src\providers\null_provider.h" />
+    <ClInclude Include="..\src\providers\provider.h" />
+    <ClInclude Include="..\src\providers\snapshot_provider.h" />
+    <ClInclude Include="..\src\themes\theme.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\addressparser.cpp" />
+    <ClCompile Include="..\src\compose.cpp" />
+    <ClCompile Include="..\src\controller.cpp" />
+    <ClCompile Include="..\src\disasm.cpp" />
+    <ClCompile Include="..\src\editor.cpp" />
+    <ClCompile Include="..\src\format.cpp" />
+    <ClCompile Include="..\src\generator.cpp" />
+    <ClCompile Include="..\src\main.cpp">
+      <DynamicSource Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">input</DynamicSource>
+      <QtMocFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).moc</QtMocFileName>
+      <DynamicSource Condition="'$(Configuration)|$(Platform)'=='Release|x64'">input</DynamicSource>
+      <QtMocFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).moc</QtMocFileName>
+    </ClCompile>
+    <ClCompile Include="..\src\optionsdialog.cpp" />
+    <ClCompile Include="..\src\pluginmanager.cpp" />
+    <ClCompile Include="..\src\processpicker.cpp" />
+    <ClCompile Include="..\src\providerregistry.cpp" />
+    <ClCompile Include="..\src\scanner.cpp" />
+    <ClCompile Include="..\src\scannerpanel.cpp" />
+    <ClCompile Include="..\src\titlebar.cpp" />
+    <ClCompile Include="..\src\typeselectorpopup.cpp" />
+    <ClCompile Include="..\src\imports\export_reclass_xml.cpp" />
+    <ClCompile Include="..\src\imports\import_pdb.cpp" />
+    <ClCompile Include="..\src\imports\import_pdb_dialog.cpp" />
+    <ClCompile Include="..\src\imports\import_reclass_xml.cpp" />
+    <ClCompile Include="..\src\imports\import_source.cpp" />
+    <ClCompile Include="..\src\mcp\mcp_bridge.cpp" />
+    <ClCompile Include="..\src\themes\theme.cpp" />
+    <ClCompile Include="..\src\themes\themeeditor.cpp" />
+    <ClCompile Include="..\src\themes\thememanager.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="fadec.vcxproj">
+      <Project>{6A30A4F0-1A8D-4C6E-82D4-0A0D9693AA40}</Project>
+    </ProjectReference>
+    <ProjectReference Include="qscintilla.vcxproj">
+      <Project>{F7124B57-7682-4702-B725-4D844DC41ADA}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\third_party\raw_pdb\build\RawPDB.vcxproj">
+      <Project>{fbe3dbfa-20a7-4f99-9326-ed82c8b7b910}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
+    <Import Project="$(QtMsBuild)\qt.targets" />
+  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

msvc/Reclass.vcxproj.filters

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>qml;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\imports">
+      <UniqueIdentifier>{A1B2C3D4-0001-0001-0001-000000000001}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\mcp">
+      <UniqueIdentifier>{A1B2C3D4-0001-0001-0001-000000000002}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\themes">
+      <UniqueIdentifier>{A1B2C3D4-0001-0001-0001-000000000003}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Header Files\imports">
+      <UniqueIdentifier>{A1B2C3D4-0002-0001-0001-000000000001}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\mcp">
+      <UniqueIdentifier>{A1B2C3D4-0002-0001-0001-000000000002}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\providers">
+      <UniqueIdentifier>{A1B2C3D4-0002-0001-0001-000000000003}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\themes">
+      <UniqueIdentifier>{A1B2C3D4-0002-0001-0001-000000000004}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>qrc;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Form Files">
+      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
+      <Extensions>ui</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <QtRcc Include="..\src\resources.qrc">
+      <Filter>Resource Files</Filter>
+    </QtRcc>
+  </ItemGroup>
+  <ItemGroup>
+    <QtUic Include="..\src\processpicker.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
+  </ItemGroup>
+  <ItemGroup>
+    <QtMoc Include="..\src\controller.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\editor.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\mainwindow.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\optionsdialog.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\processpicker.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\scanner.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\scannerpanel.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\titlebar.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\typeselectorpopup.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\imports\import_pdb_dialog.h">
+      <Filter>Header Files\imports</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\mcp\mcp_bridge.h">
+      <Filter>Header Files\mcp</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\themes\themeeditor.h">
+      <Filter>Header Files\themes</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\themes\thememanager.h">
+      <Filter>Header Files\themes</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\dock_tab_buttons.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="..\src\startpage.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\addressparser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\disasm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\generator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\iplugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\pluginmanager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\providerregistry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\workspace_model.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imports\export_reclass_xml.h">
+      <Filter>Header Files\imports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imports\import_pdb.h">
+      <Filter>Header Files\imports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imports\import_reclass_xml.h">
+      <Filter>Header Files\imports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imports\import_source.h">
+      <Filter>Header Files\imports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\providers\buffer_provider.h">
+      <Filter>Header Files\providers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\providers\null_provider.h">
+      <Filter>Header Files\providers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\providers\provider.h">
+      <Filter>Header Files\providers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\providers\snapshot_provider.h">
+      <Filter>Header Files\providers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\themes\theme.h">
+      <Filter>Header Files\themes</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\addressparser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\compose.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\controller.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\disasm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\editor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\format.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\generator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\optionsdialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\pluginmanager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\processpicker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\providerregistry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scannerpanel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\titlebar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\typeselectorpopup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imports\export_reclass_xml.cpp">
+      <Filter>Source Files\imports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imports\import_pdb.cpp">
+      <Filter>Source Files\imports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imports\import_pdb_dialog.cpp">
+      <Filter>Source Files\imports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imports\import_reclass_xml.cpp">
+      <Filter>Source Files\imports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imports\import_source.cpp">
+      <Filter>Source Files\imports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\mcp\mcp_bridge.cpp">
+      <Filter>Source Files\mcp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\themes\theme.cpp">
+      <Filter>Source Files\themes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\themes\themeeditor.cpp">
+      <Filter>Source Files\themes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\themes\thememanager.cpp">
+      <Filter>Source Files\themes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

msvc/RemoteProcessMemoryPlugin.vcxproj

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{39E2DDF6-CB76-4063-B957-66ECF1252010}</ProjectGuid>
+    <Keyword>QtVS_v304</Keyword>
+    <RootNamespace>RemoteProcessMemoryPlugin</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>debug</QtBuildConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>release</QtBuildConfig>
+  </PropertyGroup>
+  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
+    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
+  </Target>
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;..\plugins\RemoteProcessMemory;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;..\plugins\RemoteProcessMemory;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <QtMoc Include="..\src\processpicker.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtUic Include="..\src\processpicker.ui" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\plugins\RemoteProcessMemory\RemoteProcessMemoryPlugin.h" />
+    <ClInclude Include="..\plugins\RemoteProcessMemory\rcx_rpc_protocol.h" />
+    <ClInclude Include="..\src\iplugin.h" />
+    <ClInclude Include="..\src\providers\provider.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\plugins\RemoteProcessMemory\RemoteProcessMemoryPlugin.cpp" />
+    <ClCompile Include="..\src\processpicker.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
+    <Import Project="$(QtMsBuild)\qt.targets" />
+  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

msvc/WinDbgMemoryPlugin.vcxproj

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E25D358E-20F0-448B-BB2F-55E9D1F8E7CA}</ProjectGuid>
+    <Keyword>QtVS_v304</Keyword>
+    <RootNamespace>WinDbgMemoryPlugin</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>debug</QtBuildConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>release</QtBuildConfig>
+  </PropertyGroup>
+  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
+    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
+  </Target>
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>dbgeng.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>dbgeng.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <QtMoc Include="..\plugins\WinDbgMemory\WinDbgMemoryPlugin.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\iplugin.h" />
+    <ClInclude Include="..\src\providers\provider.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\plugins\WinDbgMemory\WinDbgMemoryPlugin.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
+    <Import Project="$(QtMsBuild)\qt.targets" />
+  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

msvc/fadec.vcxproj

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6A30A4F0-1A8D-4C6E-82D4-0A0D9693AA40}</ProjectGuid>
+    <RootNamespace>fadec</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <FadecDir>..\third_party\fadec\</FadecDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(FadecDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level4</WarningLevel>
+      <SDLCheck>false</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4018;4146;4244;4245;4267;4310</DisableSpecificWarnings>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(FadecDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level4</WarningLevel>
+      <SDLCheck>false</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4018;4146;4244;4245;4267;4310</DisableSpecificWarnings>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Target Name="GenerateFadecTables" BeforeTargets="ClCompile"
+          Inputs="$(FadecDir)instrs.txt;$(FadecDir)parseinstrs.py"
+          Outputs="$(FadecDir)fadec-decode-public.inc;$(FadecDir)fadec-decode-private.inc">
+    <Exec Command="python &quot;$(FadecDir)parseinstrs.py&quot; decode &quot;$(FadecDir)instrs.txt&quot; &quot;$(FadecDir)fadec-decode-public.inc&quot; &quot;$(FadecDir)fadec-decode-private.inc&quot; --32 --64" />
+  </Target>
+  <ItemGroup>
+    <ClCompile Include="..\third_party\fadec\decode.c" />
+    <ClCompile Include="..\third_party\fadec\format.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\third_party\fadec\fadec.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

msvc/qscintilla.vcxproj

@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F7124B57-7682-4702-B725-4D844DC41ADA}</ProjectGuid>
+    <Keyword>QtVS_v304</Keyword>
+    <RootNamespace>qscintilla</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets;printsupport</QtModules>
+    <QtBuildConfig>debug</QtBuildConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
+    <QtInstall>Qt 6.10.2 MSVC</QtInstall>
+    <QtModules>core;gui;widgets;printsupport</QtModules>
+    <QtBuildConfig>release</QtBuildConfig>
+  </PropertyGroup>
+  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
+    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
+  </Target>
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(QtMsBuild)\Qt.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <QScintillaDir>..\third_party\qscintilla\</QScintillaDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(QScintillaDir)src;$(QScintillaDir)scintilla\include;$(QScintillaDir)scintilla\lexlib;$(QScintillaDir)scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <PreprocessorDefinitions>SCINTILLA_QT;SCI_LEXER;INCLUDE_DEPRECATED_FEATURES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(QScintillaDir)src;$(QScintillaDir)scintilla\include;$(QScintillaDir)scintilla\lexlib;$(QScintillaDir)scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <PreprocessorDefinitions>SCINTILLA_QT;SCI_LEXER;INCLUDE_DEPRECATED_FEATURES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <!-- QtMoc headers (Q_OBJECT) — QScintilla Qt wrapper -->
+  <ItemGroup>
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qsciabstractapis.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qsciapis.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexer.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerasm.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexeravs.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerbash.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerbatch.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexercmake.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexercoffeescript.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexercpp.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexercsharp.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexercss.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexercustom.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerd.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerdiff.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexeredifact.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerfortran.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerfortran77.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerhex.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerhtml.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexeridl.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerintelhex.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerjava.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerjavascript.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerjson.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerlua.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexermakefile.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexermarkdown.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexermasm.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexermatlab.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexernasm.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexeroctave.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerpascal.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerperl.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerpostscript.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerpo.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerpov.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerproperties.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerpython.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerruby.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerspice.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexersql.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexersrec.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexertcl.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexertekhex.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexertex.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerverilog.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexervhdl.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexerxml.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscilexeryaml.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qscimacro.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qsciscintilla.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\Qsci\qsciscintillabase.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\SciClasses.h" />
+    <QtMoc Include="..\third_party\qscintilla\src\ScintillaQt.h" />
+  </ItemGroup>
+  <!-- ClInclude headers (no Q_OBJECT) -->
+  <ItemGroup>
+    <ClInclude Include="..\third_party\qscintilla\src\Qsci\qscicommand.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\Qsci\qscicommandset.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\Qsci\qscidocument.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\Qsci\qsciglobal.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\Qsci\qsciprinter.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\Qsci\qscistyle.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\Qsci\qscistyledtext.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\ListBoxQt.h" />
+    <ClInclude Include="..\third_party\qscintilla\src\SciAccessibility.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\include\ILexer.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\include\ILoader.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\include\Platform.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\include\Sci_Position.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\include\SciLexer.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\include\Scintilla.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\include\ScintillaWidget.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\Accessor.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\CharacterCategory.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\CharacterSet.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\DefaultLexer.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\LexAccessor.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\LexerBase.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\LexerModule.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\LexerNoExceptions.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\LexerSimple.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\OptionSet.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\PropSetSimple.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\SparseState.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\StringCopy.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\StyleContext.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\SubStyles.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\lexlib\WordList.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\AutoComplete.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\CallTip.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\CaseConvert.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\CaseFolder.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Catalogue.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\CellBuffer.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\CharClassify.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\ContractionState.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\DBCS.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Decoration.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Document.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\EditModel.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Editor.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\EditView.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\ElapsedPeriod.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\ExternalLexer.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\FontQuality.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Indicator.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\IntegerRectangle.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\KeyMap.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\LineMarker.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\MarginView.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Partitioning.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\PerLine.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Position.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\PositionCache.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\RESearch.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\RunStyles.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\ScintillaBase.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Selection.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\SparseVector.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\SplitVector.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\Style.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\UniConversion.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\UniqueString.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\ViewStyle.h" />
+    <ClInclude Include="..\third_party\qscintilla\scintilla\src\XPM.h" />
+  </ItemGroup>
+  <!-- QScintilla Qt wrapper sources -->
+  <ItemGroup>
+    <ClCompile Include="..\third_party\qscintilla\src\qsciscintilla.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qsciscintillabase.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qsciabstractapis.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qsciapis.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscicommand.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscicommandset.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscidocument.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexer.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerasm.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexeravs.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerbash.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerbatch.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexercmake.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexercoffeescript.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexercpp.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexercsharp.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexercss.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexercustom.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerd.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerdiff.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexeredifact.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerfortran.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerfortran77.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerhex.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerhtml.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexeridl.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerintelhex.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerjava.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerjavascript.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerjson.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerlua.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexermakefile.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexermarkdown.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexermasm.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexermatlab.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexernasm.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexeroctave.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerpascal.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerperl.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerpostscript.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerpo.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerpov.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerproperties.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerpython.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerruby.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerspice.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexersql.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexersrec.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexertcl.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexertekhex.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexertex.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerverilog.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexervhdl.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexerxml.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscilexeryaml.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscimacro.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qsciprinter.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscistyle.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\qscistyledtext.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\InputMethod.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\ListBoxQt.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\PlatQt.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\SciAccessibility.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\SciClasses.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\src\ScintillaQt.cpp" />
+  </ItemGroup>
+  <!-- Scintilla lexers -->
+  <ItemGroup>
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexA68K.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAPDL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexASY.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAU3.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAVE.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAVS.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAbaqus.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAda.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAsm.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexAsn1.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexBaan.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexBash.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexBasic.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexBatch.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexBibTeX.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexBullant.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCLW.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCOBOL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCPP.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCSS.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCaml.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCmake.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCoffeeScript.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexConf.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCrontab.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexCsound.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexD.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexDMAP.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexDMIS.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexDiff.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexECL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexEDIFACT.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexEScript.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexEiffel.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexErlang.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexErrorList.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexFlagship.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexForth.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexFortran.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexGAP.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexGui4Cli.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexHTML.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexHaskell.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexHex.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexIndent.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexInno.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexJSON.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexKVIrc.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexKix.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexLaTeX.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexLisp.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexLout.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexLua.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMMIXAL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMPT.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMSSQL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMagik.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMake.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMarkdown.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMatlab.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMaxima.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMetapost.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexModula.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexMySQL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexNimrod.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexNsis.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexNull.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexOScript.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexOpal.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPB.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPLM.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPO.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPOV.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPS.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPascal.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPerl.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPowerPro.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPowerShell.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexProgress.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexProps.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexPython.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexR.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexRebol.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexRegistry.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexRuby.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexRust.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSAS.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSML.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSQL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSTTXT.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexScriptol.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSmalltalk.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSorcus.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSpecman.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexSpice.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexStata.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexTACL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexTADS3.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexTAL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexTCL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexTCMD.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexTeX.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexTxt2tags.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexVB.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexVHDL.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexVerilog.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexVisualProlog.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexers\LexYAML.cpp" />
+  </ItemGroup>
+  <!-- Scintilla lexlib -->
+  <ItemGroup>
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\Accessor.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\CharacterCategory.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\CharacterSet.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\DefaultLexer.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\LexerBase.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\LexerModule.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\LexerNoExceptions.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\LexerSimple.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\PropSetSimple.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\StyleContext.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\lexlib\WordList.cpp" />
+  </ItemGroup>
+  <!-- Scintilla core engine -->
+  <ItemGroup>
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\AutoComplete.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\CallTip.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\CaseConvert.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\CaseFolder.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\Catalogue.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\CellBuffer.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\CharClassify.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\ContractionState.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\DBCS.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\Decoration.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\Document.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\EditModel.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\Editor.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\EditView.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\ExternalLexer.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\Indicator.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\KeyMap.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\LineMarker.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\MarginView.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\PerLine.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\PositionCache.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\RESearch.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\RunStyles.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\ScintillaBase.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\Selection.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\Style.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\UniConversion.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\ViewStyle.cpp" />
+    <ClCompile Include="..\third_party\qscintilla\scintilla\src\XPM.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
+    <Import Project="$(QtMsBuild)\qt.targets" />
+  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

plugins/ProcessMemory/ProcessMemoryPlugin.cpp

@@ -19,6 +19,60 @@
 #include <tlhelp32.h>
 #include <psapi.h>
 #include <shellapi.h>
+
+typedef struct _UNICODE_STRING { USHORT Length, MaximumLength; PWSTR Buffer; } UNICODE_STRING;
+typedef struct _CLIENT_ID { HANDLE UniqueProcess; HANDLE UniqueThread; } CLIENT_ID;
+typedef struct _SYSTEM_THREAD_INFORMATION {
+    LARGE_INTEGER KernelTime, UserTime, CreateTime;
+    ULONG WaitTime; PVOID StartAddress; CLIENT_ID ClientId;
+    LONG Priority, BasePriority; ULONG ContextSwitches, ThreadState, WaitReason;
+} SYSTEM_THREAD_INFORMATION;
+typedef struct _SYSTEM_PROCESS_INFORMATION {
+    ULONG NextEntryOffset;                  // 0x000
+    ULONG NumberOfThreads;                  // 0x004
+    LARGE_INTEGER WorkingSetPrivateSize;    // 0x008
+    ULONG HardFaultCount;                   // 0x010
+    ULONG NumberOfThreadsHighWatermark;     // 0x014
+    ULONGLONG CycleTime;                    // 0x018
+    LARGE_INTEGER CreateTime;               // 0x020
+    LARGE_INTEGER UserTime;                 // 0x028
+    LARGE_INTEGER KernelTime;               // 0x030
+    UNICODE_STRING ImageName;               // 0x038
+    LONG BasePriority;                      // 0x048
+    HANDLE UniqueProcessId;                 // 0x050
+    PVOID InheritedFromUniqueProcessId;     // 0x058
+    ULONG HandleCount;                      // 0x060
+    ULONG SessionId;                        // 0x064
+    ULONG_PTR UniqueProcessKey;             // 0x068
+    SIZE_T PeakVirtualSize;                 // 0x070
+    SIZE_T VirtualSize;                     // 0x078
+    ULONG PageFaultCount;                   // 0x080
+    ULONG _pad0;                            // 0x084
+    SIZE_T PeakWorkingSetSize;              // 0x088
+    SIZE_T WorkingSetSize;                  // 0x090
+    SIZE_T QuotaPeakPagedPoolUsage;         // 0x098
+    SIZE_T QuotaPagedPoolUsage;             // 0x0A0
+    SIZE_T QuotaPeakNonPagedPoolUsage;      // 0x0A8
+    SIZE_T QuotaNonPagedPoolUsage;          // 0x0B0
+    SIZE_T PagefileUsage;                   // 0x0B8
+    SIZE_T PeakPagefileUsage;               // 0x0C0
+    SIZE_T PrivatePageCount;                // 0x0C8
+    LARGE_INTEGER ReadOperationCount;       // 0x0D0
+    LARGE_INTEGER WriteOperationCount;      // 0x0D8
+    LARGE_INTEGER OtherOperationCount;      // 0x0E0
+    LARGE_INTEGER ReadTransferCount;        // 0x0E8
+    LARGE_INTEGER WriteTransferCount;       // 0x0F0
+    LARGE_INTEGER OtherTransferCount;       // 0x0F8
+} SYSTEM_PROCESS_INFORMATION; // sizeof = 0x100
+typedef struct alignas(8) _THREAD_BASIC_INFORMATION {
+    NTSTATUS  ExitStatus;       // 0x00
+    ULONG     _pad;             // 0x04
+    PVOID     TebBaseAddress;   // 0x08
+    CLIENT_ID ClientId;         // 0x10
+    ULONG_PTR AffinityMask;     // 0x20
+    LONG      Priority;         // 0x28
+    LONG      BasePriority;     // 0x2C
+} THREAD_BASIC_INFORMATION;
 #elif defined(__linux__)
 #include <climits>
 #include <sys/types.h>
@@ -56,8 +110,24 @@ ProcessMemoryProvider::ProcessMemoryProvider(uint32_t pid, const QString& proces
         m_writable = false;
     }
 
-    if (m_handle)
+    if (m_handle) {
+        // Detect 32-bit (WoW64) process
+        BOOL isWow64 = FALSE;
+        if (IsWow64Process(m_handle, &isWow64) && isWow64)
+            m_pointerSize = 4;
+        // Query PEB address via NtQueryInformationProcess
+        {
+            typedef NTSTATUS(NTAPI* NtQIP_t)(HANDLE, ULONG, PVOID, ULONG, PULONG);
+            static NtQIP_t pNtQIP = (NtQIP_t)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryInformationProcess");
+            if (pNtQIP) {
+                struct { PVOID r1; PVOID PebBaseAddress; PVOID r2[2]; ULONG_PTR pid; PVOID r3; } pbi = {};
+                ULONG retLen = 0;
+                if (pNtQIP(m_handle, /*ProcessBasicInformation*/0, &pbi, sizeof(pbi), &retLen) >= 0 && pbi.PebBaseAddress)
+                    m_peb = (uint64_t)(uintptr_t)pbi.PebBaseAddress;
+            }
+        }
         cacheModules();
+    }
 }
 
 bool ProcessMemoryProvider::read(uint64_t addr, void* buf, int len) const
@@ -124,6 +194,51 @@ void ProcessMemoryProvider::cacheModules()
     }
 }
 
+QVector<rcx::MemoryRegion> ProcessMemoryProvider::enumerateRegions() const
+{
+    QVector<rcx::MemoryRegion> regions;
+    if (!m_handle) return regions;
+
+    MEMORY_BASIC_INFORMATION mbi;
+    uint64_t addr = 0;
+
+    while (VirtualQueryEx(m_handle, (LPCVOID)addr, &mbi, sizeof(mbi)) == sizeof(mbi)) {
+        if (mbi.State == MEM_COMMIT &&
+            !(mbi.Protect & PAGE_NOACCESS) &&
+            !(mbi.Protect & PAGE_GUARD))
+        {
+            rcx::MemoryRegion region;
+            region.base = (uint64_t)mbi.BaseAddress;
+            region.size = mbi.RegionSize;
+            region.readable = true;
+            region.writable = (mbi.Protect & PAGE_READWRITE) ||
+                              (mbi.Protect & PAGE_WRITECOPY) ||
+                              (mbi.Protect & PAGE_EXECUTE_READWRITE) ||
+                              (mbi.Protect & PAGE_EXECUTE_WRITECOPY);
+            region.executable = (mbi.Protect & PAGE_EXECUTE) ||
+                                (mbi.Protect & PAGE_EXECUTE_READ) ||
+                                (mbi.Protect & PAGE_EXECUTE_READWRITE) ||
+                                (mbi.Protect & PAGE_EXECUTE_WRITECOPY);
+
+            // Match module name from cached module list
+            for (const auto& mod : m_modules) {
+                if (region.base >= mod.base && region.base < mod.base + mod.size) {
+                    region.moduleName = mod.name;
+                    break;
+                }
+            }
+
+            regions.append(region);
+        }
+
+        uint64_t next = (uint64_t)mbi.BaseAddress + mbi.RegionSize;
+        if (next <= addr) break; // overflow protection
+        addr = next;
+    }
+
+    return regions;
+}
+
 #elif defined(__linux__)
 
 ProcessMemoryProvider::ProcessMemoryProvider(uint32_t pid, const QString& processName)
@@ -147,9 +262,20 @@ ProcessMemoryProvider::ProcessMemoryProvider(uint32_t pid, const QString& proces
         m_writable = false;
     }
 
-    if (m_fd >= 0)
+    if (m_fd >= 0) {
+        // Detect 32-bit ELF process
+        QString exePath = QStringLiteral("/proc/%1/exe").arg(pid);
+        QByteArray exePathUtf8 = exePath.toUtf8();
+        int exeFd = ::open(exePathUtf8.constData(), O_RDONLY);
+        if (exeFd >= 0) {
+            unsigned char elfClass = 0;
+            // ELF e_ident[EI_CLASS] is at offset 4
+            if (::pread(exeFd, &elfClass, 1, 4) == 1 && elfClass == 1) // ELFCLASS32
+                m_pointerSize = 4;
+            ::close(exeFd);
+        }
         cacheModules();
-
+    }
 }
 
 bool ProcessMemoryProvider::read(uint64_t addr, void* buf, int len) const
@@ -282,6 +408,58 @@ void ProcessMemoryProvider::cacheModules()
     }
 }
 
+QVector<rcx::MemoryRegion> ProcessMemoryProvider::enumerateRegions() const
+{
+    QVector<rcx::MemoryRegion> regions;
+    if (m_fd < 0) return regions;
+
+    QString mapsPath = QStringLiteral("/proc/%1/maps").arg(m_pid);
+    std::ifstream mapsFile(mapsPath.toStdString());
+    if (!mapsFile.is_open()) return regions;
+
+    std::string line;
+    while (std::getline(mapsFile, line)) {
+        std::istringstream iss(line);
+        std::string addrRange, perms, offset, dev, inode, pathname;
+        iss >> addrRange >> perms >> offset >> dev >> inode;
+        std::getline(iss, pathname);
+
+        auto dash = addrRange.find('-');
+        if (dash == std::string::npos) continue;
+        uint64_t addrStart = std::stoull(addrRange.substr(0, dash), nullptr, 16);
+        uint64_t addrEnd = std::stoull(addrRange.substr(dash + 1), nullptr, 16);
+
+        if (perms.size() < 4) continue;
+        bool readable   = (perms[0] == 'r');
+        bool writable   = (perms[1] == 'w');
+        bool executable = (perms[2] == 'x');
+
+        if (!readable) continue;
+
+        rcx::MemoryRegion region;
+        region.base       = addrStart;
+        region.size       = addrEnd - addrStart;
+        region.readable   = readable;
+        region.writable   = writable;
+        region.executable = executable;
+
+        // Extract module name from pathname
+        size_t start = pathname.find_first_not_of(" \t");
+        if (start != std::string::npos) {
+            QString qpath = QString::fromStdString(pathname.substr(start));
+            if (qpath.startsWith('/') && !qpath.startsWith("/dev/") &&
+                !qpath.startsWith("/memfd:")) {
+                QFileInfo fi(qpath);
+                region.moduleName = fi.fileName();
+            }
+        }
+
+        regions.append(region);
+    }
+
+    return regions;
+}
+
 #endif // platform
 
 uint64_t ProcessMemoryProvider::symbolToAddress(const QString& name) const
@@ -313,6 +491,58 @@ int ProcessMemoryProvider::size() const
 #endif
 }
 
+
+QVector<rcx::Provider::ThreadInfo> ProcessMemoryProvider::tebs() const
+{
+#ifdef _WIN32
+    QVector<ThreadInfo> result;
+    if (!m_handle || !m_peb) return result;
+
+    typedef NTSTATUS(NTAPI* NtQSI_t)(ULONG, PVOID, ULONG, PULONG);
+    typedef NTSTATUS(NTAPI* NtQIT_t)(HANDLE, ULONG, PVOID, ULONG, PULONG);
+    static auto pNtQSI = (NtQSI_t)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation");
+    static auto pNtQIT = (NtQIT_t)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryInformationThread");
+    if (!pNtQSI || !pNtQIT) return result;
+
+    // Enumerate threads via SystemProcessInformation (class 5)
+    ULONG retLen = 0;
+    ULONG bufSize = 1 << 20;
+    QByteArray buf(bufSize, 0);
+    NTSTATUS qsiSt;
+    for (int attempt = 0; attempt < 8; ++attempt) {
+        qsiSt = pNtQSI(5, buf.data(), bufSize, &retLen);
+        if ((uint32_t)qsiSt != 0xC0000004u) break;
+        bufSize *= 2;
+        buf.resize(bufSize);
+    }
+    if (qsiSt < 0) return result;
+
+    // Walk process entries to find ours
+    auto* proc = (SYSTEM_PROCESS_INFORMATION*)buf.data();
+    for (;;) {
+        if ((uintptr_t)proc->UniqueProcessId == m_pid) {
+            auto* threads = (SYSTEM_THREAD_INFORMATION*)((char*)proc + sizeof(*proc));
+            for (ULONG i = 0; i < proc->NumberOfThreads; ++i) {
+                DWORD tid = (DWORD)(uintptr_t)threads[i].ClientId.UniqueThread;
+                HANDLE hThread = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, tid);
+                if (!hThread) continue;
+                THREAD_BASIC_INFORMATION tbi = {};
+                ULONG tbiLen = 0;
+                NTSTATUS qitSt = pNtQIT(hThread, 0, &tbi, sizeof(tbi), &tbiLen);
+                if (qitSt >= 0 && tbi.TebBaseAddress)
+                    result.append({(uint64_t)(uintptr_t)tbi.TebBaseAddress, tid});
+                CloseHandle(hThread);
+            }
+            break;
+        }
+        if (!proc->NextEntryOffset) break;
+        proc = (SYSTEM_PROCESS_INFORMATION*)((char*)proc + proc->NextEntryOffset);
+    }
+    return result;
+#else
+    return {};
+#endif
+}
 // ──────────────────────────────────────────────────────────────────────────
 // ProcessMemoryPlugin implementation
 // ──────────────────────────────────────────────────────────────────────────
@@ -428,6 +658,7 @@ bool ProcessMemoryPlugin::selectTarget(QWidget* parent, QString* target)
         info.name = pinfo.name;
         info.path = pinfo.path;
         info.icon = pinfo.icon;
+        info.is32Bit = pinfo.is32Bit;
         processes.append(info);
     }
 
@@ -489,6 +720,11 @@ QVector<PluginProcessInfo> ProcessMemoryPlugin::enumerateProcesses()
                     }
                 }
 
+                // Detect 32-bit (WoW64) process
+                BOOL isWow64 = FALSE;
+                if (IsWow64Process(hProcess, &isWow64) && isWow64)
+                    info.is32Bit = true;
+
                 CloseHandle(hProcess);
             }
 
@@ -535,6 +771,16 @@ QVector<PluginProcessInfo> ProcessMemoryPlugin::enumerateProcesses()
         info.name = procName;
         info.path = resolvedPath;
         info.icon = defaultIcon;
+
+        // Detect 32-bit ELF process
+        int exeFd = ::open(exePath.toUtf8().constData(), O_RDONLY);
+        if (exeFd >= 0) {
+            unsigned char elfClass = 0;
+            if (::pread(exeFd, &elfClass, 1, 4) == 1 && elfClass == 1) // ELFCLASS32
+                info.is32Bit = true;
+            ::close(exeFd);
+        }
+
         processes.append(info);
     }
 #endif

plugins/ProcessMemory/ProcessMemoryPlugin.h

@@ -28,6 +28,8 @@ public:
 
     bool isLive() const override { return true; }
     uint64_t base() const override { return m_base; }
+    int pointerSize() const override { return m_pointerSize; }
+    QVector<rcx::MemoryRegion> enumerateRegions() const override;
     bool isReadable(uint64_t, int len) const override {
 #ifdef _WIN32
         return m_handle && len >= 0;
@@ -39,6 +41,8 @@ public:
     // Process-specific helpers
     uint32_t pid() const { return m_pid; }
     void refreshModules() { m_modules.clear(); cacheModules(); }
+    uint64_t peb() const override { return m_peb; }
+    QVector<ThreadInfo> tebs() const override;
 
 private:
     void cacheModules();
@@ -53,6 +57,8 @@ private:
     QString m_processName;
     bool m_writable;
     uint64_t m_base;
+    int m_pointerSize = 8;
+    uint64_t m_peb = 0;
 
     struct ModuleInfo {
         QString  name;

plugins/RemoteProcessMemory/RemoteProcessMemoryPlugin.cpp

@@ -59,6 +59,10 @@ struct IpcClient {
     QMutex mutex;
     bool   connected  = false;
 
+    RcxRpcHeader* header() const {
+        return mappedView ? reinterpret_cast<RcxRpcHeader*>(mappedView) : nullptr;
+    }
+
     ~IpcClient() { disconnect(); }
 
     /* ── connect / disconnect ──────────────────────────────────────── */
@@ -285,8 +289,16 @@ RemoteProcessProvider::RemoteProcessProvider(
     , m_base(0)
     , m_ipc(std::move(ipc))
 {
-    if (m_connected)
+    if (m_connected) {
         cacheModules();
+        // Read pointer size from payload's SHM header (0 means not set → default 8)
+        auto* hdr = m_ipc ? m_ipc->header() : nullptr;
+        if (hdr) {
+            uint32_t ps = hdr->pointerSize;
+            if (ps == 4 || ps == 8)
+                m_pointerSize = (int)ps;
+        }
+    }
 }
 
 RemoteProcessProvider::~RemoteProcessProvider() = default;

plugins/RemoteProcessMemory/RemoteProcessMemoryPlugin.h

@@ -32,6 +32,7 @@ public:
     QString  kind() const override { return QStringLiteral("RemoteProcess"); }
     bool     isLive() const override { return true; }
     uint64_t base() const override { return m_base; }
+    int      pointerSize() const override { return m_pointerSize; }
     bool     isReadable(uint64_t, int len) const override { return m_connected && len >= 0; }
     QString  getSymbol(uint64_t addr) const override;
     uint64_t symbolToAddress(const QString& n) const override;
@@ -45,6 +46,7 @@ private:
     QString  m_processName;
     bool     m_connected;
     uint64_t m_base;
+    int      m_pointerSize = 8;
     mutable std::shared_ptr<IpcClient> m_ipc;
     QVector<ModuleInfo> m_modules;
 };

plugins/RemoteProcessMemory/rcx_rpc_protocol.h

@@ -66,7 +66,8 @@ struct RcxRpcModuleEntry {
  *    32     responseCount    (4)
  *    36     totalDataUsed    (4)
  *    40     imageBase        (8)  -- main module base from PEB / procfs
- *    48     _pad[4048]
+ *    48     pointerSize      (4)  -- 4 for 32-bit, 8 for 64-bit payload
+ *    52     _pad[4044]
  */
 struct RcxRpcHeader {
     uint32_t version;
@@ -79,7 +80,8 @@ struct RcxRpcHeader {
     uint32_t responseCount;
     uint32_t totalDataUsed;
     uint64_t imageBase;        /* main module base (PEB on Win, /proc on Linux) */
-    uint8_t  _pad[RCX_RPC_HEADER_SIZE - 48];
+    uint32_t pointerSize;      /* 4 for 32-bit, 8 for 64-bit payload           */
+    uint8_t  _pad[RCX_RPC_HEADER_SIZE - 52];
 };
 
 /* ── name formatting helpers (PID-only, no nonce) ─────────────────── */

plugins/WinDbgMemory/CMakeLists.txt

@@ -20,7 +20,7 @@ set(PLUGIN_SOURCES
 add_library(WinDbgMemoryPlugin SHARED ${PLUGIN_SOURCES})
 
 # Link Qt + DbgEng
-target_link_libraries(WinDbgMemoryPlugin PRIVATE ${QT}::Widgets dbgeng ole32)
+target_link_libraries(WinDbgMemoryPlugin PRIVATE ${QT}::Widgets ole32)
 
 # Include directories
 target_include_directories(WinDbgMemoryPlugin PRIVATE

plugins/WinDbgMemory/WinDbgMemoryPlugin.cpp

@@ -12,12 +12,99 @@
 #include <QDebug>
 #include <QClipboard>
 #include <QGuiApplication>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QSettings>
 
 #ifdef _WIN32
 #include <windows.h>
 #include <initguid.h>
 #include <dbgeng.h>
-#pragma comment(lib, "dbgeng.lib")
+// dbgeng.dll is loaded dynamically — see loadDbgEngTools()
+
+// The system dbgeng.dll (C:\Windows\System32) does not support remote
+// connections (DebugConnect returns 0x8007053d).  The full version lives
+// in the Debugging Tools for Windows directory.  We load it dynamically
+// so the plugin works without requiring the debugger tools on PATH.
+static const char* const kDbgToolsDirs[] = {
+    "C:\\Program Files (x86)\\Windows Kits\\10\\Debuggers\\x64",
+    "C:\\Program Files\\Windows Kits\\10\\Debuggers\\x64",
+};
+static const char* const kSettingsKey = "WinDbgPlugin/DbgToolsDir";
+
+typedef HRESULT (STDAPICALLTYPE *PFN_DebugConnect)(PCSTR, REFIID, PVOID*);
+typedef HRESULT (STDAPICALLTYPE *PFN_DebugCreate)(REFIID, PVOID*);
+
+static QString  s_loadedDir;
+static HMODULE  s_hDbgEng = nullptr;
+
+static HMODULE tryLoadFrom(const char* dir) {
+    SetDllDirectoryA(dir);
+    // Pre-load dependencies so the tools versions are used instead of
+    // the older System32 copies (e.g. dbghelp.dll without StackWalk2).
+    char path[MAX_PATH];
+    for (auto dep : {"dbghelp.dll", "dbgcore.dll", "symsrv.dll"}) {
+        snprintf(path, sizeof(path), "%s\\%s", dir, dep);
+        LoadLibraryA(path); // OK if missing
+    }
+    snprintf(path, sizeof(path), "%s\\dbgeng.dll", dir);
+    HMODULE h = LoadLibraryA(path);
+    if (h) {
+        s_loadedDir = QString::fromLocal8Bit(dir);
+        qDebug() << "[WinDbg] Loaded dbgeng.dll from" << dir;
+    }
+    return h;
+}
+
+static HMODULE loadDbgEngTools() {
+    if (s_hDbgEng) return s_hDbgEng;
+
+    // 1. Try user-configured path from settings
+    QSettings settings;
+    QString userDir = settings.value(kSettingsKey).toString();
+    if (!userDir.isEmpty()) {
+        s_hDbgEng = tryLoadFrom(userDir.toLocal8Bit().constData());
+        if (s_hDbgEng) return s_hDbgEng;
+    }
+
+    // 2. Try well-known install paths
+    for (auto dir : kDbgToolsDirs) {
+        s_hDbgEng = tryLoadFrom(dir);
+        if (s_hDbgEng) return s_hDbgEng;
+    }
+
+    SetDllDirectoryA(nullptr);
+    return nullptr;
+}
+
+static bool dbgToolsFound() {
+    loadDbgEngTools();
+    return s_hDbgEng != nullptr;
+}
+
+static PFN_DebugConnect getDebugConnect() {
+    static PFN_DebugConnect pfn = nullptr;
+    static bool tried = false;
+    if (!tried) {
+        tried = true;
+        HMODULE h = loadDbgEngTools();
+        if (h) pfn = (PFN_DebugConnect)GetProcAddress(h, "DebugConnect");
+        if (!pfn) qWarning() << "[WinDbg] DebugConnect not available — Debugging Tools not found";
+    }
+    return pfn;
+}
+
+static PFN_DebugCreate getDebugCreate() {
+    static PFN_DebugCreate pfn = nullptr;
+    static bool tried = false;
+    if (!tried) {
+        tried = true;
+        HMODULE h = loadDbgEngTools();
+        if (h) pfn = (PFN_DebugCreate)GetProcAddress(h, "DebugCreate");
+        if (!pfn) qWarning() << "[WinDbg] DebugCreate not available — Debugging Tools not found";
+    }
+    return pfn;
+}
 #endif
 
 // ──────────────────────────────────────────────────────────────────────────
@@ -65,6 +152,9 @@ WinDbgMemoryProvider::WinDbgMemoryProvider(const QString& target)
     dispatchToOwner([this, &target]() {
         HRESULT hr;
 
+        // COM must be initialized on this thread for DbgEng
+        CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+
         qDebug() << "[WinDbg] Opening target:" << target
                  << "on DbgEng thread" << QThread::currentThread();
 
@@ -72,9 +162,11 @@ WinDbgMemoryProvider::WinDbgMemoryProvider(const QString& target)
             || target.startsWith("npipe:", Qt::CaseInsensitive))
         {
             // ── Remote: connect to existing WinDbg debug server ──
+            auto pfnConnect = getDebugConnect();
+            if (!pfnConnect) { qWarning() << "[WinDbg] Debugging Tools required for remote connections"; return; }
             QByteArray connUtf8 = target.toUtf8();
             qDebug() << "[WinDbg] DebugConnect:" << target;
-            hr = DebugConnect(connUtf8.constData(), IID_IDebugClient, (void**)&m_client);
+            hr = pfnConnect(connUtf8.constData(), IID_IDebugClient, (void**)&m_client);
             qDebug() << "[WinDbg] DebugConnect hr=" << Qt::hex << (unsigned long)hr
                      << "client=" << (void*)m_client;
             if (FAILED(hr) || !m_client) {
@@ -86,7 +178,9 @@ WinDbgMemoryProvider::WinDbgMemoryProvider(const QString& target)
         else
         {
             // ── Local: create debug client for pid/dump ──
-            hr = DebugCreate(IID_IDebugClient, (void**)&m_client);
+            auto pfnCreate = getDebugCreate();
+            if (!pfnCreate) { qWarning() << "[WinDbg] Debugging Tools required"; return; }
+            hr = pfnCreate(IID_IDebugClient, (void**)&m_client);
             qDebug() << "[WinDbg] DebugCreate hr=" << Qt::hex << (unsigned long)hr
                      << "client=" << (void*)m_client;
             if (FAILED(hr) || !m_client) {
@@ -165,6 +259,10 @@ void WinDbgMemoryProvider::initInterfaces()
     qDebug() << "[WinDbg] IDebugDataSpaces hr=" << Qt::hex << (unsigned long)hr
              << "ptr=" << (void*)m_dataSpaces;
 
+    hr = m_client->QueryInterface(IID_IDebugDataSpaces2, (void**)&m_dataSpaces2);
+    qDebug() << "[WinDbg] IDebugDataSpaces2 hr=" << Qt::hex << (unsigned long)hr
+             << "ptr=" << (void*)m_dataSpaces2;
+
     hr = m_client->QueryInterface(IID_IDebugControl, (void**)&m_control);
     qDebug() << "[WinDbg] IDebugControl hr=" << Qt::hex << (unsigned long)hr
              << "ptr=" << (void*)m_control;
@@ -197,6 +295,19 @@ void WinDbgMemoryProvider::querySessionInfo()
         }
     }
 
+    // Query effective processor type for pointer size detection
+    if (m_control) {
+        ULONG procType = 0;
+        hr = m_control->GetEffectiveProcessorType(&procType);
+        if (SUCCEEDED(hr)) {
+            // IMAGE_FILE_MACHINE_I386 = 0x014C
+            if (procType == 0x014C)
+                m_pointerSize = 4;
+            qDebug() << "[WinDbg] EffectiveProcessorType=" << Qt::hex << procType
+                     << "pointerSize=" << m_pointerSize;
+        }
+    }
+
     // WinDbg provides access to the entire virtual address space.
     // Do NOT auto-select a module as base — let the user set their
     // own base address.  m_base stays 0 so the controller won't
@@ -222,6 +333,7 @@ WinDbgMemoryProvider::~WinDbgMemoryProvider()
                     m_client->DetachProcesses();
             }
             cleanup();
+            CoUninitialize();
         });
     } else {
         // Thread not running — clean up directly (best-effort)
@@ -251,10 +363,11 @@ WinDbgMemoryProvider::~WinDbgMemoryProvider()
 void WinDbgMemoryProvider::cleanup()
 {
 #ifdef _WIN32
-    if (m_symbols)    { m_symbols->Release();    m_symbols = nullptr; }
-    if (m_control)    { m_control->Release();    m_control = nullptr; }
-    if (m_dataSpaces) { m_dataSpaces->Release(); m_dataSpaces = nullptr; }
-    if (m_client)     { m_client->Release();     m_client = nullptr; }
+    if (m_symbols)     { m_symbols->Release();     m_symbols = nullptr; }
+    if (m_control)     { m_control->Release();     m_control = nullptr; }
+    if (m_dataSpaces2) { m_dataSpaces2->Release(); m_dataSpaces2 = nullptr; }
+    if (m_dataSpaces)  { m_dataSpaces->Release();  m_dataSpaces = nullptr; }
+    if (m_client)      { m_client->Release();      m_client = nullptr; }
 #endif
 }
 
@@ -351,6 +464,112 @@ QString WinDbgMemoryProvider::getSymbol(uint64_t addr) const
 #endif
 }
 
+QVector<rcx::MemoryRegion> WinDbgMemoryProvider::enumerateRegions() const
+{
+    QVector<rcx::MemoryRegion> regions;
+#ifdef _WIN32
+    if (!m_dataSpaces) return regions;
+
+    // Enumerate modules — used for tagging (user-mode) or as the primary
+    // source of regions (kernel-mode, where QueryVirtual is unavailable).
+    struct ModInfo { uint64_t base; uint64_t size; QString name; };
+    QVector<ModInfo> modules;
+
+    if (m_symbols) {
+        dispatchToOwner([&]() {
+            ULONG loaded = 0, unloaded = 0;
+            if (FAILED(m_symbols->GetNumberModules(&loaded, &unloaded)))
+                return;
+            for (ULONG i = 0; i < loaded; i++) {
+                ULONG64 modBase = 0;
+                if (FAILED(m_symbols->GetModuleByIndex(i, &modBase)))
+                    continue;
+                DEBUG_MODULE_PARAMETERS params = {};
+                if (FAILED(m_symbols->GetModuleParameters(1, &modBase, 0, &params)))
+                    continue;
+                char nameBuf[256] = {};
+                ULONG nameSize = 0;
+                m_symbols->GetModuleNames(i, 0,
+                                          nullptr, 0, nullptr,
+                                          nameBuf, sizeof(nameBuf), &nameSize,
+                                          nullptr, 0, nullptr);
+                ModInfo mi;
+                mi.base = modBase;
+                mi.size = params.Size;
+                mi.name = QString::fromUtf8(nameBuf);
+                modules.append(mi);
+            }
+        });
+    }
+
+    // Try QueryVirtual first (user-mode debugging / user-mode dumps).
+    // MSDN: "This method is not available in kernel-mode debugging."
+    if (m_dataSpaces2) {
+        dispatchToOwner([&]() {
+            ULONG64 addr = 0;
+            int safety = 0;
+            constexpr int kMaxRegions = 500000;
+
+            while (safety++ < kMaxRegions) {
+                MEMORY_BASIC_INFORMATION64 mbi = {};
+                HRESULT hr = m_dataSpaces2->QueryVirtual(addr, &mbi);
+                if (FAILED(hr))
+                    break;
+
+                if (mbi.State == MEM_COMMIT &&
+                    !(mbi.Protect & PAGE_NOACCESS) &&
+                    !(mbi.Protect & PAGE_GUARD))
+                {
+                    rcx::MemoryRegion region;
+                    region.base = mbi.BaseAddress;
+                    region.size = mbi.RegionSize;
+                    region.readable = true;
+                    region.writable = (mbi.Protect & PAGE_READWRITE) ||
+                                      (mbi.Protect & PAGE_WRITECOPY) ||
+                                      (mbi.Protect & PAGE_EXECUTE_READWRITE) ||
+                                      (mbi.Protect & PAGE_EXECUTE_WRITECOPY);
+                    region.executable = (mbi.Protect & PAGE_EXECUTE) ||
+                                        (mbi.Protect & PAGE_EXECUTE_READ) ||
+                                        (mbi.Protect & PAGE_EXECUTE_READWRITE) ||
+                                        (mbi.Protect & PAGE_EXECUTE_WRITECOPY);
+
+                    for (const auto& mod : modules) {
+                        if (region.base >= mod.base && region.base < mod.base + mod.size) {
+                            region.moduleName = mod.name;
+                            break;
+                        }
+                    }
+
+                    regions.append(region);
+                }
+
+                ULONG64 next = mbi.BaseAddress + mbi.RegionSize;
+                if (next <= addr) break;
+                addr = next;
+            }
+        });
+    }
+
+    // Fallback for kernel-mode debugging: QueryVirtual is unavailable,
+    // so use loaded modules as scannable regions.  Each module image
+    // becomes one region — the scanner reads through module code/data.
+    if (regions.isEmpty() && !modules.isEmpty()) {
+        for (const auto& mod : modules) {
+            if (mod.size == 0) continue;
+            rcx::MemoryRegion region;
+            region.base = mod.base;
+            region.size = mod.size;
+            region.readable = true;
+            region.writable = false;
+            region.executable = true;
+            region.moduleName = mod.name;
+            regions.append(region);
+        }
+    }
+#endif
+    return regions;
+}
+
 // ──────────────────────────────────────────────────────────────────────────
 // WinDbgMemoryPlugin implementation
 // ──────────────────────────────────────────────────────────────────────────
@@ -379,7 +598,7 @@ std::unique_ptr<rcx::Provider> WinDbgMemoryPlugin::createProvider(const QString&
                 *errorMsg = QString("Failed to connect to debug server.\n\n"
                                    "Target: %1\n\n"
                                    "Make sure WinDbg is running with a matching .server command\n"
-                                   "(e.g. .server tcp:port=5055) and the port/pipe is reachable.")
+                                   "(e.g. .server tcp:port=5056) and the port/pipe is reachable.")
                             .arg(target);
             else if (target.startsWith("pid:", Qt::CaseInsensitive))
                 *errorMsg = QString("Failed to attach to process.\n\n"
@@ -408,7 +627,7 @@ bool WinDbgMemoryPlugin::selectTarget(QWidget* parent, QString* target)
 {
     QDialog dlg(parent);
     dlg.setWindowTitle("WinDbg Settings");
-    dlg.resize(460, 260);
+    dlg.resize(480, 360);
 
     QPalette dlgPal = qApp->palette();
     dlg.setPalette(dlgPal);
@@ -416,15 +635,27 @@ bool WinDbgMemoryPlugin::selectTarget(QWidget* parent, QString* target)
 
     auto* layout = new QVBoxLayout(&dlg);
 
+    QColor editBg = dlgPal.window().color().darker(115);
+    QString editSS = QStringLiteral(
+        "QLineEdit { background: %1; color: %2; border: 1px solid %3;"
+        " border-radius: 3px; padding: 4px 6px; }")
+        .arg(editBg.name(),
+             dlgPal.color(QPalette::Text).name(),
+             dlgPal.color(QPalette::Mid).name());
+
     layout->addWidget(new QLabel(
         "Connect to a running WinDbg debug server.\n"
-        "In WinDbg, run:  .server tcp:port=5055"));
+        "In WinDbg, run:  .server tcp:port=5056\n\n"
+        "Non-invasive debug and dump files only.\n"
+        "Execution control (bp, g, t, p) is not supported.\n"
+        "WinDbg Classic is recommended."));
 
     layout->addSpacing(8);
     layout->addWidget(new QLabel("Connection string:"));
     auto* connEdit = new QLineEdit;
-    connEdit->setPlaceholderText("tcp:Port=5055,Server=localhost");
-    connEdit->setText("tcp:Port=5055,Server=localhost");
+    connEdit->setPlaceholderText("tcp:Port=5056,Server=127.0.0.1");
+    connEdit->setText("tcp:Port=5056,Server=127.0.0.1");
+    connEdit->setStyleSheet(editSS);
     layout->addWidget(connEdit);
 
     layout->addSpacing(4);
@@ -448,8 +679,72 @@ bool WinDbgMemoryPlugin::selectTarget(QWidget* parent, QString* target)
         layout->addLayout(row);
     };
 
-    addExample(".server tcp:port=5055");
+    addExample(".server tcp:port=5056");
     addExample(".server npipe:pipe=reclass");
+
+    // ── Debugger Tools status ──
+    layout->addSpacing(8);
+#ifdef _WIN32
+    bool found = dbgToolsFound();
+    auto* toolsRow = new QHBoxLayout;
+    auto* toolsLabel = new QLabel;
+    if (found) {
+        toolsLabel->setText(QStringLiteral("Debugging Tools:  %1").arg(s_loadedDir));
+        QPalette tp = dlgPal;
+        tp.setColor(QPalette::WindowText, dlgPal.color(QPalette::Disabled, QPalette::WindowText));
+        toolsLabel->setPalette(tp);
+    } else {
+        toolsLabel->setText("Debugging Tools:  not found");
+        QPalette tp = dlgPal;
+        tp.setColor(QPalette::WindowText, QColor(220, 120, 80));
+        toolsLabel->setPalette(tp);
+    }
+    toolsLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    toolsRow->addWidget(toolsLabel, 1);
+
+    auto* browseBtn = new QPushButton("Browse...");
+    browseBtn->setFixedWidth(70);
+    browseBtn->setToolTip("Locate Debugging Tools for Windows directory (contains dbgeng.dll)");
+    QObject::connect(browseBtn, &QPushButton::clicked, [&dlg, toolsLabel, &dlgPal]() {
+        QString dir = QFileDialog::getExistingDirectory(&dlg,
+            "Locate Debugging Tools for Windows",
+            "C:\\Program Files (x86)\\Windows Kits\\10\\Debuggers");
+        if (dir.isEmpty()) return;
+        QString dllPath = dir + "/dbgeng.dll";
+        if (!QFileInfo::exists(dllPath)) {
+            QMessageBox::warning(&dlg, "Not Found",
+                "dbgeng.dll was not found in that directory.\n"
+                "Select the folder containing dbgeng.dll\n"
+                "(e.g. Debuggers\\x64).");
+            return;
+        }
+        QSettings settings;
+        settings.setValue(kSettingsKey, dir);
+        // Force reload on next use
+        s_hDbgEng = nullptr;
+        s_loadedDir.clear();
+        if (dbgToolsFound()) {
+            toolsLabel->setText(QStringLiteral("Debugging Tools:  %1").arg(s_loadedDir));
+            QPalette tp = dlgPal;
+            tp.setColor(QPalette::WindowText, dlgPal.color(QPalette::Disabled, QPalette::WindowText));
+            toolsLabel->setPalette(tp);
+        }
+    });
+    toolsRow->addWidget(browseBtn);
+    layout->addLayout(toolsRow);
+
+    if (!found) {
+        auto* note = new QLabel(
+            "The system dbgeng.dll does not support remote connections.\n"
+            "Install Debugging Tools for Windows or use Browse to locate them.");
+        QPalette np = dlgPal;
+        np.setColor(QPalette::WindowText, dlgPal.color(QPalette::Disabled, QPalette::WindowText));
+        note->setPalette(np);
+        note->setWordWrap(true);
+        layout->addWidget(note);
+    }
+#endif
+
     layout->addStretch();
 
     auto* btnLayout = new QHBoxLayout;

plugins/WinDbgMemory/WinDbgMemoryPlugin.h

@@ -9,6 +9,7 @@
 // Forward declarations for DbgEng COM interfaces
 struct IDebugClient;
 struct IDebugDataSpaces;
+struct IDebugDataSpaces2;
 struct IDebugControl;
 struct IDebugSymbols;
 
@@ -59,9 +60,11 @@ public:
     QString name() const override { return m_name; }
     QString kind() const override { return QStringLiteral("WinDbg"); }
     QString getSymbol(uint64_t addr) const override;
+    QVector<rcx::MemoryRegion> enumerateRegions() const override;
 
     bool isLive() const override { return m_isLive; }
     uint64_t base() const override { return m_base; }
+    int pointerSize() const override { return m_pointerSize; }
 
 private:
     void initInterfaces();   // get IDebugDataSpaces/Control/Symbols from client
@@ -73,15 +76,17 @@ private:
     template<typename Fn>
     void dispatchToOwner(Fn&& fn) const;
 
-    IDebugClient*     m_client = nullptr;
-    IDebugDataSpaces* m_dataSpaces = nullptr;
-    IDebugControl*    m_control = nullptr;
-    IDebugSymbols*    m_symbols = nullptr;
+    IDebugClient*      m_client = nullptr;
+    IDebugDataSpaces*  m_dataSpaces = nullptr;
+    IDebugDataSpaces2* m_dataSpaces2 = nullptr;
+    IDebugControl*     m_control = nullptr;
+    IDebugSymbols*     m_symbols = nullptr;
 
     QString  m_name;
     uint64_t m_base = 0;
     bool     m_isLive = false;
     bool     m_writable = false;
+    int      m_pointerSize = 8;
     bool     m_isRemote = false;   // true when connected via DebugConnect (tcp/npipe)
     mutable int  m_readFailCount = 0;
 

scripts/build_macos.sh

@@ -0,0 +1,168 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+print_help() {
+  cat <<'EOF'
+Reclass macOS Build Script
+
+Usage:
+  ./scripts/build_macos.sh [options]
+
+Options:
+  --qt-dir <path>       Qt installation prefix (e.g. /opt/homebrew/opt/qt)
+  --build-type <type>   Release | Debug | RelWithDebInfo | MinSizeRel (default: Release)
+  --build-dir <path>    Build directory (default: <repo>/build)
+  --generator <name>    CMake generator (default: Ninja if available)
+  --clean               Remove build directory before configuring
+  --rebuild             Clean then build
+  --package             Run macdeployqt and create a zip
+  --tests               Run ctest after build
+  -h, --help            Show this help
+
+Notes:
+  - You can set QTDIR or Qt6_DIR in your environment instead of --qt-dir.
+  - If Qt is installed via Homebrew, the script will try to detect it.
+EOF
+}
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+project_root="$(cd "${script_dir}/.." && pwd)"
+
+qt_dir=""
+build_type="Release"
+build_dir="${project_root}/build"
+generator=""
+do_clean="false"
+do_package="false"
+do_tests="false"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --qt-dir)
+      qt_dir="${2:-}"
+      shift 2
+      ;;
+    --build-type)
+      build_type="${2:-}"
+      shift 2
+      ;;
+    --build-dir)
+      build_dir="${2:-}"
+      shift 2
+      ;;
+    --generator)
+      generator="${2:-}"
+      shift 2
+      ;;
+    --clean)
+      do_clean="true"
+      shift
+      ;;
+    --rebuild)
+      do_clean="true"
+      shift
+      ;;
+    --package)
+      do_package="true"
+      shift
+      ;;
+    --tests)
+      do_tests="true"
+      shift
+      ;;
+    -h|--help)
+      print_help
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      print_help
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "${qt_dir}" ]]; then
+  if [[ -n "${QTDIR:-}" ]]; then
+    qt_dir="${QTDIR}"
+  elif [[ -n "${Qt6_DIR:-}" ]]; then
+    qt_dir="${Qt6_DIR}"
+  elif command -v brew >/dev/null 2>&1; then
+    if brew --prefix qt >/dev/null 2>&1; then
+      qt_dir="$(brew --prefix qt)"
+    fi
+  fi
+fi
+
+if ! command -v cmake >/dev/null 2>&1; then
+  echo "ERROR: cmake not found. Install CMake and try again." >&2
+  exit 1
+fi
+
+if [[ -z "${generator}" ]]; then
+  if command -v ninja >/dev/null 2>&1; then
+    generator="Ninja"
+  fi
+fi
+
+if [[ "${do_clean}" == "true" && -d "${build_dir}" ]]; then
+  echo "Cleaning build directory: ${build_dir}"
+  rm -rf "${build_dir}"
+fi
+
+mkdir -p "${build_dir}"
+
+cmake_args=(
+  -S "${project_root}"
+  -B "${build_dir}"
+  -DCMAKE_BUILD_TYPE="${build_type}"
+)
+
+if [[ -n "${generator}" ]]; then
+  cmake_args+=(-G "${generator}")
+fi
+
+if [[ -n "${qt_dir}" ]]; then
+  export PATH="${qt_dir}/bin:${PATH}"
+  cmake_args+=(-DCMAKE_PREFIX_PATH="${qt_dir}")
+fi
+
+echo "Configuring..."
+cmake "${cmake_args[@]}"
+
+echo "Building..."
+cmake --build "${build_dir}" --config "${build_type}"
+
+if [[ "${do_tests}" == "true" ]]; then
+  echo "Running tests..."
+  ctest --test-dir "${build_dir}" --output-on-failure -C "${build_type}"
+fi
+
+if [[ "${do_package}" == "true" ]]; then
+  app_path="${build_dir}/Reclass.app"
+  if [[ ! -d "${app_path}" ]]; then
+    echo "ERROR: ${app_path} not found. Build may have failed." >&2
+    exit 1
+  fi
+
+  macdeployqt_bin=""
+  if [[ -n "${qt_dir}" && -x "${qt_dir}/bin/macdeployqt" ]]; then
+    macdeployqt_bin="${qt_dir}/bin/macdeployqt"
+  elif command -v macdeployqt >/dev/null 2>&1; then
+    macdeployqt_bin="$(command -v macdeployqt)"
+  fi
+
+  if [[ -z "${macdeployqt_bin}" ]]; then
+    echo "ERROR: macdeployqt not found. Ensure Qt is installed and in PATH." >&2
+    exit 1
+  fi
+
+  echo "Running macdeployqt..."
+  "${macdeployqt_bin}" "${app_path}" -always-overwrite
+
+  arch="$(uname -m)"
+  zip_name="Reclass-macos-${arch}-qt6.zip"
+  echo "Creating zip: ${zip_name}"
+  ditto -c -k --sequesterRsrc --keepParent "${app_path}" "${build_dir}/${zip_name}"
+  echo "Packaged: ${build_dir}/${zip_name}"
+fi

src/addressparser.cpp

@@ -10,20 +10,28 @@ namespace rcx {
 //   "<Program.exe> + 0xDE"            → module base + offset
 //   "[<Program.exe> + 0xDE] - AB"     → dereference pointer, then subtract
 //   "7ff6`6cce0000"                   → WinDbg-style backtick separator (stripped before parsing)
+//   "base + e_lfanew"                 → C/C++ style identifier resolution
+//   "0xFF & 0x0F"                     → bitwise AND
+//   "1 << 4"                          → shift left
 //
-// Grammar (standard operator precedence: *, / bind tighter than +, -):
+// Grammar (C operator precedence):
 //
-//   expr   = term (('+' | '-') term)*
-//   term   = unary (('*' | '/') unary)*
-//   unary  = '-' unary | atom
-//   atom   = '[' expr ']'             -- read pointer at address (dereference)
-//          | '<' moduleName '>'       -- resolve module base address
-//          | '(' expr ')'             -- grouping
-//          | hexLiteral               -- hex number, optional 0x prefix
+//   bitwiseOr  = bitwiseXor ('|' bitwiseXor)*
+//   bitwiseXor = bitwiseAnd ('^' bitwiseAnd)*
+//   bitwiseAnd = shift ('&' shift)*
+//   shift      = expr (('<<' | '>>') expr)*
+//   expr       = term (('+' | '-') term)*
+//   term       = unary (('*' | '/') unary)*
+//   unary      = '-' unary | '~' unary | atom
+//   atom       = '[' bitwiseOr ']'    -- read pointer at address (dereference)
+//              | '<' moduleName '>'   -- resolve module base address
+//              | '(' bitwiseOr ')'    -- grouping
+//              | identifier           -- C/C++ name resolved via callback
+//              | hexLiteral           -- hex number, optional 0x prefix
 //
 // All numeric literals are hexadecimal (base 16).
-// Module names and pointer reads are resolved via optional callbacks.
-// Without callbacks, modules and dereferences evaluate to 0 (syntax-check mode).
+// Identifiers: [a-zA-Z_][a-zA-Z0-9_]* containing at least one non-hex char.
+// Pure hex-digit words (e.g. "DEAD") are treated as hex literals.
 
 class ExpressionParser {
 public:
@@ -36,7 +44,7 @@ public:
             return error("empty expression");
 
         uint64_t value = 0;
-        if (!parseExpression(value))
+        if (!parseBitwiseOr(value))
             return error(m_error);
 
         skipSpaces();
@@ -90,8 +98,89 @@ private:
             || (ch >= 'A' && ch <= 'F');
     }
 
+    static bool isIdentStart(QChar ch) {
+        return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_';
+    }
+
+    static bool isIdentChar(QChar ch) {
+        return isIdentStart(ch) || (ch >= '0' && ch <= '9');
+    }
+
     // ── Recursive descent parsing ──
 
+    // bitwiseOr = bitwiseXor ('|' bitwiseXor)*
+    bool parseBitwiseOr(uint64_t& result) {
+        if (!parseBitwiseXor(result))
+            return false;
+        for (;;) {
+            skipSpaces();
+            if (peek() != '|')
+                break;
+            advance();
+            uint64_t rhs = 0;
+            if (!parseBitwiseXor(rhs))
+                return false;
+            result |= rhs;
+        }
+        return true;
+    }
+
+    // bitwiseXor = bitwiseAnd ('^' bitwiseAnd)*
+    bool parseBitwiseXor(uint64_t& result) {
+        if (!parseBitwiseAnd(result))
+            return false;
+        for (;;) {
+            skipSpaces();
+            if (peek() != '^')
+                break;
+            advance();
+            uint64_t rhs = 0;
+            if (!parseBitwiseAnd(rhs))
+                return false;
+            result ^= rhs;
+        }
+        return true;
+    }
+
+    // bitwiseAnd = shift ('&' shift)*
+    bool parseBitwiseAnd(uint64_t& result) {
+        if (!parseShift(result))
+            return false;
+        for (;;) {
+            skipSpaces();
+            if (peek() != '&')
+                break;
+            advance();
+            uint64_t rhs = 0;
+            if (!parseShift(rhs))
+                return false;
+            result &= rhs;
+        }
+        return true;
+    }
+
+    // shift = expr (('<<' | '>>') expr)*
+    bool parseShift(uint64_t& result) {
+        if (!parseExpression(result))
+            return false;
+        for (;;) {
+            skipSpaces();
+            QChar c = peek();
+            if (c != '<' && c != '>')
+                break;
+            // Must be << or >> (not < or > alone)
+            if (m_pos + 1 >= m_input.size() || m_input[m_pos + 1] != c)
+                break;
+            bool isLeft = (c == '<');
+            advance(); advance(); // skip << or >>
+            uint64_t rhs = 0;
+            if (!parseExpression(rhs))
+                return false;
+            result = isLeft ? (result << rhs) : (result >> rhs);
+        }
+        return true;
+    }
+
     // expr = term (('+' | '-') term)*
     bool parseExpression(uint64_t& result) {
         if (!parseTerm(result))
@@ -140,7 +229,7 @@ private:
         return true;
     }
 
-    // unary = '-' unary | atom
+    // unary = '-' unary | '~' unary | atom
     bool parseUnary(uint64_t& result) {
         skipSpaces();
         if (peek() == '-') {
@@ -151,10 +240,18 @@ private:
             result = static_cast<uint64_t>(-static_cast<int64_t>(inner));
             return true;
         }
+        if (peek() == '~') {
+            advance();
+            uint64_t inner = 0;
+            if (!parseUnary(inner))
+                return false;
+            result = ~inner;
+            return true;
+        }
         return parseAtom(result);
     }
 
-    // atom = '[' expr ']' | '<' name '>' | '(' expr ')' | hexLiteral
+    // atom = '[' bitwiseOr ']' | '<' name '>' | '(' bitwiseOr ')' | identifier | hexLiteral
     bool parseAtom(uint64_t& result) {
         skipSpaces();
         if (atEnd())
@@ -165,15 +262,55 @@ private:
         if (ch == '[') return parseDereference(result);
         if (ch == '<') return parseModuleName(result);
         if (ch == '(') return parseGrouping(result);
+
+        // Try identifier before hex — identifiers start with [a-zA-Z_]
+        if (isIdentStart(ch))
+            return parseIdentifierOrHex(result);
+
         return parseHexNumber(result);
     }
 
-    // '[' expr ']' — read the pointer value at the computed address
+    // Identifier or hex literal disambiguation.
+    // Scan [a-zA-Z_][a-zA-Z0-9_]*. If it contains any non-hex char → identifier.
+    // Otherwise → backtrack and parse as hex number.
+    bool parseIdentifierOrHex(uint64_t& result) {
+        int start = m_pos;
+        bool hasNonHex = false;
+
+        // Scan full token
+        while (!atEnd() && isIdentChar(peek())) {
+            if (!isHexDigit(peek()))
+                hasNonHex = true;
+            advance();
+        }
+
+        QString token = m_input.mid(start, m_pos - start);
+
+        if (!hasNonHex) {
+            // Pure hex digits (e.g. "DEAD") — backtrack, parse as hex
+            m_pos = start;
+            return parseHexNumber(result);
+        }
+
+        // It's an identifier — resolve via callback
+        if (!m_callbacks || !m_callbacks->resolveIdentifier) {
+            result = 0;
+            return true;
+        }
+
+        bool ok = false;
+        result = m_callbacks->resolveIdentifier(token, &ok);
+        if (!ok)
+            return fail(QStringLiteral("unknown identifier '%1'").arg(token));
+        return true;
+    }
+
+    // '[' bitwiseOr ']' — read the pointer value at the computed address
     bool parseDereference(uint64_t& result) {
         advance(); // skip '['
 
         uint64_t address = 0;
-        if (!parseExpression(address))
+        if (!parseBitwiseOr(address))
             return false;
         if (!expect(']'))
             return false;
@@ -220,10 +357,10 @@ private:
         return true;
     }
 
-    // '(' expr ')' — parenthesized sub-expression for grouping
+    // '(' bitwiseOr ')' — parenthesized sub-expression for grouping
     bool parseGrouping(uint64_t& result) {
         advance(); // skip '('
-        if (!parseExpression(result))
+        if (!parseBitwiseOr(result))
             return false;
         return expect(')');
     }
@@ -268,6 +405,8 @@ private:
 AddressParseResult AddressParser::evaluate(const QString& formula, int ptrSize,
                                            const AddressParserCallbacks* cb)
 {
+    // ptrSize is used by the caller to configure the readPointer callback;
+    // the parser itself doesn't need it directly.
     Q_UNUSED(ptrSize);
 
     // WinDbg displays 64-bit addresses with backtick separators for readability,
@@ -290,7 +429,7 @@ QString AddressParser::validate(const QString& formula)
     if (cleaned.isEmpty())
         return QStringLiteral("empty");
 
-    // Parse with no callbacks — modules and dereferences succeed but return 0.
+    // Parse with no callbacks — modules, dereferences, identifiers succeed but return 0.
     // This checks syntax only.
     ExpressionParser parser(cleaned, nullptr);
     auto result = parser.parse();

src/addressparser.h

@@ -15,6 +15,7 @@ struct AddressParseResult {
 struct AddressParserCallbacks {
     std::function<uint64_t(const QString& name, bool* ok)> resolveModule;
     std::function<uint64_t(uint64_t addr, bool* ok)>       readPointer;
+    std::function<uint64_t(const QString& name, bool* ok)> resolveIdentifier;
 };
 
 class AddressParser {

src/compose.cpp

@@ -1,4 +1,6 @@
 #include "core.h"
+#include "typeinfer.h"
+#include "addressparser.h"
 #include <algorithm>
 #include <numeric>
 
@@ -6,6 +8,49 @@ namespace rcx {
 
 namespace {
 
+// ── Value preview for type hints ──
+// Formats raw bytes as the suggested type using existing fmt:: functions.
+
+static QString formatPreview(const uint8_t* data, int len, const TypeSuggestion& s) {
+    using namespace detail;
+    if (s.kinds.isEmpty()) return {};
+    NodeKind k = s.kinds[0];
+    if (s.kinds.size() == 1) {
+        switch (k) {
+        case NodeKind::Float:     return fmt::fmtFloat(loadF32(data));
+        case NodeKind::Double:    return fmt::fmtDouble(loadF64(data));
+        case NodeKind::Int32:     return fmt::fmtInt32((int32_t)loadU32(data));
+        case NodeKind::UInt32:    return fmt::fmtUInt32(loadU32(data));
+        case NodeKind::Int16:     return fmt::fmtInt16((int16_t)loadU16(data));
+        case NodeKind::UInt16:    return fmt::fmtUInt16(loadU16(data));
+        case NodeKind::Int64:     return fmt::fmtInt64((int64_t)loadU64(data));
+        case NodeKind::UInt64:    return fmt::fmtUInt64(loadU64(data));
+        case NodeKind::Pointer64: return fmt::fmtPointer64(loadU64(data));
+        case NodeKind::Pointer32: return fmt::fmtPointer32(loadU32(data));
+        case NodeKind::Bool:      return fmt::fmtBool(data[0]);
+        case NodeKind::UTF8: {
+            int n = std::min(len, 8);
+            QString s;
+            for (int i = 0; i < n && data[i] >= 0x20 && data[i] <= 0x7E; ++i)
+                s += QLatin1Char(data[i]);
+            return s.isEmpty() ? QString() : (QStringLiteral("\"") + s + QStringLiteral("\""));
+        }
+        default: return {};
+        }
+    }
+    // Split: show each part
+    int partSz = len / s.kinds.size();
+    QStringList parts;
+    for (int i = 0; i < s.kinds.size(); ++i) {
+        TypeSuggestion sub;
+        sub.kinds = {s.kinds[i]};
+        sub.score = s.score;
+        sub.strength = s.strength;
+        parts << formatPreview(data + i * partSz, partSz, sub);
+    }
+    return parts.join(QStringLiteral(", "));
+}
+
 // Scintilla fold constants (avoid including Scintilla headers in core)
 constexpr int SC_FOLDLEVELBASE       = 0x400;
 constexpr int SC_FOLDLEVELHEADERFLAG = 0x2000;
@@ -22,6 +67,11 @@ struct ComposeState {
     int                nameW       = kColName;  // global name column width (fallback)
     int                offsetHexDigits = 8;     // hex digit tier for offset margin
     bool               baseEmitted = false;     // only first root struct shows base address
+    bool               compactColumns = false;  // compact column mode: cap type width, overflow long types
+    bool               treeLines      = false;  // draw Unicode tree connectors in indentation
+    bool               braceWrap      = false;  // opening brace on its own line
+    bool               typeHints      = false;  // show type inference hints on hex nodes
+    QVector<bool>      siblingStack;             // per-depth: true = more siblings follow at this level
     uint64_t           currentPtrBase = 0;      // absolute addr of current pointer expansion target
 
     // Precomputed for O(1) lookups
@@ -39,7 +89,16 @@ struct ComposeState {
         return scopeNameW.value(scopeId, nameW);
     }
 
-    void emitLine(const QString& lineText, LineMeta lm) {
+    // Set sibling-continuation flag for children at the given depth.
+    // childDepth is the depth of the children being iterated.
+    void setTreeSibling(int childDepth, bool hasMoreSiblings) {
+        if (!treeLines) return;
+        int d = childDepth - 1;
+        while (siblingStack.size() <= d) siblingStack.append(false);
+        siblingStack[d] = hasMoreSiblings;
+    }
+
+    void emitLine(const QString& lineText, LineMeta&& lm) {
         if (currentLine > 0) text += '\n';
         // 3-char fold indicator column: " - " expanded, " + " collapsed, "   " other
         // CommandRow has no fold prefix (flush left)
@@ -50,8 +109,30 @@ struct ComposeState {
             text += lm.foldCollapsed ? QStringLiteral(" \u25B8 ") : QStringLiteral(" \u25BE ");
         else
             text += QStringLiteral("   ");
-        text += lineText;
-        meta.append(lm);
+
+        // Replace leading indent spaces with Unicode tree connectors
+        if (treeLines && lm.depth > 0) {
+            QString treeIndent;
+            int D = lm.depth;
+            bool isFooter = (lm.lineKind == LineKind::Footer);
+            for (int d = 0; d < D; d++) {
+                bool active = (d < siblingStack.size() && siblingStack[d]);
+                if (isFooter || d < D - 1) {
+                    // Ancestor continuation or footer's own level
+                    treeIndent += active ? QStringLiteral("\u2502  ")
+                                        : QStringLiteral("   ");
+                } else {
+                    // This node's own connector (non-footer only)
+                    treeIndent += active ? QStringLiteral("\u251C\u2500 ")
+                                        : QStringLiteral("\u2514\u2500 ");
+                }
+            }
+            text += treeIndent + lineText.mid(D * 3);
+        } else {
+            text += lineText;
+        }
+
+        meta.append(std::move(lm));
         currentLine++;
     }
 };
@@ -104,6 +185,13 @@ static inline uint64_t resolveAddr(const ComposeState& state,
     return state.absOffsets[nodeIdx];
 }
 
+
+static const QVector<int>& childIndices(const ComposeState& state, uint64_t parentId) {
+    static const QVector<int> kEmpty;
+    auto it = state.childMap.constFind(parentId);
+    return it == state.childMap.constEnd() ? kEmpty : it.value();
+}
+
 void composeLeaf(ComposeState& state, const NodeTree& tree,
                  const Provider& prov, int nodeIdx,
                  int depth, uint64_t absAddr, uint64_t scopeId) {
@@ -132,6 +220,11 @@ void composeLeaf(ComposeState& state, const NodeTree& tree,
         }
     }
 
+    // Detect type overflow in compact mode (for effectiveTypeW)
+    QString rawType = ptrTypeOverride.isEmpty() ? fmt::typeNameRaw(node.kind) : ptrTypeOverride;
+    bool typeOverflow = state.compactColumns && rawType.size() > typeW;
+    int lineTypeW = typeOverflow ? rawType.size() : typeW;
+
     for (int sub = 0; sub < numLines; sub++) {
         bool isCont = (sub > 0);
 
@@ -148,7 +241,7 @@ void composeLeaf(ComposeState& state, const NodeTree& tree,
         lm.ptrBase         = state.currentPtrBase;
         lm.markerMask      = computeMarkers(node, prov, absAddr, isCont, depth);
         lm.foldLevel       = computeFoldLevel(depth, false);
-        lm.effectiveTypeW  = typeW;
+        lm.effectiveTypeW  = lineTypeW;
         lm.effectiveNameW  = nameW;
         lm.pointerTargetName = ptrTargetName;
 
@@ -158,8 +251,32 @@ void composeLeaf(ComposeState& state, const NodeTree& tree,
         }
 
         QString lineText = fmt::fmtNodeLine(node, prov, absAddr, depth, sub,
-                                            /*comment=*/{}, typeW, nameW, ptrTypeOverride);
-        state.emitLine(lineText, lm);
+                                            /*comment=*/{}, typeW, nameW, ptrTypeOverride,
+                                            state.compactColumns);
+
+        // Type inference hint for hex nodes (when enabled)
+        if (state.typeHints && isHexNode(node.kind) && sub == 0) {
+            const int sz = sizeForKind(node.kind);
+            QByteArray b = prov.isReadable(absAddr, sz)
+                ? prov.readBytes(absAddr, sz) : QByteArray(sz, '\0');
+            auto suggestions = inferTypes(
+                reinterpret_cast<const uint8_t*>(b.constData()), sz);
+            if (!suggestions.isEmpty() && suggestions[0].strength >= 3) {
+                lm.typeHintStart = lineText.size() + 2; // after "  " gap
+                lm.typeHintKinds = suggestions[0].kinds;
+                QString typeName = formatHint(suggestions[0]);
+                QString preview = formatPreview(
+                    reinterpret_cast<const uint8_t*>(b.constData()), sz, suggestions[0]);
+                // Value-first with bracketed type: "0x7ff718570000 [ptr64]"
+                if (!preview.isEmpty())
+                    lm.typeHint = preview + QStringLiteral(" [") + typeName + QStringLiteral("]");
+                else
+                    lm.typeHint = QStringLiteral("[") + typeName + QStringLiteral("]");
+                lineText += QStringLiteral("  ") + lm.typeHint;
+            }
+        }
+
+        state.emitLine(lineText, std::move(lm));
     }
 }
 
@@ -197,7 +314,7 @@ void composeParent(ComposeState& state, const NodeTree& tree,
         lm.markerMask = (1u << M_CYCLE) | (1u << M_ERR);
         lm.foldLevel  = computeFoldLevel(depth, false);
         state.emitLine(fmt::indent(depth) + QStringLiteral("/* CYCLE: ") +
-                       node.name + QStringLiteral(" */"), lm);
+                       node.name + QStringLiteral(" */"), std::move(lm));
         return;
     }
     state.visiting.insert(node.id);
@@ -218,7 +335,7 @@ void composeParent(ComposeState& state, const NodeTree& tree,
         lm.arrayElementIdx = arrayElementIdx;
         uint64_t relOff = absAddr - arrayContainerAddr;
         QString relOffHex = QString::number(relOff, 16).toUpper();
-        state.emitLine(fmt::indent(depth) + QStringLiteral("[%1] +0x%2").arg(arrayElementIdx).arg(relOffHex), lm);
+        state.emitLine(fmt::indent(depth) + QStringLiteral("[%1] +0x%2").arg(arrayElementIdx).arg(relOffHex), std::move(lm));
     }
 
     // Detect root header: first root-level struct — suppressed from display
@@ -248,8 +365,6 @@ void composeParent(ComposeState& state, const NodeTree& tree,
         lm.foldCollapsed = node.collapsed;
         lm.foldLevel  = computeFoldLevel(depth, true);
         lm.markerMask = (1u << M_STRUCT_BG);
-        lm.effectiveTypeW = typeW;
-        lm.effectiveNameW = nameW;
 
         QString headerText;
         if (node.kind == NodeKind::Array) {
@@ -260,30 +375,169 @@ void composeParent(ComposeState& state, const NodeTree& tree,
             lm.arrayCount    = node.arrayLen;
             QString elemStructName = (node.elementKind == NodeKind::Struct)
                 ? resolvePointerTarget(tree, node.refId) : QString();
-            headerText = fmt::fmtArrayHeader(node, depth, node.viewIndex, node.collapsed, typeW, nameW, elemStructName);
+            QString rawType = fmt::arrayTypeName(node.elementKind, node.arrayLen, elemStructName);
+            bool overflow = state.compactColumns && rawType.size() > typeW;
+            lm.effectiveTypeW = overflow ? rawType.size() : typeW;
+            lm.effectiveNameW = nameW;
+            headerText = fmt::fmtArrayHeader(node, depth, node.viewIndex, node.collapsed, typeW, nameW, elemStructName, state.compactColumns);
         } else {
             // All structs (root and nested) use the same header format
-            headerText = fmt::fmtStructHeader(node, depth, node.collapsed, typeW, nameW);
+            QString rawType = fmt::structTypeName(node);
+            bool overflow = state.compactColumns && rawType.size() > typeW;
+            lm.effectiveTypeW = overflow ? rawType.size() : typeW;
+            lm.effectiveNameW = nameW;
+            headerText = fmt::fmtStructHeader(node, depth, node.collapsed, typeW, nameW, state.compactColumns);
+        }
+        // Brace wrapping: move trailing '{' to its own line
+        if (state.braceWrap && !node.collapsed && headerText.endsWith(QChar('{'))) {
+            headerText.chop(1);
+            // Remove trailing separator spaces
+            while (headerText.endsWith(' ')) headerText.chop(1);
+            state.emitLine(headerText, std::move(lm));
+            // Emit standalone brace line
+            LineMeta braceLm;
+            braceLm.nodeIdx   = nodeIdx;
+            braceLm.nodeId    = node.id;
+            braceLm.depth     = depth;
+            braceLm.lineKind  = LineKind::Header;
+            braceLm.foldLevel = computeFoldLevel(depth, true);
+            braceLm.markerMask = (1u << M_STRUCT_BG);
+            state.emitLine(fmt::indent(depth) + QStringLiteral("{"), std::move(braceLm));
+        } else {
+            state.emitLine(headerText, std::move(lm));
         }
-        state.emitLine(headerText, lm);
     }
 
     if (!node.collapsed || isArrayChild || isRootHeader) {
-        QVector<int> children = state.childMap.value(node.id);
-        std::sort(children.begin(), children.end(), [&](int a, int b) {
-            return tree.nodes[a].offset < tree.nodes[b].offset;
-        });
+        // Enum with members: render name = value lines instead of offset-based fields
+        if (node.resolvedClassKeyword() == QStringLiteral("enum") && !node.enumMembers.isEmpty()) {
+            int childDepth = depth + 1;
+            int maxNameLen = 4;
+            for (const auto& m : node.enumMembers)
+                maxNameLen = qMax(maxNameLen, (int)m.first.size());
+
+            // Build display order sorted by value
+            QVector<int> order(node.enumMembers.size());
+            std::iota(order.begin(), order.end(), 0);
+            std::sort(order.begin(), order.end(), [&](int a, int b) {
+                return node.enumMembers[a].second < node.enumMembers[b].second;
+            });
+
+            for (int oi = 0; oi < order.size(); oi++) {
+                state.setTreeSibling(childDepth, oi < order.size() - 1);
+                int mi = order[oi];
+                const auto& m = node.enumMembers[mi];
+                LineMeta lm;
+                lm.nodeIdx    = nodeIdx;
+                lm.nodeId     = node.id;
+                lm.subLine    = mi;
+                lm.depth      = childDepth;
+                lm.lineKind   = LineKind::Field;
+                lm.isMemberLine = true;
+                lm.nodeKind   = NodeKind::UInt32;
+                lm.foldLevel  = computeFoldLevel(childDepth, false);
+                lm.markerMask = 0;
+                lm.offsetText = fmt::fmtOffsetMargin(absAddr, true, state.offsetHexDigits);
+                lm.offsetAddr = absAddr;
+                lm.ptrBase    = state.currentPtrBase;
+                state.emitLine(fmt::fmtEnumMember(m.first, m.second, childDepth, maxNameLen), std::move(lm));
+            }
+
+            // Footer
+            if (!isArrayChild) {
+                LineMeta lm;
+                lm.nodeIdx   = nodeIdx;
+                lm.nodeId    = node.id;
+                lm.depth     = depth;
+                lm.lineKind  = LineKind::Footer;
+                lm.nodeKind  = node.kind;
+                lm.isRootHeader = isRootHeader;
+                lm.foldLevel = computeFoldLevel(depth, false);
+                lm.markerMask = 0;
+                lm.offsetText = fmt::fmtOffsetMargin(absAddr, false, state.offsetHexDigits);
+                lm.offsetAddr = absAddr;
+                lm.ptrBase    = state.currentPtrBase;
+                state.emitLine(fmt::fmtStructFooter(node, depth, 0), std::move(lm));
+            }
+
+            state.visiting.remove(node.id);
+            return;
+        }
+
+        // Bitfield with members: render name : width = value lines
+        if (node.resolvedClassKeyword() == QStringLiteral("bitfield")
+            && !node.bitfieldMembers.isEmpty()) {
+            int childDepth = depth + 1;
+            int maxNameLen = 4;
+            for (const auto& m : node.bitfieldMembers)
+                maxNameLen = qMax(maxNameLen, (int)m.name.size());
+
+            for (int mi = 0; mi < node.bitfieldMembers.size(); mi++) {
+                state.setTreeSibling(childDepth, mi < node.bitfieldMembers.size() - 1);
+                const auto& m = node.bitfieldMembers[mi];
+                uint64_t bitVal = fmt::extractBits(prov, absAddr, node.elementKind,
+                                                   m.bitOffset, m.bitWidth);
+                LineMeta lm;
+                lm.nodeIdx    = nodeIdx;
+                lm.nodeId     = node.id;
+                lm.subLine    = mi;
+                lm.depth      = childDepth;
+                lm.lineKind   = LineKind::Field;
+                lm.isMemberLine = true;
+                lm.nodeKind   = node.elementKind;
+                lm.foldLevel  = computeFoldLevel(childDepth, false);
+                lm.markerMask = 0;
+                lm.offsetText = fmt::fmtOffsetMargin(absAddr, true, state.offsetHexDigits);
+                lm.offsetAddr = absAddr;
+                lm.ptrBase    = state.currentPtrBase;
+                state.emitLine(fmt::fmtBitfieldMember(m.name, m.bitWidth, bitVal,
+                                                       childDepth, maxNameLen), std::move(lm));
+            }
+
+            // Footer
+            if (!isArrayChild) {
+                LineMeta lm;
+                lm.nodeIdx   = nodeIdx;
+                lm.nodeId    = node.id;
+                lm.depth     = depth;
+                lm.lineKind  = LineKind::Footer;
+                lm.nodeKind  = node.kind;
+                lm.isRootHeader = isRootHeader;
+                lm.foldLevel = computeFoldLevel(depth, false);
+                lm.markerMask = 0;
+                int sz = sizeForKind(node.elementKind);
+                lm.offsetText = fmt::fmtOffsetMargin(absAddr + sz, false, state.offsetHexDigits);
+                lm.offsetAddr = absAddr + sz;
+                lm.ptrBase    = state.currentPtrBase;
+                state.emitLine(fmt::fmtStructFooter(node, depth, sz), std::move(lm));
+            }
+
+            state.visiting.remove(node.id);
+            return;
+        }
+
+        const QVector<int>& allChildren = childIndices(state, node.id);
+
+        // Split children into regular nodes and static fields (static fields render at the end)
+        QVector<int> regular, staticIdxs;
+        for (int ci : allChildren) {
+            if (tree.nodes[ci].isStatic)
+                staticIdxs.append(ci);
+            else
+                regular.append(ci);
+        }
 
         int childDepth = depth + 1;
 
         // Primitive arrays with no child nodes: synthesize element lines dynamically
-        if (node.kind == NodeKind::Array && children.isEmpty()
+        if (node.kind == NodeKind::Array && regular.isEmpty()
             && node.elementKind != NodeKind::Struct && node.elementKind != NodeKind::Array) {
             int elemSize = sizeForKind(node.elementKind);
             int eTW = state.effectiveTypeW(node.id);
             int eNW = state.effectiveNameW(node.id);
             for (int i = 0; i < node.arrayLen; i++) {
-                uint64_t elemAddr = absAddr + i * elemSize;
+                state.setTreeSibling(childDepth, i < node.arrayLen - 1);
+                uint64_t elemAddr = absAddr + (uint64_t)i * elemSize;
 
                 // Type override: "float[0]", "uint32_t[1]", etc.
                 QString elemTypeStr = fmt::typeNameRaw(node.elementKind)
@@ -292,7 +546,7 @@ void composeParent(ComposeState& state, const NodeTree& tree,
                 Node elem;
                 elem.kind = node.elementKind;
                 elem.name = QString();  // no name for array elements
-                elem.offset = node.offset + i * elemSize;
+                elem.offset = node.offset + (int)((uint64_t)i * elemSize);
                 elem.parentId = node.id;
                 elem.id = 0;
 
@@ -309,23 +563,26 @@ void composeParent(ComposeState& state, const NodeTree& tree,
                 lm.ptrBase    = state.currentPtrBase;
                 lm.markerMask = computeMarkers(elem, prov, elemAddr, false, childDepth);
                 lm.foldLevel  = computeFoldLevel(childDepth, false);
-                lm.effectiveTypeW = eTW;
+                bool elemOverflow = state.compactColumns && elemTypeStr.size() > eTW;
+                lm.effectiveTypeW = elemOverflow ? elemTypeStr.size() : eTW;
                 lm.effectiveNameW = eNW;
 
                 state.emitLine(fmt::fmtNodeLine(elem, prov, elemAddr, childDepth, 0,
-                                                {}, eTW, eNW, elemTypeStr), lm);
+                                                {}, eTW, eNW, elemTypeStr,
+                                                state.compactColumns), std::move(lm));
             }
         }
 
         // Struct arrays with refId but no child nodes: synthesize by expanding the
         // referenced struct for each element (like repeated pointer deref)
-        if (node.kind == NodeKind::Array && children.isEmpty()
+        if (node.kind == NodeKind::Array && regular.isEmpty()
             && node.elementKind == NodeKind::Struct && node.refId != 0) {
             int refIdx = tree.indexOfId(node.refId);
             if (refIdx >= 0) {
                 int elemSize = tree.structSpan(node.refId, &state.childMap);
                 if (elemSize <= 0) elemSize = 1;
                 for (int i = 0; i < node.arrayLen; i++) {
+                    state.setTreeSibling(childDepth, i < node.arrayLen - 1);
                     uint64_t elemBase = absAddr + (uint64_t)i * elemSize;
                     // Use base offset that maps refStruct's children to the right provider address
                     composeParent(state, tree, prov, refIdx, childDepth, elemBase, node.refId,
@@ -336,21 +593,22 @@ void composeParent(ComposeState& state, const NodeTree& tree,
 
         // Embedded struct with refId but no child nodes: expand referenced struct's
         // children at this node's offset (single instance, like array with count=1)
-        if (node.kind == NodeKind::Struct && children.isEmpty() && node.refId != 0) {
+        if (node.kind == NodeKind::Struct && regular.isEmpty() && node.refId != 0) {
             int refIdx = tree.indexOfId(node.refId);
             if (refIdx >= 0) {
-                QVector<int> refChildren = state.childMap.value(node.refId);
-                std::sort(refChildren.begin(), refChildren.end(), [&](int a, int b) {
-                    return tree.nodes[a].offset < tree.nodes[b].offset;
-                });
+                const QVector<int>& refChildren = childIndices(state, node.refId);
                 // Use the referenced struct's scope widths (children come from there)
                 uint64_t refScopeId = node.refId;
-                for (int childIdx : refChildren) {
+                for (int rci = 0; rci < refChildren.size(); rci++) {
+                    int childIdx = refChildren[rci];
+                    state.setTreeSibling(childDepth, rci < refChildren.size() - 1);
                     const Node& child = tree.nodes[childIdx];
                     // Self-referential child → show as collapsed struct (non-expandable)
                     if (state.visiting.contains(child.id)) {
                         int typeW = state.effectiveTypeW(refScopeId);
                         int nameW = state.effectiveNameW(refScopeId);
+                        QString rawType = fmt::structTypeName(child);
+                        bool overflow = state.compactColumns && rawType.size() > typeW;
                         LineMeta lm;
                         lm.nodeIdx    = nodeIdx;  // parent struct — materialize target
                         lm.nodeId     = child.id;
@@ -366,10 +624,10 @@ void composeParent(ComposeState& state, const NodeTree& tree,
                         lm.foldCollapsed = true;
                         lm.foldLevel  = computeFoldLevel(childDepth, true);
                         lm.markerMask = (1u << M_STRUCT_BG) | (1u << M_CYCLE);
-                        lm.effectiveTypeW = typeW;
+                        lm.effectiveTypeW = overflow ? rawType.size() : typeW;
                         lm.effectiveNameW = nameW;
                         state.emitLine(fmt::fmtStructHeader(child, childDepth,
-                            /*collapsed=*/true, typeW, nameW), lm);
+                            /*collapsed=*/true, typeW, nameW, state.compactColumns), std::move(lm));
                         continue;
                     }
                     composeNode(state, tree, prov, childIdx, childDepth,
@@ -381,7 +639,13 @@ void composeParent(ComposeState& state, const NodeTree& tree,
         // For arrays, render children as condensed (no header/footer for struct elements)
         bool childrenAreArrayElements = (node.kind == NodeKind::Array);
         int elementIdx = 0;
-        for (int childIdx : children) {
+        for (int ri = 0; ri < regular.size(); ri++) {
+            int childIdx = regular[ri];
+            // A regular child has more siblings if there are more regular children
+            // or if static fields follow after all regular children
+            bool hasMore = (ri < regular.size() - 1)
+                           || (!staticIdxs.isEmpty() && !node.collapsed);
+            state.setTreeSibling(childDepth, hasMore);
             // Pass this container's id as the scope for children (for per-scope widths)
             // For array elements, also pass the element index for [N] separator
             composeNode(state, tree, prov, childIdx, childDepth, base, rootId,
@@ -389,6 +653,206 @@ void composeParent(ComposeState& state, const NodeTree& tree,
                         childrenAreArrayElements ? elementIdx++ : -1,
                         childrenAreArrayElements ? absAddr : 0);
         }
+
+        // ── Static fields: render after regular children, before footer ──
+        if (!staticIdxs.isEmpty() && (!node.collapsed || isRootHeader)) {
+            // Build identifier resolver for static field expressions
+            auto makeResolver = [&](uint64_t parentAbsAddr) {
+                AddressParserCallbacks cbs;
+                cbs.resolveIdentifier = [&tree, &prov, &regular, parentAbsAddr]
+                        (const QString& name, bool* ok) -> uint64_t {
+                    if (name == QStringLiteral("base")) {
+                        *ok = true;
+                        return parentAbsAddr;
+                    }
+                    // Find sibling field by name, read its value
+                    for (int ci : regular) {
+                        const Node& sib = tree.nodes[ci];
+                        if (sib.name == name) {
+                            int sz = sib.byteSize();
+                            uint64_t sibAddr = parentAbsAddr + sib.offset;
+                            if (sz > 0 && prov.isValid() && prov.isReadable(sibAddr, sz)) {
+                                *ok = true;
+                                if (sz == 1) return (uint64_t)prov.readU8(sibAddr);
+                                if (sz == 2) return (uint64_t)prov.readU16(sibAddr);
+                                if (sz == 4) return (uint64_t)prov.readU32(sibAddr);
+                                return prov.readU64(sibAddr);
+                            }
+                            *ok = false;
+                            return 0;
+                        }
+                    }
+                    *ok = false;
+                    return 0;
+                };
+                int ps = tree.pointerSize;
+                cbs.readPointer = [&prov, ps](uint64_t addr, bool* ok) -> uint64_t {
+                    if (prov.isValid() && prov.isReadable(addr, ps)) {
+                        *ok = true;
+                        return (ps >= 8) ? prov.readU64(addr)
+                                         : (uint64_t)prov.readU32(addr);
+                    }
+                    *ok = false;
+                    return 0;
+                };
+                return cbs;
+            };
+
+            auto cbs = makeResolver(absAddr);
+
+            for (int sii = 0; sii < staticIdxs.size(); sii++) {
+                int si = staticIdxs[sii];
+                state.setTreeSibling(childDepth, sii < staticIdxs.size() - 1);
+                const Node& sf = tree.nodes[si];
+
+                // Evaluate expression → absolute address
+                uint64_t staticAddr = 0;
+                bool exprOk = false;
+                if (!sf.offsetExpr.isEmpty()) {
+                    auto result = AddressParser::evaluate(sf.offsetExpr, tree.pointerSize, &cbs);
+                    exprOk = result.ok;
+                    if (result.ok)
+                        staticAddr = result.value;
+                }
+
+                // Resolve type name
+                QString typeName;
+                if (sf.kind == NodeKind::Struct)
+                    typeName = fmt::structTypeName(sf);
+                else if (sf.kind == NodeKind::Pointer64 || sf.kind == NodeKind::Pointer32)
+                    typeName = fmt::pointerTypeName(sf.kind, resolvePointerTarget(tree, sf.refId));
+                else
+                    typeName = fmt::typeNameRaw(sf.kind);
+
+                bool isCollapsed = sf.collapsed;
+
+                // ── Header line: "static <type> <name> {" or collapsed: "static <type> <name> { return <expr>; }"
+                QString headerLine;
+                if (isCollapsed) {
+                    QString exprPart;
+                    if (!sf.offsetExpr.isEmpty()) {
+                        if (exprOk)
+                            exprPart = QStringLiteral("return %1 } \u2192 0x%2")
+                                .arg(sf.offsetExpr)
+                                .arg(QString::number(staticAddr, 16).toUpper());
+                        else
+                            exprPart = QStringLiteral("return %1 }  (error)").arg(sf.offsetExpr);
+                    } else {
+                        exprPart = QStringLiteral("}");
+                    }
+                    headerLine = fmt::indent(childDepth)
+                        + QStringLiteral("static ") + typeName
+                        + QStringLiteral(" ") + sf.name
+                        + QStringLiteral(" { ") + exprPart;
+                } else {
+                    headerLine = fmt::indent(childDepth)
+                        + QStringLiteral("static ") + typeName
+                        + QStringLiteral(" ") + sf.name
+                        + QStringLiteral(" {");
+                }
+
+                LineMeta lm;
+                lm.nodeIdx    = si;
+                lm.nodeId     = sf.id;
+                lm.depth      = childDepth;
+                lm.lineKind   = LineKind::Header;
+                lm.nodeKind   = sf.kind;
+                lm.foldHead      = true;
+                lm.foldCollapsed = isCollapsed;
+                lm.isStaticLine  = true;
+                lm.foldLevel  = computeFoldLevel(childDepth, true);
+                lm.markerMask = (1u << M_STRUCT_BG);
+                lm.offsetText = QStringLiteral("~") + QString::number(staticAddr, 16)
+                    .toUpper().rightJustified(state.offsetHexDigits - 1, '0');
+                lm.offsetAddr = staticAddr;
+                lm.ptrBase    = state.currentPtrBase;
+                lm.effectiveTypeW = typeName.size() + 7; // "static " prefix
+                lm.effectiveNameW = sf.name.size();
+                state.emitLine(headerLine, std::move(lm));
+
+                // ── Body + children (only when expanded) ──
+                if (!isCollapsed) {
+                    // Determine if struct children follow the body line
+                    bool hasStructKids = exprOk
+                        && (sf.kind == NodeKind::Struct || sf.kind == NodeKind::Array);
+                    const QVector<int> staticKids = hasStructKids
+                        ? childIndices(state, sf.id) : QVector<int>();
+                    hasStructKids = hasStructKids && !staticKids.isEmpty();
+
+                    // Body line: "   return <expr>    → 0xADDR"
+                    {
+                        // Body has more siblings if struct children follow
+                        state.setTreeSibling(childDepth + 1, hasStructKids);
+
+                        QString bodyLine;
+                        if (!sf.offsetExpr.isEmpty()) {
+                            if (exprOk)
+                                bodyLine = fmt::indent(childDepth + 1)
+                                    + QStringLiteral("return %1").arg(sf.offsetExpr);
+                            else
+                                bodyLine = fmt::indent(childDepth + 1)
+                                    + QStringLiteral("return %1  (error)").arg(sf.offsetExpr);
+                        } else {
+                            bodyLine = fmt::indent(childDepth + 1)
+                                + QStringLiteral("return 0");
+                        }
+
+                        // Right-align resolved address
+                        if (exprOk && !sf.offsetExpr.isEmpty()) {
+                            bodyLine += QStringLiteral("  \u2192 0x")
+                                + QString::number(staticAddr, 16).toUpper();
+                        }
+
+                        LineMeta blm;
+                        blm.nodeIdx    = si;
+                        blm.nodeId     = sf.id;
+                        blm.depth      = childDepth + 1;
+                        blm.lineKind   = LineKind::Field;
+                        blm.nodeKind   = sf.kind;
+                        blm.isStaticLine = true;
+                        blm.foldLevel  = computeFoldLevel(childDepth + 1, false);
+                        blm.markerMask = 0;
+                        blm.offsetText = QString(state.offsetHexDigits, QChar(' '));
+                        blm.offsetAddr = staticAddr;
+                        blm.ptrBase    = state.currentPtrBase;
+                        state.emitLine(bodyLine, std::move(blm));
+                    }
+
+                    // If struct/array, compose children at evaluated address
+                    if (hasStructKids) {
+                        for (int ski = 0; ski < staticKids.size(); ski++) {
+                            state.setTreeSibling(childDepth + 1, ski < staticKids.size() - 1);
+                            composeNode(state, tree, prov, staticKids[ski], childDepth + 1,
+                                        staticAddr, sf.id, false, sf.id);
+                        }
+                    }
+
+                    // Footer line: "};"
+                    {
+                        LineMeta flm;
+                        flm.nodeIdx   = si;
+                        flm.nodeId    = sf.id;
+                        flm.depth     = childDepth;
+                        flm.lineKind  = LineKind::Footer;
+                        flm.nodeKind  = sf.kind;
+                        flm.isStaticLine = true;
+                        flm.foldLevel = computeFoldLevel(childDepth, false);
+                        flm.markerMask = 0;
+                        if (exprOk && (sf.kind == NodeKind::Struct || sf.kind == NodeKind::Array)) {
+                            int sSpan = tree.structSpan(sf.id, &state.childMap);
+                            flm.offsetText = fmt::fmtOffsetMargin(staticAddr + sSpan, false,
+                                                                   state.offsetHexDigits);
+                            flm.offsetAddr = staticAddr + sSpan;
+                        } else {
+                            flm.offsetText = QString(state.offsetHexDigits, QChar(' '));
+                            flm.offsetAddr = staticAddr;
+                        }
+                        flm.ptrBase    = state.currentPtrBase;
+                        state.emitLine(fmt::indent(childDepth) + QStringLiteral("};"), std::move(flm));
+                    }
+                }
+            }
+        }
     }
 
     // Footer line: skip when collapsed or for array element structs
@@ -406,7 +870,7 @@ void composeParent(ComposeState& state, const NodeTree& tree,
         lm.offsetText = fmt::fmtOffsetMargin(absAddr + sz, false, state.offsetHexDigits);
         lm.offsetAddr = absAddr + sz;
         lm.ptrBase    = state.currentPtrBase;
-        state.emitLine(fmt::fmtStructFooter(node, depth, sz), lm);
+        state.emitLine(fmt::fmtStructFooter(node, depth, sz), std::move(lm));
     }
 
     state.visiting.remove(node.id);
@@ -431,7 +895,7 @@ void composeNode(ComposeState& state, const NodeTree& tree,
         QString ptrTypeOverride = fmt::pointerTypeName(node.kind, ptrTargetName);
 
         // Check if this pointer has materialized children (from materializeRefChildren)
-        QVector<int> ptrChildren = state.childMap.value(node.id);
+        const QVector<int>& ptrChildren = childIndices(state, node.id);
         bool hasMaterialized = !ptrChildren.isEmpty();
 
         // Force collapsed if this refId is already being virtually expanded
@@ -458,12 +922,30 @@ void composeNode(ComposeState& state, const NodeTree& tree,
             lm.foldLevel  = computeFoldLevel(depth, true);
             lm.markerMask = computeMarkers(node, prov, absAddr, false, depth);
             if (forceCollapsed) lm.markerMask |= (1u << M_CYCLE);
-            lm.effectiveTypeW = typeW;
+            bool ptrOverflow = state.compactColumns && ptrTypeOverride.size() > typeW;
+            lm.effectiveTypeW = ptrOverflow ? ptrTypeOverride.size() : typeW;
             lm.effectiveNameW = nameW;
             lm.pointerTargetName = ptrTargetName;
-            state.emitLine(fmt::fmtPointerHeader(node, depth, effectiveCollapsed,
-                                                  prov, absAddr, ptrTypeOverride,
-                                                  typeW, nameW), lm);
+            {
+                QString ptrText = fmt::fmtPointerHeader(node, depth, effectiveCollapsed,
+                                                         prov, absAddr, ptrTypeOverride,
+                                                         typeW, nameW, state.compactColumns);
+                if (state.braceWrap && !effectiveCollapsed && ptrText.endsWith(QChar('{'))) {
+                    ptrText.chop(1);
+                    while (ptrText.endsWith(' ')) ptrText.chop(1);
+                    state.emitLine(ptrText, std::move(lm));
+                    LineMeta braceLm;
+                    braceLm.nodeIdx   = nodeIdx;
+                    braceLm.nodeId    = node.id;
+                    braceLm.depth     = depth;
+                    braceLm.lineKind  = LineKind::Header;
+                    braceLm.foldLevel = computeFoldLevel(depth, true);
+                    braceLm.markerMask = lm.markerMask;
+                    state.emitLine(fmt::indent(depth) + QStringLiteral("{"), std::move(braceLm));
+                } else {
+                    state.emitLine(ptrText, std::move(lm));
+                }
+            }
         }
 
         if (!effectiveCollapsed) {
@@ -496,11 +978,9 @@ void composeNode(ComposeState& state, const NodeTree& tree,
                 // Render materialized children at the pointer target address.
                 // These are real tree nodes with independent state — use rootId
                 // so resolveAddr computes offsets relative to the pointer target.
-                std::sort(ptrChildren.begin(), ptrChildren.end(), [&](int a, int b) {
-                    return tree.nodes[a].offset < tree.nodes[b].offset;
-                });
-                for (int childIdx : ptrChildren) {
-                    composeNode(state, tree, childProv, childIdx, depth + 1,
+                for (int pci = 0; pci < ptrChildren.size(); pci++) {
+                    state.setTreeSibling(depth + 1, pci < ptrChildren.size() - 1);
+                    composeNode(state, tree, childProv, ptrChildren[pci], depth + 1,
                                 pBase, node.id, false, node.id);
                 }
             } else {
@@ -543,7 +1023,7 @@ void composeNode(ComposeState& state, const NodeTree& tree,
                 lm.offsetText.clear();
                 lm.foldLevel = computeFoldLevel(depth, false);
                 lm.markerMask = 0;
-                state.emitLine(fmt::indent(depth) + QStringLiteral("}"), lm);
+                state.emitLine(fmt::indent(depth) + QStringLiteral("}"), std::move(lm));
             }
         }
         return;
@@ -558,17 +1038,52 @@ void composeNode(ComposeState& state, const NodeTree& tree,
 
 } // anonymous namespace
 
-ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewRootId) {
+ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewRootId,
+                      bool compactColumns, bool treeLines, bool braceWrap,
+                      bool typeHints) {
     ComposeState state;
+    state.compactColumns = compactColumns;
+    state.treeLines = treeLines;
+    state.braceWrap = braceWrap;
+    state.typeHints = typeHints;
 
     // Precompute parent→children map
     for (int i = 0; i < tree.nodes.size(); i++)
         state.childMap[tree.nodes[i].parentId].append(i);
 
-    // Precompute absolute offsets (baseAddress + structure-relative offset)
+    for (auto it = state.childMap.begin(); it != state.childMap.end(); ++it) {
+        QVector<int>& children = it.value();
+        std::sort(children.begin(), children.end(), [&](int a, int b) {
+            return tree.nodes[a].offset < tree.nodes[b].offset;
+        });
+    }
+
+    // Pre-allocate output buffers (estimate ~3 lines per node, ~80 chars per line)
+    state.meta.reserve(tree.nodes.size() * 3);
+    state.text.reserve(tree.nodes.size() * 80);
+
+    // Precompute absolute offsets via BFS (O(N) — avoids per-node parent-chain walk)
     state.absOffsets.resize(tree.nodes.size());
+    state.absOffsets.fill(0);
     for (int i = 0; i < tree.nodes.size(); i++)
-        state.absOffsets[i] = tree.baseAddress + tree.computeOffset(i);
+        if (tree.nodes[i].parentId == 0)
+            state.absOffsets[i] = tree.nodes[i].offset;
+    {
+        QVector<int> bfsQueue;
+        for (int i : state.childMap.value(0))
+            bfsQueue.append(i);
+        int front = 0;
+        while (front < bfsQueue.size()) {
+            int idx = bfsQueue[front++];
+            int pi = tree.indexOfId(tree.nodes[idx].parentId);
+            state.absOffsets[idx] = (pi >= 0 ? state.absOffsets[pi] : 0)
+                                  + tree.nodes[idx].offset;
+            for (int ci : state.childMap.value(tree.nodes[idx].id))
+                bfsQueue.append(ci);
+        }
+    }
+    for (auto& v : state.absOffsets)
+        v += tree.baseAddress;
 
     // Compute hex digit tier from max absolute address
     {
@@ -597,22 +1112,21 @@ ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewR
         return fmt::typeNameRaw(n.kind);
     };
 
-    // Compute effective type column width from longest type name
-    // Include struct/array headers which use "struct TypeName" or "type[count]" format
-    int maxTypeLen = kMinTypeW;
-    for (const Node& node : tree.nodes) {
-        maxTypeLen = qMax(maxTypeLen, (int)nodeTypeName(node).size());
-    }
-    state.typeW = qBound(kMinTypeW, maxTypeLen, kMaxTypeW);
+    // Pre-compute type name lengths (avoids re-creating temp QStrings in width loops)
+    QVector<int> typeNameLens(tree.nodes.size());
+    for (int i = 0; i < tree.nodes.size(); i++)
+        typeNameLens[i] = nodeTypeName(tree.nodes[i]).size();
 
-    // Compute effective name column width from longest name
-    // Include struct/array names - they now use columnar layout too
+    // Compute effective column widths from longest type/name in a single pass
+    const int typeCap = state.compactColumns ? kCompactTypeW : kMaxTypeW;
+    int maxTypeLen = kMinTypeW;
     int maxNameLen = kMinNameW;
-    for (const Node& node : tree.nodes) {
-        // Skip hex (they show ASCII preview, not name column)
-        if (isHexPreview(node.kind)) continue;
-        maxNameLen = qMax(maxNameLen, (int)node.name.size());
+    for (int i = 0; i < tree.nodes.size(); i++) {
+        maxTypeLen = qMax(maxTypeLen, typeNameLens[i]);
+        if (!isHexPreview(tree.nodes[i].kind))
+            maxNameLen = qMax(maxNameLen, (int)tree.nodes[i].name.size());
     }
+    state.typeW = qBound(kMinTypeW, maxTypeLen, typeCap);
     state.nameW = qBound(kMinNameW, maxNameLen, kMaxNameW);
 
     // Pre-compute per-scope widths (each container gets widths based on direct children only)
@@ -626,7 +1140,10 @@ ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewR
 
         for (int childIdx : state.childMap.value(container.id)) {
             const Node& child = tree.nodes[childIdx];
-            scopeMaxType = qMax(scopeMaxType, (int)nodeTypeName(child).size());
+            // Skip struct children — pointer headers shouldn't inflate sibling widths
+            if (child.kind == NodeKind::Struct)
+                continue;
+            scopeMaxType = qMax(scopeMaxType, typeNameLens[childIdx]);
 
             // Name width (skip hex, but include containers)
             if (!isHexPreview(child.kind)) {
@@ -647,30 +1164,32 @@ ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewR
             scopeMaxType = qMax(scopeMaxType, (int)longestElemType.size());
         }
 
-        state.scopeTypeW[container.id] = qBound(kMinTypeW, scopeMaxType, kMaxTypeW);
+        state.scopeTypeW[container.id] = qBound(kMinTypeW, scopeMaxType, typeCap);
         state.scopeNameW[container.id] = qBound(kMinNameW, scopeMaxName, kMaxNameW);
     }
 
     // Compute scope widths for root level (parentId == 0)
-    // Include struct/array headers - they now use columnar layout too
     {
         int rootMaxType = kMinTypeW;
         int rootMaxName = kMinNameW;
         for (int childIdx : state.childMap.value(0)) {
             const Node& child = tree.nodes[childIdx];
-            rootMaxType = qMax(rootMaxType, (int)nodeTypeName(child).size());
+            // Skip struct children — pointer headers shouldn't inflate sibling widths
+            if (child.kind == NodeKind::Struct)
+                continue;
+            rootMaxType = qMax(rootMaxType, typeNameLens[childIdx]);
 
             // Name width (skip hex, include containers)
             if (!isHexPreview(child.kind)) {
                 rootMaxName = qMax(rootMaxName, (int)child.name.size());
             }
         }
-        state.scopeTypeW[0] = qBound(kMinTypeW, rootMaxType, kMaxTypeW);
+        state.scopeTypeW[0] = qBound(kMinTypeW, rootMaxType, typeCap);
         state.scopeNameW[0] = qBound(kMinNameW, rootMaxName, kMaxNameW);
     }
 
     // Emit CommandRow as line 0 (combined: source + address + root class type + name)
-    const QString cmdRowText = QStringLiteral("[\u25B8] source\u25BE \u00B7 0x0 \u00B7 struct NoName {");
+    const QString cmdRowText = QStringLiteral("[\u25B8] source\u25BE  0x0  struct NoName {");
     {
         LineMeta lm;
         lm.nodeIdx   = -1;
@@ -685,13 +1204,22 @@ ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewR
         lm.markerMask = 0;
         lm.effectiveTypeW = state.typeW;
         lm.effectiveNameW = state.nameW;
-        state.emitLine(cmdRowText, lm);
+        state.emitLine(cmdRowText, std::move(lm));
     }
 
-    QVector<int> roots = state.childMap.value(0);
-    std::sort(roots.begin(), roots.end(), [&](int a, int b) {
-        return tree.nodes[a].offset < tree.nodes[b].offset;
-    });
+    // Brace wrapping: emit standalone "{" after CommandRow
+    if (state.braceWrap) {
+        LineMeta braceLm;
+        braceLm.nodeIdx   = -1;
+        braceLm.nodeId    = 0;  // not associated with any node (no hover)
+        braceLm.depth     = 0;
+        braceLm.lineKind  = LineKind::Header;
+        braceLm.foldLevel = SC_FOLDLEVELBASE;
+        braceLm.markerMask = 0;
+        state.emitLine(QStringLiteral("{"), std::move(braceLm));
+    }
+
+    const QVector<int>& roots = childIndices(state, 0);
 
     for (int idx : roots) {
         // If viewRootId is set, skip roots that don't match
@@ -700,7 +1228,7 @@ ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewR
         composeNode(state, tree, prov, idx, 0);
     }
 
-    return { state.text, state.meta, LayoutInfo{state.typeW, state.nameW, state.offsetHexDigits, tree.baseAddress} };
+    return { state.text, state.meta, LayoutInfo{state.typeW, state.nameW, state.offsetHexDigits, tree.baseAddress, treeLines} };
 }
 
 QSet<uint64_t> NodeTree::normalizePreferAncestors(const QSet<uint64_t>& ids) const {

src/controller.h

@@ -40,7 +40,9 @@ public:
         return m ? QString::fromLatin1(m->typeName) : QStringLiteral("???");
     }
 
-    ComposeResult compose(uint64_t viewRootId = 0) const;
+    ComposeResult compose(uint64_t viewRootId = 0, bool compactColumns = false,
+                          bool treeLines = false, bool braceWrap = false,
+                          bool typeHints = false) const;
     bool save(const QString& path);
     bool load(const QString& path);
     void loadData(const QString& binaryPath);
@@ -90,6 +92,7 @@ public:
     void changeNodeKind(int nodeIdx, NodeKind newKind);
     void renameNode(int nodeIdx, const QString& newName);
     void insertNode(uint64_t parentId, int offset, NodeKind kind, const QString& name);
+    void insertNodeAbove(int beforeIdx, NodeKind kind, const QString& name);
     void removeNode(int nodeIdx);
     void toggleCollapse(int nodeIdx);
     void materializeRefChildren(int nodeIdx);
@@ -98,10 +101,14 @@ public:
     void duplicateNode(int nodeIdx);
     void convertToTypedPointer(uint64_t nodeId);
     void splitHexNode(uint64_t nodeId);
+    void toggleBitfieldBit(uint64_t nodeId, int memberIdx);
+    void editBitfieldValue(uint64_t nodeId, int memberIdx);
     void showContextMenu(RcxEditor* editor, int line, int nodeIdx, int subLine, const QPoint& globalPos);
     void batchRemoveNodes(const QVector<int>& nodeIndices);
     void batchChangeKind(const QVector<int>& nodeIndices, NodeKind newKind);
     void deleteRootStruct(uint64_t structId);
+    void groupIntoUnion(const QSet<uint64_t>& nodeIds);
+    void dissolveUnion(uint64_t unionId);
 
     void applyCommand(const Command& cmd, bool isUndo);
     void refresh();
@@ -122,6 +129,12 @@ public:
     RcxDocument* document() const { return m_doc; }
     void setEditorFont(const QString& fontName);
     void setRefreshInterval(int ms);
+    void setCompactColumns(bool v);
+    void setTreeLines(bool v);
+    void setBraceWrap(bool v);
+    void setTypeHints(bool v);
+    bool typeHints() const { return m_typeHints; }
+    void resetProvider();
 
     // MCP bridge accessors
     void setSuppressRefresh(bool v) { m_suppressRefresh = v; }
@@ -136,16 +149,20 @@ public:
     // Value tracking toggle (per-tab, off by default)
     bool trackValues() const { return m_trackValues; }
     void setTrackValues(bool on);
+    void resetChangeTracking();
 
     // Cross-tab type visibility: point at the project's full document list
     void setProjectDocuments(QVector<RcxDocument*>* docs) { m_projectDocs = docs; }
 
-    // Test accessor
+    // Test accessors
     const QHash<uint64_t, ValueHistory>& valueHistory() const { return m_valueHistory; }
+    const ComposeResult& lastResult() const { return m_lastResult; }
+    int  dataExtent() const { return computeDataExtent(); }
 
 signals:
     void nodeSelected(int nodeIdx);
     void selectionChanged(int count);
+    void contextMenuAboutToShow(QMenu* menu, int line);
 
 private:
     RcxDocument*       m_doc;
@@ -154,6 +171,10 @@ private:
     QSet<uint64_t>     m_selIds;
     int                m_anchorLine = -1;
     bool               m_suppressRefresh = false;
+    bool               m_compactColumns = false;
+    bool               m_treeLines = false;
+    bool               m_braceWrap = false;
+    bool               m_typeHints = false;
     uint64_t           m_viewRootId = 0;
 
     // ── Saved sources for quick-switch ──
@@ -162,6 +183,7 @@ private:
 
     // ── Cached type selector popup (avoids ~350ms cold-start on first show) ──
     QPointer<TypeSelectorPopup> m_cachedPopup;
+    int m_typePopupGen = 0;  // generation counter for deferred content loading
 
     // ── Auto-refresh state ──
     using PageMap = QHash<uint64_t, QByteArray>;
@@ -171,7 +193,8 @@ private:
     PageMap         m_prevPages;
     QSet<int64_t>   m_changedOffsets;
     QHash<uint64_t, ValueHistory> m_valueHistory;
-    bool            m_trackValues = false;
+    bool            m_trackValues = true;
+    int             m_valueTrackCooldown = 0; // suppress value recording for N refresh cycles after clear
     uint64_t        m_refreshGen = 0;
     uint64_t        m_readGen = 0;
     bool            m_readInFlight = false;

src/core.h

@@ -11,6 +11,7 @@
 #include <array>
 #include <memory>
 #include <variant>
+#include <QDateTime>
 
 #include "providers/provider.h"
 #include "providers/buffer_provider.h"
@@ -85,8 +86,8 @@ inline constexpr KindMeta kKindMeta[] = {
     {NodeKind::Vec3,      "Vec3",      "vec3",       12,  1,  4, KF_Vector},
     {NodeKind::Vec4,      "Vec4",      "vec4",       16,  1,  4, KF_Vector},
     {NodeKind::Mat4x4,    "Mat4x4",    "mat4x4",     64,  4,  4, KF_None},
-    {NodeKind::UTF8,      "UTF8",      "char[]",      1,  1,  1, KF_String},
-    {NodeKind::UTF16,     "UTF16",     "wchar_t[]",   2,  1,  2, KF_String},
+    {NodeKind::UTF8,      "UTF8",      "str",         1,  1,  1, KF_String},
+    {NodeKind::UTF16,     "UTF16",     "wstr",        2,  1,  2, KF_String},
     {NodeKind::Struct,    "Struct",    "struct",      0,  1,  1, KF_Container},
     {NodeKind::Array,     "Array",     "array",       0,  1,  1, KF_Container},
 };
@@ -152,14 +153,11 @@ inline constexpr bool isValidPrimitivePtrTarget(NodeKind k) {
     return true;
 }
 
-inline QStringList allTypeNamesForUI(bool stripBrackets = false) {
+inline QStringList allTypeNamesForUI(bool /*stripBrackets*/ = false) {
     QStringList out;
     out.reserve(std::size(kKindMeta));
-    for (const auto& m : kKindMeta) {
-        QString t = QString::fromLatin1(m.typeName);
-        if (stripBrackets) t.remove(QStringLiteral("[]"));
-        out << t;
-    }
+    for (const auto& m : kKindMeta)
+        out << QString::fromLatin1(m.typeName);
     out.sort(Qt::CaseInsensitive);
     out.removeDuplicates();
     return out;
@@ -179,6 +177,14 @@ enum Marker : int {
     M_ACCENT    = 9,
 };
 
+// ── Bitfield member (name + bit position + width within a container) ──
+
+struct BitfieldMember {
+    QString name;
+    uint8_t bitOffset = 0;  // position from LSB within the container
+    uint8_t bitWidth  = 1;  // number of bits (1..64)
+};
+
 // ── Node ──
 
 struct Node {
@@ -189,13 +195,17 @@ struct Node {
     QString  classKeyword;    // "struct", "class", or "enum" (empty = "struct")
     uint64_t parentId   = 0;   // 0 = root (no parent)
     int      offset     = 0;
+    bool     isStatic   = false;   // static field — excluded from struct layout
+    QString  offsetExpr;           // C/C++ expression → absolute address (static fields only)
     int      arrayLen   = 1;   // Array: element count
     int      strLen     = 64;
-    bool     collapsed  = false;
+    bool     collapsed  = true;
     uint64_t refId      = 0;       // Pointer32/64: id of Struct to expand at *ptr
     NodeKind elementKind = NodeKind::UInt8;  // Array: element type; Pointer with ptrDepth>0: target type
     int      ptrDepth   = 0;   // Pointer: 0=struct/void ptr, 1=primitive*, 2=primitive**
     int      viewIndex  = 0;   // Array: current view offset (transient)
+    QVector<QPair<QString, int64_t>> enumMembers; // Enum: name→value pairs
+    QVector<BitfieldMember> bitfieldMembers;       // Bitfield: per-bit member definitions
 
     // Note: Returns 0 for Array-of-Struct/Array. Use tree.structSpan() for accurate size.
     int byteSize() const {
@@ -207,6 +217,12 @@ struct Node {
             if (elemSz <= 0) return 0;
             return qMin(arrayLen, INT_MAX / elemSz) * elemSz;
         }
+        case NodeKind::Struct:
+            if (classKeyword == QStringLiteral("bitfield")) {
+                int sz = sizeForKind(elementKind);
+                return sz > 0 ? sz : 4;
+            }
+            return 0;
         default: return sizeForKind(kind);
         }
     }
@@ -222,6 +238,10 @@ struct Node {
             o["classKeyword"] = classKeyword;
         o["parentId"]  = QString::number(parentId);
         o["offset"]    = offset;
+        if (isStatic)
+            o["isStatic"] = true;
+        if (!offsetExpr.isEmpty())
+            o["offsetExpr"] = offsetExpr;
         o["arrayLen"]  = arrayLen;
         o["strLen"]    = strLen;
         o["collapsed"] = collapsed;
@@ -229,6 +249,27 @@ struct Node {
         o["elementKind"] = kindToString(elementKind);
         if (ptrDepth > 0)
             o["ptrDepth"] = ptrDepth;
+        if (!enumMembers.isEmpty()) {
+            QJsonArray arr;
+            for (const auto& m : enumMembers) {
+                QJsonObject em;
+                em["name"] = m.first;
+                em["value"] = QString::number(m.second);
+                arr.append(em);
+            }
+            o["enumMembers"] = arr;
+        }
+        if (!bitfieldMembers.isEmpty()) {
+            QJsonArray arr;
+            for (const auto& m : bitfieldMembers) {
+                QJsonObject bm;
+                bm["name"] = m.name;
+                bm["bitOffset"] = m.bitOffset;
+                bm["bitWidth"] = m.bitWidth;
+                arr.append(bm);
+            }
+            o["bitfieldMembers"] = arr;
+        }
         return o;
     }
     static Node fromJson(const QJsonObject& o) {
@@ -240,12 +281,33 @@ struct Node {
         n.classKeyword = o["classKeyword"].toString();
         n.parentId  = o["parentId"].toString("0").toULongLong();
         n.offset    = o["offset"].toInt(0);
+        n.isStatic  = o["isStatic"].toBool(o["isHelper"].toBool(false));
+        n.offsetExpr = o["offsetExpr"].toString();
         n.arrayLen  = qBound(1, o["arrayLen"].toInt(1), 1000000);
         n.strLen    = qBound(1, o["strLen"].toInt(64), 1000000);
-        n.collapsed = o["collapsed"].toBool(false);
+        n.collapsed = o["collapsed"].toBool(true);
         n.refId     = o["refId"].toString("0").toULongLong();
         n.elementKind = kindFromString(o["elementKind"].toString("UInt8"));
         n.ptrDepth  = qBound(0, o["ptrDepth"].toInt(0), 2);
+        if (o.contains("enumMembers")) {
+            QJsonArray arr = o["enumMembers"].toArray();
+            for (const auto& v : arr) {
+                QJsonObject em = v.toObject();
+                n.enumMembers.append({em["name"].toString(),
+                                      em["value"].toString("0").toLongLong()});
+            }
+        }
+        if (o.contains("bitfieldMembers")) {
+            QJsonArray arr = o["bitfieldMembers"].toArray();
+            for (const auto& v : arr) {
+                QJsonObject bm = v.toObject();
+                BitfieldMember m;
+                m.name = bm["name"].toString();
+                m.bitOffset = (uint8_t)qBound(0, bm["bitOffset"].toInt(0), 255);
+                m.bitWidth = (uint8_t)qBound(1, bm["bitWidth"].toInt(1), 64);
+                n.bitfieldMembers.append(m);
+            }
+        }
         return n;
     }
 
@@ -268,8 +330,10 @@ struct NodeTree {
     QVector<Node> nodes;
     uint64_t      baseAddress = 0x00400000;
     QString       baseAddressFormula;  // e.g. "<ReClass.exe> + 0x100"
+    int           pointerSize = 8;    // 4 for 32-bit targets, 8 for 64-bit
     uint64_t      m_nextId    = 1;
     mutable QHash<uint64_t, int> m_idCache;
+    mutable QHash<uint64_t, QVector<int>> m_childCache;
 
     int addNode(const Node& n) {
         Node copy = n;
@@ -279,13 +343,15 @@ struct NodeTree {
         nodes.append(copy);
         if (!m_idCache.isEmpty())
             m_idCache[copy.id] = idx;
+        if (!m_childCache.isEmpty())
+            m_childCache[copy.parentId].append(idx);
         return idx;
     }
 
     // Reserve a unique ID atomically (for use before pushing undo commands)
     uint64_t reserveId() { return m_nextId++; }
 
-    void invalidateIdCache() const { m_idCache.clear(); }
+    void invalidateIdCache() const { m_idCache.clear(); m_childCache.clear(); }
 
     int indexOfId(uint64_t id) const {
         if (m_idCache.isEmpty() && !nodes.isEmpty()) {
@@ -296,11 +362,11 @@ struct NodeTree {
     }
 
     QVector<int> childrenOf(uint64_t parentId) const {
-        QVector<int> result;
-        for (int i = 0; i < nodes.size(); i++) {
-            if (nodes[i].parentId == parentId) result.append(i);
+        if (m_childCache.isEmpty() && !nodes.isEmpty()) {
+            for (int i = 0; i < nodes.size(); i++)
+                m_childCache[nodes[i].parentId].append(i);
         }
-        return result;
+        return m_childCache.value(parentId);
     }
 
     // Collect node + all descendants (iterative, cycle-safe)
@@ -381,10 +447,11 @@ struct NodeTree {
         QVector<int> kids = childMap ? childMap->value(structId) : childrenOf(structId);
         for (int ci : kids) {
             const Node& c = nodes[ci];
+            if (c.isStatic) continue;  // static fields don't affect struct size
             int sz = (c.kind == NodeKind::Struct || c.kind == NodeKind::Array)
                 ? structSpan(c.id, childMap, visited) : c.byteSize();
-            int end = c.offset + sz;
-            if (end > maxEnd) maxEnd = end;
+            int64_t end = (int64_t)c.offset + sz;
+            if (end > maxEnd) maxEnd = (int)qMin(end, (int64_t)INT_MAX);
         }
 
         // Embedded struct reference: no own children but refId points to a struct definition
@@ -403,6 +470,8 @@ struct NodeTree {
         o["baseAddress"] = QString::number(baseAddress, 16);
         if (!baseAddressFormula.isEmpty())
             o["baseAddressFormula"] = baseAddressFormula;
+        if (pointerSize != 8)
+            o["pointerSize"] = pointerSize;
         o["nextId"]      = QString::number(m_nextId);
         QJsonArray arr;
         for (const auto& n : nodes) arr.append(n.toJson());
@@ -414,8 +483,10 @@ struct NodeTree {
         NodeTree t;
         t.baseAddress = o["baseAddress"].toString("400000").toULongLong(nullptr, 16);
         t.baseAddressFormula = o["baseAddressFormula"].toString();
+        t.pointerSize = o["pointerSize"].toInt(8);
         t.m_nextId    = o["nextId"].toString("1").toULongLong();
         QJsonArray arr = o["nodes"].toArray();
+        t.nodes.reserve(arr.size());
         for (const auto& v : arr) {
             Node n = Node::fromJson(v.toObject());
             t.nodes.append(n);
@@ -431,6 +502,7 @@ struct NodeTree {
 struct ValueHistory {
     static constexpr int kCapacity = 10;
     std::array<QString, kCapacity> values;
+    std::array<qint64, kCapacity> timestamps{};  // msec since epoch
     int count = 0;   // total unique values recorded
     int head  = 0;   // next write position in ring
 
@@ -440,10 +512,16 @@ struct ValueHistory {
             if (values[last] == v) return;  // no change
         }
         values[head] = v;
+        timestamps[head] = QDateTime::currentMSecsSinceEpoch();
         head = (head + 1) % kCapacity;
         if (count < INT_MAX) count++;
     }
 
+    void clear() {
+        count = 0;
+        head = 0;
+    }
+
     int uniqueCount() const { return qMin(count, kCapacity); }
 
     // 0=static, 1=cold(2 unique), 2=warm(3-4), 3=hot(5+)
@@ -467,6 +545,16 @@ struct ValueHistory {
         for (int i = 0; i < n; i++)
             fn(values[(start + i) % kCapacity]);
     }
+
+    // Iterate with timestamps from newest to oldest
+    template<typename Fn>
+    void forEachWithTime(Fn&& fn) const {
+        int n = uniqueCount();
+        for (int i = 0; i < n; i++) {
+            int idx = (head + kCapacity - 1 - i) % kCapacity;
+            fn(values[idx], timestamps[idx]);
+        }
+    }
 };
 
 // ── LineMeta ──
@@ -482,17 +570,30 @@ static constexpr int      kCommandRowLine = 0;
 static constexpr int      kFirstDataLine  = 1;
 static constexpr uint64_t kFooterIdBit    = 0x8000000000000000ULL;
 static constexpr uint64_t kArrayElemBit   = 0x4000000000000000ULL;  // marks array element selection
-static constexpr uint64_t kArrayElemShift = 48;                     // bits 48-61 hold element index
-static constexpr uint64_t kArrayElemMask  = 0x3FFF000000000000ULL;  // 14 bits → max 16383 elements
+static constexpr uint64_t kArrayElemShift = 42;                     // bits 42-61 hold element index
+static constexpr uint64_t kArrayElemMask  = 0x3FFFFC0000000000ULL;  // 20 bits → max 1048575 elements
 
-// Encode an array element selection ID: nodeId | kArrayElemBit | (elemIdx << 48)
+// Encode an array element selection ID: nodeId | kArrayElemBit | (elemIdx << 42)
 inline uint64_t makeArrayElemSelId(uint64_t nodeId, int elemIdx) {
-    return nodeId | kArrayElemBit | ((uint64_t)(elemIdx & 0x3FFF) << kArrayElemShift);
+    Q_ASSERT(elemIdx >= 0);
+    return nodeId | kArrayElemBit | ((uint64_t)(elemIdx & 0xFFFFF) << kArrayElemShift);
 }
 inline int arrayElemIdxFromSelId(uint64_t selId) {
     return (int)((selId & kArrayElemMask) >> kArrayElemShift);
 }
 
+// Member selection encoding (enum/bitfield members) — mirrors array element pattern
+static constexpr uint64_t kMemberBit      = 0x2000000000000000ULL;
+static constexpr uint64_t kMemberSubShift = 42;
+static constexpr uint64_t kMemberSubMask  = 0x3FFFFC0000000000ULL;
+
+inline uint64_t makeMemberSelId(uint64_t nodeId, int subLine) {
+    return nodeId | kMemberBit | ((uint64_t)(subLine & 0xFFFFF) << kMemberSubShift);
+}
+inline int memberSubFromSelId(uint64_t selId) {
+    return (int)((selId & kMemberSubMask) >> kMemberSubShift);
+}
+
 struct LineMeta {
     int      nodeIdx        = -1;
     uint64_t nodeId         = 0;
@@ -522,6 +623,11 @@ struct LineMeta {
     int      effectiveNameW = 22;  // Per-line name column width used for rendering
     QString  pointerTargetName;    // Resolved target type name for Pointer32/64 (empty = "void")
     bool     isArrayElement  = false;  // true for synthesized primitive array element lines
+    bool     isMemberLine   = false;  // true for enum member / bitfield member lines
+    bool     isStaticLine   = false;  // true for static field node lines
+    QString  typeHint;                 // Type inference hint text (e.g. "Float×2") — only set for hex nodes when hints enabled
+    int      typeHintStart  = -1;      // Character offset where hint text starts in line text (-1 = none)
+    QVector<NodeKind> typeHintKinds;   // Suggested kinds from inference (empty = no hint)
 };
 
 inline bool isSyntheticLine(const LineMeta& lm) {
@@ -535,6 +641,7 @@ struct LayoutInfo {
     int nameW = 22;  // Effective name column width (default = kColName)
     int offsetHexDigits = 8;  // Hex digits for offset margin (4/8/12/16)
     uint64_t baseAddress = 0; // Base address for relative offset computation
+    bool treeLines = false;   // Whether tree line connectors are embedded in the text
 };
 
 // ── ComposeResult ──
@@ -566,13 +673,18 @@ namespace cmd {
     struct ChangeStructTypeName { uint64_t nodeId; QString oldName, newName; };
     struct ChangeClassKeyword { uint64_t nodeId; QString oldKeyword, newKeyword; };
     struct ChangeOffset { uint64_t nodeId; int oldOffset, newOffset; };
+    struct ChangeEnumMembers { uint64_t nodeId;
+                               QVector<QPair<QString, int64_t>> oldMembers, newMembers; };
+    struct ChangeOffsetExpr { uint64_t nodeId; QString oldExpr, newExpr; };
+    struct ToggleStatic     { uint64_t nodeId; bool oldVal, newVal; };
 }
 
 using Command = std::variant<
     cmd::ChangeKind, cmd::Rename, cmd::Collapse,
     cmd::Insert, cmd::Remove, cmd::ChangeBase, cmd::WriteBytes,
     cmd::ChangeArrayMeta, cmd::ChangePointerRef, cmd::ChangeStructTypeName,
-    cmd::ChangeClassKeyword, cmd::ChangeOffset
+    cmd::ChangeClassKeyword, cmd::ChangeOffset, cmd::ChangeEnumMembers,
+    cmd::ChangeOffsetExpr, cmd::ToggleStatic
 >;
 
 // ── Column spans (for inline editing) ──
@@ -585,7 +697,7 @@ struct ColumnSpan {
 
 enum class EditTarget { Name, Type, Value, BaseAddress, Source, ArrayIndex, ArrayCount,
                         ArrayElementType, ArrayElementCount, PointerTarget,
-                        RootClassType, RootClassName, TypeSelector };
+                        RootClassType, RootClassName, TypeSelector, StaticExpr };
 
 // Column layout constants (shared with format.cpp span computation)
 inline constexpr int kFoldCol     = 3;   // 3-char fold indicator prefix per line
@@ -595,19 +707,20 @@ inline constexpr int kColValue    = 96;
 inline constexpr int kColComment  = 28;  // "// Enter=Save Esc=Cancel" fits
 inline constexpr int kColBaseAddr = 12;  // "0x" + up to 10 hex digits (40-bit address)
 inline constexpr int kSepWidth    = 1;
-inline constexpr int kMinTypeW    = 8;   // Minimum type column width (fits "uint64_t")
+inline constexpr int kMinTypeW    = 7;   // Minimum type column width (fits "uint8_t")
 inline constexpr int kMaxTypeW    = 128; // Maximum type column width
 inline constexpr int kMinNameW    = 8;   // Minimum name column width (matches ASCII preview)
 inline constexpr int kMaxNameW    = 128; // Maximum name column width
+inline constexpr int kCompactTypeW    = 20; // Type column cap for compact column mode
 
 inline ColumnSpan typeSpanFor(const LineMeta& lm, int typeW = kColType) {
-    if (lm.lineKind != LineKind::Field || lm.isContinuation) return {};
+    if (lm.lineKind != LineKind::Field || lm.isContinuation || lm.isMemberLine) return {};
     int ind = kFoldCol + lm.depth * 3;
     return {ind, ind + typeW, true};
 }
 
 inline ColumnSpan nameSpanFor(const LineMeta& lm, int typeW = kColType, int nameW = kColName) {
-    if (lm.isContinuation || lm.lineKind != LineKind::Field) return {};
+    if (lm.isContinuation || lm.lineKind != LineKind::Field || lm.isMemberLine) return {};
 
     int ind = kFoldCol + lm.depth * 3;
     int start = ind + typeW + kSepWidth;
@@ -622,6 +735,7 @@ inline ColumnSpan nameSpanFor(const LineMeta& lm, int typeW = kColType, int name
 inline ColumnSpan valueSpanFor(const LineMeta& lm, int /*lineLength*/, int typeW = kColType, int nameW = kColName) {
     if (lm.lineKind == LineKind::Header || lm.lineKind == LineKind::Footer ||
         lm.lineKind == LineKind::ArrayElementSeparator) return {};
+    if (lm.isMemberLine) return {};
     int ind = kFoldCol + lm.depth * 3;
 
     // Hex uses nameW for ASCII column (same as regular name column)
@@ -640,6 +754,45 @@ inline ColumnSpan valueSpanFor(const LineMeta& lm, int /*lineLength*/, int typeW
     return {start, start + valWidth, true};
 }
 
+// Member line spans (enum "name = value", bitfield "name : N = value")
+inline ColumnSpan memberNameSpanFor(const LineMeta& lm, const QString& lineText) {
+    if (!lm.isMemberLine) return {};
+    int ind = kFoldCol + lm.depth * 3;
+    int eq = lineText.indexOf(QLatin1String(" = "), ind);
+    if (eq < 0) return {};
+    int nameEnd = eq;
+    while (nameEnd > ind && lineText[nameEnd - 1] == ' ') nameEnd--;
+    return {ind, nameEnd, true};
+}
+
+inline ColumnSpan memberValueSpanFor(const LineMeta& lm, const QString& lineText) {
+    if (!lm.isMemberLine) return {};
+    int eq = lineText.indexOf(QLatin1String(" = "));
+    if (eq < 0) return {};
+    int valStart = eq + 3;
+    int valEnd = lineText.size();
+    while (valEnd > valStart && lineText[valEnd - 1] == ' ') valEnd--;
+    return {valStart, valEnd, true};
+}
+
+// Static field expression span: locates text between "return " and "→" / "(error)" / end
+inline ColumnSpan staticExprSpanFor(const LineMeta& /*lm*/, const QString& lineText) {
+    int ret = lineText.indexOf(QLatin1String("return "));
+    if (ret < 0) return {};
+    int exprStart = ret + 7;
+    // End: before arrow, before "(error)", or line end
+    int exprEnd = lineText.size();
+    int arrow = lineText.indexOf(QChar(0x2192), exprStart);
+    if (arrow > exprStart) exprEnd = arrow;
+    int err = lineText.indexOf(QLatin1String("(error)"), exprStart);
+    if (err > exprStart && err < exprEnd) exprEnd = err;
+    // Also stop at " }" for collapsed format
+    int brace = lineText.indexOf(QLatin1String(" }"), exprStart);
+    if (brace > exprStart && brace < exprEnd) exprEnd = brace;
+    while (exprEnd > exprStart && lineText[exprEnd - 1] == ' ') exprEnd--;
+    return {exprStart, exprEnd, true};
+}
+
 inline ColumnSpan commentSpanFor(const LineMeta& lm, int lineLength, int typeW = kColType, int nameW = kColName) {
     if (lm.lineKind == LineKind::Header || lm.lineKind == LineKind::Footer) return {};
     int ind = kFoldCol + lm.depth * 3;
@@ -661,30 +814,14 @@ inline ColumnSpan commentSpanFor(const LineMeta& lm, int lineLength, int typeW =
 // Line format: "source▾ · 0x140000000"
 
 inline ColumnSpan commandRowSrcSpan(const QString& lineText) {
-    int idx = lineText.indexOf(QStringLiteral(" \u00B7"));
-    if (idx < 0) return {};
+    // Source label ends at the ▾ dropdown arrow
+    int arrow = lineText.indexOf(QChar(0x25BE));
+    if (arrow < 0) return {};
     int start = 0;
-    while (start < idx && !lineText[start].isLetterOrNumber()
+    while (start < arrow && !lineText[start].isLetterOrNumber()
            && lineText[start] != '<' && lineText[start] != '\'') start++;
-    if (start >= idx) return {};
-    // Exclude trailing ▾ from the editable span
-    int end = idx;
-    while (end > start && lineText[end - 1] == QChar(0x25BE)) end--;
-    if (end <= start) return {};
-    return {start, end, true};
-}
-
-inline ColumnSpan commandRowAddrSpan(const QString& lineText) {
-    int tag = lineText.indexOf(QStringLiteral(" \u00B7"));
-    if (tag < 0) return {};
-    int start = tag + 3;  // after " · "
-    // Scan to next " · " separator (or end of line) to support formulas with spaces
-    int nextSep = lineText.indexOf(QStringLiteral(" \u00B7"), start);
-    int end = (nextSep >= 0) ? nextSep : lineText.size();
-    // Trim trailing whitespace
-    while (end > start && lineText[end - 1].isSpace()) end--;
-    if (end <= start) return {};
-    return {start, end, true};
+    if (start >= arrow) return {};
+    return {start, arrow, true};
 }
 
 // ── CommandRow root-class spans ──
@@ -703,6 +840,25 @@ inline int commandRowRootStart(const QString& lineText) {
     return best;
 }
 
+inline ColumnSpan commandRowAddrSpan(const QString& lineText) {
+    // Address starts at "0x" after the source dropdown arrow
+    int arrow = lineText.indexOf(QChar(0x25BE));
+    if (arrow < 0) return {};
+    int start = lineText.indexOf(QStringLiteral("0x"), arrow);
+    if (start < 0) {
+        // Formula mode: address is between arrow and root keyword
+        start = arrow + 1;
+        while (start < lineText.size() && lineText[start].isSpace()) start++;
+    }
+    // End at root keyword (struct/class/enum) or end of line
+    int rootStart = commandRowRootStart(lineText);
+    int end = (rootStart > start) ? rootStart : lineText.size();
+    // Trim trailing whitespace
+    while (end > start && lineText[end - 1].isSpace()) end--;
+    if (end <= start) return {};
+    return {start, end, true};
+}
+
 inline ColumnSpan commandRowRootTypeSpan(const QString& lineText) {
     int start = commandRowRootStart(lineText);
     if (start < 0) return {};
@@ -851,17 +1007,18 @@ namespace fmt {
     QString fmtNodeLine(const Node& node, const Provider& prov,
                         uint64_t addr, int depth, int subLine = 0,
                         const QString& comment = {}, int colType = kColType, int colName = kColName,
-                        const QString& typeOverride = {});
+                        const QString& typeOverride = {}, bool compact = false);
     QString fmtOffsetMargin(uint64_t absoluteOffset, bool isContinuation, int hexDigits = 8);
-    QString fmtStructHeader(const Node& node, int depth, bool collapsed, int colType = kColType, int colName = kColName);
+    QString fmtStructHeader(const Node& node, int depth, bool collapsed, int colType = kColType, int colName = kColName, bool compact = false);
     QString fmtStructFooter(const Node& node, int depth, int totalSize = -1);
-    QString fmtArrayHeader(const Node& node, int depth, int viewIdx, bool collapsed, int colType = kColType, int colName = kColName, const QString& elemStructName = {});
+    QString fmtArrayHeader(const Node& node, int depth, int viewIdx, bool collapsed, int colType = kColType, int colName = kColName, const QString& elemStructName = {}, bool compact = false);
     QString structTypeName(const Node& node);  // Full type string for struct headers
     QString arrayTypeName(NodeKind elemKind, int count, const QString& structName = {});
     QString pointerTypeName(NodeKind kind, const QString& targetName);
     QString fmtPointerHeader(const Node& node, int depth, bool collapsed,
                              const Provider& prov, uint64_t addr,
-                             const QString& ptrTypeName, int colType = kColType, int colName = kColName);
+                             const QString& ptrTypeName, int colType = kColType, int colName = kColName,
+                             bool compact = false);
     QString validateBaseAddress(const QString& text);
     QString indent(int depth);
     QString readValue(const Node& node, const Provider& prov,
@@ -871,10 +1028,18 @@ namespace fmt {
     QByteArray parseValue(NodeKind kind, const QString& text, bool* ok);
     QByteArray parseAsciiValue(const QString& text, int expectedSize, bool* ok);
     QString validateValue(NodeKind kind, const QString& text);
+    QString fmtEnumMember(const QString& name, int64_t value, int depth, int nameW);
+    QString fmtBitfieldMember(const QString& name, uint8_t bitWidth,
+                              uint64_t value, int depth, int nameW);
+    uint64_t extractBits(const Provider& prov, uint64_t addr,
+                         NodeKind containerKind,
+                         uint8_t bitOffset, uint8_t bitWidth);
 } // namespace fmt
 
 // ── Compose function forward declaration ──
 
-ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewRootId = 0);
+ComposeResult compose(const NodeTree& tree, const Provider& prov, uint64_t viewRootId = 0,
+                      bool compactColumns = false, bool treeLines = false,
+                      bool braceWrap = false, bool typeHints = false);
 
 } // namespace rcx

src/dock_tab_buttons.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <QWidget>
+#include <QToolButton>
+#include <QHBoxLayout>
+#include <QIcon>
+
+// Dock tab button widget (close button)
+// Placed on the right side of each dock tab via QTabBar::setTabButton.
+class DockTabButtons : public QWidget {
+    Q_OBJECT
+public:
+    QToolButton* closeBtn;
+
+    explicit DockTabButtons(QWidget* parent = nullptr) : QWidget(parent) {
+        auto* hl = new QHBoxLayout(this);
+        hl->setContentsMargins(0, 0, 0, 0);
+        hl->setSpacing(0);
+
+        closeBtn = new QToolButton(this);
+        closeBtn->setAutoRaise(true);
+        closeBtn->setCursor(Qt::PointingHandCursor);
+        closeBtn->setFixedSize(16, 16);
+        closeBtn->setToolTip("Close tab");
+        closeBtn->setIcon(QIcon(":/vsicons/close.svg"));
+        closeBtn->setIconSize(QSize(12, 12));
+        hl->addWidget(closeBtn);
+    }
+
+    void applyTheme(const QColor& hover) {
+        QString style = QStringLiteral(
+            "QToolButton { border: none; padding: 1px; border-radius: 0px; }"
+            "QToolButton:hover { background: %1; }").arg(hover.name());
+        closeBtn->setStyleSheet(style);
+    }
+};

src/editor.h

@@ -6,6 +6,7 @@
 #include <QPoint>
 #include <QHash>
 
+class QLineEdit;
 class QsciScintilla;
 class QsciLexerCPP;
 
@@ -28,10 +29,15 @@ public:
     void restoreViewState(const ViewState& vs);
 
     QsciScintilla* scintilla() const { return m_sci; }
+    QWidget* historyPopup() const { return m_historyPopup; }
+    QWidget* disasmPopup() const { return m_disasmPopup; }
     QWidget* structPreviewPopup() const { return m_structPreviewPopup; }
     const LineMeta* metaForLine(int line) const;
     int currentNodeIndex() const;
     void scrollToNodeId(uint64_t nodeId);
+    void showFindBar();
+    void dismissHistoryPopup();
+    void dismissAllPopups();
 
     // ── Column span computation ──
     static ColumnSpan typeSpan(const LineMeta& lm, int typeW = kColType);
@@ -45,6 +51,7 @@ public:
     bool isEditing() const { return m_editState.active; }
     bool beginInlineEdit(EditTarget target, int line = -1, int col = -1);
     void cancelInlineEdit();
+    void setStaticCompletions(const QStringList& words) { m_staticCompletions = words; }
 
     void applySelectionOverlay(const QSet<uint64_t>& selIds);
     void setCommandRowText(const QString& line);
@@ -61,6 +68,8 @@ public:
         m_disasmProvider = prov; m_disasmRealProv = realProv; m_disasmTree = tree;
     }
 
+    void setRelativeOffsets(bool rel) { m_relativeOffsets = rel; reformatMargins(); }
+
     // Saved sources for quick-switch in source picker
     void setSavedSources(const QVector<SavedSourceDisplay>& sources) { m_savedSourceDisplay = sources; }
 
@@ -75,6 +84,11 @@ signals:
     void inlineEditCancelled();
     void typeSelectorRequested();
     void typePickerRequested(EditTarget target, int nodeIdx, QPoint globalPos);
+    void insertAboveRequested(int nodeIdx, NodeKind kind);
+    void relativeOffsetsChanged(bool relative);
+    void appendBytesRequested(uint64_t structId, int byteCount);
+    void trimHexRequested(uint64_t structId);
+    void appendEnumMembersRequested(uint64_t enumId, int count);
 
 protected:
     bool eventFilter(QObject* obj, QEvent* event) override;
@@ -131,6 +145,7 @@ private:
         bool       lastValidationOk = true;  // track state to avoid redundant updates
     };
     InlineEditState m_editState;
+    QStringList m_staticCompletions;  // autocomplete words for StaticExpr editing
 
     // ── Tab cycling state ──
     EditTarget m_lastTabTarget = EditTarget::Value;
@@ -144,12 +159,18 @@ private:
     // ── Value history ref (owned by controller) ──
     const QHash<uint64_t, ValueHistory>* m_valueHistory = nullptr;
     QWidget* m_historyPopup = nullptr;  // ValueHistoryPopup (file-local class in editor.cpp)
-    QWidget* m_disasmPopup = nullptr;   // DisasmPopup (file-local class in editor.cpp)
-    QWidget* m_structPreviewPopup = nullptr; // StructPreviewPopup (file-local class in editor.cpp)
+    QWidget* m_disasmPopup = nullptr;        // TitleBodyPopup (file-local class in editor.cpp)
+    QWidget* m_structPreviewPopup = nullptr; // TitleBodyPopup (file-local class in editor.cpp)
     const Provider* m_disasmProvider = nullptr;   // snapshot or real — for reading tree data
     const Provider* m_disasmRealProv = nullptr;   // real process provider — for reading code at arbitrary addresses
     const NodeTree* m_disasmTree = nullptr;
 
+    // ── Find bar ──
+    QWidget*   m_findBarContainer = nullptr;
+    QLineEdit* m_findBar = nullptr;
+    long       m_findPos = 0;
+    void hideFindBar();
+
     // ── Reentrancy guards ──
     bool m_applyingDocument = false;
     bool m_clampingSelection = false;
@@ -162,13 +183,11 @@ private:
     void setupMarkers();
     void allocateMarginStyles();
 
-    void applyMarginText(const QVector<LineMeta>& meta);
+    void applyLineAttributes(const QVector<LineMeta>& meta);
     void reformatMargins();
-    void applyMarkers(const QVector<LineMeta>& meta);
-    void applyFoldLevels(const QVector<LineMeta>& meta);
     void applyHexDimming(const QVector<LineMeta>& meta);
-    void applyHeatmapHighlight(const QVector<LineMeta>& meta);
-    void applySymbolColoring(const QVector<LineMeta>& meta);
+    void applyHeatmapHighlight(const QVector<LineMeta>& meta, const QVector<QString>& lineTexts);
+    void applySymbolColoring(const QVector<LineMeta>& meta, const QVector<QString>& lineTexts);
     void applyBaseAddressColoring(const QVector<LineMeta>& meta);
     void applyCommandRowPills();
 

src/examples/MMPFN.rcx

@@ -0,0 +1,616 @@
+{
+    "baseAddress": "FFFFCA8010000000",
+    "nextId": "3000",
+    "nodes": [
+        {
+            "id": "100",
+            "kind": "Struct",
+            "name": "list_entry",
+            "structTypeName": "_LIST_ENTRY",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "101",
+            "kind": "Pointer64",
+            "name": "Flink",
+            "offset": 0,
+            "parentId": "100",
+            "refId": "100",
+            "collapsed": true
+        },
+        {
+            "id": "102",
+            "kind": "Pointer64",
+            "name": "Blink",
+            "offset": 8,
+            "parentId": "100",
+            "refId": "100",
+            "collapsed": true
+        },
+
+        {
+            "id": "200",
+            "kind": "Struct",
+            "name": "balanced_node",
+            "structTypeName": "_RTL_BALANCED_NODE",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "210",
+            "kind": "Struct",
+            "name": "",
+            "classKeyword": "union",
+            "offset": 0,
+            "parentId": "200",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "211",
+            "kind": "Pointer64",
+            "name": "Left",
+            "offset": 0,
+            "parentId": "210",
+            "refId": "200",
+            "collapsed": true
+        },
+        {
+            "id": "212",
+            "kind": "Pointer64",
+            "name": "Right",
+            "offset": 8,
+            "parentId": "210",
+            "refId": "200",
+            "collapsed": true
+        },
+        {
+            "id": "220",
+            "kind": "Struct",
+            "name": "",
+            "classKeyword": "union",
+            "offset": 16,
+            "parentId": "200",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "221",
+            "kind": "UInt64",
+            "name": "ParentValue",
+            "offset": 0,
+            "parentId": "220"
+        },
+
+        {
+            "id": "300",
+            "kind": "Struct",
+            "name": "mmpte",
+            "structTypeName": "_MMPTE",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "301",
+            "kind": "Struct",
+            "name": "u",
+            "classKeyword": "union",
+            "offset": 0,
+            "parentId": "300",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "302",
+            "kind": "UInt64",
+            "name": "Long",
+            "offset": 0,
+            "parentId": "301"
+        },
+        {
+            "id": "303",
+            "kind": "Struct",
+            "name": "Hard",
+            "structTypeName": "_MMPTE_HARDWARE",
+            "offset": 0,
+            "parentId": "301",
+            "refId": "400",
+            "collapsed": true
+        },
+        {
+            "id": "304",
+            "kind": "Struct",
+            "name": "Proto",
+            "structTypeName": "_MMPTE_PROTOTYPE",
+            "offset": 0,
+            "parentId": "301",
+            "refId": "600",
+            "collapsed": true
+        },
+        {
+            "id": "305",
+            "kind": "Struct",
+            "name": "Soft",
+            "structTypeName": "_MMPTE_SOFTWARE",
+            "offset": 0,
+            "parentId": "301",
+            "refId": "500",
+            "collapsed": true
+        },
+        {
+            "id": "306",
+            "kind": "Struct",
+            "name": "Trans",
+            "structTypeName": "_MMPTE_TRANSITION",
+            "offset": 0,
+            "parentId": "301",
+            "refId": "700",
+            "collapsed": true
+        },
+        {
+            "id": "307",
+            "kind": "Struct",
+            "name": "Subsect",
+            "structTypeName": "_MMPTE_SUBSECTION",
+            "offset": 0,
+            "parentId": "301",
+            "refId": "800",
+            "collapsed": true
+        },
+        {
+            "id": "308",
+            "kind": "Struct",
+            "name": "TimeStamp",
+            "structTypeName": "_MMPTE_TIMESTAMP",
+            "offset": 0,
+            "parentId": "301",
+            "refId": "900",
+            "collapsed": true
+        },
+        {
+            "id": "309",
+            "kind": "Struct",
+            "name": "List",
+            "structTypeName": "_MMPTE_LIST",
+            "offset": 0,
+            "parentId": "301",
+            "refId": "1000",
+            "collapsed": true
+        },
+
+        {
+            "id": "400",
+            "kind": "Struct",
+            "name": "mmpte_hardware",
+            "structTypeName": "_MMPTE_HARDWARE",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "401",
+            "kind": "Hex64",
+            "name": "Valid:1 Dirty1:1 Owner:1 WriteThrough:1 CacheDisable:1 Accessed:1 Dirty:1 LargePage:1 Global:1 CopyOnWrite:1 Unused:1 Write:1 PageFrameNumber:40 ReservedForSoftware:4 WsleAge:4 WsleProtection:3 NoExecute:1",
+            "offset": 0,
+            "parentId": "400"
+        },
+
+        {
+            "id": "500",
+            "kind": "Struct",
+            "name": "mmpte_software",
+            "structTypeName": "_MMPTE_SOFTWARE",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "501",
+            "kind": "Hex64",
+            "name": "Valid:1 PageFileReserved:1 PageFileAllocated:1 ColdPage:1 SwizzleBit:1 Protection:5 Prototype:1 Transition:1 PageFileLow:4 UsedPageTableEntries:10 ShadowStack:1 OnStandbyLookaside:1 Unused:4 PageFileHigh:32",
+            "offset": 0,
+            "parentId": "500"
+        },
+
+        {
+            "id": "600",
+            "kind": "Struct",
+            "name": "mmpte_prototype",
+            "structTypeName": "_MMPTE_PROTOTYPE",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "601",
+            "kind": "Hex64",
+            "name": "Valid:1 DemandFillProto:1 HiberVerifyConverted:1 ReadOnly:1 SwizzleBit:1 Protection:5 Prototype:1 Combined:1 Unused1:4 ProtoAddress:48",
+            "offset": 0,
+            "parentId": "600"
+        },
+
+        {
+            "id": "700",
+            "kind": "Struct",
+            "name": "mmpte_transition",
+            "structTypeName": "_MMPTE_TRANSITION",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "701",
+            "kind": "Hex64",
+            "name": "Valid:1 Write:1 OnStandbyLookaside:1 IoTracker:1 SwizzleBit:1 Protection:5 Prototype:1 Transition:1 PageFrameNumber:40 Unused:12",
+            "offset": 0,
+            "parentId": "700"
+        },
+
+        {
+            "id": "800",
+            "kind": "Struct",
+            "name": "mmpte_subsection",
+            "structTypeName": "_MMPTE_SUBSECTION",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "801",
+            "kind": "Hex64",
+            "name": "Valid:1 Unused0:2 OnStandbyLookaside:1 SwizzleBit:1 Protection:5 Prototype:1 ColdPage:1 Unused2:3 ExecutePrivilege:1 SubsectionAddress:48",
+            "offset": 0,
+            "parentId": "800"
+        },
+
+        {
+            "id": "900",
+            "kind": "Struct",
+            "name": "mmpte_timestamp",
+            "structTypeName": "_MMPTE_TIMESTAMP",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "901",
+            "kind": "Hex64",
+            "name": "MustBeZero:1 Unused:3 SwizzleBit:1 Protection:5 Prototype:1 Transition:1 PageFileLow:4 Reserved:16 GlobalTimeStamp:32",
+            "offset": 0,
+            "parentId": "900"
+        },
+
+        {
+            "id": "1000",
+            "kind": "Struct",
+            "name": "mmpte_list",
+            "structTypeName": "_MMPTE_LIST",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1001",
+            "kind": "Hex64",
+            "name": "Valid:1 OneEntry:1 filler0:2 SwizzleBit:1 Protection:5 Prototype:1 Transition:1 filler1:13 NextEntry:39",
+            "offset": 0,
+            "parentId": "1000"
+        },
+
+        {
+            "id": "1100",
+            "kind": "Struct",
+            "name": "mipfnflink",
+            "structTypeName": "_MIPFNFLINK",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1101",
+            "kind": "Hex64",
+            "name": "Flink",
+            "offset": 0,
+            "parentId": "1100"
+        },
+
+        {
+            "id": "1200",
+            "kind": "Struct",
+            "name": "mipfnblink",
+            "structTypeName": "_MIPFNBLINK",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1201",
+            "kind": "Hex64",
+            "name": "Blink",
+            "offset": 0,
+            "parentId": "1200"
+        },
+
+        {
+            "id": "1300",
+            "kind": "Struct",
+            "name": "mmpfnentry1",
+            "structTypeName": "_MMPFNENTRY1",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1301",
+            "kind": "Hex8",
+            "name": "Flags",
+            "offset": 0,
+            "parentId": "1300"
+        },
+
+        {
+            "id": "1400",
+            "kind": "Struct",
+            "name": "mmpfnentry3",
+            "structTypeName": "_MMPFNENTRY3",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1401",
+            "kind": "Hex8",
+            "name": "Flags",
+            "offset": 0,
+            "parentId": "1400"
+        },
+
+        {
+            "id": "1500",
+            "kind": "Struct",
+            "name": "mi_pfn_flags",
+            "structTypeName": "_MI_PFN_FLAGS",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1501",
+            "kind": "Hex32",
+            "name": "Flags",
+            "offset": 0,
+            "parentId": "1500"
+        },
+
+        {
+            "id": "1600",
+            "kind": "Struct",
+            "name": "mi_pfn_flags4",
+            "structTypeName": "_MI_PFN_FLAGS4",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1601",
+            "kind": "Hex64",
+            "name": "Flags",
+            "offset": 0,
+            "parentId": "1600"
+        },
+
+        {
+            "id": "1700",
+            "kind": "Struct",
+            "name": "mi_pfn_flags5",
+            "structTypeName": "_MI_PFN_FLAGS5",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": true
+        },
+        {
+            "id": "1701",
+            "kind": "Hex32",
+            "name": "Flags",
+            "offset": 0,
+            "parentId": "1700"
+        },
+
+        {
+            "id": "2000",
+            "kind": "Struct",
+            "name": "mmpfn",
+            "structTypeName": "_MMPFN",
+            "offset": 0,
+            "parentId": "0",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "2001",
+            "kind": "Struct",
+            "name": "",
+            "classKeyword": "union",
+            "offset": 0,
+            "parentId": "2000",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "2010",
+            "kind": "Struct",
+            "name": "ListEntry",
+            "structTypeName": "_LIST_ENTRY",
+            "offset": 0,
+            "parentId": "2001",
+            "refId": "100",
+            "collapsed": true
+        },
+        {
+            "id": "2011",
+            "kind": "Struct",
+            "name": "TreeNode",
+            "structTypeName": "_RTL_BALANCED_NODE",
+            "offset": 0,
+            "parentId": "2001",
+            "refId": "200",
+            "collapsed": true
+        },
+        {
+            "id": "2012",
+            "kind": "Struct",
+            "name": "",
+            "offset": 0,
+            "parentId": "2001",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "2013",
+            "kind": "Struct",
+            "name": "u1",
+            "structTypeName": "_MIPFNFLINK",
+            "offset": 0,
+            "parentId": "2012",
+            "refId": "1100",
+            "collapsed": true
+        },
+        {
+            "id": "2014",
+            "kind": "Struct",
+            "name": "",
+            "classKeyword": "union",
+            "offset": 8,
+            "parentId": "2012",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "2015",
+            "kind": "Pointer64",
+            "name": "PteAddress",
+            "offset": 0,
+            "parentId": "2014",
+            "refId": "300",
+            "collapsed": true
+        },
+        {
+            "id": "2016",
+            "kind": "UInt64",
+            "name": "PteLong",
+            "offset": 0,
+            "parentId": "2014"
+        },
+        {
+            "id": "2017",
+            "kind": "Struct",
+            "name": "OriginalPte",
+            "structTypeName": "_MMPTE",
+            "offset": 16,
+            "parentId": "2012",
+            "refId": "300",
+            "collapsed": true
+        },
+
+        {
+            "id": "2020",
+            "kind": "Struct",
+            "name": "u2",
+            "structTypeName": "_MIPFNBLINK",
+            "offset": 24,
+            "parentId": "2000",
+            "refId": "1200",
+            "collapsed": true
+        },
+
+        {
+            "id": "2030",
+            "kind": "Struct",
+            "name": "u3",
+            "classKeyword": "union",
+            "offset": 32,
+            "parentId": "2000",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "2031",
+            "kind": "Struct",
+            "name": "",
+            "offset": 0,
+            "parentId": "2030",
+            "refId": "0",
+            "collapsed": false
+        },
+        {
+            "id": "2032",
+            "kind": "UInt16",
+            "name": "ReferenceCount",
+            "offset": 0,
+            "parentId": "2031"
+        },
+        {
+            "id": "2033",
+            "kind": "Struct",
+            "name": "e1",
+            "structTypeName": "_MMPFNENTRY1",
+            "offset": 2,
+            "parentId": "2031",
+            "refId": "1300",
+            "collapsed": true
+        },
+        {
+            "id": "2034",
+            "kind": "Struct",
+            "name": "e4",
+            "structTypeName": "_MI_PFN_FLAGS",
+            "offset": 0,
+            "parentId": "2030",
+            "refId": "1500",
+            "collapsed": true
+        },
+
+        {
+            "id": "2040",
+            "kind": "Struct",
+            "name": "u5",
+            "structTypeName": "_MI_PFN_FLAGS5",
+            "offset": 36,
+            "parentId": "2000",
+            "refId": "1700",
+            "collapsed": true
+        },
+
+        {
+            "id": "2050",
+            "kind": "Struct",
+            "name": "u4",
+            "structTypeName": "_MI_PFN_FLAGS4",
+            "offset": 40,
+            "parentId": "2000",
+            "refId": "1600",
+            "collapsed": true
+        }
+    ]
+}

src/format.cpp

@@ -23,6 +23,14 @@ static QString fit(QString s, int w) {
     return s.leftJustified(w, ' ');
 }
 
+// Like fit() but overflows instead of truncating: if s exceeds w, return full string
+static QString fitOverflow(const QString& s, int w) {
+    if (w <= 0) return {};
+    if (s.size() <= w)
+        return s.leftJustified(w, ' ');
+    return s;
+}
+
 // ── Type name ──
 
 // Override seam: injectable type-name provider
@@ -65,45 +73,45 @@ QString pointerTypeName(NodeKind kind, const QString& targetName) {
 // ── Value formatting ──
 
 static QString hexVal(uint64_t v) {
-    return QStringLiteral("0x") + QString::number(v, 16);
+    return QString::asprintf("0x%llx", (unsigned long long)v);
 }
 
 static QString rawHex(uint64_t v, int digits) {
     return QString::number(v, 16).rightJustified(digits, '0');
 }
 
-QString fmtInt8(int8_t v)     { return hexVal((uint8_t)v); }
-QString fmtInt16(int16_t v)   { return hexVal((uint16_t)v); }
-QString fmtInt32(int32_t v)   { return hexVal((uint32_t)v); }
-QString fmtInt64(int64_t v)   { return hexVal((uint64_t)v); }
+QString fmtInt8(int8_t v)     { return QString::number(v); }
+QString fmtInt16(int16_t v)   { return QString::number(v); }
+QString fmtInt32(int32_t v)   { return QString::number(v); }
+QString fmtInt64(int64_t v)   { return QString::number((qlonglong)v); }
 QString fmtUInt8(uint8_t v)   { return hexVal(v); }
 QString fmtUInt16(uint16_t v) { return hexVal(v); }
 QString fmtUInt32(uint32_t v) { return hexVal(v); }
 QString fmtUInt64(uint64_t v) { return hexVal(v); }
 
 QString fmtFloat(float v) {
+    // Fixed 7-char body: digits + "." + decimals + "f"
+    // Negative values get a '-' prefix (8 chars total), positive stay 7.
     if (std::isnan(v)) return QStringLiteral("NaN");
     if (std::isinf(v)) return v > 0 ? QStringLiteral("inff") : QStringLiteral("-inff");
 
-    // 6 significant digits — covers full single-precision range
-    QString s = QString::number(v, 'g', 6);
+    float av = std::fabs(v);
+    if (av >= 100000.f)
+        return v < 0 ? QStringLiteral("-99999+f") : QStringLiteral("99999+f");
 
-    // If 'g' chose scientific notation, reformat as plain decimal
-    if (s.contains('e') || s.contains('E')) {
-        s = QString::number(v, 'f', 8);
-        if (s.contains('.')) {
-            int i = s.size() - 1;
-            while (i > 0 && s[i] == '0') i--;
-            if (s[i] == '.') i++;  // keep at least one decimal digit
-            s.truncate(i + 1);
+    // body = digits + "." + decimals + "f", target exactly 7 chars.
+    // Start with max decimals, reduce if integer part is wide or rounding overflows.
+    for (int dec = 4; dec >= 0; dec--) {
+        QString body = QString::number(av, 'f', dec);
+        body += (dec == 0) ? QStringLiteral(".f") : QStringLiteral("f");
+        if (body.size() == 7) {
+            if (v < 0.f) body.prepend('-');
+            return body;
         }
     }
 
-    if (!s.contains('.'))
-        s += QStringLiteral(".f");
-    else
-        s += QLatin1Char('f');
-    return s;
+    // Rounding pushed past 99999 — use overflow cap
+    return v < 0 ? QStringLiteral("-99999+f") : QStringLiteral("99999+f");
 }
 QString fmtDouble(double v) {
     QString s = QString::number(v, 'g', 6);
@@ -113,15 +121,8 @@ QString fmtDouble(double v) {
 }
 QString fmtBool(uint8_t v)    { return v ? QStringLiteral("true") : QStringLiteral("false"); }
 
-QString fmtPointer32(uint32_t v) {
-    if (v == 0) return QStringLiteral("-> NULL");
-    return QStringLiteral("-> ") + hexVal(v);
-}
-
-QString fmtPointer64(uint64_t v) {
-    if (v == 0) return QStringLiteral("-> NULL");
-    return QStringLiteral("-> ") + hexVal(v);
-}
+QString fmtPointer32(uint32_t v) { return hexVal(v); }
+QString fmtPointer64(uint64_t v) { return hexVal(v); }
 
 // ── Indentation ──
 
@@ -140,32 +141,43 @@ QString fmtOffsetMargin(uint64_t absoluteOffset, bool isContinuation, int hexDig
 // ── Struct type name (for width calculation) ──
 
 QString structTypeName(const Node& node) {
-    // Full type string: "struct TypeName" or just "struct" if no typename
-    QString base = typeName(node.kind).trimmed();  // "struct"
+    // Named types: just the type name (e.g. "_LIST_ENTRY")
+    // Anonymous: just the keyword (e.g. "union", "struct")
     if (!node.structTypeName.isEmpty())
-        return base + QStringLiteral(" ") + node.structTypeName;
-    return base;
+        return node.structTypeName;
+    return node.resolvedClassKeyword();
 }
 
 // ── Struct header / footer ──
 
-QString fmtStructHeader(const Node& node, int depth, bool collapsed, int colType, int colName) {
+QString fmtStructHeader(const Node& node, int depth, bool collapsed, int colType, int colName, bool compact) {
     // Columnar format: <type> <name> { (or no brace when collapsed)
     QString ind = indent(depth);
-    QString type = fit(structTypeName(node), colType);
+    QString rawType = structTypeName(node);
     QString suffix = collapsed ? QString() : QStringLiteral("{");
+    if (node.name.isEmpty()) {
+        // Anonymous struct/union: "union {" with no column padding
+        return ind + rawType + SEP + suffix;
+    }
+    QString type = compact ? fitOverflow(rawType, colType) : fit(rawType, colType);
     return ind + type + SEP + node.name + SEP + suffix;
 }
 
-QString fmtStructFooter(const Node& /*node*/, int depth, int /*totalSize*/) {
-    return indent(depth) + QStringLiteral("};");
+QString fmtStructFooter(const Node& node, int depth, int /*totalSize*/) {
+    QString footer = indent(depth) + QStringLiteral("};");
+    if (node.resolvedClassKeyword() == QStringLiteral("enum"))
+        footer += QStringLiteral("  +10");
+    else
+        footer += QStringLiteral("  +10h +100h +1000h Trim");
+    return footer;
 }
 
 // ── Array header ──
 // Columnar format: <type[count]> <name> { (or no brace when collapsed)
-QString fmtArrayHeader(const Node& node, int depth, int /*viewIdx*/, bool collapsed, int colType, int colName, const QString& elemStructName) {
+QString fmtArrayHeader(const Node& node, int depth, int /*viewIdx*/, bool collapsed, int colType, int colName, const QString& elemStructName, bool compact) {
     QString ind = indent(depth);
-    QString type = fit(arrayTypeName(node.elementKind, node.arrayLen, elemStructName), colType);
+    QString rawType = arrayTypeName(node.elementKind, node.arrayLen, elemStructName);
+    QString type = compact ? fitOverflow(rawType, colType) : fit(rawType, colType);
     QString suffix = collapsed ? QString() : QStringLiteral("{");
     return ind + type + SEP + node.name + SEP + suffix;
 }
@@ -174,10 +186,16 @@ QString fmtArrayHeader(const Node& node, int depth, int /*viewIdx*/, bool collap
 
 QString fmtPointerHeader(const Node& node, int depth, bool collapsed,
                          const Provider& prov, uint64_t addr,
-                         const QString& ptrTypeName, int colType, int colName) {
+                         const QString& ptrTypeName, int colType, int colName,
+                         bool compact) {
     QString ind = indent(depth);
-    QString type = fit(ptrTypeName, colType);
+    bool overflow = compact && ptrTypeName.size() > colType;
+    QString type = compact ? fitOverflow(ptrTypeName, colType) : fit(ptrTypeName, colType);
     if (collapsed) {
+        if (overflow) {
+            // Overflow: no column padding
+            return ind + type + SEP + node.name + SEP + readValue(node, prov, addr, 0);
+        }
         // Collapsed: show pointer value instead of brace (name padded for value alignment)
         QString name = fit(node.name, colName);
         QString val = fit(readValue(node, prov, addr, 0), COL_VALUE);
@@ -215,15 +233,18 @@ static QString bytesToAscii(const QByteArray& b, int slot) {
     return out;
 }
 
+static const char kHexDigits[] = "0123456789ABCDEF";
+
 static QString bytesToHex(const QByteArray& b, int slot) {
-    QString out;
-    out.reserve(slot * 3);
+    QChar buf[64]; // max slot=8 → 8*3-1=23 chars; 64 is plenty
+    int pos = 0;
     for (int i = 0; i < slot; ++i) {
         uint8_t c = (i < b.size()) ? (uint8_t)b[i] : 0;
-        out += QString::asprintf("%02X", (unsigned)c);
-        if (i + 1 < slot) out += ' ';
+        buf[pos++] = QLatin1Char(kHexDigits[c >> 4]);
+        buf[pos++] = QLatin1Char(kHexDigits[c & 0xF]);
+        if (i + 1 < slot) buf[pos++] = QLatin1Char(' ');
     }
-    return out;
+    return QString(buf, pos);
 }
 
 static QString fmtAsciiAndBytes(const Provider& prov, uint64_t addr,
@@ -320,7 +341,7 @@ static QString readValueImpl(const Node& node, const Provider& prov,
         int count = sizeForKind(node.kind) / 4;
         QStringList parts;
         for (int i = 0; i < count; i++)
-            parts << fmtFloat(prov.readF32(addr + i * 4)).trimmed();
+            parts << fmtFloat(prov.readF32(addr + i * 4));
         return parts.join(QStringLiteral(", "));
     }
     case NodeKind::Mat4x4: {
@@ -329,7 +350,7 @@ static QString readValueImpl(const Node& node, const Provider& prov,
         QString line = QStringLiteral("row%1 [").arg(subLine);
         for (int c = 0; c < 4; c++) {
             if (c > 0) line += QStringLiteral(", ");
-            line += fmtFloat(prov.readF32(addr + (subLine * 4 + c) * 4)).trimmed();
+            line += fmtFloat(prov.readF32(addr + (subLine * 4 + c) * 4));
         }
         line += QStringLiteral("]");
         return line;
@@ -366,12 +387,22 @@ QString readValue(const Node& node, const Provider& prov,
 QString fmtNodeLine(const Node& node, const Provider& prov,
                     uint64_t addr, int depth, int subLine,
                     const QString& comment, int colType, int colName,
-                    const QString& typeOverride) {
+                    const QString& typeOverride, bool compact) {
     QString ind = indent(depth);
-    QString type = typeOverride.isEmpty() ? typeName(node.kind, colType) : fit(typeOverride, colType);
-    QString name = fit(node.name, colName);
+
+    // Compute raw type string for overflow detection
+    QString rawType = typeOverride.isEmpty() ? typeNameRaw(node.kind) : typeOverride;
+    bool overflow = compact && rawType.size() > colType;
+
+    QString type = overflow ? fitOverflow(rawType, colType)
+                            : (typeOverride.isEmpty() ? typeName(node.kind, colType)
+                                                      : fit(typeOverride, colType));
+    QString name = overflow ? node.name : fit(node.name, colName);
+
+    // Effective column width for this line (accounts for overflow, clamped to hard max)
+    int effectiveColType = overflow ? rawType.size() : colType;
     // Blank prefix for continuation lines (same width as type+sep+name+sep)
-    const int prefixW = colType + colName + 2 * kSepWidth;
+    const int prefixW = effectiveColType + (overflow ? name.size() : colName) + 2 * kSepWidth;
 
     // Comment suffix (only present when a comment is provided; no trailing padding)
     QString cmtSuffix = comment.isEmpty() ? QString()
@@ -394,7 +425,8 @@ QString fmtNodeLine(const Node& node, const Provider& prov,
         return ind + type + SEP + ascii + SEP + hex + cmtSuffix;
     }
 
-    QString val = fit(readValue(node, prov, addr, subLine), COL_VALUE);
+    QString val = overflow ? readValue(node, prov, addr, subLine)
+                           : fit(readValue(node, prov, addr, subLine), COL_VALUE);
     return ind + type + SEP + name + SEP + val + cmtSuffix;
 }
 
@@ -629,8 +661,10 @@ QString validateValue(NodeKind kind, const QString& text) {
         QString digits = hasHexPrefix ? s.mid(2) : s;
 
         if (hasHexPrefix || isHexKind) {
-            // Hex mode: only 0-9, a-f, A-F
+            // Hex mode: only 0-9, a-f, A-F (spaces allowed for multi-byte hex kinds)
+            bool isMultiByteHex = (kind >= NodeKind::Hex16 && kind <= NodeKind::Hex64);
             for (QChar c : digits) {
+                if (c == ' ' && isMultiByteHex) continue;
                 if (!c.isDigit() && !(c >= 'a' && c <= 'f') && !(c >= 'A' && c <= 'F'))
                     return QStringLiteral("invalid hex '%1'").arg(c);
             }
@@ -674,4 +708,33 @@ QString validateBaseAddress(const QString& text) {
     return AddressParser::validate(s);
 }
 
+QString fmtEnumMember(const QString& name, int64_t value, int depth, int nameW) {
+    QString ind = indent(depth);
+    return ind + name.leftJustified(nameW) + QStringLiteral(" = ") + QString::number(value);
+}
+
+// ── Bitfield member formatting ──
+
+uint64_t extractBits(const Provider& prov, uint64_t addr,
+                     NodeKind containerKind,
+                     uint8_t bitOffset, uint8_t bitWidth) {
+    uint64_t container = 0;
+    switch (containerKind) {
+    case NodeKind::Hex8:  container = prov.readU8(addr);  break;
+    case NodeKind::Hex16: container = prov.readU16(addr); break;
+    case NodeKind::Hex32: container = prov.readU32(addr); break;
+    default:              container = prov.readU64(addr); break;
+    }
+    Q_ASSERT(bitOffset + bitWidth <= 64);
+    if (bitWidth >= 64) return container >> bitOffset;
+    return (container >> bitOffset) & ((1ULL << bitWidth) - 1);
+}
+
+QString fmtBitfieldMember(const QString& name, uint8_t bitWidth,
+                          uint64_t value, int depth, int nameW) {
+    QString ind = indent(depth);
+    return ind + name.leftJustified(nameW)
+         + QStringLiteral(" : %1 = %2").arg(bitWidth).arg(value);
+}
+
 } // namespace rcx::fmt

src/generator.cpp

@@ -68,6 +68,7 @@ struct GenContext {
     QString         output;
     int             padCounter = 0;
     const QHash<NodeKind, QString>* typeAliases = nullptr;
+    bool            emitAsserts = false;
 
     QString uniquePadName() {
         return QStringLiteral("_pad%1").arg(padCounter++, 4, 16, QChar('0'));
@@ -100,82 +101,93 @@ static void emitStruct(GenContext& ctx, uint64_t structId);
 
 static const QChar kCommentMarker = QChar(0x01);
 
-static QString offsetComment(int offset) {
+static QString offsetComment(int offset, bool isSizeof = false) {
+    if (isSizeof)
+        return QString(kCommentMarker) + QStringLiteral("// sizeof 0x%1").arg(QString::number(offset, 16).toUpper());
     return QString(kCommentMarker) + QStringLiteral("// 0x%1").arg(QString::number(offset, 16).toUpper());
 }
 
-static QString emitField(GenContext& ctx, const Node& node) {
+static QString indent(int depth) {
+    return QString(depth * 4, ' ');
+}
+
+static QString emitField(GenContext& ctx, const Node& node, int depth, int baseOffset) {
     const NodeTree& tree = ctx.tree;
+    QString ind = indent(depth);
     QString name = sanitizeIdent(node.name.isEmpty()
         ? QStringLiteral("field_%1").arg(node.offset, 2, 16, QChar('0'))
         : node.name);
-    QString oc = offsetComment(node.offset);
+    QString oc = offsetComment(baseOffset + node.offset);
 
     switch (node.kind) {
     case NodeKind::Vec2:
-        return QStringLiteral("    %1 %2[2];").arg(ctx.cType(NodeKind::Float), name) + oc;
+        return ind + QStringLiteral("%1 %2[2];").arg(ctx.cType(NodeKind::Float), name) + oc;
     case NodeKind::Vec3:
-        return QStringLiteral("    %1 %2[3];").arg(ctx.cType(NodeKind::Float), name) + oc;
+        return ind + QStringLiteral("%1 %2[3];").arg(ctx.cType(NodeKind::Float), name) + oc;
     case NodeKind::Vec4:
-        return QStringLiteral("    %1 %2[4];").arg(ctx.cType(NodeKind::Float), name) + oc;
+        return ind + QStringLiteral("%1 %2[4];").arg(ctx.cType(NodeKind::Float), name) + oc;
     case NodeKind::Mat4x4:
-        return QStringLiteral("    %1 %2[4][4];").arg(ctx.cType(NodeKind::Float), name) + oc;
+        return ind + QStringLiteral("%1 %2[4][4];").arg(ctx.cType(NodeKind::Float), name) + oc;
     case NodeKind::UTF8:
-        return QStringLiteral("    %1 %2[%3];").arg(ctx.cType(NodeKind::UTF8), name).arg(node.strLen) + oc;
+        return ind + QStringLiteral("%1 %2[%3];").arg(ctx.cType(NodeKind::UTF8), name).arg(node.strLen) + oc;
     case NodeKind::UTF16:
-        return QStringLiteral("    %1 %2[%3];").arg(ctx.cType(NodeKind::UTF16), name).arg(node.strLen) + oc;
-    case NodeKind::Pointer32: {
-        if (node.refId != 0) {
-            int refIdx = tree.indexOfId(node.refId);
-            if (refIdx >= 0) {
-                QString target = ctx.structName(tree.nodes[refIdx]);
-                return QStringLiteral("    %1 %2;").arg(ctx.cType(NodeKind::Pointer32), name) +
-                    offsetComment(node.offset).replace(QStringLiteral("//"), QStringLiteral("// -> %1*").arg(target));
-            }
-        }
-        return QStringLiteral("    %1 %2;").arg(ctx.cType(NodeKind::Pointer32), name) + oc;
-    }
+        return ind + QStringLiteral("%1 %2[%3];").arg(ctx.cType(NodeKind::UTF16), name).arg(node.strLen) + oc;
+    case NodeKind::Pointer32:
     case NodeKind::Pointer64: {
         if (node.refId != 0) {
             int refIdx = tree.indexOfId(node.refId);
             if (refIdx >= 0) {
                 QString target = ctx.structName(tree.nodes[refIdx]);
-                return QStringLiteral("    %1* %2;").arg(target, name) + oc;
+                return ind + QStringLiteral("struct %1* %2;").arg(target, name) + oc;
             }
         }
-        return QStringLiteral("    void* %1;").arg(name) + oc;
+        // Native pointer: use void* when this is the target's natural pointer kind
+        bool isNativePtr = (node.kind == NodeKind::Pointer32 && ctx.tree.pointerSize <= 4)
+                        || (node.kind == NodeKind::Pointer64 && ctx.tree.pointerSize >= 8);
+        if (isNativePtr)
+            return ind + QStringLiteral("void* %1;").arg(name) + oc;
+        // Cross-size pointer: fall back to raw integer type
+        return ind + QStringLiteral("%1 %2;").arg(ctx.cType(node.kind), name) + oc;
     }
     case NodeKind::FuncPtr32:
-        return QStringLiteral("    void (*%1)();").arg(name) + oc;
+        return ind + QStringLiteral("void (*%1)();").arg(name) + oc;
     case NodeKind::FuncPtr64:
-        return QStringLiteral("    void (*%1)();").arg(name) + oc;
+        return ind + QStringLiteral("void (*%1)();").arg(name) + oc;
     default:
-        return QStringLiteral("    %1 %2;").arg(ctx.cType(node.kind), name) + oc;
+        return ind + QStringLiteral("%1 %2;").arg(ctx.cType(node.kind), name) + oc;
     }
 }
 
-// ── Emit struct body (fields + padding) ──
+// ── Emit struct body (fields + padding) — Vergilius-style ──
 
-static void emitStructBody(GenContext& ctx, uint64_t structId) {
+static void emitStructBody(GenContext& ctx, uint64_t structId,
+                           bool isUnion, int depth, int baseOffset) {
     const NodeTree& tree = ctx.tree;
     int idx = tree.indexOfId(structId);
     if (idx < 0) return;
 
     int structSize = tree.structSpan(structId, &ctx.childMap);
+    QString ind = indent(depth);
 
-    QVector<int> children = ctx.childMap.value(structId);
+    QVector<int> allChildren = ctx.childMap.value(structId);
+    QVector<int> children, staticIdxs;
+    for (int ci : allChildren) {
+        if (tree.nodes[ci].isStatic)
+            staticIdxs.append(ci);
+        else
+            children.append(ci);
+    }
     std::sort(children.begin(), children.end(), [&](int a, int b) {
         return tree.nodes[a].offset < tree.nodes[b].offset;
     });
 
     // Helper: emit a padding/hex run as a single collapsed byte array
-    auto emitPadRun = [&](int offset, int size) {
+    auto emitPadRun = [&](int relOffset, int size) {
         if (size <= 0) return;
-        ctx.output += QStringLiteral("    %1 %2[0x%3];%4\n")
-            .arg(QStringLiteral("uint8_t"))
+        ctx.output += ind + QStringLiteral("uint8_t %1[0x%2];%3\n")
             .arg(ctx.uniquePadName())
             .arg(QString::number(size, 16).toUpper())
-            .arg(offsetComment(offset));
+            .arg(offsetComment(baseOffset + relOffset));
     };
 
     int cursor = 0;
@@ -189,13 +201,15 @@ static void emitStructBody(GenContext& ctx, uint64_t structId) {
         else
             childSize = child.byteSize();
 
-        // Gap before this field
-        if (child.offset > cursor)
-            emitPadRun(cursor, child.offset - cursor);
-        else if (child.offset < cursor)
-            ctx.output += QStringLiteral("    // WARNING: overlap at offset 0x%1 (previous field ends at 0x%2)\n")
-                .arg(QString::number(child.offset, 16).toUpper())
-                .arg(QString::number(cursor, 16).toUpper());
+        // Gap/overlap handling (skip for unions)
+        if (!isUnion) {
+            if (child.offset > cursor)
+                emitPadRun(cursor, child.offset - cursor);
+            else if (child.offset < cursor)
+                ctx.output += ind + QStringLiteral("// WARNING: overlap at offset 0x%1 (previous field ends at 0x%2)\n")
+                    .arg(QString::number(baseOffset + child.offset, 16).toUpper())
+                    .arg(QString::number(baseOffset + cursor, 16).toUpper());
+        }
 
         // Collapse consecutive hex nodes into a single padding array
         if (isHexNode(child.kind)) {
@@ -206,8 +220,7 @@ static void emitStructBody(GenContext& ctx, uint64_t structId) {
                 const Node& next = tree.nodes[children[j]];
                 if (!isHexNode(next.kind)) break;
                 int nextSize = next.byteSize();
-                // Allow gaps within the run (they become part of the pad)
-                if (next.offset < runEnd) break;  // overlap — stop merging
+                if (next.offset < runEnd) break;
                 runEnd = next.offset + nextSize;
                 j++;
             }
@@ -219,10 +232,53 @@ static void emitStructBody(GenContext& ctx, uint64_t structId) {
 
         // Emit the field
         if (child.kind == NodeKind::Struct) {
-            emitStruct(ctx, child.id);
-            QString typeName = ctx.structName(child);
-            QString fieldName = sanitizeIdent(child.name);
-            ctx.output += QStringLiteral("    %1 %2;%3\n").arg(typeName, fieldName, offsetComment(child.offset));
+            // Bitfield container — emit inline bitfield members
+            if (child.classKeyword == QStringLiteral("bitfield")
+                && !child.bitfieldMembers.isEmpty()) {
+                QString bfType = ctx.cType(child.elementKind);
+                if (bfType.isEmpty()) bfType = QStringLiteral("uint32_t");
+                QString fieldName = child.name.isEmpty()
+                    ? QString() : QStringLiteral(" ") + sanitizeIdent(child.name);
+                ctx.output += ind + QStringLiteral("struct\n");
+                ctx.output += ind + QStringLiteral("{\n");
+                QString bfInd = indent(depth + 1);
+                for (const auto& m : child.bitfieldMembers) {
+                    ctx.output += bfInd + bfType + QStringLiteral(" ")
+                        + sanitizeIdent(m.name) + QStringLiteral(" : ")
+                        + QString::number(m.bitWidth) + QStringLiteral(";")
+                        + offsetComment(baseOffset + child.offset)
+                        + QStringLiteral("\n");
+                }
+                ctx.output += ind + QStringLiteral("}") + fieldName + QStringLiteral(";")
+                    + offsetComment(baseOffset + child.offset) + QStringLiteral("\n");
+            } else {
+
+            bool isAnonymous = child.structTypeName.isEmpty();
+
+            if (isAnonymous) {
+                // Inline anonymous struct/union
+                QString kw = child.resolvedClassKeyword();
+                ctx.output += ind + kw + QStringLiteral("\n");
+                ctx.output += ind + QStringLiteral("{\n");
+                bool childIsUnion = (kw == QStringLiteral("union"));
+                emitStructBody(ctx, child.id, childIsUnion, depth + 1,
+                               baseOffset + child.offset);
+                QString fieldName = child.name.isEmpty()
+                    ? QString() : QStringLiteral(" ") + sanitizeIdent(child.name);
+                ctx.output += ind + QStringLiteral("}") + fieldName + QStringLiteral(";")
+                    + offsetComment(baseOffset + child.offset) + QStringLiteral("\n");
+            } else {
+                // Named struct — reference by name with struct keyword prefix
+                QString kw = child.resolvedClassKeyword();
+                if (kw == QStringLiteral("enum") && child.enumMembers.isEmpty())
+                    kw = QStringLiteral("struct");
+                QString typeName = sanitizeIdent(child.structTypeName);
+                QString fieldName = sanitizeIdent(child.name);
+                ctx.output += ind + kw + QStringLiteral(" ") + typeName
+                    + QStringLiteral(" ") + fieldName + QStringLiteral(";")
+                    + offsetComment(baseOffset + child.offset) + QStringLiteral("\n");
+            }
+            } // end bitfield else
         } else if (child.kind == NodeKind::Array) {
             QVector<int> arrayKids = ctx.childMap.value(child.id);
             bool hasStructChild = false;
@@ -231,7 +287,6 @@ static void emitStructBody(GenContext& ctx, uint64_t structId) {
             for (int ak : arrayKids) {
                 if (tree.nodes[ak].kind == NodeKind::Struct) {
                     hasStructChild = true;
-                    emitStruct(ctx, tree.nodes[ak].id);
                     elemTypeName = ctx.structName(tree.nodes[ak]);
                     break;
                 }
@@ -239,14 +294,16 @@ static void emitStructBody(GenContext& ctx, uint64_t structId) {
 
             QString fieldName = sanitizeIdent(child.name);
             if (hasStructChild && !elemTypeName.isEmpty()) {
-                ctx.output += QStringLiteral("    %1 %2[%3];%4\n")
-                    .arg(elemTypeName, fieldName).arg(child.arrayLen).arg(offsetComment(child.offset));
+                ctx.output += ind + QStringLiteral("struct %1 %2[%3];%4\n")
+                    .arg(elemTypeName, fieldName).arg(child.arrayLen)
+                    .arg(offsetComment(baseOffset + child.offset));
             } else {
-                ctx.output += QStringLiteral("    %1 %2[%3];%4\n")
-                    .arg(ctx.cType(child.elementKind), fieldName).arg(child.arrayLen).arg(offsetComment(child.offset));
+                ctx.output += ind + QStringLiteral("%1 %2[%3];%4\n")
+                    .arg(ctx.cType(child.elementKind), fieldName).arg(child.arrayLen)
+                    .arg(offsetComment(baseOffset + child.offset));
             }
         } else {
-            ctx.output += emitField(ctx, child) + QStringLiteral("\n");
+            ctx.output += emitField(ctx, child, depth, baseOffset) + QStringLiteral("\n");
         }
 
         int childEnd = child.offset + childSize;
@@ -254,12 +311,20 @@ static void emitStructBody(GenContext& ctx, uint64_t structId) {
         i++;
     }
 
-    // Tail padding
-    if (cursor < structSize)
+    // Tail padding (skip for unions)
+    if (!isUnion && cursor < structSize)
         emitPadRun(cursor, structSize - cursor);
+
+    // Emit static field comments (static fields are runtime-only, not part of struct layout)
+    for (int si : staticIdxs) {
+        const Node& sf = tree.nodes[si];
+        QString sfType = sf.structTypeName.isEmpty() ? ctx.cType(sf.kind) : sf.structTypeName;
+        ctx.output += ind + QStringLiteral("// static: %1 %2 @ %3\n")
+            .arg(sfType, sanitizeIdent(sf.name), sf.offsetExpr);
+    }
 }
 
-// ── Emit a complete struct definition ──
+// ── Emit a complete top-level struct definition (Vergilius-style) ──
 
 static void emitStruct(GenContext& ctx, uint64_t structId) {
     if (ctx.emittedIds.contains(structId)) return;
@@ -275,19 +340,12 @@ static void emitStruct(GenContext& ctx, uint64_t structId) {
         return;
     }
 
-    // For arrays, we don't emit a top-level struct — the array itself
-    // is a field inside its parent.  But we do emit struct element types.
     if (node.kind == NodeKind::Array) {
-        QVector<int> kids = ctx.childMap.value(structId);
-        for (int ki : kids) {
-            if (ctx.tree.nodes[ki].kind == NodeKind::Struct)
-                emitStruct(ctx, ctx.tree.nodes[ki].id);
-        }
         ctx.visiting.remove(structId);
         return;
     }
 
-    // Deduplicate by struct type name (different nodes may share the same type)
+    // Deduplicate by struct type name
     QString typeName = ctx.structName(node);
     if (ctx.emittedTypeNames.contains(typeName)) {
         ctx.emittedIds.insert(structId);
@@ -295,47 +353,39 @@ static void emitStruct(GenContext& ctx, uint64_t structId) {
         return;
     }
 
-    // Emit nested struct types first (dependency order)
-    QVector<int> children = ctx.childMap.value(structId);
-    for (int ci : children) {
-        const Node& child = ctx.tree.nodes[ci];
-        if (child.kind == NodeKind::Struct)
-            emitStruct(ctx, child.id);
-        else if (child.kind == NodeKind::Array) {
-            QVector<int> arrayKids = ctx.childMap.value(child.id);
-            for (int ak : arrayKids) {
-                if (ctx.tree.nodes[ak].kind == NodeKind::Struct)
-                    emitStruct(ctx, ctx.tree.nodes[ak].id);
-            }
-        }
-        // Forward-declare pointer target types if they're outside this subtree
-        if (child.kind == NodeKind::Pointer64 && child.refId != 0) {
-            int refIdx = ctx.tree.indexOfId(child.refId);
-            if (refIdx >= 0 && !ctx.emittedIds.contains(child.refId)
-                && !ctx.forwardDeclared.contains(child.refId)) {
-                QString fwdName = ctx.structName(ctx.tree.nodes[refIdx]);
-                QString fwdKw = ctx.tree.nodes[refIdx].resolvedClassKeyword();
-                if (fwdKw == QStringLiteral("enum")) fwdKw = QStringLiteral("struct");
-                ctx.output += QStringLiteral("%1 %2;\n").arg(fwdKw, fwdName);
-                ctx.forwardDeclared.insert(child.refId);
-            }
-        }
-    }
-
     ctx.emittedIds.insert(structId);
     ctx.emittedTypeNames.insert(typeName);
     int structSize = ctx.tree.structSpan(structId, &ctx.childMap);
 
     QString kw = node.resolvedClassKeyword();
-    if (kw == QStringLiteral("enum")) kw = QStringLiteral("struct");  // enum is cosmetic
-    ctx.output += QStringLiteral("%1 %2 {\n").arg(kw, typeName);
 
-    emitStructBody(ctx, structId);
+    // Enum with members: emit as proper C enum
+    if (kw == QStringLiteral("enum") && !node.enumMembers.isEmpty()) {
+        ctx.output += QStringLiteral("enum %1 {\n").arg(typeName);
+        for (const auto& m : node.enumMembers) {
+            ctx.output += QStringLiteral("    %1 = %2,\n")
+                .arg(sanitizeIdent(m.first))
+                .arg(m.second);
+        }
+        ctx.output += QStringLiteral("};\n\n");
+        ctx.visiting.remove(structId);
+        return;
+    }
 
-    ctx.output += QStringLiteral("};\n");
-    ctx.output += QStringLiteral("static_assert(sizeof(%1) == 0x%2, \"Size mismatch for %1\");\n\n")
-        .arg(typeName)
-        .arg(QString::number(structSize, 16).toUpper());
+    if (kw == QStringLiteral("enum")) kw = QStringLiteral("struct");
+
+    ctx.output += kw + QStringLiteral(" ") + typeName + QStringLiteral("\n{\n");
+
+    emitStructBody(ctx, structId, kw == QStringLiteral("union"), 1, 0);
+
+    ctx.output += QStringLiteral("};")
+        + offsetComment(structSize, true)
+        + QStringLiteral("\n");
+    if (ctx.emitAsserts)
+        ctx.output += QStringLiteral("static_assert(sizeof(%1) == 0x%2, \"Size mismatch for %1\");\n")
+            .arg(typeName)
+            .arg(QString::number(structSize, 16).toUpper());
+    ctx.output += QStringLiteral("\n");
 
     ctx.visiting.remove(structId);
 }
@@ -389,14 +439,15 @@ static QString alignComments(const QString& raw) {
 // ── Public API ──
 
 QString renderCpp(const NodeTree& tree, uint64_t rootStructId,
-                  const QHash<NodeKind, QString>* typeAliases) {
+                  const QHash<NodeKind, QString>* typeAliases,
+                  bool emitAsserts) {
     int idx = tree.indexOfId(rootStructId);
     if (idx < 0) return {};
 
     const Node& root = tree.nodes[idx];
     if (root.kind != NodeKind::Struct) return {};
 
-    GenContext ctx{tree, buildChildMap(tree), {}, {}, {}, {}, {}, 0, typeAliases};
+    GenContext ctx{tree, buildChildMap(tree), {}, {}, {}, {}, {}, 0, typeAliases, emitAsserts};
 
     ctx.output += QStringLiteral("#pragma once\n\n");
 
@@ -406,8 +457,9 @@ QString renderCpp(const NodeTree& tree, uint64_t rootStructId,
 }
 
 QString renderCppAll(const NodeTree& tree,
-                     const QHash<NodeKind, QString>* typeAliases) {
-    GenContext ctx{tree, buildChildMap(tree), {}, {}, {}, {}, {}, 0, typeAliases};
+                     const QHash<NodeKind, QString>* typeAliases,
+                     bool emitAsserts) {
+    GenContext ctx{tree, buildChildMap(tree), {}, {}, {}, {}, {}, 0, typeAliases, emitAsserts};
 
     ctx.output += QStringLiteral("#pragma once\n\n");
 

src/generator.h

@@ -9,11 +9,13 @@ namespace rcx {
 // Generate C++ struct definitions for a single root struct and all
 // nested/referenced types reachable from it.
 QString renderCpp(const NodeTree& tree, uint64_t rootStructId,
-                  const QHash<NodeKind, QString>* typeAliases = nullptr);
+                  const QHash<NodeKind, QString>* typeAliases = nullptr,
+                  bool emitAsserts = false);
 
 // Generate C++ struct definitions for every root-level struct (full SDK).
 QString renderCppAll(const NodeTree& tree,
-                     const QHash<NodeKind, QString>* typeAliases = nullptr);
+                     const QHash<NodeKind, QString>* typeAliases = nullptr,
+                     bool emitAsserts = false);
 
 // Null generator placeholder (returns empty string).
 QString renderNull(const NodeTree& tree, uint64_t rootStructId);

src/imports/export_reclass_xml.cpp

@@ -115,6 +115,24 @@ bool exportReclassXml(const NodeTree& tree, const QString& filePath, QString* er
         while (i < children.size()) {
             const Node& child = tree.nodes[children[i]];
 
+            // Bitfield container: export as hex node (ReClassEx has no bitfield concept)
+            if (child.kind == NodeKind::Struct
+                && child.resolvedClassKeyword() == QStringLiteral("bitfield")) {
+                int sz = child.byteSize();
+                if (sz <= 0) sz = 4;
+                xml.writeStartElement(QStringLiteral("Node"));
+                xml.writeAttribute(QStringLiteral("Name"), child.name);
+                NodeKind hexKind = (sz <= 1) ? NodeKind::Hex8 : (sz <= 2) ? NodeKind::Hex16
+                    : (sz <= 4) ? NodeKind::Hex32 : NodeKind::Hex64;
+                xml.writeAttribute(QStringLiteral("Type"), QString::number(xmlTypeForKind(hexKind)));
+                xml.writeAttribute(QStringLiteral("Size"), QString::number(sz));
+                xml.writeAttribute(QStringLiteral("bHidden"), QStringLiteral("false"));
+                xml.writeAttribute(QStringLiteral("Comment"), QStringLiteral("bitfield"));
+                xml.writeEndElement();
+                i++;
+                continue;
+            }
+
             // Collapse consecutive hex nodes into a single Custom node (Type=21)
             if (isHexNode(child.kind)) {
                 int runStart = child.offset;

src/imports/import_pdb.cpp

@@ -7,6 +7,7 @@
 #include <QHash>
 #include <QPair>
 #include <QSet>
+#include <QDebug>
 
 // ── RawPDB headers ──
 #include "PDB.h"
@@ -232,10 +233,16 @@ struct PdbCtx {
     NodeTree tree;
     const TypeTable* tt = nullptr;
     QHash<uint32_t, uint64_t> typeCache; // typeIndex → nodeId
+    QHash<QString, uint32_t> structDefByName; // struct/class definition name → typeIndex
+    QHash<QString, uint32_t> unionDefByName;  // union definition name → typeIndex
+    bool udtDefIndexBuilt = false;
 
     uint64_t importUDT(uint32_t typeIndex);
+    uint64_t importEnum(uint32_t typeIndex);
     void importFieldList(uint32_t fieldListIndex, uint64_t parentId);
     void importMemberType(uint32_t typeIndex, int offset, const QString& name, uint64_t parentId);
+    void buildUdtDefinitionIndex();
+    uint32_t findUdtDefinitionIndex(TRK kind, const char* typeName);
 
     // Resolve LF_MODIFIER chain to underlying type index
     uint32_t unwrapModifier(uint32_t typeIndex) const {
@@ -248,6 +255,56 @@ struct PdbCtx {
     }
 };
 
+void PdbCtx::buildUdtDefinitionIndex() {
+    if (udtDefIndexBuilt || !tt) return;
+    udtDefIndexBuilt = true;
+
+    for (uint32_t ti = tt->firstIndex(); ti < tt->lastIndex(); ti++) {
+        const auto* rec = tt->get(ti);
+        if (!rec) continue;
+
+        bool isUnion = false;
+        bool isFwd = false;
+        const char* candidateName = nullptr;
+
+        if (rec->header.kind == TRK::LF_UNION) {
+            isUnion = true;
+            isFwd = rec->data.LF_UNION.property.fwdref;
+            candidateName = leafName(rec->data.LF_UNION.data, unionLeafKind(rec->data.LF_UNION.data));
+        } else if (rec->header.kind == TRK::LF_STRUCTURE || rec->header.kind == TRK::LF_CLASS) {
+            isFwd = rec->data.LF_CLASS.property.fwdref;
+            candidateName = leafName(rec->data.LF_CLASS.data, rec->data.LF_CLASS.lfEasy.kind);
+        } else {
+            continue;
+        }
+
+        if (isFwd || !candidateName || candidateName[0] == '\0') continue;
+
+        QString qname = QString::fromUtf8(candidateName);
+        QHash<QString, uint32_t>& lookup = isUnion ? unionDefByName : structDefByName;
+        if (!lookup.contains(qname)) lookup.insert(qname, ti);
+    }
+}
+
+uint32_t PdbCtx::findUdtDefinitionIndex(TRK kind, const char* typeName) {
+    if (!typeName || typeName[0] == '\0') return 0;
+
+    buildUdtDefinitionIndex();
+
+    const QString qname = QString::fromUtf8(typeName);
+    if (kind == TRK::LF_UNION) {
+        auto it = unionDefByName.constFind(qname);
+        return (it != unionDefByName.cend()) ? it.value() : 0;
+    }
+
+    if (kind == TRK::LF_STRUCTURE || kind == TRK::LF_CLASS) {
+        auto it = structDefByName.constFind(qname);
+        return (it != structDefByName.cend()) ? it.value() : 0;
+    }
+
+    return 0;
+}
+
 uint64_t PdbCtx::importUDT(uint32_t typeIndex) {
     if (typeIndex < tt->firstIndex()) return 0;
 
@@ -300,12 +357,66 @@ uint64_t PdbCtx::importUDT(uint32_t typeIndex) {
     return nodeId;
 }
 
+uint64_t PdbCtx::importEnum(uint32_t typeIndex) {
+    if (typeIndex < tt->firstIndex()) return 0;
+
+    auto it = typeCache.find(typeIndex);
+    if (it != typeCache.end()) return it.value();
+
+    const auto* rec = tt->get(typeIndex);
+    if (!rec || rec->header.kind != TRK::LF_ENUM) return 0;
+    if (rec->data.LF_ENUM.property.fwdref) return 0;
+
+    QString qname = rec->data.LF_ENUM.name
+        ? QString::fromUtf8(rec->data.LF_ENUM.name)
+        : QStringLiteral("<anon>");
+
+    Node s;
+    s.kind = NodeKind::Struct;
+    s.name = qname;
+    s.structTypeName = qname;
+    s.classKeyword = QStringLiteral("enum");
+    s.parentId = 0;
+    s.collapsed = true;
+
+    // Extract enum members from field list
+    uint32_t fieldListIndex = rec->data.LF_ENUM.field;
+    const auto* flRec = tt->get(fieldListIndex);
+    if (flRec && flRec->header.kind == TRK::LF_FIELDLIST) {
+        auto maxSize = flRec->header.size - sizeof(uint16_t);
+        for (size_t i = 0; i < maxSize; ) {
+            auto* field = reinterpret_cast<const PDB::CodeView::TPI::FieldList*>(
+                reinterpret_cast<const uint8_t*>(&flRec->data.LF_FIELD.list) + i);
+            if (field->kind != TRK::LF_ENUMERATE) break;
+
+            int64_t val = static_cast<int64_t>(leafValue(
+                field->data.LF_ENUMERATE.value,
+                field->data.LF_ENUMERATE.lfEasy.kind));
+            const char* eName = leafName(
+                field->data.LF_ENUMERATE.value,
+                field->data.LF_ENUMERATE.lfEasy.kind);
+            if (eName)
+                s.enumMembers.append({QString::fromUtf8(eName), val});
+
+            i += static_cast<size_t>(eName - reinterpret_cast<const char*>(field));
+            i += strnlen(eName, maxSize - i - 1) + 1;
+            i = (i + 3) & ~size_t(3);
+        }
+    }
+
+    int idx = tree.addNode(s);
+    uint64_t nodeId = tree.nodes[idx].id;
+    typeCache[typeIndex] = nodeId;
+    return nodeId;
+}
+
 void PdbCtx::importFieldList(uint32_t fieldListIndex, uint64_t parentId) {
     const auto* rec = tt->get(fieldListIndex);
     if (!rec || rec->header.kind != TRK::LF_FIELDLIST) return;
 
     auto maximumSize = rec->header.size - sizeof(uint16_t);
     QSet<QPair<int,int>> bitfieldSlots;
+    QHash<QPair<int,int>, uint64_t> bitfieldNodeIds;
 
     for (size_t i = 0; i < maximumSize; ) {
         auto* field = reinterpret_cast<const PDB::CodeView::TPI::FieldList*>(
@@ -331,7 +442,7 @@ void PdbCtx::importFieldList(uint32_t fieldListIndex, uint64_t parentId) {
             if (typeRec && typeRec->header.kind == TRK::LF_BITFIELD) {
                 uint32_t underlying = typeRec->data.LF_BITFIELD.type;
                 uint8_t bitLen = typeRec->data.LF_BITFIELD.length;
-                (void)bitLen;
+                uint8_t bitPos = typeRec->data.LF_BITFIELD.position;
 
                 // Determine slot size from underlying type
                 uint64_t slotSize = 4;
@@ -343,12 +454,26 @@ void PdbCtx::importFieldList(uint32_t fieldListIndex, uint64_t parentId) {
                 auto key = qMakePair((int)offset, (int)slotSize);
                 if (!bitfieldSlots.contains(key)) {
                     bitfieldSlots.insert(key);
+                    // Create bitfield container node
                     Node n;
-                    n.kind = hexForSize(slotSize);
-                    n.name = qname;
+                    n.kind = NodeKind::Struct;
+                    n.classKeyword = QStringLiteral("bitfield");
+                    n.elementKind = hexForSize(slotSize);
                     n.parentId = parentId;
                     n.offset = offset;
-                    tree.addNode(n);
+                    n.collapsed = false;
+                    int idx = tree.addNode(n);
+                    bitfieldNodeIds[key] = tree.nodes[idx].id;
+                }
+                // Add this member to the bitfield container
+                uint64_t bfNodeId = bitfieldNodeIds[key];
+                int bfIdx = tree.indexOfId(bfNodeId);
+                if (bfIdx >= 0) {
+                    BitfieldMember bm;
+                    bm.name = qname;
+                    bm.bitOffset = bitPos;
+                    bm.bitWidth = bitLen;
+                    tree.nodes[bfIdx].bitfieldMembers.append(bm);
                 }
             } else {
                 importMemberType(memberType, offset, qname, parentId);
@@ -522,7 +647,6 @@ void PdbCtx::importMemberType(uint32_t typeIndex, int offset, const QString& nam
                         isFwd = pointeeRec->data.LF_CLASS.property.fwdref;
 
                     if (isFwd) {
-                        // Need to find the non-fwdref definition by name
                         const char* typeName = nullptr;
                         if (pointeeRec->header.kind == TRK::LF_UNION)
                             typeName = leafName(pointeeRec->data.LF_UNION.data, unionLeafKind(pointeeRec->data.LF_UNION.data));
@@ -530,30 +654,24 @@ void PdbCtx::importMemberType(uint32_t typeIndex, int offset, const QString& nam
                             typeName = leafName(pointeeRec->data.LF_CLASS.data,
                                                pointeeRec->data.LF_CLASS.lfEasy.kind);
 
-                        if (typeName) {
-                            // Linear scan for the definition (cached after first import)
-                            for (uint32_t ti = tt->firstIndex(); ti < tt->lastIndex(); ti++) {
-                                const auto* candidate = tt->get(ti);
-                                if (!candidate) continue;
-                                if (candidate->header.kind != pointeeRec->header.kind) continue;
-                                bool candidateFwd;
-                                const char* candidateName;
-                                if (candidate->header.kind == TRK::LF_UNION) {
-                                    candidateFwd = candidate->data.LF_UNION.property.fwdref;
-                                    candidateName = leafName(candidate->data.LF_UNION.data, unionLeafKind(candidate->data.LF_UNION.data));
-                                } else {
-                                    candidateFwd = candidate->data.LF_CLASS.property.fwdref;
-                                    candidateName = leafName(candidate->data.LF_CLASS.data,
-                                                             candidate->data.LF_CLASS.lfEasy.kind);
-                                }
-                                if (!candidateFwd && candidateName && strcmp(candidateName, typeName) == 0) {
-                                    defIndex = ti;
-                                    break;
-                                }
-                            }
-                        }
+                        uint32_t resolved = findUdtDefinitionIndex(pointeeRec->header.kind, typeName);
+                        if (resolved != 0) defIndex = resolved;
                     }
-                    n.refId = importUDT(defIndex);
+                    // Skip anonymous pointer targets — they'd create root orphans
+                    const char* ptName = nullptr;
+                    const auto* defRec2 = tt->get(defIndex);
+                    if (defRec2) {
+                        if (defRec2->header.kind == TRK::LF_UNION)
+                            ptName = leafName(defRec2->data.LF_UNION.data,
+                                              unionLeafKind(defRec2->data.LF_UNION.data));
+                        else if (defRec2->header.kind == TRK::LF_STRUCTURE ||
+                                 defRec2->header.kind == TRK::LF_CLASS)
+                            ptName = leafName(defRec2->data.LF_CLASS.data,
+                                              defRec2->data.LF_CLASS.lfEasy.kind);
+                    }
+                    bool isAnonTarget = !ptName || ptName[0] == '<' || ptName[0] == '\0';
+                    if (!isAnonTarget)
+                        n.refId = importUDT(defIndex);
                 } else if (pointeeRec->header.kind == TRK::LF_PROCEDURE ||
                            pointeeRec->header.kind == TRK::LF_MFUNCTION) {
                     n.kind = (ptrSize <= 4) ? NodeKind::FuncPtr32 : NodeKind::FuncPtr64;
@@ -584,31 +702,10 @@ void PdbCtx::importMemberType(uint32_t typeIndex, int offset, const QString& nam
             else
                 typeName = leafName(rec->data.LF_CLASS.data, rec->data.LF_CLASS.lfEasy.kind);
 
-            if (typeName) {
-                for (uint32_t ti = tt->firstIndex(); ti < tt->lastIndex(); ti++) {
-                    const auto* candidate = tt->get(ti);
-                    if (!candidate) continue;
-                    if (candidate->header.kind != rec->header.kind) continue;
-                    bool candidateFwd;
-                    const char* candidateName;
-                    if (candidate->header.kind == TRK::LF_UNION) {
-                        candidateFwd = candidate->data.LF_UNION.property.fwdref;
-                        candidateName = leafName(candidate->data.LF_UNION.data, unionLeafKind(candidate->data.LF_UNION.data));
-                    } else {
-                        candidateFwd = candidate->data.LF_CLASS.property.fwdref;
-                        candidateName = leafName(candidate->data.LF_CLASS.data,
-                                                 candidate->data.LF_CLASS.lfEasy.kind);
-                    }
-                    if (!candidateFwd && candidateName && strcmp(candidateName, typeName) == 0) {
-                        defIndex = ti;
-                        break;
-                    }
-                }
-            }
+            uint32_t resolved = findUdtDefinitionIndex(rec->header.kind, typeName);
+            if (resolved != 0) defIndex = resolved;
         }
 
-        uint64_t refId = importUDT(defIndex);
-
         const char* typeName = nullptr;
         bool isUnion = (rec->header.kind == TRK::LF_UNION);
         if (isUnion)
@@ -616,6 +713,38 @@ void PdbCtx::importMemberType(uint32_t typeIndex, int offset, const QString& nam
         else
             typeName = leafName(rec->data.LF_CLASS.data, rec->data.LF_CLASS.lfEasy.kind);
 
+        // Anonymous types: inline fields directly instead of creating root orphan
+        bool isAnonymous = !typeName || typeName[0] == '<' || typeName[0] == '\0';
+        if (isAnonymous) {
+            // Resolve to definition if needed
+            const auto* defRec = tt->get(defIndex);
+            uint32_t fieldListIdx = 0;
+            if (defRec) {
+                if (defRec->header.kind == TRK::LF_UNION)
+                    fieldListIdx = defRec->data.LF_UNION.field;
+                else if (defRec->header.kind == TRK::LF_STRUCTURE ||
+                         defRec->header.kind == TRK::LF_CLASS)
+                    fieldListIdx = defRec->data.LF_CLASS.field;
+            }
+            if (fieldListIdx != 0) {
+                // Create inline container (no refId, no root orphan)
+                Node n;
+                n.kind = NodeKind::Struct;
+                n.name = name;
+                n.classKeyword = isUnion ? QStringLiteral("union") : QStringLiteral("struct");
+                n.parentId = parentId;
+                n.offset = offset;
+                n.collapsed = true;
+                int idx = tree.addNode(n);
+                uint64_t inlineId = tree.nodes[idx].id;
+                importFieldList(fieldListIdx, inlineId);
+                break;
+            }
+            // Fallthrough if no field list
+        }
+
+        uint64_t refId = importUDT(defIndex);
+
         Node n;
         n.kind = NodeKind::Struct;
         n.name = name;
@@ -707,8 +836,9 @@ void PdbCtx::importMemberType(uint32_t typeIndex, int offset, const QString& nam
     }
 
     case TRK::LF_ENUM: {
-        // Map enum to its underlying integer type
+        // Map enum to its underlying integer type, link to enum definition
         uint32_t utype = rec->data.LF_ENUM.utype;
+        uint64_t enumNodeId = importEnum(typeIndex);
         Node n;
         if (utype < tt->firstIndex()) {
             n.kind = mapPrimitiveType(utype);
@@ -718,6 +848,7 @@ void PdbCtx::importMemberType(uint32_t typeIndex, int offset, const QString& nam
         n.name = name;
         n.parentId = parentId;
         n.offset = offset;
+        n.refId = enumNodeId;
         tree.addNode(n);
         break;
     }
@@ -735,16 +866,21 @@ void PdbCtx::importMemberType(uint32_t typeIndex, int offset, const QString& nam
 
     case TRK::LF_BITFIELD: {
         uint32_t underlying = rec->data.LF_BITFIELD.type;
+        uint8_t bitLen = rec->data.LF_BITFIELD.length;
+        uint8_t bitPos = rec->data.LF_BITFIELD.position;
         uint64_t slotSize = 4;
         if (underlying < tt->firstIndex()) {
             NodeKind k = mapPrimitiveType(underlying);
             slotSize = sizeForKind(k);
         }
         Node n;
-        n.kind = hexForSize(slotSize);
+        n.kind = NodeKind::Struct;
+        n.classKeyword = QStringLiteral("bitfield");
+        n.elementKind = hexForSize(slotSize);
         n.name = name;
         n.parentId = parentId;
         n.offset = offset;
+        n.bitfieldMembers.append({name, bitPos, bitLen});
         tree.addNode(n);
         break;
     }
@@ -823,14 +959,27 @@ QVector<PdbTypeInfo> enumeratePdbTypes(const QString& pdbPath, QString* errorMsg
         bool isUDT = (rec->header.kind == TRK::LF_STRUCTURE ||
                       rec->header.kind == TRK::LF_CLASS ||
                       rec->header.kind == TRK::LF_UNION);
-        if (!isUDT) continue;
+        bool isEnum = (rec->header.kind == TRK::LF_ENUM);
+        if (!isUDT && !isEnum) continue;
 
         const char* name = nullptr;
         uint16_t fieldCount = 0;
         bool isUnion = false;
         uint64_t size = 0;
 
-        if (rec->header.kind == TRK::LF_UNION) {
+        if (isEnum) {
+            if (rec->data.LF_ENUM.property.fwdref) continue;
+            fieldCount = rec->data.LF_ENUM.count;
+            name = rec->data.LF_ENUM.name;
+            // Size from underlying type
+            uint32_t ut = rec->data.LF_ENUM.utype;
+            if (ut < tt.firstIndex()) {
+                NodeKind ek = mapPrimitiveType(ut);
+                size = sizeForKind(ek);
+            } else {
+                size = 4;
+            }
+        } else if (rec->header.kind == TRK::LF_UNION) {
             if (rec->data.LF_UNION.property.fwdref) continue;
             isUnion = true;
             fieldCount = rec->data.LF_UNION.count;
@@ -856,9 +1005,16 @@ QVector<PdbTypeInfo> enumeratePdbTypes(const QString& pdbPath, QString* errorMsg
         info.size = size;
         info.childCount = fieldCount;
         info.isUnion = isUnion;
+        info.isEnum = isEnum;
         result.append(info);
     }
 
+    int enumCount = 0;
+    for (const auto& r : result)
+        if (r.isEnum) enumCount++;
+    qDebug() << "[PDB] enumeratePdbTypes:" << result.size() << "types,"
+             << enumCount << "enums";
+
     return result;
 }
 
@@ -875,14 +1031,34 @@ NodeTree importPdbSelected(const QString& pdbPath,
     ctx.tt = pdb.typeTable;
 
     int total = typeIndices.size();
+    int enumDispatched = 0, enumCreated = 0;
     for (int i = 0; i < total; i++) {
-        ctx.importUDT(typeIndices[i]);
+        uint32_t ti = typeIndices[i];
+        const auto* rec = pdb.typeTable->get(ti);
+        if (rec && rec->header.kind == TRK::LF_ENUM) {
+            enumDispatched++;
+            uint64_t id = ctx.importEnum(ti);
+            if (id != 0) enumCreated++;
+            else qDebug() << "[PDB] importEnum FAILED for typeIndex" << ti;
+        } else {
+            ctx.importUDT(ti);
+        }
         if (progressCb && !progressCb(i + 1, total)) {
             if (errorMsg) *errorMsg = QStringLiteral("Import cancelled");
             return ctx.tree; // return partial result
         }
     }
 
+    // Count enum nodes in tree
+    int enumNodes = 0;
+    for (const auto& n : ctx.tree.nodes)
+        if (n.classKeyword == QLatin1String("enum")) enumNodes++;
+    qDebug() << "[PDB] importPdbSelected:" << total << "types,"
+             << enumDispatched << "enum dispatches,"
+             << enumCreated << "enum created,"
+             << enumNodes << "enum nodes in tree,"
+             << ctx.tree.nodes.size() << "total nodes";
+
     if (ctx.tree.nodes.isEmpty()) {
         if (errorMsg) *errorMsg = QStringLiteral("No types imported");
     }

src/imports/import_pdb.h

@@ -7,10 +7,11 @@ namespace rcx {
 
 struct PdbTypeInfo {
     uint32_t typeIndex;      // TPI type index
-    QString  name;           // struct/class/union name
+    QString  name;           // struct/class/union/enum name
     uint64_t size;           // sizeof in bytes
     int      childCount;     // direct member count
     bool     isUnion;        // union vs struct/class
+    bool     isEnum = false; // enum type
 };
 
 // Phase 1: Enumerate all UDT types in the PDB (fast scan, no recursive import).

src/imports/import_reclass_xml.cpp

@@ -80,15 +80,19 @@ static const struct { int xmlType; NodeKind kind; } kTypeMap2013[] = {
     { 30, NodeKind::Array },      // ClassPointerArray
 };
 
-static NodeKind lookupKind(int xmlType, XmlVersion ver) {
+static NodeKind lookupKind(int xmlType, XmlVersion ver, int ptrSize = 8) {
+    NodeKind k = NodeKind::Hex8;
     if (ver == XmlVersion::V2016) {
         for (const auto& e : kTypeMap2016)
-            if (e.xmlType == xmlType) return e.kind;
+            if (e.xmlType == xmlType) { k = e.kind; break; }
     } else {
         for (const auto& e : kTypeMap2013)
-            if (e.xmlType == xmlType) return e.kind;
+            if (e.xmlType == xmlType) { k = e.kind; break; }
     }
-    return NodeKind::Hex8; // fallback
+    // Remap pointer types for 32-bit targets
+    if (ptrSize < 8 && k == NodeKind::Pointer64)
+        k = NodeKind::Pointer32;
+    return k;
 }
 
 // Is this XML type a pointer-like type that uses the "Pointer" attribute?
@@ -135,7 +139,7 @@ struct PendingRef {
     QString  className;
 };
 
-NodeTree importReclassXml(const QString& filePath, QString* errorMsg) {
+NodeTree importReclassXml(const QString& filePath, QString* errorMsg, int pointerSize) {
     qDebug() << "[ImportXML] Opening file:" << filePath;
 
     QFile file(filePath);
@@ -152,6 +156,7 @@ NodeTree importReclassXml(const QString& filePath, QString* errorMsg) {
 
     NodeTree tree;
     tree.baseAddress = 0x00400000;
+    tree.pointerSize = pointerSize;
 
     // Class name → struct node ID (for pointer resolution)
     QHash<QString, uint64_t> classIds;
@@ -249,7 +254,7 @@ NodeTree importReclassXml(const QString& filePath, QString* errorMsg) {
                     continue;
                 }
 
-                NodeKind kind = lookupKind(xmlType, version);
+                NodeKind kind = lookupKind(xmlType, version, pointerSize);
 
                 // Handle ClassInstanceArray: read child <Array> element
                 if (isClassInstanceArrayType(xmlType, version)) {
@@ -371,7 +376,6 @@ NodeTree importReclassXml(const QString& filePath, QString* errorMsg) {
         auto it = classIds.find(ref.className);
         if (it != classIds.end()) {
             tree.nodes[nodeIdx].refId = it.value();
-            tree.invalidateIdCache();
             resolved++;
         } else {
             qDebug() << "[ImportXML] Unresolved ref:" << ref.className << "for node" << ref.nodeId;

src/imports/import_reclass_xml.h

@@ -5,7 +5,9 @@ namespace rcx {
 
 // Import a ReClass XML file (.reclass, .MemeCls, etc.) into a NodeTree.
 // Supports ReClassEx, MemeClsEx, ReClass 2011/2013/2016 XML formats.
+// pointerSize: 4 for 32-bit targets, 8 for 64-bit (default).
 // Returns an empty NodeTree on failure; populates errorMsg if non-null.
-NodeTree importReclassXml(const QString& filePath, QString* errorMsg = nullptr);
+NodeTree importReclassXml(const QString& filePath, QString* errorMsg = nullptr,
+                          int pointerSize = 8);
 
 } // namespace rcx

src/imports/import_source.h

@@ -7,7 +7,9 @@ namespace rcx {
 // Supports two modes (auto-detected):
 //   1. With comment offsets (// 0xNN) - trusts the offset values
 //   2. Without comment offsets - computes offsets from type sizes
+// pointerSize: 4 for 32-bit targets, 8 for 64-bit (default).
 // Returns an empty NodeTree on failure; populates errorMsg if non-null.
-NodeTree importFromSource(const QString& sourceCode, QString* errorMsg = nullptr);
+NodeTree importFromSource(const QString& sourceCode, QString* errorMsg = nullptr,
+                          int pointerSize = 8);
 
 } // namespace rcx

src/iplugin.h

@@ -66,7 +66,8 @@ struct PluginProcessInfo {
     QString name;
     QString path;
     QIcon icon;
-    
+    bool is32Bit = false;
+
     PluginProcessInfo() : pid(0) {}
     PluginProcessInfo(uint32_t p, const QString& n, const QString& pth = QString(), const QIcon& i = QIcon())
         : pid(p), name(n), path(pth), icon(i) {}

src/macos_titlebar.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <QWidget>
+
+namespace rcx {
+
+struct Theme;
+
+// Apply macOS native title bar color to match the theme.
+// No-op on non-macOS platforms (implementation is platform-specific).
+void applyMacTitleBarTheme(QWidget* window, const Theme& theme);
+
+} // namespace rcx

src/macos_titlebar.mm

@@ -0,0 +1,43 @@
+#include "macos_titlebar.h"
+#include "themes/theme.h"
+
+#import <Cocoa/Cocoa.h>
+#include <QColor>
+#include <QWidget>
+
+namespace rcx {
+
+static NSColor* toNSColor(const QColor& color) {
+    return [NSColor colorWithCalibratedRed:color.redF()
+                                     green:color.greenF()
+                                      blue:color.blueF()
+                                     alpha:color.alphaF()];
+}
+
+void applyMacTitleBarTheme(QWidget* window, const Theme& theme) {
+    if (!window) return;
+
+    // Ensure native window is created.
+    window->winId();
+
+    auto* nsView = reinterpret_cast<NSView*>(window->winId());
+    if (!nsView) return;
+
+    NSWindow* nsWindow = [nsView window];
+    if (!nsWindow) return;
+
+    // Keep native traffic lights while tinting the title bar to the theme.
+    // Match the title text contrast by selecting the appropriate system appearance.
+    const qreal luminance =
+        0.2126 * theme.background.redF() +
+        0.7152 * theme.background.greenF() +
+        0.0722 * theme.background.blueF();
+    const bool isLight = luminance >= 0.5;
+    [nsWindow setAppearance:[NSAppearance appearanceNamed:
+        (isLight ? NSAppearanceNameAqua : NSAppearanceNameDarkAqua)]];
+    [nsWindow setTitlebarAppearsTransparent:YES];
+    [nsWindow setTitleVisibility:NSWindowTitleVisible];
+    [nsWindow setBackgroundColor:toNSColor(theme.background)];
+}
+
+} // namespace rcx

src/mainwindow.h

@@ -2,29 +2,37 @@
 #include "controller.h"
 #include "titlebar.h"
 #include "pluginmanager.h"
+#include "scannerpanel.h"
+#include "startpage.h"
+#include "workspace_model.h"
 #include <QMainWindow>
-#include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QLabel>
 #include <QSplitter>
 #include <QTabWidget>
 #include <QDockWidget>
 #include <QTreeView>
 #include <QStandardItemModel>
+#include <QSortFilterProxyModel>
+#include <QLineEdit>
 #include <QMap>
 #include <QButtonGroup>
 #include <QPushButton>
+#include <QTimer>
 #include <Qsci/qsciscintilla.h>
 
 namespace rcx {
 
 class McpBridge;
+class ShimmerLabel;
+class DockGripWidget;
+class WorkspaceDelegate;
 
 class MainWindow : public QMainWindow {
     Q_OBJECT
     friend class McpBridge;
 public:
     explicit MainWindow(QWidget* parent = nullptr);
+    ~MainWindow() override;
 
 private slots:
     void newClass();
@@ -59,31 +67,45 @@ private slots:
     void showOptionsDialog();
 
 public:
+    // Status bar helpers — separate app / MCP channels
+    void setAppStatus(const QString& text);
+    void setAppStatus(const QString& text, const QString& dimSuffix);
+    void setMcpStatus(const QString& text);
+    void clearMcpStatus();
+
     // Project Lifecycle API
-    QMdiSubWindow* project_new(const QString& classKeyword = QString());
-    QMdiSubWindow* project_open(const QString& path = {});
-    bool project_save(QMdiSubWindow* sub = nullptr, bool saveAs = false);
-    void project_close(QMdiSubWindow* sub = nullptr);
+    QDockWidget* project_new(const QString& classKeyword = QString());
+    QDockWidget* project_open(const QString& path = {});
+    bool project_save(QDockWidget* dock = nullptr, bool saveAs = false);
+    void project_close(QDockWidget* dock = nullptr);
 
 private:
     enum ViewMode { VM_Reclass, VM_Rendered };
 
-    QMdiArea*       m_mdiArea;
-    QLabel*         m_statusLabel;
-    QButtonGroup*   m_viewBtnGroup = nullptr;
-    QPushButton*    m_btnReclass   = nullptr;
-    QPushButton*    m_btnRendered  = nullptr;
+    QWidget*        m_centralPlaceholder;
+    ShimmerLabel*   m_statusLabel;
+    QString         m_appStatus;
+    QString         m_appStatusDim;
+    bool            m_mcpBusy   = false;
+    QTimer*         m_mcpClearTimer = nullptr;
     TitleBarWidget* m_titleBar = nullptr;
+    QMenuBar*       m_menuBar = nullptr;
+    bool            m_menuBarTitleCase = false;
     QWidget*        m_borderOverlay = nullptr;
     PluginManager   m_pluginManager;
     McpBridge*      m_mcp       = nullptr;
     QAction*        m_mcpAction = nullptr;
+    QAction*        m_actRelOfs = nullptr;
     QMenu*          m_sourceMenu = nullptr;
+    QMenu*          m_recentFilesMenu = nullptr;
 
     struct SplitPane {
         QTabWidget*    tabWidget = nullptr;
         RcxEditor*     editor    = nullptr;
         QsciScintilla* rendered  = nullptr;
+        QLineEdit*     findBar   = nullptr;
+        QWidget*       findContainer = nullptr;
+        QWidget*       renderedContainer = nullptr;
         ViewMode       viewMode  = VM_Reclass;
         uint64_t       lastRenderedRootId = 0;
     };
@@ -95,22 +117,38 @@ private:
         QVector<SplitPane> panes;
         int                activePaneIdx = 0;
     };
-    QMap<QMdiSubWindow*, TabState> m_tabs;
+    QMap<QDockWidget*, TabState> m_tabs;
+    QVector<QDockWidget*> m_docDocks;       // ordered list for tabByIndex
+    QDockWidget* m_activeDocDock = nullptr;  // tracks active document dock
+    QDockWidget* m_sentinelDock  = nullptr;  // hidden dock to bootstrap tab bar creation
     QVector<RcxDocument*> m_allDocs;  // all open docs, shared with controllers
+    bool m_closingAll = false;        // guards spurious project_new during batch close
+    bool m_tabBarShowGuard = false;   // prevents recursion in event filter re-show
+    struct ClosingGuard {
+        bool& flag;
+        ClosingGuard(bool& f) : flag(f) { flag = true; }
+        ~ClosingGuard() { flag = false; }
+    };
     void rebuildAllDocs();
 
     void createMenus();
+    void applyMenuBarTitleCase(bool titleCase);
     void createStatusBar();
     void showPluginsDialog();
     void populateSourceMenu();
+    void addRecentFile(const QString& path);
+    void updateRecentFilesMenu();
     QIcon makeIcon(const QString& svgPath);
 
     RcxController* activeController() const;
     TabState* activeTab();
     TabState* tabByIndex(int index);
     int tabCount() const { return m_tabs.size(); }
-    QMdiSubWindow* createTab(RcxDocument* doc);
+    QDockWidget* createTab(RcxDocument* doc);
+    QString tabTitle(const TabState& tab) const;
+    void setupDockTabBars();
     void updateWindowTitle();
+    void closeAllDocDocks();
 
     void setViewMode(ViewMode mode);
     void updateRenderedView(TabState& tab, SplitPane& pane);
@@ -120,25 +158,46 @@ private:
 
     SplitPane createSplitPane(TabState& tab);
     void applyTheme(const Theme& theme);
-    void styleTabCloseButtons();
     void syncViewButtons(ViewMode mode);
     SplitPane* findPaneByTabWidget(QTabWidget* tw);
     SplitPane* findActiveSplitPane();
     RcxEditor* activePaneEditor();
 
     // Workspace dock
-    QDockWidget*        m_workspaceDock  = nullptr;
-    QTreeView*          m_workspaceTree  = nullptr;
-    QStandardItemModel* m_workspaceModel = nullptr;
-    QLabel*             m_dockTitleLabel = nullptr;
-    QToolButton*        m_dockCloseBtn   = nullptr;
+    QDockWidget*          m_workspaceDock   = nullptr;
+    QTreeView*            m_workspaceTree   = nullptr;
+    QStandardItemModel*   m_workspaceModel  = nullptr;
+    QSortFilterProxyModel* m_workspaceProxy = nullptr;
+    QLineEdit*            m_workspaceSearch = nullptr;
+    WorkspaceDelegate*    m_workspaceDelegate = nullptr;
+    QLabel*               m_dockTitleLabel  = nullptr;
+    QToolButton*          m_dockCloseBtn    = nullptr;
+    DockGripWidget*       m_dockGrip        = nullptr;
+    QSet<uint64_t>        m_pinnedIds;
     void createWorkspaceDock();
-    void rebuildWorkspaceModel();
+    void rebuildWorkspaceModel();       // debounced — safe to call frequently
+    void rebuildWorkspaceModelNow();    // immediate rebuild
+    QTimer*               m_workspaceRebuildTimer = nullptr;
+    QTimer*               m_workspaceSearchTimer  = nullptr;
     void updateBorderColor(const QColor& color);
 
+    // Scanner dock
+    QDockWidget*          m_scannerDock      = nullptr;
+    ScannerPanel*         m_scannerPanel     = nullptr;
+    QLabel*               m_scanDockTitle    = nullptr;
+    QToolButton*          m_scanDockCloseBtn = nullptr;
+    DockGripWidget*       m_scanDockGrip     = nullptr;
+    void createScannerDock();
+
+    // Start page
+    StartPageWidget*      m_startPage        = nullptr;
+    Q_INVOKABLE void showStartPage();
+    void dismissStartPage();
+
 protected:
     void changeEvent(QEvent* event) override;
     void resizeEvent(QResizeEvent* event) override;
+    bool eventFilter(QObject* obj, QEvent* event) override;
 };
 
 } // namespace rcx

src/mcp/mcp_bridge.cpp

@@ -4,18 +4,30 @@
 #include "generator.h"
 #include "mainwindow.h"
 #include <QCoreApplication>
+#include <QSettings>
 #include <QDebug>
 #include <cstring>
 
 namespace rcx {
 
+static constexpr int kMaxReadBuffer = 10 * 1024 * 1024; // 10 MB
+
 // ════════════════════════════════════════════════════════════════════
 // Construction / lifecycle
 // ════════════════════════════════════════════════════════════════════
 
 McpBridge::McpBridge(MainWindow* mainWindow, QObject* parent)
     : QObject(parent), m_mainWindow(mainWindow)
-{}
+{
+    m_notifyTimer = new QTimer(this);
+    m_notifyTimer->setSingleShot(true);
+    m_notifyTimer->setInterval(100);
+    connect(m_notifyTimer, &QTimer::timeout, this, [this]() {
+        if (m_client && m_initialized)
+            sendNotification("notifications/resources/updated",
+                             QJsonObject{{"uri", "project://tree"}});
+    });
+}
 
 McpBridge::~McpBridge() {
     stop();
@@ -83,15 +95,24 @@ void McpBridge::onNewConnection() {
 void McpBridge::onReadyRead() {
     m_readBuffer.append(m_client->readAll());
 
-    // Newline-delimited JSON framing
+    if (m_readBuffer.size() > kMaxReadBuffer) {
+        qWarning() << "[MCP] Read buffer exceeded 10MB, disconnecting client";
+        m_client->disconnectFromServer();
+        return;
+    }
+
+    // Newline-delimited JSON framing (cursor approach avoids quadratic shifting)
+    int consumed = 0;
     while (true) {
-        int idx = m_readBuffer.indexOf('\n');
+        int idx = m_readBuffer.indexOf('\n', consumed);
         if (idx < 0) break;
-        QByteArray line = m_readBuffer.left(idx).trimmed();
-        m_readBuffer.remove(0, idx + 1);
+        QByteArray line = m_readBuffer.mid(consumed, idx - consumed).trimmed();
+        consumed = idx + 1;
         if (!line.isEmpty())
             processLine(line);
     }
+    if (consumed > 0)
+        m_readBuffer.remove(0, consumed);
 }
 
 void McpBridge::onDisconnected() {
@@ -152,6 +173,7 @@ QJsonObject McpBridge::makeTextResult(const QString& text, bool isError) {
 // ════════════════════════════════════════════════════════════════════
 
 void McpBridge::processLine(const QByteArray& line) {
+  try {
     qDebug() << "[MCP] <<" << line.trimmed().left(200);
     auto doc = QJsonDocument::fromJson(line);
     if (!doc.isObject()) {
@@ -170,14 +192,26 @@ void McpBridge::processLine(const QByteArray& line) {
     }
 
     if (method == "initialize") {
+        m_mainWindow->setMcpStatus(QStringLiteral("MCP: client connected"));
         sendJson(handleInitialize(id, req.value("params").toObject()));
+        m_mainWindow->clearMcpStatus();
     } else if (method == "tools/list") {
+        m_mainWindow->setMcpStatus(QStringLiteral("MCP: tools/list"));
         sendJson(handleToolsList(id));
+        m_mainWindow->clearMcpStatus();
     } else if (method == "tools/call") {
         sendJson(handleToolsCall(id, req.value("params").toObject()));
     } else {
         sendJson(errReply(id, -32601, "Method not found: " + method));
     }
+  } catch (const std::exception& e) {
+    qWarning() << "[MCP] Exception:" << e.what();
+    sendJson(errReply(QJsonValue(), -32603,
+        QStringLiteral("Internal error: %1").arg(e.what())));
+  } catch (...) {
+    qWarning() << "[MCP] Unknown exception";
+    sendJson(errReply(QJsonValue(), -32603, "Internal error"));
+  }
 }
 
 // ════════════════════════════════════════════════════════════════════
@@ -196,7 +230,28 @@ QJsonObject McpBridge::handleInitialize(const QJsonValue& id, const QJsonObject&
         {"serverInfo", QJsonObject{
             {"name", "reclass-mcp"},
             {"version", "1.0.0"}
-        }}
+        }},
+        {"instructions",
+            "You are connected to ReClass, a live memory structure editor for reverse engineering. "
+            "You have two types of data available:\n"
+            "1. STRUCTURE: The node tree defines typed fields (project.state, tree.search, tree.apply). "
+            "Each node has a kind (the data type: UInt32, Float, Hex64, etc.) and a name.\n"
+            "2. LIVE DATA: The provider reads real memory from an attached process (hex.read, hex.write). "
+            "node.history returns timestamped value changes with heat levels (0=static, 1=cold, 2=warm, 3=hot).\n\n"
+            "CRITICAL RULES:\n"
+            "- When labeling/identifying a field, ALWAYS change BOTH name AND kind in one tree.apply call. "
+            "Example: [{op:'rename',nodeId:'X',name:'health'},{op:'change_kind',nodeId:'X',kind:'Int32'}]. "
+            "A node named 'health' with kind Hex64 is WRONG — the kind must match the actual data type.\n"
+            "- To detect what changed after an in-game event: call ui.action with action:'reset_tracking', "
+            "then have the user perform the action, then call node.history on the relevant nodes "
+            "to see which ones have new timestamped entries.\n"
+            "- hex.read offset is relative to the struct base address by default. "
+            "Use baseRelative=true for absolute virtual addresses in the process.\n"
+            "- tree.apply operations are atomic (undo macro). Batch related changes into one call.\n"
+            "- Use tree.search to quickly find nodes by name instead of paging through project.state.\n"
+            "- project.state returns structure metadata only (kinds, names, offsets), NOT live values. "
+            "Use hex.read for actual memory values and node.history for tracking changes over time."
+        }
     };
     return okReply(id, result);
 }
@@ -211,20 +266,31 @@ QJsonObject McpBridge::handleToolsList(const QJsonValue& id) {
     // 1. project.state
     tools.append(QJsonObject{
         {"name", "project.state"},
-        {"description", "Returns project state: node tree, base address, sources, provider info. "
-                        "Use depth/parentId to avoid dumping the whole tree. "
-                        "Call with depth:1 first to see top-level structs, then drill in with parentId."},
+        {"description", "Returns project state with paginated node tree. "
+                        "NOTE: This returns structure metadata only (kinds, names, offsets), NOT live memory values. "
+                        "Use hex.read to read actual values and node.history to track value changes over time. "
+                        "Responses return max 'limit' nodes (default 50). "
+                        "Use depth:1 first, then parentId to drill into a struct. "
+                        "Enum/bitfield member arrays are omitted by default (counts shown instead); "
+                        "pass includeMembers:true to get full arrays. "
+                        "Response includes returned/total/nextOffset for paging."},
         {"inputSchema", QJsonObject{
             {"type", "object"},
             {"properties", QJsonObject{
                 {"tabIndex", QJsonObject{{"type", "integer"},
                     {"description", "MDI tab index (0-based). Omit for active tab."}}},
                 {"depth", QJsonObject{{"type", "integer"},
-                    {"description", "Max tree depth to return (default 1 = top-level structs only)."}}},
+                    {"description", "Max tree depth to return (default 1)."}}},
                 {"parentId", QJsonObject{{"type", "string"},
                     {"description", "Only return children of this node."}}},
                 {"includeTree", QJsonObject{{"type", "boolean"},
-                    {"description", "If false, return only provider/source info, no tree. Default true."}}}
+                    {"description", "If false, return only provider/source info, no tree. Default true."}}},
+                {"includeMembers", QJsonObject{{"type", "boolean"},
+                    {"description", "If true, include full enumMembers/bitfieldMembers arrays. Default false (shows counts only)."}}},
+                {"limit", QJsonObject{{"type", "integer"},
+                    {"description", "Max nodes to return (default 50, max 500)."}}},
+                {"offset", QJsonObject{{"type", "integer"},
+                    {"description", "Skip this many nodes (for pagination). Use nextOffset from previous response."}}}
             }}
         }}
     });
@@ -233,6 +299,10 @@ QJsonObject McpBridge::handleToolsList(const QJsonValue& id) {
     tools.append(QJsonObject{
         {"name", "tree.apply"},
         {"description", "Apply batch of tree operations atomically (undo macro). "
+                        "IMPORTANT: When identifying/labeling a field, you MUST use BOTH rename AND change_kind "
+                        "in the same batch. A renamed node still has its original kind (e.g. Hex64) unless you "
+                        "explicitly change it. Example: "
+                        "[{op:'rename',nodeId:'ID',name:'health'},{op:'change_kind',nodeId:'ID',kind:'Int32'}]. "
                         "Each op is a JSON object with an 'op' field for the operation type and 'nodeId' (string) for the target node. "
                         "Operations: "
                         "remove: {op:'remove', nodeId:'ID'}. "
@@ -240,7 +310,7 @@ QJsonObject McpBridge::handleToolsList(const QJsonValue& id) {
                         "insert: {op:'insert', kind:'Hex64', name:'field', parentId:'ID', offset:0}. "
                         "change_kind: {op:'change_kind', nodeId:'ID', kind:'UInt32'}. "
                         "change_offset: {op:'change_offset', nodeId:'ID', offset:16}. "
-                        "change_base: {op:'change_base', baseAddress:'0x400000'}. "
+                        "change_base: {op:'change_base', baseAddress:'0x400000', formula:'[0x233CA80]'} — formula is optional, enables auto-resolve on provider attach. "
                         "change_struct_type: {op:'change_struct_type', nodeId:'ID', structTypeName:'Name'}. "
                         "change_class_keyword: {op:'change_class_keyword', nodeId:'ID', classKeyword:'class'}. "
                         "change_pointer_ref: {op:'change_pointer_ref', nodeId:'ID', refId:'targetID'}. "
@@ -285,10 +355,11 @@ QJsonObject McpBridge::handleToolsList(const QJsonValue& id) {
     // 4. hex.read
     tools.append(QJsonObject{
         {"name", "hex.read"},
-        {"description", "Read raw bytes from provider. Returns hex dump, ASCII, and multi-type "
+        {"description", "Read raw bytes from provider (live process memory). Returns hex dump, ASCII, and multi-type "
                         "interpretations (u8/u16/u32/u64/i32/f32/f64/ptr/string heuristics). "
+                        "Use this to see what actual values are in memory at any offset. "
                         "Offset is tree-relative (0-based, baseAddress added automatically) "
-                        "unless baseRelative=true (offset is absolute)."},
+                        "unless baseRelative=true (offset is absolute virtual address in the process)."},
         {"inputSchema", QJsonObject{
             {"type", "object"},
             {"properties", QJsonObject{
@@ -343,7 +414,10 @@ QJsonObject McpBridge::handleToolsList(const QJsonValue& id) {
         {"description", "Trigger a UI action. Fallback for operations without dedicated tools. "
                         "Actions: undo, redo, new_file, open_file, save_file, save_file_as, "
                         "export_cpp, set_view_root, scroll_to_node, collapse_node, expand_node, "
-                        "select_node, refresh"},
+                        "select_node, refresh, reset_tracking. "
+                        "export_cpp accepts optional nodeId to export a single struct (recommended for large projects). "
+                        "reset_tracking clears all value change histories — use before an in-game event, "
+                        "then check node.history afterward to see what changed."},
         {"inputSchema", QJsonObject{
             {"type", "object"},
             {"properties", QJsonObject{
@@ -357,6 +431,65 @@ QJsonObject McpBridge::handleToolsList(const QJsonValue& id) {
         }}
     });
 
+    // 8. tree.search
+    tools.append(QJsonObject{
+        {"name", "tree.search"},
+        {"description", "Search for nodes by name (substring, case-insensitive). "
+                        "Returns compact results: id, name, kind, parentId, offset, childCount. "
+                        "Use kindFilter to narrow (e.g. 'Struct'). Max 100 results. "
+                        "Much faster than paging through project.state to find a specific type."},
+        {"inputSchema", QJsonObject{
+            {"type", "object"},
+            {"properties", QJsonObject{
+                {"tabIndex", QJsonObject{{"type", "integer"},
+                    {"description", "MDI tab index (0-based). Omit for active tab."}}},
+                {"query", QJsonObject{{"type", "string"},
+                    {"description", "Name substring to search for (case-insensitive)."}}},
+                {"kindFilter", QJsonObject{{"type", "string"},
+                    {"description", "Filter by node kind (e.g. 'Struct', 'Hex64', 'Array')."}}},
+                {"limit", QJsonObject{{"type", "integer"},
+                    {"description", "Max results to return (default 20, max 100)."}}}
+            }}
+        }}
+    });
+
+    // 9. node.history
+    tools.append(QJsonObject{
+        {"name", "node.history"},
+        {"description", "Returns timestamped value change history (up to 10 entries) for specified nodes. "
+                        "Use this to detect what changed after an in-game event — no need to manually snapshot memory. "
+                        "Each node returns: entries[] with {value, timestamp}, heatLevel (0=static to 3=hot), "
+                        "and uniqueCount. Heat level 3 means the field is actively changing. "
+                        "Requires live provider with value tracking enabled."},
+        {"inputSchema", QJsonObject{
+            {"type", "object"},
+            {"properties", QJsonObject{
+                {"nodeIds", QJsonObject{{"type", "array"},
+                    {"items", QJsonObject{{"type", "string"}}},
+                    {"description", "Array of node IDs to get history for."}}},
+                {"tabIndex", QJsonObject{{"type", "integer"},
+                    {"description", "MDI tab index. Omit for active tab."}}}
+            }},
+            {"required", QJsonArray{"nodeIds"}}
+        }}
+    });
+
+
+    // process.info
+    tools.append(QJsonObject{
+        {"name", "process.info"},
+        {"description", "Returns PEB address and enumerates all Thread Environment Blocks (TEBs) for the attached process. "
+                        "TEBs are discovered via NtQuerySystemInformation and NtQueryInformationThread. "
+                        "Each TEB entry includes: address, threadId. "
+                        "Requires a live process provider with PEB support."},
+        {"inputSchema", QJsonObject{
+            {"type", "object"},
+            {"properties", QJsonObject{
+                {"tabIndex", QJsonObject{{"type", "integer"},
+                    {"description", "MDI tab index (0-based). Omit for active tab."}}}
+            }}
+        }}
+    });
     return okReply(id, QJsonObject{{"tools", tools}});
 }
 
@@ -368,6 +501,10 @@ QJsonObject McpBridge::handleToolsCall(const QJsonValue& id, const QJsonObject&
     QString toolName = params.value("name").toString();
     QJsonObject args = params.value("arguments").toObject();
 
+    // Show tool activity in status bar (with shimmer)
+    m_mainWindow->setMcpStatus(QStringLiteral("MCP: %1").arg(toolName));
+    QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+
     QJsonObject result;
     if      (toolName == "project.state")  result = toolProjectState(args);
     else if (toolName == "tree.apply")     result = toolTreeApply(args);
@@ -376,8 +513,13 @@ QJsonObject McpBridge::handleToolsCall(const QJsonValue& id, const QJsonObject&
     else if (toolName == "hex.write")      result = toolHexWrite(args);
     else if (toolName == "status.set")     result = toolStatusSet(args);
     else if (toolName == "ui.action")      result = toolUiAction(args);
+    else if (toolName == "tree.search")   result = toolTreeSearch(args);
+    else if (toolName == "node.history")  result = toolNodeHistory(args);
+    else if (toolName == "process.info") result = toolProcessInfo(args);
     else return errReply(id, -32601, "Unknown tool: " + toolName);
 
+    m_mainWindow->clearMcpStatus();
+
     return okReply(id, result);
 }
 
@@ -386,11 +528,15 @@ QJsonObject McpBridge::handleToolsCall(const QJsonValue& id, const QJsonObject&
 // ════════════════════════════════════════════════════════════════════
 
 QString McpBridge::resolvePlaceholder(const QString& ref,
-                                       const QHash<QString, uint64_t>& placeholderMap) {
+                                       const QHash<QString, uint64_t>& placeholderMap,
+                                       bool* ok) {
+    if (ok) *ok = true;
     if (ref.startsWith('$')) {
         auto it = placeholderMap.find(ref);
         if (it != placeholderMap.end())
             return QString::number(it.value());
+        if (ok) *ok = false;
+        return ref;  // unresolved placeholder
     }
     return ref;  // not a placeholder — return as-is
 }
@@ -399,26 +545,36 @@ QString McpBridge::resolvePlaceholder(const QString& ref,
 // Smart tab resolution
 // ════════════════════════════════════════════════════════════════════
 
-MainWindow::TabState* McpBridge::resolveTab(const QJsonObject& args) {
+MainWindow::TabState* McpBridge::resolveTab(const QJsonObject& args, int* resolvedIndex) {
+    if (resolvedIndex) *resolvedIndex = -1;
+
     // 1) Explicit tab index from args
     if (args.contains("tabIndex")) {
         int idx = args.value("tabIndex").toInt();
         auto* t = m_mainWindow->tabByIndex(idx);
-        if (t) return t;
+        if (t) { if (resolvedIndex) *resolvedIndex = idx; return t; }
     }
 
     // 2) Active sub-window (user clicked on it)
     auto* t = m_mainWindow->activeTab();
-    if (t) return t;
+    if (t) {
+        if (resolvedIndex) {
+            for (int i = 0; i < m_mainWindow->tabCount(); i++) {
+                if (m_mainWindow->tabByIndex(i) == t) { *resolvedIndex = i; break; }
+            }
+        }
+        return t;
+    }
 
     // 3) Fall back to first available tab
     if (m_mainWindow->tabCount() > 0) {
         t = m_mainWindow->tabByIndex(0);
-        if (t) return t;
+        if (t) { if (resolvedIndex) *resolvedIndex = 0; return t; }
     }
 
     // 4) No tabs at all — auto-create a project
     m_mainWindow->project_new();
+    if (resolvedIndex) *resolvedIndex = 0;
     return m_mainWindow->tabByIndex(0);
 }
 
@@ -436,6 +592,9 @@ QJsonObject McpBridge::toolProjectState(const QJsonObject& args) {
 
     int maxDepth = args.value("depth").toInt(1);
     bool includeTree = args.contains("includeTree") ? args.value("includeTree").toBool() : true;
+    bool includeMembers = args.value("includeMembers").toBool(false);
+    int limit = qBound(1, args.value("limit").toInt(50), 500);
+    int offset = qMax(0, args.value("offset").toInt(0));
     QString parentIdStr = args.value("parentId").toString();
     uint64_t filterParentId = parentIdStr.isEmpty() ? 0 : parentIdStr.toULongLong();
 
@@ -481,6 +640,7 @@ QJsonObject McpBridge::toolProjectState(const QJsonObject& args) {
     state["modified"] = doc->modified;
     state["undoAvailable"] = doc->undoStack.canUndo();
     state["redoAvailable"] = doc->undoStack.canRedo();
+    state["statusText"] = m_mainWindow->m_appStatus;
 
     // Filtered tree: only emit nodes up to maxDepth from the filter root
     if (includeTree) {
@@ -489,12 +649,15 @@ QJsonObject McpBridge::toolProjectState(const QJsonObject& args) {
         for (int i = 0; i < tree.nodes.size(); i++)
             childMap[tree.nodes[i].parentId].append(i);
 
-        // BFS from filterParentId, respecting maxDepth
+        // BFS from filterParentId, respecting maxDepth + pagination
         QJsonArray nodeArr;
         struct QueueEntry { uint64_t parentId; int depth; };
         QVector<QueueEntry> queue;
         queue.append({filterParentId, 0});
 
+        int totalCount = 0;  // total nodes that match depth filter
+        int emitted = 0;
+
         while (!queue.isEmpty()) {
             auto entry = queue.takeFirst();
             if (entry.depth > maxDepth) continue;
@@ -502,13 +665,47 @@ QJsonObject McpBridge::toolProjectState(const QJsonObject& args) {
             const auto& kids = childMap.value(entry.parentId);
             for (int ci : kids) {
                 const Node& n = tree.nodes[ci];
+
+                // Count all matching nodes for pagination metadata
+                totalCount++;
+
+                // Apply offset/limit pagination
+                if (totalCount <= offset) {
+                    // Still skipping — but enqueue children for counting
+                    if (entry.depth + 1 <= maxDepth)
+                        queue.append({n.id, entry.depth + 1});
+                    continue;
+                }
+                if (emitted >= limit) {
+                    // Past limit — just keep counting total
+                    if (entry.depth + 1 <= maxDepth)
+                        queue.append({n.id, entry.depth + 1});
+                    continue;
+                }
+
                 QJsonObject nj = n.toJson();
+
+                // Strip inline member arrays unless requested
+                if (!includeMembers) {
+                    if (nj.contains("enumMembers")) {
+                        int count = nj.value("enumMembers").toArray().size();
+                        nj.remove("enumMembers");
+                        nj["enumMemberCount"] = count;
+                    }
+                    if (nj.contains("bitfieldMembers")) {
+                        int count = nj.value("bitfieldMembers").toArray().size();
+                        nj.remove("bitfieldMembers");
+                        nj["bitfieldMemberCount"] = count;
+                    }
+                }
+
                 // Add computed size for containers
                 if (n.kind == NodeKind::Struct || n.kind == NodeKind::Array) {
                     nj["computedSize"] = tree.structSpan(n.id, &childMap);
                     nj["childCount"] = childMap.value(n.id).size();
                 }
                 nodeArr.append(nj);
+                emitted++;
 
                 // Enqueue children if we haven't hit depth limit
                 if (entry.depth + 1 <= maxDepth)
@@ -520,6 +717,10 @@ QJsonObject McpBridge::toolProjectState(const QJsonObject& args) {
         treeObj["baseAddress"] = QString::number(tree.baseAddress, 16);
         treeObj["nextId"] = QString::number(tree.m_nextId);
         treeObj["nodes"] = nodeArr;
+        treeObj["returned"] = emitted;
+        treeObj["total"] = totalCount;
+        if (emitted < totalCount)
+            treeObj["nextOffset"] = offset + emitted;
         state["tree"] = treeObj;
     }
 
@@ -565,8 +766,11 @@ QJsonObject McpBridge::toolTreeApply(const QJsonObject& args) {
     QStringList skippedOps;
     for (int i = 0; i < ops.size(); i++) {
         // Safety valve: keep paint events flowing for large batches
-        if (i % 100 == 0 && ops.size() > 200)
+        if (i % 100 == 0 && ops.size() > 200) {
+            m_mainWindow->setMcpStatus(
+                QStringLiteral("MCP: tree.apply %1/%2").arg(i).arg(ops.size()));
             QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 5);
+        }
 
         QJsonObject op = ops[i].toObject();
         QString opType = op.value("op").toString();
@@ -576,15 +780,29 @@ QJsonObject McpBridge::toolTreeApply(const QJsonObject& args) {
             n.id = placeholders.value(QStringLiteral("$%1").arg(i), tree.reserveId());
             n.kind = kindFromString(op.value("kind").toString("Hex64"));
             n.name = op.value("name").toString();
-            QString pid = resolvePlaceholder(op.value("parentId").toString("0"), placeholders);
+            bool pidOk;
+            QString pid = resolvePlaceholder(op.value("parentId").toString("0"), placeholders, &pidOk);
+            if (!pidOk) {
+                skippedOps.append(QStringLiteral("op[%1]: unresolved placeholder for parentId").arg(i));
+                continue;
+            }
             n.parentId = pid.toULongLong();
+            if (n.parentId != 0 && tree.indexOfId(n.parentId) < 0) {
+                skippedOps.append(QStringLiteral("op[%1]: parentId '%2' not found").arg(i).arg(pid));
+                continue;
+            }
             n.offset = op.value("offset").toInt(0);
             n.structTypeName = op.value("structTypeName").toString();
             n.classKeyword = op.value("classKeyword").toString();
-            n.strLen = op.value("strLen").toInt(64);
+            n.strLen = qBound(1, op.value("strLen").toInt(64), 1000000);
             n.elementKind = kindFromString(op.value("elementKind").toString("UInt8"));
-            n.arrayLen = op.value("arrayLen").toInt(1);
-            QString refStr = resolvePlaceholder(op.value("refId").toString("0"), placeholders);
+            n.arrayLen = qBound(1, op.value("arrayLen").toInt(1), 1000000);
+            bool refOk;
+            QString refStr = resolvePlaceholder(op.value("refId").toString("0"), placeholders, &refOk);
+            if (!refOk) {
+                skippedOps.append(QStringLiteral("op[%1]: unresolved placeholder for refId").arg(i));
+                continue;
+            }
             n.refId = refStr.toULongLong();
 
             // Auto-place: offset -1 means "after last sibling"
@@ -660,8 +878,10 @@ QJsonObject McpBridge::toolTreeApply(const QJsonObject& args) {
         }
         else if (opType == "change_base") {
             uint64_t newBase = op.value("baseAddress").toString().toULongLong(nullptr, 16);
+            QString oldFormula = tree.baseAddressFormula;
+            QString newFormula = op.value("formula").toString();
             doc->undoStack.push(new RcxCommand(ctrl,
-                cmd::ChangeBase{tree.baseAddress, newBase}));
+                cmd::ChangeBase{tree.baseAddress, newBase, oldFormula, newFormula}));
             applied++;
         }
         else if (opType == "change_struct_type") {
@@ -708,7 +928,7 @@ QJsonObject McpBridge::toolTreeApply(const QJsonObject& args) {
             int idx = tree.indexOfId(nid.toULongLong());
             if (idx >= 0) {
                 NodeKind newElemKind = kindFromString(op.value("elementKind").toString());
-                int newLen = op.value("arrayLen").toInt(1);
+                int newLen = qBound(1, op.value("arrayLen").toInt(1), 1000000);
                 doc->undoStack.push(new RcxCommand(ctrl,
                     cmd::ChangeArrayMeta{tree.nodes[idx].id,
                         tree.nodes[idx].elementKind, newElemKind,
@@ -956,7 +1176,7 @@ QJsonObject McpBridge::toolStatusSet(const QJsonObject& args) {
         }
     }
     if (target == "statusBar" || target == "both") {
-        m_mainWindow->m_statusLabel->setText(text);
+        m_mainWindow->setAppStatus(text);
     }
 
     return makeTextResult("Status set: " + text);
@@ -1004,7 +1224,25 @@ QJsonObject McpBridge::toolUiAction(const QJsonObject& args) {
     if (action == "export_cpp") {
         if (!doc) return makeTextResult("No active tab", true);
         const QHash<NodeKind, QString>* aliases = doc->typeAliases.isEmpty() ? nullptr : &doc->typeAliases;
-        QString code = renderCppAll(doc->tree, aliases);
+        bool asserts = QSettings("Reclass", "Reclass").value("generatorAsserts", false).toBool();
+        QString code;
+        if (!nodeIdStr.isEmpty()) {
+            // Per-struct export
+            uint64_t nid = nodeIdStr.toULongLong();
+            code = renderCpp(doc->tree, nid, aliases, asserts);
+            if (code.isEmpty())
+                return makeTextResult("Node not found or not a struct: " + nodeIdStr, true);
+        } else {
+            code = renderCppAll(doc->tree, aliases, asserts);
+        }
+        // Truncate if too large (64 KB limit)
+        if (code.size() > 65536) {
+            int totalSize = code.size();
+            code.truncate(65536);
+            code += QStringLiteral("\n\n... truncated (%1 bytes total, showing first 64KB)"
+                                   "\nUse nodeId param to export a single struct.")
+                    .arg(totalSize);
+        }
         return makeTextResult(code);
     }
     if (action == "save_file") {
@@ -1050,17 +1288,160 @@ QJsonObject McpBridge::toolUiAction(const QJsonObject& args) {
         return makeTextResult("Selected node " + nodeIdStr);
     }
 
+    if (action == "reset_tracking") {
+        int count = m_mainWindow->tabCount();
+        for (int i = 0; i < count; ++i) {
+            auto* t = m_mainWindow->tabByIndex(i);
+            if (t && t->ctrl)
+                t->ctrl->resetChangeTracking();
+        }
+        return makeTextResult(QStringLiteral("Value tracking reset on all %1 tabs.").arg(count));
+    }
+
     return makeTextResult("Unknown action: " + action, true);
 }
 
+// ════════════════════════════════════════════════════════════════════
+// TOOL: tree.search
+// ════════════════════════════════════════════════════════════════════
+
+QJsonObject McpBridge::toolTreeSearch(const QJsonObject& args) {
+    auto* tab = resolveTab(args);
+    if (!tab) return makeTextResult("No active tab", true);
+
+    const auto& tree = tab->doc->tree;
+    QString query = args.value("query").toString();
+    QString kindFilter = args.value("kindFilter").toString();
+    int limit = qBound(1, args.value("limit").toInt(20), 100);
+
+    if (query.isEmpty() && kindFilter.isEmpty())
+        return makeTextResult("Provide 'query' (name substring) and/or 'kindFilter' (e.g. 'Struct')", true);
+
+    // Build parent→children map for childCount
+    QHash<uint64_t, int> childCounts;
+    for (const auto& n : tree.nodes)
+        childCounts[n.parentId]++;
+
+    QJsonArray results;
+    for (const auto& n : tree.nodes) {
+        // Kind filter
+        if (!kindFilter.isEmpty()) {
+            if (kindToString(n.kind) != kindFilter) continue;
+        }
+        // Name substring match (case-insensitive)
+        if (!query.isEmpty()) {
+            bool nameMatch = n.name.contains(query, Qt::CaseInsensitive);
+            bool typeMatch = n.structTypeName.contains(query, Qt::CaseInsensitive);
+            if (!nameMatch && !typeMatch) continue;
+        }
+
+        QJsonObject nj;
+        nj["id"] = QString::number(n.id);
+        nj["name"] = n.name;
+        nj["kind"] = kindToString(n.kind);
+        nj["parentId"] = QString::number(n.parentId);
+        nj["offset"] = n.offset;
+        if (!n.structTypeName.isEmpty())
+            nj["structTypeName"] = n.structTypeName;
+        if (!n.classKeyword.isEmpty())
+            nj["classKeyword"] = n.classKeyword;
+        if (n.kind == NodeKind::Struct || n.kind == NodeKind::Array)
+            nj["childCount"] = childCounts.value(n.id, 0);
+        if (!n.enumMembers.isEmpty())
+            nj["enumMemberCount"] = n.enumMembers.size();
+        if (!n.bitfieldMembers.isEmpty())
+            nj["bitfieldMemberCount"] = n.bitfieldMembers.size();
+        results.append(nj);
+
+        if (results.size() >= limit) break;
+    }
+
+    QJsonObject out;
+    out["results"] = results;
+    out["count"] = results.size();
+    out["query"] = query;
+    if (!kindFilter.isEmpty()) out["kindFilter"] = kindFilter;
+    return makeTextResult(QString::fromUtf8(
+        QJsonDocument(out).toJson(QJsonDocument::Indented)));
+}
+
+// ════════════════════════════════════════════════════════════════════
+// Tool: node.history — return timestamped value history for nodes
+// ════════════════════════════════════════════════════════════════════
+
+QJsonObject McpBridge::toolNodeHistory(const QJsonObject& args) {
+    auto* tab = resolveTab(args);
+    if (!tab) return makeTextResult("No active tab.", true);
+
+    const auto& histMap = tab->ctrl->valueHistory();
+    QJsonArray requestedIds = args.value("nodeIds").toArray();
+    if (requestedIds.isEmpty())
+        return makeTextResult("nodeIds array is required.", true);
+
+    QJsonObject result;
+    for (const auto& idVal : requestedIds) {
+        QString idStr = idVal.toString();
+        uint64_t nodeId = idStr.toULongLong();
+        auto it = histMap.find(nodeId);
+        QJsonArray entries;
+        if (it != histMap.end()) {
+            it->forEachWithTime([&](const QString& val, qint64 msec) {
+                QJsonObject entry;
+                entry.insert(QStringLiteral("value"), val);
+                entry.insert(QStringLiteral("timestamp"), msec);
+                entries.append(entry);
+            });
+        }
+        QJsonObject nodeResult;
+        nodeResult.insert(QStringLiteral("entries"), entries);
+        nodeResult.insert(QStringLiteral("heatLevel"), it != histMap.end() ? it->heatLevel() : 0);
+        nodeResult.insert(QStringLiteral("uniqueCount"), it != histMap.end() ? it->uniqueCount() : 0);
+        result.insert(idStr, nodeResult);
+    }
+    return makeTextResult(QString::fromUtf8(
+        QJsonDocument(result).toJson(QJsonDocument::Compact)));
+}
+
+
+// ════════════════════════════════════════════════════════════════════
+// TOOL: process.info — PEB address + TEB enumeration
+// ════════════════════════════════════════════════════════════════════
+
+QJsonObject McpBridge::toolProcessInfo(const QJsonObject& args) {
+    auto* tab = resolveTab(args);
+    if (!tab) return makeTextResult("No active tab", true);
+
+    auto* prov = tab->doc->provider.get();
+    if (!prov) return makeTextResult("No data source attached", true);
+    if (!prov->isLive()) return makeTextResult("Not a live provider", true);
+
+    uint64_t pebAddr = prov->peb();
+    if (!pebAddr) return makeTextResult("PEB not available for this provider", true);
+
+    QJsonObject out;
+    out["peb"] = "0x" + QString::number(pebAddr, 16).toUpper();
+
+    auto tebList = prov->tebs();
+    QJsonArray tebArr;
+    for (const auto& t : tebList) {
+        tebArr.append(QJsonObject{
+            {"address", "0x" + QString::number(t.tebAddress, 16).toUpper()},
+            {"threadId", (qint64)t.threadId}
+        });
+    }
+
+    out["tebs"] = tebArr;
+    out["tebCount"] = tebArr.size();
+    return makeTextResult(QString::fromUtf8(QJsonDocument(out).toJson(QJsonDocument::Indented)));
+}
+
 // ════════════════════════════════════════════════════════════════════
 // Notifications (call from MainWindow/Controller hooks)
 // ════════════════════════════════════════════════════════════════════
 
 void McpBridge::notifyTreeChanged() {
     if (!m_client || !m_initialized) return;
-    sendNotification("notifications/resources/updated",
-                     QJsonObject{{"uri", "project://tree"}});
+    m_notifyTimer->start();  // debounce 100ms
 }
 
 void McpBridge::notifyDataChanged() {

src/mcp/mcp_bridge.h

@@ -7,6 +7,7 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QByteArray>
+#include <QTimer>
 
 namespace rcx {
 
@@ -34,6 +35,7 @@ private:
     QByteArray     m_readBuffer;
     bool           m_initialized = false;
     bool           m_slowMode    = false;
+    QTimer*        m_notifyTimer = nullptr;
 
     // JSON-RPC plumbing
     void onNewConnection();
@@ -58,14 +60,18 @@ private:
     QJsonObject toolHexWrite(const QJsonObject& args);
     QJsonObject toolStatusSet(const QJsonObject& args);
     QJsonObject toolUiAction(const QJsonObject& args);
+    QJsonObject toolTreeSearch(const QJsonObject& args);
+    QJsonObject toolNodeHistory(const QJsonObject& args);
+    QJsonObject toolProcessInfo(const QJsonObject& args);
 
     // Helpers
     QJsonObject makeTextResult(const QString& text, bool isError = false);
     QString resolvePlaceholder(const QString& ref,
-                               const QHash<QString, uint64_t>& placeholderMap);
+                               const QHash<QString, uint64_t>& placeholderMap,
+                               bool* ok = nullptr);
 
     // Smart tab resolution: tabIndex arg → activeTab → first tab → auto-create
-    MainWindow::TabState* resolveTab(const QJsonObject& args);
+    MainWindow::TabState* resolveTab(const QJsonObject& args, int* resolvedIndex = nullptr);
 };
 
 } // namespace rcx

src/optionsdialog.cpp

@@ -40,9 +40,21 @@ OptionsDialog::OptionsDialog(const OptionsResult& current, QWidget* parent)
     m_tree->setHeaderHidden(true);
     m_tree->setRootIsDecorated(true);
     m_tree->setFixedWidth(200);
+    m_tree->setMouseTracking(true);
+    m_tree->setIconSize(QSize(16, 16));
+    {
+        const auto& t = ThemeManager::instance().current();
+        QPalette tp = m_tree->palette();
+        tp.setColor(QPalette::Text, t.textDim);
+        tp.setColor(QPalette::Highlight, t.hover);
+        tp.setColor(QPalette::HighlightedText, t.text);
+        m_tree->setPalette(tp);
+    }
 
     auto* envItem = new QTreeWidgetItem(m_tree, {"Environment"});
+    envItem->setIcon(0, QIcon(":/vsicons/folder.svg"));
     auto* generalItem = new QTreeWidgetItem(envItem, {"General"});
+    generalItem->setIcon(0, QIcon(":/vsicons/settings-gear.svg"));
     m_tree->expandAll();
     m_tree->setCurrentItem(generalItem);
     leftColumn->addWidget(m_tree, 1);
@@ -102,7 +114,7 @@ OptionsDialog::OptionsDialog(const OptionsResult& current, QWidget* parent)
     m_fontCombo->setObjectName("fontCombo");
     visualLayout->addRow("Editor Font:", m_fontCombo);
 
-    m_titleCaseCheck = new QCheckBox("Apply title case styling to menu bar");
+    m_titleCaseCheck = new QCheckBox("Uppercase menu items");
     m_titleCaseCheck->setChecked(current.menuBarTitleCase);
     visualLayout->addRow(m_titleCaseCheck);
 
@@ -110,25 +122,11 @@ OptionsDialog::OptionsDialog(const OptionsResult& current, QWidget* parent)
     m_showIconCheck->setChecked(current.showIcon);
     visualLayout->addRow(m_showIconCheck);
 
+    m_braceWrapCheck = new QCheckBox("Opening brace on new line");
+    m_braceWrapCheck->setChecked(current.braceWrap);
+    visualLayout->addRow(m_braceWrapCheck);
+
     generalLayout->addWidget(visualGroup);
-
-    // Safe Mode group box
-    auto* safeModeGroup = new QGroupBox("Preview Features");
-    auto* safeModeLayout = new QVBoxLayout(safeModeGroup);
-    safeModeLayout->setSpacing(4);
-
-    m_safeModeCheck = new QCheckBox("Safe Mode");
-    m_safeModeCheck->setChecked(current.safeMode);
-    safeModeLayout->addWidget(m_safeModeCheck);
-
-    auto* safeModeDesc = new QLabel(
-        "Enable to use the default OS icon for this application and "
-        "create the window with the name of the executable file.");
-    safeModeDesc->setWordWrap(true);
-    safeModeDesc->setContentsMargins(20, 0, 0, 0);  // indent under checkbox
-    safeModeLayout->addWidget(safeModeDesc);
-
-    generalLayout->addWidget(safeModeGroup);
     generalLayout->addStretch();
 
     m_pages->addWidget(generalPage);                     // index 0
@@ -136,6 +134,7 @@ OptionsDialog::OptionsDialog(const OptionsResult& current, QWidget* parent)
 
     // -- AI Features page --
     auto* aiItem = new QTreeWidgetItem(envItem, {"AI Features"});
+    aiItem->setIcon(0, QIcon(":/vsicons/remote.svg"));
 
     auto* aiPage = new QWidget;
     auto* aiLayout = new QVBoxLayout(aiPage);
@@ -165,11 +164,20 @@ OptionsDialog::OptionsDialog(const OptionsResult& current, QWidget* parent)
 
     // -- Generator page --
     auto* generatorItem = new QTreeWidgetItem(envItem, {"Generator"});
+    generatorItem->setIcon(0, QIcon(":/vsicons/code.svg"));
 
     auto* generatorPage = new QWidget;
     auto* generatorLayout = new QVBoxLayout(generatorPage);
     generatorLayout->setContentsMargins(0, 0, 0, 0);
     generatorLayout->setSpacing(8);
+
+    auto* cppGroup = new QGroupBox("C++ Header");
+    auto* cppLayout = new QVBoxLayout(cppGroup);
+    m_assertCheck = new QCheckBox("Emit static_assert size checks");
+    m_assertCheck->setChecked(current.generatorAsserts);
+    cppLayout->addWidget(m_assertCheck);
+    generatorLayout->addWidget(cppGroup);
+
     generatorLayout->addStretch();
 
     m_pages->addWidget(generatorPage);                   // index 2
@@ -205,9 +213,10 @@ OptionsResult OptionsDialog::result() const {
     r.fontName = m_fontCombo->currentText();
     r.menuBarTitleCase = m_titleCaseCheck->isChecked();
     r.showIcon = m_showIconCheck->isChecked();
-    r.safeMode = m_safeModeCheck->isChecked();
     r.autoStartMcp = m_autoMcpCheck->isChecked();
     r.refreshMs = m_refreshSpin->value();
+    r.generatorAsserts = m_assertCheck->isChecked();
+    r.braceWrap = m_braceWrapCheck->isChecked();
     return r;
 }
 

src/optionsdialog.h

@@ -15,9 +15,10 @@ struct OptionsResult {
     QString fontName;
     bool    menuBarTitleCase = true;
     bool    showIcon = false;
-    bool    safeMode = false;
-    bool    autoStartMcp = false;
+    bool    autoStartMcp = true;
     int     refreshMs = 660;
+    bool    generatorAsserts = false;
+    bool    braceWrap = false;
 };
 
 class OptionsDialog : public QDialog {
@@ -38,9 +39,10 @@ private:
     QComboBox*      m_fontCombo      = nullptr;
     QCheckBox*      m_titleCaseCheck = nullptr;
     QCheckBox*      m_showIconCheck  = nullptr;
-    QCheckBox*      m_safeModeCheck  = nullptr;
     QCheckBox*      m_autoMcpCheck   = nullptr;
     QSpinBox*       m_refreshSpin    = nullptr;
+    QCheckBox*      m_assertCheck    = nullptr;
+    QCheckBox*      m_braceWrapCheck = nullptr;
 
     // searchable keywords per leaf tree item
     QHash<QTreeWidgetItem*, QStringList> m_pageKeywords;

src/processpicker.cpp

@@ -5,6 +5,10 @@
 #include <QMessageBox>
 #include <QFileInfo>
 #include <QPixmap>
+#include <QSettings>
+#include <QApplication>
+#include <QClipboard>
+#include <QMenu>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -27,22 +31,9 @@ ProcessPicker::ProcessPicker(QWidget *parent)
     , m_useCustomList(false)
 {
     ui->setupUi(this);
-    
-    // Configure table
-    ui->processTable->setColumnWidth(0, 80);   // PID column - fixed width
-    ui->processTable->setColumnWidth(1, 200);  // Name column - fixed width
-    ui->processTable->horizontalHeader()->setStretchLastSection(true);  // Path column - fills remaining space
-    ui->processTable->setWordWrap(false);  // Disable word wrap for single-line display
-    ui->processTable->setTextElideMode(Qt::ElideLeft);  // Elide from left (show end of path)
-    
-    // Connect signals
-    connect(ui->refreshButton, &QPushButton::clicked, this, &ProcessPicker::refreshProcessList);
-    connect(ui->processTable, &QTableWidget::itemDoubleClicked, this, &ProcessPicker::onProcessSelected);
-    connect(ui->filterEdit, &QLineEdit::textChanged, this, &ProcessPicker::filterProcesses);
-    connect(ui->attachButton, &QPushButton::clicked, this, &ProcessPicker::onProcessSelected);
-    
-    // Initial process enumeration
+    initUi();
     refreshProcessList();
+    selectPreferredProcess();
 }
 
 ProcessPicker::ProcessPicker(const QList<ProcessInfo>& customProcesses, QWidget *parent)
@@ -51,23 +42,103 @@ ProcessPicker::ProcessPicker(const QList<ProcessInfo>& customProcesses, QWidget
     , m_useCustomList(true)
 {
     ui->setupUi(this);
-    
-    // Configure table
-    ui->processTable->setColumnWidth(0, 80);
-    ui->processTable->setColumnWidth(1, 200);
+    initUi();
+    ui->refreshButton->setVisible(false);
+    m_allProcesses = customProcesses;
+    applyFilter();
+    selectPreferredProcess();
+}
+
+void ProcessPicker::initUi()
+{
+    // Table configuration
+    ui->processTable->setColumnWidth(0, 80);   // PID column
+    ui->processTable->setColumnWidth(1, 200);  // Name column
     ui->processTable->horizontalHeader()->setStretchLastSection(true);
+    ui->processTable->setSortingEnabled(true);
     ui->processTable->setWordWrap(false);
     ui->processTable->setTextElideMode(Qt::ElideLeft);
-    
-    // Connect signals (no refresh button for custom lists)
-    ui->refreshButton->setVisible(false);
+    ui->processTable->setShowGrid(false);
+    ui->processTable->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 6);
+
+    // Signal connections
+    connect(ui->refreshButton, &QPushButton::clicked, this, &ProcessPicker::refreshProcessList);
     connect(ui->processTable, &QTableWidget::itemDoubleClicked, this, &ProcessPicker::onProcessSelected);
     connect(ui->filterEdit, &QLineEdit::textChanged, this, &ProcessPicker::filterProcesses);
     connect(ui->attachButton, &QPushButton::clicked, this, &ProcessPicker::onProcessSelected);
-    
-    // Use custom process list
-    m_allProcesses = customProcesses;
-    applyFilter();
+
+    // Derive theme colors from the global palette (set by applyGlobalTheme)
+    QPalette pal = qApp->palette();
+    QString bg       = pal.color(QPalette::Base).name();
+    QString text     = pal.color(QPalette::Text).name();
+    QString hover    = pal.color(QPalette::Mid).name();
+    QString surface  = pal.color(QPalette::AlternateBase).name();
+    QString button   = pal.color(QPalette::Button).name();
+    QString highlight= pal.color(QPalette::Highlight).name();
+    QString border   = pal.color(QPalette::Mid).darker(120).name();
+    QString mutedText= pal.color(QPalette::Disabled, QPalette::WindowText).name();
+    QString hoverDk  = pal.color(QPalette::Mid).darker(130).name();
+
+    ui->processTable->setStyleSheet(QStringLiteral(
+        "QTableWidget { background: %1; color: %2; border: none; }"
+        "QTableWidget::item { padding: 2px 6px; border: none; }"
+        "QTableWidget::item:hover { background: %3; padding: 2px 6px; border: none; }"
+        "QTableWidget::item:selected { background: %3; color: %2; padding: 2px 6px; border: none; }")
+        .arg(bg, text, hover));
+
+    ui->processTable->horizontalHeader()->setStyleSheet(QStringLiteral(
+        "QHeaderView::section { background: %1; color: %2; border: none;"
+        "  padding: 4px 6px; text-align: left; }")
+        .arg(surface, text));
+    ui->processTable->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+
+    ui->filterEdit->setStyleSheet(QStringLiteral(
+        "QLineEdit { background: %1; color: %2; border: 1px solid %3; padding: 2px 4px; }"
+        "QLineEdit:focus { border-color: %4; }")
+        .arg(bg, text, border, highlight));
+
+    QString btnStyle = QStringLiteral(
+        "QPushButton { background: %1; color: %2; border: 1px solid %3; padding: 4px 12px; }"
+        "QPushButton:hover { background: %4; }"
+        "QPushButton:pressed { background: %5; }"
+        "QPushButton:disabled { color: %6; }")
+        .arg(button, text, border, hover, hoverDk, mutedText);
+    ui->refreshButton->setStyleSheet(btnStyle);
+    ui->attachButton->setStyleSheet(btnStyle);
+    ui->cancelButton->setStyleSheet(btnStyle);
+
+    // Right-click context menu
+    ui->processTable->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(ui->processTable, &QWidget::customContextMenuRequested, this, [this](const QPoint& pos) {
+        int row = ui->processTable->rowAt(pos.y());
+        if (row < 0) return;
+        auto* pidItem  = ui->processTable->item(row, 0);
+        auto* nameItem = ui->processTable->item(row, 1);
+        auto* pathItem = ui->processTable->item(row, 2);
+        if (!pidItem || !nameItem) return;
+
+        QString pid  = QString::number(pidItem->data(Qt::EditRole).toUInt());
+        QString name = nameItem->data(Qt::UserRole).toString();
+        QString path = pathItem ? pathItem->text() : QString();
+
+        QMenu menu;
+        auto* copyPid  = menu.addAction(QStringLiteral("Copy PID"));
+        auto* copyName = menu.addAction(QStringLiteral("Copy Name"));
+        QAction* copyPath = nullptr;
+        if (!path.isEmpty())
+            copyPath = menu.addAction(QStringLiteral("Copy Path"));
+
+        auto* chosen = menu.exec(ui->processTable->viewport()->mapToGlobal(pos));
+        if (chosen == copyPid)
+            QApplication::clipboard()->setText(pid);
+        else if (chosen == copyName)
+            QApplication::clipboard()->setText(name);
+        else if (copyPath && chosen == copyPath)
+            QApplication::clipboard()->setText(path);
+    });
+
+    // Auto-focus filter for immediate typing
+    ui->filterEdit->setFocus();
 }
 
 ProcessPicker::~ProcessPicker()
@@ -97,28 +168,31 @@ void ProcessPicker::onProcessSelected()
 {
     auto* item = ui->processTable->currentItem();
     if (!item) return;
-    
+
     int row = item->row();
     m_selectedPid = ui->processTable->item(row, 0)->data(Qt::EditRole).toUInt();
-    m_selectedName = ui->processTable->item(row, 1)->text();
-    
+    // Use original name stored in UserRole (without architecture suffix)
+    QVariant origName = ui->processTable->item(row, 1)->data(Qt::UserRole);
+    m_selectedName = origName.isValid() ? origName.toString()
+                                        : ui->processTable->item(row, 1)->text();
+
     accept();
 }
 
 void ProcessPicker::enumerateProcesses()
 {
     QList<ProcessInfo> processes;
-    
+
 #ifdef _WIN32
     HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
     if (snapshot == INVALID_HANDLE_VALUE) {
         QMessageBox::warning(this, "Error", "Failed to enumerate processes.");
         return;
     }
-    
+
     PROCESSENTRY32W pe32;
     pe32.dwSize = sizeof(PROCESSENTRY32W);
-    
+
     if (Process32FirstW(snapshot, &pe32))
     {
         do
@@ -126,10 +200,7 @@ void ProcessPicker::enumerateProcesses()
             ProcessInfo info;
             info.pid = pe32.th32ProcessID;
             info.name = QString::fromWCharArray(pe32.szExeFile);
-            
-            // Try to get full path and extract icon
-            // If we can't open a process with PROCESS_QUERY_LIMITED_INFORMATION then
-            // we for sure can't access their memory. - Skip in this case
+
             HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pe32.th32ProcessID);
             if (hProcess)
             {
@@ -140,7 +211,7 @@ void ProcessPicker::enumerateProcesses()
                     GetModuleFileNameExW(hProcess, nullptr, path, pathLen))
                 {
                     info.path = QString::fromWCharArray(path);
-                    
+
                     // Extract icon from executable
                     SHFILEINFOW sfi = {};
                     if (SHGetFileInfoW(path, 0, &sfi, sizeof(sfi), SHGFI_ICON | SHGFI_SMALLICON)) {
@@ -158,11 +229,16 @@ void ProcessPicker::enumerateProcesses()
                 {
                     info.path = "";
                 }
+                // Detect 32-bit (WoW64) process
+                BOOL isWow64 = FALSE;
+                if (IsWow64Process(hProcess, &isWow64) && isWow64)
+                    info.is32Bit = true;
+
                 CloseHandle(hProcess);
 
                 processes.append(info);
             }
-            
+
         } while (Process32NextW(snapshot, &pe32));
     }
     
@@ -204,6 +280,16 @@ void ProcessPicker::enumerateProcesses()
         info.name = procName;
         info.path = resolvedPath;
         info.icon = defaultIcon;
+
+        // Detect 32-bit ELF process
+        QFile exeFile(exePath);
+        if (exeFile.open(QIODevice::ReadOnly)) {
+            QByteArray header = exeFile.read(5);
+            if (header.size() >= 5 && header[4] == 1) // ELFCLASS32
+                info.is32Bit = true;
+            exeFile.close();
+        }
+
         processes.append(info);
     }
 #else
@@ -227,11 +313,16 @@ void ProcessPicker::populateTable(const QList<ProcessInfo>& processes)
         pidItem->setData(Qt::EditRole, (int)proc.pid);
         ui->processTable->setItem(i, 0, pidItem);
         
-        // Name column with icon
-        auto* nameItem = new QTableWidgetItem(proc.name);
+        // Name column with icon and architecture indicator
+        QString displayName = proc.is32Bit
+            ? proc.name + QStringLiteral(" (32-bit)")
+            : proc.name;
+        auto* nameItem = new QTableWidgetItem(displayName);
         if (!proc.icon.isNull()) {
             nameItem->setIcon(proc.icon);
         }
+        // Store original name for selectedProcessName()
+        nameItem->setData(Qt::UserRole, proc.name);
         ui->processTable->setItem(i, 1, nameItem);
         
         // Path column with tooltip for full path
@@ -239,6 +330,9 @@ void ProcessPicker::populateTable(const QList<ProcessInfo>& processes)
         pathItem->setToolTip(proc.path);  // Show full path on hover
         ui->processTable->setItem(i, 2, pathItem);
     }
+
+    // Default sort: highest PID first (most recently launched processes on top)
+    ui->processTable->sortItems(0, Qt::DescendingOrder);
 }
 
 void ProcessPicker::filterProcesses(const QString& text)
@@ -269,3 +363,22 @@ void ProcessPicker::applyFilter()
     
     populateTable(filtered);
 }
+
+void ProcessPicker::selectPreferredProcess()
+{
+    // Try to select the last-attached process if it's in the list
+    QSettings s("Reclass", "Reclass");
+    QString lastProc = s.value("lastAttachedProcess").toString();
+    if (lastProc.isEmpty()) return;
+
+    for (int row = 0; row < ui->processTable->rowCount(); ++row) {
+        auto* nameItem = ui->processTable->item(row, 1);
+        if (!nameItem) continue;
+        QString name = nameItem->data(Qt::UserRole).toString();
+        if (name.compare(lastProc, Qt::CaseInsensitive) == 0) {
+            ui->processTable->selectRow(row);
+            ui->processTable->scrollToItem(nameItem);
+            break;
+        }
+    }
+}

src/processpicker.h

@@ -14,6 +14,7 @@ struct ProcessInfo {
     QString name;
     QString path;
     QIcon icon;
+    bool is32Bit = false;
 };
 
 class ProcessPicker : public QDialog
@@ -34,9 +35,11 @@ private slots:
     void filterProcesses(const QString& text);
 
 private:
+    void initUi();
     void enumerateProcesses();
     void populateTable(const QList<ProcessInfo>& processes);
     void applyFilter();
+    void selectPreferredProcess();
 
     Ui::ProcessPicker *ui;
     uint32_t m_selectedPid = 0;

src/processpicker.ui

@@ -127,22 +127,6 @@
  </widget>
  <resources/>
  <connections>
-  <connection>
-   <sender>attachButton</sender>
-   <signal>clicked()</signal>
-   <receiver>ProcessPicker</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>600</x>
-     <y>470</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>350</x>
-     <y>250</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>cancelButton</sender>
    <signal>clicked()</signal>

src/providers/provider.h

@@ -1,11 +1,21 @@
 #pragma once
 #include <QByteArray>
 #include <QString>
+#include <QVector>
 #include <cstdint>
 #include <cstring>
 
 namespace rcx {
 
+struct MemoryRegion {
+    uint64_t base       = 0;
+    uint64_t size       = 0;
+    bool     readable   = true;
+    bool     writable   = false;
+    bool     executable = false;
+    QString  moduleName;
+};
+
 class Provider {
 public:
     virtual ~Provider() = default;
@@ -33,6 +43,10 @@ public:
     // Examples: "File", "Process", "Socket"
     virtual QString kind() const { return QStringLiteral("File"); }
 
+    // Native pointer size of the target (4 for 32-bit, 8 for 64-bit).
+    // Providers should override this to report the target's architecture.
+    virtual int pointerSize() const { return 8; }
+
     // Initial base address discovered by the provider (e.g. main module base).
     // Used by the controller to set tree.baseAddress on first attach.
     // For file/buffer providers this is always 0.
@@ -54,6 +68,18 @@ public:
         return 0;
     }
 
+    // Enumerate committed/readable memory regions.
+    // Used by the scan engine to know what address ranges to scan.
+    // Default: returns empty (scan engine falls back to [0, size())).
+    virtual QVector<MemoryRegion> enumerateRegions() const { return {}; }
+
+    // Process Environment Block address (x64 PEB VA in target process).
+    // Only meaningful for live process providers. Returns 0 if unavailable.
+    virtual uint64_t peb() const { return 0; }
+
+    struct ThreadInfo { uint64_t tebAddress; uint32_t threadId; };
+    virtual QVector<ThreadInfo> tebs() const { return {}; }
+
     // --- Derived convenience (non-virtual, never override) ---
 
     bool isValid() const { return size() > 0; }

src/providers/snapshot_provider.h

@@ -53,6 +53,7 @@ public:
     bool isReadable(uint64_t addr, int len) const override {
         if (len <= 0) return (len == 0);
         uint64_t end = addr + static_cast<uint64_t>(len);
+        if (end < addr) return false;   // overflow
         for (uint64_t p = addr & kPageMask; p < end; p += kPageSize) {
             if (!m_pages.contains(p)) return false;
         }

src/rcxtooltip.h

@@ -0,0 +1,241 @@
+#pragma once
+#include "themes/thememanager.h"
+#include <QWidget>
+#include <QLabel>
+#include <QPainter>
+#include <QPainterPath>
+#include <QApplication>
+#include <QScreen>
+#include <QTimer>
+#include <QPropertyAnimation>
+#include <QCursor>
+#include <cstdio>
+
+#define TIP_LOG(...) do { \
+    FILE* _f = fopen("E:/game_dev/util/reclass2027-main/build/tip_trace.log", "a"); \
+    if (_f) { fprintf(_f, __VA_ARGS__); fclose(_f); } \
+} while(0)
+
+namespace rcx {
+
+class RcxTooltip : public QWidget {
+public:
+    static RcxTooltip* instance() {
+        static RcxTooltip* s = nullptr;
+        if (!s) {
+            s = new RcxTooltip;
+            QObject::connect(&ThemeManager::instance(), &ThemeManager::themeChanged,
+                             s, [](const rcx::Theme&) { /* colors read live in paintEvent */ });
+        }
+        return s;
+    }
+
+    void showFor(QWidget* trigger, const QString& text) {
+        if (!trigger || text.isEmpty()) {
+            TIP_LOG("[TIP] showFor: null trigger or empty text -- dismiss\n");
+            dismiss(); return;
+        }
+
+        // Same widget+text already showing — do nothing (prevents teleport)
+        if (m_trigger == trigger && m_text == text && isVisible()) {
+            TIP_LOG("[TIP] showFor: same widget+text, already visible -- skip\n");
+            return;
+        }
+
+        TIP_LOG("[TIP] showFor: text='%s' trigger=%p class=%s\n",
+               qPrintable(text), (void*)trigger, trigger->metaObject()->className());
+
+        // Cancel pending dismiss
+        if (m_dismissTimer) m_dismissTimer->stop();
+
+        m_trigger = trigger;
+        m_text    = text;
+
+        m_label->setText(text);
+        m_label->adjustSize();
+
+        // ── Size: label + padding + arrow ──
+        const int pad = 8;
+        const int vpad = 4;
+        int bodyW = m_label->sizeHint().width()  + pad * 2;
+        int bodyH = m_label->sizeHint().height() + vpad * 2;
+        int totalW = bodyW;
+        int totalH = bodyH + kArrowH;
+
+        // ── Position relative to trigger widget ──
+        QRect trigGlobal = QRect(trigger->mapToGlobal(QPoint(0, 0)), trigger->size());
+        int trigCenterX  = trigGlobal.center().x();
+
+        QScreen* screen = QApplication::screenAt(trigGlobal.center());
+        QRect scr = screen ? screen->availableGeometry() : QRect(0, 0, 1920, 1080);
+
+        // Default: above the trigger
+        m_arrowDown = true;
+        int x = trigCenterX - totalW / 2;
+        int y = trigGlobal.top() - totalH - kGap;
+
+        // Flip below if not enough room above
+        if (y < scr.top()) {
+            m_arrowDown = false;
+            y = trigGlobal.bottom() + kGap;
+        }
+
+        // Clamp horizontally
+        if (x < scr.left()) x = scr.left() + 2;
+        if (x + totalW > scr.right()) x = scr.right() - totalW - 2;
+
+        // Arrow X in local coords
+        m_arrowLocalX = trigCenterX - x;
+        m_arrowLocalX = qBound(kArrowHalfW + 4, m_arrowLocalX, totalW - kArrowHalfW - 4);
+
+        // Position label inside the body
+        if (m_arrowDown)
+            m_label->move(pad, vpad);
+        else
+            m_label->move(pad, kArrowH + vpad);
+
+        m_bodyRect = m_arrowDown
+            ? QRect(0, 0, bodyW, bodyH)
+            : QRect(0, kArrowH, bodyW, bodyH);
+
+        setFixedSize(totalW, totalH);
+        move(x, y);
+
+        if (!isVisible()) {
+            TIP_LOG("[TIP] showFor: showing at (%d,%d) size=%dx%d arrowDown=%d arrowX=%d\n",
+                   x, y, totalW, totalH, m_arrowDown, m_arrowLocalX);
+            setWindowOpacity(0.0);
+            show();
+            raise();
+            // Fade in
+            auto* anim = new QPropertyAnimation(this, "windowOpacity", this);
+            anim->setDuration(80);
+            anim->setStartValue(0.0);
+            anim->setEndValue(1.0);
+            anim->setEasingCurve(QEasingCurve::OutCubic);
+            anim->start(QAbstractAnimation::DeleteWhenStopped);
+        } else {
+            TIP_LOG("[TIP] showFor: already visible, updating\n");
+            update();
+        }
+    }
+
+    void dismiss() {
+        TIP_LOG("[TIP] dismiss: wasVisible=%d\n", isVisible());
+        if (m_dismissTimer) m_dismissTimer->stop();
+        if (isVisible()) hide();
+        m_trigger = nullptr;
+    }
+
+    // Schedule dismiss with a delay — but only if the cursor has truly
+    // left the trigger+tooltip zone.  Qt fires synthetic Leave events
+    // when a tooltip window appears above the trigger; we must ignore those.
+    void scheduleDismiss() {
+        if (m_trigger) {
+            QPoint cursor = QCursor::pos();
+            QRect trigRect(m_trigger->mapToGlobal(QPoint(0, 0)), m_trigger->size());
+            QRect tipRect(pos(), size());
+            QRect zone = trigRect.united(tipRect).adjusted(-4, -4, 4, 4);
+            bool inside = zone.contains(cursor);
+            TIP_LOG("[TIP] scheduleDismiss: cursor=(%d,%d) zone=(%d,%d %dx%d) inside=%d\n",
+                   cursor.x(), cursor.y(),
+                   zone.x(), zone.y(), zone.width(), zone.height(), inside);
+            if (inside)
+                return;  // cursor still inside — ignore spurious Leave
+        }
+        if (!m_dismissTimer) {
+            m_dismissTimer = new QTimer(this);
+            m_dismissTimer->setSingleShot(true);
+            connect(m_dismissTimer, &QTimer::timeout, this, &RcxTooltip::dismiss);
+        }
+        m_dismissTimer->start(100);
+    }
+
+    QWidget* currentTrigger() const { return m_trigger; }
+
+    // ── Geometry accessors (for testing) ──
+    bool     arrowPointsDown()    const { return m_arrowDown; }
+    int      arrowLocalX()        const { return m_arrowLocalX; }
+    QRect    bodyRect()           const { return m_bodyRect; }
+    QString  currentText()        const { return m_text; }
+
+    // Constants exposed for testing
+    static constexpr int kArrowH     = 6;
+    static constexpr int kArrowHalfW = 6;
+    static constexpr int kGap        = 2;
+
+protected:
+    void paintEvent(QPaintEvent*) override {
+        TIP_LOG("[TIP] paintEvent: size=%dx%d bodyRect=(%d,%d %dx%d)\n",
+               width(), height(),
+               m_bodyRect.x(), m_bodyRect.y(), m_bodyRect.width(), m_bodyRect.height());
+        const auto& theme = ThemeManager::instance().current();
+
+        QPainter p(this);
+        p.setRenderHint(QPainter::Antialiasing);
+
+        // Fill entire widget with the tooltip background first
+        // (no WA_TranslucentBackground, so unpainted areas would be opaque garbage)
+        p.fillRect(rect(), theme.backgroundAlt);
+
+        // Build path: rounded body + triangle arrow
+        QPainterPath path;
+        path.addRoundedRect(QRectF(m_bodyRect), 4.0, 4.0);
+
+        // Triangle arrow
+        QPolygonF arrow;
+        if (m_arrowDown) {
+            int ay = m_bodyRect.bottom();
+            arrow << QPointF(m_arrowLocalX - kArrowHalfW, ay)
+                  << QPointF(m_arrowLocalX, ay + kArrowH)
+                  << QPointF(m_arrowLocalX + kArrowHalfW, ay);
+        } else {
+            int ay = kArrowH;
+            arrow << QPointF(m_arrowLocalX - kArrowHalfW, ay)
+                  << QPointF(m_arrowLocalX, 0)
+                  << QPointF(m_arrowLocalX + kArrowHalfW, ay);
+        }
+        QPainterPath arrowPath;
+        arrowPath.addPolygon(arrow);
+        arrowPath.closeSubpath();
+        path = path.united(arrowPath);
+
+        // Stroke the shape border
+        p.setPen(QPen(theme.border, 1.0));
+        p.setBrush(theme.backgroundAlt);
+        p.drawPath(path);
+    }
+
+private:
+    explicit RcxTooltip()
+        : QWidget(nullptr, Qt::ToolTip | Qt::FramelessWindowHint)
+    {
+        // NOTE: WA_TranslucentBackground removed — it breaks under DWM dark mode
+        // (DwmSetWindowAttribute DWMWA_USE_IMMERSIVE_DARK_MODE kills layered compositing)
+        setAttribute(Qt::WA_ShowWithoutActivating);
+        setAutoFillBackground(false);  // we paint everything ourselves in paintEvent
+
+        m_label = new QLabel(this);
+        m_label->setAlignment(Qt::AlignCenter);
+        updateLabelStyle();
+        connect(&ThemeManager::instance(), &ThemeManager::themeChanged,
+                this, [this](const rcx::Theme&) { updateLabelStyle(); });
+    }
+
+    void updateLabelStyle() {
+        const auto& theme = ThemeManager::instance().current();
+        m_label->setStyleSheet(
+            QStringLiteral("QLabel { color: %1; background: transparent; padding: 0; }")
+                .arg(theme.text.name()));
+    }
+
+    QLabel*   m_label        = nullptr;
+    QWidget*  m_trigger      = nullptr;
+    QString   m_text;
+    QTimer*   m_dismissTimer = nullptr;
+    bool      m_arrowDown    = true;
+    int       m_arrowLocalX  = 0;
+    QRect     m_bodyRect;
+};
+
+} // namespace rcx

src/resources.qrc

@@ -49,11 +49,23 @@
         <file alias="symbol-ruler.svg">vsicons/symbol-ruler.svg</file>
         <file alias="settings-gear.svg">vsicons/settings-gear.svg</file>
         <file alias="chevron-down.svg">vsicons/chevron-down.svg</file>
+        <file alias="chevron-right.svg">vsicons/chevron-right.svg</file>
+        <file alias="chevron-left.svg">vsicons/chevron-left.svg</file>
         <file alias="folder.svg">vsicons/folder.svg</file>
         <file alias="symbol-enum.svg">vsicons/symbol-enum.svg</file>
+        <file alias="symbol-class.svg">vsicons/symbol-class.svg</file>
+        <file alias="symbol-variable.svg">vsicons/symbol-variable.svg</file>
         <file alias="server-process.svg">vsicons/server-process.svg</file>
         <file alias="remote.svg">vsicons/remote.svg</file>
         <file alias="plug.svg">vsicons/plug.svg</file>
         <file alias="clear-all.svg">vsicons/clear-all.svg</file>
+        <file alias="search.svg">vsicons/search.svg</file>
+        <file alias="regex.svg">vsicons/regex.svg</file>
+        <file alias="refresh.svg">vsicons/refresh.svg</file>
+        <file alias="pin.svg">vsicons/pin.svg</file>
+        <file alias="pinned.svg">vsicons/pinned.svg</file>
+        <file alias="close-all.svg">vsicons/close-all.svg</file>
+        <file alias="split-vertical.svg">vsicons/split-vertical.svg</file>
+        <file alias="book.svg">vsicons/book.svg</file>
     </qresource>
 </RCC>

src/scanner.cpp

@@ -0,0 +1,781 @@
+#include "scanner.h"
+#include <QtConcurrent>
+#include <QMetaObject>
+#include <QElapsedTimer>
+#include <QDebug>
+#include <cstring>
+#include <cmath>
+#include <algorithm>
+
+namespace rcx {
+
+// ── Pattern parsing ──
+
+static int hexVal(QChar c) {
+    ushort u = c.unicode();
+    if (u >= '0' && u <= '9') return u - '0';
+    if (u >= 'a' && u <= 'f') return u - 'a' + 10;
+    if (u >= 'A' && u <= 'F') return u - 'A' + 10;
+    return -1;
+}
+
+bool parseSignature(const QString& input, QByteArray& pattern, QByteArray& mask,
+                    QString* errorMsg)
+{
+    pattern.clear();
+    mask.clear();
+
+    QString trimmed = input.trimmed();
+    if (trimmed.isEmpty()) {
+        if (errorMsg) *errorMsg = QStringLiteral("Empty pattern");
+        return false;
+    }
+
+    // Check for C-style: \xAB\xCD
+    if (trimmed.startsWith(QStringLiteral("\\x"))) {
+        QStringList parts = trimmed.split(QStringLiteral("\\x"), Qt::SkipEmptyParts);
+        for (const QString& part : parts) {
+            if (part.size() != 2) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid C-style byte: \\x%1").arg(part);
+                return false;
+            }
+            int hi = hexVal(part[0]);
+            int lo = hexVal(part[1]);
+            if (hi < 0 || lo < 0) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid hex char in: \\x%1").arg(part);
+                return false;
+            }
+            pattern.append(char((hi << 4) | lo));
+            mask.append(char(0xFF));
+        }
+        return !pattern.isEmpty();
+    }
+
+    // Space-separated or packed hex
+    bool hasSpaces = trimmed.contains(' ');
+
+    if (hasSpaces) {
+        QStringList tokens = trimmed.split(' ', Qt::SkipEmptyParts);
+        for (const QString& tok : tokens) {
+            if (tok == QStringLiteral("??") || tok == QStringLiteral("?")) {
+                pattern.append(char(0));
+                mask.append(char(0));
+            } else if (tok.size() == 2) {
+                int hi = hexVal(tok[0]);
+                int lo = hexVal(tok[1]);
+                if (hi < 0 || lo < 0) {
+                    if (errorMsg) *errorMsg = QStringLiteral("Invalid hex byte: %1").arg(tok);
+                    return false;
+                }
+                pattern.append(char((hi << 4) | lo));
+                mask.append(char(0xFF));
+            } else {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid token: %1 (expected 2 hex chars or wildcards)").arg(tok);
+                return false;
+            }
+        }
+    } else {
+        // Packed: "488B??05"
+        if (trimmed.size() % 2 != 0) {
+            if (errorMsg) *errorMsg = QStringLiteral("Odd number of characters in packed pattern");
+            return false;
+        }
+        for (int i = 0; i < trimmed.size(); i += 2) {
+            QChar c0 = trimmed[i], c1 = trimmed[i + 1];
+            if ((c0 == '?' && c1 == '?')) {
+                pattern.append(char(0));
+                mask.append(char(0));
+            } else {
+                int hi = hexVal(c0);
+                int lo = hexVal(c1);
+                if (hi < 0 || lo < 0) {
+                    if (errorMsg) *errorMsg = QStringLiteral("Invalid hex chars at position %1: %2%3")
+                        .arg(i).arg(c0).arg(c1);
+                    return false;
+                }
+                pattern.append(char((hi << 4) | lo));
+                mask.append(char(0xFF));
+            }
+        }
+    }
+
+    if (pattern.isEmpty()) {
+        if (errorMsg) *errorMsg = QStringLiteral("Empty pattern after parsing");
+        return false;
+    }
+
+    return true;
+}
+
+// ── Value serialization ──
+
+template<typename T>
+static void appendLE(QByteArray& out, T val) {
+    out.append(reinterpret_cast<const char*>(&val), sizeof(T));
+}
+
+bool serializeValue(ValueType type, const QString& input,
+                    QByteArray& pattern, QByteArray& mask,
+                    QString* errorMsg)
+{
+    pattern.clear();
+    mask.clear();
+
+    QString trimmed = input.trimmed();
+    if (trimmed.isEmpty()) {
+        if (errorMsg) *errorMsg = QStringLiteral("Empty value");
+        return false;
+    }
+
+    bool ok = false;
+
+    switch (type) {
+    case ValueType::Int8: {
+        int v = trimmed.toInt(&ok);
+        if (!ok || v < -128 || v > 127) {
+            if (errorMsg) *errorMsg = QStringLiteral("Invalid int8 value");
+            return false;
+        }
+        appendLE<int8_t>(pattern, (int8_t)v);
+        break;
+    }
+    case ValueType::Int16: {
+        int v = trimmed.toInt(&ok);
+        if (!ok || v < -32768 || v > 32767) {
+            if (errorMsg) *errorMsg = QStringLiteral("Invalid int16 value");
+            return false;
+        }
+        appendLE<int16_t>(pattern, (int16_t)v);
+        break;
+    }
+    case ValueType::Int32: {
+        int v = trimmed.toInt(&ok);
+        if (!ok) {
+            if (errorMsg) *errorMsg = QStringLiteral("Invalid int32 value");
+            return false;
+        }
+        appendLE<int32_t>(pattern, (int32_t)v);
+        break;
+    }
+    case ValueType::Int64: {
+        qlonglong v = trimmed.toLongLong(&ok);
+        if (!ok) {
+            if (errorMsg) *errorMsg = QStringLiteral("Invalid int64 value");
+            return false;
+        }
+        appendLE<int64_t>(pattern, (int64_t)v);
+        break;
+    }
+    case ValueType::UInt8: {
+        uint v = trimmed.toUInt(&ok);
+        if (!ok || v > 255) {
+            // Try hex
+            if (trimmed.startsWith("0x", Qt::CaseInsensitive))
+                v = trimmed.toUInt(&ok, 16);
+            if (!ok || v > 255) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid uint8 value");
+                return false;
+            }
+        }
+        appendLE<uint8_t>(pattern, (uint8_t)v);
+        break;
+    }
+    case ValueType::UInt16: {
+        uint v = trimmed.toUInt(&ok);
+        if (!ok || v > 65535) {
+            if (trimmed.startsWith("0x", Qt::CaseInsensitive))
+                v = trimmed.toUInt(&ok, 16);
+            if (!ok || v > 65535) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid uint16 value");
+                return false;
+            }
+        }
+        appendLE<uint16_t>(pattern, (uint16_t)v);
+        break;
+    }
+    case ValueType::UInt32: {
+        quint32 v = trimmed.toULong(&ok);
+        if (!ok) {
+            if (trimmed.startsWith("0x", Qt::CaseInsensitive))
+                v = trimmed.toULong(&ok, 16);
+            if (!ok) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid uint32 value");
+                return false;
+            }
+        }
+        appendLE<uint32_t>(pattern, v);
+        break;
+    }
+    case ValueType::UInt64: {
+        quint64 v = trimmed.toULongLong(&ok);
+        if (!ok) {
+            if (trimmed.startsWith("0x", Qt::CaseInsensitive))
+                v = trimmed.toULongLong(&ok, 16);
+            if (!ok) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid uint64 value");
+                return false;
+            }
+        }
+        appendLE<uint64_t>(pattern, v);
+        break;
+    }
+    case ValueType::Float: {
+        float v = trimmed.toFloat(&ok);
+        if (!ok) {
+            if (errorMsg) *errorMsg = QStringLiteral("Invalid float value");
+            return false;
+        }
+        appendLE<float>(pattern, v);
+        break;
+    }
+    case ValueType::Double: {
+        double v = trimmed.toDouble(&ok);
+        if (!ok) {
+            if (errorMsg) *errorMsg = QStringLiteral("Invalid double value");
+            return false;
+        }
+        appendLE<double>(pattern, v);
+        break;
+    }
+    case ValueType::Vec2: {
+        QStringList parts = trimmed.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
+        if (parts.size() != 2) {
+            if (errorMsg) *errorMsg = QStringLiteral("Vec2 requires 2 space-separated floats");
+            return false;
+        }
+        for (const QString& p : parts) {
+            float v = p.toFloat(&ok);
+            if (!ok) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid float in vec2: %1").arg(p);
+                return false;
+            }
+            appendLE<float>(pattern, v);
+        }
+        break;
+    }
+    case ValueType::Vec3: {
+        QStringList parts = trimmed.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
+        if (parts.size() != 3) {
+            if (errorMsg) *errorMsg = QStringLiteral("Vec3 requires 3 space-separated floats");
+            return false;
+        }
+        for (const QString& p : parts) {
+            float v = p.toFloat(&ok);
+            if (!ok) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid float in vec3: %1").arg(p);
+                return false;
+            }
+            appendLE<float>(pattern, v);
+        }
+        break;
+    }
+    case ValueType::Vec4: {
+        QStringList parts = trimmed.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
+        if (parts.size() != 4) {
+            if (errorMsg) *errorMsg = QStringLiteral("Vec4 requires 4 space-separated floats");
+            return false;
+        }
+        for (const QString& p : parts) {
+            float v = p.toFloat(&ok);
+            if (!ok) {
+                if (errorMsg) *errorMsg = QStringLiteral("Invalid float in vec4: %1").arg(p);
+                return false;
+            }
+            appendLE<float>(pattern, v);
+        }
+        break;
+    }
+    case ValueType::UTF8: {
+        QByteArray encoded = trimmed.toUtf8();
+        if (encoded.isEmpty()) {
+            if (errorMsg) *errorMsg = QStringLiteral("Empty UTF-8 string");
+            return false;
+        }
+        pattern = encoded;
+        break;
+    }
+    case ValueType::UTF16: {
+        // UTF-16LE encoding
+        for (int i = 0; i < trimmed.size(); i++) {
+            ushort u = trimmed[i].unicode();
+            appendLE<uint16_t>(pattern, u);
+        }
+        if (pattern.isEmpty()) {
+            if (errorMsg) *errorMsg = QStringLiteral("Empty UTF-16 string");
+            return false;
+        }
+        break;
+    }
+    case ValueType::HexBytes: {
+        // Parse hex bytes (like signature but no wildcards)
+        QByteArray dummyMask;
+        if (!parseSignature(trimmed, pattern, dummyMask, errorMsg))
+            return false;
+        // HexBytes = exact match, no wildcards
+        break;
+    }
+    }
+
+    // Set mask to all 0xFF (exact match) for value scans
+    mask.fill(char(0xFF), pattern.size());
+    return true;
+}
+
+int naturalAlignment(ValueType type) {
+    switch (type) {
+    case ValueType::Int8:
+    case ValueType::UInt8:
+    case ValueType::UTF8:
+    case ValueType::HexBytes:
+        return 1;
+    case ValueType::Int16:
+    case ValueType::UInt16:
+    case ValueType::UTF16:
+        return 2;
+    case ValueType::Int32:
+    case ValueType::UInt32:
+    case ValueType::Float:
+    case ValueType::Vec2:
+    case ValueType::Vec3:
+    case ValueType::Vec4:
+        return 4;
+    case ValueType::Int64:
+    case ValueType::UInt64:
+    case ValueType::Double:
+        return 8;
+    }
+    return 1;
+}
+
+int valueSizeForType(ValueType type) {
+    switch (type) {
+    case ValueType::Int8:  case ValueType::UInt8:  return 1;
+    case ValueType::Int16: case ValueType::UInt16: return 2;
+    case ValueType::Int32: case ValueType::UInt32: case ValueType::Float: return 4;
+    case ValueType::Int64: case ValueType::UInt64: case ValueType::Double: return 8;
+    case ValueType::Vec2: return 8;
+    case ValueType::Vec3: return 12;
+    case ValueType::Vec4: return 16;
+    default: return 4;
+    }
+}
+
+// ── Typed comparison for rescan conditions ──
+
+static int compareTyped(const QByteArray& a, const QByteArray& b, ValueType vt) {
+    const char* da = a.constData();
+    const char* db = b.constData();
+    int sz = qMin(a.size(), b.size());
+
+    switch (vt) {
+    case ValueType::Int8:
+        if (sz >= 1) { int8_t va, vb; memcpy(&va, da, 1); memcpy(&vb, db, 1); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::UInt8:
+        if (sz >= 1) { uint8_t va, vb; memcpy(&va, da, 1); memcpy(&vb, db, 1); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::Int16:
+        if (sz >= 2) { int16_t va, vb; memcpy(&va, da, 2); memcpy(&vb, db, 2); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::UInt16:
+        if (sz >= 2) { uint16_t va, vb; memcpy(&va, da, 2); memcpy(&vb, db, 2); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::Int32:
+        if (sz >= 4) { int32_t va, vb; memcpy(&va, da, 4); memcpy(&vb, db, 4); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::UInt32:
+        if (sz >= 4) { uint32_t va, vb; memcpy(&va, da, 4); memcpy(&vb, db, 4); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::Int64:
+        if (sz >= 8) { int64_t va, vb; memcpy(&va, da, 8); memcpy(&vb, db, 8); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::UInt64:
+        if (sz >= 8) { uint64_t va, vb; memcpy(&va, da, 8); memcpy(&vb, db, 8); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::Float:
+        if (sz >= 4) { float va, vb; memcpy(&va, da, 4); memcpy(&vb, db, 4); return (va > vb) - (va < vb); }
+        break;
+    case ValueType::Double:
+        if (sz >= 8) { double va, vb; memcpy(&va, da, 8); memcpy(&vb, db, 8); return (va > vb) - (va < vb); }
+        break;
+    default:
+        break;
+    }
+    // Fallback: byte comparison
+    return memcmp(da, db, sz);
+}
+
+// ── Scan engine ──
+
+ScanEngine::ScanEngine(QObject* parent)
+    : QObject(parent)
+{
+    qRegisterMetaType<QVector<ScanResult>>("QVector<rcx::ScanResult>");
+}
+
+bool ScanEngine::isRunning() const {
+    return m_watcher && m_watcher->isRunning();
+}
+
+void ScanEngine::abort() {
+    m_abort.store(true);
+}
+
+void ScanEngine::start(std::shared_ptr<Provider> provider, const ScanRequest& req) {
+    if (isRunning()) return;
+
+    if (req.condition != ScanCondition::UnknownValue) {
+        if (req.pattern.isEmpty()) {
+            emit error(QStringLiteral("Empty pattern"));
+            return;
+        }
+        if (req.pattern.size() != req.mask.size()) {
+            emit error(QStringLiteral("Pattern and mask size mismatch"));
+            return;
+        }
+    }
+
+    m_abort.store(false);
+
+    auto* watcher = new QFutureWatcher<QVector<ScanResult>>(this);
+    m_watcher = watcher;
+
+    connect(watcher, &QFutureWatcher<QVector<ScanResult>>::finished, this, [this, watcher]() {
+        auto results = watcher->result();
+        watcher->deleteLater();
+        if (m_watcher == watcher)
+            m_watcher = nullptr;
+        emit finished(results);
+    });
+
+    watcher->setFuture(QtConcurrent::run([this, provider, req]() {
+        return runScan(provider, req);
+    }));
+}
+
+QVector<ScanResult> ScanEngine::runScan(std::shared_ptr<Provider> prov,
+                                         const ScanRequest& req)
+{
+    QElapsedTimer timer;
+    timer.start();
+
+    QVector<ScanResult> results;
+    const bool isUnknown = (req.condition == ScanCondition::UnknownValue);
+
+    if (!prov || (!isUnknown && req.pattern.isEmpty()))
+        return results;
+
+    auto regions = prov->enumerateRegions();
+    qDebug() << "[scan] regions:" << regions.size()
+             << " pattern:" << req.pattern.size() << "bytes"
+             << " align:" << req.alignment
+             << " condition:" << (int)req.condition
+             << " filterExec:" << req.filterExecutable
+             << " filterWrite:" << req.filterWritable;
+
+    // Fallback for providers that don't enumerate regions (file/buffer)
+    if (regions.isEmpty()) {
+        MemoryRegion fallback;
+        fallback.base = 0;
+        fallback.size = (uint64_t)prov->size();
+        fallback.readable = true;
+        fallback.writable = true;
+        fallback.executable = false;
+        regions.append(fallback);
+    }
+
+    const int patternLen = isUnknown ? req.valueSize : req.pattern.size();
+    const char* pat = isUnknown ? nullptr : req.pattern.constData();
+    const char* msk = isUnknown ? nullptr : req.mask.constData();
+    const int alignment = qMax(1, req.alignment);
+    const int valSize = isUnknown ? req.valueSize : patternLen;
+    const bool hasRange = (req.startAddress != 0 || req.endAddress != 0) &&
+                           req.endAddress > req.startAddress;
+
+    // Pre-compute total bytes for progress
+    uint64_t totalBytes = 0;
+    for (const auto& r : regions) {
+        if (req.filterExecutable && !r.executable) continue;
+        if (req.filterWritable && !r.writable) continue;
+        uint64_t rStart = r.base, rEnd = r.base + r.size;
+        if (hasRange) {
+            if (rEnd <= req.startAddress || rStart >= req.endAddress) continue;
+            rStart = qMax(rStart, req.startAddress);
+            rEnd   = qMin(rEnd, req.endAddress);
+        }
+        totalBytes += rEnd - rStart;
+    }
+
+    qDebug() << "[scan] total scannable:" << (totalBytes / 1024) << "KB across filtered regions";
+
+    if (totalBytes == 0) return results;
+
+    uint64_t scannedBytes = 0;
+    int lastPct = -1;
+
+    constexpr int kChunk = 256 * 1024;
+
+    for (const auto& region : regions) {
+        if (m_abort.load()) break;
+
+        if (req.filterExecutable && !region.executable) continue;
+        if (req.filterWritable && !region.writable) continue;
+
+        // Clip region to requested address range
+        uint64_t regStart = region.base;
+        uint64_t regEnd   = region.base + region.size;
+        if (hasRange) {
+            if (regEnd <= req.startAddress || regStart >= req.endAddress) {
+                // Entirely outside range — skip
+                continue;
+            }
+            regStart = qMax(regStart, req.startAddress);
+            regEnd   = qMin(regEnd, req.endAddress);
+        }
+        uint64_t regSize = regEnd - regStart;
+        if (regSize == 0) continue;
+
+        if ((uint64_t)patternLen > regSize) {
+            scannedBytes += regSize;
+            continue;
+        }
+
+        const int overlap = patternLen - 1;
+        QByteArray chunk(qMin((uint64_t)kChunk, regSize), Qt::Uninitialized);
+        uint64_t regOffset = regStart - region.base; // offset within provider region
+
+        for (uint64_t off = 0; off < regSize; ) {
+            if (m_abort.load()) break;
+
+            uint64_t remaining = regSize - off;
+            int readLen = (int)qMin((uint64_t)chunk.size(), remaining);
+
+            if (!prov->read(regStart + off, chunk.data(), readLen)) {
+                // Skip unreadable chunk
+                off += readLen;
+                scannedBytes += readLen;
+                continue;
+            }
+
+            int scanEnd = readLen - patternLen;
+            const char* data = chunk.constData();
+
+            if (isUnknown) {
+                // Unknown value: capture every aligned address
+                for (int i = 0; i <= scanEnd; i += alignment) {
+                    ScanResult r;
+                    r.address = regStart + off + (uint64_t)i;
+                    r.scanValue = QByteArray(data + i, valSize);
+                    results.append(r);
+
+                    if (results.size() >= req.maxResults)
+                        goto done;
+                }
+            } else {
+                // Exact pattern match
+                for (int i = 0; i <= scanEnd; i += alignment) {
+                    bool match = true;
+                    for (int j = 0; j < patternLen; j++) {
+                        if ((data[i + j] & msk[j]) != (pat[j] & msk[j])) {
+                            match = false;
+                            break;
+                        }
+                    }
+                    if (match) {
+                        ScanResult r;
+                        r.address = regStart + off + (uint64_t)i;
+                        r.regionModule = region.moduleName;
+                        r.scanValue = QByteArray(data + i, qMin(16, readLen - i));
+                        results.append(r);
+
+                        if (results.size() >= req.maxResults)
+                            goto done;
+                    }
+                }
+            }
+
+            // Advance with overlap to catch patterns that straddle chunks
+            uint64_t advance;
+            if (readLen > overlap)
+                advance = (uint64_t)(readLen - overlap);
+            else
+                advance = 1; // prevent infinite loop on tiny regions
+            scannedBytes += advance;
+            off += advance;
+
+            // Throttled progress
+            int pct = (int)(scannedBytes * 100 / totalBytes);
+            if (pct > 100) pct = 100;
+            if (pct != lastPct) {
+                lastPct = pct;
+                QMetaObject::invokeMethod(this, "progress",
+                    Qt::QueuedConnection, Q_ARG(int, pct));
+            }
+        }
+    }
+
+done:
+    qDebug() << "[scan] done:" << results.size() << "results in" << timer.elapsed() << "ms"
+             << " scanned:" << (scannedBytes / 1024) << "KB";
+    return results;
+}
+
+void ScanEngine::startRescan(std::shared_ptr<Provider> provider,
+                              QVector<ScanResult> results, int readSize,
+                              ScanCondition condition, ValueType valueType,
+                              const QByteArray& filterPattern,
+                              const QByteArray& filterMask) {
+    if (isRunning()) return;
+
+    m_abort.store(false);
+
+    auto* watcher = new QFutureWatcher<QVector<ScanResult>>(this);
+    m_watcher = watcher;
+
+    connect(watcher, &QFutureWatcher<QVector<ScanResult>>::finished, this, [this, watcher]() {
+        auto results = watcher->result();
+        watcher->deleteLater();
+        if (m_watcher == watcher)
+            m_watcher = nullptr;
+        emit rescanFinished(results);
+    });
+
+    watcher->setFuture(QtConcurrent::run(
+        [this, provider, results = std::move(results), readSize,
+         condition, valueType, filterPattern, filterMask]() mutable {
+            return runRescan(provider, std::move(results), readSize,
+                             condition, valueType, filterPattern, filterMask);
+        }));
+}
+
+QVector<ScanResult> ScanEngine::runRescan(std::shared_ptr<Provider> prov,
+                                           QVector<ScanResult> results, int readSize,
+                                           ScanCondition condition, ValueType valueType,
+                                           const QByteArray& filterPattern,
+                                           const QByteArray& filterMask) {
+    QElapsedTimer timer;
+    timer.start();
+
+    int total = results.size();
+    if (total == 0 || !prov) return results;
+
+    bool hasExactFilter = !filterPattern.isEmpty() && condition == ScanCondition::ExactValue;
+    bool hasComparison = (condition == ScanCondition::Changed ||
+                          condition == ScanCondition::Unchanged ||
+                          condition == ScanCondition::Increased ||
+                          condition == ScanCondition::Decreased);
+    bool needsFilter = hasExactFilter || hasComparison;
+
+    qDebug() << "[rescan] start:" << total << "results, readSize:" << readSize
+             << "condition:" << (int)condition
+             << "exactFilter:" << (hasExactFilter ? "yes" : "no")
+             << "comparison:" << (hasComparison ? "yes" : "no");
+
+    // Save previous values
+    for (auto& r : results)
+        r.previousValue = r.scanValue;
+
+    // Sort indices by address for sequential chunked reads
+    QVector<int> order(total);
+    for (int i = 0; i < total; i++) order[i] = i;
+    std::sort(order.begin(), order.end(), [&results](int a, int b) {
+        return results[a].address < results[b].address;
+    });
+
+    constexpr int kChunk = 256 * 1024;
+    int updated = 0;
+    int lastPct = -1;
+    int chunks = 0;
+    uint64_t totalBytesRead = 0;
+    int i = 0;
+
+    // Track which results matched (by original index)
+    QVector<bool> matched(total, !needsFilter); // if no filter, all match
+
+    while (i < total && !m_abort.load()) {
+        uint64_t spanBase = results[order[i]].address;
+        int spanEnd = i;
+
+        // Extend span while next result fits in the same chunk
+        while (spanEnd + 1 < total) {
+            uint64_t endAddr = results[order[spanEnd + 1]].address + readSize;
+            if (endAddr - spanBase > (uint64_t)kChunk) break;
+            spanEnd++;
+        }
+
+        uint64_t spanLast = results[order[spanEnd]].address;
+        int chunkLen = (int)(spanLast + readSize - spanBase);
+        QByteArray chunk(chunkLen, '\0');
+        prov->read(spanBase, chunk.data(), chunkLen);
+
+        for (int j = i; j <= spanEnd; j++) {
+            int idx = order[j];
+            auto& r = results[idx];
+            int off = (int)(r.address - spanBase);
+            r.scanValue = chunk.mid(off, readSize);
+
+            // Apply exact-value filter
+            if (hasExactFilter) {
+                int patLen = filterPattern.size();
+                if (r.scanValue.size() >= patLen) {
+                    bool ok = true;
+                    const char* data = r.scanValue.constData();
+                    const char* pat  = filterPattern.constData();
+                    const char* msk  = filterMask.constData();
+                    for (int k = 0; k < patLen; k++) {
+                        if ((data[k] & msk[k]) != (pat[k] & msk[k])) {
+                            ok = false;
+                            break;
+                        }
+                    }
+                    matched[idx] = ok;
+                }
+            }
+
+            // Apply comparison-based filter
+            if (hasComparison && !r.previousValue.isEmpty()) {
+                int cmp = compareTyped(r.scanValue, r.previousValue, valueType);
+                switch (condition) {
+                case ScanCondition::Changed:   matched[idx] = (cmp != 0); break;
+                case ScanCondition::Unchanged: matched[idx] = (cmp == 0); break;
+                case ScanCondition::Increased: matched[idx] = (cmp > 0);  break;
+                case ScanCondition::Decreased: matched[idx] = (cmp < 0);  break;
+                default: break;
+                }
+            }
+        }
+
+        chunks++;
+        totalBytesRead += chunkLen;
+        updated += (spanEnd - i + 1);
+        i = spanEnd + 1;
+
+        int pct = updated * 100 / total;
+        if (pct != lastPct) {
+            lastPct = pct;
+            QMetaObject::invokeMethod(this, "progress",
+                Qt::QueuedConnection, Q_ARG(int, pct));
+        }
+    }
+
+    // Filter out non-matching results
+    if (needsFilter) {
+        QVector<ScanResult> filtered;
+        filtered.reserve(total);
+        for (int k = 0; k < total; k++) {
+            if (matched[k])
+                filtered.append(std::move(results[k]));
+        }
+        qDebug() << "[rescan] done:" << filtered.size() << "/" << total
+                 << "matched in" << timer.elapsed() << "ms |" << chunks
+                 << "chunks," << (totalBytesRead / 1024) << "KB read";
+        return filtered;
+    }
+
+    qDebug() << "[rescan] done:" << updated << "/" << total << "results in"
+             << timer.elapsed() << "ms |" << chunks << "chunks,"
+             << (totalBytesRead / 1024) << "KB read";
+    return results;
+}
+
+} // namespace rcx

src/scanner.h

@@ -0,0 +1,117 @@
+#pragma once
+#include "providers/provider.h"
+#include <QObject>
+#include <QByteArray>
+#include <QString>
+#include <QVector>
+#include <QFutureWatcher>
+#include <atomic>
+#include <memory>
+
+namespace rcx {
+
+// ── Value scan types ──
+
+enum class ValueType {
+    Int8, Int16, Int32, Int64,
+    UInt8, UInt16, UInt32, UInt64,
+    Float, Double,
+    Vec2, Vec3, Vec4,
+    UTF8, UTF16,
+    HexBytes
+};
+
+// ── Scan condition (Cheat Engine-style) ──
+
+enum class ScanCondition {
+    ExactValue,      // first scan + rescan: match specific bytes
+    UnknownValue,    // first scan only: capture all aligned addresses
+    Changed,         // rescan: current != previous
+    Unchanged,       // rescan: current == previous
+    Increased,       // rescan: current > previous (numeric)
+    Decreased        // rescan: current < previous (numeric)
+};
+
+// ── Scan request / result ──
+
+struct ScanRequest {
+    QByteArray pattern;             // literal bytes to match (empty for UnknownValue)
+    QByteArray mask;                // 0xFF = must match, 0x00 = wildcard
+
+    bool filterExecutable = false;  // only scan +x regions
+    bool filterWritable   = false;  // only scan +w regions
+
+    int alignment  = 1;             // 1 = every byte, 4 = dword, 8 = qword
+    int maxResults = 50000;
+
+    ScanCondition condition = ScanCondition::ExactValue;
+    int valueSize = 4;              // bytes per value (for unknown scans)
+
+    uint64_t startAddress = 0;      // 0 = no limit (scan all regions)
+    uint64_t endAddress   = 0;      // 0 = no limit (scan all regions)
+};
+
+struct ScanResult {
+    uint64_t   address;
+    QString    regionModule;
+    QByteArray scanValue;       // cached bytes at scan/update time
+    QByteArray previousValue;   // value before last update
+};
+
+// ── Pattern parsing ──
+
+// Parse IDA-style signature string ("48 8B ?? 05") into pattern + mask.
+// Returns true on success. On failure, sets errorMsg.
+bool parseSignature(const QString& input, QByteArray& pattern, QByteArray& mask,
+                    QString* errorMsg = nullptr);
+
+// Serialize a typed value into raw bytes for exact-match scanning.
+// Returns true on success. On failure, sets errorMsg.
+bool serializeValue(ValueType type, const QString& input,
+                    QByteArray& pattern, QByteArray& mask,
+                    QString* errorMsg = nullptr);
+
+// Natural alignment for a value type (used as default alignment for value scans).
+int naturalAlignment(ValueType type);
+
+// Byte-size for a value type (used for unknown scans and rescan read size).
+int valueSizeForType(ValueType type);
+
+// ── Scan engine ──
+
+class ScanEngine : public QObject {
+    Q_OBJECT
+public:
+    explicit ScanEngine(QObject* parent = nullptr);
+
+    void start(std::shared_ptr<Provider> provider, const ScanRequest& req);
+    void startRescan(std::shared_ptr<Provider> provider,
+                     QVector<ScanResult> results, int readSize,
+                     ScanCondition condition = ScanCondition::ExactValue,
+                     ValueType valueType = ValueType::Int32,
+                     const QByteArray& filterPattern = {},
+                     const QByteArray& filterMask = {});
+    void abort();
+    bool isRunning() const;
+
+signals:
+    void progress(int percent);
+    void finished(QVector<ScanResult> results);
+    void rescanFinished(QVector<ScanResult> results);
+    void error(QString message);
+
+private:
+    QVector<ScanResult> runScan(std::shared_ptr<Provider> prov, const ScanRequest& req);
+    QVector<ScanResult> runRescan(std::shared_ptr<Provider> prov,
+                                   QVector<ScanResult> results, int readSize,
+                                   ScanCondition condition, ValueType valueType,
+                                   const QByteArray& filterPattern,
+                                   const QByteArray& filterMask);
+
+    std::atomic<bool> m_abort{false};
+    QFutureWatcher<QVector<ScanResult>>* m_watcher = nullptr;
+};
+
+} // namespace rcx
+
+Q_DECLARE_METATYPE(QVector<rcx::ScanResult>)

src/scannerpanel.cpp

@@ -0,0 +1,833 @@
+#include "scannerpanel.h"
+#include "addressparser.h"
+#include <cstring>
+#include <QElapsedTimer>
+#include <QDebug>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QClipboard>
+#include <QApplication>
+#include <QMenu>
+#include <QPainter>
+
+namespace rcx {
+
+void AddressDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
+                            const QModelIndex& index) const {
+    // Draw background (selection/hover handled by style)
+    QStyleOptionViewItem opt = option;
+    initStyleOption(&opt, index);
+    opt.text.clear();
+    QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &opt, painter);
+
+    QString text = index.data(Qt::DisplayRole).toString();
+    if (text.isEmpty()) return;
+
+    // Find first non-zero hex digit (skip backtick)
+    int dimEnd = 0;
+    for (int i = 0; i < text.size(); i++) {
+        QChar c = text[i];
+        if (c == '`') { dimEnd = i + 1; continue; }
+        if (c != '0') break;
+        dimEnd = i + 1;
+    }
+
+    QRect textRect = opt.rect.adjusted(7, 0, -4, 0); // match item padding
+    painter->setFont(opt.font);
+
+    if (dimEnd > 0) {
+        painter->setPen(dimColor);
+        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text.left(dimEnd));
+        // Advance past dim prefix
+        int dimWidth = painter->fontMetrics().horizontalAdvance(text.left(dimEnd));
+        textRect.setLeft(textRect.left() + dimWidth);
+    }
+    painter->setPen(brightColor);
+    painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text.mid(dimEnd));
+}
+
+ScannerPanel::ScannerPanel(QWidget* parent)
+    : QWidget(parent)
+    , m_engine(new ScanEngine(this))
+{
+    auto* mainLayout = new QVBoxLayout(this);
+    mainLayout->setContentsMargins(6, 6, 6, 6);
+    mainLayout->setSpacing(4);
+
+    // ── Row 1: Mode + pattern/value input ──
+    auto* inputRow = new QHBoxLayout;
+    inputRow->setSpacing(6);
+
+    m_modeCombo = new QComboBox(this);
+    m_modeCombo->addItem(QIcon(QStringLiteral(":/vsicons/regex.svg")),
+                         QStringLiteral("Signature"));
+    m_modeCombo->addItem(QIcon(QStringLiteral(":/vsicons/symbol-variable.svg")),
+                         QStringLiteral("Value"));
+    updateComboWidth();
+    inputRow->addWidget(m_modeCombo);
+
+    // Signature input
+    m_patternLabel = new QLabel(QStringLiteral("Pattern:"), this);
+    inputRow->addWidget(m_patternLabel);
+
+    m_patternEdit = new QLineEdit(this);
+    m_patternEdit->setPlaceholderText(QStringLiteral("48 8B ?? 05 ?? ?? ?? ?? CC"));
+    inputRow->addWidget(m_patternEdit, 1);
+
+    // Value input (hidden initially)
+    m_typeLabel = new QLabel(QStringLiteral("Type:"), this);
+    inputRow->addWidget(m_typeLabel);
+
+    m_typeCombo = new QComboBox(this);
+    m_typeCombo->addItem(QStringLiteral("int8"),    (int)ValueType::Int8);
+    m_typeCombo->addItem(QStringLiteral("int16"),   (int)ValueType::Int16);
+    m_typeCombo->addItem(QStringLiteral("int32"),   (int)ValueType::Int32);
+    m_typeCombo->addItem(QStringLiteral("int64"),   (int)ValueType::Int64);
+    m_typeCombo->addItem(QStringLiteral("uint8"),   (int)ValueType::UInt8);
+    m_typeCombo->addItem(QStringLiteral("uint16"),  (int)ValueType::UInt16);
+    m_typeCombo->addItem(QStringLiteral("uint32"),  (int)ValueType::UInt32);
+    m_typeCombo->addItem(QStringLiteral("uint64"),  (int)ValueType::UInt64);
+    m_typeCombo->addItem(QStringLiteral("float"),   (int)ValueType::Float);
+    m_typeCombo->addItem(QStringLiteral("double"),  (int)ValueType::Double);
+    m_typeCombo->setCurrentIndex(2); // default: int32
+    inputRow->addWidget(m_typeCombo);
+
+    m_condLabel = new QLabel(QStringLiteral("Scan:"), this);
+    inputRow->addWidget(m_condLabel);
+
+    m_condCombo = new QComboBox(this);
+    m_condCombo->addItem(QStringLiteral("Exact Value"),    (int)ScanCondition::ExactValue);
+    m_condCombo->addItem(QStringLiteral("Unknown Value"),  (int)ScanCondition::UnknownValue);
+    m_condCombo->addItem(QStringLiteral("Changed"),        (int)ScanCondition::Changed);
+    m_condCombo->addItem(QStringLiteral("Unchanged"),      (int)ScanCondition::Unchanged);
+    m_condCombo->addItem(QStringLiteral("Increased"),      (int)ScanCondition::Increased);
+    m_condCombo->addItem(QStringLiteral("Decreased"),      (int)ScanCondition::Decreased);
+    inputRow->addWidget(m_condCombo);
+
+    m_valueLabel = new QLabel(QStringLiteral("Value:"), this);
+    inputRow->addWidget(m_valueLabel);
+
+    m_valueEdit = new QLineEdit(this);
+    m_valueEdit->setPlaceholderText(QStringLiteral("12345"));
+    inputRow->addWidget(m_valueEdit, 1);
+
+    mainLayout->addLayout(inputRow);
+
+    // ── Row 2: Filters + scan button + progress ──
+    auto* filterRow = new QHBoxLayout;
+    filterRow->setSpacing(6);
+
+    m_execCheck = new QCheckBox(QStringLiteral("Executable"), this);
+    filterRow->addWidget(m_execCheck);
+
+    m_writeCheck = new QCheckBox(QStringLiteral("Writable"), this);
+    filterRow->addWidget(m_writeCheck);
+
+    m_structOnlyCheck = new QCheckBox(QStringLiteral("Current Struct"), this);
+    filterRow->addWidget(m_structOnlyCheck);
+
+    filterRow->addStretch();
+
+    m_scanBtn = new QPushButton(QIcon(QStringLiteral(":/vsicons/search.svg")),
+                               QStringLiteral("Scan"), this);
+    filterRow->addWidget(m_scanBtn);
+
+    m_updateBtn = new QPushButton(QIcon(QStringLiteral(":/vsicons/refresh.svg")),
+                                  QStringLiteral("Re-scan"), this);
+    m_updateBtn->setEnabled(false);
+    filterRow->addWidget(m_updateBtn);
+
+    m_progressBar = new QProgressBar(this);
+    m_progressBar->setRange(0, 100);
+    m_progressBar->setTextVisible(true);
+    m_progressBar->setFixedWidth(150);
+    m_progressBar->hide();
+    filterRow->addWidget(m_progressBar);
+
+    mainLayout->addLayout(filterRow);
+
+    // ── Results table ──
+    m_resultTable = new QTableWidget(this);
+    m_resultTable->setColumnCount(2);
+    m_resultTable->horizontalHeader()->hide();
+    m_resultTable->verticalHeader()->hide();
+    m_resultTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+    m_resultTable->horizontalHeader()->setStretchLastSection(true);
+    m_resultTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_resultTable->setSelectionMode(QAbstractItemView::SingleSelection);
+    m_resultTable->setEditTriggers(QAbstractItemView::DoubleClicked);
+    m_resultTable->setShowGrid(false);
+    m_resultTable->setMouseTracking(true);
+    m_resultTable->setFocusPolicy(Qt::StrongFocus);
+    m_resultTable->setContextMenuPolicy(Qt::CustomContextMenu);
+
+    // Address column delegate for dimmed leading zeros
+    m_addrDelegate = new AddressDelegate(this);
+    m_resultTable->setItemDelegateForColumn(0, m_addrDelegate);
+    mainLayout->addWidget(m_resultTable, 1);
+
+    // ── Row 3: Status + action buttons ──
+    auto* actionRow = new QHBoxLayout;
+    actionRow->setSpacing(6);
+
+    m_statusLabel = new QLabel(QStringLiteral("Ready"), this);
+    actionRow->addWidget(m_statusLabel, 1);
+
+    m_gotoBtn = new QPushButton(QIcon(QStringLiteral(":/vsicons/arrow-right.svg")),
+                               QStringLiteral("Go to Address"), this);
+    m_gotoBtn->setEnabled(false);
+    actionRow->addWidget(m_gotoBtn);
+
+    m_copyBtn = new QPushButton(QIcon(QStringLiteral(":/vsicons/clippy.svg")),
+                               QStringLiteral("Copy Address"), this);
+    m_copyBtn->setEnabled(false);
+    actionRow->addWidget(m_copyBtn);
+    actionRow->addSpacing(20);  // room for resize grip when floating
+
+    mainLayout->addLayout(actionRow);
+
+    // ── Initial state: signature mode ──
+    m_typeLabel->hide();
+    m_typeCombo->hide();
+    m_condLabel->hide();
+    m_condCombo->hide();
+    m_valueLabel->hide();
+    m_valueEdit->hide();
+    m_execCheck->setChecked(true);
+
+    // ── Connections ──
+    connect(m_modeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &ScannerPanel::onModeChanged);
+    connect(m_condCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &ScannerPanel::onConditionChanged);
+    connect(m_scanBtn, &QPushButton::clicked,
+            this, &ScannerPanel::onScanClicked);
+    connect(m_updateBtn, &QPushButton::clicked,
+            this, &ScannerPanel::onUpdateClicked);
+    connect(m_gotoBtn, &QPushButton::clicked,
+            this, &ScannerPanel::onGoToAddress);
+    connect(m_copyBtn, &QPushButton::clicked,
+            this, &ScannerPanel::onCopyAddress);
+    connect(m_resultTable, &QTableWidget::cellDoubleClicked,
+            this, &ScannerPanel::onResultDoubleClicked);
+    connect(m_resultTable, &QTableWidget::cellChanged,
+            this, &ScannerPanel::onCellEdited);
+    connect(m_resultTable, &QTableWidget::itemSelectionChanged, this, [this]() {
+        bool hasSel = !m_resultTable->selectedItems().isEmpty();
+        m_gotoBtn->setEnabled(hasSel);
+        m_copyBtn->setEnabled(hasSel);
+    });
+
+    connect(m_resultTable, &QWidget::customContextMenuRequested, this, [this](const QPoint& pos) {
+        int row = m_resultTable->rowAt(pos.y());
+        if (row < 0 || row >= m_results.size()) return;
+        QMenu menu;
+        auto* copyAddr = menu.addAction(QIcon(QStringLiteral(":/vsicons/clippy.svg")),
+                                        QStringLiteral("Copy Address"));
+        auto* copyVal = menu.addAction(QIcon(QStringLiteral(":/vsicons/clippy.svg")),
+                                       QStringLiteral("Copy Value"));
+        auto* goTo = menu.addAction(QIcon(QStringLiteral(":/vsicons/arrow-right.svg")),
+                                    QStringLiteral("Go to Address"));
+        auto* chosen = menu.exec(m_resultTable->viewport()->mapToGlobal(pos));
+        if (chosen == copyAddr) {
+            QString addr = QStringLiteral("0x%1")
+                .arg(m_results[row].address, 0, 16, QLatin1Char('0')).toUpper();
+            QApplication::clipboard()->setText(addr);
+            m_statusLabel->setText(QStringLiteral("Copied: %1").arg(addr));
+        } else if (chosen == copyVal) {
+            QApplication::clipboard()->setText(formatValue(m_results[row].scanValue));
+            m_statusLabel->setText(QStringLiteral("Copied value"));
+        } else if (chosen == goTo) {
+            emit goToAddress(m_results[row].address);
+        }
+    });
+
+    connect(m_engine, &ScanEngine::progress, this, [this](int pct) {
+        m_progressBar->setValue(pct);
+    });
+    connect(m_engine, &ScanEngine::finished,
+            this, &ScannerPanel::onScanFinished);
+    connect(m_engine, &ScanEngine::rescanFinished,
+            this, &ScannerPanel::onRescanFinished);
+    connect(m_engine, &ScanEngine::error, this, [this](const QString& msg) {
+        m_statusLabel->setText(QStringLiteral("Error: %1").arg(msg));
+        m_scanBtn->setText(QStringLiteral("Scan"));
+        m_progressBar->hide();
+    });
+}
+
+void ScannerPanel::setProviderGetter(ProviderGetter getter) {
+    m_providerGetter = std::move(getter);
+}
+
+void ScannerPanel::setBoundsGetter(BoundsGetter getter) {
+    m_boundsGetter = std::move(getter);
+}
+
+void ScannerPanel::setEditorFont(const QFont& font) {
+    m_resultTable->setFont(font);
+    QFontMetrics fm(font);
+    m_resultTable->verticalHeader()->setDefaultSectionSize(fm.height() + 6);
+    // Address column width: "00000000`00000000" + padding
+    m_resultTable->setColumnWidth(0, fm.horizontalAdvance(QStringLiteral("00000000`00000000")) + 20);
+    m_patternEdit->setFont(font);
+    m_valueEdit->setFont(font);
+    m_modeCombo->setFont(font);
+    m_typeCombo->setFont(font);
+    m_condCombo->setFont(font);
+    m_statusLabel->setFont(font);
+    m_scanBtn->setFont(font);
+    m_gotoBtn->setFont(font);
+    m_copyBtn->setFont(font);
+    m_patternLabel->setFont(font);
+    m_typeLabel->setFont(font);
+    m_condLabel->setFont(font);
+    m_valueLabel->setFont(font);
+    m_execCheck->setFont(font);
+    m_writeCheck->setFont(font);
+    m_structOnlyCheck->setFont(font);
+    m_updateBtn->setFont(font);
+    updateComboWidth();
+}
+
+void ScannerPanel::updateComboWidth() {
+    QFontMetrics fm(m_modeCombo->font());
+    int maxW = 0;
+    for (int i = 0; i < m_modeCombo->count(); i++)
+        maxW = qMax(maxW, fm.horizontalAdvance(m_modeCombo->itemText(i)));
+    m_modeCombo->setFixedWidth(maxW + 50); // icon + dropdown arrow + padding
+}
+
+void ScannerPanel::onModeChanged(int index) {
+    bool isSig = (index == 0);
+
+    m_patternLabel->setVisible(isSig);
+    m_patternEdit->setVisible(isSig);
+
+    m_typeLabel->setVisible(!isSig);
+    m_typeCombo->setVisible(!isSig);
+    m_condLabel->setVisible(!isSig);
+    m_condCombo->setVisible(!isSig);
+
+    // Enable/disable value input based on condition
+    auto cond = (ScanCondition)m_condCombo->currentData().toInt();
+    bool needsValue = !isSig && (cond == ScanCondition::ExactValue);
+    m_valueLabel->setVisible(!isSig);
+    m_valueEdit->setVisible(!isSig);
+    m_valueEdit->setEnabled(needsValue);
+    m_valueLabel->setEnabled(needsValue);
+
+    // Auto-toggle filters: signatures → executable code, values → writable data
+    m_execCheck->setChecked(isSig);
+    m_writeCheck->setChecked(!isSig);
+}
+
+void ScannerPanel::onConditionChanged(int /*index*/) {
+    auto cond = (ScanCondition)m_condCombo->currentData().toInt();
+    bool needsValue = (cond == ScanCondition::ExactValue);
+    m_valueEdit->setEnabled(needsValue);
+    m_valueLabel->setEnabled(needsValue);
+}
+
+void ScannerPanel::onScanClicked() {
+    if (m_engine->isRunning()) {
+        m_engine->abort();
+        return; // finished/rescanFinished handler resets UI
+    }
+
+    // Get provider
+    std::shared_ptr<Provider> provider;
+    if (m_providerGetter)
+        provider = m_providerGetter();
+
+    if (!provider) {
+        m_statusLabel->setText(QStringLiteral("No source attached"));
+        return;
+    }
+
+    // Build request
+    ScanRequest req = buildRequest();
+    if (req.condition != ScanCondition::UnknownValue && req.pattern.isEmpty())
+        return; // error already shown by buildRequest
+
+    m_lastScanMode = m_modeCombo->currentIndex();
+    if (m_lastScanMode == 1) {
+        m_lastValueType = (ValueType)m_typeCombo->currentData().toInt();
+        m_lastCondition = req.condition;
+    }
+    m_lastPattern = req.pattern;
+
+    m_scanBtn->setText(QStringLiteral("Cancel"));
+    m_progressBar->setValue(0);
+    m_progressBar->show();
+    m_statusLabel->setText(QStringLiteral("Scanning..."));
+
+    m_engine->start(provider, req);
+}
+
+ScanRequest ScannerPanel::buildRequest() {
+    ScanRequest req;
+    QString err;
+
+    if (m_modeCombo->currentIndex() == 0) {
+        // Signature mode
+        if (!parseSignature(m_patternEdit->text(), req.pattern, req.mask, &err)) {
+            m_statusLabel->setText(QStringLiteral("Pattern error: %1").arg(err));
+            return {};
+        }
+        req.alignment = 1;
+    } else {
+        // Value mode
+        auto vt = (ValueType)m_typeCombo->currentData().toInt();
+        auto cond = (ScanCondition)m_condCombo->currentData().toInt();
+
+        // Comparison conditions on fresh scan → treat as unknown
+        if (cond == ScanCondition::Changed || cond == ScanCondition::Unchanged ||
+            cond == ScanCondition::Increased || cond == ScanCondition::Decreased) {
+            cond = ScanCondition::UnknownValue;
+        }
+
+        req.condition = cond;
+        req.alignment = naturalAlignment(vt);
+        req.valueSize = valueSizeForType(vt);
+
+        if (cond == ScanCondition::UnknownValue) {
+            // No pattern needed — capture all aligned addresses
+            req.maxResults = 10000000;
+        } else {
+            // Exact value mode
+            if (!serializeValue(vt, m_valueEdit->text(), req.pattern, req.mask, &err)) {
+                m_statusLabel->setText(QStringLiteral("Value error: %1").arg(err));
+                return {};
+            }
+        }
+    }
+
+    req.filterExecutable = m_execCheck->isChecked();
+    req.filterWritable = m_writeCheck->isChecked();
+
+    if (m_structOnlyCheck->isChecked() && m_boundsGetter) {
+        auto bounds = m_boundsGetter();
+        if (bounds.size > 0) {
+            req.startAddress = bounds.start;
+            req.endAddress   = bounds.start + bounds.size;
+        }
+    }
+
+    return req;
+}
+
+void ScannerPanel::onScanFinished(QVector<ScanResult> results) {
+    m_scanBtn->setText(QStringLiteral("Scan"));
+    m_progressBar->hide();
+    m_results = std::move(results);
+
+    // Bytes are cached by the engine during scan.
+    // Value mode (exact): override with exact search pattern (engine caches raw chunk bytes).
+    // Unknown mode: keep engine-captured bytes as-is (they're the baseline).
+    for (auto& r : m_results) {
+        r.previousValue.clear();
+        if (m_lastScanMode == 1 && m_lastCondition == ScanCondition::ExactValue)
+            r.scanValue = m_lastPattern;
+    }
+
+    m_updateBtn->setEnabled(!m_results.isEmpty());
+    {
+        QElapsedTimer pt;
+        pt.start();
+        populateTable(false);
+        qDebug() << "[panel] populateTable(initial):" << m_results.size()
+                 << "results," << pt.elapsed() << "ms";
+    }
+
+    int n = m_results.size();
+    if (m_lastCondition == ScanCondition::UnknownValue && n >= 10000000)
+        m_statusLabel->setText(QStringLiteral("%1 results (capped — narrow with Re-scan)").arg(n));
+    else
+        m_statusLabel->setText(QStringLiteral("%1 result%2").arg(n).arg(n == 1 ? "" : "s"));
+}
+
+void ScannerPanel::populateTable(bool showPrevious) {
+    constexpr int kMaxRows = 10000;
+
+    m_resultTable->blockSignals(true);
+    int cols = showPrevious ? 3 : 2;
+    m_resultTable->setColumnCount(cols);
+    int displayCount = qMin(m_results.size(), kMaxRows);
+    m_resultTable->setRowCount(displayCount);
+
+    for (int i = 0; i < displayCount; i++) {
+        const auto& r = m_results[i];
+
+        // Address column — WinDbg backtick format: 00000000`00000000
+        QString hexPart = QStringLiteral("%1").arg(r.address, 16, 16, QLatin1Char('0')).toUpper();
+        hexPart.insert(8, '`');
+        auto* addrItem = new QTableWidgetItem(hexPart);
+        addrItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
+        m_resultTable->setItem(i, 0, addrItem);
+
+        // Value column
+        auto* valItem = new QTableWidgetItem(formatValue(r.scanValue));
+        valItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
+        m_resultTable->setItem(i, 1, valItem);
+
+        // Previous column
+        if (showPrevious) {
+            auto* prevItem = new QTableWidgetItem(
+                r.previousValue.isEmpty() ? QString() : formatValue(r.previousValue));
+            prevItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+            m_resultTable->setItem(i, 2, prevItem);
+        }
+    }
+
+    m_resultTable->blockSignals(false);
+}
+
+void ScannerPanel::onUpdateClicked() {
+    if (m_results.isEmpty() || m_engine->isRunning()) return;
+
+    std::shared_ptr<Provider> prov;
+    if (m_providerGetter)
+        prov = m_providerGetter();
+    if (!prov) {
+        m_statusLabel->setText(QStringLiteral("No source attached"));
+        return;
+    }
+
+    int readSize = (m_lastScanMode == 1) ? valueSize() : 16;
+
+    // Determine rescan condition
+    ScanCondition cond = ScanCondition::ExactValue;
+    if (m_lastScanMode == 1)
+        cond = (ScanCondition)m_condCombo->currentData().toInt();
+
+    // For UnknownValue on rescan, just re-read all (update only, no filter)
+    if (cond == ScanCondition::UnknownValue)
+        cond = ScanCondition::ExactValue; // with empty filter = update only
+
+    // Build filter from current input field (only for ExactValue condition)
+    QByteArray filterPattern, filterMask;
+    if (cond == ScanCondition::ExactValue) {
+        if (m_lastScanMode == 0) {
+            // Signature mode
+            QString err;
+            if (!m_patternEdit->text().trimmed().isEmpty()) {
+                if (!parseSignature(m_patternEdit->text(), filterPattern, filterMask, &err)) {
+                    m_statusLabel->setText(QStringLiteral("Pattern error: %1").arg(err));
+                    return;
+                }
+            }
+        } else {
+            // Value mode — exact value filter
+            QString err;
+            if (!m_valueEdit->text().trimmed().isEmpty()) {
+                auto vt = (ValueType)m_typeCombo->currentData().toInt();
+                if (!serializeValue(vt, m_valueEdit->text(), filterPattern, filterMask, &err)) {
+                    m_statusLabel->setText(QStringLiteral("Value error: %1").arg(err));
+                    return;
+                }
+                m_lastValueType = vt;
+            }
+        }
+    }
+    // Comparison conditions (Changed/Unchanged/Increased/Decreased) don't need a filter pattern
+
+    // Update last pattern so display uses the new value
+    if (!filterPattern.isEmpty())
+        m_lastPattern = filterPattern;
+
+    m_preRescanCount = m_results.size();
+    m_updateBtn->setEnabled(false);
+    m_scanBtn->setText(QStringLiteral("Cancel"));
+    m_statusLabel->setText(QStringLiteral("Re-scanning..."));
+    m_progressBar->setValue(0);
+    m_progressBar->show();
+
+    m_engine->startRescan(prov, m_results, readSize, cond, m_lastValueType,
+                          filterPattern, filterMask);
+}
+
+void ScannerPanel::onRescanFinished(QVector<ScanResult> results) {
+    m_scanBtn->setText(QStringLiteral("Scan"));
+    m_progressBar->hide();
+    m_results = std::move(results);
+    m_updateBtn->setEnabled(!m_results.isEmpty());
+
+    {
+        QElapsedTimer pt;
+        pt.start();
+        populateTable(true);
+        qDebug() << "[panel] populateTable(rescan):" << m_results.size()
+                 << "results," << pt.elapsed() << "ms";
+    }
+
+    int n = m_results.size();
+    if (m_preRescanCount > 0 && n < m_preRescanCount)
+        m_statusLabel->setText(QStringLiteral("%1 of %2 results match")
+            .arg(n).arg(m_preRescanCount));
+    else
+        m_statusLabel->setText(QStringLiteral("Updated %1 result%2")
+            .arg(n).arg(n == 1 ? "" : "s"));
+}
+
+void ScannerPanel::onGoToAddress() {
+    int row = m_resultTable->currentRow();
+    if (row < 0 || row >= m_results.size()) return;
+    emit goToAddress(m_results[row].address);
+}
+
+void ScannerPanel::onCopyAddress() {
+    int row = m_resultTable->currentRow();
+    if (row < 0 || row >= m_results.size()) return;
+
+    QString addr = QStringLiteral("0x%1")
+        .arg(m_results[row].address, 0, 16, QLatin1Char('0')).toUpper();
+    QApplication::clipboard()->setText(addr);
+    m_statusLabel->setText(QStringLiteral("Copied: %1").arg(addr));
+}
+
+void ScannerPanel::onResultDoubleClicked(int row, int col) {
+    // Double-click on address column navigates (editing also starts via edit trigger)
+    // Double-click on preview column only starts inline editing
+    Q_UNUSED(col);
+    Q_UNUSED(row);
+    // Navigation is handled by Go to Address button or onCellEdited for address expressions
+}
+
+void ScannerPanel::onCellEdited(int row, int col) {
+    if (row < 0 || row >= m_results.size()) return;
+
+    auto* item = m_resultTable->item(row, col);
+    if (!item) return;
+    QString text = item->text().trimmed();
+
+    if (col == 0) {
+        // Address column — evaluate expression via AddressParser
+        AddressParserCallbacks cbs;
+        std::shared_ptr<Provider> prov;
+        if (m_providerGetter)
+            prov = m_providerGetter();
+        if (prov) {
+            auto* p = prov.get();
+            cbs.resolveModule = [p](const QString& name, bool* ok) -> uint64_t {
+                uint64_t base = p->symbolToAddress(name);
+                *ok = (base != 0);
+                return base;
+            };
+            int ptrSz = p->pointerSize();
+            cbs.readPointer = [p, ptrSz](uint64_t addr, bool* ok) -> uint64_t {
+                uint64_t val = 0;
+                *ok = p->read(addr, &val, ptrSz);
+                return val;
+            };
+        }
+        int evalPtrSize = prov ? prov->pointerSize() : 8;
+        auto result = AddressParser::evaluate(text, evalPtrSize, &cbs);
+        if (result.ok) {
+            m_results[row].address = result.value;
+            emit goToAddress(result.value);
+            // Reformat the address cell
+            m_resultTable->blockSignals(true);
+            QString hexPart = QStringLiteral("%1").arg(result.value, 16, 16, QLatin1Char('0')).toUpper();
+            hexPart.insert(8, '`');
+            item->setText(hexPart);
+            // Re-read preview at new address and update cache
+            if (prov) {
+                int readSize = (m_lastScanMode == 1) ? valueSize() : 16;
+                m_results[row].scanValue = prov->readBytes(result.value, readSize);
+                if (auto* prevItem = m_resultTable->item(row, 1))
+                    prevItem->setText(formatValue(m_results[row].scanValue));
+            }
+            m_resultTable->blockSignals(false);
+        } else {
+            m_statusLabel->setText(QStringLiteral("Expression error: %1").arg(result.error));
+            // Restore original address
+            m_resultTable->blockSignals(true);
+            QString hexPart = QStringLiteral("%1").arg(m_results[row].address, 16, 16, QLatin1Char('0')).toUpper();
+            hexPart.insert(8, '`');
+            item->setText(hexPart);
+            m_resultTable->blockSignals(false);
+        }
+    } else if (col == 1) {
+        // Preview column — parse hex bytes and write to provider
+        std::shared_ptr<Provider> prov;
+        if (m_providerGetter)
+            prov = m_providerGetter();
+        if (!prov || !prov->isWritable()) {
+            m_statusLabel->setText(QStringLiteral("Provider is read-only"));
+            return;
+        }
+        QByteArray bytes;
+        uint64_t addr = m_results[row].address;
+
+        if (m_lastScanMode == 0) {
+            // Signature mode — parse space-separated hex bytes
+            QStringList tokens = text.split(' ', Qt::SkipEmptyParts);
+            for (const QString& tok : tokens) {
+                bool ok;
+                uint val = tok.toUInt(&ok, 16);
+                if (!ok || val > 0xFF) {
+                    m_statusLabel->setText(QStringLiteral("Invalid hex byte: %1").arg(tok));
+                    return;
+                }
+                bytes.append(char(val));
+            }
+        } else {
+            // Value mode — parse native type
+            bool ok = false;
+            bytes.resize(valueSize());
+            char* d = bytes.data();
+            switch (m_lastValueType) {
+            case ValueType::Int8:   { auto v = (int8_t)text.toInt(&ok);     if (ok) memcpy(d, &v, 1); break; }
+            case ValueType::UInt8:  { auto v = (uint8_t)text.toUInt(&ok);   if (ok) memcpy(d, &v, 1); break; }
+            case ValueType::Int16:  { auto v = (int16_t)text.toShort(&ok);  if (ok) memcpy(d, &v, 2); break; }
+            case ValueType::UInt16: { auto v = text.toUShort(&ok);          if (ok) memcpy(d, &v, 2); break; }
+            case ValueType::Int32:  { auto v = text.toInt(&ok);             if (ok) memcpy(d, &v, 4); break; }
+            case ValueType::UInt32: { auto v = text.toUInt(&ok);            if (ok) memcpy(d, &v, 4); break; }
+            case ValueType::Int64:  { auto v = text.toLongLong(&ok);        if (ok) memcpy(d, &v, 8); break; }
+            case ValueType::UInt64: { auto v = text.toULongLong(&ok);       if (ok) memcpy(d, &v, 8); break; }
+            case ValueType::Float:  { auto v = text.toFloat(&ok);           if (ok) memcpy(d, &v, 4); break; }
+            case ValueType::Double: { auto v = text.toDouble(&ok);          if (ok) memcpy(d, &v, 8); break; }
+            default: break;
+            }
+            if (!ok) {
+                m_statusLabel->setText(QStringLiteral("Invalid value"));
+                return;
+            }
+        }
+        if (bytes.isEmpty()) return;
+
+        if (prov->writeBytes(addr, bytes)) {
+            m_statusLabel->setText(QStringLiteral("Wrote %1 byte%2 to 0x%3")
+                .arg(bytes.size())
+                .arg(bytes.size() == 1 ? "" : "s")
+                .arg(QString::number(addr, 16).toUpper()));
+            // Re-read and update cache
+            m_resultTable->blockSignals(true);
+            int readSize = (m_lastScanMode == 1) ? valueSize() : 16;
+            m_results[row].scanValue = prov->readBytes(addr, readSize);
+            item->setText(formatValue(m_results[row].scanValue));
+            m_resultTable->blockSignals(false);
+        } else {
+            m_statusLabel->setText(QStringLiteral("Write failed"));
+        }
+    }
+}
+
+void ScannerPanel::applyTheme(const Theme& theme) {
+    // Address delegate colors
+    m_addrDelegate->dimColor = theme.textFaint;
+    m_addrDelegate->brightColor = theme.text;
+
+    // Results table — editor-matching style
+    m_resultTable->setStyleSheet(QStringLiteral(
+        "QTableWidget { background: %1; color: %2; border: none; }"
+        "QTableWidget::item { padding: 2px 6px; border: none; }"
+        "QTableWidget::item:hover { background: %3; padding: 2px 6px; border: none; }"
+        "QTableWidget::item:selected { background: %3; color: %2; padding: 2px 6px; border: none; }"
+        "QTableWidget QLineEdit { background: %1; color: %2; border: 1px solid %4;"
+        "  padding: 1px 4px; selection-background-color: %5; }")
+        .arg(theme.background.name(), theme.text.name(), theme.hover.name(),
+             theme.borderFocused.name(), theme.selection.name()));
+
+    // Input fields
+    QString lineEditStyle = QStringLiteral(
+        "QLineEdit { background: %1; color: %2; border: 1px solid %3; padding: 2px 4px; }"
+        "QLineEdit:focus { border-color: %4; }")
+        .arg(theme.background.name(), theme.text.name(),
+             theme.border.name(), theme.borderFocused.name());
+    m_patternEdit->setStyleSheet(lineEditStyle);
+    m_valueEdit->setStyleSheet(lineEditStyle);
+
+    // Combo boxes
+    QString comboStyle = QStringLiteral(
+        "QComboBox { background: %1; color: %2; border: 1px solid %3; padding: 2px 4px 2px 4px; }"
+        "QComboBox::drop-down { subcontrol-origin: padding; subcontrol-position: top right;"
+        "  width: 16px; border-left: 1px solid %3; }"
+        "QComboBox::down-arrow { image: url(:/vsicons/chevron-down.svg); width: 10px; height: 10px; }"
+        "QComboBox QAbstractItemView { background: %1; color: %2; selection-background-color: %4; }")
+        .arg(theme.background.name(), theme.text.name(),
+             theme.border.name(), theme.hover.name());
+    m_modeCombo->setStyleSheet(comboStyle);
+    m_typeCombo->setStyleSheet(comboStyle);
+    m_condCombo->setStyleSheet(comboStyle);
+
+    // Labels
+    QPalette lp;
+    lp.setColor(QPalette::WindowText, theme.textDim);
+    m_patternLabel->setPalette(lp);
+    m_typeLabel->setPalette(lp);
+    m_condLabel->setPalette(lp);
+    m_valueLabel->setPalette(lp);
+    m_statusLabel->setPalette(lp);
+
+    // Checkboxes
+    QPalette cp;
+    cp.setColor(QPalette::WindowText, theme.textDim);
+    m_execCheck->setPalette(cp);
+    m_writeCheck->setPalette(cp);
+    m_structOnlyCheck->setPalette(cp);
+
+    // Buttons
+    QString btnStyle = QStringLiteral(
+        "QPushButton { background: %1; color: %2; border: 1px solid %3; padding: 4px 12px; }"
+        "QPushButton:hover { background: %4; }"
+        "QPushButton:pressed { background: %5; }"
+        "QPushButton:disabled { color: %6; }")
+        .arg(theme.button.name(), theme.text.name(), theme.border.name(),
+             theme.hover.name(), theme.hover.darker(130).name(),
+             theme.textMuted.name());
+    m_scanBtn->setStyleSheet(btnStyle);
+    m_updateBtn->setStyleSheet(btnStyle);
+    m_gotoBtn->setStyleSheet(btnStyle);
+    m_copyBtn->setStyleSheet(btnStyle);
+
+    // Progress bar
+    m_progressBar->setStyleSheet(QStringLiteral(
+        "QProgressBar { background: %1; border: 1px solid %2; text-align: center; color: %3; }"
+        "QProgressBar::chunk { background: %4; }")
+        .arg(theme.background.name(), theme.border.name(),
+             theme.textDim.name(), theme.indHoverSpan.name()));
+}
+
+int ScannerPanel::valueSize() const {
+    switch (m_lastValueType) {
+    case ValueType::Int8:  case ValueType::UInt8:  return 1;
+    case ValueType::Int16: case ValueType::UInt16: return 2;
+    case ValueType::Int32: case ValueType::UInt32: case ValueType::Float: return 4;
+    case ValueType::Int64: case ValueType::UInt64: case ValueType::Double: return 8;
+    default: return 16;
+    }
+}
+
+QString ScannerPanel::formatValue(const QByteArray& bytes) const {
+    if (m_lastScanMode == 0) {
+        // Signature mode — hex bytes
+        QString s;
+        for (int j = 0; j < bytes.size(); j++) {
+            if (j > 0) s += ' ';
+            s += QStringLiteral("%1").arg((uint8_t)bytes[j], 2, 16, QLatin1Char('0')).toUpper();
+        }
+        return s;
+    }
+    // Value mode — native type
+    const char* d = bytes.constData();
+    int sz = bytes.size();
+    switch (m_lastValueType) {
+    case ValueType::Int8:   if (sz >= 1) return QString::number((int8_t)d[0]); break;
+    case ValueType::UInt8:  if (sz >= 1) return QString::number((uint8_t)d[0]); break;
+    case ValueType::Int16:  if (sz >= 2) { int16_t v; memcpy(&v, d, 2); return QString::number(v); } break;
+    case ValueType::UInt16: if (sz >= 2) { uint16_t v; memcpy(&v, d, 2); return QString::number(v); } break;
+    case ValueType::Int32:  if (sz >= 4) { int32_t v; memcpy(&v, d, 4); return QString::number(v); } break;
+    case ValueType::UInt32: if (sz >= 4) { uint32_t v; memcpy(&v, d, 4); return QString::number(v); } break;
+    case ValueType::Int64:  if (sz >= 8) { int64_t v; memcpy(&v, d, 8); return QString::number(v); } break;
+    case ValueType::UInt64: if (sz >= 8) { uint64_t v; memcpy(&v, d, 8); return QString::number(v); } break;
+    case ValueType::Float:  if (sz >= 4) { float v; memcpy(&v, d, 4); return QString::number(v, 'g', 9); } break;
+    case ValueType::Double: if (sz >= 8) { double v; memcpy(&v, d, 8); return QString::number(v, 'g', 17); } break;
+    default: break;
+    }
+    return QStringLiteral("??");
+}
+
+} // namespace rcx

src/scannerpanel.h

@@ -0,0 +1,127 @@
+#pragma once
+#include "scanner.h"
+#include "themes/theme.h"
+#include <QWidget>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QProgressBar>
+#include <QTableWidget>
+#include <QStyledItemDelegate>
+#include <QLabel>
+#include <functional>
+#include <memory>
+
+namespace rcx {
+
+// Delegate that paints address with dimmed high-bytes prefix
+class AddressDelegate : public QStyledItemDelegate {
+    Q_OBJECT
+public:
+    using QStyledItemDelegate::QStyledItemDelegate;
+    QColor dimColor;
+    QColor brightColor;
+    void paint(QPainter* painter, const QStyleOptionViewItem& option,
+               const QModelIndex& index) const override;
+};
+
+class ScannerPanel : public QWidget {
+    Q_OBJECT
+public:
+    explicit ScannerPanel(QWidget* parent = nullptr);
+
+    using ProviderGetter = std::function<std::shared_ptr<Provider>()>;
+    void setProviderGetter(ProviderGetter getter);
+
+    struct StructBounds { uint64_t start = 0; uint64_t size = 0; };
+    using BoundsGetter = std::function<StructBounds()>;
+    void setBoundsGetter(BoundsGetter getter);
+
+    void setEditorFont(const QFont& font);
+    void applyTheme(const Theme& theme);
+
+    // Test accessors
+    QComboBox*    modeCombo()    const { return m_modeCombo; }
+    QLineEdit*    patternEdit()  const { return m_patternEdit; }
+    QComboBox*    typeCombo()    const { return m_typeCombo; }
+    QLineEdit*    valueEdit()    const { return m_valueEdit; }
+    QCheckBox*    execCheck()    const { return m_execCheck; }
+    QCheckBox*    writeCheck()   const { return m_writeCheck; }
+    QPushButton*  scanButton()   const { return m_scanBtn; }
+    QPushButton*  updateButton() const { return m_updateBtn; }
+    QProgressBar* progressBar()  const { return m_progressBar; }
+    QTableWidget* resultsTable() const { return m_resultTable; }
+    QLabel*       statusLabel()  const { return m_statusLabel; }
+    QPushButton*  gotoButton()   const { return m_gotoBtn; }
+    QPushButton*  copyButton()   const { return m_copyBtn; }
+    ScanEngine*   engine()       const { return m_engine; }
+    QComboBox*    condCombo()    const { return m_condCombo; }
+    QLabel*       condLabel()    const { return m_condLabel; }
+    QCheckBox*    structOnlyCheck() const { return m_structOnlyCheck; }
+
+signals:
+    void goToAddress(uint64_t address);
+
+private slots:
+    void onModeChanged(int index);
+    void onScanClicked();
+    void onScanFinished(QVector<ScanResult> results);
+    void onGoToAddress();
+    void onCopyAddress();
+    void onResultDoubleClicked(int row, int col);
+    void onCellEdited(int row, int col);
+    void onUpdateClicked();
+    void onRescanFinished(QVector<ScanResult> results);
+
+private:
+    ScanRequest buildRequest();
+    void populateTable(bool showPrevious);
+    void updateComboWidth();
+
+    void onConditionChanged(int index);
+
+    // Input widgets
+    QComboBox*    m_modeCombo;      // Signature / Value
+    QLineEdit*    m_patternEdit;    // Signature pattern input
+    QComboBox*    m_typeCombo;      // Value type dropdown
+    QComboBox*    m_condCombo;      // Scan condition (Exact/Unknown/Changed/...)
+    QLineEdit*    m_valueEdit;      // Value input
+    QLabel*       m_patternLabel;
+    QLabel*       m_typeLabel;
+    QLabel*       m_condLabel;
+    QLabel*       m_valueLabel;
+
+    // Filters
+    QCheckBox*    m_execCheck;
+    QCheckBox*    m_writeCheck;
+    QCheckBox*    m_structOnlyCheck;
+
+    // Actions
+    QPushButton*  m_scanBtn;
+    QPushButton*  m_updateBtn;
+    QProgressBar* m_progressBar;
+
+    // Results
+    QTableWidget*    m_resultTable;
+    AddressDelegate* m_addrDelegate;
+    QLabel*          m_statusLabel;
+    QPushButton*     m_gotoBtn;
+    QPushButton*     m_copyBtn;
+
+    // Engine
+    ScanEngine*   m_engine;
+    ProviderGetter m_providerGetter;
+    BoundsGetter   m_boundsGetter;
+    QVector<ScanResult> m_results;
+    int           m_lastScanMode = 0;   // 0=signature, 1=value
+    ValueType     m_lastValueType = ValueType::Int32;
+    ScanCondition m_lastCondition = ScanCondition::ExactValue;
+    QByteArray    m_lastPattern;        // serialized search value
+    int           m_preRescanCount = 0; // result count before last rescan
+
+    QString formatValue(const QByteArray& bytes) const;
+    int     valueSize() const;
+};
+
+} // namespace rcx

src/startpage.h

@@ -0,0 +1,360 @@
+#pragma once
+#include "themes/thememanager.h"
+#include <QDialog>
+#include <QLineEdit>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QWheelEvent>
+#include <QFileInfo>
+#include <QDir>
+#include <QSettings>
+#include <QCoreApplication>
+#include <QPainterPath>
+
+namespace rcx {
+
+// Single-widget start page: everything painted in paintEvent.
+// Zero CSS, zero Fusion conflicts, zero child-widget styling issues.
+
+class StartPageWidget : public QDialog {
+    Q_OBJECT
+public:
+    explicit StartPageWidget(QWidget* parent = nullptr) : QDialog(parent) {
+        setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog);
+        setMouseTracking(true);
+        setAttribute(Qt::WA_OpaquePaintEvent);
+
+        m_search = new QLineEdit(this);
+        m_search->setPlaceholderText("Search recent...");
+        m_search->setFixedHeight(30);
+        m_search->setMaximumWidth(330);
+        m_search->addAction(QIcon(":/vsicons/search.svg"), QLineEdit::TrailingPosition);
+        connect(m_search, &QLineEdit::textChanged, this, [this]{ buildGroups(); update(); });
+
+        loadEntries();
+        buildGroups();
+        applyTheme(ThemeManager::instance().current());
+    }
+
+    void applyTheme(const Theme& t) {
+        m_t = t;
+        m_search->setStyleSheet(
+            "QLineEdit { background: " + t.background.name() + "; color: " + t.text.name()
+            + "; border: 1px solid " + t.border.name()
+            + "; padding: 2px 8px; font-size: 13px; }"
+            "QLineEdit:focus { border: 1px solid " + t.borderFocused.name() + "; }");
+        update();
+    }
+
+signals:
+    void openProject();
+    void newClass();
+    void importSource();
+    void importXml();
+    void importPdb();
+    void continueClicked();
+    void fileSelected(const QString& path);
+
+protected:
+    void paintEvent(QPaintEvent*) override {
+        QPainter p(this);
+        p.setRenderHint(QPainter::Antialiasing);
+
+        const int LX = 48, TM = 36, RM = 32, GAP = 40, RW = 340;
+        const int rpX = width() - RW - RM;
+        const int lW  = qMax(100, rpX - GAP - LX);
+
+        p.fillRect(rect(), m_t.background);
+
+        // ── Title ──
+        int y = TM;
+        QFont titleF = font(); titleF.setPixelSize(30); titleF.setWeight(QFont::Light);
+        p.setFont(titleF); p.setPen(m_t.text);
+        QFontMetrics titleFm(titleF);
+        p.drawText(LX, y + titleFm.ascent(), "Reclass");
+        y += titleFm.height() + 24;
+
+        // ── Headings (left + right at same y) ──
+        QFont headF = font(); headF.setPixelSize(20); headF.setWeight(QFont::DemiBold);
+        p.setFont(headF); QFontMetrics headFm(headF);
+        p.drawText(LX, y + headFm.ascent(), "Open recent");
+        int ry = y;
+        p.drawText(rpX, ry + headFm.ascent(), "Get started");
+        ry += headFm.height() + 14;
+        y  += headFm.height() + 14;
+
+        // ── Search bar (only child widget) ──
+        m_search->setGeometry(LX, y, qMin(330, lW), 30);
+        y += 46;
+        m_listTop = y;
+
+        // ── Right panel ──
+        drawCards(p, rpX, ry, RW);
+
+        // ── File list ──
+        drawFileList(p, LX, lW);
+
+        // ── Border ──
+        p.setPen(QPen(m_t.border, 1));
+        p.setBrush(Qt::NoBrush);
+        p.drawRect(rect().adjusted(0, 0, -1, -1));
+    }
+
+    void mouseMoveEvent(QMouseEvent* e) override {
+        auto [z, i] = hitTest(e->pos());
+        if (z != m_hz || i != m_hi) {
+            m_hz = z; m_hi = i;
+            setCursor(z != HZ_None ? Qt::PointingHandCursor : Qt::ArrowCursor);
+            update();
+        }
+    }
+
+    void mousePressEvent(QMouseEvent* e) override {
+        if (e->button() != Qt::LeftButton) return;
+        auto [z, i] = hitTest(e->pos());
+        if (z == HZ_Entry)    emit fileSelected(m_filtered[i].path);
+        if (z == HZ_Group)    { m_groups[i].expanded = !m_groups[i].expanded; update(); }
+        if (z == HZ_Card && i == 0) emit newClass();
+        if (z == HZ_Card && i == 1) emit openProject();
+        if (z == HZ_Card && i == 2) emit importSource();
+        if (z == HZ_Card && i == 3) emit importXml();
+        if (z == HZ_Card && i == 4) emit importPdb();
+        if (z == HZ_Continue) emit continueClicked();
+    }
+
+    void wheelEvent(QWheelEvent* e) override {
+        m_scrollY = qBound(0, m_scrollY - e->angleDelta().y() / 2, m_maxScroll);
+        update();
+    }
+
+    void resizeEvent(QResizeEvent* e) override { QWidget::resizeEvent(e); update(); }
+    void leaveEvent(QEvent*) override { m_hz = HZ_None; m_hi = -1; setCursor(Qt::ArrowCursor); update(); }
+    void keyPressEvent(QKeyEvent* e) override { if (e->key() == Qt::Key_Escape) reject(); }
+
+private:
+    enum HZ { HZ_None, HZ_Entry, HZ_Group, HZ_Card, HZ_Continue };
+    struct Hit { HZ zone; int idx; };
+
+    struct Entry {
+        QString path, fileName, dirPath;
+        QDateTime lastModified;
+        bool isExample;
+    };
+    struct Group {
+        QString name;
+        bool expanded = true;
+        QVector<int> entries;
+    };
+
+    Theme m_t;
+    QLineEdit* m_search;
+    QVector<Entry> m_all, m_filtered;
+    QVector<Group> m_groups;
+    int m_scrollY = 0, m_maxScroll = 0, m_listTop = 0, m_contentH = 0;
+
+    HZ  m_hz = HZ_None;
+    int m_hi = -1;
+
+    // Hit rects populated during paint
+    QVector<QPair<int, QRectF>> m_grpRects, m_entRects;
+    QRectF m_cardR[5], m_contR;
+
+    void drawIcon(QPainter& p, const QString& path, int x, int y, int sz) {
+        QIcon(path).paint(&p, x, y, sz, sz);
+    }
+
+    // ── Data loading ──
+
+    void loadEntries() {
+        m_all.clear();
+        QSettings s("Reclass", "Reclass");
+        for (const auto& path : s.value("recentFiles").toStringList()) {
+            QFileInfo fi(path);
+            if (!fi.exists()) continue;
+            m_all.append({fi.absoluteFilePath(), fi.fileName(), fi.absolutePath(),
+                          fi.lastModified(), false});
+        }
+#ifdef __APPLE__
+        QDir exDir(QDir::cleanPath(QCoreApplication::applicationDirPath() + "/../Resources/examples"));
+#else
+        QDir exDir(QCoreApplication::applicationDirPath() + "/examples");
+#endif
+        for (const auto& fn : exDir.entryList({"*.rcx"}, QDir::Files, QDir::Name))
+            m_all.append({exDir.absoluteFilePath(fn), fn, exDir.absolutePath(),
+                          QFileInfo(exDir.filePath(fn)).lastModified(), true});
+    }
+
+    void buildGroups() {
+        QString f = m_search->text().trimmed().toLower();
+        m_filtered.clear();
+        for (const auto& e : m_all)
+            if (f.isEmpty() || e.fileName.toLower().contains(f) || e.dirPath.toLower().contains(f))
+                m_filtered.append(e);
+
+        QDate today = QDate::currentDate();
+        QVector<int> bk[6];
+        for (int i = 0; i < m_filtered.size(); i++) {
+            auto& e = m_filtered[i];
+            if (e.isExample) { bk[5].append(i); continue; }
+            int d = e.lastModified.date().daysTo(today);
+            if      (d == 0) bk[0].append(i);
+            else if (d == 1) bk[1].append(i);
+            else if (d <  7) bk[2].append(i);
+            else if (e.lastModified.date().month() == today.month()
+                  && e.lastModified.date().year()  == today.year()) bk[3].append(i);
+            else bk[4].append(i);
+        }
+        static const char* names[] = {"Today","Yesterday","This week","This month","Older","Examples"};
+        m_groups.clear();
+        for (int i = 0; i < 6; i++)
+            if (!bk[i].isEmpty()) m_groups.append({names[i], true, bk[i]});
+        m_scrollY = 0;
+    }
+
+    // ── Drawing ──
+
+    void drawCards(QPainter& p, int x, int y, int w) {
+        struct C { const char* icon; const char* title; const char* desc; };
+        static const C cards[] = {
+            {":/vsicons/symbol-structure.svg", "New Class",          "Start a new binary class definition"},
+            {":/vsicons/folder-opened.svg",    "Open project",      "Open an existing .rcx project"},
+            {":/vsicons/file-binary.svg",      "Import from Source", "Import C/C++ header or source file"},
+            {":/vsicons/code.svg",             "Import ReClass XML", "Import from ReClass .xml format"},
+            {":/vsicons/debug.svg",            "Import PDB",         "Import types from a .pdb symbol file"}
+        };
+
+        const int N = 5, CH = 84, R = 6, panelH = N * CH;
+
+        // Rounded panel background
+        QPainterPath clip;
+        clip.addRoundedRect(QRectF(x, y, w, panelH), R, R);
+        p.save();
+        p.setClipPath(clip);
+        p.fillRect(x, y, w, panelH, m_t.background);
+
+        for (int i = 0; i < N; i++) {
+            int cy = y + i * CH;
+            QRectF cr(x, cy, w, CH);
+            m_cardR[i] = cr;
+            bool hov = (m_hz == HZ_Card && m_hi == i);
+
+            if (hov) {
+                p.fillRect(cr, m_t.hover);
+                p.fillRect(QRectF(x, cy, 3, CH), m_t.indHoverSpan);
+            }
+
+            // Icon (32px, centered vertically)
+            int iconSz = 32;
+            drawIcon(p, cards[i].icon, x + 24, cy + (CH - iconSz) / 2, iconSz);
+
+            // Title + description block, centered vertically
+            int tx = x + 24 + iconSz + 16;
+            QFont tf = font(); tf.setPixelSize(15);
+            QFont df = font(); df.setPixelSize(12);
+            QFontMetrics tfm(tf), dfm(df);
+            int blockH = tfm.height() + 5 + dfm.height();
+            int by = cy + (CH - blockH) / 2;
+
+            p.setFont(tf); p.setPen(m_t.text);
+            p.drawText(tx, by + tfm.ascent(), cards[i].title);
+            p.setFont(df); p.setPen(m_t.textDim);
+            p.drawText(tx, by + tfm.height() + 5 + dfm.ascent(), cards[i].desc);
+        }
+
+        p.restore();
+
+        // "Continue →" centered under the panel
+        int cy = y + panelH + 8;
+        QFont lf = font(); lf.setPixelSize(13);
+        if (m_hz == HZ_Continue) lf.setUnderline(true);
+        p.setFont(lf); p.setPen(m_t.indHoverSpan);
+        QFontMetrics lfm(lf);
+        QString ct = QStringLiteral("Continue  \u2192");
+        int cw = lfm.horizontalAdvance(ct);
+        m_contR = QRectF(x + (w - cw) / 2, cy, cw, lfm.height());
+        p.drawText(int(m_contR.x()), cy + lfm.ascent(), ct);
+    }
+
+    void drawFileList(QPainter& p, int x, int w) {
+        int listH = height() - 24 - m_listTop;
+        p.save();
+        p.setClipRect(x, m_listTop, w, listH);
+
+        int fy = m_listTop - m_scrollY;
+        m_grpRects.clear();
+        m_entRects.clear();
+
+        for (int gi = 0; gi < m_groups.size(); gi++) {
+            auto& g = m_groups[gi];
+            if (gi > 0) fy += 15;
+
+            // Group header
+            m_grpRects.append({gi, QRectF(x, fy, w, 28)});
+            p.setPen(Qt::NoPen); p.setBrush(m_t.text);
+            int triX = x + 8, triY = fy + 11;
+            QPolygonF tri;
+            if (g.expanded) tri << QPointF(triX,triY) << QPointF(triX+6,triY) << QPointF(triX+3,triY+6);
+            else            tri << QPointF(triX,triY) << QPointF(triX+6,triY+3) << QPointF(triX,triY+6);
+            p.drawPolygon(tri);
+
+            QFont gf = font(); gf.setPixelSize(13);
+            p.setFont(gf); p.setPen(m_t.text);
+            p.drawText(triX + 14, fy + 14 + QFontMetrics(gf).ascent() / 2 - 1, g.name);
+            fy += 28;
+
+            if (!g.expanded) continue;
+
+            for (int ei : g.entries) {
+                auto& e = m_filtered[ei];
+                QRectF er(x, fy, w, 52);
+                m_entRects.append({ei, er});
+                if (m_hz == HZ_Entry && m_hi == ei) p.fillRect(er, m_t.hover);
+
+                drawIcon(p, e.isExample ? ":/vsicons/book.svg" : ":/vsicons/symbol-structure.svg",
+                         x + 24, fy + 17, 18);
+
+                int tx = x + 52, avail = w - 64;
+                QFont nf = font(); nf.setPixelSize(14);
+                p.setFont(nf); p.setPen(m_t.text);
+                QFontMetrics nm(nf);
+                int ny = fy + 8;
+                p.drawText(tx, ny + nm.ascent(),
+                           nm.elidedText(e.fileName, Qt::ElideMiddle, avail * 0.65));
+
+                if (!e.isExample) {
+                    p.setPen(m_t.textDim);
+                    QString dt = e.lastModified.toString("M/d/yyyy h:mm AP");
+                    p.drawText(x + w - 12 - nm.horizontalAdvance(dt), ny + nm.ascent(), dt);
+                }
+
+                QFont pf = font(); pf.setPixelSize(12);
+                p.setFont(pf); p.setPen(m_t.textDim);
+                QFontMetrics pm(pf);
+                p.drawText(tx, ny + nm.height() + 4 + pm.ascent(),
+                           pm.elidedText(e.dirPath, Qt::ElideMiddle, avail));
+                fy += 52;
+            }
+        }
+
+        m_contentH = fy + m_scrollY - m_listTop;
+        m_maxScroll = qMax(0, m_contentH - listH);
+        p.restore();
+    }
+
+    // ── Hit testing ──
+
+    Hit hitTest(QPoint pos) const {
+        for (int i = 0; i < 5; i++)
+            if (m_cardR[i].contains(pos)) return {HZ_Card, i};
+        if (m_contR.contains(pos)) return {HZ_Continue, 0};
+        if (pos.y() >= m_listTop && pos.y() < height() - 24) {
+            for (const auto& [gi, r] : m_grpRects)
+                if (r.contains(pos)) return {HZ_Group, gi};
+            for (const auto& [ei, r] : m_entRects)
+                if (r.contains(pos)) return {HZ_Entry, ei};
+        }
+        return {HZ_None, -1};
+    }
+};
+
+} // namespace rcx

src/themes/defaults/mid.json

@@ -10,8 +10,8 @@
     "textDim": "#505C74",
     "textMuted": "#384258",
     "textFaint": "#2C3448",
-    "hover": "#121720",
-    "selected": "#121720",
+    "hover": "#181E2A",
+    "selected": "#1A2D4A",
     "selection": "#1A2038",
     "syntaxKeyword": "#5688C0",
     "syntaxNumber": "#90B480",

src/themes/defaults/modern.json

@@ -0,0 +1,32 @@
+{
+    "name": "Modern",
+    "background": "#0e1117",
+    "backgroundAlt": "#12151c",
+    "surface": "#181d27",
+    "border": "#1e2533",
+    "borderFocused": "#4fc3f7",
+    "button": "#1e2433",
+    "text": "#a8bbd0",
+    "textDim": "#7a8fa8",
+    "textMuted": "#566278",
+    "textFaint": "#3d4d6a",
+    "hover": "#1e2433",
+    "selected": "#232a3a",
+    "selection": "#1a4a5e",
+    "syntaxKeyword": "#9d8cff",
+    "syntaxNumber": "#f0c060",
+    "syntaxString": "#26c6b3",
+    "syntaxComment": "#566278",
+    "syntaxPreproc": "#f472b6",
+    "syntaxType": "#4fc3f7",
+    "indHoverSpan": "#f0c060",
+    "indCmdPill": "#12151c",
+    "indDataChanged": "#6bda8a",
+    "indHeatCold": "#f0c060",
+    "indHeatWarm": "#e8946a",
+    "indHeatHot": "#ff6b6b",
+    "indHintGreen": "#2a5e3a",
+    "markerPtr": "#ff6b6b",
+    "markerCycle": "#f0c060",
+    "markerError": "#3a1a1a"
+}

src/themes/defaults/reclass_dark.json

@@ -10,8 +10,8 @@
     "textDim": "#858585",
     "textMuted": "#585858",
     "textFaint": "#505050",
-    "hover": "#1e1e1e",
-    "selected": "#1e1e1e",
+    "hover": "#2a2a2a",
+    "selected": "#2a2d2e",
     "selection": "#2b2b2b",
     "syntaxKeyword": "#569cd6",
     "syntaxNumber": "#b5cea8",

src/themes/defaults/tw.json

@@ -0,0 +1,32 @@
+{
+    "name": "Light",
+    "background": "#e8e8ec",
+    "backgroundAlt": "#dcdce0",
+    "surface": "#d4d4d8",
+    "border": "#b8b8be",
+    "borderFocused": "#6870a0",
+    "button": "#ccccd0",
+    "text": "#1b1b22",
+    "textDim": "#5c5c68",
+    "textMuted": "#6a6a78",
+    "textFaint": "#8a8a94",
+    "hover": "#d8d8de",
+    "selected": "#d0d0d8",
+    "selection": "#b4c8e8",
+    "syntaxKeyword": "#4455aa",
+    "syntaxNumber": "#2a7a4c",
+    "syntaxString": "#9a4040",
+    "syntaxComment": "#6a7a6a",
+    "syntaxPreproc": "#787880",
+    "syntaxType": "#2e7a8a",
+    "indHoverSpan": "#5a68a0",
+    "indCmdPill": "#dcdce0",
+    "indDataChanged": "#2a7a4c",
+    "indHeatCold": "#6a6a30",
+    "indHeatWarm": "#a06828",
+    "indHeatHot": "#b83030",
+    "indHintGreen": "#387a44",
+    "markerPtr": "#b83030",
+    "markerCycle": "#9a7010",
+    "markerError": "#e8c8c8"
+}

src/themes/defaults/warm.json

@@ -15,8 +15,8 @@
     "selection": "#21213A",
     "syntaxKeyword": "#AA9565",
     "syntaxNumber": "#AAA98C",
-    "syntaxString": "#6B3B21",
-    "syntaxComment": "#464646",
+    "syntaxString": "#C0825A",
+    "syntaxComment": "#8A8878",
     "syntaxPreproc": "#AA9565",
     "syntaxType": "#6B959F",
     "indHoverSpan": "#AA9565",
@@ -25,8 +25,8 @@
     "indHeatCold": "#C4A44A",
     "indHeatWarm": "#AA9565",
     "indHeatHot": "#A05040",
-    "indHintGreen": "#464646",
-    "markerPtr": "#6B3B21",
+    "indHintGreen": "#688A58",
+    "markerPtr": "#B85A42",
     "markerCycle": "#AA9565",
     "markerError": "#3C2121"
 }

src/themes/themeeditor.cpp

@@ -64,7 +64,8 @@ ThemeEditor::ThemeEditor(int themeIndex, QWidget* parent)
 
     // ── File info ──
     m_fileInfoLabel = new QLabel;
-    m_fileInfoLabel->setStyleSheet(QStringLiteral("color: #666; font-size: 10px; padding: 0 0 4px 0;"));
+    m_fileInfoLabel->setStyleSheet(QStringLiteral("color: %1; font-size: 10px; padding: 0 0 4px 0;")
+        .arg(tm.current().textDim.name()));
     QString path = tm.themeFilePath(themeIndex);
     m_fileInfoLabel->setText(path.isEmpty()
         ? QStringLiteral("Built-in theme (edits save as user copy)")
@@ -109,7 +110,8 @@ ThemeEditor::ThemeEditor(int themeIndex, QWidget* parent)
 
         auto* hexLbl = new QLabel;
         hexLbl->setFixedWidth(60);
-        hexLbl->setStyleSheet(QStringLiteral("color: #aaa; font-size: 10px;"));
+        hexLbl->setStyleSheet(QStringLiteral("color: %1; font-size: 10px;")
+            .arg(tm.current().textMuted.name()));
         row->addWidget(hexLbl);
 
         row->addStretch();

src/themes/thememanager.cpp

@@ -33,7 +33,12 @@ ThemeManager::ThemeManager() {
 // ── Load built-in themes from JSON files next to the executable ──
 
 QString ThemeManager::builtInDir() const {
+#ifdef Q_OS_MACOS
+    // In a macOS .app bundle, resources live in Contents/Resources, not Contents/MacOS
+    return QCoreApplication::applicationDirPath() + "/../Resources/themes";
+#else
     return QCoreApplication::applicationDirPath() + "/themes";
+#endif
 }
 
 void ThemeManager::loadBuiltInThemes() {

src/titlebar.cpp

@@ -1,5 +1,6 @@
 #include "titlebar.h"
 #include "themes/thememanager.h"
+#include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QStyle>
@@ -74,17 +75,37 @@ void TitleBarWidget::applyTheme(const Theme& theme) {
     // App label
     m_appLabel->setStyleSheet(
         QStringLiteral("QLabel { color: %1; font-size: 12px; font-weight: bold; }")
-            .arg(theme.textDim.name()));
+            .arg(theme.text.name()));
 
-    // Menu bar palette — hover/bg handled by MenuBarStyle QProxyStyle.
-    // Set Window + Button to background so Fusion never paints a foreign color.
+    // Menu bar palette — all roles used by MenuBarStyle, so live theme
+    // switches don't rely on app-palette inheritance (which can stall
+    // once setPalette has been called on a widget).
     {
         QPalette mbPal = m_menuBar->palette();
         mbPal.setColor(QPalette::Window, theme.background);
         mbPal.setColor(QPalette::Button, theme.background);
-        mbPal.setColor(QPalette::ButtonText, theme.textDim);
+        mbPal.setColor(QPalette::ButtonText, theme.text);
+        mbPal.setColor(QPalette::Text, theme.text);
+        mbPal.setColor(QPalette::Highlight, theme.selected);
+        mbPal.setColor(QPalette::Link, theme.indHoverSpan);
+        mbPal.setColor(QPalette::AlternateBase, theme.surface);
+        mbPal.setColor(QPalette::Dark, theme.border);
+        mbPal.setColor(QPalette::Mid, theme.hover);
         m_menuBar->setPalette(mbPal);
         m_menuBar->setAutoFillBackground(false);
+
+        // Propagate to existing QMenu children so dropdown popups update too
+        for (auto* menu : m_menuBar->findChildren<QMenu*>()) {
+            QPalette mp = menu->palette();
+            mp.setColor(QPalette::Window, theme.background);
+            mp.setColor(QPalette::WindowText, theme.text);
+            mp.setColor(QPalette::Text, theme.text);
+            mp.setColor(QPalette::Highlight, theme.selected);
+            mp.setColor(QPalette::Link, theme.indHoverSpan);
+            mp.setColor(QPalette::AlternateBase, theme.surface);
+            mp.setColor(QPalette::Dark, theme.border);
+            menu->setPalette(mp);
+        }
     }
 
     // Chrome buttons
@@ -95,10 +116,10 @@ void TitleBarWidget::applyTheme(const Theme& theme) {
     m_btnMin->setStyleSheet(btnStyle);
     m_btnMax->setStyleSheet(btnStyle);
 
-    // Close button: red hover
+    // Close button: themed red hover
     m_btnClose->setStyleSheet(QStringLiteral(
         "QToolButton { background: transparent; border: none; }"
-        "QToolButton:hover { background: #c42b1c; }"));
+        "QToolButton:hover { background: %1; }").arg(theme.indHeatHot.name()));
 
     update();
 }
@@ -107,12 +128,14 @@ void TitleBarWidget::setShowIcon(bool show) {
     if (show) {
         m_appLabel->setText(QString());
         m_appLabel->setPixmap(QIcon(":/icons/class.png").pixmap(24, 24));
+        setFixedHeight(34);
     } else {
         m_appLabel->setPixmap(QPixmap());
         m_appLabel->setText(QStringLiteral("Reclass"));
         m_appLabel->setStyleSheet(
             QStringLiteral("QLabel { color: %1; font-size: 12px; font-weight: bold; }")
-                .arg(m_theme.textDim.name()));
+                .arg(m_theme.text.name()));
+        setFixedHeight(32);
     }
 }
 

src/titlebar.h

@@ -34,7 +34,7 @@ private:
     QToolButton* m_btnClose   = nullptr;
 
     Theme m_theme;
-    bool  m_titleCase = true;
+    bool  m_titleCase = false;
 
     QToolButton* makeChromeButton(const QString& iconPath);
     void toggleMaximize();

src/typeinfer.h

@@ -0,0 +1,505 @@
+#pragma once
+#include <QVector>
+#include <cmath>
+#include <cstdint>
+#include <cstring>
+
+#include "core.h"
+
+namespace rcx {
+
+// ── Hints from value history (optional, improves accuracy) ──
+
+struct InferHints {
+    const uint8_t* minObserved = nullptr; // raw bytes, same len as data
+    const uint8_t* maxObserved = nullptr;
+    bool monotonic    = false; // value only increases or only decreases
+    bool neverChanged = false; // identical across all samples
+    int  sampleCount  = 0;    // 0 = no history
+    int  ptrSize      = 8;
+};
+
+// ── Suggestion result ──
+
+struct TypeSuggestion {
+    QVector<NodeKind> kinds; // size==1: convert, size>1: uniform split
+    int score    = 0;        // 0-100 feature ratio (passed / checked × 100)
+    int strength = 0;        // 0=hidden, 1=weak, 2=moderate, 3=strong
+};
+
+// ── Public API ──
+
+QVector<TypeSuggestion> inferTypes(
+    const uint8_t* data, int len,
+    const InferHints& hints = {},
+    int maxResults = 3);
+
+// Format top suggestion as short type label (e.g. "ptr64", "int32_t×2")
+inline QString formatHint(const TypeSuggestion& s) {
+    if (s.kinds.isEmpty()) return {};
+    const char* name = kindMeta(s.kinds[0])->typeName;
+    return (s.kinds.size() == 1)
+        ? QString::fromLatin1(name)
+        : QStringLiteral("%1\u00D7%2").arg(QString::fromLatin1(name)).arg(s.kinds.size());
+}
+
+// ── Implementation (header-only) ──
+
+namespace detail {
+
+inline uint32_t loadU32(const uint8_t* p) {
+    uint32_t v; std::memcpy(&v, p, 4); return v;
+}
+inline uint64_t loadU64(const uint8_t* p) {
+    uint64_t v; std::memcpy(&v, p, 8); return v;
+}
+inline uint16_t loadU16(const uint8_t* p) {
+    uint16_t v; std::memcpy(&v, p, 2); return v;
+}
+inline float loadF32(const uint8_t* p) {
+    float v; std::memcpy(&v, p, 4); return v;
+}
+inline double loadF64(const uint8_t* p) {
+    double v; std::memcpy(&v, p, 8); return v;
+}
+
+inline bool allZero(const uint8_t* p, int n) {
+    for (int i = 0; i < n; ++i) if (p[i]) return false;
+    return true;
+}
+
+inline int popcount32(uint32_t v) {
+#if defined(__GNUC__) || defined(__clang__)
+    return __builtin_popcount(v);
+#else
+    int c = 0; while (v) { v &= v - 1; ++c; } return c;
+#endif
+}
+
+inline bool isPrintable(uint8_t c) {
+    return c >= 0x20 && c <= 0x7E;
+}
+
+// ── Float feature checker ──
+// Returns features passed out of features checked (as pair)
+
+struct FeatureResult { int passed; int checked; };
+
+inline bool isGoodFloat(uint32_t bits) {
+    uint32_t exp = (bits >> 23) & 0xFF;
+    if (exp == 0xFF) return false;  // inf/nan
+    if (exp == 0 && (bits & 0x7FFFFF)) return false; // denormal
+    float f; std::memcpy(&f, &bits, 4);
+    double af = std::fabs((double)f);
+    return f == 0.0f || (af >= 1e-6 && af <= 1e7);
+}
+
+inline FeatureResult countFloatFeatures(uint32_t cur,
+                                        const uint8_t* minP, const uint8_t* maxP,
+                                        const InferHints& h) {
+    int passed = 0, checked = 4;
+    float f; std::memcpy(&f, &cur, 4);
+
+    // Feature 1: finite
+    passed += std::isfinite((double)f) ? 1 : 0;
+    // Feature 2: non-denormal (exponent > 0 or value is ±0)
+    uint32_t exp = (cur >> 23) & 0xFF;
+    passed += (exp > 0 || (cur & 0x7FFFFFFF) == 0) ? 1 : 0;
+    // Feature 3: reasonable range
+    double af = std::fabs((double)f);
+    passed += (f == 0.0f || (af >= 1e-6 && af <= 1e7)) ? 1 : 0;
+    // Feature 4: has fractional part (not just a reinterpreted integer)
+    float ip; double frac = std::fabs((double)std::modf(f, &ip));
+    passed += (frac > 0.0001) ? 1 : 0;
+
+    if (h.sampleCount > 0 && minP && maxP) {
+        checked += 4;
+        uint32_t minBits = loadU32(minP), maxBits = loadU32(maxP);
+        // Feature 5-6: min/max are also valid floats
+        passed += isGoodFloat(minBits) ? 1 : 0;
+        passed += isGoodFloat(maxBits) ? 1 : 0;
+        // Feature 7: field changes
+        passed += (minBits != maxBits) ? 1 : 0;
+        // Feature 8: range is game-plausible
+        float fmin, fmax;
+        std::memcpy(&fmin, &minBits, 4);
+        std::memcpy(&fmax, &maxBits, 4);
+        double range = std::fabs((double)fmax - (double)fmin);
+        passed += (range < 1e6) ? 1 : 0;
+    }
+    return {passed, checked};
+}
+
+// ── Integer feature checker ──
+
+inline FeatureResult countIntFeatures(uint32_t val,
+                                      const uint8_t* minP, const uint8_t* maxP,
+                                      const InferHints& h) {
+    // Hard reject: zero and sentinel are never useful integers
+    if (val == 0 || val == 0xFFFFFFFF)
+        return {0, 3};
+
+    int passed = 0, checked = 3;
+    int32_t sv = (int32_t)val;
+
+    // Feature 1: non-zero and not sentinel (always passes after hard reject)
+    passed += 1;
+    // Feature 2: small absolute value
+    passed += (val <= 1000000u || (uint32_t)(sv + 1000000) <= 2000000u) ? 1 : 0;
+    // Feature 3: fits int16 range
+    passed += (sv >= -32768 && sv <= 32767) ? 1 : 0;
+
+    if (h.sampleCount > 0 && minP && maxP) {
+        checked += 3;
+        uint32_t minV = loadU32(minP), maxV = loadU32(maxP);
+        // Feature 4: min/max in reasonable range
+        passed += (minV <= 1000000u && maxV <= 1000000u) ? 1 : 0;
+        // Feature 5: monotonic (counter/timer)
+        passed += h.monotonic ? 1 : 0;
+        // Feature 6: field varies
+        passed += (minV != maxV) ? 1 : 0;
+    }
+    return {passed, checked};
+}
+
+// ── Flags feature checker ──
+
+inline FeatureResult countFlagFeatures(uint32_t val,
+                                       const uint8_t* minP, const uint8_t* maxP,
+                                       const InferHints& h) {
+    int passed = 0, checked = 2;
+    int pc = popcount32(val);
+
+    // Feature 1: sparse bits (1-3 set)
+    passed += (pc >= 1 && pc <= 3) ? 1 : 0;
+    // Feature 2: not a small sequential integer (flags are usually not 1,2,3...)
+    passed += (val > 256 || (val & (val - 1)) != 0) ? 1 : 0;
+
+    if (h.sampleCount > 0 && minP && maxP) {
+        checked += 3;
+        uint32_t minV = loadU32(minP), maxV = loadU32(maxP);
+        // Feature 3: XOR of min/max has low popcount (specific bits toggle)
+        passed += (popcount32(minV ^ maxV) <= 4) ? 1 : 0;
+        // Feature 4: field varies
+        passed += (minV != maxV) ? 1 : 0;
+        // Feature 5: max is superset of min bits
+        passed += ((minV & maxV) == minV) ? 1 : 0;
+    }
+    return {passed, checked};
+}
+
+// ── Pointer feature checker ──
+
+inline FeatureResult countPtrFeatures64(uint64_t val) {
+    // Hard reject: common sentinel values are never pointers
+    if (val == 0 || val == 0xFFFFFFFFFFFFFFFFULL || val == 0x00000000FFFFFFFFULL)
+        return {0, 6};
+
+    int passed = 0, checked = 6;
+    // Feature 1: canonical 48-bit address (sign-extended from bit 47)
+    passed += (val <= 0x00007FFFFFFFFFFFULL
+               || val >= 0xFFFF800000000000ULL) ? 1 : 0;
+    // Feature 2: aligned to 8 (heap/vtable allocations)
+    passed += ((val & 7) == 0) ? 1 : 0;
+    // Feature 3: above null guard pages (real addresses >= 64KB)
+    passed += (val >= 0x10000) ? 1 : 0;
+    // Feature 4: has upper 32 bits (real 64-bit address, not a small constant)
+    passed += ((val >> 32) != 0) ? 1 : 0;
+    // Feature 5: above 4GB (in real 64-bit address space, not a 32-bit value)
+    passed += (val > 0x100000000ULL) ? 1 : 0;
+    // Feature 6: user-mode address range (not kernel 0xFFFF800000000000+)
+    passed += (val < 0xFFFF800000000000ULL) ? 1 : 0;
+    return {passed, checked};
+}
+
+inline FeatureResult countPtrFeatures32(uint32_t val) {
+    int passed = 0, checked = 3;
+    // Feature 1: non-zero and not sentinel
+    passed += (val != 0 && val != 0xFFFFFFFF) ? 1 : 0;
+    // Feature 2: aligned to 4
+    passed += ((val & 3) == 0) ? 1 : 0;
+    // Feature 3: above null guard pages (>= 64KB)
+    passed += (val >= 0x10000) ? 1 : 0;
+    return {passed, checked};
+}
+
+// ── String feature checker ──
+
+inline FeatureResult countStringFeatures(const uint8_t* data, int len) {
+    if (len < 2) return {0, 4};
+    int printable = 0, letters = 0, consecutive = 0, maxConsec = 0;
+    for (int i = 0; i < len; ++i) {
+        if (isPrintable(data[i])) {
+            printable++;
+            consecutive++;
+            maxConsec = std::max(maxConsec, consecutive);
+            if ((data[i] >= 'A' && data[i] <= 'Z') || (data[i] >= 'a' && data[i] <= 'z'))
+                letters++;
+        } else {
+            consecutive = 0;
+        }
+    }
+    double ratio = (double)printable / len;
+    int passed = 0, checked = 4;
+    passed += (maxConsec >= 4) ? 1 : 0;
+    passed += (ratio > 0.75) ? 1 : 0;
+    passed += (letters >= 1) ? 1 : 0;
+    passed += (ratio > 0.90) ? 1 : 0;
+    return {passed, checked};
+}
+
+// ── Int16 feature checker ──
+
+inline FeatureResult countInt16Features(uint16_t val,
+                                        const uint8_t* minP, const uint8_t* maxP,
+                                        const InferHints& h) {
+    int passed = 0, checked = 2;
+    int16_t sv = (int16_t)val;
+    passed += (val != 0) ? 1 : 0;
+    passed += (sv >= -16384 && sv <= 16384) ? 1 : 0;
+
+    if (h.sampleCount > 0 && minP && maxP) {
+        checked += 2;
+        uint16_t minV = loadU16(minP), maxV = loadU16(maxP);
+        passed += (minV <= 4096 && maxV <= 4096) ? 1 : 0;
+        passed += (minV != maxV) ? 1 : 0;
+    }
+    return {passed, checked};
+}
+
+// ── Score from feature result ──
+
+inline int featureScore(FeatureResult r) {
+    if (r.checked == 0) return 0;
+    return (r.passed * 100) / r.checked;
+}
+
+inline int strengthFromScore(int score) {
+    if (score >= 75) return 3;
+    if (score >= 50) return 2;
+    if (score >= 25) return 1;
+    return 0;
+}
+
+// ── Candidate accumulator ──
+
+struct Candidate {
+    QVector<NodeKind> kinds;
+    int score;
+};
+
+inline void addCandidate(QVector<Candidate>& out, NodeKind k, int score) {
+    if (score >= 25) out.append({{k}, score});
+}
+
+inline void addSplitCandidate(QVector<Candidate>& out, NodeKind k, int count, int score) {
+    if (score >= 25) {
+        QVector<NodeKind> kinds(count, k);
+        out.append({std::move(kinds), score});
+    }
+}
+
+// ── Try whole-width interpretations ──
+
+inline void tryWhole8(const uint8_t* data, const InferHints& h, QVector<Candidate>& out) {
+    uint64_t u64 = loadU64(data);
+
+    // Pointer64
+    if (h.ptrSize == 8)
+        addCandidate(out, NodeKind::Pointer64, featureScore(countPtrFeatures64(u64)));
+
+    // Double
+    {
+        double d; std::memcpy(&d, data, 8);
+        uint64_t exp = (u64 >> 52) & 0x7FF;
+        int passed = 0, checked = 3;
+        passed += std::isfinite(d) ? 1 : 0;
+        passed += (exp > 0 || (u64 & 0x7FFFFFFFFFFFFFFFull) == 0) ? 1 : 0;
+        double ad = std::fabs(d);
+        passed += (d == 0.0 || (ad >= 1e-6 && ad <= 1e12)) ? 1 : 0;
+        addCandidate(out, NodeKind::Double, featureScore({passed, checked}));
+    }
+
+    // UTF8
+    addCandidate(out, NodeKind::UTF8, featureScore(countStringFeatures(data, 8)));
+
+    // UInt64 / Int64
+    {
+        int passed = 0, checked = 4;
+        // Feature 1: fits in 32 bits (small constant, not an address)
+        passed += (u64 <= 0xFFFFFFFFull) ? 1 : 0;
+        // Feature 2: upper 32 bits are zero (confirms it's a small value, not a pointer)
+        passed += ((u64 >> 32) == 0) ? 1 : 0;
+        // Feature 3: non-zero
+        passed += (u64 != 0) ? 1 : 0;
+        // Feature 4: monotonic or very small (< 0x10000)
+        passed += (h.monotonic || u64 < 0x10000) ? 1 : 0;
+        addCandidate(out, NodeKind::UInt64, featureScore({passed, checked}));
+    }
+}
+
+inline void tryWhole4(const uint8_t* data, const uint8_t* minP, const uint8_t* maxP,
+                      const InferHints& h, QVector<Candidate>& out) {
+    uint32_t u32 = loadU32(data);
+
+    // Float
+    addCandidate(out, NodeKind::Float, featureScore(countFloatFeatures(u32, minP, maxP, h)));
+
+    // Int32
+    addCandidate(out, NodeKind::Int32, featureScore(countIntFeatures(u32, minP, maxP, h)));
+
+    // UInt32
+    addCandidate(out, NodeKind::UInt32, featureScore(countIntFeatures(u32, minP, maxP, h)));
+
+    // Flags (only if sparse bits)
+    addCandidate(out, NodeKind::UInt32, featureScore(countFlagFeatures(u32, minP, maxP, h)));
+
+    // Pointer32
+    if (h.ptrSize == 4)
+        addCandidate(out, NodeKind::Pointer32, featureScore(countPtrFeatures32(u32)));
+}
+
+inline void tryWhole2(const uint8_t* data, const uint8_t* minP, const uint8_t* maxP,
+                      const InferHints& h, QVector<Candidate>& out) {
+    uint16_t u16 = loadU16(data);
+    int scoreI = featureScore(countInt16Features(u16, minP, maxP, h));
+    addCandidate(out, NodeKind::Int16, scoreI);
+    addCandidate(out, NodeKind::UInt16, scoreI);
+}
+
+inline void tryWhole1(const uint8_t* data, QVector<Candidate>& out) {
+    uint8_t v = data[0];
+    int score = (v == 0 || v == 1) ? 50 : 25;
+    addCandidate(out, NodeKind::UInt8, score);
+}
+
+// ── Try uniform splits ──
+
+inline void trySplitUniform(const uint8_t* data, int len,
+                            const InferHints& h,
+                            QVector<Candidate>& out) {
+
+    // 8 → 2×4
+    if (len == 8) {
+        const uint8_t* minA = h.minObserved;
+        const uint8_t* minB = h.minObserved ? h.minObserved + 4 : nullptr;
+        const uint8_t* maxA = h.maxObserved;
+        const uint8_t* maxB = h.maxObserved ? h.maxObserved + 4 : nullptr;
+        bool zA = allZero(data, 4), zB = allZero(data + 4, 4);
+
+        // Float×2: both halves must be good floats and at least one non-zero
+        if (!zA || !zB) {
+            uint32_t bitsA = loadU32(data), bitsB = loadU32(data + 4);
+            bool fA = zA || isGoodFloat(bitsA);
+            bool fB = zB || isGoodFloat(bitsB);
+            if (fA && fB) {
+                auto rA = zA ? FeatureResult{2, 4} : countFloatFeatures(bitsA, minA, maxA, h);
+                auto rB = zB ? FeatureResult{2, 4} : countFloatFeatures(bitsB, minB, maxB, h);
+                int score = std::min(featureScore(rA), featureScore(rB));
+                addSplitCandidate(out, NodeKind::Float, 2, score);
+            }
+        }
+
+        // Int32×2: both halves, at least one non-zero
+        if (!zA || !zB) {
+            auto rA = zA ? FeatureResult{1, 3} : countIntFeatures(loadU32(data), minA, maxA, h);
+            auto rB = zB ? FeatureResult{1, 3} : countIntFeatures(loadU32(data + 4), minB, maxB, h);
+            int score = std::min(featureScore(rA), featureScore(rB));
+            addSplitCandidate(out, NodeKind::Int32, 2, score);
+        }
+
+        // UInt32×2
+        if (!zA || !zB) {
+            auto rA = zA ? FeatureResult{1, 3} : countIntFeatures(loadU32(data), minA, maxA, h);
+            auto rB = zB ? FeatureResult{1, 3} : countIntFeatures(loadU32(data + 4), minB, maxB, h);
+            int score = std::min(featureScore(rA), featureScore(rB));
+            addSplitCandidate(out, NodeKind::UInt32, 2, score);
+        }
+    }
+
+    // 8 → 4×2 or 4 → 2×2
+    int halfLen = len / 2;
+    if (halfLen == 2) {
+        int minScore = 100;
+        int count = len / 2;
+        bool anyNonZero = false;
+        for (int i = 0; i < count; ++i) {
+            const uint8_t* part = data + i * 2;
+            if (!allZero(part, 2)) anyNonZero = true;
+            const uint8_t* mp = h.minObserved ? h.minObserved + i * 2 : nullptr;
+            const uint8_t* xp = h.maxObserved ? h.maxObserved + i * 2 : nullptr;
+            int s = featureScore(countInt16Features(loadU16(part), mp, xp, h));
+            minScore = std::min(minScore, s);
+        }
+        if (anyNonZero) {
+            addSplitCandidate(out, NodeKind::Int16, count, minScore);
+            addSplitCandidate(out, NodeKind::UInt16, count, minScore);
+        }
+    }
+}
+
+// ── Prune and rank ──
+
+inline QVector<TypeSuggestion> pruneAndRank(QVector<Candidate>& cands, int maxResults) {
+    // Sort descending by score
+    std::sort(cands.begin(), cands.end(), [](const Candidate& a, const Candidate& b) {
+        return a.score > b.score;
+    });
+
+    // Dedup: keep highest-scoring per unique kinds vector
+    QVector<Candidate> deduped;
+    for (const auto& c : cands) {
+        bool dup = false;
+        for (const auto& d : deduped) {
+            if (d.kinds == c.kinds) { dup = true; break; }
+        }
+        if (!dup) deduped.append(c);
+    }
+
+    // Dominance: if top >= 1.5× second, keep only top
+    if (deduped.size() >= 2 && deduped[0].score >= deduped[1].score * 3 / 2)
+        deduped.resize(1);
+    else if (deduped.size() > maxResults)
+        deduped.resize(maxResults);
+
+    QVector<TypeSuggestion> result;
+    result.reserve(deduped.size());
+    for (const auto& c : deduped) {
+        int str = strengthFromScore(c.score);
+        if (str > 0)
+            result.append({c.kinds, c.score, str});
+    }
+    return result;
+}
+
+} // namespace detail
+
+// ── Entry point ──
+
+inline QVector<TypeSuggestion> inferTypes(
+    const uint8_t* data, int len,
+    const InferHints& hints,
+    int maxResults)
+{
+    using namespace detail;
+
+    if (!data || len <= 0) return {};
+    if (allZero(data, len)) return {};  // NULL → skip entirely
+
+    QVector<Candidate> cands;
+    cands.reserve(12);
+
+    // Whole-width candidates
+    if (len >= 8) tryWhole8(data, hints, cands);
+    if (len == 4) tryWhole4(data, hints.minObserved, hints.maxObserved, hints, cands);
+    if (len == 2) tryWhole2(data, hints.minObserved, hints.maxObserved, hints, cands);
+    if (len == 1) tryWhole1(data, cands);
+
+    // Uniform splits (compete directly with whole-width candidates)
+    if (len >= 4)
+        trySplitUniform(data, len, hints, cands);
+
+    return pruneAndRank(cands, maxResults);
+}
+
+} // namespace rcx

src/typeselectorpopup.h

@@ -3,6 +3,7 @@
 #include <QFont>
 #include <QVector>
 #include <QString>
+#include <QStringList>
 #include <cstdint>
 #include "core.h"
 
@@ -26,13 +27,19 @@ enum class TypePopupMode { Root, FieldType, ArrayElement, PointerTarget };
 
 struct TypeEntry {
     enum Kind { Primitive, Composite, Section };
+    enum Category { CatPrimitive, CatType, CatEnum };
 
     Kind        entryKind     = Primitive;
+    Category    category      = CatPrimitive;
     NodeKind    primitiveKind = NodeKind::Hex8;  // valid when entryKind==Primitive
     uint64_t    structId      = 0;               // valid when entryKind==Composite
     QString     displayName;
     QString     classKeyword;                    // "struct", "class", "enum" (Composite only)
     bool        enabled       = true;            // false = grayed out (visible but not selectable)
+    int         sizeBytes     = 0;               // size in bytes (for display)
+    int         alignment     = 0;               // natural alignment in bytes
+    int         fieldCount    = 0;               // child field count (composite only)
+    QStringList fieldSummary;                     // first ~6 fields: "0x00: float x"
 };
 
 // ── Parsed type spec (shared between popup filter and inline edit) ──
@@ -58,16 +65,21 @@ public:
     void setMode(TypePopupMode mode);
     void applyTheme(const Theme& theme);
     void setCurrentNodeSize(int bytes);
+    void setPointerSize(int bytes);
     void setModifier(int modId, int arrayCount = 0);
     void setTypes(const QVector<TypeEntry>& types, const TypeEntry* current = nullptr);
     void popup(const QPoint& globalPos);
 
+    /// Show popup instantly with skeleton placeholders; call setTypes() to fill content.
+    void popupLoading(const QPoint& globalPos);
+
     /// Force native window creation to avoid cold-start delay.
     void warmUp();
 
 signals:
     void typeSelected(const TypeEntry& entry, const QString& fullText);
     void createNewTypeRequested();
+    void saveRequested();
     void dismissed();
 
 protected:
@@ -78,28 +90,37 @@ private:
     QLabel*           m_titleLabel   = nullptr;
     QToolButton*      m_escLabel     = nullptr;
     QToolButton*      m_createBtn    = nullptr;
+    QToolButton*      m_saveBtn      = nullptr;
     QLineEdit*        m_filterEdit   = nullptr;
-    QLabel*           m_previewLabel = nullptr;
     QListView*        m_listView     = nullptr;
     QStringListModel* m_model        = nullptr;
-    QFrame*           m_separator    = nullptr;
 
     // Modifier toggles
     QWidget*          m_modRow       = nullptr;
-    QToolButton*      m_btnPlain     = nullptr;
     QToolButton*      m_btnPtr       = nullptr;
     QToolButton*      m_btnDblPtr    = nullptr;
     QToolButton*      m_btnArray     = nullptr;
     QLineEdit*        m_arrayCountEdit = nullptr;
     QButtonGroup*     m_modGroup     = nullptr;
 
+    // Category filter checkboxes
+    QWidget*          m_chipRow      = nullptr;
+    QToolButton*      m_chipPrim     = nullptr;
+    QToolButton*      m_chipTypes    = nullptr;
+    QToolButton*      m_chipEnums    = nullptr;
+    QLabel*           m_statusLabel  = nullptr;
+
     QVector<TypeEntry> m_allTypes;
     QVector<TypeEntry> m_filteredTypes;
+    QVector<QVector<int>> m_matchPositions;
     TypeEntry          m_currentEntry;
     bool               m_hasCurrent = false;
     TypePopupMode      m_mode = TypePopupMode::FieldType;
     int                m_currentNodeSize = 0;
+    int                m_pointerSize = 8;
+    bool               m_loading = false;
     QFont              m_font;
+    int                m_cachedMaxNameLen = 0; // longest displayName length (chars)
 
     void applyFilter(const QString& text);
     void updateModifierPreview();

src/workspace_model.h

@@ -1,8 +1,13 @@
 #pragma once
 #include "core.h"
+#include "themes/theme.h"
 #include <QIcon>
 #include <QStandardItemModel>
 #include <QStandardItem>
+#include <QStyledItemDelegate>
+#include <QSortFilterProxyModel>
+#include <QPainter>
+#include <QApplication>
 #include <algorithm>
 
 namespace rcx {
@@ -10,69 +15,344 @@ namespace rcx {
 struct TabInfo {
     const NodeTree* tree;
     QString         name;
-    void*           subPtr;   // QMdiSubWindow* as void*
+    void*           subPtr;   // QDockWidget* as void*
 };
 
-// Sentinel value stored in UserRole+1 to mark the Project group node.
-static constexpr uint64_t kGroupSentinel = ~uint64_t(0);
+// Helper: is a Hex padding node
+inline bool isHexPad(NodeKind k) {
+    return k == NodeKind::Hex8 || k == NodeKind::Hex16
+        || k == NodeKind::Hex32 || k == NodeKind::Hex64;
+}
 
+// Build child rows for a struct item.
+inline void buildStructChildren(QStandardItem* item,
+                                const NodeTree* tree, uint64_t structId,
+                                void* subPtr) {
+    item->removeRows(0, item->rowCount());
+
+    QVector<int> members = tree->childrenOf(structId);
+    std::sort(members.begin(), members.end(), [&](int a, int b) {
+        return tree->nodes[a].offset < tree->nodes[b].offset;
+    });
+
+    auto memberTypeName = [](const Node& m) -> QString {
+        if (m.kind == NodeKind::Struct) {
+            return m.structTypeName.isEmpty() ? m.resolvedClassKeyword()
+                                              : m.structTypeName;
+        }
+        return QString::fromLatin1(kindToString(m.kind));
+    };
+
+    for (int mi : members) {
+        if (mi < 0 || mi >= tree->nodes.size()) continue;
+        const Node& m = tree->nodes[mi];
+        if (isHexPad(m.kind)) continue;
+        QString childDisplay = QStringLiteral("%1 %2")
+            .arg(memberTypeName(m), m.name);
+        auto* childItem = new QStandardItem(childDisplay);
+        childItem->setData(QVariant::fromValue(subPtr), Qt::UserRole);
+        childItem->setData(QVariant::fromValue(m.id), Qt::UserRole + 1);
+        item->appendRow(childItem);
+    }
+}
+
+// Helper to build display string for a type entry.
+inline QString typeDisplayString(const Node* node, const NodeTree* tree) {
+    auto nameOf = [](const Node* n) {
+        return n->structTypeName.isEmpty() ? n->name : n->structTypeName;
+    };
+    if (node->resolvedClassKeyword() == QStringLiteral("enum")) {
+        return QStringLiteral("%1 \u2014 %2")
+            .arg(nameOf(node),
+                 QString::number(node->enumMembers.size()));
+    }
+    QVector<int> members = tree->childrenOf(node->id);
+    int vc = 0;
+    for (int mi : members)
+        if (!isHexPad(tree->nodes[mi].kind)) ++vc;
+    return QStringLiteral("%1 \u2014 %2")
+        .arg(nameOf(node), QString::number(vc));
+}
+
+// Build a new item for a type entry.
+inline QStandardItem* makeTypeItem(const Node* node, const NodeTree* tree,
+                                   void* subPtr) {
+    static const QIcon enumIcon(":/vsicons/symbol-enum.svg");
+    static const QIcon structIcon(":/vsicons/symbol-structure.svg");
+    bool isEnum = node->resolvedClassKeyword() == QStringLiteral("enum");
+    auto* item = new QStandardItem(
+        isEnum ? enumIcon : structIcon,
+        typeDisplayString(node, tree));
+    item->setData(QVariant::fromValue(subPtr), Qt::UserRole);
+    item->setData(QVariant::fromValue(node->id), Qt::UserRole + 1);
+    item->setData(isEnum, Qt::UserRole + 2);
+
+    if (!isEnum)
+        buildStructChildren(item, tree, node->id, subPtr);
+
+    return item;
+}
+
+// Full rebuild — used by benchmarks and first build.
 inline void buildProjectExplorer(QStandardItemModel* model,
-                                 const QVector<TabInfo>& tabs) {
+                                 const QVector<TabInfo>& tabs,
+                                 const QSet<uint64_t>& pinnedIds = {}) {
     model->clear();
     model->setHorizontalHeaderLabels({QStringLiteral("Name")});
 
-    // Single "Project" root with folder icon
-    void* firstSub = tabs.isEmpty() ? nullptr : tabs[0].subPtr;
-    auto* projectItem = new QStandardItem(QIcon(":/vsicons/folder.svg"),
-                                          QStringLiteral("Project"));
-    projectItem->setData(QVariant::fromValue(firstSub), Qt::UserRole);
-    projectItem->setData(QVariant::fromValue(kGroupSentinel), Qt::UserRole + 1);
-
-    // Collect all top-level structs/enums across all tabs
-    QVector<std::pair<const Node*, void*>> types, enums;
+    struct Entry { const Node* node; void* subPtr; const NodeTree* tree; };
+    QVector<Entry> types, enums;
     for (const auto& tab : tabs) {
         QVector<int> topLevel = tab.tree->childrenOf(0);
         for (int idx : topLevel) {
             const Node& n = tab.tree->nodes[idx];
             if (n.kind != NodeKind::Struct) continue;
             if (n.resolvedClassKeyword() == QStringLiteral("enum"))
-                enums.append({&n, tab.subPtr});
+                enums.append({&n, tab.subPtr, tab.tree});
             else
-                types.append({&n, tab.subPtr});
+                types.append({&n, tab.subPtr, tab.tree});
         }
     }
 
-    auto nameOf = [](const Node* n) {
-        return n->structTypeName.isEmpty() ? n->name : n->structTypeName;
-    };
-    auto cmpName = [&](const std::pair<const Node*, void*>& a,
-                       const std::pair<const Node*, void*>& b) {
-        return nameOf(a.first).compare(nameOf(b.first), Qt::CaseInsensitive) < 0;
-    };
-    std::sort(types.begin(), types.end(), cmpName);
-    std::sort(enums.begin(), enums.end(), cmpName);
-
-    for (const auto& [n, subPtr] : types) {
-        QString display = QStringLiteral("%1 (%2)")
-            .arg(nameOf(n), n->resolvedClassKeyword());
-        auto* item = new QStandardItem(
-            QIcon(":/vsicons/symbol-structure.svg"), display);
-        item->setData(QVariant::fromValue(subPtr), Qt::UserRole);
-        item->setData(QVariant::fromValue(n->id), Qt::UserRole + 1);
-        projectItem->appendRow(item);
+    // Pinned items at the very top, then structs, then enums
+    QVector<Entry> pinned;
+    QVector<Entry> unpinnedTypes, unpinnedEnums;
+    for (const auto& e : types) {
+        if (pinnedIds.contains(e.node->id)) pinned.append(e);
+        else unpinnedTypes.append(e);
     }
-
-    for (const auto& [n, subPtr] : enums) {
-        QString display = QStringLiteral("%1 (%2)")
-            .arg(nameOf(n), n->resolvedClassKeyword());
-        auto* item = new QStandardItem(
-            QIcon(":/vsicons/symbol-enum.svg"), display);
-        item->setData(QVariant::fromValue(subPtr), Qt::UserRole);
-        item->setData(QVariant::fromValue(n->id), Qt::UserRole + 1);
-        projectItem->appendRow(item);
+    for (const auto& e : enums) {
+        if (pinnedIds.contains(e.node->id)) pinned.append(e);
+        else unpinnedEnums.append(e);
     }
-
-    model->appendRow(projectItem);
+    for (const auto& e : pinned)
+        model->appendRow(makeTypeItem(e.node, e.tree, e.subPtr));
+    for (const auto& e : unpinnedTypes)
+        model->appendRow(makeTypeItem(e.node, e.tree, e.subPtr));
+    for (const auto& e : unpinnedEnums)
+        model->appendRow(makeTypeItem(e.node, e.tree, e.subPtr));
 }
 
+// Incremental sync — preserves tree expansion/scroll state.
+inline void syncProjectExplorer(QStandardItemModel* model,
+                                const QVector<TabInfo>& tabs,
+                                const QSet<uint64_t>& pinnedIds = {}) {
+    // First call — full build
+    if (model->rowCount() == 0 && !tabs.isEmpty()) {
+        buildProjectExplorer(model, tabs, pinnedIds);
+        return;
+    }
+
+    // Collect desired entries
+    struct Entry { uint64_t id; const Node* node; void* subPtr; const NodeTree* tree; bool isEnum; };
+    QVector<Entry> desired;
+    for (const auto& tab : tabs) {
+        QVector<int> topLevel = tab.tree->childrenOf(0);
+        for (int idx : topLevel) {
+            const Node& n = tab.tree->nodes[idx];
+            if (n.kind != NodeKind::Struct) continue;
+            bool ie = n.resolvedClassKeyword() == QStringLiteral("enum");
+            desired.append({n.id, &n, tab.subPtr, tab.tree, ie});
+        }
+    }
+
+    QHash<uint64_t, int> desiredMap;
+    desiredMap.reserve(desired.size());
+    for (int i = 0; i < desired.size(); ++i)
+        desiredMap[desired[i].id] = i;
+
+    // Remove stale items (backwards)
+    for (int i = model->rowCount() - 1; i >= 0; --i) {
+        auto* item = model->item(i);
+        if (!item) continue;
+        uint64_t id = item->data(Qt::UserRole + 1).toULongLong();
+        if (!desiredMap.contains(id))
+            model->removeRow(i);
+    }
+
+    // Update existing items
+    QSet<uint64_t> existing;
+    for (int i = 0; i < model->rowCount(); ++i) {
+        auto* item = model->item(i);
+        uint64_t id = item->data(Qt::UserRole + 1).toULongLong();
+        existing.insert(id);
+        auto dit = desiredMap.find(id);
+        if (dit == desiredMap.end()) continue;
+        const Entry& e = desired[*dit];
+
+        QString display = typeDisplayString(e.node, e.tree);
+        if (item->text() != display)
+            item->setText(display);
+        item->setData(QVariant::fromValue(e.subPtr), Qt::UserRole);
+
+        // Refresh children only when count changed (avoids destroying expansion state)
+        if (!e.isEnum) {
+            QVector<int> members = e.tree->childrenOf(id);
+            int visCount = 0;
+            for (int mi : members)
+                if (!isHexPad(e.tree->nodes[mi].kind)) ++visCount;
+            if (item->rowCount() != visCount)
+                buildStructChildren(item, e.tree, id, e.subPtr);
+        }
+    }
+
+    // Add new items
+    for (const auto& e : desired) {
+        if (existing.contains(e.id)) continue;
+        model->appendRow(makeTypeItem(e.node, e.tree, e.subPtr));
+    }
+
+    if (model->horizontalHeaderItem(0) == nullptr)
+        model->setHorizontalHeaderLabels({QStringLiteral("Name")});
+}
+
+// ── Custom delegate for rich workspace tree rendering ──
+
+class WorkspaceDelegate : public QStyledItemDelegate {
+public:
+    using QStyledItemDelegate::QStyledItemDelegate;
+
+    void setThemeColors(const Theme& t) {
+        m_text      = t.text;
+        m_textDim   = t.textDim;
+        m_textMuted = t.textMuted;
+        m_syntaxType = t.syntaxType;
+        m_hover     = t.hover;
+        m_selected  = t.selected;
+        m_accent    = t.borderFocused; // left accent bar
+        m_bg        = t.background;
+        m_badgeBg   = t.backgroundAlt;
+        m_badgeText = t.textDim;
+    }
+
+    QSize sizeHint(const QStyleOptionViewItem& option,
+                   const QModelIndex& index) const override {
+        QSize s = QStyledItemDelegate::sizeHint(option, index);
+        int pad = index.parent().isValid() ? 6 : 10;
+        s.setHeight(option.fontMetrics.height() + pad);
+        return s;
+    }
+
+    void paint(QPainter* painter, const QStyleOptionViewItem& option,
+               const QModelIndex& index) const override {
+        painter->save();
+
+        QStyleOptionViewItem opt = option;
+        initStyleOption(&opt, index);
+        opt.text.clear();
+        opt.icon = QIcon();  // we draw icon manually
+        QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &opt, painter);
+
+        // Custom background for selection/hover
+        if (opt.state & QStyle::State_Selected) {
+            painter->fillRect(opt.rect, m_selected);
+            // Left accent bar
+            painter->fillRect(QRect(opt.rect.x(), opt.rect.y(), 1, opt.rect.height()), m_accent);
+        } else if (opt.state & QStyle::State_MouseOver) {
+            painter->fillRect(opt.rect, m_hover);
+        }
+
+        bool isChild = index.parent().isValid();
+        QString fullText = index.data(Qt::DisplayRole).toString();
+        QRect textRect = opt.rect.adjusted(4, 0, -4, 0);
+
+        // Letter badge (S/E for top-level, F for children)
+        {
+            QChar letter = 'F';
+            if (!isChild) {
+                bool isEnum = index.data(Qt::UserRole + 2).toBool();
+                letter = isEnum ? 'E' : 'S';
+            }
+            int sz = opt.fontMetrics.height();
+            int y = textRect.y() + (textRect.height() - sz) / 2;
+            QRect badge(textRect.x(), y, sz, sz);
+            painter->setRenderHint(QPainter::Antialiasing, true);
+            painter->setRenderHint(QPainter::TextAntialiasing, true);
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(m_badgeBg);
+            painter->drawRoundedRect(badge, 3, 3);
+            QColor letterCol = m_badgeText;
+            if (!isChild && !index.data(Qt::UserRole + 3).toBool())
+                letterCol.setAlpha(100);
+            painter->setPen(letterCol);
+            QFont bf = opt.font;
+            bf.setBold(true);
+            painter->setFont(bf);
+            painter->drawText(badge, Qt::AlignCenter, letter);
+            painter->setRenderHint(QPainter::Antialiasing, false);
+            textRect.setLeft(textRect.left() + sz + 4);
+        }
+
+        painter->setFont(opt.font);
+
+        if (!isChild) {
+            // Top-level: "StructName — 3" → name left, count pill right
+            int dashPos = fullText.indexOf(QChar(0x2014));
+            QString name = (dashPos > 1) ? fullText.left(dashPos - 1) : fullText;
+            QString count = (dashPos > 1) ? fullText.mid(dashPos + 2).trimmed() : QString();
+
+            bool pinned = index.data(Qt::UserRole + 4).toBool();
+
+            // Reserve right side for pin icon + count pill
+            int rightEdge = textRect.right();
+            if (!count.isEmpty()) {
+                int cw = opt.fontMetrics.horizontalAdvance(count) + 10;
+                int ch = opt.fontMetrics.height();
+                int cy = textRect.y() + (textRect.height() - ch) / 2;
+                QRect pill(rightEdge - cw, cy, cw, ch);
+                rightEdge = pill.left() - 2;
+
+                painter->setPen(Qt::NoPen);
+                painter->setBrush(m_badgeBg);
+                painter->drawRect(pill);
+                painter->setPen(m_textMuted);
+                painter->drawText(pill, Qt::AlignCenter, count);
+            }
+            if (pinned) {
+                static const QIcon pinIcon(":/vsicons/pin.svg");
+                int isz = opt.fontMetrics.height() - 2;
+                int iy = textRect.y() + (textRect.height() - isz) / 2;
+                QRect pinRect(rightEdge - isz, iy, isz, isz);
+                pinIcon.paint(painter, pinRect);
+                rightEdge = pinRect.left() - 2;
+            }
+
+            // Draw name clipped before right-side elements
+            if (rightEdge > textRect.left() + 4) {
+                QRect nameRect = textRect;
+                nameRect.setRight(rightEdge);
+                QString elided = opt.fontMetrics.elidedText(name, Qt::ElideRight, nameRect.width());
+                painter->setPen(m_text);
+                painter->drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter, elided);
+            }
+        } else {
+            // Child: "TypeName fieldName"
+            int spacePos = fullText.indexOf(' ');
+            if (spacePos > 0) {
+                QString typeName = fullText.left(spacePos);
+                QString fieldName = fullText.mid(spacePos);
+
+                painter->setPen(m_syntaxType);
+                painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, typeName);
+                int typeW = opt.fontMetrics.horizontalAdvance(typeName);
+
+                QRect fieldRect = textRect;
+                fieldRect.setLeft(textRect.left() + typeW);
+                painter->setPen(m_textDim);
+                painter->drawText(fieldRect, Qt::AlignLeft | Qt::AlignVCenter, fieldName);
+            } else {
+                painter->setPen(m_textDim);
+                painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, fullText);
+            }
+        }
+
+        painter->restore();
+    }
+
+private:
+    QColor m_text, m_textDim, m_textMuted, m_syntaxType;
+    QColor m_hover, m_selected, m_accent, m_bg;
+    QColor m_badgeBg, m_badgeText;
+};
+
 } // namespace rcx

tests/bench_large_class.cpp

@@ -0,0 +1,255 @@
+/*
+ * bench_large_class — benchmark compose, applyDocument, hover highlight,
+ * and selection overlay on a large struct (500+ fields).
+ *
+ * Simulates EPROCESS-class structures to measure editor performance.
+ */
+#include <QtTest/QtTest>
+#include <QElapsedTimer>
+#include "core.h"
+#include "editor.h"
+#include "providers/buffer_provider.h"
+
+using namespace rcx;
+
+/* ── Build a large struct tree with N fields of mixed types ──────── */
+
+static NodeTree buildLargeTree(int fieldCount)
+{
+    NodeTree tree;
+    tree.baseAddress = 0x7FF600000000ULL;
+
+    // Root struct
+    Node root;
+    root.id = 1;
+    root.kind = NodeKind::Struct;
+    root.name = QStringLiteral("EPROCESS");
+    root.structTypeName = QStringLiteral("_EPROCESS");
+    root.parentId = 0;
+    root.offset = 0;
+    tree.addNode(root);
+
+    // Cycle through common field types
+    const NodeKind kinds[] = {
+        NodeKind::Int32, NodeKind::UInt64, NodeKind::Float,
+        NodeKind::Pointer64, NodeKind::Int16, NodeKind::UInt32,
+        NodeKind::Double, NodeKind::Bool, NodeKind::Hex8
+    };
+    const int kindCount = sizeof(kinds) / sizeof(kinds[0]);
+
+    int offset = 0;
+    for (int i = 0; i < fieldCount; ++i) {
+        Node n;
+        n.id = (uint64_t)(i + 2);
+        n.kind = kinds[i % kindCount];
+        n.name = QStringLiteral("field_%1").arg(i, 4, 10, QChar('0'));
+        n.parentId = 1;
+        n.offset = offset;
+        tree.addNode(n);
+        offset += sizeForKind(n.kind);
+    }
+    tree.m_nextId = (uint64_t)(fieldCount + 2);
+    return tree;
+}
+
+/* ══════════════════════════════════════════════════════════════════ */
+
+class BenchLargeClass : public QObject {
+    Q_OBJECT
+
+private:
+    NodeTree m_tree;
+    BufferProvider m_prov;
+    ComposeResult m_result;
+
+private slots:
+    void initTestCase();
+    void benchCompose();
+    void benchComposeLarge();
+    void benchApplyDocument();
+    void benchHoverHighlight();
+    void benchSelectionOverlay();
+    void benchHoverHighlightRepeated();
+
+public:
+    BenchLargeClass() : m_prov(QByteArray()) {}
+};
+
+void BenchLargeClass::initTestCase()
+{
+    m_tree = buildLargeTree(500);
+
+    // Create buffer large enough for all fields
+    QByteArray buf(0x10000, '\0');
+    // Fill with pattern so values are non-zero
+    for (int i = 0; i < buf.size(); ++i)
+        buf[i] = (char)(i & 0xFF);
+    m_prov = BufferProvider(buf, QStringLiteral("bench_data"));
+
+    // Pre-compose for tests that need the result
+    m_result = rcx::compose(m_tree, m_prov);
+    qDebug() << "Tree:" << m_tree.nodes.size() << "nodes,"
+             << m_result.meta.size() << "display lines,"
+             << m_result.text.size() << "chars";
+}
+
+void BenchLargeClass::benchCompose()
+{
+    const int ITERS = 100;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        ComposeResult r = rcx::compose(m_tree, m_prov);
+        Q_UNUSED(r);
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== Compose Benchmark (500 fields) ===";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-compose:" << (double)elapsed / ITERS << "ms";
+    QVERIFY(elapsed > 0);
+}
+
+void BenchLargeClass::benchComposeLarge()
+{
+    // Build a 2000-field tree to stress-test compose at scale
+    NodeTree bigTree = buildLargeTree(2000);
+    QByteArray buf(0x40000, '\0');
+    for (int i = 0; i < buf.size(); ++i) buf[i] = (char)(i & 0xFF);
+    BufferProvider bigProv(buf, QStringLiteral("bench_large"));
+
+    // Warmup
+    { ComposeResult w = rcx::compose(bigTree, bigProv); Q_UNUSED(w); }
+
+    const int ITERS = 50;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        ComposeResult r = rcx::compose(bigTree, bigProv);
+        Q_UNUSED(r);
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== Compose Benchmark (2000 fields) ===";
+    qDebug() << "  Tree:" << bigTree.nodes.size() << "nodes";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-compose:" << (double)elapsed / ITERS << "ms";
+    QVERIFY(elapsed > 0);
+}
+
+void BenchLargeClass::benchApplyDocument()
+{
+    RcxEditor editor;
+    editor.resize(800, 600);
+
+    const int ITERS = 50;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i)
+        editor.applyDocument(m_result);
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== ApplyDocument Benchmark (500 fields) ===";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-apply:" << (double)elapsed / ITERS << "ms";
+    QVERIFY(elapsed > 0);
+}
+
+void BenchLargeClass::benchHoverHighlight()
+{
+    RcxEditor editor;
+    editor.resize(800, 600);
+    editor.applyDocument(m_result);
+
+    // Simulate hovering over the first field
+    // We need access to internals, so we measure via public methods
+    // by toggling selection which triggers applyHoverHighlight internally
+    QSet<uint64_t> sel;
+    sel.insert(2);  // first field node id
+
+    const int ITERS = 200;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        editor.applySelectionOverlay(i % 2 == 0 ? sel : QSet<uint64_t>{});
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== Hover/Selection Overlay Benchmark (500 fields) ===";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-cycle:" << (double)elapsed / ITERS << "ms";
+    QVERIFY(elapsed > 0);
+}
+
+void BenchLargeClass::benchSelectionOverlay()
+{
+    RcxEditor editor;
+    editor.resize(800, 600);
+    editor.applyDocument(m_result);
+
+    // Select many nodes (simulate multi-select of 50 fields)
+    QSet<uint64_t> bigSel;
+    for (int i = 0; i < 50; ++i)
+        bigSel.insert((uint64_t)(i + 2));
+
+    const int ITERS = 100;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        editor.applySelectionOverlay(bigSel);
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== Multi-Selection Overlay Benchmark (50 selected, 500 fields) ===";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-overlay:" << (double)elapsed / ITERS << "ms";
+    QVERIFY(elapsed > 0);
+}
+
+void BenchLargeClass::benchHoverHighlightRepeated()
+{
+    RcxEditor editor;
+    editor.resize(800, 600);
+    editor.applyDocument(m_result);
+
+    // Simulate rapid hover changes: alternate between two different nodes
+    // This is the worst case - every call does a full marker clear + rescan
+    QSet<uint64_t> empty;
+    QSet<uint64_t> sel1; sel1.insert(10);
+    QSet<uint64_t> sel2; sel2.insert(100);
+
+    const int ITERS = 500;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        editor.applySelectionOverlay(i % 3 == 0 ? sel1 : (i % 3 == 1 ? sel2 : empty));
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== Rapid Hover Change Benchmark (500 fields, alternating nodes) ===";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-change:" << (double)elapsed / ITERS << "ms";
+    qDebug() << "  Simulated events/sec:" << (ITERS * 1000.0 / elapsed);
+    QVERIFY(elapsed > 0);
+}
+
+QTEST_MAIN(BenchLargeClass)
+#include "bench_large_class.moc"

tests/bench_project.cpp

@@ -0,0 +1,282 @@
+/*
+ * bench_project — benchmark project lifecycle operations:
+ *   - New class creation
+ *   - Loading large .rcx files (WinSDK, Vergilius)
+ *   - Workspace model building
+ *   - Workspace search filtering
+ *   - JSON parsing vs model building breakdown
+ */
+#include <QtTest/QtTest>
+#include <QElapsedTimer>
+#include <QJsonDocument>
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
+#include "core.h"
+#include "controller.h"
+#include "workspace_model.h"
+
+using namespace rcx;
+
+class BenchProject : public QObject {
+    Q_OBJECT
+
+private slots:
+    void benchNewClass();
+    void benchLoadVergilius();
+    void benchLoadWinSDK();
+    void benchJsonParse();
+    void benchNodeTreeFromJson();
+    void benchBuildWorkspaceModel();
+    void benchWorkspaceSearch();
+};
+
+static QString findExample(const QString& name) {
+    // Try relative to executable, then common build layout
+    QStringList candidates = {
+        QCoreApplication::applicationDirPath() + "/examples/" + name,
+        QCoreApplication::applicationDirPath() + "/../src/examples/" + name,
+        QStringLiteral("src/examples/") + name,
+        QStringLiteral("../src/examples/") + name,
+    };
+    for (const auto& c : candidates)
+        if (QFileInfo::exists(c)) return c;
+    return {};
+}
+
+// ── New class (just the core operations, no UI) ──
+
+void BenchProject::benchNewClass()
+{
+    const int ITERS = 1000;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        NodeTree tree;
+        tree.baseAddress = 0x00400000;
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = QStringLiteral("NewClass");
+        root.structTypeName = QStringLiteral("NewClass");
+        root.classKeyword = QStringLiteral("class");
+        tree.addNode(root);
+        // Add 8 hex64 padding fields (what buildEmptyStruct does)
+        uint64_t rootId = tree.nodes[0].id;
+        for (int j = 0; j < 8; ++j) {
+            Node pad;
+            pad.kind = NodeKind::Hex64;
+            pad.name = QString();
+            pad.parentId = rootId;
+            pad.offset = j * 8;
+            tree.addNode(pad);
+        }
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== New Class (core tree build) ===";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-new:" << (double)elapsed / ITERS << "ms";
+}
+
+// ── Load .rcx files ──
+
+static bool loadRcx(const QString& path, NodeTree& tree) {
+    QFile f(path);
+    if (!f.open(QIODevice::ReadOnly)) return false;
+    QJsonDocument jdoc = QJsonDocument::fromJson(f.readAll());
+    tree = NodeTree::fromJson(jdoc.object());
+    return !tree.nodes.isEmpty();
+}
+
+void BenchProject::benchLoadVergilius()
+{
+    QString path = findExample("Vergilius_25H2.rcx");
+    if (path.isEmpty()) { QSKIP("Vergilius_25H2.rcx not found"); return; }
+
+    const int ITERS = 5;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        NodeTree tree;
+        QVERIFY(loadRcx(path, tree));
+        if (i == 0)
+            qDebug() << "  Nodes:" << tree.nodes.size();
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== Load Vergilius_25H2.rcx ===";
+    qDebug() << "  File:" << QFileInfo(path).size() / 1024 << "KB";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-load:" << (double)elapsed / ITERS << "ms";
+}
+
+void BenchProject::benchLoadWinSDK()
+{
+    QString path = findExample("WinSDK.rcx");
+    if (path.isEmpty()) { QSKIP("WinSDK.rcx not found"); return; }
+
+    const int ITERS = 5;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        NodeTree tree;
+        QVERIFY(loadRcx(path, tree));
+        if (i == 0)
+            qDebug() << "  Nodes:" << tree.nodes.size();
+    }
+    qint64 elapsed = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== Load WinSDK.rcx ===";
+    qDebug() << "  File:" << QFileInfo(path).size() / 1024 << "KB";
+    qDebug() << "  Iterations:" << ITERS;
+    qDebug() << "  Total:" << elapsed << "ms";
+    qDebug() << "  Per-load:" << (double)elapsed / ITERS << "ms";
+}
+
+// ── Breakdown: JSON parse vs NodeTree build ──
+
+void BenchProject::benchJsonParse()
+{
+    QString path = findExample("Vergilius_25H2.rcx");
+    if (path.isEmpty()) path = findExample("WinSDK.rcx");
+    if (path.isEmpty()) { QSKIP("No large .rcx found"); return; }
+
+    QFile f(path);
+    QVERIFY(f.open(QIODevice::ReadOnly));
+    QByteArray data = f.readAll();
+    f.close();
+
+    const int ITERS = 5;
+
+    // Phase 1: raw JSON parse
+    QElapsedTimer timer;
+    timer.start();
+    QJsonDocument jdoc;
+    for (int i = 0; i < ITERS; ++i)
+        jdoc = QJsonDocument::fromJson(data);
+    qint64 jsonMs = timer.elapsed();
+
+    // Phase 2: NodeTree::fromJson
+    QJsonObject root = jdoc.object();
+    timer.start();
+    NodeTree tree;
+    for (int i = 0; i < ITERS; ++i)
+        tree = NodeTree::fromJson(root);
+    qint64 treeMs = timer.elapsed();
+
+    qDebug() << "";
+    qDebug() << "=== JSON Parse Breakdown ===" << QFileInfo(path).fileName();
+    qDebug() << "  File:" << data.size() / 1024 << "KB," << tree.nodes.size() << "nodes";
+    qDebug() << "  JSON parse:" << (double)jsonMs / ITERS << "ms/iter";
+    qDebug() << "  NodeTree build:" << (double)treeMs / ITERS << "ms/iter";
+    qDebug() << "  Total per-load:" << (double)(jsonMs + treeMs) / ITERS << "ms";
+}
+
+void BenchProject::benchNodeTreeFromJson()
+{
+    // Already covered by benchJsonParse breakdown
+    QVERIFY(true);
+}
+
+// ── Workspace model building ──
+
+void BenchProject::benchBuildWorkspaceModel()
+{
+    // Load both large examples if available
+    QVector<NodeTree> trees;
+    for (const auto& name : {QStringLiteral("Vergilius_25H2.rcx"), QStringLiteral("WinSDK.rcx")}) {
+        QString path = findExample(name);
+        if (path.isEmpty()) continue;
+        NodeTree t;
+        if (loadRcx(path, t)) trees.append(std::move(t));
+    }
+    if (trees.isEmpty()) { QSKIP("No .rcx examples found"); return; }
+
+    // Build TabInfo array
+    QVector<TabInfo> tabs;
+    for (const auto& t : trees)
+        tabs.append({ &t, QStringLiteral("test"), nullptr });
+
+    QStandardItemModel model;
+    const int ITERS = 20;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i)
+        buildProjectExplorer(&model, tabs);
+    qint64 elapsed = timer.elapsed();
+
+    // Count items
+    int topLevel = model.rowCount();
+    int totalChildren = 0;
+    for (int i = 0; i < topLevel; ++i)
+        totalChildren += model.item(i)->rowCount();
+
+    int totalNodes = 0;
+    for (const auto& t : trees) totalNodes += t.nodes.size();
+    fprintf(stderr, "\n=== Build Workspace Model ===\n");
+    fprintf(stderr, "  Trees: %d  total nodes: %d\n", (int)trees.size(), totalNodes);
+    fprintf(stderr, "  Top-level items: %d  child items: %d\n", topLevel, totalChildren);
+    fprintf(stderr, "  Iterations: %d\n", ITERS);
+    fprintf(stderr, "  Total: %lld ms\n", (long long)elapsed);
+    fprintf(stderr, "  Per-build: %.1f ms\n", (double)elapsed / ITERS);
+}
+
+// ── Workspace search filtering ──
+
+void BenchProject::benchWorkspaceSearch()
+{
+    QVector<NodeTree> trees;
+    for (const auto& name : {QStringLiteral("Vergilius_25H2.rcx"), QStringLiteral("WinSDK.rcx")}) {
+        QString path = findExample(name);
+        if (path.isEmpty()) continue;
+        NodeTree t;
+        if (loadRcx(path, t)) trees.append(std::move(t));
+    }
+    if (trees.isEmpty()) { QSKIP("No .rcx examples found"); return; }
+
+    QVector<TabInfo> tabs;
+    for (const auto& t : trees)
+        tabs.append({ &t, QStringLiteral("test"), nullptr });
+
+    QStandardItemModel model;
+    buildProjectExplorer(&model, tabs);
+
+    QSortFilterProxyModel proxy;
+    proxy.setSourceModel(&model);
+    proxy.setFilterCaseSensitivity(Qt::CaseInsensitive);
+    proxy.setRecursiveFilteringEnabled(true);
+
+    const QStringList queries = {
+        "EPROCESS", "KTHREAD", "LIST_ENTRY", "HAL", "DMA",
+        "xyz_no_match", "a", "Dispatch"
+    };
+
+    const int ITERS = 50;
+    QElapsedTimer timer;
+
+    timer.start();
+    for (int i = 0; i < ITERS; ++i) {
+        for (const auto& q : queries)
+            proxy.setFilterFixedString(q);
+        proxy.setFilterFixedString(QString());  // clear
+    }
+    qint64 elapsed = timer.elapsed();
+
+    int totalOps = ITERS * (queries.size() + 1);
+    fprintf(stderr, "\n=== Workspace Search Filter ===\n");
+    fprintf(stderr, "  Model rows: %d  queries: %d\n", model.rowCount(), (int)queries.size());
+    fprintf(stderr, "  Iterations: %d  total filter ops: %d\n", ITERS, totalOps);
+    fprintf(stderr, "  Total: %lld ms\n", (long long)elapsed);
+    fprintf(stderr, "  Per-filter: %.2f ms\n", (double)elapsed / totalOps);
+}
+
+QTEST_MAIN(BenchProject)
+#include "bench_project.moc"

tests/test_32bit_support.cpp

@@ -0,0 +1,440 @@
+#include <QtTest/QTest>
+#include "core.h"
+#include "generator.h"
+#include "imports/import_source.h"
+#include "imports/import_reclass_xml.h"
+#include "providers/provider.h"
+#include "addressparser.h"
+#include "iplugin.h"
+#include "processpicker.h"
+
+// Include RPC protocol for header size test
+#include "rcx_rpc_protocol.h"
+
+using namespace rcx;
+
+// ── Test provider that reports a configurable pointer size ──
+
+class TestProvider32 : public Provider {
+public:
+    QByteArray m_data;
+    int m_ptrSize;
+
+    TestProvider32(int ptrSize, int dataSize = 256)
+        : m_ptrSize(ptrSize), m_data(dataSize, '\0') {}
+
+    bool read(uint64_t addr, void* buf, int len) const override {
+        if ((int)addr + len > m_data.size()) {
+            memset(buf, 0, len);
+            return false;
+        }
+        memcpy(buf, m_data.constData() + addr, len);
+        return true;
+    }
+    int size() const override { return m_data.size(); }
+    int pointerSize() const override { return m_ptrSize; }
+};
+
+class Test32BitSupport : public QObject {
+    Q_OBJECT
+
+private slots:
+
+    // ── 1. Provider::pointerSize() default is 8 ──
+
+    void providerDefaultPointerSize() {
+        // NullProvider inherits default
+        NullProvider np;
+        QCOMPARE(np.pointerSize(), 8);
+    }
+
+    void providerCustomPointerSize() {
+        TestProvider32 p32(4);
+        QCOMPARE(p32.pointerSize(), 4);
+        TestProvider32 p64(8);
+        QCOMPARE(p64.pointerSize(), 8);
+    }
+
+    // ── 2. NodeTree pointerSize field ──
+
+    void nodeTreeDefaultPointerSize() {
+        NodeTree tree;
+        QCOMPARE(tree.pointerSize, 8);
+    }
+
+    void nodeTreePointerSizeRoundTrip() {
+        // 32-bit tree persists to JSON and back
+        NodeTree tree;
+        tree.pointerSize = 4;
+        tree.baseAddress = 0x00400000;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Test";
+        root.structTypeName = "Test";
+        root.parentId = 0;
+        tree.addNode(root);
+
+        QJsonObject json = tree.toJson();
+        QCOMPARE(json["pointerSize"].toInt(), 4);
+
+        NodeTree restored = NodeTree::fromJson(json);
+        QCOMPARE(restored.pointerSize, 4);
+    }
+
+    void nodeTreePointerSizeOmittedForDefault() {
+        // 64-bit (default) should not write pointerSize key
+        NodeTree tree;
+        tree.pointerSize = 8;
+        QJsonObject json = tree.toJson();
+        QVERIFY(!json.contains("pointerSize"));
+    }
+
+    void nodeTreePointerSizeDefaultOnMissing() {
+        // Legacy JSON without pointerSize should default to 8
+        QJsonObject json;
+        json["baseAddress"] = "400000";
+        json["nextId"] = "1";
+        json["nodes"] = QJsonArray();
+
+        NodeTree tree = NodeTree::fromJson(json);
+        QCOMPARE(tree.pointerSize, 8);
+    }
+
+    // ── 3. Source import respects pointer size ──
+
+    void sourceImport64bitDefault() {
+        QString src = R"(
+            struct Test {
+                PVOID ptr;     // 0x0
+                SIZE_T sz;     // 0x8
+            };
+        )";
+        QString error;
+        NodeTree tree = importFromSource(src, &error);
+        QVERIFY2(!tree.nodes.isEmpty(), qPrintable(error));
+
+        // Default: 64-bit pointers
+        bool foundPtr64 = false, foundUInt64 = false;
+        for (const auto& n : tree.nodes) {
+            if (n.name == "ptr" && n.kind == NodeKind::Pointer64) foundPtr64 = true;
+            if (n.name == "sz" && n.kind == NodeKind::UInt64) foundUInt64 = true;
+        }
+        QVERIFY2(foundPtr64, "PVOID should be Pointer64 in 64-bit mode");
+        QVERIFY2(foundUInt64, "SIZE_T should be UInt64 in 64-bit mode");
+    }
+
+    void sourceImport32bit() {
+        QString src = R"(
+            struct Test {
+                PVOID ptr;     // 0x0
+                SIZE_T sz;     // 0x4
+            };
+        )";
+        QString error;
+        NodeTree tree = importFromSource(src, &error, 4);
+        QVERIFY2(!tree.nodes.isEmpty(), qPrintable(error));
+
+        QCOMPARE(tree.pointerSize, 4);
+
+        bool foundPtr32 = false, foundUInt32 = false;
+        for (const auto& n : tree.nodes) {
+            if (n.name == "ptr" && n.kind == NodeKind::Pointer32) foundPtr32 = true;
+            if (n.name == "sz" && n.kind == NodeKind::UInt32) foundUInt32 = true;
+        }
+        QVERIFY2(foundPtr32, "PVOID should be Pointer32 in 32-bit mode");
+        QVERIFY2(foundUInt32, "SIZE_T should be UInt32 in 32-bit mode");
+    }
+
+    void sourceImportPointerField32bit() {
+        // A generic pointer (void* field) should become Pointer32 in 32-bit mode
+        QString src = R"(
+            struct Test {
+                void* ptr;     // 0x0
+                int value;     // 0x4
+            };
+        )";
+        QString error;
+        NodeTree tree = importFromSource(src, &error, 4);
+        QVERIFY2(!tree.nodes.isEmpty(), qPrintable(error));
+
+        bool foundPtr32 = false;
+        for (const auto& n : tree.nodes) {
+            if (n.name == "ptr" && n.kind == NodeKind::Pointer32) foundPtr32 = true;
+        }
+        QVERIFY2(foundPtr32, "void* should be Pointer32 in 32-bit mode");
+    }
+
+    void sourceImportPointerSizeTypes32bit() {
+        // All pointer-size-dependent types should be 32-bit
+        QString src = R"(
+            struct Test {
+                HANDLE h;        // 0x0
+                ULONG_PTR up;    // 0x4
+                LONG_PTR lp;     // 0x8
+                uintptr_t uip;   // 0xC
+                intptr_t ip;     // 0x10
+                size_t sz;       // 0x14
+                LPVOID lv;       // 0x18
+                PCHAR pc;        // 0x1C
+            };
+        )";
+        QString error;
+        NodeTree tree = importFromSource(src, &error, 4);
+        QVERIFY2(!tree.nodes.isEmpty(), qPrintable(error));
+
+        for (const auto& n : tree.nodes) {
+            if (n.parentId == 0) continue; // skip root struct
+            int sz = n.byteSize();
+            QVERIFY2(sz == 4,
+                qPrintable(QString("Field '%1' has size %2, expected 4")
+                    .arg(n.name).arg(sz)));
+        }
+    }
+
+    // ── 4. Generator respects pointer size ──
+
+    void generatorPointer32NativeVoidStar() {
+        // For 32-bit target, untyped Pointer32 should emit void*
+        NodeTree tree;
+        tree.pointerSize = 4;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Test";
+        root.structTypeName = "Test";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node p;
+        p.kind = NodeKind::Pointer32;
+        p.name = "ptr";
+        p.parentId = rootId;
+        p.offset = 0;
+        tree.addNode(p);
+
+        QString result = renderCpp(tree, rootId);
+        QVERIFY2(result.contains("void* ptr;"),
+            qPrintable("32-bit native Pointer32 should emit void*:\n" + result));
+    }
+
+    void generatorPointer64NativeVoidStar() {
+        // For 64-bit target (default), untyped Pointer64 should emit void*
+        NodeTree tree;
+        tree.pointerSize = 8;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Test";
+        root.structTypeName = "Test";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node p;
+        p.kind = NodeKind::Pointer64;
+        p.name = "ptr";
+        p.parentId = rootId;
+        p.offset = 0;
+        tree.addNode(p);
+
+        QString result = renderCpp(tree, rootId);
+        QVERIFY2(result.contains("void* ptr;"),
+            qPrintable("64-bit native Pointer64 should emit void*:\n" + result));
+    }
+
+    void generatorPointer32CrossSizeInt() {
+        // For 64-bit target, Pointer32 should emit uint32_t (cross-size)
+        NodeTree tree;
+        tree.pointerSize = 8;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Test";
+        root.structTypeName = "Test";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node p;
+        p.kind = NodeKind::Pointer32;
+        p.name = "ptr32";
+        p.parentId = rootId;
+        p.offset = 0;
+        tree.addNode(p);
+
+        QString result = renderCpp(tree, rootId);
+        QVERIFY2(result.contains("uint32_t ptr32;"),
+            qPrintable("Cross-size Pointer32 on 64-bit target should emit uint32_t:\n" + result));
+    }
+
+    void generatorTypedPointerBothSizes() {
+        // Typed pointers (with refId) always emit struct X* regardless of size
+        NodeTree tree;
+        tree.pointerSize = 4;
+
+        Node target;
+        target.kind = NodeKind::Struct;
+        target.name = "Target";
+        target.structTypeName = "TargetData";
+        target.parentId = 0;
+        int ti = tree.addNode(target);
+        uint64_t targetId = tree.nodes[ti].id;
+
+        Node main;
+        main.kind = NodeKind::Struct;
+        main.name = "Main";
+        main.structTypeName = "MainStruct";
+        main.parentId = 0;
+        int mi = tree.addNode(main);
+        uint64_t mainId = tree.nodes[mi].id;
+
+        Node p;
+        p.kind = NodeKind::Pointer32;
+        p.name = "pTarget";
+        p.parentId = mainId;
+        p.offset = 0;
+        p.refId = targetId;
+        tree.addNode(p);
+
+        QString result = renderCpp(tree, mainId);
+        QVERIFY2(result.contains("struct TargetData* pTarget;"),
+            qPrintable("Typed Pointer32 should emit struct X*:\n" + result));
+    }
+
+    // ── 5. RPC protocol header has pointerSize field ──
+
+    void rpcHeaderHasPointerSize() {
+        // Verify the field exists and header is still 4096 bytes
+        RcxRpcHeader hdr = {};
+        hdr.pointerSize = 4;
+        QCOMPARE(hdr.pointerSize, (uint32_t)4);
+        QCOMPARE((int)sizeof(RcxRpcHeader), RCX_RPC_HEADER_SIZE);
+    }
+
+    // ── 6. PluginProcessInfo has is32Bit field ──
+
+    void pluginProcessInfoIs32Bit() {
+        PluginProcessInfo info;
+        QCOMPARE(info.is32Bit, false); // default
+
+        info.is32Bit = true;
+        QCOMPARE(info.is32Bit, true);
+    }
+
+    // ── 7. ProcessInfo has is32Bit field ──
+
+    void processInfoIs32Bit() {
+        ProcessInfo info;
+        QCOMPARE(info.is32Bit, false); // default
+
+        info.is32Bit = true;
+        QCOMPARE(info.is32Bit, true);
+    }
+
+    // ── 8. AddressParser readPointer uses correct size ──
+
+    void addressParserReadPointer32bit() {
+        // Create a test provider with a 32-bit pointer at address 0
+        TestProvider32 prov(4, 16);
+        uint32_t val32 = 0xDEADBEEF;
+        memcpy(prov.m_data.data(), &val32, 4);
+        // Write garbage in bytes 4-7 to verify we only read 4 bytes
+        memset(prov.m_data.data() + 4, 0xFF, 4);
+
+        AddressParserCallbacks cbs;
+        int ptrSz = prov.pointerSize();
+        auto* p = &prov;
+        cbs.readPointer = [p, ptrSz](uint64_t addr, bool* ok) -> uint64_t {
+            uint64_t val = 0;
+            *ok = p->read(addr, &val, ptrSz);
+            return val;
+        };
+
+        auto result = AddressParser::evaluate("[0]", ptrSz, &cbs);
+        QVERIFY(result.ok);
+        QCOMPARE(result.value, (uint64_t)0xDEADBEEF);
+    }
+
+    void addressParserReadPointer64bit() {
+        TestProvider32 prov(8, 16);
+        uint64_t val64 = 0x0000DEADBEEF1234ULL;
+        memcpy(prov.m_data.data(), &val64, 8);
+
+        AddressParserCallbacks cbs;
+        int ptrSz = prov.pointerSize();
+        auto* p = &prov;
+        cbs.readPointer = [p, ptrSz](uint64_t addr, bool* ok) -> uint64_t {
+            uint64_t val = 0;
+            *ok = p->read(addr, &val, ptrSz);
+            return val;
+        };
+
+        auto result = AddressParser::evaluate("[0]", ptrSz, &cbs);
+        QVERIFY(result.ok);
+        QCOMPARE(result.value, (uint64_t)0x0000DEADBEEF1234ULL);
+    }
+
+    // ── 9. Source import HANDLE/LPVOID remain 64-bit by default ──
+
+    void sourceImportBackwardsCompat() {
+        QString src = R"(
+            struct Test {
+                HANDLE h;      // 0x0
+                LPVOID lv;     // 0x8
+            };
+        )";
+        QString error;
+        NodeTree tree = importFromSource(src, &error);
+        QVERIFY(!tree.nodes.isEmpty());
+
+        // Default (no pointerSize arg) should be 64-bit
+        for (const auto& n : tree.nodes) {
+            if (n.name == "h") QCOMPARE(n.kind, NodeKind::Pointer64);
+            if (n.name == "lv") QCOMPARE(n.kind, NodeKind::Pointer64);
+        }
+    }
+
+    // ── 10. Full round-trip: 32-bit import → generate → verify ──
+
+    void fullRoundTrip32bit() {
+        QString src = R"(
+            struct EPROCESS_32 {
+                PVOID Pcb;         // 0x0
+                HANDLE UniqueProcessId;  // 0x4
+                DWORD ActiveProcessLinks;  // 0x8
+            };
+        )";
+        QString error;
+        NodeTree tree = importFromSource(src, &error, 4);
+        QVERIFY2(!tree.nodes.isEmpty(), qPrintable(error));
+        QCOMPARE(tree.pointerSize, 4);
+
+        // Find the root struct
+        uint64_t rootId = 0;
+        for (const auto& n : tree.nodes) {
+            if (n.parentId == 0 && n.kind == NodeKind::Struct) {
+                rootId = n.id;
+                break;
+            }
+        }
+        QVERIFY(rootId != 0);
+
+        // Generate C++ code
+        QString code = renderCpp(tree, rootId);
+        QVERIFY2(code.contains("void* Pcb;"),
+            qPrintable("PVOID in 32-bit should generate void*:\n" + code));
+        QVERIFY2(code.contains("void* UniqueProcessId;"),
+            qPrintable("HANDLE in 32-bit should generate void*:\n" + code));
+
+        // Verify JSON persistence
+        QJsonObject json = tree.toJson();
+        QCOMPARE(json["pointerSize"].toInt(), 4);
+        NodeTree restored = NodeTree::fromJson(json);
+        QCOMPARE(restored.pointerSize, 4);
+    }
+};
+
+QTEST_MAIN(Test32BitSupport)
+#include "test_32bit_support.moc"

tests/test_addressparser.cpp

@@ -213,6 +213,186 @@ private slots:
         QVERIFY(r.ok);
         QCOMPARE(r.value, 0x600ULL);
     }
+
+    // -- Identifier resolution --
+
+    void identBase() {
+        AddressParserCallbacks cbs;
+        cbs.resolveIdentifier = [](const QString& name, bool* ok) -> uint64_t {
+            *ok = (name == "base");
+            return *ok ? 0x140000000ULL : 0;
+        };
+        auto r = AddressParser::evaluate("base", 8, &cbs);
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x140000000ULL);
+    }
+
+    void identFieldName() {
+        AddressParserCallbacks cbs;
+        cbs.resolveIdentifier = [](const QString& name, bool* ok) -> uint64_t {
+            if (name == "base")     { *ok = true; return 0x140000000ULL; }
+            if (name == "e_lfanew") { *ok = true; return 0xE8ULL; }
+            *ok = false; return 0;
+        };
+        auto r = AddressParser::evaluate("base + e_lfanew", 8, &cbs);
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x1400000E8ULL);
+    }
+
+    void identUnknown() {
+        AddressParserCallbacks cbs;
+        cbs.resolveIdentifier = [](const QString&, bool* ok) -> uint64_t {
+            *ok = false; return 0;
+        };
+        auto r = AddressParser::evaluate("unknown_var", 8, &cbs);
+        QVERIFY(!r.ok);
+        QVERIFY(r.error.contains("unknown identifier"));
+    }
+
+    // -- Hex vs identifier disambiguation --
+
+    void hexDisambigDEAD() {
+        // "DEAD" is all hex digits → should parse as hex number 0xDEAD
+        auto r = AddressParser::evaluate("DEAD");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0xDEADULL);
+    }
+
+    void hexDisambigBase() {
+        // "base" has 's' (non-hex) → identifier
+        AddressParserCallbacks cbs;
+        cbs.resolveIdentifier = [](const QString& name, bool* ok) -> uint64_t {
+            *ok = (name == "base"); return *ok ? 42ULL : 0;
+        };
+        auto r = AddressParser::evaluate("base", 8, &cbs);
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 42ULL);
+    }
+
+    void hexDisambigABCwithUnderscore() {
+        // "ABC_field" has '_' → identifier, not hex
+        AddressParserCallbacks cbs;
+        cbs.resolveIdentifier = [](const QString& name, bool* ok) -> uint64_t {
+            *ok = (name == "ABC_field"); return *ok ? 99ULL : 0;
+        };
+        auto r = AddressParser::evaluate("ABC_field", 8, &cbs);
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 99ULL);
+    }
+
+    // -- Bitwise operators --
+
+    void bitwiseAnd() {
+        auto r = AddressParser::evaluate("0xFF & 0x0F");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x0FULL);
+    }
+
+    void bitwiseOr() {
+        auto r = AddressParser::evaluate("0xA0 | 0x0B");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0xABULL);
+    }
+
+    void bitwiseXor() {
+        auto r = AddressParser::evaluate("0xA ^ 0x5");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0xFULL);
+    }
+
+    void shiftLeft() {
+        auto r = AddressParser::evaluate("1 << 4");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x10ULL);
+    }
+
+    void shiftRight() {
+        auto r = AddressParser::evaluate("0xFF00 >> 8");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0xFFULL);
+    }
+
+    // -- Unary bitwise NOT --
+
+    void unaryNot() {
+        auto r = AddressParser::evaluate("~0");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0xFFFFFFFFFFFFFFFFULL);
+    }
+
+    void unaryNotMask() {
+        // ~0xFFF = 0xFFFFFFFFFFFFF000
+        auto r = AddressParser::evaluate("~0xFFF");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0xFFFFFFFFFFFFF000ULL);
+    }
+
+    // -- Operator precedence --
+
+    void shiftPrecedence() {
+        // C precedence: shift binds looser than addition
+        // 1 + 2 << 3 = (1 + 2) << 3 = 3 << 3 = 24 = 0x18
+        auto r = AddressParser::evaluate("1 + 2 << 3");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x18ULL);
+    }
+
+    void andOrPrecedence() {
+        // & binds tighter than |
+        // 0xFF | 0x100 & 0xF00 = 0xFF | (0x100 & 0xF00) = 0xFF | 0x100 = 0x1FF
+        auto r = AddressParser::evaluate("0xFF | 0x100 & 0xF00");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x1FFULL);
+    }
+
+    void xorPrecedence() {
+        // ^ between & and |: a | b ^ c & d = a | (b ^ (c & d))
+        // 0xF0 | 0x0F ^ 0xFF & 0x0F = 0xF0 | (0x0F ^ (0xFF & 0x0F))
+        //   = 0xF0 | (0x0F ^ 0x0F) = 0xF0 | 0x00 = 0xF0
+        auto r = AddressParser::evaluate("0xF0 | 0x0F ^ 0xFF & 0x0F");
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0xF0ULL);
+    }
+
+    // -- E_lfanew end-to-end --
+
+    void elfanewScenario() {
+        AddressParserCallbacks cbs;
+        cbs.resolveIdentifier = [](const QString& name, bool* ok) -> uint64_t {
+            if (name == "base")     { *ok = true; return 0x140000000ULL; }
+            if (name == "e_lfanew") { *ok = true; return 0xE8ULL; }
+            *ok = false; return 0;
+        };
+        // base + e_lfanew = 0x140000000 + 0xE8 = 0x1400000E8
+        auto r = AddressParser::evaluate("base + e_lfanew", 8, &cbs);
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x1400000E8ULL);
+    }
+
+    void pageAlignedExpr() {
+        AddressParserCallbacks cbs;
+        cbs.resolveIdentifier = [](const QString& name, bool* ok) -> uint64_t {
+            if (name == "base")     { *ok = true; return 0x140000000ULL; }
+            if (name == "e_lfanew") { *ok = true; return 0xE8ULL; }
+            *ok = false; return 0;
+        };
+        // (base + e_lfanew) & ~0xFFF = 0x1400000E8 & ~0xFFF = 0x140000000
+        auto r = AddressParser::evaluate("(base + e_lfanew) & ~0xFFF", 8, &cbs);
+        QVERIFY(r.ok);
+        QCOMPARE(r.value, 0x140000000ULL);
+    }
+
+    // -- Validate with new syntax --
+
+    void validateIdentifier() {
+        QCOMPARE(AddressParser::validate("base + e_lfanew"), QString());
+    }
+
+    void validateBitwiseOps() {
+        QCOMPARE(AddressParser::validate("0xFF & 0x0F"), QString());
+        QCOMPARE(AddressParser::validate("1 << 4"), QString());
+        QCOMPARE(AddressParser::validate("~0xFFF"), QString());
+    }
 };
 
 QTEST_GUILESS_MAIN(TestAddressParser)

tests/test_command_row.cpp

@@ -21,7 +21,7 @@ static QString buildCommandRow(const Provider& prov, uint64_t baseAddress) {
     QString src = buildSourceLabel(prov);
     QString addr = QStringLiteral("0x") +
         QString::number(baseAddress, 16).toUpper();
-    return QStringLiteral("   %1 \u00B7 %2").arg(src, addr);
+    return QStringLiteral("   %1  %2").arg(src, addr);
 }
 
 // -- Replicate commandRowSrcSpan for testing
@@ -32,17 +32,13 @@ struct TestColumnSpan {
 };
 
 static TestColumnSpan commandRowSrcSpan(const QString& lineText) {
-    int idx = lineText.indexOf(QStringLiteral(" \u00B7"));
-    if (idx < 0) return {};
+    int arrow = lineText.indexOf(QChar(0x25BE));
+    if (arrow < 0) return {};
     int start = 0;
-    while (start < idx && !lineText[start].isLetterOrNumber()
+    while (start < arrow && !lineText[start].isLetterOrNumber()
            && lineText[start] != '<' && lineText[start] != '\'') start++;
-    if (start >= idx) return {};
-    // Exclude trailing ▾ from the editable span
-    int end = idx;
-    while (end > start && lineText[end - 1] == QChar(0x25BE)) end--;
-    if (end <= start) return {};
-    return {start, end, true};
+    if (start >= arrow) return {};
+    return {start, arrow, true};
 }
 
 class TestCommandRow : public QObject {
@@ -77,13 +73,13 @@ private slots:
     void row_nullProvider() {
         NullProvider p;
         QString row = buildCommandRow(p, 0);
-        QCOMPARE(row, QStringLiteral("   source\u25BE \u00B7 0x0"));
+        QCOMPARE(row, QStringLiteral("   source\u25BE  0x0"));
     }
 
     void row_fileProvider() {
         BufferProvider p(QByteArray(4, '\0'), "test.bin");
         QString row = buildCommandRow(p, 0x140000000ULL);
-        QCOMPARE(row, QStringLiteral("   'test.bin'\u25BE \u00B7 0x140000000"));
+        QCOMPARE(row, QStringLiteral("   'test.bin'\u25BE  0x140000000"));
     }
 
     // ---------------------------------------------------------------
@@ -110,7 +106,7 @@ private slots:
     void span_processProvider_simulated() {
         // Simulate a process provider without needing Windows APIs
         // by building the string directly
-        QString row = QStringLiteral("   'notepad.exe'\u25BE \u00B7 0x7FF600000000");
+        QString row = QStringLiteral("   'notepad.exe'\u25BE  0x7FF600000000");
         auto span = commandRowSrcSpan(row);
         QVERIFY(span.valid);
         QString extracted = row.mid(span.start, span.end - span.start);

tests/test_compose.cpp

@@ -1,4 +1,6 @@
 #include <QtTest/QTest>
+#include <QJsonDocument>
+#include <QFile>
 #include "core.h"
 
 using namespace rcx;
@@ -232,6 +234,7 @@ private slots:
         child.name = "Child";
         child.parentId = rootId;
         child.offset = 0;
+        child.collapsed = false;
         int ci = tree.addNode(child);
         uint64_t childId = tree.nodes[ci].id;
 
@@ -279,6 +282,7 @@ private slots:
         inner.name = "Inner";
         inner.parentId = rootId;
         inner.offset = 4;
+        inner.collapsed = false;
         int ii = tree.addNode(inner);
         uint64_t innerId = tree.nodes[ii].id;
 
@@ -352,6 +356,7 @@ private slots:
         tmpl.name = "VTable";
         tmpl.parentId = 0;
         tmpl.offset = 200;  // far away so standalone rendering uses offset 200
+        tmpl.collapsed = false;
         int ti = tree.addNode(tmpl);
         uint64_t tmplId = tree.nodes[ti].id;
 
@@ -376,6 +381,7 @@ private slots:
         ptr.parentId = mainId;
         ptr.offset = 4;
         ptr.refId = tmplId;
+        ptr.collapsed = false;
         tree.addNode(ptr);
 
         // Provider: pointer at offset 4 points to address 100
@@ -432,6 +438,7 @@ private slots:
         tmpl.name = "Target";
         tmpl.parentId = 0;
         tmpl.offset = 200;
+        tmpl.collapsed = false;
         int ti = tree.addNode(tmpl);
         uint64_t tmplId = tree.nodes[ti].id;
 
@@ -448,6 +455,7 @@ private slots:
         ptr.parentId = mainId;
         ptr.offset = 0;
         ptr.refId = tmplId;
+        ptr.collapsed = false;
         tree.addNode(ptr);
 
         // All zeros = null pointer
@@ -491,6 +499,7 @@ private slots:
         tmpl.name = "Target";
         tmpl.parentId = 0;
         tmpl.offset = 200;
+        tmpl.collapsed = false;  // standalone rendering shows children
         int ti = tree.addNode(tmpl);
         uint64_t tmplId = tree.nodes[ti].id;
 
@@ -507,7 +516,7 @@ private slots:
         ptr.parentId = mainId;
         ptr.offset = 0;
         ptr.refId = tmplId;
-        ptr.collapsed = true;  // collapsed
+        ptr.collapsed = true;  // collapsed — this is the test condition
         tree.addNode(ptr);
 
         // Non-null pointer
@@ -546,6 +555,7 @@ private slots:
         tmpl.name = "Recursive";
         tmpl.parentId = 0;
         tmpl.offset = 200;
+        tmpl.collapsed = false;
         int ti = tree.addNode(tmpl);
         uint64_t tmplId = tree.nodes[ti].id;
 
@@ -563,6 +573,7 @@ private slots:
         backPtr.parentId = tmplId;
         backPtr.offset = 4;
         backPtr.refId = tmplId;  // points back to same struct
+        backPtr.collapsed = false;
         tree.addNode(backPtr);
 
         // Pointer in Main → Recursive
@@ -572,6 +583,7 @@ private slots:
         ptr.parentId = mainId;
         ptr.offset = 0;
         ptr.refId = tmplId;
+        ptr.collapsed = false;
         tree.addNode(ptr);
 
         // Provider: main ptr at offset 0 points to 100
@@ -694,6 +706,7 @@ private slots:
         arr.offset = 0;
         arr.elementKind = NodeKind::Int32;
         arr.arrayLen = 10;
+        arr.collapsed = false;
         tree.addNode(arr);
 
         NullProvider prov;
@@ -845,6 +858,7 @@ private slots:
         arr.offset = 0;
         arr.elementKind = NodeKind::Int32;
         arr.arrayLen = 2;
+        arr.collapsed = false;
         int ai = tree.addNode(arr);
         uint64_t arrId = tree.nodes[ai].id;
 
@@ -854,6 +868,7 @@ private slots:
         elem0.name = "Item";
         elem0.parentId = arrId;
         elem0.offset = 0;
+        elem0.collapsed = false;
         int e0i = tree.addNode(elem0);
         uint64_t elem0Id = tree.nodes[e0i].id;
 
@@ -869,6 +884,7 @@ private slots:
         elem1.name = "Item";
         elem1.parentId = arrId;
         elem1.offset = 4;
+        elem1.collapsed = false;
         int e1i = tree.addNode(elem1);
         uint64_t elem1Id = tree.nodes[e1i].id;
 
@@ -1033,6 +1049,7 @@ private slots:
         arr.offset = 0;
         arr.elementKind = NodeKind::UInt32;
         arr.arrayLen = 4;
+        arr.collapsed = false;
         tree.addNode(arr);
 
         // Buffer with known values: 0x11, 0x22, 0x33, 0x44
@@ -1138,6 +1155,7 @@ private slots:
         arr.offset = 0;
         arr.elementKind = NodeKind::Struct;
         arr.arrayLen = 1;
+        arr.collapsed = false;
         int ai = tree.addNode(arr);
         uint64_t arrId = tree.nodes[ai].id;
 
@@ -1147,6 +1165,7 @@ private slots:
         elem.name = "Item";
         elem.parentId = arrId;
         elem.offset = 0;
+        elem.collapsed = false;
         int ei = tree.addNode(elem);
         uint64_t elemId = tree.nodes[ei].id;
 
@@ -1479,6 +1498,7 @@ private slots:
         structC.structTypeName = "InnerData";
         structC.parentId = 0;
         structC.offset = 300;
+        structC.collapsed = false;
         int ci = tree.addNode(structC);
         uint64_t structCId = tree.nodes[ci].id;
 
@@ -1496,6 +1516,7 @@ private slots:
         structB.structTypeName = "Wrapper";
         structB.parentId = 0;
         structB.offset = 200;
+        structB.collapsed = false;
         int bi = tree.addNode(structB);
         uint64_t structBId = tree.nodes[bi].id;
 
@@ -1512,6 +1533,7 @@ private slots:
         bptr.parentId = structBId;
         bptr.offset = 4;
         bptr.refId = structCId;  // points to InnerData
+        bptr.collapsed = false;
         tree.addNode(bptr);
 
         // Root's pointer to StructB
@@ -1521,6 +1543,7 @@ private slots:
         rptr.parentId = rootId;
         rptr.offset = 0;
         rptr.refId = structBId;
+        rptr.collapsed = false;
         tree.addNode(rptr);
 
         // Provider: rptr at 0 → addr 100, bptr at 100+4=104 → addr 150
@@ -1589,6 +1612,7 @@ private slots:
         structB.name = "StructB";
         structB.parentId = 0;
         structB.offset = 200;
+        structB.collapsed = false;
         int bi = tree.addNode(structB);
         uint64_t structBId = tree.nodes[bi].id;
 
@@ -1606,6 +1630,7 @@ private slots:
         ptrToB.parentId = mainId;
         ptrToB.offset = 4;
         ptrToB.refId = structBId;
+        ptrToB.collapsed = false;
         tree.addNode(ptrToB);
 
         // StructB → Main pointer (creates cycle!)
@@ -1615,6 +1640,7 @@ private slots:
         ptrToMain.parentId = structBId;
         ptrToMain.offset = 4;
         ptrToMain.refId = mainId;
+        ptrToMain.collapsed = false;
         tree.addNode(ptrToMain);
 
         // Provider: Main.to_b at offset 4 → addr 100
@@ -1922,7 +1948,7 @@ private slots:
 
     void testCommandRowRootNameSpan() {
         // Name span should cover the class name in the merged command row
-        QString text = "source\u25BE \u00B7 0x0 \u00B7 struct MyClass {";
+        QString text = "source\u25BE  0x0  struct MyClass {";
         ColumnSpan nameSpan = commandRowRootNameSpan(text);
         QVERIFY(nameSpan.valid);
 
@@ -1984,6 +2010,766 @@ private slots:
         }
     }
 
+    // ═════════════════════════════════════════════════════════════
+    // Union tests
+    // ═════════════════════════════════════════════════════════════
+
+    void testUnionHeaderShowsKeyword() {
+        // Union (Struct with classKeyword="union") should display "union" in header
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        // Union container
+        Node u;
+        u.kind = NodeKind::Struct;
+        u.classKeyword = "union";
+        u.name = "u1";
+        u.parentId = rootId;
+        u.offset = 0;
+        u.collapsed = false;
+        int ui = tree.addNode(u);
+        uint64_t uId = tree.nodes[ui].id;
+
+        // Two members at offset 0
+        Node m1;
+        m1.kind = NodeKind::UInt32;
+        m1.name = "asInt";
+        m1.parentId = uId;
+        m1.offset = 0;
+        tree.addNode(m1);
+
+        Node m2;
+        m2.kind = NodeKind::Float;
+        m2.name = "asFloat";
+        m2.parentId = uId;
+        m2.offset = 0;
+        tree.addNode(m2);
+
+        NullProvider prov;
+        ComposeResult result = compose(tree, prov);
+        QStringList lines = result.text.split('\n');
+
+        // Find the union header line
+        int headerLine = -1;
+        for (int i = 0; i < result.meta.size(); i++) {
+            if (result.meta[i].lineKind == LineKind::Header &&
+                result.meta[i].nodeKind == NodeKind::Struct &&
+                result.meta[i].depth == 1) {
+                headerLine = i;
+                break;
+            }
+        }
+        QVERIFY(headerLine >= 0);
+        QVERIFY2(lines[headerLine].contains("union"),
+                 qPrintable("Union header should contain 'union': " + lines[headerLine]));
+
+        // Both members should be rendered at depth 2
+        int memberCount = 0;
+        for (int i = 0; i < result.meta.size(); i++) {
+            if (result.meta[i].lineKind == LineKind::Field && result.meta[i].depth == 2)
+                memberCount++;
+        }
+        QCOMPARE(memberCount, 2);
+
+        // Both members share the same offset text (both at 0000)
+        QVector<int> memberLines;
+        for (int i = 0; i < result.meta.size(); i++) {
+            if (result.meta[i].lineKind == LineKind::Field && result.meta[i].depth == 2)
+                memberLines.append(i);
+        }
+        QCOMPARE(memberLines.size(), 2);
+        QCOMPARE(result.meta[memberLines[0]].offsetText,
+                 result.meta[memberLines[1]].offsetText);
+    }
+
+    void testUnionCollapsed() {
+        // Collapsed union should hide children
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node u;
+        u.kind = NodeKind::Struct;
+        u.classKeyword = "union";
+        u.name = "u1";
+        u.parentId = rootId;
+        u.offset = 0;
+        u.collapsed = true;
+        int ui = tree.addNode(u);
+        uint64_t uId = tree.nodes[ui].id;
+
+        Node m;
+        m.kind = NodeKind::UInt64;
+        m.name = "val";
+        m.parentId = uId;
+        m.offset = 0;
+        tree.addNode(m);
+
+        NullProvider prov;
+        ComposeResult result = compose(tree, prov);
+
+        // No field lines at depth 2
+        int deepFields = 0;
+        for (const auto& lm : result.meta) {
+            if (lm.lineKind == LineKind::Field && lm.depth >= 2)
+                deepFields++;
+        }
+        QCOMPARE(deepFields, 0);
+    }
+
+    void testUnionStructSpan() {
+        // structSpan of a union = max(child offset + size), not sum
+        NodeTree tree;
+
+        Node u;
+        u.kind = NodeKind::Struct;
+        u.classKeyword = "union";
+        u.name = "U";
+        u.parentId = 0;
+        u.offset = 0;
+        int ui = tree.addNode(u);
+        uint64_t uId = tree.nodes[ui].id;
+
+        // 2-byte member
+        Node m1;
+        m1.kind = NodeKind::UInt16;
+        m1.name = "small";
+        m1.parentId = uId;
+        m1.offset = 0;
+        tree.addNode(m1);
+
+        // 8-byte member
+        Node m2;
+        m2.kind = NodeKind::UInt64;
+        m2.name = "big";
+        m2.parentId = uId;
+        m2.offset = 0;
+        tree.addNode(m2);
+
+        // structSpan = max(0+2, 0+8) = 8
+        QCOMPARE(tree.structSpan(uId), 8);
+    }
+
+    // ═════════════════════════════════════════════════════════════
+    // Enum compose tests
+    // ═════════════════════════════════════════════════════════════
+
+    void testEnumDisplaysMembers() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node e;
+        e.kind = NodeKind::Struct;
+        e.classKeyword = "enum";
+        e.name = "Color";
+        e.structTypeName = "Color";
+        e.parentId = rootId;
+        e.offset = 0;
+        e.collapsed = false;
+        e.enumMembers = {{"Red", 0}, {"Green", 1}, {"Blue", 2}};
+        tree.addNode(e);
+
+        NullProvider prov;
+        auto result = compose(tree, prov);
+
+        // Should have enum members in the text
+        QVERIFY(result.text.contains("Red"));
+        QVERIFY(result.text.contains("Green"));
+        QVERIFY(result.text.contains("Blue"));
+        QVERIFY(result.text.contains("= 0"));
+        QVERIFY(result.text.contains("= 2"));
+        // Header should contain the type name
+        QVERIFY(result.text.contains("Color"));
+    }
+
+    void testEnumCollapsed() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node e;
+        e.kind = NodeKind::Struct;
+        e.classKeyword = "enum";
+        e.name = "Flags";
+        e.structTypeName = "Flags";
+        e.parentId = rootId;
+        e.offset = 0;
+        e.collapsed = true;
+        e.enumMembers = {{"A", 0}, {"B", 1}};
+        tree.addNode(e);
+
+        NullProvider prov;
+        auto result = compose(tree, prov);
+
+        // Collapsed: members should NOT appear
+        QVERIFY(!result.text.contains("= 0"));
+        QVERIFY(!result.text.contains("= 1"));
+        // But header should still show the type name
+        QVERIFY(result.text.contains("Flags"));
+    }
+
+    // ═════════════════════════════════════════════════════════════
+    // Compact columns: load EPROCESS.rcx and compare output
+    // ═════════════════════════════════════════════════════════════
+
+    void testCompactColumnsEprocess() {
+        // Load the EPROCESS example .rcx
+        // Try multiple paths: build dir examples, or source dir
+        QString rcxPath;
+        QStringList candidates = {
+            QCoreApplication::applicationDirPath() + "/examples/EPROCESS.rcx",
+            QCoreApplication::applicationDirPath() + "/../src/examples/EPROCESS.rcx",
+        };
+        for (const auto& c : candidates) {
+            if (QFile::exists(c)) { rcxPath = c; break; }
+        }
+        if (rcxPath.isEmpty())
+            QSKIP("EPROCESS.rcx not found");
+        QFile file(rcxPath);
+        QVERIFY2(file.open(QIODevice::ReadOnly),
+                 qPrintable("Cannot open " + rcxPath));
+        QJsonDocument jdoc = QJsonDocument::fromJson(file.readAll());
+        NodeTree tree = NodeTree::fromJson(jdoc.object());
+        NullProvider prov;
+
+        // Compose WITHOUT compact (default)
+        ComposeResult normal = compose(tree, prov, 0, false);
+        // Compose WITH compact
+        ComposeResult compact = compose(tree, prov, 0, true);
+
+        // Compact typeW should be capped at kCompactTypeW (22)
+        QVERIFY2(compact.layout.typeW <= kCompactTypeW,
+                 qPrintable(QString("compact typeW=%1, expected <= %2")
+                            .arg(compact.layout.typeW).arg(kCompactTypeW)));
+
+        // Normal typeW should be wider (the _EPROCESS has long type names)
+        QVERIFY2(normal.layout.typeW > compact.layout.typeW,
+                 qPrintable(QString("normal typeW=%1 should exceed compact typeW=%2")
+                            .arg(normal.layout.typeW).arg(compact.layout.typeW)));
+
+        // Print side-by-side sample for visual inspection
+        QStringList normalLines  = normal.text.split('\n');
+        QStringList compactLines = compact.text.split('\n');
+        qDebug() << "\n=== EPROCESS compact columns comparison ===";
+        qDebug() << "Normal typeW:" << normal.layout.typeW
+                 << " Compact typeW:" << compact.layout.typeW;
+        qDebug() << "Normal lines:" << normalLines.size()
+                 << " Compact lines:" << compactLines.size();
+
+        // Dump full output to files for visual diffing
+        {
+            QFile nf(QCoreApplication::applicationDirPath() + "/../eprocess_normal.txt");
+            nf.open(QIODevice::WriteOnly);
+            nf.write(normal.text.toUtf8());
+        }
+        {
+            QFile cf(QCoreApplication::applicationDirPath() + "/../eprocess_compact.txt");
+            cf.open(QIODevice::WriteOnly);
+            cf.write(compact.text.toUtf8());
+        }
+        qDebug() << "Wrote eprocess_normal.txt and eprocess_compact.txt";
+
+        // Show first 50 lines of each for quick inspection
+        qDebug() << "\n--- NORMAL (first 50 lines) ---";
+        for (int i = 0; i < qMin(50, normalLines.size()); ++i)
+            qDebug().noquote() << normalLines[i];
+
+        qDebug() << "\n--- COMPACT (first 50 lines) ---";
+        for (int i = 0; i < qMin(50, compactLines.size()); ++i)
+            qDebug().noquote() << compactLines[i];
+
+        // Overflow types should print in full (no truncation)
+        bool foundFull = false;
+        for (const QString& l : compactLines) {
+            if (l.contains("_PS_DYNAMIC_ENFORCED_ADDRESS_RANGES")) {
+                foundFull = true;
+                break;
+            }
+        }
+        QVERIFY2(foundFull,
+                 "Long type _PS_DYNAMIC_ENFORCED_ADDRESS_RANGES should print in full (no truncation)");
+    }
+
+    void testMmpfnRcxLoadsAndComposes() {
+        // Load the MMPFN.rcx example file and verify it composes without errors
+        // Try several paths to find the .rcx file
+        QString rcxPath;
+        for (const auto& p : {
+                QStringLiteral("../src/examples/MMPFN.rcx"),
+                QStringLiteral("../../src/examples/MMPFN.rcx"),
+                QStringLiteral("src/examples/MMPFN.rcx")}) {
+            if (QFile::exists(p)) { rcxPath = p; break; }
+        }
+        if (rcxPath.isEmpty()) {
+            QSKIP("MMPFN.rcx not found (run from build dir)");
+        }
+        QFile f(rcxPath);
+        QVERIFY2(f.open(QIODevice::ReadOnly), "Cannot open MMPFN.rcx");
+        QJsonDocument jdoc = QJsonDocument::fromJson(f.readAll());
+        QVERIFY(jdoc.isObject());
+        NodeTree tree = NodeTree::fromJson(jdoc.object());
+
+        QVERIFY2(tree.nodes.size() >= 60, "Expected at least 60 nodes");
+
+        // Check key top-level types exist
+        bool hasMmpfn = false, hasListEntry = false, hasMmpte = false;
+        for (const auto& n : tree.nodes) {
+            if (n.parentId == 0 && n.structTypeName == "_MMPFN") hasMmpfn = true;
+            if (n.parentId == 0 && n.structTypeName == "_LIST_ENTRY") hasListEntry = true;
+            if (n.parentId == 0 && n.structTypeName == "_MMPTE") hasMmpte = true;
+        }
+        QVERIFY2(hasMmpfn, "Missing _MMPFN top-level type");
+        QVERIFY2(hasListEntry, "Missing _LIST_ENTRY top-level type");
+        QVERIFY2(hasMmpte, "Missing _MMPTE top-level type");
+
+        // Compose and verify output
+        NullProvider prov;
+        ComposeResult result = compose(tree, prov, 0, false);
+        QStringList lines = result.text.split('\n');
+        QVERIFY2(lines.size() > 10, "Expected non-trivial compose output");
+
+        // Print first 30 lines for manual inspection
+        qDebug() << "=== MMPFN compose output ===";
+        for (int i = 0; i < qMin(30, lines.size()); ++i)
+            qDebug().noquote() << lines[i];
+        qDebug() << "... total lines:" << lines.size();
+
+        // Verify _MMPFN header appears in output
+        bool foundMmpfn = false;
+        for (const auto& l : lines) {
+            if (l.contains("_MMPFN")) { foundMmpfn = true; break; }
+        }
+        QVERIFY2(foundMmpfn, "Compose output should contain _MMPFN");
+
+        // Verify no M_CYCLE markers on any lines (all self-ref pointers are collapsed)
+        for (int i = 0; i < result.meta.size(); i++) {
+            bool hasCycle = (result.meta[i].markerMask & (1u << M_CYCLE)) != 0;
+            QVERIFY2(!hasCycle,
+                     qPrintable(QString("Unexpected cycle marker on line %1").arg(i)));
+        }
+    }
+
+    void testBitfieldMembers() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = QStringLiteral("Test");
+        root.structTypeName = QStringLiteral("Test");
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node bf;
+        bf.kind = NodeKind::Struct;
+        bf.classKeyword = QStringLiteral("bitfield");
+        bf.name = QStringLiteral("flags");
+        bf.elementKind = NodeKind::Hex32;
+        bf.parentId = rootId;
+        bf.offset = 0;
+        bf.collapsed = false;
+        bf.bitfieldMembers = {
+            {QStringLiteral("Valid"), 0, 1},
+            {QStringLiteral("Dirty"), 1, 1},
+            {QStringLiteral("PageNum"), 2, 20}
+        };
+        tree.addNode(bf);
+
+        NullProvider prov;
+        auto result = compose(tree, prov);
+
+        // Should contain bitfield member names
+        QVERIFY(result.text.contains(QStringLiteral("Valid")));
+        QVERIFY(result.text.contains(QStringLiteral("Dirty")));
+        QVERIFY(result.text.contains(QStringLiteral("PageNum")));
+        // Should contain : width = value format
+        QVERIFY(result.text.contains(QStringLiteral(": 1 =")));
+        QVERIFY(result.text.contains(QStringLiteral(": 20 =")));
+        // Member lines should have isMemberLine set
+        bool foundMemberLine = false;
+        for (const auto& lm : result.meta) {
+            if (lm.isMemberLine) {
+                foundMemberLine = true;
+                break;
+            }
+        }
+        QVERIFY(foundMemberLine);
+    }
+
+    void testBitfieldJsonRoundtrip() {
+        Node n;
+        n.id = 42;
+        n.kind = NodeKind::Struct;
+        n.classKeyword = QStringLiteral("bitfield");
+        n.elementKind = NodeKind::Hex64;
+        n.bitfieldMembers = {
+            {QStringLiteral("ExecuteDisable"), 63, 1},
+            {QStringLiteral("PageFrameNumber"), 12, 36}
+        };
+
+        QJsonObject json = n.toJson();
+        Node restored = Node::fromJson(json);
+
+        QCOMPARE(restored.classKeyword, QStringLiteral("bitfield"));
+        QCOMPARE(restored.bitfieldMembers.size(), 2);
+        QCOMPARE(restored.bitfieldMembers[0].name, QStringLiteral("ExecuteDisable"));
+        QCOMPARE(restored.bitfieldMembers[0].bitOffset, (uint8_t)63);
+        QCOMPARE(restored.bitfieldMembers[0].bitWidth, (uint8_t)1);
+        QCOMPARE(restored.bitfieldMembers[1].name, QStringLiteral("PageFrameNumber"));
+        QCOMPARE(restored.bitfieldMembers[1].bitOffset, (uint8_t)12);
+        QCOMPARE(restored.bitfieldMembers[1].bitWidth, (uint8_t)36);
+    }
+
+    void testBitfieldByteSize() {
+        Node n;
+        n.kind = NodeKind::Struct;
+        n.classKeyword = QStringLiteral("bitfield");
+        n.elementKind = NodeKind::Hex8;
+        QCOMPARE(n.byteSize(), 1);
+        n.elementKind = NodeKind::Hex16;
+        QCOMPARE(n.byteSize(), 2);
+        n.elementKind = NodeKind::Hex32;
+        QCOMPARE(n.byteSize(), 4);
+        n.elementKind = NodeKind::Hex64;
+        QCOMPARE(n.byteSize(), 8);
+    }
+
+    // ── Static field node compose tests ──
+
+    void testStaticFieldHeaderLine() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        // Regular field
+        Node f1;
+        f1.kind = NodeKind::UInt32;
+        f1.name = "field_a";
+        f1.parentId = rootId;
+        f1.offset = 0;
+        tree.addNode(f1);
+
+        // Static field node
+        Node sf;
+        sf.kind = NodeKind::Hex64;
+        sf.name = "my_static";
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        tree.addNode(sf);
+
+        NullProvider prov;
+        ComposeResult result = compose(tree, prov);
+
+        // Header with "static" keyword and opening brace should appear
+        QVERIFY2(result.text.contains(QStringLiteral("static "))
+              && result.text.contains(QStringLiteral("my_static"))
+              && result.text.contains(QStringLiteral("{")),
+                 qPrintable("Expected static field header in:\n" + result.text));
+    }
+
+    void testStaticFieldDoesNotAffectStructSize() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node f1;
+        f1.kind = NodeKind::UInt32;
+        f1.name = "a";
+        f1.parentId = rootId;
+        f1.offset = 0;
+        tree.addNode(f1);
+
+        // Struct span without static field
+        int spanBefore = tree.structSpan(rootId);
+
+        // Add static field
+        Node sf;
+        sf.kind = NodeKind::Struct;
+        sf.name = "static_field";
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base + 100");
+        tree.addNode(sf);
+
+        int spanAfter = tree.structSpan(rootId);
+        QCOMPARE(spanAfter, spanBefore);
+    }
+
+    void testStaticFieldIsStaticLineFlag() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node f1;
+        f1.kind = NodeKind::UInt32;
+        f1.name = "field_a";
+        f1.parentId = rootId;
+        f1.offset = 0;
+        tree.addNode(f1);
+
+        Node sf;
+        sf.kind = NodeKind::Hex64;
+        sf.name = "my_static";
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        tree.addNode(sf);
+
+        NullProvider prov;
+        ComposeResult result = compose(tree, prov);
+
+        // At least one line should have isStaticLine set
+        bool foundStaticField = false;
+        for (const auto& lm : result.meta) {
+            if (lm.isStaticLine) {
+                foundStaticField = true;
+                break;
+            }
+        }
+        QVERIFY2(foundStaticField, "Expected at least one LineMeta with isStaticLine=true");
+    }
+
+    void testStaticFieldCollapsed() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        // Static field struct with a child (should still appear collapsed)
+        Node sf;
+        sf.kind = NodeKind::Struct;
+        sf.name = "inner";
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        sf.collapsed = true;
+        int hi = tree.addNode(sf);
+        uint64_t sfId = tree.nodes[hi].id;
+
+        Node sfChild;
+        sfChild.kind = NodeKind::UInt32;
+        sfChild.name = "x";
+        sfChild.parentId = sfId;
+        sfChild.offset = 0;
+        tree.addNode(sfChild);
+
+        NullProvider prov;
+        ComposeResult result = compose(tree, prov);
+
+        // The static field's child should NOT have a visible line (it's collapsed)
+        bool foundChildLine = false;
+        for (const auto& lm : result.meta) {
+            if (lm.nodeIdx >= 0 && lm.nodeIdx < tree.nodes.size()
+                && tree.nodes[lm.nodeIdx].name == QStringLiteral("x")
+                && tree.nodes[lm.nodeIdx].parentId == sfId) {
+                foundChildLine = true;
+            }
+        }
+        QVERIFY2(!foundChildLine,
+                 "Static field's children should not be visible when collapsed");
+    }
+
+    void testStaticFieldExpressionShownInText() {
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        Node sf;
+        sf.kind = NodeKind::Hex64;
+        sf.name = "my_static";
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base + 0x10");
+        tree.addNode(sf);
+
+        NullProvider prov;
+        ComposeResult result = compose(tree, prov);
+
+        // The composed text should contain the expression and arrow
+        QVERIFY2(result.text.contains(QStringLiteral("base + 0x10")),
+                 qPrintable("Expected expression in text:\n" + result.text));
+        QVERIFY2(result.text.contains(QStringLiteral("\u2192")),
+                 qPrintable("Expected arrow (\u2192) in text:\n" + result.text));
+    }
+    void testTreeLinesDepth2() {
+        // Diagnostic test: verify tree chars at depth 2+ with hex64 nodes
+        // (matches user's actual scenario — Hex64 inside pointer expansion)
+        NodeTree tree;
+        tree.baseAddress = 0;
+
+        // Root struct "Unnamed"
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Unnamed";
+        root.parentId = 0;
+        root.offset = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        // First child: hex64 at depth 1
+        Node f1;
+        f1.kind = NodeKind::Hex64;
+        f1.name = "";
+        f1.parentId = rootId;
+        f1.offset = 0;
+        tree.addNode(f1);
+
+        // Ref struct "NewClass" (separate root-level definition)
+        Node inner;
+        inner.kind = NodeKind::Struct;
+        inner.name = "NewClass";
+        inner.parentId = 0;
+        inner.collapsed = false;
+        inner.offset = 200;
+        int ii = tree.addNode(inner);
+        uint64_t innerId = tree.nodes[ii].id;
+
+        // hex64 children of NewClass
+        Node if1;
+        if1.kind = NodeKind::Hex64;
+        if1.name = "";
+        if1.parentId = innerId;
+        if1.offset = 0;
+        tree.addNode(if1);
+
+        Node if2;
+        if2.kind = NodeKind::Hex64;
+        if2.name = "";
+        if2.parentId = innerId;
+        if2.offset = 8;
+        tree.addNode(if2);
+
+        Node if3;
+        if3.kind = NodeKind::Hex64;
+        if3.name = "";
+        if3.parentId = innerId;
+        if3.offset = 16;
+        tree.addNode(if3);
+
+        // Pointer in root referencing NewClass
+        Node ptr;
+        ptr.kind = NodeKind::Pointer64;
+        ptr.name = "field_0008";
+        ptr.parentId = rootId;
+        ptr.offset = 8;
+        ptr.refId = innerId;
+        ptr.collapsed = false;
+        tree.addNode(ptr);
+
+        // Last child: hex64 at depth 1
+        Node f2;
+        f2.kind = NodeKind::Hex64;
+        f2.name = "";
+        f2.parentId = rootId;
+        f2.offset = 16;
+        tree.addNode(f2);
+
+        // Provider with pointer value
+        QByteArray data(256, '\0');
+        uint64_t ptrVal = 100;
+        memcpy(data.data() + 8, &ptrVal, 8);
+        BufferProvider prov(data);
+
+        // Compose WITH tree lines
+        ComposeResult result = compose(tree, prov, 0, false, true);
+
+        QStringList lines = result.text.split('\n');
+
+        // Print output with char codes for debugging
+        qDebug() << "=== Tree lines compose output (hex64 scenario) ===";
+        for (int i = 0; i < lines.size(); i++) {
+            // Also show hex of first 15 chars to see tree chars
+            QString hexChars;
+            for (int c = 0; c < qMin(15, lines[i].size()); c++)
+                hexChars += QString("U+%1 ").arg(static_cast<uint>(lines[i][c].unicode()), 4, 16, QChar('0'));
+            qDebug().noquote() << QString("[%1] d=%2 k=%3: %4")
+                .arg(i, 2).arg(result.meta[i].depth).arg((int)result.meta[i].lineKind).arg(lines[i]);
+            qDebug().noquote() << QString("     hex: %1").arg(hexChars);
+        }
+        qDebug() << "=== end ===";
+
+        // Verify depth-2 lines contain tree chars
+        QChar vertLine(0x2502);  // │
+        QChar tee(0x251C);       // ├
+        QChar corner(0x2514);    // └
+
+        bool foundDepth2TreeChar = false;
+        for (int i = 0; i < result.meta.size(); i++) {
+            if (result.meta[i].depth == 2
+                && result.meta[i].lineKind != LineKind::Footer) {
+                bool has = lines[i].contains(vertLine)
+                        || lines[i].contains(tee)
+                        || lines[i].contains(corner);
+                if (has) foundDepth2TreeChar = true;
+                QVERIFY2(has,
+                    qPrintable(QString("Depth-2 line %1 missing tree chars: %2")
+                        .arg(i).arg(lines[i])));
+            }
+        }
+        QVERIFY2(foundDepth2TreeChar,
+                 qPrintable("No depth-2 lines with tree chars found:\n" + result.text));
+    }
 };
 
 QTEST_MAIN(TestCompose)

tests/test_controller.cpp

@@ -38,6 +38,7 @@ static void buildSmallTree(NodeTree& tree) {
     root.name = "root";
     root.parentId = 0;
     root.offset = 0;
+    root.collapsed = false;
     int ri = tree.addNode(root);
     uint64_t rootId = tree.nodes[ri].id;
 
@@ -668,6 +669,243 @@ private slots:
         QVERIFY(newIdx >= 0);
         QCOMPARE(m_doc->tree.nodes[newIdx].kind, NodeKind::UInt32);
     }
+    // ── Static field node controller tests ──
+
+    void testAddStaticField() {
+        uint64_t rootId = m_doc->tree.nodes[0].id;
+        int origSize = m_doc->tree.nodes.size();
+
+        // Simulate "Add Static Field" — same code as context menu action
+        Node sf;
+        sf.id = m_doc->tree.m_nextId++;
+        sf.kind = NodeKind::Hex64;
+        sf.name = QStringLiteral("static_field");
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        m_doc->undoStack.push(new RcxCommand(m_ctrl, cmd::Insert{sf, {}}));
+        QApplication::processEvents();
+
+        QCOMPARE(m_doc->tree.nodes.size(), origSize + 1);
+        const auto& h = m_doc->tree.nodes.back();
+        QCOMPARE(h.isStatic, true);
+        QCOMPARE(h.offsetExpr, QStringLiteral("base"));
+        QCOMPARE(h.name, QStringLiteral("static_field"));
+        QCOMPARE(h.parentId, rootId);
+    }
+
+    void testAddStaticFieldUndo() {
+        uint64_t rootId = m_doc->tree.nodes[0].id;
+        int origSize = m_doc->tree.nodes.size();
+
+        Node sf;
+        sf.id = m_doc->tree.m_nextId++;
+        sf.kind = NodeKind::Hex64;
+        sf.name = QStringLiteral("static_field");
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        m_doc->undoStack.push(new RcxCommand(m_ctrl, cmd::Insert{sf, {}}));
+        QApplication::processEvents();
+
+        QCOMPARE(m_doc->tree.nodes.size(), origSize + 1);
+
+        // Undo: static field should be gone
+        m_doc->undoStack.undo();
+        QApplication::processEvents();
+        QCOMPARE(m_doc->tree.nodes.size(), origSize);
+
+        // Redo: static field should be back
+        m_doc->undoStack.redo();
+        QApplication::processEvents();
+        QCOMPARE(m_doc->tree.nodes.size(), origSize + 1);
+        QCOMPARE(m_doc->tree.nodes.back().isStatic, true);
+    }
+
+    void testChangeStaticFieldExpression() {
+        uint64_t rootId = m_doc->tree.nodes[0].id;
+
+        // Add a static field
+        Node sf;
+        sf.id = m_doc->tree.m_nextId++;
+        sf.kind = NodeKind::Hex64;
+        sf.name = QStringLiteral("static_field");
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        m_doc->undoStack.push(new RcxCommand(m_ctrl, cmd::Insert{sf, {}}));
+        QApplication::processEvents();
+
+        uint64_t sfId = m_doc->tree.nodes.back().id;
+
+        // Change expression
+        m_doc->undoStack.push(new RcxCommand(m_ctrl,
+            cmd::ChangeOffsetExpr{sfId, QStringLiteral("base"), QStringLiteral("base + 0x10")}));
+        QApplication::processEvents();
+
+        int idx = m_doc->tree.indexOfId(sfId);
+        QVERIFY(idx >= 0);
+        QCOMPARE(m_doc->tree.nodes[idx].offsetExpr, QStringLiteral("base + 0x10"));
+
+        // Undo: old expression restored
+        m_doc->undoStack.undo();
+        QApplication::processEvents();
+        idx = m_doc->tree.indexOfId(sfId);
+        QVERIFY(idx >= 0);
+        QCOMPARE(m_doc->tree.nodes[idx].offsetExpr, QStringLiteral("base"));
+    }
+
+    void testDeleteStaticFieldPreservesStructSize() {
+        uint64_t rootId = m_doc->tree.nodes[0].id;
+        int spanBefore = m_doc->tree.structSpan(rootId);
+
+        // Add a static field
+        Node sf;
+        sf.id = m_doc->tree.m_nextId++;
+        sf.kind = NodeKind::Hex64;
+        sf.name = QStringLiteral("static_field");
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        m_doc->undoStack.push(new RcxCommand(m_ctrl, cmd::Insert{sf, {}}));
+        QApplication::processEvents();
+
+        // Struct size unchanged after adding static field
+        QCOMPARE(m_doc->tree.structSpan(rootId), spanBefore);
+
+        // Remove static field
+        uint64_t sfId = m_doc->tree.nodes.back().id;
+        m_doc->undoStack.push(new RcxCommand(m_ctrl, cmd::Remove{sfId}));
+        QApplication::processEvents();
+
+        // Struct size still unchanged
+        QCOMPARE(m_doc->tree.structSpan(rootId), spanBefore);
+    }
+
+    void testStaticFieldRenamePreservesExpression() {
+        uint64_t rootId = m_doc->tree.nodes[0].id;
+
+        // Add a static field
+        Node sf;
+        sf.id = m_doc->tree.m_nextId++;
+        sf.kind = NodeKind::Hex64;
+        sf.name = QStringLiteral("my_static");
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base + field_u32");
+        m_doc->undoStack.push(new RcxCommand(m_ctrl, cmd::Insert{sf, {}}));
+        QApplication::processEvents();
+
+        uint64_t sfId = m_doc->tree.nodes.back().id;
+
+        // Rename the static field
+        m_doc->undoStack.push(new RcxCommand(m_ctrl,
+            cmd::Rename{sfId, QStringLiteral("my_static"), QStringLiteral("renamed_static")}));
+        QApplication::processEvents();
+
+        int idx = m_doc->tree.indexOfId(sfId);
+        QVERIFY(idx >= 0);
+        QCOMPARE(m_doc->tree.nodes[idx].name, QStringLiteral("renamed_static"));
+        // Expression should be preserved
+        QCOMPARE(m_doc->tree.nodes[idx].offsetExpr, QStringLiteral("base + field_u32"));
+        QCOMPARE(m_doc->tree.nodes[idx].isStatic, true);
+    }
+
+    // ── Test: clearing value history actually resets heat to 0 ──
+    void testClearValueHistoryResetsHeat() {
+        // Use a live provider so value tracking runs during refresh()
+        m_doc->provider = std::make_unique<BaseAwareProvider>(makeSmallBuffer(), 0);
+        m_ctrl->setTrackValues(true);
+
+        // Do initial refresh to populate m_lastResult.meta
+        m_ctrl->refresh();
+        QApplication::processEvents();
+
+        // Find field_u32 nodeId
+        uint64_t targetId = 0;
+        for (const auto& n : m_doc->tree.nodes) {
+            if (n.name == "field_u32") { targetId = n.id; break; }
+        }
+        QVERIFY(targetId != 0);
+
+        // Seed value history with multiple changes to get heat > 0
+        auto& history = const_cast<QHash<uint64_t, ValueHistory>&>(m_ctrl->valueHistory());
+        history[targetId].record("val_1");
+        history[targetId].record("val_2");
+        history[targetId].record("val_3");
+        QVERIFY2(history[targetId].heatLevel() >= 2,
+                 "Pre-clear: should have heat >= 2 (warm)");
+
+        // Refresh so heatLevel propagates to LineMeta
+        m_ctrl->refresh();
+        QApplication::processEvents();
+
+        // Verify heat is visible in meta
+        bool foundHot = false;
+        for (const auto& lm : m_ctrl->lastResult().meta) {
+            if (lm.nodeId == targetId && lm.heatLevel > 0) {
+                foundHot = true;
+                break;
+            }
+        }
+        QVERIFY2(foundHot, "Pre-clear: LineMeta should show heat > 0");
+
+        // Now simulate what the "Clear Value History" context menu does:
+        // remove from history map + clear subtree + refresh
+        history.remove(targetId);
+        for (int ci : m_doc->tree.subtreeIndices(targetId))
+            history.remove(m_doc->tree.nodes[ci].id);
+
+        m_ctrl->refresh();
+        QApplication::processEvents();
+
+        // After clear + refresh, heatLevel must be 0 for this node
+        for (const auto& lm : m_ctrl->lastResult().meta) {
+            if (lm.nodeId == targetId) {
+                QCOMPARE(lm.heatLevel, 0);
+            }
+        }
+
+        // The history entry should exist again (re-recorded by refresh)
+        // but with only 1 unique value → heatLevel 0
+        QVERIFY(history.contains(targetId));
+        QCOMPARE(history[targetId].heatLevel(), 0);
+        QCOMPARE(history[targetId].uniqueCount(), 1);
+    }
+
+    void testStaticFieldTypeChangePreservesFlags() {
+        uint64_t rootId = m_doc->tree.nodes[0].id;
+
+        Node sf;
+        sf.id = m_doc->tree.m_nextId++;
+        sf.kind = NodeKind::Hex64;
+        sf.name = QStringLiteral("static_field");
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        m_doc->undoStack.push(new RcxCommand(m_ctrl, cmd::Insert{sf, {}}));
+        QApplication::processEvents();
+
+        uint64_t sfId = m_doc->tree.nodes.back().id;
+
+        // Change kind to UInt32
+        m_doc->undoStack.push(new RcxCommand(m_ctrl,
+            cmd::ChangeKind{sfId, NodeKind::Hex64, NodeKind::UInt32}));
+        QApplication::processEvents();
+
+        int idx = m_doc->tree.indexOfId(sfId);
+        QVERIFY(idx >= 0);
+        QCOMPARE(m_doc->tree.nodes[idx].kind, NodeKind::UInt32);
+        // Static field flags must survive type change
+        QCOMPARE(m_doc->tree.nodes[idx].isStatic, true);
+        QCOMPARE(m_doc->tree.nodes[idx].offsetExpr, QStringLiteral("base"));
+    }
 };
 
 QTEST_MAIN(TestController)

tests/test_core.cpp

@@ -671,6 +671,114 @@ private slots:
         QCOMPARE(h.count, 4);       // 4 transitions
         QCOMPARE(h.heatLevel(), 2); // warm (count=4 → 3-4 range)
     }
+
+    // ── Static field node serialization ──
+
+    void testStaticFieldJsonRoundTrip() {
+        rcx::NodeTree tree;
+        tree.baseAddress = 0x14000000;
+
+        rcx::Node root;
+        root.kind = rcx::NodeKind::Struct;
+        root.name = "DOS_HEADER";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        rcx::Node field;
+        field.kind = rcx::NodeKind::UInt32;
+        field.name = "e_lfanew";
+        field.parentId = rootId;
+        field.offset = 0x3C;
+        tree.addNode(field);
+
+        rcx::Node sf;
+        sf.kind = rcx::NodeKind::Struct;
+        sf.name = "nt_hdr";
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base + e_lfanew");
+        tree.addNode(sf);
+
+        QJsonObject json = tree.toJson();
+        rcx::NodeTree tree2 = rcx::NodeTree::fromJson(json);
+
+        QCOMPARE(tree2.nodes.size(), 3);
+        const auto& h = tree2.nodes[2];
+        QCOMPARE(h.isStatic, true);
+        QCOMPARE(h.offsetExpr, QStringLiteral("base + e_lfanew"));
+        QCOMPARE(h.name, QStringLiteral("nt_hdr"));
+    }
+
+    void testStaticFieldJsonBackwardCompat() {
+        // Old JSON without isStatic/offsetExpr should load with defaults
+        rcx::NodeTree tree;
+        rcx::Node root;
+        root.kind = rcx::NodeKind::Struct;
+        root.name = "Test";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+
+        QJsonObject json = tree.toJson();
+        rcx::NodeTree tree2 = rcx::NodeTree::fromJson(json);
+
+        QCOMPARE(tree2.nodes[0].isStatic, false);
+        QCOMPARE(tree2.nodes[0].offsetExpr, QString());
+    }
+
+    void testStructSpanExcludesStaticFields() {
+        using namespace rcx;
+        NodeTree tree;
+
+        Node root;
+        root.kind = NodeKind::Struct;
+        root.name = "Root";
+        root.parentId = 0;
+        int ri = tree.addNode(root);
+        uint64_t rootId = tree.nodes[ri].id;
+
+        // Regular field: offset 0, size 4
+        Node f1;
+        f1.kind = NodeKind::UInt32;
+        f1.name = "a";
+        f1.parentId = rootId;
+        f1.offset = 0;
+        tree.addNode(f1);
+
+        // Regular field: offset 4, size 8
+        Node f2;
+        f2.kind = NodeKind::UInt64;
+        f2.name = "b";
+        f2.parentId = rootId;
+        f2.offset = 4;
+        tree.addNode(f2);
+
+        // Static field: should NOT affect span
+        Node sf;
+        sf.kind = NodeKind::Struct;
+        sf.name = "static_field";
+        sf.parentId = rootId;
+        sf.offset = 0;
+        sf.isStatic = true;
+        sf.offsetExpr = QStringLiteral("base");
+        tree.addNode(sf);
+
+        // Span should be max(0+4, 4+8) = 12, same as without static field
+        QCOMPARE(tree.structSpan(rootId), 12);
+    }
+
+    void testStaticExprSpanFor() {
+        using namespace rcx;
+        // Simulate a static field body line: "   return base + e_lfanew  → 0x1400000E8"
+        LineMeta lm;
+        lm.isStaticLine = true;
+        QString lineText = QStringLiteral("   return base + e_lfanew  \u2192 0x1400000E8");
+        ColumnSpan span = staticExprSpanFor(lm, lineText);
+        QVERIFY(span.valid);
+        QString expr = lineText.mid(span.start, span.end - span.start);
+        QCOMPARE(expr.trimmed(), QStringLiteral("base + e_lfanew"));
+    }
 };
 
 QTEST_MAIN(TestCore)

tests/test_dbgconnect.cpp

@@ -4,62 +4,92 @@
 #include <initguid.h>
 #include <dbgeng.h>
 
-int main()
+int main(int argc, char* argv[])
 {
-    const char* connStr = "tcp:Port=5057,Server=localhost";
+    const char* connStr = "tcp:Port=5055,Server=localhost";
+    if (argc > 1) connStr = argv[1];
+
+    // Initialize COM — required for DbgEng remote transport (TCP/named-pipe)
+    HRESULT hrCom = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    printf("CoInitializeEx: 0x%08lX\n", hrCom);
+    fflush(stdout);
+
     printf("Attempting DebugConnect(\"%s\")...\n", connStr);
+    fflush(stdout);
 
     IDebugClient* client = nullptr;
     HRESULT hr = DebugConnect(connStr, IID_IDebugClient, (void**)&client);
     printf("DebugConnect returned: 0x%08lX\n", hr);
+    fflush(stdout);
 
     if (SUCCEEDED(hr) && client) {
-        printf("Connected! Getting IDebugDataSpaces...\n");
+        printf("Connected! Getting interfaces...\n");
+        fflush(stdout);
 
         IDebugDataSpaces* ds = nullptr;
         hr = client->QueryInterface(IID_IDebugDataSpaces, (void**)&ds);
         printf("QueryInterface(IDebugDataSpaces) = 0x%08lX\n", hr);
+        fflush(stdout);
 
-        if (ds) {
-            IDebugControl* ctrl = nullptr;
-            client->QueryInterface(IID_IDebugControl, (void**)&ctrl);
+        IDebugControl* ctrl = nullptr;
+        client->QueryInterface(IID_IDebugControl, (void**)&ctrl);
 
-            if (ctrl) {
-                printf("Waiting for event...\n");
-                hr = ctrl->WaitForEvent(0, 5000);
-                printf("WaitForEvent = 0x%08lX\n", hr);
-                ctrl->Release();
-            }
+        if (ctrl) {
+            printf("Calling WaitForEvent(5000ms)...\n");
+            fflush(stdout);
+            hr = ctrl->WaitForEvent(0, 5000);
+            printf("WaitForEvent = 0x%08lX\n", hr);
+            fflush(stdout);
 
-            // Try to read 2 bytes
-            IDebugSymbols* sym = nullptr;
-            client->QueryInterface(IID_IDebugSymbols, (void**)&sym);
-            if (sym) {
-                ULONG numMods = 0, numUnloaded = 0;
-                hr = sym->GetNumberModules(&numMods, &numUnloaded);
-                printf("GetNumberModules = 0x%08lX, numMods=%lu\n", hr, numMods);
-
-                if (numMods > 0) {
-                    ULONG64 base = 0;
-                    hr = sym->GetModuleByIndex(0, &base);
-                    printf("Module[0] base = 0x%llX (hr=0x%08lX)\n", base, hr);
-
-                    if (SUCCEEDED(hr) && base) {
-                        uint8_t buf[4] = {};
-                        ULONG got = 0;
-                        hr = ds->ReadVirtual(base, buf, 4, &got);
-                        printf("ReadVirtual(%llX, 4) = 0x%08lX, got=%lu, data=[%02X %02X %02X %02X]\n",
-                               base, hr, got, buf[0], buf[1], buf[2], buf[3]);
-                    }
-                }
-                sym->Release();
-            }
-            ds->Release();
+            ULONG debugClass = 0, debugQual = 0;
+            hr = ctrl->GetDebuggeeType(&debugClass, &debugQual);
+            printf("GetDebuggeeType = 0x%08lX, class=%lu, qualifier=%lu\n",
+                   hr, debugClass, debugQual);
+            printf("  -> %s\n", debugQual >= 1024 ? "DUMP" : "LIVE");
+            fflush(stdout);
         }
+
+        IDebugSymbols* sym = nullptr;
+        client->QueryInterface(IID_IDebugSymbols, (void**)&sym);
+
+        if (sym) {
+            ULONG numMods = 0, numUnloaded = 0;
+            hr = sym->GetNumberModules(&numMods, &numUnloaded);
+            printf("GetNumberModules = 0x%08lX, loaded=%lu, unloaded=%lu\n",
+                   hr, numMods, numUnloaded);
+            fflush(stdout);
+
+            if (numMods > 0) {
+                ULONG64 base = 0;
+                hr = sym->GetModuleByIndex(0, &base);
+                printf("Module[0] base = 0x%llX (hr=0x%08lX)\n", base, hr);
+                fflush(stdout);
+
+                if (SUCCEEDED(hr) && base && ds) {
+                    uint8_t buf[4] = {};
+                    ULONG got = 0;
+                    hr = ds->ReadVirtual(base, buf, 4, &got);
+                    printf("ReadVirtual(0x%llX, 4) = 0x%08lX, got=%lu, data=[%02X %02X %02X %02X]\n",
+                           base, hr, got, buf[0], buf[1], buf[2], buf[3]);
+                    fflush(stdout);
+                }
+            }
+            sym->Release();
+        }
+
+        if (ds) ds->Release();
+        if (ctrl) ctrl->Release();
+
+        printf("Disconnecting...\n");
+        fflush(stdout);
+        client->EndSession(DEBUG_END_DISCONNECT);
         client->Release();
+        printf("Done.\n");
     } else {
         printf("DebugConnect FAILED. hr=0x%08lX\n", hr);
     }
+    fflush(stdout);
 
+    if (SUCCEEDED(hrCom)) CoUninitialize();
     return 0;
 }

tests/test_dbgdump.cpp

@@ -0,0 +1,112 @@
+#include <cstdio>
+#include <cstdint>
+#include <windows.h>
+#include <initguid.h>
+#include <dbgeng.h>
+
+int main(int argc, char* argv[])
+{
+    const char* dumpPath = "F:\\MEMORY_EaService2024.DMP";
+    if (argc > 1) dumpPath = argv[1];
+
+    HRESULT hrCom = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    printf("CoInitializeEx: 0x%08lX\n", hrCom);
+    fflush(stdout);
+
+    IDebugClient* client = nullptr;
+    HRESULT hr = DebugCreate(IID_IDebugClient, (void**)&client);
+    printf("DebugCreate: 0x%08lX, client=%p\n", hr, (void*)client);
+    fflush(stdout);
+
+    if (FAILED(hr) || !client) {
+        printf("FAILED to create debug client\n");
+        if (SUCCEEDED(hrCom)) CoUninitialize();
+        return 1;
+    }
+
+    printf("Opening dump: %s\n", dumpPath);
+    fflush(stdout);
+    hr = client->OpenDumpFile(dumpPath);
+    printf("OpenDumpFile: 0x%08lX\n", hr);
+    fflush(stdout);
+
+    if (FAILED(hr)) {
+        printf("FAILED to open dump\n");
+        client->Release();
+        if (SUCCEEDED(hrCom)) CoUninitialize();
+        return 1;
+    }
+
+    IDebugControl* ctrl = nullptr;
+    client->QueryInterface(IID_IDebugControl, (void**)&ctrl);
+
+    if (ctrl) {
+        printf("WaitForEvent(10s)...\n");
+        fflush(stdout);
+        hr = ctrl->WaitForEvent(0, 10000);
+        printf("WaitForEvent: 0x%08lX\n", hr);
+        fflush(stdout);
+
+        ULONG debugClass = 0, debugQual = 0;
+        hr = ctrl->GetDebuggeeType(&debugClass, &debugQual);
+        printf("GetDebuggeeType: 0x%08lX, class=%lu, qualifier=%lu\n",
+               hr, debugClass, debugQual);
+        printf("  -> %s\n", debugQual >= 1024 ? "DUMP" : "LIVE");
+        fflush(stdout);
+    }
+
+    IDebugDataSpaces* ds = nullptr;
+    client->QueryInterface(IID_IDebugDataSpaces, (void**)&ds);
+
+    IDebugSymbols* sym = nullptr;
+    client->QueryInterface(IID_IDebugSymbols, (void**)&sym);
+
+    if (sym) {
+        ULONG numMods = 0, numUnloaded = 0;
+        hr = sym->GetNumberModules(&numMods, &numUnloaded);
+        printf("GetNumberModules: 0x%08lX, loaded=%lu, unloaded=%lu\n",
+               hr, numMods, numUnloaded);
+        fflush(stdout);
+
+        if (numMods > 0) {
+            ULONG64 base = 0;
+            hr = sym->GetModuleByIndex(0, &base);
+            printf("Module[0] base: 0x%llX (hr=0x%08lX)\n", base, hr);
+            fflush(stdout);
+
+            if (SUCCEEDED(hr) && base && ds) {
+                uint8_t buf[16] = {};
+                ULONG got = 0;
+                hr = ds->ReadVirtual(base, buf, 16, &got);
+                printf("ReadVirtual(0x%llX, 16): hr=0x%08lX, got=%lu\n", base, hr, got);
+                printf("  data: ");
+                for (int i = 0; i < 16; i++) printf("%02X ", buf[i]);
+                printf("\n");
+                fflush(stdout);
+            }
+        }
+    }
+
+    // Try reading kernel base directly
+    uint64_t ntBase = 0xfffff80123c00000ULL;
+    if (ds) {
+        uint8_t buf[16] = {};
+        ULONG got = 0;
+        hr = ds->ReadVirtual(ntBase, buf, 16, &got);
+        printf("ReadVirtual(nt base 0x%llX, 16): hr=0x%08lX, got=%lu\n", ntBase, hr, got);
+        printf("  data: ");
+        for (int i = 0; i < 16; i++) printf("%02X ", buf[i]);
+        printf("\n");
+        fflush(stdout);
+    }
+
+    if (sym) sym->Release();
+    if (ds) ds->Release();
+    if (ctrl) ctrl->Release();
+    client->DetachProcesses();
+    client->Release();
+
+    printf("Done.\n");
+    if (SUCCEEDED(hrCom)) CoUninitialize();
+    return 0;
+}