@misterhuydo/sentinel 1.4.36 → 1.4.38

package/.cairn/.hint-lock

@@ -1 +1 @@
-2026-03-25T06:47:22.703Z
+2026-03-25T07:20:08.738Z

package/.cairn/session.json

@@ -1,6 +1,6 @@
 {
-  "message": "Auto-checkpoint at 2026-03-25T07:07:44.746Z",
-  "checkpoint_at": "2026-03-25T07:07:44.747Z",
+  "message": "Auto-checkpoint at 2026-03-25T07:35:25.214Z",
+  "checkpoint_at": "2026-03-25T07:35:25.219Z",
   "active_files": [],
   "notes": [],
   "mtime_snapshot": {}

package/package.json

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

package/python/sentinel/fix_engine.py

@@ -29,6 +29,25 @@ _DIFF_BLOCK = re.compile(r"```(?:diff|patch)?\n(.*?)```", re.DOTALL)
 _DIFF_HEADER = re.compile(r"^diff --git|^---\s+\S+|^\+\+\+\s+\S+", re.MULTILINE)
 
 
+def _extract_patch(output: str) -> str | None:
+    """Extract a unified diff patch from Claude's output."""
+    # 1. Prefer a fenced ```diff or ```patch block
+    m = _DIFF_BLOCK.search(output)
+    if m:
+        patch = m.group(1).strip()
+        if _DIFF_HEADER.search(patch):
+            return patch
+
+    # 2. Fall back to raw diff lines anywhere in the output
+    if _DIFF_HEADER.search(output):
+        lines = output.splitlines()
+        for i, line in enumerate(lines):
+            if _DIFF_HEADER.match(line):
+                return "\n".join(lines[i:])
+
+    return None
+
+
 def _build_prompt(event, repo: RepoConfig, log_file, marker: str, stale_markers: list[str] = None, synced_files: list = None) -> str:
     if log_file and log_file.exists():
         ctx = (

package/python/sentinel/main.py

@@ -29,7 +29,7 @@ from .log_parser import parse_all, scan_all_for_markers, ErrorEvent
 from .issue_watcher import scan_issues, mark_done, IssueEvent
 from .repo_router import route
 from .reporter import build_and_send, send_fix_notification, send_failure_notification, send_confirmed_notification, send_regression_notification, send_startup_notification, send_upgrade_notification
-from .notify import notify_fix_blocked
+from .notify import notify_fix_blocked, notify_fix_applied
 from .health_checker import evaluate_repos
 from .state_store import StateStore
 
@@ -183,61 +183,71 @@ async def _handle_issue(event: IssueEvent, cfg_loader: ConfigLoader, store: Stat
         )
         return  # Leave the file so admin can add the header
 
-    patches_dir = Path(sentinel.workspace_dir) / "patches"
-    status, patch_path, marker = generate_fix(event, repo, sentinel, patches_dir, store)
+    try:
+        patches_dir = Path(sentinel.workspace_dir) / "patches"
+        status, patch_path, marker = generate_fix(event, repo, sentinel, patches_dir, store)
+
+        if status != "patch" or patch_path is None:
+            store.record_fix(event.fingerprint, "skipped" if status in ("skip", "needs_human") else "failed",
+                             repo_name=repo.repo_name)
+            # For user-submitted issues: always notify (person is waiting)
+            submitter_uid = getattr(event, "submitter_user_id", "")
+            reason_text = marker if status == "needs_human" else f"Claude Code returned {status.upper()}"
+            notify_fix_blocked(sentinel, event.source, event.message,
+                               reason=reason_text, repo_name=repo.repo_name,
+                               submitter_user_id=submitter_uid)
+            mark_done(event.issue_file)
+            return
 
-    if status != "patch" or patch_path is None:
-        store.record_fix(event.fingerprint, "skipped" if status in ("skip", "needs_human") else "failed",
-                         repo_name=repo.repo_name)
-        # For user-submitted issues: always notify (person is waiting)
-        submitter_uid = getattr(event, "submitter_user_id", "")
-        reason_text = marker if status == "needs_human" else f"Claude Code returned {status.upper()}"
-        notify_fix_blocked(sentinel, event.source, event.message,
-                           reason=reason_text, repo_name=repo.repo_name,
-                           submitter_user_id=submitter_uid)
-        mark_done(event.issue_file)
-        return
+        commit_status, commit_hash = apply_and_commit(event, patch_path, repo, sentinel)
+        if commit_status != "committed":
+            store.record_fix(event.fingerprint, "failed", repo_name=repo.repo_name)
+            submitter_uid = getattr(event, "submitter_user_id", "")
+            notify_fix_blocked(sentinel, event.source, event.message,
+                               reason="Patch was generated but commit/tests failed",
+                               repo_name=repo.repo_name,
+                               submitter_user_id=submitter_uid)
+            mark_done(event.issue_file)
+            return
 
-    commit_status, commit_hash = apply_and_commit(event, patch_path, repo, sentinel)
-    if commit_status != "committed":
-        store.record_fix(event.fingerprint, "failed", repo_name=repo.repo_name)
+        branch, pr_url = publish(event, repo, sentinel, commit_hash)
+        store.record_fix(
+            event.fingerprint,
+            "applied" if repo.auto_publish else "pending",
+            patch_path=str(patch_path),
+            commit_hash=commit_hash,
+            branch=branch,
+            pr_url=pr_url,
+            repo_name=repo.repo_name,
+            sentinel_marker=marker,
+        )
+        send_fix_notification(sentinel, {
+            "source":       event.source,
+            "severity":     "ERROR",
+            "fingerprint":  event.fingerprint,
+            "first_seen":   event.timestamp,
+            "message":      event.message,
+            "stack_trace":  event.body,
+            "repo_name":    repo.repo_name,
+            "commit_hash":  commit_hash,
+            "branch":       branch,
+            "pr_url":       pr_url,
+            "auto_publish": repo.auto_publish,
+            "files_changed": [],
+        })
         submitter_uid = getattr(event, "submitter_user_id", "")
-        notify_fix_blocked(sentinel, event.source, event.message,
-                           reason="Patch was generated but commit/tests failed",
-                           repo_name=repo.repo_name,
+        notify_fix_applied(sentinel, event.source, event.message,
+                           repo_name=repo.repo_name, branch=branch, pr_url=pr_url,
                            submitter_user_id=submitter_uid)
         mark_done(event.issue_file)
-        return
 
-    branch, pr_url = publish(event, repo, sentinel, commit_hash)
-    store.record_fix(
-        event.fingerprint,
-        "applied" if repo.auto_publish else "pending",
-        patch_path=str(patch_path),
-        commit_hash=commit_hash,
-        branch=branch,
-        pr_url=pr_url,
-        repo_name=repo.repo_name,
-        sentinel_marker=marker,
-    )
-    send_fix_notification(sentinel, {
-        "source":       event.source,
-        "severity":     "ERROR",
-        "fingerprint":  event.fingerprint,
-        "first_seen":   event.timestamp,
-        "message":      event.message,
-        "stack_trace":  event.body,
-        "repo_name":    repo.repo_name,
-        "commit_hash":  commit_hash,
-        "branch":       branch,
-        "pr_url":       pr_url,
-        "auto_publish": repo.auto_publish,
-        "files_changed": [],
-    })
-    mark_done(event.issue_file)
+        if repo.auto_publish:
+            cicd_trigger(repo, store, event.fingerprint)
 
-    if repo.auto_publish:
-        cicd_trigger(repo, store, event.fingerprint)
+    except Exception:
+        logger.exception("Unexpected error processing issue %s — archiving to prevent retry loop", event.source)
+        store.record_fix(event.fingerprint, "failed", repo_name=repo.repo_name)
+        mark_done(event.issue_file)
 
 
 async def poll_cycle(cfg_loader: ConfigLoader, store: StateStore):

package/python/sentinel/notify.py

@@ -228,6 +228,39 @@ def notify_fix_blocked(
         logger.warning("notify_fix_blocked: email notification failed: %s", exc)
 
 
+def notify_fix_applied(
+    cfg,
+    source: str,
+    message: str,
+    repo_name: str,
+    branch: str,
+    pr_url: str,
+    submitter_user_id: str = "",
+) -> None:
+    """
+    DM the submitter (if known) that their issue was fixed.
+    Falls back to posting in the Slack channel if no submitter.
+    """
+    repo_line = f" in *{repo_name}*" if repo_name else ""
+    if pr_url:
+        action_line = f":arrow_right: <{pr_url}|Review PR>"
+    elif branch:
+        action_line = f":arrow_right: Pushed to `{branch}`"
+    else:
+        action_line = ""
+
+    slack_text = (
+        f":white_check_mark: *Fix applied{repo_line}*\n"
+        f"*Issue:* {message[:200]}\n"
+        + (f"{action_line}\n" if action_line else "")
+    ).rstrip()
+
+    if submitter_user_id:
+        slack_dm(cfg.slack_bot_token, submitter_user_id, slack_text)
+    else:
+        slack_alert(cfg.slack_bot_token, cfg.slack_channel, slack_text)
+
+
 def alert_if_rate_limited(
     bot_token: str,
     channel: str,