merge: resolve conflicts with main (keep skills config additions)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: OriNachum

src/open_responses_server/common/config.py

@@ -31,7 +31,6 @@
 SKILLS_DIR = os.environ.get("SKILLS_DIR", "")
 SKILLS_EXEC_TIMEOUT = int(os.environ.get("SKILLS_EXEC_TIMEOUT", "30"))
 
-
 # --- Logging Configuration ---
 
 def setup_logging():