Merge branch 'main' into kevin

Author: SmartManoj

.openhands/microagents/repo.md

@@ -14,7 +14,7 @@ IMPORTANT: Before making any changes to the codebase, ALWAYS run `make install-p
 
 Before pushing any changes, you MUST ensure that any lint errors or simple test errors have been fixed.
 
-* If you've made changes to the backend, you should run `pre-commit run --all-files --config ./dev_config/python/.pre-commit-config.yaml`
+* If you've made changes to the backend, you should run `pre-commit run --config ./dev_config/python/.pre-commit-config.yaml` (this will run on staged files).
 * If you've made changes to the frontend, you should run `cd frontend && npm run lint:fix && npm run build ; cd ..`
 
 The pre-commit hooks MUST pass successfully before pushing any changes to the repository. This is a mandatory requirement to maintain code quality and consistency.

openhands/controller/agent_controller.py

@@ -793,7 +793,7 @@ async def _step(self) -> None:
         """Executes a single step of the parent or delegate agent. Detects stuck agents and limits on the number of iterations and the task budget."""
         if self.get_agent_state() != AgentState.RUNNING:
             self.log(
-                'info',
+                'debug',
                 f'Agent not stepping because state is {self.get_agent_state()} (not RUNNING)',
                 extra={'msg_type': 'STEP_BLOCKED_STATE'},
             )
@@ -803,7 +803,7 @@ async def _step(self) -> None:
             action_id = getattr(self._pending_action, 'id', 'unknown')
             action_type = type(self._pending_action).__name__
             self.log(
-                'info',
+                'debug',
                 f'Agent not stepping because of pending action: {action_type} (id={action_id})',
                 extra={'msg_type': 'STEP_BLOCKED_PENDING_ACTION'},
             )

openhands/server/listen_socket.py

@@ -75,9 +75,12 @@ async def connect(connection_id: str, environ):
             raise ConnectionRefusedError('No conversation_id in query params')
 
         cookies_str = environ.get('HTTP_COOKIE', '')
+        # Get Authorization header from the environment
+        # Headers in WSGI/ASGI are prefixed with 'HTTP_' and have dashes replaced with underscores
+        authorization_header = environ.get('HTTP_AUTHORIZATION', None)
         conversation_validator = create_conversation_validator()
         user_id, github_user_id = await conversation_validator.validate(
-            conversation_id, cookies_str
+            conversation_id, cookies_str, authorization_header
         )
         if server_config.app_mode == AppMode.SAAS:
             if get_credits(user_id) < 1:

openhands/server/routes/manage_conversations.py

@@ -101,7 +101,7 @@ async def _create_new_conversation(
             )
 
     else:
-        logger.warn('Settings not present, not starting conversation')
+        logger.warning('Settings not present, not starting conversation')
         raise MissingSettingsError('Settings not found')
 
     session_init_args['git_provider_tokens'] = git_provider_tokens

openhands/storage/conversation/conversation_validator.py

@@ -7,7 +7,10 @@ class ConversationValidator:
     """Storage for conversation metadata. May or may not support multiple users depending on the environment."""
 
     async def validate(
-        self, conversation_id: str, cookies_str: str
+        self,
+        conversation_id: str,
+        cookies_str: str,
+        authorization_header: str | None = None,
     ) -> tuple[None, None]:
         return None, None