@misterhuydo/sentinel 1.4.88 → 1.4.89

package/.cairn/.hint-lock

@@ -1 +1 @@
-2026-03-27T05:10:33.256Z
+2026-03-27T05:41:33.700Z

package/.cairn/session.json

@@ -1,6 +1,6 @@
 {
-  "message": "Auto-checkpoint at 2026-03-27T05:16:34.970Z",
-  "checkpoint_at": "2026-03-27T05:16:34.971Z",
+  "message": "Auto-checkpoint at 2026-03-27T05:38:58.308Z",
+  "checkpoint_at": "2026-03-27T05:38:58.309Z",
   "active_files": [],
   "notes": [],
   "mtime_snapshot": {}

package/package.json

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

package/python/sentinel/issue_watcher.py

@@ -52,7 +52,9 @@ class IssueEvent:
 
     def __post_init__(self):
         if not self.fingerprint:
-            raw = f"issue:{self.source}:{self.message[:200]}"
+            # Use target_repo + message (not filename) so retries of the same
+            # issue share the same fingerprint — enables cooldown dedup.
+            raw = f"issue:{self.target_repo}:{self.message[:200]}"
             self.fingerprint = hashlib.sha1(raw.encode()).hexdigest()[:16]
         if not self.submitter_user_id:
             import re as _re

package/python/sentinel/sentinel_boss.py

@@ -1790,7 +1790,63 @@ async def _run_tool(name: str, inputs: dict, cfg_loader, store, slack_client=Non
         source_file = candidates[0]
         content     = source_file.read_text(encoding="utf-8", errors="replace")
 
-        # Re-submit as a fresh issue file (new name = new fingerprint = no cooldown block)
+        # ── Guard: refuse if state_store shows this issue already fixed/pending ──
+        # Compute the content-based fingerprint (same formula as IssueEvent.__post_init__)
+        import hashlib as _hashlib
+        _target_repo = ""
+        _message     = ""
+        _body_lines  = []
+        _in_body     = False
+        _META_UPPER  = ("TARGET_REPO:", "SUBMITTED_BY:", "SUBMITTED_AT:", "SUPPORT_URL:")
+        for _line in content.splitlines():
+            _s = _line.strip()
+            if not _in_body:
+                if _s.upper().startswith("TARGET_REPO"):
+                    _target_repo = _s.split(":", 1)[-1].split("=", 1)[-1].strip()
+                elif any(_s.upper().startswith(_p) for _p in _META_UPPER) or not _s:
+                    pass
+                else:
+                    _in_body = True
+                    _body_lines.append(_line)
+            else:
+                _body_lines.append(_line)
+        _message = next((l.strip() for l in _body_lines if l.strip()), source_file.name)
+        _fp_raw  = f"issue:{_target_repo}:{_message[:200]}"
+        _fp      = _hashlib.sha1(_fp_raw.encode()).hexdigest()[:16]
+
+        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",
+                        (_fp,),
+                    ).fetchone()
+                if _row:
+                    _status = _row["status"]
+                    if _status in ("merged", "applied"):
+                        _commit = _row["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"If the problem recurred, describe it as a new issue."
+                            )
+                        })
+                    if _status == "pending":
+                        _pr = _row["pr_url"] or ""
+                        return json.dumps({
+                            "error": (
+                                f"There is already an open PR for this issue"
+                                + (f": {_pr}" if _pr else "")
+                                + ". Merge or close it before retrying."
+                            )
+                        })
+            except Exception as _e:
+                logger.debug("retry_issue: state_store guard failed (non-fatal): %s", _e)
+
+        # Re-submit as a fresh issue file
         issues_dir = project_dir / "issues"
         issues_dir.mkdir(exist_ok=True)
         fname = f"retry-{source_file.stem[-8:]}-{uuid.uuid4().hex[:6]}.txt"