chore: update semantic contracts and git merge handling

backend/src/app.py

@@ -3,7 +3,7 @@
 # @SEMANTICS: app, main, entrypoint, fastapi
 # @PURPOSE: The main entry point for the FastAPI application. It initializes the app, configures CORS, sets up dependencies, includes API routers, and defines the WebSocket endpoint for log streaming.
 # @LAYER: UI (API)
-# @RELATION: DEPENDS_ON ->[backend.src.dependencies]
+# @RELATION: DEPENDS_ON ->[AppDependencies]
 # @RELATION: DEPENDS_ON ->[backend.src.api.routes]
 # @INVARIANT: Only one FastAPI app instance exists per process.
 # @INVARIANT: All WebSocket connections must be properly cleaned up on disconnect.
@@ -69,6 +69,8 @@ async def shutdown_event():
         scheduler.stop()
 # [/DEF:shutdown_event:Function]
 
+# [DEF:app_middleware:Block]
+# @PURPOSE: Configure application-wide middleware (Session, CORS).
 # Configure Session Middleware (required by Authlib for OAuth2 flow)
 from .core.auth.config import auth_config
 app.add_middleware(SessionMiddleware, secret_key=auth_config.SECRET_KEY)
@@ -81,6 +83,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
+# [/DEF:app_middleware:Block]
 
 
 # [DEF:network_error_handler:Function]
@@ -129,6 +132,8 @@ async def log_requests(request: Request, call_next):
             )
 # [/DEF:log_requests:Function]
 
+# [DEF:api_routes:Block]
+# @PURPOSE: Register all application API routers.
 # Include API routes
 app.include_router(auth.router)
 app.include_router(admin.router)
@@ -150,6 +155,7 @@ app.include_router(clean_release.router)
 app.include_router(clean_release_v2.router)
 app.include_router(profile.router)
 app.include_router(health.router)
+# [/DEF:api_routes:Block]
 
 
 # [DEF:api.include_routers:Action]