@misterhuydo/sentinel 1.0.44 → 1.0.46

package/.cairn/session.json

@@ -1,6 +1,6 @@
 {
-  "message": "Auto-checkpoint at 2026-03-21T23:30:09.918Z",
-  "checkpoint_at": "2026-03-21T23:30:09.918Z",
+  "message": "Auto-checkpoint at 2026-03-22T05:40:32.023Z",
+  "checkpoint_at": "2026-03-22T05:40:32.024Z",
   "active_files": [],
   "notes": [],
   "mtime_snapshot": {}

package/package.json

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

package/python/sentinel/sentinel_boss.py

@@ -29,17 +29,20 @@ and opens GitHub PRs for admin review (or pushes directly if AUTO_PUBLISH=true).
 Your job:
 - Understand what the DevOps engineer needs in natural language
 - Query Sentinel's live state (errors, fixes, open PRs) on their behalf
-- Create issue reports when asked to investigate or fix something
+- Deliver tasks/issues to the right project — you know all projects in this workspace
 - Control Sentinel (pause/resume) when asked
 - Give honest, concise answers — you know this system inside out
+- If a project name is unclear or ambiguous, ask the engineer to clarify — never guess
 
 What you can do (tools available):
 
 1. get_status        — Show recent errors detected, fixes applied/pending, open PRs.
                        e.g. "what happened today?", "any issues?", "show open PRs"
 
-2. create_issue      — Queue a manual fix request for Sentinel to investigate next poll.
-                       e.g. "look into this bug: ...", "investigate order creation failures"
+2. create_issue      — Deliver a fix/task to any project in this workspace by short name.
+                       You know all project names — use list_projects if you're unsure.
+                       If the project name is ambiguous or not found, ask to clarify.
+                       e.g. "tell 1881 to fix X", "look into Y in elprint", "investigate Z"
 
 3. pause_sentinel    — Create SENTINEL_PAUSE file to halt all auto-fix activity.
                        e.g. "pause sentinel", "stop auto-fixing"
@@ -69,8 +72,11 @@ What you can do (tools available):
 11. list_errors      — List recent errors from the state store, optionally filtered by repo or source.
                        e.g. "show all errors today", "what errors hit elprint this week?"
 
-12. pull_repo        — Run git pull on one or all managed repos.
-                       e.g. "pull changes for sentinel-1881", "git pull all repos", "update the code"
+12. pull_repo        — Run git pull on one or all managed application repos.
+                       e.g. "pull changes", "git pull all repos", "update the code"
+
+13. pull_config      — Run git pull on one or all Sentinel project config dirs.
+                       e.g. "pull config for 1881", "update sentinel config", "pull all configs"
 
 Tone: direct, professional, like a senior engineer who owns the system.
 Don't pad responses. Don't say "Great question!" or "Certainly!".
@@ -104,20 +110,25 @@ _TOOLS = [
     {
         "name": "create_issue",
         "description": (
-            "Queue a fix request for Sentinel to investigate on the next poll cycle. "
-            "Use whenever the engineer reports a bug, customer complaint, or asks you "
-            "to look into something specific. Include every detail they gave you."
+            "Deliver a fix/task request to a Sentinel project instance. "
+            "Use when the engineer says 'tell 1881 to do X', 'look into Y in project elprint', "
+            "'implement this in 1881: ...'. Can target any project by short name. "
+            "Defaults to the current project if no project is specified."
         ),
         "input_schema": {
             "type": "object",
             "properties": {
                 "description": {
                     "type": "string",
-                    "description": "Full problem description — everything the engineer told you",
+                    "description": "Full task/problem description — everything the engineer told you",
+                },
+                "project": {
+                    "type": "string",
+                    "description": "Project short name to deliver to (e.g. '1881', 'elprint'). Omit for current project.",
                 },
                 "target_repo": {
                     "type": "string",
-                    "description": "Repo name to assign to (omit to let Sentinel auto-route)",
+                    "description": "Specific repo within the project (omit to let Sentinel auto-route)",
                 },
             },
             "required": ["description"],
@@ -248,9 +259,68 @@ _TOOLS = [
             },
         },
     },
+    {
+        "name": "pull_config",
+        "description": (
+            "Run git pull on one or all Sentinel project config directories. "
+            "Projects are matched by short name ('1881', 'elprint') or full dir name ('sentinel-1881'). "
+            "Use for: 'pull config for 1881', 'update sentinel config', 'pull all configs'."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "project": {
+                    "type": "string",
+                    "description": "Project short name or dir name to pull (omit for all projects)",
+                },
+            },
+        },
+    },
 ]
 
 
+# ── Workspace helpers ─────────────────────────────────────────────────────────
+
+def _workspace_dir() -> Path:
+    return Path(".").resolve().parent
+
+def _short_name(dir_name: str) -> str:
+    """'sentinel-1881' → '1881', 'sentinel-elprint' → 'elprint', others unchanged."""
+    if dir_name.startswith("sentinel-"):
+        return dir_name[len("sentinel-"):]
+    return dir_name
+
+def _find_project_dirs(target: str = "") -> list[Path]:
+    """Return project dirs matching target (short or full name), or all if target empty."""
+    workspace = _workspace_dir()
+    results = []
+    try:
+        for d in sorted(workspace.iterdir()):
+            if not d.is_dir() or d.name in ("code", ".git"):
+                continue
+            if not (d / "config").exists():
+                continue
+            if target:
+                if target.lower() not in d.name.lower() and target.lower() not in _short_name(d.name).lower():
+                    continue
+            results.append(d)
+    except Exception:
+        pass
+    return results
+
+def _git_pull(path: Path) -> dict:
+    try:
+        r = subprocess.run(
+            ["git", "pull", "--rebase", "origin"],
+            cwd=str(path), capture_output=True, text=True, timeout=60,
+        )
+        last = r.stdout.strip().splitlines()[-1] if r.stdout.strip() else "already up to date"
+        return {"status": "ok" if r.returncode == 0 else "error",
+                "detail": last if r.returncode == 0 else r.stderr.strip()}
+    except Exception as e:
+        return {"status": "error", "detail": str(e)}
+
+
 # ── Tool execution ────────────────────────────────────────────────────────────
 
 def _run_tool(name: str, inputs: dict, cfg_loader, store) -> str:
@@ -290,16 +360,43 @@ def _run_tool(name: str, inputs: dict, cfg_loader, store) -> str:
     if name == "create_issue":
         description = inputs["description"]
         target_repo = inputs.get("target_repo", "")
-        issues_dir  = Path("issues")
+        project_arg = inputs.get("project", "")
+
+        if project_arg:
+            project_dirs = _find_project_dirs(project_arg)
+            if not project_dirs:
+                all_names = [_short_name(d.name) for d in _find_project_dirs()]
+                return json.dumps({
+                    "error": f"No project found matching '{project_arg}'",
+                    "available_projects": all_names,
+                    "action_needed": "Ask the user which project they meant.",
+                })
+            if len(project_dirs) > 1:
+                matches = [_short_name(d.name) for d in project_dirs]
+                return json.dumps({
+                    "error": f"Ambiguous project name '{project_arg}' — matches: {matches}",
+                    "action_needed": "Ask the user to clarify which project they mean.",
+                })
+            project_dir = project_dirs[0]
+        else:
+            project_dir = Path(".")
+
+        issues_dir = project_dir / "issues"
         issues_dir.mkdir(exist_ok=True)
         fname   = f"slack-{uuid.uuid4().hex[:8]}.txt"
         content = (f"TARGET_REPO: {target_repo}\n\n" if target_repo else "") + description
         (issues_dir / fname).write_text(content, encoding="utf-8")
-        logger.info("Boss created issue: %s", fname)
+
+        # Touch SENTINEL_POLL_NOW so the target instance picks it up immediately
+        (project_dir / "SENTINEL_POLL_NOW").touch()
+
+        project_label = _short_name(project_dir.resolve().name) if project_arg else "this project"
+        logger.info("Boss created issue for %s: %s", project_label, fname)
         return json.dumps({
-            "status": "queued",
-            "file":   fname,
-            "note":   "Sentinel will pick this up on the next poll cycle.",
+            "status":  "queued",
+            "project": project_label,
+            "file":    fname,
+            "note":    f"Delivered to '{project_label}'. Sentinel will process it on the next poll cycle.",
         })
 
     if name == "get_fix_details":
@@ -339,27 +436,11 @@ def _run_tool(name: str, inputs: dict, cfg_loader, store) -> str:
         return json.dumps({"status": "resumed"})
 
     if name == "list_projects":
-        # Repos this instance manages
-        my_repos = [
-            {
-                "repo":         r.repo_name,
-                "url":          r.repo_url,
-                "branch":       r.branch,
-                "auto_publish": r.auto_publish,
-            }
-            for r in cfg_loader.repos.values()
-        ]
-        # Scan workspace for sibling project instances
-        workspace = Path(".").resolve().parent
-        other_projects = []
-        try:
-            for d in sorted(workspace.iterdir()):
-                if not d.is_dir() or d.name in ("code", ".git"):
-                    continue
-                repo_cfg_dir = d / "config" / "repo-configs"
-                if not repo_cfg_dir.exists():
-                    continue
-                repos_in_project = []
+        projects = []
+        for d in _find_project_dirs():
+            repo_cfg_dir = d / "config" / "repo-configs"
+            repos_in_project = []
+            if repo_cfg_dir.exists():
                 for p in sorted(repo_cfg_dir.glob("*.properties")):
                     if p.name.startswith("_"):
                         continue
@@ -368,25 +449,15 @@ def _run_tool(name: str, inputs: dict, cfg_loader, store) -> str:
                         if line.startswith("REPO_URL"):
                             repo_url = line.split("=", 1)[-1].strip()
                             break
-                    if repo_url:
-                        repos_in_project.append({"repo": p.stem, "url": repo_url})
-                if repos_in_project:
-                    pid_file = d / "sentinel.pid"
-                    running = pid_file.exists()
-                    other_projects.append({
-                        "project": d.name,
-                        "running": running,
-                        "repos":   repos_in_project,
-                    })
-        except Exception as e:
-            logger.warning("list_projects workspace scan failed: %s", e)
-        return json.dumps({
-            "this_instance": {
-                "project": Path(".").resolve().name,
-                "repos":   my_repos,
-            },
-            "workspace_projects": other_projects,
-        })
+                    repos_in_project.append({"repo": p.stem, "url": repo_url})
+            projects.append({
+                "project": _short_name(d.name),
+                "dir":     d.name,
+                "running": (d / "sentinel.pid").exists(),
+                "this":    d.resolve() == Path(".").resolve(),
+                "repos":   repos_in_project,
+            })
+        return json.dumps({"projects": projects})
 
     if name == "search_logs":
         query       = inputs.get("query", "")
@@ -482,6 +553,18 @@ def _run_tool(name: str, inputs: dict, cfg_loader, store) -> str:
                 results.append({"repo": repo_name, "status": "error", "detail": str(e)})
         return json.dumps({"results": results})
 
+    if name == "pull_config":
+        target = inputs.get("project", "")
+        dirs = _find_project_dirs(target)
+        if not dirs:
+            return json.dumps({"error": f"No project found matching '{target}'"})
+        results = []
+        for d in dirs:
+            res = _git_pull(d)
+            results.append({"project": _short_name(d.name), "dir": d.name, **res})
+            logger.info("Boss: pull_config %s → %s", d.name, res["status"])
+        return json.dumps({"results": results})
+
     return json.dumps({"error": f"unknown tool: {name}"})
 
 
@@ -617,14 +700,16 @@ async def handle_message(
     client = anthropic.Anthropic(api_key=api_key)
 
     # Build system context snapshot
-    paused    = Path("SENTINEL_PAUSE").exists()
-    repos     = list(cfg_loader.repos.keys())
-    ts        = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M UTC")
+    paused       = Path("SENTINEL_PAUSE").exists()
+    repos        = list(cfg_loader.repos.keys())
+    ts           = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M UTC")
+    known_projects = [_short_name(d.name) for d in _find_project_dirs()]
     system    = (
         _SYSTEM
         + f"\n\nCurrent time: {ts}"
         + f"\nSentinel status: {'⏸ PAUSED' if paused else '▶ RUNNING'}"
         + f"\nManaged repos: {', '.join(repos) if repos else '(none configured)'}"
+        + (f"\nKnown projects in workspace: {', '.join(known_projects)}" if known_projects else "")
     )
 
     history.append({"role": "user", "content": message})