metheus-governance-mcp-cli 0.2.110 → 0.2.112

package/cli.mjs

@@ -1269,10 +1269,21 @@ function normalizeBotRunnerConfigContents(parsed, filePath) {
     if (!binding.name || (!binding.botID && !binding.botName)) continue;
     if (!binding.roleProfile && !binding.client && !binding.model && !binding.permissionMode && !binding.reasoningEffort) continue;
     botBindings[binding.name] = binding;
-    const rawClient = String(safeObject(rawBinding).client || "").trim().toLowerCase();
+    const rawBindingObject = safeObject(rawBinding);
+    const rawClient = String(rawBindingObject.client || "").trim().toLowerCase();
     if (rawClient === "codex") {
       migrated = true;
     }
+    if (
+      (!Object.prototype.hasOwnProperty.call(rawBindingObject, "server_bot_id")
+        && !Object.prototype.hasOwnProperty.call(rawBindingObject, "serverBotID")
+        && (Object.prototype.hasOwnProperty.call(rawBindingObject, "bot_id") || Object.prototype.hasOwnProperty.call(rawBindingObject, "botId")))
+      || (!Object.prototype.hasOwnProperty.call(rawBindingObject, "server_bot_name")
+        && !Object.prototype.hasOwnProperty.call(rawBindingObject, "serverBotName")
+        && (Object.prototype.hasOwnProperty.call(rawBindingObject, "bot_name") || Object.prototype.hasOwnProperty.call(rawBindingObject, "botName")))
+    ) {
+      migrated = true;
+    }
   }
 
   const projectMappings = {};
