onex-cli 1.16.0__tar.gz → 1.16.2__tar.gz

{onex_cli-1.16.0/onex_cli.egg-info → onex_cli-1.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onex-cli
-Version: 1.16.0
+Version: 1.16.2
 Summary: Official CLI for deploying and managing services on OneXEOS Platform (Windows, macOS, Linux)
 Home-page: https://github.com/onexeos/onex-cli
 Author: OneXEOS Platform Team

{onex_cli-1.16.0 → onex_cli-1.16.2}/onex/__init__.py

@@ -1,2 +1,2 @@
 # OneXEOS Services CLI
-__version__ = "1.16.0"
+__version__ = "1.16.2"

{onex_cli-1.16.0 → onex_cli-1.16.2}/onex/mcp/tools/rocket_tools.py

@@ -130,17 +130,51 @@ def _detect_git_repo() -> Optional[dict]:
 
 def register_rocket_tools(mcp, api_url: Optional[str] = None):
     """Register all onex-rocket tools on an existing FastMCP server."""
-
     base_url = _resolve_rocket_url(api_url)
-    client = httpx.Client(base_url=base_url, timeout=30.0)
+    client = httpx.Client(base_url=base_url, timeout=10.0)
     _indexed_repos: set = set()  # track repos already indexed this session
+    _indexing_in_progress: set = set()  # repos currently being indexed
+
+    def _check_index_status() -> Optional[dict]:
+        """Check server-side indexing status for repos in progress.
+        Returns status dict if indexing, None if all done."""
+        if not _indexing_in_progress:
+            return None
+        try:
+            resp = client.get("/api/v1/index/status", timeout=3)
+            if resp.status_code == 200:
+                statuses = resp.json()
+                active = {}
+                for name, status in statuses.items():
+                    if name in _indexing_in_progress:
+                        if status.get("status") == "done":
+                            _indexed_repos.add(name)
+                            _indexing_in_progress.discard(name)
+                        elif status.get("status") == "error":
+                            _indexing_in_progress.discard(name)
+                        else:
+                            active[name] = status
+                if active:
+                    return active
+        except Exception:
+            pass
+        return None
 
     def _get(path: str, params: dict = None) -> str:
-        """Make GET request to rocket API, return JSON string."""
+        """Make GET request to rocket API, return JSON string.
+        If result is empty and indexing is in progress, returns status info."""
         try:
             resp = client.get(f"/api/v1/{path}", params=params or {})
             resp.raise_for_status()
-            return resp.text
+            result = resp.text
+            if result in ("null", "[]", "{}"):
+                active = _check_index_status()
+                if active:
+                    return json.dumps({
+                        "_indexing": active,
+                        "_note": "Repo is being indexed. Results will be available when indexing completes. Check status with rocket_index_status tool or retry shortly."
+                    })
+            return result
         except httpx.HTTPError as e:
             return f'{{"error": "{str(e)}"}}'
 
@@ -160,38 +194,54 @@ def register_rocket_tools(mcp, api_url: Optional[str] = None):
           main/dev/preview  -> "repo-name"       (shared graph, auto-reindexed)
           feature/hotfix    -> "repo-name@branch" (on-demand, indexed once)
 
-        Only checks once per graph_name per session.
+        Only checks once per graph_name per session. Non-blocking:
+        triggers async index on the server and returns immediately.
         """
         repo_info = _detect_git_repo()
         if not repo_info:
             return
 
         graph_name = repo_info["graph_name"]
-        if graph_name in _indexed_repos:
+        if graph_name in _indexed_repos or graph_name in _indexing_in_progress:
             return
 
-        # Check if already in graph
+        # Check index/status first (lightweight, doesn't hit the graph)
+        try:
+            resp = client.get(f"/api/v1/index/status/{graph_name}", timeout=3)
+            if resp.status_code == 200:
+                status = resp.json()
+                if status.get("status") == "done":
+                    _indexed_repos.add(graph_name)
+                    return
+                if status.get("status") == "indexing":
+                    _indexing_in_progress.add(graph_name)
+                    return
+        except Exception:
+            pass
+
+        # Not tracked — check graph stats as fallback
         try:
-            resp = client.get("/api/v1/stats", timeout=5)
+            resp = client.get("/api/v1/stats", timeout=3)
             if resp.status_code == 200:
-                stats = resp.json()
-                by_repo = stats.get("by_repo", {})
+                by_repo = resp.json().get("by_repo", {})
                 if graph_name in by_repo:
                     _indexed_repos.add(graph_name)
                     return
         except Exception:
             return
 
-        # Not in graph — trigger index
+        # Not in graph — trigger async index (returns immediately)
         try:
-            client.post("/api/v1/index", json={
+            resp = client.post("/api/v1/index", json={
                 "url": repo_info["url"],
                 "name": graph_name,
                 "branch": repo_info["branch"],
-            }, timeout=120)
-            _indexed_repos.add(graph_name)
+                "async": True,
+            }, timeout=5)
+            if resp.status_code == 200:
+                _indexing_in_progress.add(graph_name)
         except Exception:
-            pass  # best-effort, don't block the tool call
+            pass
 
     def _get_current_graph_name() -> Optional[str]:
         """Get the graph name for the current repo+branch.
@@ -354,8 +404,7 @@ def register_rocket_tools(mcp, api_url: Optional[str] = None):
     @mcp.tool()
     def rocket_stats() -> str:
         """Get graph statistics: total nodes/edges, breakdown by kind and repo.
-        NOTE: The graph indexes the MAIN branch only. Results do not reflect feature branches or uncommitted changes.
-        Auto-indexes the current repo if not already in the graph."""
+        Auto-indexes the current repo if not already in the graph (non-blocking)."""
         _ensure_repo_indexed()
         return _get("stats")
 
@@ -370,7 +419,29 @@ def register_rocket_tools(mcp, api_url: Optional[str] = None):
 
     @mcp.tool()
     def rocket_index(path: str = "", url: str = "", name: str = "", branch: str = "main") -> str:
-        """Index a repository into the code graph. Use path for local repos, url for git repos."""
+        """Index a repository into the code graph. Use path for local repos, url for git repos.
+        If indexing is already in progress for this repo, returns the current status instead of starting a new one."""
+        # Check if already indexing
+        check_name = name
+        if not check_name and url:
+            check_name = url.rstrip('/').rsplit('/', 1)[-1]
+            if check_name.endswith('.git'):
+                check_name = check_name[:-4]
+        if check_name:
+            try:
+                resp = client.get(f"/api/v1/index/status/{check_name}", timeout=3)
+                if resp.status_code == 200:
+                    status = resp.json()
+                    if status.get("status") == "indexing":
+                        return json.dumps({
+                            "status": "already_indexing",
+                            "repo": check_name,
+                            "started_at": status.get("started_at"),
+                            "message": f"Indexing already in progress for '{check_name}'. Use rocket_index_status to check progress."
+                        })
+            except Exception:
+                pass
+
         data = {"branch": branch}
         if path:
             data["path"] = path
@@ -379,3 +450,12 @@ def register_rocket_tools(mcp, api_url: Optional[str] = None):
         if name:
             data["name"] = name
         return _post("index", data)
+
+    @mcp.tool()
+    def rocket_index_status(repo: str = "") -> str:
+        """Check indexing status for a repo or all repos.
+        Returns: status (indexing/done/error), duration, symbols/edges count.
+        If repo is omitted, returns status for all repos."""
+        if repo:
+            return _get(f"index/status/{repo}")
+        return _get("index/status")

{onex_cli-1.16.0 → onex_cli-1.16.2/onex_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onex-cli
-Version: 1.16.0
+Version: 1.16.2
 Summary: Official CLI for deploying and managing services on OneXEOS Platform (Windows, macOS, Linux)
 Home-page: https://github.com/onexeos/onex-cli
 Author: OneXEOS Platform Team