@misterhuydo/sentinel 1.3.6 → 1.3.8

package/lib/add.js

@@ -283,17 +283,17 @@ async function addFromGit(gitUrl, workspace) {
   ok(`${repoSlug}: reachable`);
 
   // ── 2. Clone primary repo and discover additional repos ────────────────────
-  const localPath  = path.join(workspace, 'repos', repoSlug);
+  const projectDir = path.join(workspace, name);
   step(`[2/3] Scanning repo-configs in ${repoSlug}…`);
 
-  if (!fs.existsSync(localPath)) {
-    spawnSync(gitBin(), ['clone', '--depth', '1', gitUrl, localPath], {
+  if (!fs.existsSync(projectDir)) {
+    spawnSync(gitBin(), ['clone', '--depth', '1', gitUrl, projectDir], {
       stdio: 'inherit',
       env: gitEnv({ GIT_SSH_COMMAND: `ssh -i ${keyFile} -o StrictHostKeyChecking=no -o BatchMode=yes` }),
     });
   }
 
-  const discovered = discoverReposFromClone(localPath);
+  const discovered = discoverReposFromClone(projectDir);
 
   // Classify each discovered repo
   const privateRepos = [];
@@ -439,8 +439,6 @@ async function addFromGit(gitUrl, workspace) {
   }
 
   // ── Preview + confirm ──────────────────────────────────────────────────────
-  const projectDir = path.join(workspace, name);
-
   step('Dry-run preview');
   info(`Will create: ${projectDir}/`);
   if (discovered.length > 0) {
@@ -457,7 +455,7 @@ async function addFromGit(gitUrl, workspace) {
   }, { onCancel: () => process.exit(0) });
   if (!confirm) { info('Aborted.'); return; }
 
-  if (fs.existsSync(projectDir) && projectDir !== localPath) {
+  if (fs.existsSync(projectDir) && !fs.existsSync(path.join(projectDir, '.git'))) {
     console.error(chalk.yellow(`Project "${name}" already exists at ${projectDir}`));
     process.exit(1);
   }
@@ -468,32 +466,29 @@ async function addFromGit(gitUrl, workspace) {
 
   if (discovered.length > 0) {
     // Config already exists in the cloned repo — just generate scripts
-    generateProjectScripts(localPath, codeDir, pythonBin);
-    // Write SSH_KEY_FILE for primary repo itself
-    const primaryProps = path.join(localPath, 'config', 'repo-configs', `${repoSlug}.properties`);
+    generateProjectScripts(projectDir, codeDir, pythonBin);
+    // Write SSH_KEY_FILE for primary repo itself (no LOCAL_PATH — derived automatically)
+    const primaryProps = path.join(projectDir, 'config', 'repo-configs', `${repoSlug}.properties`);
     if (!fs.existsSync(primaryProps)) {
       writePropertiesFile(primaryProps, {
         REPO_NAME:    repoSlug,
         REPO_URL:     gitUrl,
-        LOCAL_PATH:   localPath,
         BRANCH:       'main',
         AUTO_PUBLISH: autoPublish ? 'true' : 'false',
         SSH_KEY_FILE: keyFile,
         CAIRN_MCP_ENABLED: 'true',
       });
     }
-    ok(`Project "${name}" ready at ${localPath}`);
-    printNextSteps(localPath, autoPublish);
-    await offerToStart(localPath);
+    ok(`Project "${name}" ready at ${projectDir}`);
+    printNextSteps(projectDir, autoPublish);
+    await offerToStart(projectDir);
   } else {
     // No existing repo-configs — scaffold fresh project
-    fs.ensureDirSync(projectDir);
     writeExampleProject(projectDir, codeDir, pythonBin);
     const repoDir = path.join(projectDir, 'config', 'repo-configs');
     writePropertiesFile(path.join(repoDir, `${repoSlug}.properties`), {
       REPO_NAME:    repoSlug,
       REPO_URL:     gitUrl,
-      LOCAL_PATH:   localPath,
       BRANCH:       'main',
       AUTO_PUBLISH: autoPublish ? 'true' : 'false',
       SSH_KEY_FILE: keyFile,
@@ -649,8 +644,6 @@ async function addFromUrl(url, workspace) {
   printNextSteps(projectDir);
 }
 
-// ── printNextSteps ────────────────────────────────────────────────────────────
-
 function printNextSteps(projectDir, autoPublish) {
   const logFile = path.join(projectDir, 'logs', 'sentinel.log');
   const mode = autoPublish === true
@@ -682,8 +675,6 @@ async function offerToStart(projectDir) {
   }
 }
 
-// ── entry point ───────────────────────────────────────────────────────────────
-
 module.exports = async function add(arg) {
   const type = detectInputType(arg);
   const workspace = await resolveWorkspace();

package/lib/generate.js

@@ -159,7 +159,7 @@ function generateWorkspaceScripts(workspace, smtpConfig = {}, slackConfig = {},
 WORKSPACE="$(cd "$(dirname "$0")" && pwd)"
 started=0
 skipped=0
-for project_dir in "$WORKSPACE"/*/ "$WORKSPACE"/repos/*/; do
+for project_dir in "$WORKSPACE"/*/; do
   [[ -d "$project_dir" ]] || continue
   name=$(basename "$project_dir")
   [[ "$name" == "code" ]]  && continue
@@ -266,7 +266,7 @@ echo "[sentinel] $started project(s) started, $skipped skipped"
 # Stop all Sentinel project instances
 WORKSPACE="$(cd "$(dirname "$0")" && pwd)"
 stopped=0
-for project_dir in "$WORKSPACE"/*/ "$WORKSPACE"/repos/*/; do
+for project_dir in "$WORKSPACE"/*/; do
   [[ -d "$project_dir" ]] || continue
   name=$(basename "$project_dir")
   [[ "$name" == "code" ]]  && continue

package/lib/init.js

@@ -153,9 +153,10 @@ module.exports = async function init() {
   // ── Node tools ──────────────────────────────────────────────────────────────
   step('Installing Node tools…');
   installNpmGlobal('@misterhuydo/cairn-mcp', 'cairn');
-  installNpmGlobal('@anthropic-ai/claude-code', 'claude');
-  info('Hooking Cairn MCP into Claude Code…');
+  step('Hooking Cairn MCP into Claude Code…');
   runLive('cairn', ['install']);
+  ok('cairn install complete');
+  installNpmGlobal('@anthropic-ai/claude-code', 'claude');
   step('Patching Claude Code permissions…');
   ensureClaudePermissions();
 

package/package.json

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

package/python/sentinel/config_loader.py

@@ -172,7 +172,7 @@ class ConfigLoader:
         c.slack_watch_bot_ids = _csv(d.get("SLACK_WATCH_BOT_IDS", ""))
         c.slack_allowed_users = _csv(d.get("SLACK_ALLOWED_USERS", ""))
         c.slack_admin_users = _csv(d.get("SLACK_ADMIN_USERS", ""))
-        c.project_name = d.get("PROJECT_NAME", "")
+        c.project_name = d.get("PROJECT_NAME", "") or Path(self.config_dir).resolve().parent.name
         c.claude_pro_for_tasks = d.get("CLAUDE_PRO_FOR_TASKS", "true").lower() != "false"
         c.sync_enabled = d.get("SYNC_ENABLED", "true").lower() != "false"
         c.sync_interval_seconds = int(d.get("SYNC_INTERVAL_SECONDS", 300))
@@ -218,7 +218,7 @@ class ConfigLoader:
             r = RepoConfig()
             r.repo_name = path.stem
             r.repo_url = d.get("REPO_URL", "")
-            r.local_path = os.path.expanduser(d.get("LOCAL_PATH", ""))
+            r.local_path = str(Path(self.config_dir).parent / "repos" / r.repo_name)
             r.branch = d.get("BRANCH", "main")
             r.auto_publish = d.get("AUTO_PUBLISH", "false").lower() == "true"
             r.cicd_type = d.get("CICD_TYPE", "")

package/python/sentinel/fix_engine.py

@@ -11,6 +11,7 @@ import logging
 import re
 import subprocess
 import textwrap
+from datetime import datetime, timezone
 from pathlib import Path
 
 from .config_loader import RepoConfig, SentinelConfig
@@ -135,21 +136,50 @@ def _claude_cmd(bin_path: str, prompt: str) -> list[str]:
     return [bin_path, "--print", prompt]
 
 
-def _run_claude_attempt(bin_path: str, prompt: str, env: dict) -> tuple[str, bool]:
+def _run_claude_attempt(
+    bin_path: str,
+    prompt: str,
+    env: dict,
+    cwd: str | None = None,
+    claude_log_path: Path | None = None,
+) -> tuple[str, bool]:
     """
     Run claude CLI with the given env. Returns (output, timed_out).
     Raises FileNotFoundError if binary is missing.
+    If claude_log_path is given, writes the full prompt + raw output there.
     """
     try:
         result = subprocess.run(
             _claude_cmd(bin_path, prompt),
             capture_output=True, text=True, timeout=SUBPROCESS_TIMEOUT, env=env,
+            cwd=cwd or None,
         )
-        return (result.stdout or "") + (result.stderr or ""), False
+        output = (result.stdout or "") + (result.stderr or "")
+        if claude_log_path:
+            _write_claude_log(claude_log_path, prompt, output, timed_out=False)
+        return output, False
     except subprocess.TimeoutExpired:
+        if claude_log_path:
+            _write_claude_log(claude_log_path, prompt, "", timed_out=True)
         return "", True
 
 
+def _write_claude_log(log_path: Path, prompt: str, output: str, timed_out: bool) -> None:
+    log_path.parent.mkdir(parents=True, exist_ok=True)
+    sep = "─" * 72
+    content = (
+        f"{sep}\n"
+        f"PROMPT\n"
+        f"{sep}\n"
+        f"{prompt}\n\n"
+        f"{sep}\n"
+        f"OUTPUT{'  [TIMED OUT]' if timed_out else ''}\n"
+        f"{sep}\n"
+        f"{output if output else '(no output)'}\n"
+    )
+    log_path.write_text(content, encoding="utf-8")
+
+
 def generate_fix(
     event: ErrorEvent,
     repo: RepoConfig,
@@ -194,7 +224,13 @@ def generate_fix(
         except Exception as _e:
             logger.debug("fix_engine: git log check failed: %s", _e)
 
-    logger.info("Invoking Claude Code for %s (fp=%s)", event.source, event.fingerprint)
+    ts = datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
+    claude_logs_dir = Path(cfg.workspace_dir).parent / "logs" / "claude"
+    claude_log_path = claude_logs_dir / f"{event.fingerprint[:8]}-{ts}.log"
+    logger.info(
+        "Invoking Claude Code for %s (fp=%s) — log: %s",
+        event.source, event.fingerprint, claude_log_path,
+    )
 
     base_env  = _os.environ.copy()
     api_env   = {**base_env, "ANTHROPIC_API_KEY": cfg.anthropic_api_key} if cfg.anthropic_api_key else None
@@ -216,7 +252,9 @@ def generate_fix(
             if env is None:
                 continue
             logger.info("fix_engine: trying %s for %s", label, event.fingerprint)
-            output, timed_out = _run_claude_attempt(cfg.claude_code_bin, prompt, env)
+            output, timed_out = _run_claude_attempt(
+                cfg.claude_code_bin, prompt, env, cwd=repo.local_path, claude_log_path=claude_log_path,
+            )
             if timed_out:
                 logger.error("Claude Code timed out for %s", event.fingerprint)
                 return "error", None, ""

package/python/sentinel/git_manager.py

@@ -19,7 +19,6 @@ from .log_parser import ErrorEvent
 logger = logging.getLogger(__name__)
 
 GIT_TIMEOUT = 60
-PR_BRANCH_PREFIX = "sentinel/fix-"
 
 # Files that must never be modified by Sentinel
 _PROTECTED_PATHS = {".github/", "Jenkinsfile", "pom.xml"}
@@ -144,6 +143,13 @@ def _append_changelog(repo: RepoConfig, event: ErrorEvent, commit_hash: str):
     _git(["commit", "--amend", "--no-edit"], cwd=repo.local_path, env=env)
 
 
+def remote_fix_exists(repo: RepoConfig, fingerprint: str, cfg: SentinelConfig) -> bool:
+    """Return True if any Sentinel instance already pushed a fix branch for this fingerprint."""
+    pattern = f"refs/heads/*/fix-{fingerprint[:8]}"
+    r = _git(["ls-remote", "--heads", "origin", pattern], cwd=repo.local_path, env=_git_env(repo))
+    return r.returncode == 0 and bool(r.stdout.strip())
+
+
 def publish(
     event: ErrorEvent,
     repo: RepoConfig,
@@ -159,13 +165,21 @@ def publish(
     env = _git_env(repo)
     local_path = repo.local_path
 
+    if not repo.auto_publish:
+        if remote_fix_exists(repo, event.fingerprint, cfg):
+            logger.info(
+                "Remote fix branch already exists for %s — skipping duplicate push",
+                event.fingerprint[:8],
+            )
+            return "", ""
+
     if repo.auto_publish:
         r = _git(["push", "origin", repo.branch], cwd=local_path, env=env)
         if r.returncode != 0:
             logger.error("git push failed:\n%s", r.stderr)
         return repo.branch, ""
     else:
-        branch = f"{PR_BRANCH_PREFIX}{event.fingerprint[:8]}"
+        branch = f"{cfg.project_name or 'sentinel'}/fix-{event.fingerprint[:8]}"
         _git(["checkout", "-B", branch], cwd=local_path, env=env)
         r = _git(["push", "-u", "origin", branch], cwd=local_path, env=env)
         if r.returncode != 0:

package/templates/repo-configs/_example.properties

@@ -12,9 +12,6 @@
 # SSH clone URL of the GitHub repository
 REPO_URL=git@github.com:<org>/<repo>.git
 
-# Absolute path where Sentinel will clone/manage this repo on the local machine
-LOCAL_PATH=/home/<user>/sentinel/repos/<repo-name>
-
 # Branch to pull from and push fixes to
 BRANCH=main