@misterhuydo/sentinel 1.0.5 → 1.0.9

package/python/sentinel/state_store.py

@@ -1,164 +1,275 @@
-"""
-state_store.py — SQLite-backed persistence for errors, fixes, and reports.
-"""
-
-import json
-import sqlite3
-import logging
-from contextlib import contextmanager
-from datetime import datetime, timezone
-
-logger = logging.getLogger(__name__)
-
-
-def _now() -> str:
-    return datetime.now(timezone.utc).isoformat()
-
-
-class StateStore:
-    def __init__(self, db_path: str = "./sentinel.db"):
-        self.db_path = db_path
-        self._init_db()
-
-    @contextmanager
-    def _conn(self):
-        conn = sqlite3.connect(self.db_path)
-        conn.row_factory = sqlite3.Row
-        try:
-            yield conn
-            conn.commit()
-        finally:
-            conn.close()
-
-    def _init_db(self):
-        with self._conn() as conn:
-            conn.executescript("""
-                CREATE TABLE IF NOT EXISTS errors (
-                    fingerprint   TEXT PRIMARY KEY,
-                    first_seen    TEXT NOT NULL,
-                    last_seen     TEXT NOT NULL,
-                    count         INTEGER NOT NULL DEFAULT 1,
-                    source        TEXT,
-                    message       TEXT
-                );
-
-                CREATE TABLE IF NOT EXISTS fixes (
-                    id            INTEGER PRIMARY KEY AUTOINCREMENT,
-                    fingerprint   TEXT NOT NULL,
-                    status        TEXT NOT NULL,   -- pending|applied|failed|skipped
-                    patch_path    TEXT,
-                    commit_hash   TEXT,
-                    branch        TEXT,
-                    pr_url        TEXT,
-                    repo_name     TEXT,
-                    timestamp     TEXT NOT NULL
-                );
-
-                CREATE TABLE IF NOT EXISTS reports (
-                    id              INTEGER PRIMARY KEY AUTOINCREMENT,
-                    sent_at         TEXT NOT NULL,
-                    recipient_count INTEGER NOT NULL DEFAULT 0,
-                    summary_json    TEXT
-                );
-            """)
-        logger.debug("StateStore initialised at %s", self.db_path)
-
-    # ── Errors ────────────────────────────────────────────────────────────────
-
-    def seen(self, fingerprint: str) -> bool:
-        with self._conn() as conn:
-            row = conn.execute(
-                "SELECT fingerprint FROM errors WHERE fingerprint = ?", (fingerprint,)
-            ).fetchone()
-            return row is not None
-
-    def record_error(self, fingerprint: str, source: str, message: str):
-        now = _now()
-        with self._conn() as conn:
-            existing = conn.execute(
-                "SELECT count FROM errors WHERE fingerprint = ?", (fingerprint,)
-            ).fetchone()
-            if existing:
-                conn.execute(
-                    "UPDATE errors SET last_seen=?, count=count+1 WHERE fingerprint=?",
-                    (now, fingerprint),
-                )
-            else:
-                conn.execute(
-                    "INSERT INTO errors (fingerprint, first_seen, last_seen, count, source, message) "
-                    "VALUES (?, ?, ?, 1, ?, ?)",
-                    (fingerprint, now, now, source, message),
-                )
-
-    def get_recent_errors(self, hours: int = 6) -> list[dict]:
-        with self._conn() as conn:
-            rows = conn.execute(
-                "SELECT * FROM errors WHERE last_seen >= datetime('now', ? || ' hours') "
-                "ORDER BY last_seen DESC",
-                (f"-{hours}",),
-            ).fetchall()
-            return [dict(r) for r in rows]
-
-    # ── Fixes ─────────────────────────────────────────────────────────────────
-
-    def record_fix(
-        self,
-        fingerprint: str,
-        status: str,
-        patch_path: str = "",
-        commit_hash: str = "",
-        branch: str = "",
-        pr_url: str = "",
-        repo_name: str = "",
-    ):
-        with self._conn() as conn:
-            conn.execute(
-                "INSERT INTO fixes (fingerprint, status, patch_path, commit_hash, branch, pr_url, repo_name, timestamp) "
-                "VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-                (fingerprint, status, patch_path, commit_hash, branch, pr_url, repo_name, _now()),
-            )
-
-    def get_open_prs(self) -> list[dict]:
-        """Returns fixes pushed as PRs that have not yet been merged (no commit_hash on main)."""
-        with self._conn() as conn:
-            rows = conn.execute(
-                "SELECT * FROM fixes WHERE status='pending' AND pr_url != '' "
-                "ORDER BY timestamp DESC"
-            ).fetchall()
-            return [dict(r) for r in rows]
-
-    def get_recent_fixes(self, hours: int = 6) -> list[dict]:
-        with self._conn() as conn:
-            rows = conn.execute(
-                "SELECT * FROM fixes WHERE timestamp >= datetime('now', ? || ' hours') "
-                "ORDER BY timestamp DESC",
-                (f"-{hours}",),
-            ).fetchall()
-            return [dict(r) for r in rows]
-
-    def fix_attempted_recently(self, fingerprint: str, hours: int = 24) -> bool:
-        with self._conn() as conn:
-            row = conn.execute(
-                "SELECT id FROM fixes WHERE fingerprint=? "
-                "AND timestamp >= datetime('now', ? || ' hours')",
-                (fingerprint, f"-{hours}"),
-            ).fetchone()
-            return row is not None
-
-    # ── Reports ───────────────────────────────────────────────────────────────
-
-    def record_report(self, recipient_count: int, summary: dict):
-        with self._conn() as conn:
-            conn.execute(
-                "INSERT INTO reports (sent_at, recipient_count, summary_json) VALUES (?, ?, ?)",
-                (_now(), recipient_count, json.dumps(summary)),
-            )
-
-    def last_report_time(self) -> datetime | None:
-        with self._conn() as conn:
-            row = conn.execute(
-                "SELECT sent_at FROM reports ORDER BY sent_at DESC LIMIT 1"
-            ).fetchone()
-            if row:
-                return datetime.fromisoformat(row["sent_at"])
-            return None
+"""
+state_store.py — SQLite-backed persistence for errors, fixes, and reports.
+"""
+
+import json
+import sqlite3
+import logging
+from contextlib import contextmanager
+from datetime import datetime, timezone
+
+logger = logging.getLogger(__name__)
+
+
+def _now() -> str:
+    return datetime.now(timezone.utc).isoformat()
+
+
+class StateStore:
+    def __init__(self, db_path: str = "./sentinel.db"):
+        self.db_path = db_path
+        self._init_db()
+
+    @contextmanager
+    def _conn(self):
+        conn = sqlite3.connect(self.db_path)
+        conn.row_factory = sqlite3.Row
+        try:
+            yield conn
+            conn.commit()
+        finally:
+            conn.close()
+
+    def _init_db(self):
+        with self._conn() as conn:
+            conn.executescript("""
+                CREATE TABLE IF NOT EXISTS errors (
+                    fingerprint   TEXT PRIMARY KEY,
+                    first_seen    TEXT NOT NULL,
+                    last_seen     TEXT NOT NULL,
+                    count         INTEGER NOT NULL DEFAULT 1,
+                    source        TEXT,
+                    message       TEXT
+                );
+
+                CREATE TABLE IF NOT EXISTS fixes (
+                    id              INTEGER PRIMARY KEY AUTOINCREMENT,
+                    fingerprint     TEXT NOT NULL,
+                    status          TEXT NOT NULL,   -- pending|applied|failed|skipped
+                    patch_path      TEXT,
+                    commit_hash     TEXT,
+                    branch          TEXT,
+                    pr_url          TEXT,
+                    repo_name       TEXT,
+                    timestamp       TEXT NOT NULL,
+                    sentinel_marker TEXT,            -- SENTINEL:#<fingerprint> injected into fix
+                    marker_seen_at  TEXT,            -- when marker was first seen in production logs
+                    confirmed_at    TEXT,            -- set after quiet period with no recurrence
+                    fix_outcome     TEXT             -- confirmed | regressed
+                );
+
+                -- Migration: add columns if upgrading from older schema
+                CREATE TABLE IF NOT EXISTS _sentinel_migrations (name TEXT PRIMARY KEY);
+
+                CREATE TABLE IF NOT EXISTS reports (
+                    id              INTEGER PRIMARY KEY AUTOINCREMENT,
+                    sent_at         TEXT NOT NULL,
+                    recipient_count INTEGER NOT NULL DEFAULT 0,
+                    summary_json    TEXT
+                );
+            """)
+        self._migrate()
+        logger.debug("StateStore initialised at %s", self.db_path)
+
+    def _migrate(self):
+        """Add new columns to existing DBs without breaking old installs."""
+        migrations = [
+            ("add_sentinel_marker",  "ALTER TABLE fixes ADD COLUMN sentinel_marker TEXT"),
+            ("add_confirmed_at",     "ALTER TABLE fixes ADD COLUMN confirmed_at TEXT"),
+            ("add_fix_outcome",      "ALTER TABLE fixes ADD COLUMN fix_outcome TEXT"),
+            ("add_marker_seen_at",   "ALTER TABLE fixes ADD COLUMN marker_seen_at TEXT"),
+        ]
+        with self._conn() as conn:
+            done = {r[0] for r in conn.execute("SELECT name FROM _sentinel_migrations").fetchall()}
+            for name, sql in migrations:
+                if name not in done:
+                    try:
+                        conn.execute(sql)
+                        conn.execute("INSERT INTO _sentinel_migrations VALUES (?)", (name,))
+                        logger.debug("Migration applied: %s", name)
+                    except Exception:
+                        pass  # column may already exist
+
+    # ── Errors ────────────────────────────────────────────────────────────────
+
+    def seen(self, fingerprint: str) -> bool:
+        with self._conn() as conn:
+            row = conn.execute(
+                "SELECT fingerprint FROM errors WHERE fingerprint = ?", (fingerprint,)
+            ).fetchone()
+            return row is not None
+
+    def record_error(self, fingerprint: str, source: str, message: str):
+        now = _now()
+        with self._conn() as conn:
+            existing = conn.execute(
+                "SELECT count FROM errors WHERE fingerprint = ?", (fingerprint,)
+            ).fetchone()
+            if existing:
+                conn.execute(
+                    "UPDATE errors SET last_seen=?, count=count+1 WHERE fingerprint=?",
+                    (now, fingerprint),
+                )
+            else:
+                conn.execute(
+                    "INSERT INTO errors (fingerprint, first_seen, last_seen, count, source, message) "
+                    "VALUES (?, ?, ?, 1, ?, ?)",
+                    (fingerprint, now, now, source, message),
+                )
+
+    def get_recent_errors(self, hours: int = 6) -> list[dict]:
+        with self._conn() as conn:
+            rows = conn.execute(
+                "SELECT * FROM errors WHERE last_seen >= datetime('now', ? || ' hours') "
+                "ORDER BY last_seen DESC",
+                (f"-{hours}",),
+            ).fetchall()
+            return [dict(r) for r in rows]
+
+    # ── Fixes ─────────────────────────────────────────────────────────────────
+
+    def record_fix(
+        self,
+        fingerprint: str,
+        status: str,
+        patch_path: str = "",
+        commit_hash: str = "",
+        branch: str = "",
+        pr_url: str = "",
+        repo_name: str = "",
+        sentinel_marker: str = "",
+    ):
+        with self._conn() as conn:
+            conn.execute(
+                "INSERT INTO fixes (fingerprint, status, patch_path, commit_hash, branch, "
+                "pr_url, repo_name, timestamp, sentinel_marker) "
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                (fingerprint, status, patch_path, commit_hash, branch,
+                 pr_url, repo_name, _now(), sentinel_marker or None),
+            )
+
+    def get_open_prs(self) -> list[dict]:
+        """Returns fixes pushed as PRs that have not yet been merged (no commit_hash on main)."""
+        with self._conn() as conn:
+            rows = conn.execute(
+                "SELECT * FROM fixes WHERE status='pending' AND pr_url != '' "
+                "ORDER BY timestamp DESC"
+            ).fetchall()
+            return [dict(r) for r in rows]
+
+    def get_recent_fixes(self, hours: int = 6) -> list[dict]:
+        with self._conn() as conn:
+            rows = conn.execute(
+                "SELECT * FROM fixes WHERE timestamp >= datetime('now', ? || ' hours') "
+                "ORDER BY timestamp DESC",
+                (f"-{hours}",),
+            ).fetchall()
+            return [dict(r) for r in rows]
+
+    def fix_attempted_recently(self, fingerprint: str, hours: int = 24) -> bool:
+        with self._conn() as conn:
+            row = conn.execute(
+                "SELECT id FROM fixes WHERE fingerprint=? "
+                "AND timestamp >= datetime('now', ? || ' hours')",
+                (fingerprint, f"-{hours}"),
+            ).fetchone()
+            return row is not None
+
+    def mark_marker_seen(self, marker: str) -> dict | None:
+        """Record that a SENTINEL marker appeared in production logs."""
+        with self._conn() as conn:
+            row = conn.execute(
+                "SELECT * FROM fixes WHERE sentinel_marker=? AND marker_seen_at IS NULL",
+                (marker,),
+            ).fetchone()
+            if not row:
+                return None
+            conn.execute(
+                "UPDATE fixes SET marker_seen_at=? WHERE sentinel_marker=?",
+                (_now(), marker),
+            )
+            return dict(row)
+
+    def get_fixes_pending_confirmation(self, quiet_hours: int = 24) -> list[dict]:
+        """Return fixes whose marker was seen >= quiet_hours ago and are not yet confirmed/regressed."""
+        with self._conn() as conn:
+            rows = conn.execute(
+                "SELECT * FROM fixes WHERE marker_seen_at IS NOT NULL "
+                "AND confirmed_at IS NULL AND fix_outcome IS NULL "
+                "AND marker_seen_at <= datetime('now', ? || ' hours')",
+                (f"-{quiet_hours}",),
+            ).fetchall()
+            return [dict(r) for r in rows]
+
+    def confirm_fix(self, fingerprint: str) -> dict | None:
+        """Confirm a fix after quiet period — no recurrence observed."""
+        with self._conn() as conn:
+            row = conn.execute(
+                "SELECT * FROM fixes WHERE fingerprint=? AND marker_seen_at IS NOT NULL "
+                "AND confirmed_at IS NULL AND fix_outcome IS NULL",
+                (fingerprint,),
+            ).fetchone()
+            if not row:
+                return None
+            conn.execute(
+                "UPDATE fixes SET confirmed_at=?, fix_outcome='confirmed' WHERE fingerprint=?",
+                (_now(), fingerprint),
+            )
+            return dict(row)
+
+    def mark_regressed(self, fingerprint: str):
+        """Mark fix as regressed — error recurred after marker was seen."""
+        with self._conn() as conn:
+            conn.execute(
+                "UPDATE fixes SET fix_outcome='regressed' "
+                "WHERE fingerprint=? AND fix_outcome IS NULL AND marker_seen_at IS NOT NULL",
+                (fingerprint,),
+            )
+
+    def get_confirmed_fix(self, fingerprint: str) -> dict | None:
+        """Return a confirmed (not yet regressed) fix for this fingerprint."""
+        with self._conn() as conn:
+            row = conn.execute(
+                "SELECT * FROM fixes WHERE fingerprint=? AND fix_outcome='confirmed'",
+                (fingerprint,),
+            ).fetchone()
+            return dict(row) if row else None
+
+    def get_marker_seen_fix(self, fingerprint: str) -> dict | None:
+        """Return a fix for this fingerprint where marker was seen but not yet confirmed."""
+        with self._conn() as conn:
+            row = conn.execute(
+                "SELECT * FROM fixes WHERE fingerprint=? "
+                "AND marker_seen_at IS NOT NULL AND fix_outcome IS NULL",
+                (fingerprint,),
+            ).fetchone()
+            return dict(row) if row else None
+
+    def get_stale_markers(self, repo_name: str) -> list[str]:
+        """Return markers for confirmed/regressed fixes in a repo — safe to remove from code."""
+        with self._conn() as conn:
+            rows = conn.execute(
+                "SELECT sentinel_marker FROM fixes "
+                "WHERE repo_name=? AND fix_outcome IN ('confirmed', 'regressed') "
+                "AND sentinel_marker IS NOT NULL",
+                (repo_name,),
+            ).fetchall()
+            return [r[0] for r in rows]
+
+        # ── Reports ───────────────────────────────────────────────────────────────
+
+    def record_report(self, recipient_count: int, summary: dict):
+        with self._conn() as conn:
+            conn.execute(
+                "INSERT INTO reports (sent_at, recipient_count, summary_json) VALUES (?, ?, ?)",
+                (_now(), recipient_count, json.dumps(summary)),
+            )
+
+    def last_report_time(self) -> datetime | None:
+        with self._conn() as conn:
+            row = conn.execute(
+                "SELECT sent_at FROM reports ORDER BY sent_at DESC LIMIT 1"
+            ).fetchone()
+            if row:
+                return datetime.fromisoformat(row["sent_at"])
+            return None

