Merge branch 'main' into improve-debugging-exp

KRRT7 · web-flow · commit 9311399c3348 · 2025-06-27T19:05:05.000Z
diff --git a/.github/workflows/e2e-bubblesort-benchmark.yaml b/.github/workflows/e2e-bubblesort-benchmark.yaml
@@ -1,4 +1,4 @@
-name: end-to-end-test
+name: E2E - Bubble Sort Benchmark
 
 on:
   pull_request:
diff --git a/.github/workflows/e2e-bubblesort-pytest-nogit.yaml b/.github/workflows/e2e-bubblesort-pytest-nogit.yaml
@@ -1,4 +1,4 @@
-name: end-to-end-test
+name: E2E - Bubble Sort Pytest (No Git)
 
 on:
   pull_request:
diff --git a/.github/workflows/e2e-bubblesort-unittest.yaml b/.github/workflows/e2e-bubblesort-unittest.yaml
@@ -1,4 +1,4 @@
-name: end-to-end-test
+name: E2E - Bubble Sort Unittest
 
 on:
   pull_request:
diff --git a/.github/workflows/e2e-coverage-optimization.yaml b/.github/workflows/e2e-coverage-optimization.yaml
diff --git a/.github/workflows/e2e-futurehouse-structure.yaml b/.github/workflows/e2e-futurehouse-structure.yaml
@@ -1,4 +1,4 @@
-name: end-to-end-test
+name: E2E - Futurehouse Structure
 
 on:
   pull_request:
diff --git a/.github/workflows/e2e-init-optimization.yaml b/.github/workflows/e2e-init-optimization.yaml
@@ -1,4 +1,4 @@
-name: end-to-end-test
+name: E2E - Init Optimization
 
 on:
   pull_request:
diff --git a/.github/workflows/e2e-topological-sort.yaml b/.github/workflows/e2e-topological-sort.yaml
@@ -1,4 +1,4 @@
-name: end-to-end-test
+name: E2E - Topological Sort
 
 on:
   pull_request:
diff --git a/.github/workflows/e2e-tracer-replay.yaml b/.github/workflows/e2e-tracer-replay.yaml
@@ -1,4 +1,4 @@
-name: end-to-end-test
+name: E2E - Tracer Replay
 
 on:
   pull_request:
diff --git a/codeflash/lsp/beta.py b/codeflash/lsp/beta.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import contextlib
-import json
 import os
 from dataclasses import dataclass
 from pathlib import Path
@@ -228,7 +227,7 @@ def perform_function_optimization(
         "status": "success",
         "message": "Optimization completed successfully",
         "extra": f"Speedup: {original_code_baseline.runtime / best_optimization.runtime:.2f}x faster",
-        "optimization": json.dumps(optimized_source, indent=None),
+        "optimization": optimized_source,
     }
 
 
diff --git a/codeflash/lsp/server.py b/codeflash/lsp/server.py
@@ -52,5 +52,6 @@ def initialize_optimizer(self, config_file: Path) -> None:
 
         args = parse_args()
         args.config_file = config_file
+        args.no_pr = True  # LSP server should not create PRs
         args = process_pyproject_config(args)
         self.optimizer = Optimizer(args)
diff --git a/codeflash/verification/concolic_testing.py b/codeflash/verification/concolic_testing.py
@@ -43,7 +43,7 @@ def generate_concolic_tests(
                     "crosshair",
                     "cover",
                     "--example_output_format=pytest",
-                    "--per_condition_timeout=64",
+                    "--per_condition_timeout=20",
                     ".".join(
                         [
                             function_to_optimize.file_path.relative_to(args.project_root)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: end-to-end-test`
	`1`	`+name: E2E - Bubble Sort Benchmark`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: end-to-end-test`
	`1`	`+name: E2E - Bubble Sort Pytest (No Git)`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: end-to-end-test`
	`1`	`+name: E2E - Bubble Sort Unittest`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: end-to-end-test`
	`1`	`+name: E2E - Futurehouse Structure`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: end-to-end-test`
	`1`	`+name: E2E - Init Optimization`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: end-to-end-test`
	`1`	`+name: E2E - Topological Sort`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: end-to-end-test`
	`1`	`+name: E2E - Tracer Replay`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`