workspace-mcp 1.1.12__py3-none-any.whl → 1.1.13__py3-none-any.whl

auth/google_auth.py

@@ -379,6 +379,16 @@ async def start_auth_flow(
         f"[start_auth_flow] Initiating auth for {user_display_name} with global SCOPES."
     )
 
+    # Import here to avoid circular imports
+    from auth.oauth_callback_server import ensure_oauth_callback_available
+    from core.server import _current_transport_mode, WORKSPACE_MCP_PORT, WORKSPACE_MCP_BASE_URI
+
+    # Ensure OAuth callback server is available before generating URLs
+    success, error_msg = ensure_oauth_callback_available(_current_transport_mode, WORKSPACE_MCP_PORT, WORKSPACE_MCP_BASE_URI)
+    if not success:
+        error_detail = f" ({error_msg})" if error_msg else ""
+        raise Exception(f"Cannot initiate OAuth flow - callback server unavailable{error_detail}. Please ensure the OAuth callback server can start before attempting authentication.")
+
     try:
         if "OAUTHLIB_INSECURE_TRANSPORT" not in os.environ and (
             "localhost" in redirect_uri or "127.0.0.1" in redirect_uri

auth/oauth_callback_server.py

@@ -89,16 +89,16 @@ class MinimalOAuthServer:
                 logger.error(error_message_detail, exc_info=True)
                 return create_server_error_response(str(e))
 
-    def start(self) -> bool:
+    def start(self) -> tuple[bool, str]:
         """
         Start the minimal OAuth server.
 
         Returns:
-            True if started successfully, False otherwise
+            Tuple of (success: bool, error_message: str)
         """
         if self.is_running:
             logger.info("Minimal OAuth server is already running")
-            return True
+            return True, ""
 
         # Check if port is available
         # Extract hostname from base_uri (e.g., "http://localhost" -> "localhost")
@@ -112,8 +112,9 @@ class MinimalOAuthServer:
             with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
                 s.bind((hostname, self.port))
         except OSError:
-            logger.error(f"Port {self.port} is already in use on {hostname}. Cannot start minimal OAuth server.")
-            return False
+            error_msg = f"Port {self.port} is already in use on {hostname}. Cannot start minimal OAuth server."
+            logger.error(error_msg)
+            return False, error_msg
 
         def run_server():
             """Run the server in a separate thread."""
@@ -130,6 +131,7 @@ class MinimalOAuthServer:
 
             except Exception as e:
                 logger.error(f"Minimal OAuth server error: {e}", exc_info=True)
+                self.is_running = False
 
         # Start server in background thread
         self.server_thread = threading.Thread(target=run_server, daemon=True)
@@ -145,13 +147,14 @@ class MinimalOAuthServer:
                     if result == 0:
                         self.is_running = True
                         logger.info(f"Minimal OAuth server started on {hostname}:{self.port}")
-                        return True
+                        return True, ""
             except Exception:
                 pass
             time.sleep(0.1)
 
-        logger.error(f"Failed to start minimal OAuth server on {hostname}:{self.port}")
-        return False
+        error_msg = f"Failed to start minimal OAuth server on {hostname}:{self.port} - server did not respond within {max_wait}s"
+        logger.error(error_msg)
+        return False, error_msg
 
     def stop(self):
         """Stop the minimal OAuth server."""
@@ -202,7 +205,7 @@ def get_oauth_redirect_uri(port: int = 8000, base_uri: str = "http://localhost")
     logger.info(f"Constructed redirect URI: {constructed_uri}")
     return constructed_uri
 
-def ensure_oauth_callback_available(transport_mode: str = "stdio", port: int = 8000, base_uri: str = "http://localhost") -> bool:
+def ensure_oauth_callback_available(transport_mode: str = "stdio", port: int = 8000, base_uri: str = "http://localhost") -> tuple[bool, str]:
     """
     Ensure OAuth callback endpoint is available for the given transport mode.
 
@@ -215,14 +218,14 @@ def ensure_oauth_callback_available(transport_mode: str = "stdio", port: int = 8
         base_uri: Base URI (default "http://localhost")
 
     Returns:
-        True if callback endpoint is available, False otherwise
+        Tuple of (success: bool, error_message: str)
     """
     global _minimal_oauth_server
 
     if transport_mode == "streamable-http":
         # In streamable-http mode, the main FastAPI server should handle callbacks
         logger.debug("Using existing FastAPI server for OAuth callbacks (streamable-http mode)")
-        return True
+        return True, ""
 
     elif transport_mode == "stdio":
         # In stdio mode, start minimal server if not already running
@@ -232,19 +235,21 @@ def ensure_oauth_callback_available(transport_mode: str = "stdio", port: int = 8
 
         if not _minimal_oauth_server.is_running:
             logger.info("Starting minimal OAuth server for stdio mode")
-            result = _minimal_oauth_server.start()
-            if result:
+            success, error_msg = _minimal_oauth_server.start()
+            if success:
                 logger.info(f"Minimal OAuth server successfully started on {base_uri}:{port}")
+                return True, ""
             else:
-                logger.error(f"Failed to start minimal OAuth server on {base_uri}:{port}")
-            return result
+                logger.error(f"Failed to start minimal OAuth server on {base_uri}:{port}: {error_msg}")
+                return False, error_msg
         else:
             logger.info("Minimal OAuth server is already running")
-            return True
+            return True, ""
 
     else:
-        logger.error(f"Unknown transport mode: {transport_mode}")
-        return False
+        error_msg = f"Unknown transport mode: {transport_mode}"
+        logger.error(error_msg)
+        return False, error_msg
 
 def cleanup_oauth_callback_server():
     """Clean up the minimal OAuth server if it was started."""

core/server.py

@@ -193,8 +193,12 @@ async def start_google_auth(
 
     # Ensure OAuth callback is available for current transport mode
     redirect_uri = get_oauth_redirect_uri_for_current_mode()
-    if not ensure_oauth_callback_available(_current_transport_mode, WORKSPACE_MCP_PORT, WORKSPACE_MCP_BASE_URI):
-        raise Exception("Failed to start OAuth callback server. Please try again.")
+    success, error_msg = ensure_oauth_callback_available(_current_transport_mode, WORKSPACE_MCP_PORT, WORKSPACE_MCP_BASE_URI)
+    if not success:
+        if error_msg:
+            raise Exception(f"Failed to start OAuth callback server: {error_msg}")
+        else:
+            raise Exception("Failed to start OAuth callback server. Please try again.")
 
     auth_result = await start_auth_flow(
         user_google_email=user_google_email,

main.py

@@ -149,10 +149,14 @@ def main():
             safe_print("🚀 Starting server in stdio mode")
             # Start minimal OAuth callback server for stdio mode
             from auth.oauth_callback_server import ensure_oauth_callback_available
-            if ensure_oauth_callback_available('stdio', port, base_uri):
+            success, error_msg = ensure_oauth_callback_available('stdio', port, base_uri)
+            if success:
                 safe_print(f"   OAuth callback server started on {base_uri}:{port}/oauth2callback")
             else:
-                safe_print("   ⚠️  Warning: Failed to start OAuth callback server")
+                warning_msg = f"   ⚠️  Warning: Failed to start OAuth callback server"
+                if error_msg:
+                    warning_msg += f": {error_msg}"
+                safe_print(warning_msg)
 
         safe_print("   Ready for MCP connections!")
         safe_print("")

{workspace_mcp-1.1.12.dist-info → workspace_mcp-1.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workspace-mcp
-Version: 1.1.12
+Version: 1.1.13
 Summary: Comprehensive, highly performant Google Workspace Streamable HTTP & SSE MCP Server for Calendar, Gmail, Docs, Sheets, Slides & Drive
 Author-email: Taylor Wilsdon <taylor@taylorwilsdon.com>
 License: MIT

{workspace_mcp-1.1.12.dist-info → workspace_mcp-1.1.13.dist-info}/RECORD

@@ -1,7 +1,7 @@
-main.py,sha256=3ugTmkMRAYjeKwlknFrJqv_6dPqimN44-fvTDWJdEiI,7599
+main.py,sha256=QnpxBnYTqrLaEkO5sqkIeVjiJsvQ9PqnIPk9HiaCs0Y,7765
 auth/__init__.py,sha256=gPCU3GE-SLy91S3D3CbX-XfKBm6hteK_VSPKx7yjT5s,42
-auth/google_auth.py,sha256=KucjYkUPAS4XYAojqBja2w7HharVrqDyCmbSjwF2kK8,32262
-auth/oauth_callback_server.py,sha256=01J4GE2zM1BvLaNTCh7AkDKFO6VdBIfqAWpT3I8RpW4,9319
+auth/google_auth.py,sha256=KJjwEgeysKTiqymf_zkx6Z4YIWo94gdSG7aFsZ_G2JQ,32942
+auth/oauth_callback_server.py,sha256=mUgfE4OqftTbXfWvKJmrJ3PjCxz8HZ5nvJW3Emk7_20,9630
 auth/oauth_responses.py,sha256=qbirSB4d7mBRKcJKqGLrJxRAPaLHqObf9t-VMAq6UKA,7020
 auth/scopes.py,sha256=QdeoTq7MtWRcf5G9CqbpEUI5yVbu7JriCtY7zupGVeY,3331
 auth/service_decorator.py,sha256=crHax8t3EL4DXLPg4i3h9YHyfdpegRex880yNBTNqqI,15795
@@ -20,7 +20,7 @@ auth/oauth21/tokens.py,sha256=0BzYU0vdSXq8LiUpVQ8nncZ8UnvjAhXEVw0iY8NYIhs,14745
 core/__init__.py,sha256=AHVKdPl6v4lUFm2R-KuGuAgEmCyfxseMeLGtntMcqCs,43
 core/comments.py,sha256=ZiPxdZOsQYhxFwkClCDlcefP0iyLvO23qvN7OPLGSPk,11119
 core/context.py,sha256=zNgPXf9EO2EMs9sQkfKiywoy6sEOksVNgOrJMA_c30Y,768
-core/server.py,sha256=BqF9hsL1Arjmpz1C51rlHiv4fZb6RdodjJvWmNYv3XQ,8919
+core/server.py,sha256=GslrWM4P6bK5vOrcmT8qZtwQe5JnpSjA3xC1X7c41J4,9075
 core/utils.py,sha256=sebbgJtzgmtoj-5PNgAvKEjmPtIKmtMY6b-faVf4Oec,13101
 gcalendar/__init__.py,sha256=D5fSdAwbeomoaj7XAdxSnIy-NVKNkpExs67175bOtfc,46
 gcalendar/calendar_tools.py,sha256=44RLehBqiCnuSWM50T0ZPnx06Xmbsu2bbUot-2WJ_qc,22562
@@ -40,9 +40,9 @@ gslides/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gslides/slides_tools.py,sha256=vbhdzqHtNHfkNXN3h2_E9j_rMc747OzUaXH5XBu6XQY,10017
 gtasks/__init__.py,sha256=qwOWUzQbkYLSBrdhCqEkAWPH2lEOljk1mLtrlab9YZc,107
 gtasks/tasks_tools.py,sha256=s95fEMI7-TxyP8K2JoDMiRWftnVE9Fkrrr4j6jVgxAE,26469
-workspace_mcp-1.1.12.dist-info/licenses/LICENSE,sha256=bB8L7rIyRy5o-WHxGgvRuY8hUTzNu4h3DTkvyV8XFJo,1070
-workspace_mcp-1.1.12.dist-info/METADATA,sha256=Otaw1DCgMUJ8iPyVB7wtNXF3H-pab4ozjzrQA_CSQq4,23846
-workspace_mcp-1.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-workspace_mcp-1.1.12.dist-info/entry_points.txt,sha256=kPiEfOTuf-ptDM0Rf2OlyrFudGW7hCZGg4MCn2Foxs4,44
-workspace_mcp-1.1.12.dist-info/top_level.txt,sha256=uAg7uV2mETWYRw5g80XtO1lhxVO1sY6_IihNdG_4n24,80
-workspace_mcp-1.1.12.dist-info/RECORD,,
+workspace_mcp-1.1.13.dist-info/licenses/LICENSE,sha256=bB8L7rIyRy5o-WHxGgvRuY8hUTzNu4h3DTkvyV8XFJo,1070
+workspace_mcp-1.1.13.dist-info/METADATA,sha256=HbbexOvBqcxjgOzfqWA0Rj8rfWKzKbQRl0mnHcdRQD0,23846
+workspace_mcp-1.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+workspace_mcp-1.1.13.dist-info/entry_points.txt,sha256=kPiEfOTuf-ptDM0Rf2OlyrFudGW7hCZGg4MCn2Foxs4,44
+workspace_mcp-1.1.13.dist-info/top_level.txt,sha256=uAg7uV2mETWYRw5g80XtO1lhxVO1sY6_IihNdG_4n24,80
+workspace_mcp-1.1.13.dist-info/RECORD,,