@misterhuydo/sentinel 1.5.32 → 1.5.34

package/package.json

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

package/python/sentinel/__init__.py

@@ -1 +1 @@
-__version__ = "1.5.32"
+__version__ = "1.5.34"

package/python/sentinel/sentinel_boss.py

@@ -1181,6 +1181,15 @@ _TOOLS = [
                     "type": "string",
                     "description": "Project short name this bot's issues should be routed to (e.g. '1881', 'elprint'). Infer from context or ask user before calling.",
                 },
+                "target_repo": {
+                    "type": "string",
+                    "description": (
+                        "Optional. Repo name to route this bot's issues to (e.g. '1881-SSOLoginWebApp'). "
+                        "Required when the project has multiple repos — without it, routing will fail. "
+                        "If the project has only one repo, omit this and it will be auto-selected. "
+                        "Ask the user which repo if unclear."
+                    ),
+                },
             },
             "required": ["user_ids"],
         },
@@ -3095,6 +3104,18 @@ async def _run_tool(name: str, inputs: dict, cfg_loader, store, slack_client=Non
                     "action_needed": "Ask the user to specify the project, then retry with project filled in.",
                 })
 
+        target_repo_arg = (inputs.get("target_repo") or "").strip()
+        # Fuzzy-match target_repo against known repos
+        resolved_target_repo = ""
+        if target_repo_arg and hasattr(cfg_loader, "repos"):
+            if target_repo_arg in cfg_loader.repos:
+                resolved_target_repo = target_repo_arg
+            else:
+                for rname in cfg_loader.repos:
+                    if target_repo_arg.lower() in rname.lower() or rname.lower() in target_repo_arg.lower():
+                        resolved_target_repo = rname
+                        break
+
         results = []
         for uid in user_ids:
             if not slack_client:
