windows-mcp 0.5.4__tar.gz → 0.5.6__tar.gz

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/.gitignore

@@ -165,5 +165,5 @@ cython_debug/
 .mcpregistry_github_token
 .mcpregistry_registry_token
 sandbox
-# *.ipynb
+*.ipynb
 *.mcpb

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: windows-mcp
-Version: 0.5.4
+Version: 0.5.6
 Summary: Lightweight MCP Server for interacting with Windows Operating System.
 Project-URL: homepage, https://github.com/CursorTouch
 Author-email: Jeomon George <jeogeoalukka@gmail.com>
@@ -37,14 +37,17 @@ Requires-Dist: live-inspect>=0.1.1
 Requires-Dist: markdownify>=1.1.0
 Requires-Dist: pdfplumber>=0.11.7
 Requires-Dist: pillow>=11.2.1
+Requires-Dist: posthog>=7.4.0
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: pyautogui>=0.9.54
 Requires-Dist: pygetwindow>=0.0.9
+Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: python-levenshtein>=0.27.1
 Requires-Dist: pywinauto>=0.6.9
 Requires-Dist: requests>=2.32.3
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: uiautomation>=2.0.24
+Requires-Dist: uuid7>=0.1.0
 Description-Content-Type: text/markdown
 
 [![MseeP.ai Security Assessment Badge](https://mseep.net/pr/cursortouch-windows-mcp-badge.png)](https://mseep.ai/app/cursortouch-windows-mcp)
@@ -261,7 +264,6 @@ npm install -g @google/gemini-cli
 {
   "theme": "Default",
   ...
-//MCP Server Config
   "mcpServers": {
     "windows-mcp": {
       "command": "uvx",
@@ -295,7 +297,6 @@ npm install -g @qwen-code/qwen-code@latest
 
 ```json
 {
-//MCP Server Config
   "mcpServers": {
     "windows-mcp": {
       "command": "uvx",
@@ -384,6 +385,28 @@ For detailed security information, including:
 
 Please read our [Security Policy](SECURITY.md).
 
+## 📊 Telemetry
+
+Windows-MCP collects anonymized usage data to help improve the tool. No personal information, no tool arguments, no outputs are tracked.
+
+To disable telemetry, add the following to your MCP client configuration:
+
+```json
+{
+  "mcpServers": {
+    "windows-mcp": {
+      "command": "uvx",
+      "args": [
+        "windows-mcp"
+      ],
+      "env": {
+        "ANONYMIZED_TELEMETRY": "false"
+      }
+    }
+  }
+}
+```
+
 ## 📝 Limitations
 
 - Selecting specific sections of the text in a paragraph, as the MCP is relying on a11y tree. (⌛ Working on it.)
@@ -421,3 +444,4 @@ Made with ❤️ by [CursorTouch](https://github.com/CursorTouch)
   url={https://github.com/CursorTouch/Windows-MCP}
 }
 ```
+

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/README.md

@@ -212,7 +212,6 @@ npm install -g @google/gemini-cli
 {
   "theme": "Default",
   ...
-//MCP Server Config
   "mcpServers": {
     "windows-mcp": {
       "command": "uvx",
@@ -246,7 +245,6 @@ npm install -g @qwen-code/qwen-code@latest
 
 ```json
 {
-//MCP Server Config
   "mcpServers": {
     "windows-mcp": {
       "command": "uvx",
@@ -335,6 +333,28 @@ For detailed security information, including:
 
 Please read our [Security Policy](SECURITY.md).
 
+## 📊 Telemetry
+
+Windows-MCP collects anonymized usage data to help improve the tool. No personal information, no tool arguments, no outputs are tracked.
+
+To disable telemetry, add the following to your MCP client configuration:
+
+```json
+{
+  "mcpServers": {
+    "windows-mcp": {
+      "command": "uvx",
+      "args": [
+        "windows-mcp"
+      ],
+      "env": {
+        "ANONYMIZED_TELEMETRY": "false"
+      }
+    }
+  }
+}
+```
+
 ## 📝 Limitations
 
 - Selecting specific sections of the text in a paragraph, as the MCP is relying on a11y tree. (⌛ Working on it.)
@@ -372,3 +392,4 @@ Made with ❤️ by [CursorTouch](https://github.com/CursorTouch)
   url={https://github.com/CursorTouch/Windows-MCP}
 }
 ```
+

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/pyproject.toml

@@ -1,40 +1,43 @@
-[project]
-name = "windows-mcp"
-version = "0.5.4"
-description = "Lightweight MCP Server for interacting with Windows Operating System."
-authors = [
-    { name = "Jeomon George", email = "jeogeoalukka@gmail.com" }
-]
-readme = "README.md"
-license = { file = "LICENSE.md" }
-urls = { homepage = "https://github.com/CursorTouch" }
-keywords = ["windows", "mcp", "ai", "desktop","ai agent"]
-requires-python = ">=3.13"
-dependencies = [
-    "click>=8.2.1",
-    "fastmcp>=2.8.1",
-    "fuzzywuzzy>=0.18.0",
-    "humancursor>=1.1.5",
-    "ipykernel>=6.30.0",
-    "live-inspect>=0.1.1",
-    "markdownify>=1.1.0",
-    "pdfplumber>=0.11.7",
-    "pillow>=11.2.1",
-    "psutil>=7.0.0",
-    "pyautogui>=0.9.54",
-    "pygetwindow>=0.0.9",
-    "python-levenshtein>=0.27.1",
-    "pywinauto>=0.6.9",
-    "requests>=2.32.3",
-    "tabulate>=0.9.0",
-    "uiautomation>=2.0.24",
-]
-
-[project.scripts]
-windows-mcp = "windows_mcp.__main__:main"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-
+[project]
+name = "windows-mcp"
+version = "0.5.6"
+description = "Lightweight MCP Server for interacting with Windows Operating System."
+authors = [
+    { name = "Jeomon George", email = "jeogeoalukka@gmail.com" }
+]
+readme = "README.md"
+license = { file = "LICENSE.md" }
+urls = { homepage = "https://github.com/CursorTouch" }
+keywords = ["windows", "mcp", "ai", "desktop","ai agent"]
+requires-python = ">=3.13"
+dependencies = [
+    "click>=8.2.1",
+    "fastmcp>=2.8.1",
+    "fuzzywuzzy>=0.18.0",
+    "humancursor>=1.1.5",
+    "ipykernel>=6.30.0",
+    "live-inspect>=0.1.1",
+    "markdownify>=1.1.0",
+    "pdfplumber>=0.11.7",
+    "pillow>=11.2.1",
+    "posthog>=7.4.0",
+    "psutil>=7.0.0",
+    "pyautogui>=0.9.54",
+    "pygetwindow>=0.0.9",
+    "python-dotenv>=1.1.0",
+    "python-levenshtein>=0.27.1",
+    "pywinauto>=0.6.9",
+    "requests>=2.32.3",
+    "tabulate>=0.9.0",
+    "uiautomation>=2.0.24",
+    "uuid7>=0.1.0",
+]
+
+[project.scripts]
+windows-mcp = "windows_mcp.__main__:main"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/server.json

@@ -13,7 +13,7 @@
       "registry_type": "pypi",
       "registry_base_url": "https://pypi.org",
       "identifier": "windows_mcp",
-      "version": "0.5.0",
+      "version": "0.5.4",
       "runtime_hint": "uvx",
       "transport": {
         "type": "stdio"

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/src/windows_mcp/__main__.py

@@ -1,15 +1,20 @@
+from windows_mcp.analytics import PostHogAnalytics, with_analytics
 from live_inspect.watch_cursor import WatchCursor
+from windows_mcp.desktop.service import Desktop
 from contextlib import asynccontextmanager
 from fastmcp.utilities.types import Image
-from windows_mcp.desktop.service import Desktop
 from mcp.types import ToolAnnotations
+from typing import Literal, Optional
 from humancursor import SystemCursor
+from dotenv import load_dotenv
 from textwrap import dedent
 from fastmcp import FastMCP
-from typing import Literal
 import pyautogui as pg
 import asyncio
 import click
+import os
+
+load_dotenv()
 
 pg.FAILSAFE=False
 pg.PAUSE=1.0
@@ -26,6 +31,12 @@ Windows MCP server provides tools to interact directly with the {windows_version
 thus enabling to operate the desktop on the user's behalf.
 ''')
 
+# Initialize analytics at module level to be used in decorators
+if os.getenv("ANONYMIZED_TELEMETRY", "true").lower() == "false":
+    analytics = None
+else:
+    analytics = PostHogAnalytics()
+
 @asynccontextmanager
 async def lifespan(app: FastMCP):
     """Runs initialization code before the server starts and cleanup code after it shuts down."""
@@ -35,6 +46,8 @@ async def lifespan(app: FastMCP):
         yield
     finally:
         watch_cursor.stop()
+        if analytics:
+            await analytics.close()
 
 mcp=FastMCP(name='windows-mcp',instructions=instructions,lifespan=lifespan)
 
@@ -49,6 +62,7 @@ mcp=FastMCP(name='windows-mcp',instructions=instructions,lifespan=lifespan)
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "App-Tool")
 def app_tool(mode:Literal['launch','resize','switch'],name:str|None=None,window_loc:list[int]|None=None,window_size:list[int]|None=None):
     return desktop.app(mode,name,window_loc,window_size)
     
@@ -63,6 +77,7 @@ def app_tool(mode:Literal['launch','resize','switch'],name:str|None=None,window_
         openWorldHint=True
     )
     )
+@with_analytics(analytics, "Powershell-Tool")
 def powershell_tool(command: str) -> str:
     response,status_code=desktop.execute_command(command)
     return f'Response: {response}\nStatus Code: {status_code}'
@@ -78,6 +93,7 @@ def powershell_tool(command: str) -> str:
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "State-Tool")
 def state_tool(use_vision:bool=False,use_dom:bool=False):
     # Calculate scale factor to cap resolution at 1080p (1920x1080)
     max_width, max_height = 1920, 1080
@@ -118,6 +134,7 @@ def state_tool(use_vision:bool=False,use_dom:bool=False):
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "Click-Tool")
 def click_tool(loc:list[int],button:Literal['left','right','middle']='left',clicks:int=1)->str:
     if len(loc) != 2:
         raise ValueError("Location must be a list of exactly 2 integers [x, y]")
@@ -137,6 +154,7 @@ def click_tool(loc:list[int],button:Literal['left','right','middle']='left',clic
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "Type-Tool")
 def type_tool(loc:list[int],text:str,clear:bool=False,press_enter:bool=False)->str:
     if len(loc) != 2:
         raise ValueError("Location must be a list of exactly 2 integers [x, y]")
@@ -155,6 +173,7 @@ def type_tool(loc:list[int],text:str,clear:bool=False,press_enter:bool=False)->s
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "Scroll-Tool")
 def scroll_tool(loc:list[int]=None,type:Literal['horizontal','vertical']='vertical',direction:Literal['up','down','left','right']='down',wheel_times:int=1)->str:
     if loc and len(loc) != 2:
         raise ValueError("Location must be a list of exactly 2 integers [x, y]")
@@ -174,6 +193,7 @@ def scroll_tool(loc:list[int]=None,type:Literal['horizontal','vertical']='vertic
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "Drag-Tool")
 def drag_tool(to_loc:list[int])->str:
     if len(to_loc) != 2:
         raise ValueError("to_loc must be a list of exactly 2 integers [x, y]")
@@ -192,6 +212,7 @@ def drag_tool(to_loc:list[int])->str:
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "Move-Tool")
 def move_tool(to_loc:list[int])->str:
     if len(to_loc) != 2:
         raise ValueError("to_loc must be a list of exactly 2 integers [x, y]")
@@ -210,6 +231,7 @@ def move_tool(to_loc:list[int])->str:
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "Shortcut-Tool")
 def shortcut_tool(shortcut:str):
     desktop.shortcut(shortcut)
     return f"Pressed {shortcut}."
@@ -225,13 +247,14 @@ def shortcut_tool(shortcut:str):
         openWorldHint=False
     )
     )
+@with_analytics(analytics, "Wait-Tool")
 def wait_tool(duration:int)->str:
     pg.sleep(duration)
     return f'Waited for {duration} seconds.'
 
 @mcp.tool(
     name='Scrape-Tool',
-    description='Extracts visible text content from the currently focused browser tab. Returns content in plain text format with scroll status indicators (top/bottom reached or more content available). Only works when a browser with DOM is active. Use State-Tool with use_dom=True first to ensure browser is ready.',
+    description='Fetch content from a URL or the active browser tab. By default (use_dom=False), performs a lightweight HTTP request to the URL and returns markdown content of complete webpage. Note: Some websites may block automated HTTP requests. If this fails, open the page in a browser and retry with use_dom=True to extract visible text from the active tab\'s DOM within the viewport.',
     annotations=ToolAnnotations(
         title="Scrape Tool",
         readOnlyHint=True,
@@ -240,17 +263,22 @@ def wait_tool(duration:int)->str:
         openWorldHint=True
     )
     )
-def scrape_tool(url:str)->str:
-    desktop_state=desktop.desktop_state
+@with_analytics(analytics, "Scrape-Tool")
+def scrape_tool(url:str,use_dom:bool=False)->str:
+    if not use_dom:
+        content=desktop.scrape(url)
+        return f'URL:{url}\nContent:\n{content}'
+
+    desktop_state=desktop.get_state(use_vision=False,use_dom=use_dom)
     tree_state=desktop_state.tree_state
-    if not tree_state.dom_node:
-        return f'Unable to scrape URL: {url}. No DOM node found.'
-    dom_node=tree_state.dom
-    vertical_scroll_percent=dom_node.vertical_scroll_percent
+    if not tree_state.dom_info:
+        return f'No DOM information found. Please open {url} in browser first.'
+    dom_info=tree_state.dom_info
+    vertical_scroll_percent=dom_info.vertical_scroll_percent
     content='\n'.join([node.text for node in tree_state.dom_informative_nodes])
     header_status = "Reached top" if vertical_scroll_percent <= 0 else "Scroll up to see more"
     footer_status = "Reached bottom" if vertical_scroll_percent >= 100 else "Scroll down to see more"
-    return f'URL:{url}\nContent:\n{header_status}\n{content}\n{footer_status}'
+    return f'URL:{url}\nContent:\n[{header_status}]\n{content}\n[{footer_status}]'
 
 
 @click.command()

windows_mcp-0.5.6/src/windows_mcp/analytics.py

@@ -0,0 +1,150 @@
+from typing import Optional, Dict, Any, TypeVar, Callable, Protocol, Awaitable
+from tempfile import TemporaryDirectory
+from uuid_extensions import uuid7str
+from functools import wraps
+from pathlib import Path
+import posthog
+import asyncio
+import logging
+import time
+import os
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+T = TypeVar("T")
+
+class Analytics(Protocol):
+    async def track_tool(self, tool_name: str, result: Dict[str, Any]) -> None:
+        """Tracks the execution of a tool."""
+        ...
+
+    async def track_error(self, error: Exception, context: Dict[str, Any]) -> None:
+        """Tracks an error that occurred during the execution of a tool."""
+        ...
+
+    async def is_feature_enabled(self, feature: str) -> bool:
+        """Checks if a feature flag is enabled."""
+        ...
+
+    async def close(self) -> None:
+        """Closes the analytics client."""
+        ...
+
+class PostHogAnalytics:
+    TEMP_FOLDER = Path(TemporaryDirectory().name).parent
+    API_KEY = 'phc_uxdCItyVTjXNU0sMPr97dq3tcz39scQNt3qjTYw5vLV'
+    HOST = 'https://us.i.posthog.com'
+
+    def __init__(self):
+        self.client = posthog.Posthog(
+            self.API_KEY, 
+            host=self.HOST, 
+            disable_geoip=False, 
+            enable_exception_autocapture=True,
+            debug=True
+        )
+        self._user_id = None
+        self.mcp_interaction_id = f"mcp_{int(time.time()*1000)}_{os.getpid()}"
+        
+        if self.client:
+            logger.debug(f"Initialized with user ID: {self.user_id} and session ID: {self.mcp_interaction_id}")
+
+    @property
+    def user_id(self) -> str:
+        if self._user_id:
+            return self._user_id
+            
+        user_id_file = self.TEMP_FOLDER / '.windows-mcp-user-id'
+        if user_id_file.exists():
+            self._user_id = user_id_file.read_text(encoding='utf-8').strip()
+        else:
+            self._user_id = uuid7str()
+            try:
+                user_id_file.write_text(self._user_id, encoding='utf-8')
+            except Exception as e:
+                logger.warning(f"Could not persist user ID: {e}")
+                
+        return self._user_id
+
+    async def track_tool(self, tool_name: str, result: Dict[str, Any]) -> None:
+        if self.client:
+            self.client.capture(
+                distinct_id=self.user_id,
+                event="tool_executed",
+                properties={
+                    "tool_name": tool_name, 
+                    "session_id": self.mcp_interaction_id,
+                    "process_person_profile": True,
+                    **result
+                }
+            )
+        
+        duration = result.get("duration_ms", 0)
+        success_mark = "SUCCESS" if result.get("success") else "FAILED"
+        # Using print for immediate visibility in console during debugging
+        print(f"[Analytics] {tool_name}: {success_mark} ({duration}ms)")
+        logger.info(f"{tool_name}: {success_mark} ({duration}ms)")
+        if self.client:
+            self.client.flush()
+
+    async def track_error(self, error: Exception, context: Dict[str, Any]) -> None:
+        if self.client:
+            self.client.capture(
+                 distinct_id=self.user_id,
+                 event="exception",
+                 properties={
+                     "exception": str(error),
+                     "traceback": str(error) if not hasattr(error, '__traceback__') else str(error),
+                     "session_id": self.mcp_interaction_id,
+                     "process_person_profile": True,
+                     **context
+                 }
+            )
+        
+        if self.client:
+            self.client.flush()
+        
+        logger.error(f"ERROR in {context.get('tool_name')}: {error}")
+
+    async def is_feature_enabled(self, feature: str) -> bool:
+        if not self.client:
+            return False
+        return self.client.is_feature_enabled(feature, self.user_id)
+
+    async def close(self) -> None:
+        if self.client:
+            self.client.shutdown()
+            logger.debug("Closed analytics")
+
+def with_analytics(analytics_instance: Optional[Analytics], tool_name: str):
+    """
+    Decorator to wrap tool functions with analytics tracking.
+    """
+    def decorator(func: Callable[..., Awaitable[T]]) -> Callable[..., Awaitable[T]]:
+        @wraps(func)
+        async def wrapper(*args, **kwargs) -> T:
+            start = time.time()
+            try:
+                if asyncio.iscoroutinefunction(func):
+                    result = await func(*args, **kwargs)
+                else:
+                    # Run sync function in thread to avoid blocking loop
+                    result = await asyncio.to_thread(func, *args, **kwargs)
+
+                duration_ms = int((time.time() - start) * 1000)
+                
+                if analytics_instance:
+                    await analytics_instance.track_tool(tool_name, {"duration_ms": duration_ms, "success": True})
+                
+                return result
+            except Exception as error:
+                duration_ms = int((time.time() - start) * 1000)
+                if analytics_instance:
+                    await analytics_instance.track_error(error, {
+                        "tool_name": tool_name,
+                        "duration_ms": duration_ms
+                    })
+                raise error
+        return wrapper
+    return decorator

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/src/windows_mcp/desktop/service.py

@@ -1,10 +1,10 @@
 from windows_mcp.desktop.config import BROWSER_NAMES, PROCESS_PER_MONITOR_DPI_AWARE
 from windows_mcp.desktop.views import DesktopState, App, Size, Status
+from windows_mcp.tree.service import Tree
 from locale import getpreferredencoding
 from contextlib import contextmanager
 from typing import Optional,Literal
 from markdownify import markdownify
-from windows_mcp.tree.service import Tree
 from fuzzywuzzy import process
 from psutil import Process
 from time import sleep
@@ -172,7 +172,7 @@ class Desktop:
                 sleep(1.25)
                 if status!=0:
                     return response
-                consecutive_waits=3
+                consecutive_waits=10
                 for _ in range(consecutive_waits):
                     if not self.is_app_running(name):
                         sleep(1.25)
@@ -200,11 +200,12 @@ class Desktop:
         app_name,_=matched_app
         appid=apps_map.get(app_name)
         if appid is None:
-            return (name,f'{name.title()} not found in start menu.',1)
-        if name.endswith('.exe'):
-            response,status=self.execute_command(f'Start-Process {appid}')
+            return (f'{name.title()} not found in start menu.',1)
+        if appid.endswith('.exe'):
+            command=f"Start-Process '{appid}'"
         else:
-            response,status=self.execute_command(f'Start-Process shell:AppsFolder\\{appid}')
+            command=f"Start-Process shell:AppsFolder\\{appid}"
+        response,status=self.execute_command(command)
         return response,status
     
     def switch_app(self,name:str):

{windows_mcp-0.5.4 → windows_mcp-0.5.6}/src/windows_mcp/tree/service.py

@@ -1,6 +1,6 @@
 from windows_mcp.tree.config import INTERACTIVE_CONTROL_TYPE_NAMES,DOCUMENT_CONTROL_TYPE_NAMES,INFORMATIVE_CONTROL_TYPE_NAMES, DEFAULT_ACTIONS, THREAD_MAX_RETRIES
+from windows_mcp.tree.views import TreeElementNode, ScrollElementNode, TextElementNode, Center, BoundingBox, TreeState, DOMInfo
 from uiautomation import Control,ImageControl,ScrollPattern,WindowControl,Rect,GetRootControl,PatternId
-from windows_mcp.tree.views import TreeElementNode, ScrollElementNode, TextElementNode, Center, BoundingBox, TreeState
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from windows_mcp.tree.utils import random_point_within_bounding_box
 from PIL import Image, ImageFont, ImageDraw
@@ -24,58 +24,22 @@ class Tree:
     def __init__(self,desktop:'Desktop'):
         self.desktop=desktop
         self.screen_size=self.desktop.get_screen_size()
-        self.dom:Optional[Control]=None
+        self.dom_info:Optional[DOMInfo]=None
         self.dom_bounding_box:BoundingBox=None
         self.screen_box=BoundingBox(
             top=0, left=0, bottom=self.screen_size.height, right=self.screen_size.width,
             width=self.screen_size.width, height=self.screen_size.height 
         )
-        self.root:Optional[TreeElementNode]=None
 
     def get_state(self,active_app:App,other_apps:list[App],use_dom:bool=False)->TreeState:
-        self.root=GetRootControl()
+        root=GetRootControl()
         other_apps_handle=set(map(lambda other_app: other_app.handle,other_apps))
-        apps=list(filter(lambda app:app.NativeWindowHandle not in other_apps_handle,self.root.GetChildren()))
+        apps=list(filter(lambda app:app.NativeWindowHandle not in other_apps_handle,root.GetChildren()))
         del other_apps_handle
         if active_app:
             apps=list(filter(lambda app:app.ClassName!='Progman',apps))
         interactive_nodes,scrollable_nodes,dom_informative_nodes=self.get_appwise_nodes(apps=apps,use_dom=use_dom)
-        root=TreeElementNode(**{
-            'name':'Desktop',
-            'control_type':'PaneControl',
-            'app_name':'Desktop',
-            'value':'',
-            'shortcut':'',
-            'bounding_box':self.screen_box,
-            'center':Center(x=self.screen_box.left+self.screen_box.width//2,y=self.screen_box.top+self.screen_box.height//2),
-            'xpath':'',
-            'is_focused':False
-        })
-        dom=None
-        if self.dom:
-            scroll_pattern=self.dom.GetPattern(PatternId.ScrollPattern)
-            bounding_box=self.dom.BoundingRectangle
-            dom=ScrollElementNode(**{
-                'name':"DOM",
-                'control_type':'DocumentControl',
-                'app_name':"DOM",
-                'bounding_box':BoundingBox(
-                    left=bounding_box.left,
-                    top=bounding_box.top,
-                    right=bounding_box.right,
-                    bottom=bounding_box.bottom,
-                    width=bounding_box.width(),
-                    height=bounding_box.height()
-                ),
-                'center':Center(x=bounding_box.left+bounding_box.width()//2,y=bounding_box.top+bounding_box.height()//2),
-                'horizontal_scrollable':scroll_pattern.HorizontallyScrollable,
-                'horizontal_scroll_percent':scroll_pattern.HorizontalScrollPercent if scroll_pattern.HorizontallyScrollable else 0,
-                'vertical_scrollable':scroll_pattern.VerticallyScrollable,
-                'vertical_scroll_percent':scroll_pattern.VerticalScrollPercent if scroll_pattern.VerticallyScrollable else 0,
-                'xpath':'',
-                'is_focused':False
-            })
-        return TreeState(root=root,dom=dom,interactive_nodes=interactive_nodes,scrollable_nodes=scrollable_nodes,dom_informative_nodes=dom_informative_nodes)
+        return TreeState(dom_info=self.dom_info,interactive_nodes=interactive_nodes,scrollable_nodes=scrollable_nodes,dom_informative_nodes=dom_informative_nodes)
 
     def get_appwise_nodes(self,apps:list[Control],use_dom:bool=False)-> tuple[list[TreeElementNode],list[ScrollElementNode],list[TextElementNode]]:
         interactive_nodes, scrollable_nodes,dom_informative_nodes = [], [], []
@@ -388,7 +352,13 @@ class Tree:
                     self.dom_bounding_box=BoundingBox(left=bounding_box.left,top=bounding_box.top,
                     right=bounding_box.right,bottom=bounding_box.bottom,width=bounding_box.width(),
                     height=bounding_box.height())
-                    self.dom=child
+                    scroll_pattern=child.GetPattern(PatternId.ScrollPattern)
+                    self.dom_info=DOMInfo(
+                        horizontal_scrollable=scroll_pattern.HorizontallyScrollable,
+                        horizontal_scroll_percent=scroll_pattern.HorizontalScrollPercent if scroll_pattern.HorizontallyScrollable else 0,
+                        vertical_scrollable=scroll_pattern.VerticallyScrollable,
+                        vertical_scroll_percent=scroll_pattern.VerticalScrollPercent if scroll_pattern.VerticallyScrollable else 0
+                    )
                     # enter DOM subtree
                     tree_traversal(child, is_dom=True, is_dialog=is_dialog)
                 # Check if the child is a dialog