metheus-governance-mcp-cli 0.2.98 → 0.2.100

package/README.md

@@ -33,7 +33,7 @@ These files are for local provider bot secrets, local transport options, and opt
 - Store locally:
   - Telegram-wide settings in `~/.metheus/telegram-bots/_global.env`
   - `TELEGRAM_BOT_TOKEN` as a legacy Telegram fallback in `_global.env`
-  - one Telegram bot file per entry in `~/.metheus/telegram-bots/<bot-key>.env`
+  - one Telegram bot file per entry in `~/.metheus/telegram-bots/<server-bot-name>.env`
   - `SLACK_BOT_TOKEN`
   - `KAKAOTALK_BOT_TOKEN`
 - Server-side Metheus stores project chat destination metadata separately:
@@ -50,14 +50,14 @@ Example templates:
 TELEGRAM_API_BASE_URL=
 TELEGRAM_AUTO_CLEAR_WEBHOOK=true
 TELEGRAM_ALLOWED_UPDATES=message,edited_message
-TELEGRAM_DEFAULT_BOT_KEY=ryoai
+TELEGRAM_DEFAULT_BOT_KEY=ryoai_bot
 
 # Legacy fallback
 TELEGRAM_BOT_TOKEN=
 ```
 
 ```env
-# ~/.metheus/telegram-bots/ryoai.env
+# ~/.metheus/telegram-bots/ryoai_bot.env
 TELEGRAM_BOT_NAME=ryoai_bot
 TELEGRAM_BOT_SERVER_BOT_ID=
 TELEGRAM_BOT_TOKEN=
@@ -172,7 +172,7 @@ metheus-governance-mcp-cli setup --project-id <project_uuid> --ctxpack-key "<ctx
 When Telegram local config already exists, bootstrap/setup keeps your secrets but auto-normalizes the layout to the latest split structure:
 
 - Telegram-wide settings stay in `~/.metheus/telegram-bots/_global.env`
-- per-bot secrets move to `~/.metheus/telegram-bots/<bot-key>.env`
+- per-bot secrets move to `~/.metheus/telegram-bots/<server-bot-name>.env`
 - stale inline keys such as `TELEGRAM_BOT_<NAME>_BOT_*` are rewritten into generic per-bot keys
 
 Fill provider bot secrets and provider-local transport options locally. Project chat destination identifiers should be managed on the Metheus server as project chat destinations, not as local env values and not inside legacy Chat Hooks/webhooks.
@@ -223,15 +223,15 @@ Direct commands:
 
 ```bash
 metheus-governance-mcp-cli bot list
-metheus-governance-mcp-cli bot show --provider telegram --bot-key ryoai
+metheus-governance-mcp-cli bot show --provider telegram --bot-key ryoai_bot
 metheus-governance-mcp-cli bot add --provider telegram
 metheus-governance-mcp-cli bot edit
 metheus-governance-mcp-cli bot edit --provider telegram
 metheus-governance-mcp-cli bot remove --provider telegram
-metheus-governance-mcp-cli bot set-default --provider telegram --bot-key ryoai
-metheus-governance-mcp-cli bot migrate --provider telegram --bot-key ryoai
+metheus-governance-mcp-cli bot set-default --provider telegram --bot-key ryoai_bot
+metheus-governance-mcp-cli bot migrate --provider telegram --bot-key ryoai_bot
 metheus-governance-mcp-cli bot global --provider telegram
-metheus-governance-mcp-cli bot verify --provider telegram --bot-key ryoai
+metheus-governance-mcp-cli bot verify --provider telegram --bot-key ryoai_bot
 ```
 
 Behavior:
@@ -258,7 +258,7 @@ Behavior:
 - `bot set-default` without flags starts a guided numbered flow: provider -> bot entry -> confirm default change.
 - `bot verify` without flags starts a guided numbered flow: provider -> bot entry -> output format.
 - `bot remove` without flags starts a guided numbered flow: provider -> bot entry -> confirm removal.
-- Telegram stores one bot file per entry under `~/.metheus/telegram-bots/<bot-key>.env` with generic fields:
+- Telegram stores one bot file per entry under `~/.metheus/telegram-bots/<server-bot-name>.env` with generic fields:
   - `TELEGRAM_BOT_NAME`
   - `TELEGRAM_BOT_SERVER_BOT_ID`
   - `TELEGRAM_BOT_TOKEN`
