Remove instrumentation of js tests from aiservice and into client

Author: misrasaurabh1

codeflash/languages/javascript/instrument.py

@@ -408,3 +408,40 @@ def get_instrumented_test_path(original_path: Path, mode: str) -> Path:
         new_stem = f"{stem}{suffix}"
 
     return original_path.parent / f"{new_stem}{original_path.suffix}"
+
+
+def instrument_generated_js_test(
+    test_code: str,
+    function_name: str,
+    qualified_name: str,
+    mode: str = TestingMode.BEHAVIOR,
+) -> str:
+    """Instrument generated JavaScript/TypeScript test code.
+
+    This function is used to instrument tests generated by the aiservice.
+    Unlike inject_profiling_into_existing_js_test, this takes the test code
+    as a string rather than reading from a file.
+
+    Args:
+        test_code: The generated test code to instrument.
+        function_name: Name of the function being tested.
+        qualified_name: Fully qualified function name (e.g., 'module.funcName').
+        mode: Testing mode - "behavior" or "performance".
+
+    Returns:
+        Instrumented test code.
+
+    """
+    if not test_code or not test_code.strip():
+        return test_code
+
+    # Use the internal instrumentation function
+    instrumented_code = _instrument_js_test_code(
+        code=test_code,
+        func_name=function_name,
+        test_file_path="generated_test",
+        mode=mode,
+        qualified_name=qualified_name,
+    )
+
+    return instrumented_code

codeflash/verification/verifier.py

@@ -62,36 +62,49 @@ def generate_tests(
         generated_test_source, instrumented_behavior_test_source, instrumented_perf_test_source = response
         temp_run_dir = get_run_tmp_file(Path()).as_posix()
 
-        instrumented_behavior_test_source = instrumented_behavior_test_source.replace(
-            "{codeflash_run_tmp_dir_client_side}", temp_run_dir
-        )
-        instrumented_perf_test_source = instrumented_perf_test_source.replace(
-            "{codeflash_run_tmp_dir_client_side}", temp_run_dir
-        )
-
-        # For JavaScript/TypeScript, validate and fix import styles to match source exports
+        # For JavaScript/TypeScript, instrumentation is done locally (aiservice returns uninstrumented code)
         if is_javascript():
-            from codeflash.languages.javascript.instrument import validate_and_fix_import_style
+            from codeflash.languages.javascript.instrument import (
+                TestingMode,
+                instrument_generated_js_test,
+                validate_and_fix_import_style,
+            )
             from codeflash.languages.javascript.module_system import ensure_module_system_compatibility
 
             source_file = Path(function_to_optimize.file_path)
             func_name = function_to_optimize.function_name
+            qualified_name = function_to_optimize.qualified_name
 
+            # First validate and fix import styles
             generated_test_source = validate_and_fix_import_style(generated_test_source, source_file, func_name)
-            instrumented_behavior_test_source = validate_and_fix_import_style(
-                instrumented_behavior_test_source, source_file, func_name
-            )
-            instrumented_perf_test_source = validate_and_fix_import_style(
-                instrumented_perf_test_source, source_file, func_name
-            )
 
             # Convert module system if needed (e.g., CommonJS -> ESM for ESM projects)
             generated_test_source = ensure_module_system_compatibility(generated_test_source, project_module_system)
-            instrumented_behavior_test_source = ensure_module_system_compatibility(
-                instrumented_behavior_test_source, project_module_system
+
+            # Instrument for behavior verification (writes to SQLite)
+            instrumented_behavior_test_source = instrument_generated_js_test(
+                test_code=generated_test_source,
+                function_name=func_name,
+                qualified_name=qualified_name,
+                mode=TestingMode.BEHAVIOR,
+            )
+
+            # Instrument for performance measurement (prints to stdout)
+            instrumented_perf_test_source = instrument_generated_js_test(
+                test_code=generated_test_source,
+                function_name=func_name,
+                qualified_name=qualified_name,
+                mode=TestingMode.PERFORMANCE,
+            )
+
+            logger.debug(f"Instrumented JS/TS tests locally for {func_name}")
+        else:
+            # Python: instrumentation is done by aiservice, just replace temp dir placeholders
+            instrumented_behavior_test_source = instrumented_behavior_test_source.replace(
+                "{codeflash_run_tmp_dir_client_side}", temp_run_dir
             )
-            instrumented_perf_test_source = ensure_module_system_compatibility(
-                instrumented_perf_test_source, project_module_system
+            instrumented_perf_test_source = instrumented_perf_test_source.replace(
+                "{codeflash_run_tmp_dir_client_side}", temp_run_dir
             )
     else:
         logger.warning(f"Failed to generate and instrument tests for {function_to_optimize.function_name}")