@@ -1289,6 +1300,16 @@ function normalizeBotRunnerConfigContents(parsed, filePath) {
     const routeSource = safeObject(rawRoute);
     const route = normalizeRunnerRoute(routeSource);
     routes.push(route);
+    if (
+      (!Object.prototype.hasOwnProperty.call(routeSource, "server_bot_id")
+        && !Object.prototype.hasOwnProperty.call(routeSource, "serverBotID")
+        && (Object.prototype.hasOwnProperty.call(routeSource, "bot_id") || Object.prototype.hasOwnProperty.call(routeSource, "botID")))
+      || (!Object.prototype.hasOwnProperty.call(routeSource, "server_bot_name")
+        && !Object.prototype.hasOwnProperty.call(routeSource, "serverBotName")
+        && (Object.prototype.hasOwnProperty.call(routeSource, "bot_name") || Object.prototype.hasOwnProperty.call(routeSource, "botName")))
+    ) {
+      migrated = true;
+    }
     if (!Object.prototype.hasOwnProperty.call(routeSource, "trigger_policy") && !Object.prototype.hasOwnProperty.call(routeSource, "triggerPolicy")) {
       migrated = true;
     }
@@ -1797,8 +1818,27 @@ function matchesRunnerRouteText(candidate, expected) {
   return String(candidate || "").trim().toLowerCase() === expectedText.toLowerCase();
 }
 
-function configuredRunnerRouteMatchesInlineSelection(route, inlineRoute, flags) {
+function resolveConfiguredRunnerRouteServerBotName(route, telegramEntries = []) {
   const candidate = normalizeRunnerRoute(route);
+  if (candidate.botName) {
+    return candidate.botName;
+  }
+  if (candidate.provider !== "telegram") {
+    return "";
+  }
+  const matchedTelegramEntry = ensureArray(telegramEntries).find((entry) => {
+    const current = safeObject(entry);
+    return (
+      (candidate.botID && current.serverBotID && current.serverBotID === candidate.botID)
+      || (candidate.botName && current.serverBotName && current.serverBotName === candidate.botName)
+    );
+  });
+  return String(matchedTelegramEntry?.serverBotName || "").trim();
+}
+
+function configuredRunnerRouteMatchesInlineSelection(route, inlineRoute, flags, options = {}) {
+  const candidate = normalizeRunnerRoute(route);
+  const candidateBotName = resolveConfiguredRunnerRouteServerBotName(candidate, options.telegramEntries);
   if (hasRunnerFlag(flags, "route-name") && !matchesRunnerRouteText(candidate.name, flags["route-name"])) {
     return false;
   }
@@ -1817,7 +1857,7 @@ function configuredRunnerRouteMatchesInlineSelection(route, inlineRoute, flags)
   if (inlineRoute.botID && candidate.botID !== inlineRoute.botID) {
     return false;
   }
-  if (inlineRoute.botName && !matchesRunnerRouteText(candidate.botName, inlineRoute.botName)) {
+  if (inlineRoute.botName && !matchesRunnerRouteText(candidateBotName, inlineRoute.botName)) {
     return false;
   }
   if (inlineRoute.destinationID && candidate.destinationID !== inlineRoute.destinationID) {
@@ -2014,9 +2054,10 @@ function resolveRunnerRoutes(flags, mode) {
     .map((rawRoute) => normalizeRunnerRoute(rawRoute))
     .filter((route) => route.enabled)
     .filter((route) => !routeNameFilter || String(route.name || "").trim().toLowerCase() === routeNameFilter);
+  const telegramEntries = selectionRequested ? ensureArray(readTelegramEnvState().entries) : [];
 
   if (selectionRequested) {
-    const matchedRoutes = configuredRoutes.filter((route) => configuredRunnerRouteMatchesInlineSelection(route, inlineRoute, flags));
+    const matchedRoutes = configuredRoutes.filter((route) => configuredRunnerRouteMatchesInlineSelection(route, inlineRoute, flags, { telegramEntries }));
     if (matchedRoutes.length === 1) {
       return [applyRunnerRouteFlagOverrides(matchedRoutes[0], flags)];
     }
@@ -2594,7 +2635,6 @@ function buildRunnerRouteListRows() {
     const resolvedBotName = firstNonEmptyString([
       route.botName,
       matchedTelegramEntry?.serverBotName,
-      matchedTelegramEntry?.key,
       "-",
     ]);
     return {
@@ -3938,6 +3978,7 @@ function buildBotCommandDeps() {
     normalizeBotProvider,
     normalizeTelegramBotEnvKey,
     normalizeTelegramBotUsername,
+    normalizeRunnerRoute,
     normalizeRunnerRoleProfileName,
     normalizeLocalAIClientName,
     normalizeLocalAIPermissionMode,

package/lib/bot-commands.mjs

@@ -1254,6 +1254,7 @@ function summarizeTelegramRouteLinks(parsedEnv, entry, serverBinding, deps) {
   const selectedEntry = safeObject(entry);
   const binding = safeObject(serverBinding);
   const config = safeObject(requireDependency(deps, "loadBotRunnerConfig")({ persistIfNeeded: true }));
+  const normalizeRunnerRoute = requireDependency(deps, "normalizeRunnerRoute");
   const routes = ensureArray(config.routes);
   const entryKey = String(selectedEntry.key || "").trim();
   const defaultBotKey = String(safeObject(parsedEnv).TELEGRAM_DEFAULT_BOT_KEY || "").trim();
@@ -1267,12 +1268,12 @@ function summarizeTelegramRouteLinks(parsedEnv, entry, serverBinding, deps) {
   );
   const linkedRoutes = [];
   routes.forEach((rawRoute, index) => {
-    const route = safeObject(rawRoute);
+    const route = normalizeRunnerRoute(rawRoute);
     if (route.enabled === false) return;
     if (String(route.provider || "").trim().toLowerCase() !== "telegram") return;
     const routeName = String(route.name || route.route_name || `telegram-route-${index + 1}`).trim();
-    const routeBotID = String(route.bot_id || route.botID || "").trim();
-    const routeBotName = normalizeServerBotIdentityText(route.bot_name || route.botName || "");
+    const routeBotID = String(route.server_bot_id || route.serverBotID || route.bot_id || route.botID || "").trim();
+    const routeBotName = normalizeServerBotIdentityText(route.server_bot_name || route.serverBotName || route.bot_name || route.botName || "");
     const routeRole = String(route.role_profile || route.roleProfile || route.role || "").trim();
     let matchedBy = "";
     if (serverBotID && routeBotID === serverBotID) {

package/lib/selftest-bot-commands.mjs

@@ -565,7 +565,7 @@ export async function runSelftestBotCommands(push, deps) {
         enabled: true,
         project_id: "03c586a2-006d-4051-83b4-f353a5813176",
         provider: "telegram",
-        bot_id: mock.bots[0].id,
+        server_bot_id: mock.bots[0].id,
         role_profile: "monitor",
       },
       {
@@ -600,7 +600,7 @@ export async function runSelftestBotCommands(push, deps) {
       intFromRaw(safeObject(showWithRoutesPayload.routeLinks).total, 0) >= 1
         && ensureArray(safeObject(showWithRoutesPayload.routeLinks).routes).some((route) => (
           String(safeObject(route).routeName || "") === "telegram-monitor"
-          && String(safeObject(route).matchedBy || "") === "bot_id"
+          && String(safeObject(route).matchedBy || "") === "server_bot_id"
         )),
       `routes=${JSON.stringify(safeObject(showWithRoutesPayload.routeLinks))}`,
     );

package/lib/selftest-runner-scenarios.mjs

@@ -415,7 +415,26 @@ export async function runSelftestRunnerScenarios(push, deps) {
     originalResolveUserProfile = process.env.USERPROFILE;
     const resolveHome = path.join(runnerRouteResolveTempRoot, "home");
     const resolveMetheusDir = path.join(resolveHome, ".metheus");
+    const resolveTelegramDir = path.join(resolveMetheusDir, "telegram-bots");
     fs.mkdirSync(resolveMetheusDir, { recursive: true });
+    fs.mkdirSync(resolveTelegramDir, { recursive: true });
+    fs.writeFileSync(
+      path.join(resolveTelegramDir, "global.env"),
+      "TELEGRAM_DEFAULT_BOT_KEY=serverprotocolmonitorbot\n",
+      "utf8",
+    );
+    fs.writeFileSync(
+      path.join(resolveTelegramDir, "ServerProtocolMonitorBot.env"),
+      [
+        "TELEGRAM_BOT_SERVER_BOT_ID=22222222-2222-2222-2222-222222222222",
+        "TELEGRAM_BOT_SERVER_NAME=ServerProtocolMonitorBot",
+        "TELEGRAM_BOT_SERVER_ROLES=monitor",
+        "TELEGRAM_BOT_SERVER_ROLE_IDS=monitor:22222222-2222-2222-2222-222222222222",
+        "TELEGRAM_BOT_TOKEN=test-token",
+        "",
+      ].join("\n"),
+      "utf8",
+    );
     fs.writeFileSync(
       path.join(resolveMetheusDir, "bot-runner.json"),
       `${JSON.stringify({
@@ -435,9 +454,21 @@ export async function runSelftestRunnerScenarios(push, deps) {
             provider: "telegram",
             role: "monitor",
             role_profile: "monitor",
-            bot_name: "ServerProtocolMonitorBot",
+            bot_id: "22222222-2222-2222-2222-222222222222",
             destination_label: "AI incubating CHAT ROOM",
             archive_work_item_id: "304ce77a-7032-421c-aeda-bc54daf088dd",
+            trigger_policy: {
+              mentions_only: true,
+              direct_messages: true,
+              reply_to_bot_messages: true,
+              ignore_edited_messages: true,
+            },
+            archive_policy: {
+              mirror_replies: true,
+              dedupe_inbound: true,
+              dedupe_outbound: true,
+              skip_bot_messages: true,
+            },
           },
         ],
       }, null, 2)}\n`,
@@ -457,14 +488,18 @@ export async function runSelftestRunnerScenarios(push, deps) {
       "once",
     );
     const resolvedRunnerRoute = normalizeRunnerRoute(resolvedRunnerRoutes[0]);
+    const persistedRunnerConfig = JSON.parse(fs.readFileSync(path.join(resolveMetheusDir, "bot-runner.json"), "utf8"));
+    const persistedRoute = Array.isArray(persistedRunnerConfig.routes) ? persistedRunnerConfig.routes[0] || {} : {};
     push(
       "bot_runner_inline_filters_reuse_configured_route",
       resolvedRunnerRoutes.length === 1
         && resolvedRunnerRoute.name === "telegram-monitor"
         && resolvedRunnerRoute.destinationLabel === "AI incubating CHAT ROOM"
         && resolvedRunnerRoute.dryRunDelivery === true
-        && runnerRouteKey(resolvedRunnerRoute) === "telegram-monitor::11111111-1111-1111-1111-111111111111::telegram::monitor::ServerProtocolMonitorBot::AI incubating CHAT ROOM",
-      `name=${resolvedRunnerRoute.name || "(none)"} destination=${resolvedRunnerRoute.destinationLabel || "(none)"} key=${runnerRouteKey(resolvedRunnerRoute)}`,
+        && runnerRouteKey(resolvedRunnerRoute) === "telegram-monitor::11111111-1111-1111-1111-111111111111::telegram::monitor::22222222-2222-2222-2222-222222222222::AI incubating CHAT ROOM"
+        && String(persistedRoute.server_bot_id || "") === "22222222-2222-2222-2222-222222222222"
+        && !Object.prototype.hasOwnProperty.call(persistedRoute, "bot_id"),
+      `name=${resolvedRunnerRoute.name || "(none)"} destination=${resolvedRunnerRoute.destinationLabel || "(none)"} key=${runnerRouteKey(resolvedRunnerRoute)} persisted=${JSON.stringify(persistedRoute)}`,
     );
   } catch (err) {
     push("bot_runner_inline_filters_reuse_configured_route", false, String(err?.message || err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metheus-governance-mcp-cli",
-  "version": "0.2.110",
+  "version": "0.2.112",
   "description": "Metheus Governance MCP CLI (setup + stdio proxy)",
   "type": "module",
   "files": [