package/templates/sentinel.properties

@@ -1,32 +1,20 @@
-# Sentinel master config
-
-# Schedule
-POLL_INTERVAL_SECONDS=120
-
-# Email reporting
-SMTP_HOST=smtp.gmail.com
-SMTP_PORT=587
-SMTP_USER=sentinel@yourdomain.com
-SMTP_PASSWORD=<app-password>
-MAILS=huy@yourdomain.com
-SEND_HEALTH=disabled
-REPORT_INTERVAL_HOURS=1
-
-# State DB
-STATE_DB=./sentinel.db
-
-# Workspace
-WORKSPACE_DIR=./workspace
-
-# Claude Code binary path
-CLAUDE_CODE_BIN=claude
-
-# GitHub token (required for opening PRs when AUTO_PUBLISH=false)
-GITHUB_TOKEN=<github-pat>
-
-# Fix confidence threshold (0.0 - 1.0); fixes below this are skipped
-FIX_CONFIDENCE_THRESHOLD=0.7
-
-# Rolling log retention window — fetched logs older than this are pruned
-# Claude Code reads the full window for context when generating fixes
-LOG_RETENTION_HOURS=48
+# Sentinel project config — project-specific settings.
+# Shared settings (SMTP, schedule, etc.) live in the workspace-level sentinel.properties
+# one directory above this project. Values here override workspace defaults.
+
+# Who receives fix notifications and health reports for this project
+MAILS=you@yourdomain.com
+
+# Health digest — disabled by default; per-fix emails are always sent
+SEND_HEALTH=disabled
+REPORT_INTERVAL_HOURS=1
+
+# GitHub token for opening PRs (required when AUTO_PUBLISH=false)
+GITHUB_TOKEN=<github-pat>
+
+# State DB and workspace paths (relative to this project dir)
+STATE_DB=./sentinel.db
+WORKSPACE_DIR=./workspace
+
+# Claude Code auth — set if using API key, leave blank for OAuth
+# ANTHROPIC_API_KEY=sk-ant-...

package/templates/workspace-sentinel.properties

@@ -0,0 +1,20 @@
+# Sentinel workspace config — shared across all projects in this workspace.
+# Per-project sentinel.properties can override any of these.
+
+# Schedule
+POLL_INTERVAL_SECONDS=120
+
+# SMTP — configure once here, all projects share it
+SMTP_HOST=smtp.gmail.com
+SMTP_PORT=587
+SMTP_USER=sentinel@yourdomain.com
+SMTP_PASSWORD=<app-password>
+
+# Fix confidence threshold (0.0 - 1.0)
+FIX_CONFIDENCE_THRESHOLD=0.7
+
+# Rolling log retention window (hours)
+LOG_RETENTION_HOURS=48
+
+# Claude Code binary path
+CLAUDE_CODE_BIN=claude