diff --git a/src/app/app.cmake b/src/app/app.cmake
index 671bfdf1..114e0571 100644
--- a/src/app/app.cmake
+++ b/src/app/app.cmake
@@ -239,6 +239,16 @@ if(NOT APPLE)
   endif()
 endif()
 
+# ============================================================================
+# Test harness utilities shared across builds (IT-08 widget state capture)
+# ============================================================================
+target_sources(yaze PRIVATE
+  ${CMAKE_SOURCE_DIR}/src/app/core/widget_state_capture.cc
+  ${CMAKE_SOURCE_DIR}/src/app/core/widget_state_capture.h)
+
+target_include_directories(yaze PRIVATE
+  ${CMAKE_SOURCE_DIR}/third_party/json/include)
+
 # ============================================================================
 # Optional gRPC Support for ImGuiTestHarness
 # ============================================================================
@@ -258,12 +268,7 @@ if(YAZE_WITH_GRPC)
     ${CMAKE_SOURCE_DIR}/src/app/core/testing/test_recorder.cc
     ${CMAKE_SOURCE_DIR}/src/app/core/testing/test_recorder.h
     ${CMAKE_SOURCE_DIR}/src/app/core/testing/test_script_parser.cc
-    ${CMAKE_SOURCE_DIR}/src/app/core/testing/test_script_parser.h
-    ${CMAKE_SOURCE_DIR}/src/app/core/widget_state_capture.cc
-    ${CMAKE_SOURCE_DIR}/src/app/core/widget_state_capture.h)
-
-  target_include_directories(yaze PRIVATE
-    ${CMAKE_SOURCE_DIR}/third_party/json/include)
+    ${CMAKE_SOURCE_DIR}/src/app/core/testing/test_script_parser.h)
   
   # Link gRPC libraries
   target_link_libraries(yaze PRIVATE