refactor(tools): rename query_omnifocus to search and get_tree to browse

Rename tools for clarity and consistency:
- query_omnifocus → search
- get_tree → browse

New features added during refactor:
- folderPath field: Returns folder hierarchy as an array
- available filter: Filter projects to Active + not deferred
- task_filters parameter in browse: Full task filtering when include_tasks=True

Both tools now use shared JS modules via the includes mechanism,
reducing code duplication by ~160 lines.

Author: igrybkov

…omnifocus_mcp/mcp_tools/projects/tree.py …nifocus_mcp/mcp_tools/projects/browse.pysrc/omnifocus_mcp/mcp_tools/projects/tree.py renamed to src/omnifocus_mcp/mcp_tools/projects/browse.py src/omnifocus_mcp/mcp_tools/projects/tree.py renamed to src/omnifocus_mcp/mcp_tools/projects/browse.py

@@ -1,15 +1,23 @@
-"""Get tree tool - hierarchical view of folders, projects, and tasks."""
+"""Browse tool - hierarchical view of folders, projects, and tasks."""
 
 import json
 from typing import Any
 
 from ...omnijs import execute_omnijs_with_params
 
+# Shared JS modules for browse script
+BROWSE_INCLUDES = [
+    "common/status_maps",
+    "common/filters",
+    "common/field_mappers",
+]
 
-async def get_tree(
+
+async def browse(
     parent_id: str | None = None,
     parent_name: str | None = None,
     filters: dict[str, Any] | None = None,
+    task_filters: dict[str, Any] | None = None,
     include_completed: bool = False,
     max_depth: int | None = None,
     include_root_projects: bool = True,
@@ -20,7 +28,7 @@ async def get_tree(
     include_tasks: bool = False,
 ) -> str:
     """
-    Get a hierarchical tree of folders, projects, and tasks.
+    Browse the hierarchical tree of folders, projects, and tasks.
 
     Returns a tree structure showing the folder/project/task hierarchy in OmniFocus.
     Supports filtering by various criteria and starting from a specific folder.
@@ -38,15 +46,22 @@ async def get_tree(
             - due_within: Projects due within N days from today
             - deferred_until: Projects deferred becoming available within N days
             - has_note: Filter by note presence (boolean)
+            - available: Filter to Active projects that are not deferred (boolean)
+        task_filters: Optional filters for tasks when include_tasks=True (all AND logic):
+            - flagged: Filter by flagged status (boolean)
+            - tags: Filter by tag names (list, OR logic)
+            - status: Filter by task status (list, OR logic)
+            - due_within: Tasks due within N days from today
+            - planned_within: Tasks planned within N days from today
         include_completed: Include completed/dropped projects and tasks (default: False)
         max_depth: Maximum folder depth to traverse (None = unlimited)
         include_root_projects: Include projects at root level (not in any folder) (default: True)
         summary: If True, return only counts (projectCount, folderCount, taskCount) without tree
         fields: Specific project/task fields to return (reduces response size).
             Project fields: id, name, status, sequential, flagged, dueDate, deferDate,
-            estimatedMinutes, taskCount, tagNames.
+            estimatedMinutes, taskCount, tagNames, folderPath.
             Task fields: id, name, flagged, dueDate, deferDate, estimatedMinutes, tagNames,
-            completed, note.
+            completed, note, folderPath.
             If not specified, returns all fields.
         include_folders: Include folder nodes in the tree (default: True)
         include_projects: Include project nodes in the tree (default: True)
@@ -75,11 +90,12 @@ async def get_tree(
     """
     try:
         result = await execute_omnijs_with_params(
-            "tree",
+            "browse",
             {
                 "parent_id": parent_id,
                 "parent_name": parent_name,
                 "filters": filters or {},
+                "task_filters": task_filters or {},
                 "include_completed": include_completed,
                 "max_depth": max_depth,
                 "include_root_projects": include_root_projects,
@@ -89,6 +105,7 @@ async def get_tree(
                 "include_projects": include_projects,
                 "include_tasks": include_tasks,
             },
+            includes=BROWSE_INCLUDES,
         )
         return json.dumps(result, indent=2)
     except Exception as e:

src/omnifocus_mcp/mcp_tools/query/__init__.py

@@ -1,5 +1,5 @@
 """Query tools for OmniFocus."""
 
-from .query import query_omnifocus
+from .search import search
 
-__all__ = ["query_omnifocus"]
+__all__ = ["search"]

…c/omnifocus_mcp/mcp_tools/query/query.py …/omnifocus_mcp/mcp_tools/query/search.pysrc/omnifocus_mcp/mcp_tools/query/query.py renamed to src/omnifocus_mcp/mcp_tools/query/search.py src/omnifocus_mcp/mcp_tools/query/query.py renamed to src/omnifocus_mcp/mcp_tools/query/search.py

@@ -1,12 +1,19 @@
-"""Query OmniFocus database tool."""
+"""Search OmniFocus database tool."""
 
 import json
 from typing import Any
 
 from ...omnijs import execute_omnijs_with_params
 
+# Shared JS modules for search script
+SEARCH_INCLUDES = [
+    "common/status_maps",
+    "common/filters",
+    "common/field_mappers",
+]
 
-async def query_omnifocus(
+
+async def search(
     entity: str,
     filters: dict[str, Any] | None = None,
     fields: list[str] | None = None,
@@ -17,7 +24,7 @@ async def query_omnifocus(
     summary: bool = False,
 ) -> str:
     """
-    Query OmniFocus database with powerful filters.
+    Search OmniFocus database with powerful filters.
 
     Much faster than dump_database for targeted queries.
 
@@ -34,8 +41,9 @@ async def query_omnifocus(
             - deferred_until: Items deferred becoming available within N days
             - planned_within: Tasks planned within N days from today (OmniFocus 4.7+)
             - has_note: Filter by note presence
+            - available: For projects, filter to Active + not deferred
         fields: Specific fields to return (reduces response size). Task fields include:
-            plannedDate, effectivePlannedDate, effectiveDueDate, effectiveDeferDate
+            plannedDate, effectivePlannedDate, effectiveDueDate, effectiveDeferDate, folderPath
         limit: Maximum number of items to return
         sort_by: Field to sort by (name, dueDate, deferDate, plannedDate, modificationDate, etc.)
         sort_order: Sort order: 'asc' or 'desc' (default: 'asc')
@@ -47,7 +55,7 @@ async def query_omnifocus(
     """
     try:
         result = await execute_omnijs_with_params(
-            "query",
+            "search",
             {
                 "entity": entity,
                 "filters": filters or {},
@@ -58,6 +66,7 @@ async def query_omnifocus(
                 "include_completed": include_completed,
                 "summary": summary,
             },
+            includes=SEARCH_INCLUDES,
         )
         return json.dumps(result, indent=2)
     except Exception as e: