devops-bot-sdk 1.4.23__tar.gz → 1.4.25__tar.gz

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/PKG-INFO

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

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/devops_bot_sdk.egg-info/PKG-INFO

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

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devops-bot-sdk"
-version = "1.4.23"
+version = "1.4.25"
 description = "DevOps Bot Desktop SDK — thin client for the AgentOS Electron desktop app"
 readme = "README.md"
 license = "LicenseRef-Proprietary"

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/sdk/__init__.py

@@ -1,6 +1,6 @@
 """AgentOS Desktop SDK — thin HTTPS/SSE client for the Electron app.
 
-Version: 1.4.23
+Version: 1.4.25
 
 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.23"
+__version__ = "1.4.25"
 __author__  = "AgentOS"
 
 from sdk.client import BackendClient

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/sdk/client.py

@@ -36,7 +36,7 @@ from sdk.sse import _check_status, stream_with_reconnect
 
 logger = logging.getLogger(__name__)
 
-SDK_VERSION    = "1.4.23"
+SDK_VERSION    = "1.4.25"
 _POLL_INTERVAL = 3.0
 _POLL_TIMEOUT  = 600.0
 _ORCHESTRATE_TIMEOUT      = 2700.0  # 45 min — covers approval wait + VPS execution time

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/sdk/ipc/handlers.py

@@ -1871,13 +1871,23 @@ async def handle_orchestrate_auto_local_run(
                                 ).model_dump())
                                 return
                             continue  # re-run this ticket from phase 1
-                        # Out of retries — leave it in Backlog for a later run.
+                        # Out of retries. The usage/session limit is ACCOUNT-WIDE, so
+                        # every remaining ticket would hit the same wall and burn its
+                        # own retry budget (up to 6h each). Pause the whole run instead
+                        # of marching on — this ticket and the rest stay in To Do/
+                        # Backlog, and `agentos-auto resume` picks them up after reset.
                         await send(Envelope(
                             type="step_update", thread_id=thread_id,
-                            data={"current_step": f"{jira_key}: usage limit — max retries reached, "
-                                                  f"left in Backlog"},
+                            data={"current_step": f"{jira_key}: usage limit — max retries reached; "
+                                                  f"pausing run (resume after the window resets)"},
                         ).model_dump())
-                        break
+                        await send(Envelope(
+                            type=Envelope.TYPE_DONE, thread_id=thread_id,
+                            data={"mode": "orchestrate-auto-local", "status": "paused",
+                                  "reason": "usage_limit", "processed": processed,
+                                  "task_count": total},
+                        ).model_dump())
+                        return
 
                     processed += 1
                     break

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/sdk/local_exec.py

@@ -23,7 +23,7 @@ import os
 import re
 import shutil
 import sys
-from datetime import datetime
+from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Any, Awaitable, Callable
 
@@ -86,9 +86,21 @@ _LIMIT_MARKERS = (
     "usage limit reached", "usage limit", "rate limit", "rate_limit",
     "too many requests", "limit will reset", "limit reached", "overloaded_error",
     "resets at", "429",
+    # Newer Claude Code CLI wording: "You've hit your session limit · resets 10:20pm
+    # (Asia/Karachi)" and "You've hit your usage limit". Without these the message
+    # fell through to the generic-failure path and the auto-loop never waited for
+    # the window to reset — every following ticket hit the same limit and cascaded
+    # to Backlog.
+    "session limit", "you've hit your", "youve hit your",
 )
 # A unix-seconds reset timestamp claude sometimes appends (e.g. "...reached|1719500400").
 _RESET_EPOCH_RE = re.compile(r"\b(1[6-9]\d{8}|20\d{8})\b")
+# A wall-clock reset the CLI prints instead, e.g. "resets 10:20pm (Asia/Karachi)"
+# or "resets at 10pm". Captures hour, optional minutes, am/pm, optional IANA tz.
+_RESET_CLOCK_RE = re.compile(
+    r"reset[s]?\s+(?:at\s+)?(\d{1,2})(?::(\d{2}))?\s*([ap]m)\b(?:\s*\(([^)]+)\))?",
+    re.IGNORECASE,
+)
 # Fallback wait when the limit message carries no reset time (env-tunable).
 _LIMIT_DEFAULT_WAIT_S = _f("AGENTOS_LIMIT_DEFAULT_WAIT_S", 60 * 60.0)   # 1 h
 
@@ -99,7 +111,15 @@ def _is_limit(text: str | None) -> bool:
 
 
 def _parse_reset_epoch(text: str | None) -> int | None:
-    """A unix-seconds reset time embedded in a limit message, if present."""
+    """A unix-seconds reset time embedded in a limit message, if present.
+
+    Handles two shapes the CLI uses:
+      1. A literal unix timestamp (e.g. "...reached|1719500400").
+      2. A wall-clock time (e.g. "resets 10:20pm (Asia/Karachi)") — resolved to
+         the next future occurrence of that time in the named tz (local tz when
+         none/unknown). Returns None when neither is present, so callers fall
+         back to the default wait.
+    """
     if not text:
         return None
     m = _RESET_EPOCH_RE.search(text)
@@ -108,7 +128,33 @@ def _parse_reset_epoch(text: str | None) -> int | None:
             return int(m.group(1))
         except ValueError:
             return None
-    return None
+    return _parse_reset_clock(text)
+
+
+def _parse_reset_clock(text: str) -> int | None:
+    """Resolve a 'resets 10:20pm (Asia/Karachi)'-style reset to a unix epoch."""
+    m = _RESET_CLOCK_RE.search(text)
+    if not m:
+        return None
+    try:
+        hour = int(m.group(1)) % 12          # 12am → 0, 12pm → 0 (+12 below)
+        minute = int(m.group(2) or 0)
+        if m.group(3).lower() == "pm":
+            hour += 12
+        tz = None
+        if m.group(4):
+            try:
+                from zoneinfo import ZoneInfo
+                tz = ZoneInfo(m.group(4).strip())
+            except Exception:  # noqa: BLE001 — unknown tz → local time
+                tz = None
+        now = datetime.now(tz)
+        target = now.replace(hour=hour, minute=minute, second=0, microsecond=0)
+        if target <= now:                    # already passed today → next day
+            target += timedelta(days=1)
+        return int(target.timestamp())
+    except Exception:  # noqa: BLE001 — never let reset parsing break limit handling
+        return None
 
 
 # ── Per-run claude log file (on the user's machine, local-timezone stamps) ──

{devops_bot_sdk-1.4.23 → devops_bot_sdk-1.4.25}/sdk/updater.py

@@ -184,11 +184,18 @@ def _fetch_github_token() -> str | None:
 # ── Core update logic ─────────────────────────────────────────────────────────
 
 def _install_candidates() -> list[str]:
-    """Ordered pip targets: detected URL → SSH → token-HTTPS branch → PyPI dist."""
-    cands = list(_unique([_detect_install_url(), _GITHUB_SSH]))
+    """Ordered pip targets: SSH (default) → detected URL → token-HTTPS branch → PyPI dist.
+
+    SSH is tried FIRST on every platform (Windows + Linux) so the normal upgrade
+    path uses the user's git SSH key — no token required. HTTPS-with-token is only
+    a fallback for boxes that have no SSH key configured.
+    """
+    branch = _sdk_branch()
+    ssh_branch = f"{_GITHUB_SSH}@{branch}"  # honour AGENTOS_SDK_BRANCH (default 'main')
+    cands = list(_unique([ssh_branch, _GITHUB_SSH, _detect_install_url()]))
     gh_token = _fetch_github_token()
     if gh_token:
-        cands.append(f"git+https://{gh_token}@github.com/{_GITHUB_REPO}.git@{_sdk_branch()}")
+        cands.append(f"git+https://{gh_token}@github.com/{_GITHUB_REPO}.git@{branch}")
     cands.append(_DIST)
     return cands