@@ -3107,9 +3128,9 @@ async def _run_tool(name: str, inputs: dict, cfg_loader, store, slack_client=Non
                     results.append({"user_id": uid, "status": "skipped", "reason": "not a bot — only bots can be watched passively"})
                     continue
                 bot_name = user.get("real_name") or user.get("name") or uid
-                store.add_watched_bot(uid, bot_name, added_by="boss", project_name=resolved_project)
-                logger.info("Boss: now watching bot %s (%s) → project '%s'", bot_name, uid, resolved_project or "unset")
-                results.append({"user_id": uid, "bot_name": bot_name, "project": resolved_project, "status": "watching"})
+                store.add_watched_bot(uid, bot_name, added_by="boss", project_name=resolved_project, target_repo=resolved_target_repo)
+                logger.info("Boss: now watching bot %s (%s) → project '%s', repo '%s'", bot_name, uid, resolved_project or "unset", resolved_target_repo or "auto")
+                results.append({"user_id": uid, "bot_name": bot_name, "project": resolved_project, "target_repo": resolved_target_repo or "auto", "status": "watching"})
             except Exception as e:
                 results.append({"user_id": uid, "status": "error", "reason": str(e)})
         return json.dumps({"results": results})

package/python/sentinel/slack_bot.py

@@ -181,6 +181,28 @@ import uuid as _uuid
 from pathlib import Path as _Path
 
 
+def _infer_target_repo(text: str, repos: dict) -> str:
+    """
+    Try to infer a target repo from bot message content.
+    Looks for 'Service: <name>' or 'service: <name>' patterns and fuzzy-matches
+    the extracted name against known repo names. Returns the repo name on a unique
+    match, empty string if ambiguous or no match found.
+    """
+    import re as _re
+    # Extract service hints: "Service: STS", "service: SSOLWA", etc.
+    hints = _re.findall(r'(?i)service:\s*(\S+)', text)
+    # Also try class names: "Class: SomeService" — extract first word segment
+    hints += _re.findall(r'(?i)class:\s*(\w+)', text)
+
+    for hint in hints:
+        hint_lower = hint.lower().rstrip(".,:")
+        matches = [r for r in repos if hint_lower in r.lower()]
+        if len(matches) == 1:
+            return matches[0]
+
+    return ""
+
+
 async def _handle_bot_message(event: dict, client, cfg_loader, store) -> None:
     """
     Called when a watched bot posts a message.
@@ -214,6 +236,27 @@ async def _handle_bot_message(event: dict, client, cfg_loader, store) -> None:
         None,
     )
     project_name = (bot_info or {}).get("project_name") or ""
+    target_repo  = (bot_info or {}).get("target_repo") or ""
+
+    # Auto-detect target_repo from message content when not pre-configured
+    if not target_repo and hasattr(cfg_loader, "repos") and cfg_loader.repos:
+        target_repo = _infer_target_repo(text, cfg_loader.repos)
+        if not target_repo and len(cfg_loader.repos) > 1:
+            # Can't determine — ask in the channel where the bot posted
+            bot_name = (bot_info or {}).get("bot_name") or bot_id
+            repo_names = ", ".join(f"`{r}`" for r in sorted(cfg_loader.repos))
+            try:
+                await client.chat_postMessage(
+                    channel=channel,
+                    text=(
+                        f":mag: I got an alert from *{bot_name}* but can't tell which repo to route it to.\n"
+                        f"Available repos: {repo_names}\n"
+                        f"Re-register with: `@Sentinel watch @{bot_name} for <repo-name>`"
+                    ),
+                )
+            except Exception as _e:
+                logger.warning("Bot watcher: could not post routing question: %s", _e)
+            return  # drop this message — don't queue an unroutable issue
 
     # Resolve the project issues directory
     workspace = _Path(cfg_loader.sentinel.workspace_dir).parent
@@ -238,9 +281,11 @@ async def _handle_bot_message(event: dict, client, cfg_loader, store) -> None:
 
     uid = _uuid.uuid4().hex[:8]
     fname = f"bot-{project_name or 'unknown'}-{uid}.txt"
+    target_line = f"TARGET_REPO: {target_repo}\n" if target_repo else ""
     content = (
         f"SOURCE: Slack bot {bot_id} in channel {channel}\n"
-        f"SLACK_TS: {ts}\n\n"
+        f"SLACK_TS: {ts}\n"
+        f"{target_line}\n"
         f"{text}"
     )
     (issues_dir / fname).write_text(content, encoding="utf-8")

package/python/sentinel/state_store.py

@@ -99,6 +99,7 @@ class StateStore:
             ("add_fix_outcome",           "ALTER TABLE fixes ADD COLUMN fix_outcome TEXT"),
             ("add_marker_seen_at",        "ALTER TABLE fixes ADD COLUMN marker_seen_at TEXT"),
             ("add_watched_bots_project",  "ALTER TABLE watched_bots ADD COLUMN project_name TEXT"),
+            ("add_watched_bots_target_repo", "ALTER TABLE watched_bots ADD COLUMN target_repo TEXT"),
             ("add_alert_thread_ts",       "ALTER TABLE errors ADD COLUMN alert_thread_ts TEXT"),
             ("add_alert_channel",         "ALTER TABLE errors ADD COLUMN alert_channel TEXT"),
             # knowledge_cache was originally created with a 'cached_at' column; rebuilt with 'expires_at'
@@ -408,13 +409,13 @@ class StateStore:
             "(bot_id TEXT PRIMARY KEY, bot_name TEXT, added_by TEXT, added_at TEXT)"
         )
 
-    def add_watched_bot(self, bot_id: str, bot_name: str, added_by: str = "config", project_name: str = ""):
+    def add_watched_bot(self, bot_id: str, bot_name: str, added_by: str = "config", project_name: str = "", target_repo: str = ""):
         with self._conn() as conn:
             self._ensure_watched_bots_table(conn)
             conn.execute(
-                "INSERT OR REPLACE INTO watched_bots (bot_id, bot_name, added_by, added_at, project_name) "
-                "VALUES (?, ?, ?, ?, ?)",
-                (bot_id, bot_name, added_by, _now(), project_name or None),
+                "INSERT OR REPLACE INTO watched_bots (bot_id, bot_name, added_by, added_at, project_name, target_repo) "
+                "VALUES (?, ?, ?, ?, ?, ?)",
+                (bot_id, bot_name, added_by, _now(), project_name or None, target_repo or None),
             )
 
     def remove_watched_bot(self, bot_id: str) -> bool: