devops-bot-sdk 1.4.145__tar.gz → 1.4.146__tar.gz

{devops_bot_sdk-1.4.145 → devops_bot_sdk-1.4.146}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devops-bot-sdk
-Version: 1.4.145
+Version: 1.4.146
 Summary: DevOps Bot Desktop SDK — thin client for the AgentOS Electron desktop app
 Author: noumanaziz2128
 License-Expression: LicenseRef-Proprietary

{devops_bot_sdk-1.4.145 → devops_bot_sdk-1.4.146}/devops_bot_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devops-bot-sdk
-Version: 1.4.145
+Version: 1.4.146
 Summary: DevOps Bot Desktop SDK — thin client for the AgentOS Electron desktop app
 Author: noumanaziz2128
 License-Expression: LicenseRef-Proprietary

{devops_bot_sdk-1.4.145 → devops_bot_sdk-1.4.146}/sdk/__init__.py

@@ -1,6 +1,6 @@
 """AgentOS Desktop SDK — thin HTTPS/SSE client for the Electron app.
 
-Version: 1.4.145
+Version: 1.4.146
 
 Public surface:
   BackendClient.from_config()        — create client from ~/.agentos/config.toml
@@ -30,7 +30,7 @@ Rules:
   - All data egress through submit_webhook only
 """
 
-__version__ = "1.4.145"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
+__version__ = "1.4.146"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
 __author__  = "AgentOS"   # sdk.client.SDK_VERSION and the UI server version all read this.
 
 from sdk.client import BackendClient

{devops_bot_sdk-1.4.145 → devops_bot_sdk-1.4.146}/sdk/agents/inventory.py

@@ -11,7 +11,6 @@ from __future__ import annotations
 
 import json
 import logging
-import shutil
 import subprocess
 from pathlib import Path
 
@@ -70,7 +69,8 @@ def _connectors() -> list[dict]:
 
 def _mcp_servers() -> list[dict]:
     """Installed MCP servers / Claude plugins, parsed from ``claude mcp list``."""
-    cli = shutil.which("claude")
+    from sdk.local_exec import claude_cli_path
+    cli = claude_cli_path()
     if not cli:
         return []
     try:

{devops_bot_sdk-1.4.145 → devops_bot_sdk-1.4.146}/sdk/local_exec.py

@@ -22,6 +22,7 @@ import json
 import os
 import re
 import shutil
+import subprocess
 import sys
 from datetime import datetime, timedelta
 from pathlib import Path
@@ -240,7 +241,21 @@ EventHandler = Callable[[dict], Awaitable[None]]
 
 
 def claude_cli_path() -> str | None:
-    """Absolute path to the `claude` CLI if installed on PATH, else None."""
+    """Absolute path to the `claude` CLI, or None if it isn't on PATH.
+
+    Resolution order:
+      1. ``AGENTOS_CLAUDE_CLI`` env var — explicit path override (escape hatch for
+         an install in a non-standard location).
+      2. ``PATH`` (``shutil.which``) — cross-platform, no guessing.
+
+    The service must therefore RUN with a PATH that includes the CLI. The install
+    step bakes that in (see ``sdk.ui.service`` — systemd ``Environment=PATH`` /
+    launchd ``EnvironmentVariables``; Windows tasks inherit the user's PATH), so
+    ``engine=claude_code`` works without anyone editing a unit file.
+    """
+    override = os.environ.get("AGENTOS_CLAUDE_CLI", "").strip()
+    if override and Path(override).exists():
+        return override
     return shutil.which("claude")
 
 
@@ -249,6 +264,54 @@ def is_available() -> bool:
     return claude_cli_path() is not None
 
 
+def claude_status(timeout: float = 15.0) -> dict:
+    """Readiness of the local Claude Code CLI: installed AND logged in.
+
+    Runs ``claude auth status`` (which prints structured JSON) so the panel /
+    health surface can show a non-technical operator one clear signal — "connected
+    as you@org" vs "not logged in" — instead of a raw CLI error surfacing only when
+    a job runs. All failures degrade to ``logged_in: False`` with an ``error`` note;
+    this never raises.
+
+    Returns::
+
+        {"installed": bool, "logged_in": bool, "path": str|None,
+         "auth_method": str|None, "email": str|None, "org": str|None,
+         "error": str|None}
+    """
+    cli = claude_cli_path()
+    if not cli:
+        return {"installed": False, "logged_in": False, "path": None,
+                "auth_method": None, "email": None, "org": None,
+                "error": "Claude Code CLI not found. Install it or set AGENTOS_CLAUDE_CLI."}
+    try:
+        proc = subprocess.run([cli, "auth", "status"], capture_output=True,
+                              text=True, timeout=timeout)
+    except Exception as exc:  # noqa: BLE001 — timeout / OSError; never raise to caller
+        return {"installed": True, "logged_in": False, "path": cli, "auth_method": None,
+                "email": None, "org": None, "error": f"`claude auth status` failed: {exc}"}
+
+    out = (proc.stdout or "").strip()
+    try:
+        data = json.loads(out)
+    except Exception:  # noqa: BLE001 — older CLIs may print human text, not JSON
+        logged = "logged in" in out.lower()
+        return {"installed": True, "logged_in": logged, "path": cli, "auth_method": None,
+                "email": None, "org": None,
+                "error": None if logged else ((proc.stderr or out or "not logged in").strip()[:200])}
+
+    logged = bool(data.get("loggedIn"))
+    return {
+        "installed": True,
+        "logged_in": logged,
+        "path": cli,
+        "auth_method": data.get("authMethod"),
+        "email": data.get("email"),
+        "org": data.get("orgName") or data.get("orgId"),
+        "error": None if logged else "Not logged in — run `claude` on the VPS to sign in.",
+    }
+
+
 # Cache the discovered MCP allow-entries for the process lifetime — the set of
 # configured servers doesn't change mid-run, and `claude mcp list` does a network
 # health check (~seconds) we don't want to repeat per ticket.