@@ -280,11 +280,11 @@ Non-interactive examples:
 metheus-governance-mcp-cli bot global --provider telegram --non-interactive true --api-base-url http://127.0.0.1:8999/telegram --auto-clear-webhook false --allowed-updates message,edited_message,channel_post
 metheus-governance-mcp-cli bot add --provider telegram --non-interactive true --server-bot-id <server_bot_uuid> --token <telegram_bot_token> --default true
 metheus-governance-mcp-cli bot add --provider telegram --non-interactive true --server-bot-id <server_bot_uuid> --token <telegram_bot_token> --ai-client gpt --ai-model "gpt-5.4" --ai-permission-mode read_only --ai-reasoning-effort low
-metheus-governance-mcp-cli bot edit --provider telegram --bot-key ryoai --non-interactive true --ai-client claude --ai-model "Sonnet 4.6r" --ai-permission-mode danger_full_access --ai-reasoning-effort high
-metheus-governance-mcp-cli bot set-default --provider telegram --bot-key ryoai --non-interactive true
-metheus-governance-mcp-cli bot migrate --provider telegram --bot-key ryoai --server-bot-id <server_bot_uuid> --bot-name <telegram_username> --role-profile monitor --ai-client gpt --ai-permission-mode read_only --ai-reasoning-effort low --non-interactive true
-metheus-governance-mcp-cli bot remove --provider telegram --bot-key ryoai --non-interactive true
-metheus-governance-mcp-cli bot verify --provider telegram --bot-key ryoai --json true
+metheus-governance-mcp-cli bot edit --provider telegram --bot-key ryoai_bot --non-interactive true --ai-client claude --ai-model "Sonnet 4.6r" --ai-permission-mode danger_full_access --ai-reasoning-effort high
+metheus-governance-mcp-cli bot set-default --provider telegram --bot-key ryoai_bot --non-interactive true
+metheus-governance-mcp-cli bot migrate --provider telegram --bot-key ryoai_bot --server-bot-id <server_bot_uuid> --bot-name <telegram_username> --role-profile monitor --ai-client gpt --ai-permission-mode read_only --ai-reasoning-effort low --non-interactive true
+metheus-governance-mcp-cli bot remove --provider telegram --bot-key ryoai_bot --non-interactive true
+metheus-governance-mcp-cli bot verify --provider telegram --bot-key ryoai_bot --json true
 ```
 
 For direct Telegram adds, the CLI can derive the local entry key from the matched server bot name. You no longer need `--bot-key` or `--username` in the normal server-bound path. Treat `--bot-key` as an advanced override only when you intentionally want a different local suffix.

package/cli.mjs

@@ -2666,7 +2666,6 @@ function normalizeTelegramBotEnvKey(rawValue, fallback = "") {
     .trim()
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, "_")
-    .replace(/_bot$/g, "")
     .replace(/^_+|_+$/g, "");
   return normalized || fallback;
 }
@@ -2727,24 +2726,30 @@ function collectTelegramEnvBotEntries(parsedEnv) {
     }
     entries.set(botKey, entry);
   }
-  return Array.from(entries.values());
+  return Array.from(entries.values()).map((entryRaw) => {
+    const entry = { ...safeObject(entryRaw) };
+    const preferredKey = normalizeTelegramBotEnvKey(entry.username || "", "");
+    if (preferredKey) {
+      entry.key = preferredKey;
+    }
+    return entry;
+  });
 }
 
 function telegramBotEntryDisplayNameForState(entry) {
   const current = safeObject(entry);
   const username = normalizeTelegramBotUsername(current.username || "");
   if (username) return username;
-  const key = normalizeTelegramBotEnvKey(current.key || "", "telegram_bot");
-  if (!key) return "telegram_bot";
-  return key.endsWith("_bot") ? key : `${key}_bot`;
+  return normalizeTelegramBotEnvKey(current.key || "", "telegram_bot");
 }
 
 function parseTelegramBotEntryFile(filePath) {
   const raw = fs.readFileSync(filePath, "utf8");
   const parsed = parseSimpleEnvText(raw);
   const keyFromFile = normalizeTelegramBotEnvKey(path.basename(filePath, path.extname(filePath)), "telegram_bot");
+  const keyFromName = normalizeTelegramBotEnvKey(parsed.TELEGRAM_BOT_NAME || parsed.TELEGRAM_BOT_USERNAME || "", "");
   return {
-    key: keyFromFile,
+    key: keyFromName || keyFromFile,
     username: normalizeTelegramBotUsername(parsed.TELEGRAM_BOT_NAME || parsed.TELEGRAM_BOT_USERNAME || ""),
     serverBotID: String(parsed.TELEGRAM_BOT_SERVER_BOT_ID || "").trim(),
     token: String(parsed.TELEGRAM_BOT_TOKEN || "").trim(),
@@ -2757,6 +2762,28 @@ function parseTelegramBotEntryFile(filePath) {
   };
 }
 
+function remapTelegramDefaultBotKey(defaultKeyRaw, entries) {
+  const defaultKey = normalizeTelegramBotEnvKey(defaultKeyRaw || "", "");
+  if (!defaultKey) return "";
+  const rows = ensureArray(entries).map((entry) => safeObject(entry));
+  if (rows.some((entry) => String(entry.key || "").trim() === defaultKey)) {
+    return defaultKey;
+  }
+  const directBotMatch = rows.find((entry) => String(entry.key || "").trim() === `${defaultKey}_bot`);
+  if (directBotMatch) {
+    return String(directBotMatch.key || "").trim();
+  }
+  const compactBotMatch = rows.find((entry) => String(entry.key || "").trim() === `${defaultKey}bot`);
+  if (compactBotMatch) {
+    return String(compactBotMatch.key || "").trim();
+  }
+  const byUsername = rows.find((entry) => normalizeTelegramBotUsername(entry.username || "") === defaultKey);
+  if (byUsername) {
+    return String(byUsername.key || "").trim();
+  }
+  return defaultKey;
+}
+
 function loadTelegramBotEntriesFromFiles() {
   const dirPath = telegramBotEntriesDirPath();
   if (!fs.existsSync(dirPath)) return [];
@@ -2834,6 +2861,7 @@ function readTelegramEnvState() {
     }
   });
   const entries = Array.from(mergedEntries.values());
+  globalParsed.TELEGRAM_DEFAULT_BOT_KEY = remapTelegramDefaultBotKey(globalParsed.TELEGRAM_DEFAULT_BOT_KEY || "", entries);
   return {
     filePath,
     legacyFilePath,
@@ -2854,14 +2882,15 @@ function telegramEntryCommentNameForEnv(entry) {
   const current = safeObject(entry);
   const username = normalizeTelegramBotUsername(current.username || "");
   if (username) return username;
-  const key = normalizeTelegramBotEnvKey(current.key || "", "telegram_bot");
-  if (!key) return "telegram_bot";
-  return key.endsWith("_bot") ? key : `${key}_bot`;
+  return normalizeTelegramBotEnvKey(current.key || "", "telegram_bot");
 }
 
 function renderNormalizedTelegramEnv(parsedEnv) {
   const parsed = safeObject(parsedEnv);
-  const defaultBotKey = normalizeTelegramBotEnvKey(parsed.TELEGRAM_DEFAULT_BOT_KEY || "", "");
+  const defaultBotKey = remapTelegramDefaultBotKey(
+    parsed.TELEGRAM_DEFAULT_BOT_KEY || "",
+    collectTelegramEnvBotEntries(parsed),
+  );
   const lines = [
     "# Metheus local Telegram bot settings",
     "# Keep this file on your machine only. Do not commit it.",
@@ -3001,7 +3030,7 @@ function resolveTelegramEnvConfig(parsedEnv, filePath, config, selectors = {}) {
     selectors.route?.telegramBotKey,
     selectors.route?.telegram_bot_key,
   ]), "");
-  const defaultBotKey = normalizeTelegramBotEnvKey(parsed.TELEGRAM_DEFAULT_BOT_KEY || "", "");
+  const defaultBotKey = remapTelegramDefaultBotKey(parsed.TELEGRAM_DEFAULT_BOT_KEY || "", entries);
   let selected = null;
   if (desiredBotID) {
     selected = entries.find((entry) => entry.serverBotID === desiredBotID) || null;
@@ -5384,7 +5413,7 @@ TELEGRAM_BOT_REVIEW_TOKEN=review-token
     "telegram_env_v2_default_bot_key_selects_named_token",
     telegramEnvV2Default.ok
       && telegramEnvV2Default.token === "review-token"
-      && telegramEnvV2Default.botKey === "review"
+      && telegramEnvV2Default.botKey === "reviewbot"
       && telegramEnvV2Default.autoClearWebhook === false,
     `bot=${String(telegramEnvV2Default.botKey || "(none)")} token=${String(telegramEnvV2Default.token || "(missing)")}`,
   );
@@ -5398,7 +5427,7 @@ TELEGRAM_BOT_REVIEW_TOKEN=review-token
     "telegram_env_v2_bot_name_override_selects_matching_token",
     telegramEnvV2ByUsername.ok
       && telegramEnvV2ByUsername.token === "ryoai-token"
-      && telegramEnvV2ByUsername.botKey === "ryoai"
+      && telegramEnvV2ByUsername.botKey === "ryoai_bot"
       && Array.isArray(telegramEnvV2ByUsername.allowedUpdates)
       && telegramEnvV2ByUsername.allowedUpdates.includes("channel_post"),
     `bot=${String(telegramEnvV2ByUsername.botKey || "(none)")} updates=${String((telegramEnvV2ByUsername.allowedUpdates || []).join(","))}`,
@@ -5423,9 +5452,10 @@ TELEGRAM_BOT_REVIEW_TOKEN=review-token
       ].join("\n"),
       "utf8",
     );
-    ensureProviderEnvTemplate("telegram");
+    const normalizedState = readTelegramEnvState();
+    writeTelegramEnvState(normalizedState.parsed);
     normalizedGlobalText = fs.readFileSync(providerEnvFilePath("telegram"), "utf8");
-    normalizedBotText = fs.readFileSync(telegramBotEntryFilePath("ryoai"), "utf8");
+    normalizedBotText = fs.readFileSync(telegramBotEntryFilePath("ryoai_bot"), "utf8");
   } finally {
     if (previousUserProfile === undefined) delete process.env.USERPROFILE;
     else process.env.USERPROFILE = previousUserProfile;
@@ -5434,7 +5464,7 @@ TELEGRAM_BOT_REVIEW_TOKEN=review-token
   }
   push(
     "telegram_env_existing_file_auto_normalizes_named_keys",
-    normalizedGlobalText.includes("TELEGRAM_DEFAULT_BOT_KEY=ryoai")
+    normalizedGlobalText.includes("TELEGRAM_DEFAULT_BOT_KEY=ryoai_bot")
       && !normalizedGlobalText.includes("TELEGRAM_BOT_RYOAI_BOT_TOKEN")
       && !normalizedGlobalText.includes("TELEGRAM_BOT_RYOAI_TOKEN")
       && normalizedBotText.includes("TELEGRAM_BOT_NAME=ryoai_bot")

package/lib/bot-commands.mjs

@@ -1475,6 +1475,18 @@ async function resolveServerBotForNonInteractive(provider, flags, deps, options
     if (!match) {
       throw new Error(`server bot ${requestedBotID} not found`);
     }
+    const sameNameMatches = bots.filter(
+      (bot) => normalizeServerBotIdentityText(bot.name) === normalizeServerBotIdentityText(match.name),
+    );
+    if (sameNameMatches.length > 1) {
+      return {
+        botID: match.id,
+        role: "",
+        name: match.name,
+        roles: summarizeServerBotRoles(sameNameMatches),
+        matchMode: "group",
+      };
+    }
     return {
       botID: match.id,
       role: match.role,
@@ -2189,16 +2201,6 @@ async function addTelegramBot(ui, flags, deps) {
       `Matched server Telegram bot "${serverBot.name || username || botKey}" with roles: ${ensureArray(serverBot.roles).join(", ")}. Runtime will use the server role, so local role/AI fields can stay empty.\n`,
     );
   }
-  const defaultRoleProfile = firstNonEmptyString([flags["role-profile"], serverBot.role, ""]);
-  const roleProfileAutoResolved = !nonInteractive && !String(flags["role-profile"] || "").trim() && Boolean(defaultRoleProfile);
-  const roleProfile = requireDependency(deps, "normalizeRunnerRoleProfileName")(
-    nonInteractive
-      ? String(flags["role-profile"] || defaultRoleProfile).trim()
-      : (serverGroupMatched && !String(flags["role-profile"] || "").trim()
-        ? ""
-        : (roleProfileAutoResolved ? defaultRoleProfile : await promptTelegramRoleProfile(ui, deps, defaultRoleProfile))),
-  );
-  const roleProfileDefaults = resolveRoleProfileDefaults(roleProfile, deps);
   const aiFlagOverrides = hasOwnFlag(flags, "client")
     || hasOwnFlag(flags, "ai-client")
     || hasOwnFlag(flags, "model")
@@ -2207,13 +2209,23 @@ async function addTelegramBot(ui, flags, deps) {
     || hasOwnFlag(flags, "ai-permission-mode")
     || hasOwnFlag(flags, "reasoning-effort")
     || hasOwnFlag(flags, "ai-reasoning-effort");
-  const autoApplyRoleDefaults = !nonInteractive && roleProfileAutoResolved && !aiFlagOverrides;
+  const defaultRoleProfile = firstNonEmptyString([flags["role-profile"], serverBot.role, ""]);
+  const roleProfileAutoResolved = !nonInteractive && !String(flags["role-profile"] || "").trim() && Boolean(defaultRoleProfile);
   const autoUseServerRoleRouting = serverGroupMatched
     && !String(flags["role-profile"] || "").trim()
     && !aiFlagOverrides;
+  const roleProfile = requireDependency(deps, "normalizeRunnerRoleProfileName")(
+    nonInteractive
+      ? (autoUseServerRoleRouting ? "" : String(flags["role-profile"] || defaultRoleProfile).trim())
+      : (serverGroupMatched && !String(flags["role-profile"] || "").trim()
+        ? ""
+        : (roleProfileAutoResolved ? defaultRoleProfile : await promptTelegramRoleProfile(ui, deps, defaultRoleProfile))),
+  );
+  const roleProfileDefaults = resolveRoleProfileDefaults(roleProfile, deps);
+  const autoApplyRoleDefaults = !nonInteractive && roleProfileAutoResolved && !aiFlagOverrides;
   const client = requireDependency(deps, "normalizeLocalAIClientName")(
     nonInteractive
-      ? firstNonEmptyString([getAIClientFlag(flags), roleProfileDefaults.client])
+      ? (autoUseServerRoleRouting ? getAIClientFlag(flags) : firstNonEmptyString([getAIClientFlag(flags), roleProfileDefaults.client]))
       : (autoUseServerRoleRouting
         ? getAIClientFlag(flags)
         : (autoApplyRoleDefaults
@@ -2222,15 +2234,15 @@ async function addTelegramBot(ui, flags, deps) {
     "",
   );
   const model = nonInteractive
-    ? firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model])
+    ? (autoUseServerRoleRouting ? getAIModelFlag(flags) : firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))
     : (autoUseServerRoleRouting
       ? getAIModelFlag(flags)
       : (autoApplyRoleDefaults
-        ? await promptAIModel(ui, deps, client, firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))
-        : await promptAIModel(ui, deps, client, firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))));
+          ? await promptAIModel(ui, deps, client, firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))
+          : await promptAIModel(ui, deps, client, firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))));
   const permissionMode = requireDependency(deps, "normalizeLocalAIPermissionMode")(
     nonInteractive
-      ? firstNonEmptyString([getAIPermissionModeFlag(flags), roleProfileDefaults.permissionMode])
+      ? (autoUseServerRoleRouting ? getAIPermissionModeFlag(flags) : firstNonEmptyString([getAIPermissionModeFlag(flags), roleProfileDefaults.permissionMode]))
       : (autoUseServerRoleRouting
         ? getAIPermissionModeFlag(flags)
         : (autoApplyRoleDefaults
@@ -2240,7 +2252,7 @@ async function addTelegramBot(ui, flags, deps) {
   );
   const reasoningEffort = requireDependency(deps, "normalizeLocalAIReasoningEffort")(
     nonInteractive
-      ? firstNonEmptyString([getAIReasoningEffortFlag(flags), roleProfileDefaults.reasoningEffort])
+      ? (autoUseServerRoleRouting ? getAIReasoningEffortFlag(flags) : firstNonEmptyString([getAIReasoningEffortFlag(flags), roleProfileDefaults.reasoningEffort]))
       : (autoUseServerRoleRouting
         ? getAIReasoningEffortFlag(flags)
         : (autoApplyRoleDefaults

package/lib/selftest-bot-commands.mjs

@@ -398,7 +398,7 @@ export async function runSelftestBotCommands(push, deps) {
           ]),
         },
       });
-      const groupedState = readTelegramBotEntry("ryoai");
+      const groupedState = readTelegramBotEntry("ryoai_bot");
     push(
       "bot_add_guided_autoresolves_server_bot_group_without_role_prompt",
         String(groupedState.TELEGRAM_BOT_NAME || "").toLowerCase() === "ryoai_bot"
@@ -420,7 +420,7 @@ export async function runSelftestBotCommands(push, deps) {
           ...env,
           METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
             "1", // provider: telegram
-            "2", // bot entry: ryoai
+            "2", // bot entry: ryoai_bot
             "1", // keep token
             "2", // grouped role settings: edit one role
             "3", // select role to edit: worker
@@ -465,7 +465,7 @@ export async function runSelftestBotCommands(push, deps) {
         args: [
           "bot", "show",
           "--provider", "telegram",
-          "--bot-key", "ryoai",
+          "--bot-key", "ryoai_bot",
           "--base-url", `http://127.0.0.1:${groupedMock.port}`,
           "--json", "true",
         ],

package/package.json

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