reorganization done

.gitignore

@@ -9,4 +9,7 @@ node_modules/
 package.json
 package-lock.json
 .github/
-.agent/
+.agent/
+**/__pycache__/
+**/.venv/
+**/node_modules/

Dockerfile

@@ -48,6 +48,8 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
 
 EXPOSE 7860
 
+WORKDIR /app/env
+
 USER appuser
 
-CMD ["sh", "-c", "cd /app/env && python app.py"]
+CMD ["python", "vision_ui.py"]

README.md

@@ -5,6 +5,7 @@ colorFrom: blue
 sdk: docker
 pinned: false
 app_port: 7860
+app_file: vision_ui.py
 base_path: /web
 tags:
   - openenv
@@ -54,7 +55,7 @@ Every task contains: `name`, `description`, `difficulty`, `bug_type`, `code` (bu
 
 This environment enforces strict typing and uses standard modern tooling:
 - **`uv`:** Handles dependency management (see `pyproject.toml`).
-- **FastAPI:** Provides the `server.app` integration layer for OpenEnv compliance.
+- **FastAPI:** Provides the `backend.app` integration layer for OpenEnv compliance.
 - **Pydantic (v2):** Provides strong validation layers for `models.py` (e.g., `CodeAction`, `CodeObservation`).
 - **OpenEnv Config:** See `openenv.yaml` which specifies `tracefix_rl` to run the FastAPI app on port `7860`.
 
@@ -63,7 +64,7 @@ This environment enforces strict typing and uses standard modern tooling:
 - `tasks.py`: Task metadata definitions.
 - `sandbox.py`: Subprocess runtime and output tracking.
 - `environment.py`: Reset/step/reward core RL loop logic (`TraceFixRLGym`).
-- `server/tracefix_rl_environment.py` / `server/app.py`: Maps the OpenAI/OpenEnv network interface to the core environment.
+- `backend/tracefix_rl_environment.py` / `backend/app.py`: Maps the OpenAI/OpenEnv network interface to the core environment.
 - `inference.py`: Baseline OpenAI-client inference script to evaluate agents.
 
 ## Local Development

__init__.py

@@ -1,7 +1,7 @@
 """TraceFix-RL OpenEnv package."""
 
-from .client import MyEnv, TraceFixRLEnv
-from .models import CodeAction, CodeObservation, TestResult
+from .core.client import MyEnv, TraceFixRLEnv
+from .core.models import CodeAction, CodeObservation, TestResult
 
 __all__ = [
     "CodeAction",

{server → backend}/__init__.py

@@ -1,4 +1,4 @@
-"""TraceFix-RL server components."""
+"""TraceFix-RL backend components."""
 
 from .tracefix_rl_environment import TraceFixRLEnvironment
 

{server → backend}/app.py

@@ -8,15 +8,15 @@ except Exception as e:  # pragma: no cover
     ) from e
 
 try:
-    from ..models import CodeAction, CodeObservation
-    from .tracefix_rl_environment import TraceFixRLEnvironment
+    from core.models import CodeAction, CodeObservation
+    from backend.tracefix_rl_environment import TraceFixRLEnvironment
 except ImportError:
     import sys
     from pathlib import Path
 
     sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
-    from models import CodeAction, CodeObservation
-    from server.tracefix_rl_environment import TraceFixRLEnvironment
+    from core.models import CodeAction, CodeObservation
+    from backend.tracefix_rl_environment import TraceFixRLEnvironment
 
 
 app = create_app(

{server → backend}/tracefix_rl_environment.py

@@ -4,11 +4,11 @@ from openenv.core.env_server.interfaces import Environment
 from openenv.core.env_server.types import State
 
 try:
-    from ..environment import TraceFixRLGym
-    from ..models import CodeAction, CodeObservation
+    from core.environment import TraceFixRLGym
+    from core.models import CodeAction, CodeObservation
 except ImportError:
-    from environment import TraceFixRLGym
-    from models import CodeAction, CodeObservation
+    from core.environment import TraceFixRLGym
+    from core.models import CodeAction, CodeObservation
 
 
 class TraceFixRLEnvironment(Environment):

core/__init__.py

@@ -0,0 +1,14 @@
+"""Core domain package for TraceFix-RL."""
+
+from .client import MyEnv, TraceFixRLEnv
+from .environment import TraceFixRLGym
+from .models import CodeAction, CodeObservation, TestResult
+
+__all__ = [
+	"CodeAction",
+	"CodeObservation",
+	"TestResult",
+	"TraceFixRLEnv",
+	"MyEnv",
+	"TraceFixRLGym",
+]

client.py → core/client.py

@@ -9,7 +9,7 @@ from openenv.core.env_server.types import State
 try:
     from .models import CodeAction, CodeObservation, TestResult
 except ImportError:
-    from models import CodeAction, CodeObservation, TestResult
+    from core.models import CodeAction, CodeObservation, TestResult
 
 
 class TraceFixRLEnv(

environment.py → core/environment.py

@@ -11,12 +11,12 @@ try:
     from .context import extract_error_line, get_localized_context
     from .models import CodeAction, CodeObservation, TestResult
     from .sandbox import check_syntax, run_code_with_tests
-    from .tasks import ALL_TASKS, TASKS_BY_DIFFICULTY
+    from tasks.tasks import ALL_TASKS, TASKS_BY_DIFFICULTY
 except ImportError:
-    from context import extract_error_line, get_localized_context
-    from models import CodeAction, CodeObservation, TestResult
-    from sandbox import check_syntax, run_code_with_tests
-    from tasks import ALL_TASKS, TASKS_BY_DIFFICULTY
+    from core.context import extract_error_line, get_localized_context
+    from core.models import CodeAction, CodeObservation, TestResult
+    from core.sandbox import check_syntax, run_code_with_tests
+    from tasks.tasks import ALL_TASKS, TASKS_BY_DIFFICULTY
 
 
 R_SUBMIT_ALL_PASS = +1.00

sandbox.py → core/sandbox.py

@@ -42,7 +42,7 @@ from typing import Any, Callable, Dict, List, Set, Tuple
 try:
     from .models import TestResult
 except ImportError:
-    from models import TestResult
+    from core.models import TestResult
 
 
 

inference.py

@@ -33,8 +33,8 @@ except Exception:
     ROOT_DIR = Path(__file__).resolve().parent
     if str(ROOT_DIR) not in sys.path:
         sys.path.insert(0, str(ROOT_DIR))
-    from client import TraceFixRLEnv
-    from models import CodeAction
+    from core.client import TraceFixRLEnv
+    from core.models import CodeAction
 
 
 API_BASE_URL = os.getenv("API_BASE_URL", "https://router.huggingface.co/v1")

openenv.yaml

@@ -2,5 +2,5 @@ spec_version: 1
 name: tracefix_rl
 type: space
 runtime: fastapi
-app: server.app:app
+app: backend.app:app
 port: 7860

pyproject.toml

@@ -38,10 +38,10 @@ dev = [
 
 [project.scripts]
 # Server entry point - enables running via: uv run --project . server
-# or: python -m tracefix_rl.server.app
-server = "tracefix_rl.server.app:main"
+# or: python -m tracefix_rl.backend.app
+server = "tracefix_rl.backend.app:main"
 
 [tool.setuptools]
 include-package-data = true
-packages = ["tracefix_rl", "tracefix_rl.server"]
-package-dir = { "tracefix_rl" = ".", "tracefix_rl.server" = "server" }
+packages = ["tracefix_rl", "tracefix_rl.backend", "tracefix_rl.core", "tracefix_rl.tasks"]
+package-dir = { "tracefix_rl" = ".", "tracefix_rl.backend" = "backend", "tracefix_rl.core" = "core", "tracefix_rl.tasks" = "tasks" }

tasks/__init__.py

@@ -0,0 +1,5 @@
+"""Task registry package for TraceFix-RL."""
+
+from .tasks import ALL_TASKS, TASKS_BY_DIFFICULTY
+
+__all__ = ["ALL_TASKS", "TASKS_BY_DIFFICULTY"]

app.py → vision_ui.py

@@ -19,8 +19,10 @@ from typing import Any, Generator
 import gradio as gr
 
 try:
-    from tasks import ALL_TASKS
+    from tasks import tasks
+    ALL_TASKS = tasks.ALL_TASKS
 except Exception:
+    tasks = None
     ALL_TASKS = []
 
 
@@ -308,7 +310,7 @@ def _start_backend_server() -> None:
     backend_env["PORT"] = str(BACKEND_PORT)
 
     subprocess.Popen(
-        [sys.executable, "-m", "server.app"],
+        ["python", "-m", "backend.app"],
         cwd=str(ROOT_DIR),
         env=backend_env,
         stdout=subprocess.DEVNULL,