@misterhuydo/sentinel 1.6.12 → 1.6.13

package/.cairn/.hint-lock

@@ -1 +1 @@
-2026-04-27T13:09:20.340Z
+2026-04-27T17:46:15.506Z

package/.cairn/session.json

@@ -1,6 +1,6 @@
 {
-  "message": "Auto-checkpoint at 2026-04-27T13:29:19.813Z",
-  "checkpoint_at": "2026-04-27T13:29:19.814Z",
+  "message": "Auto-checkpoint at 2026-04-27T17:47:43.806Z",
+  "checkpoint_at": "2026-04-27T17:47:43.808Z",
   "active_files": [
     "J:\\Projects\\Sentinel\\cli\\bin\\sentinel.js",
     "J:\\Projects\\Sentinel\\cli\\lib\\test.js"

package/package.json

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

package/python/sentinel/__init__.py

@@ -1 +1 @@
-__version__ = "1.6.12"
+__version__ = "1.6.13"

package/python/sentinel/git_manager.py

@@ -477,7 +477,7 @@ def apply_and_commit(
         logger.error("git pull failed for %s:\n%s", repo.repo_name, r.stderr)
         return "failed", ""
 
-    r = _git(["apply", "--check", "--recount", "--ignore-whitespace", str(patch_path)], cwd=local_path, env=env)
+    r = _git(["apply", "--check", "--recount", "--ignore-whitespace", "-C1", str(patch_path)], cwd=local_path, env=env)
     if r.returncode != 0:
         try:
             original = patch_path.read_text(encoding="utf-8", errors="replace")
@@ -487,12 +487,12 @@ def apply_and_commit(
             repaired = None
         if repaired and repaired != original:
             patch_path.write_text(repaired, encoding="utf-8")
-            r = _git(["apply", "--check", "--recount", "--ignore-whitespace", str(patch_path)], cwd=local_path, env=env)
+            r = _git(["apply", "--check", "--recount", "--ignore-whitespace", "-C1", str(patch_path)], cwd=local_path, env=env)
         if r.returncode != 0:
             logger.error("Patch dry-run failed for %s:\n%s", event.fingerprint, r.stderr)
             return "failed", ""
 
-    r = _git(["apply", "--recount", "--ignore-whitespace", str(patch_path)], cwd=local_path, env=env)
+    r = _git(["apply", "--recount", "--ignore-whitespace", "-C1", str(patch_path)], cwd=local_path, env=env)
     if r.returncode != 0:
         logger.error("git apply failed for %s:\n%s", event.fingerprint, r.stderr)
         return "failed", ""
@@ -601,7 +601,7 @@ def apply_and_commit_multi(
             dry_run_failures.append(f"{name}: git pull failed: {r.stderr.strip()[:200]}")
             continue
         # Dry-run
-        r = _git(["apply", "--check", "--recount", "--ignore-whitespace", str(sub_path)],
+        r = _git(["apply", "--check", "--recount", "--ignore-whitespace", "-C1", str(sub_path)],
                  cwd=repo.local_path, env=env)
         if r.returncode != 0:
             # Try repairing the patch by splicing in any intermediate file lines
@@ -616,7 +616,7 @@ def apply_and_commit_multi(
             if repaired and repaired != original:
                 sub_path.write_text(repaired, encoding="utf-8")
                 r = _git(
-                    ["apply", "--check", "--recount", "--ignore-whitespace", str(sub_path)],
+                    ["apply", "--check", "--recount", "--ignore-whitespace", "-C1", str(sub_path)],
                     cwd=repo.local_path, env=env,
                 )
                 if r.returncode == 0:
@@ -653,7 +653,7 @@ def apply_and_commit_multi(
             "reason": "", "sub_patch_path": sub_path,
         }
 
-        r = _git(["apply", "--recount", "--ignore-whitespace", str(sub_path)],
+        r = _git(["apply", "--recount", "--ignore-whitespace", "-C1", str(sub_path)],
                  cwd=repo.local_path, env=env)
         if r.returncode != 0:
             entry["reason"] = f"apply failed: {r.stderr.strip()[:200]}"

package/python/sentinel/main.py

@@ -563,7 +563,11 @@ async def _handle_issue(event: IssueEvent, cfg_loader: ConfigLoader, store: Stat
         return
 
     if store.fix_attempted_recently(event.fingerprint, hours=24):
-        logger.debug("Issue already processed recently: %s", event.source)
+        logger.info(
+            "Issue %s skipped — fingerprint %s attempted in last 24h "
+            "(use Boss `retry_issue` to clear the prior row and re-attempt)",
+            event.source, event.fingerprint,
+        )
         mark_done(event.issue_file)
         return
 

package/python/sentinel/sentinel_boss.py

@@ -2632,6 +2632,27 @@ async def _run_tool(name: str, inputs: dict, cfg_loader, store, slack_client=Non
             except Exception as _e:
                 logger.debug("retry_issue: state_store guard failed (non-fatal): %s", _e)
 
+            # Clear the 24h dedupe so _handle_issue actually re-runs the fix.
+            # fix_attempted_recently() ignores status='skipped', so flipping any
+            # recent 'failed' row for this fingerprint is enough.
+            try:
+                with store._conn() as _c:
+                    _n = _c.execute(
+                        "UPDATE fixes SET status='skipped' "
+                        "WHERE fingerprint=? AND status='failed' "
+                        "AND timestamp >= datetime('now', '-24 hours')",
+                        (_fp,),
+                    ).rowcount
+                    _c.commit()
+                if _n:
+                    logger.info(
+                        "Boss retry_issue: cleared %d prior failed row(s) for fingerprint %s "
+                        "so the retry won't be deduped",
+                        _n, _fp,
+                    )
+            except Exception as _e:
+                logger.debug("retry_issue: clearing prior failed rows failed (non-fatal): %s", _e)
+
         # Re-submit as a fresh issue file
         issues_dir = project_dir / "issues"
         issues_dir.mkdir(exist_ok=True)