@misterhuydo/sentinel 1.6.15 → 1.6.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@misterhuydo/sentinel",
-  "version": "1.6.15",
+  "version": "1.6.16",
   "description": "Sentinel — Autonomous DevOps Agent installer and manager",
   "bin": {
     "sentinel": "./bin/sentinel.js"

package/python/sentinel/__init__.py

@@ -1 +1 @@
-__version__ = "1.6.15"
+__version__ = "1.6.16"

package/python/sentinel/main.py

@@ -61,6 +61,27 @@ def _project_lock(project_name: str) -> "asyncio.Lock":
     return _project_locks[project_name]
 
 
+def _notify_skip(sentinel: SentinelConfig, event: "IssueEvent", reason: str) -> None:
+    """Tell the submitter (and channel) when an issue is skipped via dedupe.
+
+    Without this, Boss's "I'll @-mention you when it completes" promise breaks —
+    the user is left waiting indefinitely after a silent skip.
+    """
+    from .notify import slack_alert as _alert
+    submitter = getattr(event, "submitter_user_id", "")
+    channel = getattr(event, "origin_channel", "") or sentinel.slack_channel
+    if not channel or not sentinel.slack_bot_token:
+        return
+    mention = f"<@{submitter}> " if submitter else ""
+    _alert(
+        sentinel.slack_bot_token, channel,
+        f":fast_forward: {mention}*Issue skipped* — fingerprint `{event.fingerprint[:8]}`. "
+        f"{reason}. To force a new attempt, use `retry_issue` (it clears prior `failed` rows). "
+        f"If a successful fix already shipped for this fingerprint, the retry will still skip "
+        f"unless an admin clears the `applied` row.",
+    )
+
+
 def _restart_via_execv() -> None:
     """Re-exec the current process, preserving the original `python -m sentinel.main` invocation.
 
@@ -582,6 +603,7 @@ async def _handle_issue(event: IssueEvent, cfg_loader: ConfigLoader, store: Stat
             "(use Boss `retry_issue` to clear the prior row and re-attempt)",
             event.source, event.fingerprint,
         )
+        _notify_skip(sentinel, event, "An attempt was already made in the last 24h")
         mark_done(event.issue_file)
         return
 
@@ -643,6 +665,7 @@ async def _handle_issue_locked(event, repo, cfg_loader, store):
             "Issue %s skipped (post-lock recheck) — fingerprint %s already attempted",
             event.source, event.fingerprint,
         )
+        _notify_skip(sentinel, event, "Another worker already attempted this in the last 24h")
         mark_done(event.issue_file)
         return None
 

package/python/sentinel/sentinel_boss.py

@@ -2603,25 +2603,37 @@ async def _run_tool(name: str, inputs: dict, cfg_loader, store, slack_client=Non
         if store:
             try:
                 with store._conn() as _c:
-                    _row = _c.execute(
-                        "SELECT status, pr_url, commit_hash FROM fixes "
-                        "WHERE fingerprint=? ORDER BY timestamp DESC LIMIT 1",
+                    # Check for a successful fix in the last 24h FIRST. We can't
+                    # use ORDER BY timestamp DESC LIMIT 1 because a spurious
+                    # 'failed' row inserted by a post-success exception (see
+                    # the catch-all in main.py) sorts ahead of the real
+                    # 'applied' row by milliseconds, hiding the success.
+                    _applied = _c.execute(
+                        "SELECT status, commit_hash FROM fixes "
+                        "WHERE fingerprint=? AND status IN ('applied', 'merged') "
+                        "AND timestamp >= datetime('now', '-24 hours') "
+                        "ORDER BY timestamp DESC LIMIT 1",
                         (_fp,),
                     ).fetchone()
-                if _row:
-                    _status = _row["status"]
-                    if _status in ("merged", "applied"):
-                        _commit = _row["commit_hash"] or ""
+                    if _applied:
+                        _commit = _applied["commit_hash"] or ""
                         return json.dumps({
                             "error": (
                                 f"Already fixed — this issue was resolved "
                                 + (f"in commit `{_commit[:8]}`" if _commit else "successfully")
-                                + f". Status: `{_status}`. "
+                                + f". Status: `{_applied['status']}`. "
                                 f"If the problem recurred, describe it as a new issue."
                             )
                         })
-                    if _status == "pending":
-                        _pr = _row["pr_url"] or ""
+                    _pending = _c.execute(
+                        "SELECT pr_url FROM fixes "
+                        "WHERE fingerprint=? AND status='pending' "
+                        "AND timestamp >= datetime('now', '-24 hours') "
+                        "ORDER BY timestamp DESC LIMIT 1",
+                        (_fp,),
+                    ).fetchone()
+                    if _pending:
+                        _pr = _pending["pr_url"] or ""
                         return json.dumps({
                             "error": (
                                 f"There is already an open PR for this issue"