@@ -396,7 +459,9 @@ async def run_claude_local(
     cli = claude_cli_path()
     if not cli:
         return {
-            "ok": False, "result": "", "error": "claude CLI not found on PATH",
+            "ok": False, "result": "",
+            "error": ("Claude Code CLI not found. Install it, or if it is installed "
+                      "in a non-standard location set AGENTOS_CLAUDE_CLI to its full path."),
             "input_tokens": 0, "output_tokens": 0, "total_tokens": 0,
             "cost_usd": 0.0, "files_changed": [],
         }
@@ -461,6 +526,15 @@ async def run_claude_local(
     # the user's global git config. Tokens stay in the subprocess env only.
     env = dict(os.environ)
 
+    # Make sure the CLI's own directory is on the subprocess PATH: node/gh and the
+    # CLI's sibling tools usually live alongside it, and under a minimal service
+    # PATH they'd otherwise be missing. Prepend the resolved binary's dir only —
+    # no guessing beyond that — so anything the operator exported still wins.
+    _cli_dir = str(Path(cli).resolve().parent)
+    _cur_path = env.get("PATH", "")
+    if _cli_dir not in _cur_path.split(os.pathsep):
+        env["PATH"] = _cli_dir + (os.pathsep + _cur_path if _cur_path else "")
+
     # A custom agent's persisted API keys (sdk.agents.secrets) are overlaid here
     # so they reach the subprocess (and any MCP servers it spawns) WITHOUT ever
     # touching the ambient os.environ of this process — same "subprocess env only"

{devops_bot_sdk-1.4.145 → devops_bot_sdk-1.4.146}/sdk/ui/service.py

@@ -51,6 +51,30 @@ def _systemd_available() -> bool:
     return bool(shutil.which("systemctl")) and Path("/run/systemd/system").exists()
 
 
+def _service_path_env() -> str:
+    """PATH for the service environment.
+
+    A service (systemd/launchd) runs with a minimal PATH that omits ~/.local/bin,
+    nvm/Homebrew, etc. — exactly where the ``claude`` CLI and its node/git/gh
+    runtime live. Prepend the resolved CLI's own directory and ~/.local/bin to the
+    standard system dirs so ``engine=claude_code`` works with no manual PATH edits.
+    """
+    base = ["/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"]
+    extra = [str(Path.home() / ".local" / "bin")]
+    try:
+        from sdk.local_exec import claude_cli_path
+        cli = claude_cli_path()
+        if cli:
+            extra.append(str(Path(cli).resolve().parent))
+    except Exception:  # noqa: BLE001 — discovery must never break install
+        pass
+    ordered: list[str] = []
+    for d in extra + base:
+        if d and d not in ordered:
+            ordered.append(d)
+    return ":".join(ordered)
+
+
 def _unit_text(host: str, port: int, home: str) -> str:
     exec_line = f"{_exe()} --host {host} --port {port} --no-browser"
     return (
@@ -64,6 +88,7 @@ def _unit_text(host: str, port: int, home: str) -> str:
         "Restart=always\n"
         "RestartSec=5\n"
         f"Environment=HOME={home}\n"
+        f"Environment=PATH={_service_path_env()}\n"
         f"WorkingDirectory={home}\n\n"
         "[Install]\n"
         f"WantedBy={{target}}\n"
@@ -145,6 +170,9 @@ def _install_launchd(host: str, port: int) -> tuple[bool, str]:
         f'    <string>{exe}</string><string>--host</string><string>{host}</string>\n'
         f'    <string>--port</string><string>{port}</string><string>--no-browser</string>\n'
         '  </array>\n'
+        '  <key>EnvironmentVariables</key><dict>\n'
+        f'    <key>PATH</key><string>{_service_path_env()}</string>\n'
+        '  </dict>\n'
         '  <key>RunAtLoad</key><true/>\n'
         '  <key>KeepAlive</key><true/>\n'
         '</dict></plist>\n'

{devops_bot_sdk-1.4.145 → devops_bot_sdk-1.4.146}/sdk/ui/setup_manager.py

@@ -64,6 +64,19 @@ def sdk_version() -> str:
         return "unknown"
 
 
+def claude_readiness() -> dict:
+    """Claude Code CLI readiness (installed + logged in) for the /status surface.
+
+    Guarded: any failure degrades to a not-ready dict rather than breaking /status.
+    """
+    try:
+        from sdk.local_exec import claude_status
+        return claude_status()
+    except Exception as exc:  # noqa: BLE001
+        return {"installed": False, "logged_in": False, "path": None,
+                "auth_method": None, "email": None, "org": None, "error": str(exc)}
+
+
 def environment_info() -> dict:
     """Env snapshot for the /status endpoint and setup wizard."""
     vp = running_venv()
@@ -78,6 +91,7 @@ def environment_info() -> dict:
         "expected_agentsystem_root": str(root),
         "agentsystem_exists": root.exists(),
         "sdk_version": sdk_version(),
+        "claude": claude_readiness(),
     }