@misterhuydo/sentinel 1.0.4 → 1.0.6

package/lib/generate.js

@@ -73,7 +73,7 @@ if echo "$AUTH_OUT" | grep -Eqi "not logged in|/login"; then
   exit 1
 fi
 
-mkdir -p "$DIR/logs" "$DIR/workspace/fetched" "$DIR/workspace/patches"
+mkdir -p "$DIR/logs" "$DIR/workspace/fetched" "$DIR/workspace/patches" "$DIR/issues"
 cd "$DIR"
 PYTHONPATH="${codeDir}" "${pythonBin}" -m sentinel.main --config ./config \\
   >> "$DIR/logs/sentinel.log" 2>&1 &
@@ -109,17 +109,36 @@ rm -f "$PID_FILE"
 function generateWorkspaceScripts(workspace) {
   // startAll.sh
   fs.writeFileSync(path.join(workspace, 'startAll.sh'), `#!/usr/bin/env bash
-# Start all Sentinel project instances
+# Start all valid Sentinel project instances.
+# A valid project must have config/repo-configs/*.properties with a GitHub REPO_URL.
 WORKSPACE="$(cd "$(dirname "$0")" && pwd)"
 started=0
+skipped=0
 for project_dir in "$WORKSPACE"/*/; do
   name=$(basename "$project_dir")
   [[ "$name" == "code" ]] && continue
   [[ -f "$project_dir/start.sh" ]] || continue
+
+  # Must have at least one repo-config with a valid GitHub REPO_URL
+  valid_repo=false
+  for props in "$project_dir/config/repo-configs/"*.properties 2>/dev/null; do
+    [[ -f "$props" ]] || continue
+    if grep -qE "^REPO_URL[[:space:]]*=[[:space:]]*(git@github\.com:|https://github\.com/)" "$props"; then
+      valid_repo=true
+      break
+    fi
+  done
+
+  if [[ "$valid_repo" == "false" ]]; then
+    echo "[sentinel] Skipping $name — no valid REPO_URL found in config/repo-configs/"
+    skipped=$((skipped + 1))
+    continue
+  fi
+
   bash "$project_dir/start.sh"
   started=$((started + 1))
 done
-echo "[sentinel] $started project(s) started"
+echo "[sentinel] $started project(s) started, $skipped skipped"
 `, { mode: 0o755 });
 
   // stopAll.sh

package/package.json

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

package/python/sentinel/config_loader.py

@@ -41,8 +41,9 @@ class SentinelConfig:
     smtp_port: int = 587
     smtp_user: str = ""
     smtp_password: str = ""
-    report_recipients: list[str] = field(default_factory=list)
+    mails: list[str] = field(default_factory=list)
     report_interval_hours: int = 6
+    send_health: bool = False
     state_db: str = "./sentinel.db"
     workspace_dir: str = "./workspace"
     claude_code_bin: str = "claude"
@@ -114,8 +115,9 @@ class ConfigLoader:
         c.smtp_port = int(d.get("SMTP_PORT", 587))
         c.smtp_user = d.get("SMTP_USER", "")
         c.smtp_password = d.get("SMTP_PASSWORD", "")
-        c.report_recipients = _csv(d.get("REPORT_RECIPIENTS", ""))
+        c.mails = _csv(d.get("MAILS", ""))
         c.report_interval_hours = int(d.get("REPORT_INTERVAL_HOURS", 6))
+        c.send_health = d.get("SEND_HEALTH", "disabled").lower() == "enabled"
         c.state_db = d.get("STATE_DB", "./sentinel.db")
         c.workspace_dir = d.get("WORKSPACE_DIR", "./workspace")
         c.claude_code_bin = d.get("CLAUDE_CODE_BIN", "claude")

package/python/sentinel/fix_engine.py

@@ -26,36 +26,39 @@ _DIFF_BLOCK = re.compile(r"```(?:diff|patch)?\n(.*?)```", re.DOTALL)
 _DIFF_HEADER = re.compile(r"^diff --git|^---\s+\S+|^\+\+\+\s+\S+", re.MULTILINE)
 
 
-def _build_prompt(event: ErrorEvent, repo: RepoConfig, log_file: Path) -> str:
-    return textwrap.dedent(f"""\
-        You are fixing a production bug in the repository at {repo.local_path}.
-        Repository: {repo.repo_name}
-
-        LOG FILE: {log_file}
-        Read this file first. It contains the last 48h of logs from {event.source} —
-        use it to understand the frequency, surrounding context, and any warnings
-        that preceded this error.
-
-        ERROR fingerprint to fix (from {event.source}):
-        {event.full_text()}
-
-        Task:
-        1. Read the log file above to understand what led up to this error.
-        2. Use your available tools to explore the codebase and identify the root cause.
-        3. Output ONLY a unified diff patch (git diff format) fixing the issue.
-        4. Do not explain. Output only the patch.
-        5. If you cannot determine a safe fix, output: SKIP: <reason>
-    """)
-
-
-def _extract_patch(output: str) -> str | None:
-    m = _DIFF_BLOCK.search(output)
-    if m:
-        return m.group(1).strip()
-    if _DIFF_HEADER.search(output):
-        return output.strip()
-    return None
-
+def _build_prompt(event, repo: RepoConfig, log_file) -> str:
+    if log_file and log_file.exists():
+        ctx = (
+            "LOG FILE: " + str(log_file) + "\n"
+            "Read this file first -- it contains the last 48h of logs from "
+            + event.source + ".\n"
+            "Use it to understand frequency, context, and preceding warnings."
+        )
+        step1 = "Read the log file above to understand what led up to this error."
+    else:
+        ctx = (
+            "SOURCE: " + event.source + "\n"
+            "No rolling log file available. The full issue description is below."
+        )
+        step1 = "Use the issue description above as your primary context."
+
+    lines_out = [
+        f"You are fixing a production bug in the repository at {repo.local_path}.",
+        f"Repository: {repo.repo_name}",
+        "",
+        ctx,
+        "",
+        f"ISSUE TO FIX (from {event.source}):",
+        event.full_text(),
+        "",
+        "Task:",
+        f"1. {step1}",
+        "2. Use your available tools to explore the codebase and identify the root cause.",
+        "3. Output ONLY a unified diff patch (git diff format) fixing the issue.",
+        "4. Do not explain. Output only the patch.",
+        "5. If you cannot determine a safe fix, output: SKIP: <reason>",
+    ]
+    return "\n".join(lines_out)
 
 def _validate_patch(patch: str) -> tuple[bool, str]:
     files_changed = len(re.findall(r"^diff --git", patch, re.MULTILINE))
@@ -83,7 +86,10 @@ def generate_fix(
         (status, patch_path)
         status: "patch" | "skip" | "error"
     """
+    # Issues have source like "issues/filename" — no rolling log file exists
     log_file = Path(cfg.workspace_dir) / "fetched" / f"{event.source}.log"
+    if not log_file.exists():
+        log_file = None
     prompt = _build_prompt(event, repo, log_file)
 
     logger.info("Invoking Claude Code for %s (fp=%s)", event.source, event.fingerprint)

package/python/sentinel/issue_watcher.py

@@ -0,0 +1,131 @@
+"""
+issue_watcher.py — Scan the issues/ directory for manually-submitted bug reports.
+
+Admins drop plain-text or markdown files into <project>/issues/.
+Each file is treated as a fix request. Processed files are archived to issues/.done/.
+
+File format (TARGET_REPO header is optional):
+
+    TARGET_REPO: my-repo-name
+
+    Short summary of the problem (becomes the email subject line)
+
+    Any details: customer feedback, stack traces, screenshots text, etc.
+    If TARGET_REPO is omitted and only one repo is configured, it is used automatically.
+"""
+
+import hashlib
+import logging
+import time
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
+from pathlib import Path
+
+logger = logging.getLogger(__name__)
+
+_TARGET_REPO_PREFIX = "TARGET_REPO:"
+
+
+@dataclass
+class IssueEvent:
+    """
+    A fix request sourced from the issues/ directory.
+    Implements the same interface as ErrorEvent so it can flow through
+    the same fix pipeline (_handle_error / generate_fix / git_manager).
+    """
+    source: str        # "issues/<filename>" — shown in emails and logs
+    issue_file: Path   # full path, used for archiving after processing
+    message: str       # first non-blank body line — used as subject summary
+    body: str          # full file content (the issue description)
+    target_repo: str   # explicit TARGET_REPO value, or "" for auto-select
+    fingerprint: str = ""
+    severity: str = "ERROR"
+    timestamp: str = ""
+
+    # Compatibility fields matching ErrorEvent interface
+    level: str = "ERROR"
+    thread: str = ""
+    logger_name: str = ""
+    stack_trace: list[str] = field(default_factory=list)
+    log_file: str = ""
+
+    def __post_init__(self):
+        if not self.fingerprint:
+            raw = f"issue:{self.source}:{self.message[:200]}"
+            self.fingerprint = hashlib.sha1(raw.encode()).hexdigest()[:16]
+        if not self.timestamp:
+            self.timestamp = datetime.now(timezone.utc).isoformat()
+        if not self.stack_trace:
+            self.stack_trace = self.body.splitlines()
+
+    @property
+    def is_infra_issue(self) -> bool:
+        return False
+
+    def short_summary(self) -> str:
+        return self.message[:120]
+
+    def full_text(self) -> str:
+        return self.body
+
+
+def scan_issues(project_dir: Path) -> list[IssueEvent]:
+    """
+    Return all pending issue files from <project_dir>/issues/.
+    Files starting with '.' and files inside .done/ are skipped.
+    """
+    issues_dir = project_dir / "issues"
+    if not issues_dir.exists():
+        return []
+
+    events = []
+    for f in sorted(issues_dir.iterdir()):
+        if not f.is_file() or f.name.startswith("."):
+            continue
+
+        try:
+            content = f.read_text(encoding="utf-8", errors="replace").strip()
+        except OSError as e:
+            logger.error("Cannot read issue file %s: %s", f, e)
+            continue
+
+        if not content:
+            continue
+
+        lines = content.splitlines()
+        target_repo = ""
+        body_start = 0
+
+        # Parse optional TARGET_REPO: header (must be the first non-blank line)
+        for i, line in enumerate(lines):
+            stripped = line.strip()
+            if stripped.upper().startswith(_TARGET_REPO_PREFIX):
+                target_repo = stripped[len(_TARGET_REPO_PREFIX):].strip()
+                body_start = i + 1
+            elif stripped:
+                break
+
+        body = "\n".join(lines[body_start:]).strip() or content
+        message = next((l.strip() for l in lines[body_start:] if l.strip()), f.name)
+
+        events.append(IssueEvent(
+            source=f"issues/{f.name}",
+            issue_file=f,
+            message=message,
+            body=body,
+            target_repo=target_repo,
+        ))
+        logger.info("Found issue: %s (target_repo=%r)", f.name, target_repo or "auto")
+
+    return events
+
+
+def mark_done(issue_file: Path) -> None:
+    """Archive a processed issue to issues/.done/ regardless of outcome."""
+    done_dir = issue_file.parent / ".done"
+    done_dir.mkdir(exist_ok=True)
+    dest = done_dir / issue_file.name
+    if dest.exists():
+        dest = done_dir / f"{issue_file.stem}-{int(time.time())}{issue_file.suffix}"
+    issue_file.rename(dest)
+    logger.info("Issue archived: %s -> .done/%s", issue_file.name, dest.name)