metheus-governance-mcp-cli 0.2.90 → 0.2.92

package/README.md

@@ -31,7 +31,7 @@ Install creates local provider settings templates here:
 These files are for local provider bot secrets, local transport options, and optional per-bot local AI binding.
 
 - Store locally:
-  - `TELEGRAM_BOT_TOKEN` or named Telegram bot mappings such as `TELEGRAM_BOT_RYOAI_BOT_TOKEN`
+  - `TELEGRAM_BOT_TOKEN` or named Telegram bot mappings such as `TELEGRAM_BOT_RYOAI_TOKEN`
   - `SLACK_BOT_TOKEN`
   - `KAKAOTALK_BOT_TOKEN`
 - Server-side Metheus stores project chat destination metadata separately:
@@ -48,21 +48,21 @@ Example templates:
 TELEGRAM_API_BASE_URL=
 TELEGRAM_AUTO_CLEAR_WEBHOOK=true
 TELEGRAM_ALLOWED_UPDATES=message,edited_message
-TELEGRAM_DEFAULT_BOT_KEY=ryoai_bot
+TELEGRAM_DEFAULT_BOT_KEY=ryoai
 
 # Legacy fallback
 TELEGRAM_BOT_TOKEN=
 
 # Preferred named bot mapping
-TELEGRAM_BOT_RYOAI_BOT_SERVER_BOT_ID=
+TELEGRAM_BOT_RYOAI_SERVER_BOT_ID=
 # Optional fallback only when server bot binding is unavailable
-# TELEGRAM_BOT_RYOAI_BOT_USERNAME=<bot_username>
-TELEGRAM_BOT_RYOAI_BOT_TOKEN=
-TELEGRAM_BOT_RYOAI_BOT_ROLE_PROFILE=monitor
-TELEGRAM_BOT_RYOAI_BOT_AI_CLIENT=gpt
-TELEGRAM_BOT_RYOAI_BOT_AI_MODEL=gpt-5.4
-TELEGRAM_BOT_RYOAI_BOT_AI_PERMISSION_MODE=read_only
-TELEGRAM_BOT_RYOAI_BOT_AI_REASONING_EFFORT=low
+# TELEGRAM_BOT_RYOAI_USERNAME=<bot_username>
+TELEGRAM_BOT_RYOAI_TOKEN=
+TELEGRAM_BOT_RYOAI_ROLE_PROFILE=monitor
+TELEGRAM_BOT_RYOAI_AI_CLIENT=gpt
+TELEGRAM_BOT_RYOAI_AI_MODEL=gpt-5.4
+TELEGRAM_BOT_RYOAI_AI_PERMISSION_MODE=read_only
+TELEGRAM_BOT_RYOAI_AI_REASONING_EFFORT=low
 
 # ~/.metheus/slack.env
 SLACK_BOT_TOKEN=
@@ -212,15 +212,15 @@ Direct commands:
 
 ```bash
 metheus-governance-mcp-cli bot list
-metheus-governance-mcp-cli bot show --provider telegram --bot-key ryoai_bot
+metheus-governance-mcp-cli bot show --provider telegram --bot-key ryoai
 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_bot
-metheus-governance-mcp-cli bot migrate --provider telegram --bot-key ryoai_bot
+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 global --provider telegram
-metheus-governance-mcp-cli bot verify --provider telegram --bot-key ryoai_bot
+metheus-governance-mcp-cli bot verify --provider telegram --bot-key ryoai
 ```
 
 Behavior:
@@ -269,11 +269,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_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
+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
 ```
 
 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

@@ -749,32 +749,32 @@ function providerEnvTemplate(provider) {
       "# TELEGRAM_BOT_TOKEN=<bot token>",
       "#",
       "# Preferred v2 multi-bot mapping:",
-      "# TELEGRAM_DEFAULT_BOT_KEY=ryoai_bot",
-      "# TELEGRAM_BOT_RYOAI_BOT_SERVER_BOT_ID=<server bot uuid>",
-      "# TELEGRAM_BOT_RYOAI_BOT_USERNAME=<optional fallback username when server binding is unavailable>",
-      "# TELEGRAM_BOT_RYOAI_BOT_TOKEN=<bot token>",
-      "# TELEGRAM_BOT_RYOAI_BOT_ROLE_PROFILE=monitor",
-      "# TELEGRAM_BOT_RYOAI_BOT_AI_CLIENT=gpt",
-      "# TELEGRAM_BOT_RYOAI_BOT_AI_MODEL=gpt-5.4",
-      "# TELEGRAM_BOT_RYOAI_BOT_AI_PERMISSION_MODE=read_only",
-      "# TELEGRAM_BOT_RYOAI_BOT_AI_REASONING_EFFORT=low",
+      "# TELEGRAM_DEFAULT_BOT_KEY=ryoai",
+      "# TELEGRAM_BOT_RYOAI_SERVER_BOT_ID=<server bot uuid>",
+      "# TELEGRAM_BOT_RYOAI_USERNAME=<optional fallback username when server binding is unavailable>",
+      "# TELEGRAM_BOT_RYOAI_TOKEN=<bot token>",
+      "# TELEGRAM_BOT_RYOAI_ROLE_PROFILE=monitor",
+      "# TELEGRAM_BOT_RYOAI_AI_CLIENT=gpt",
+      "# TELEGRAM_BOT_RYOAI_AI_MODEL=gpt-5.4",
+      "# TELEGRAM_BOT_RYOAI_AI_PERMISSION_MODE=read_only",
+      "# TELEGRAM_BOT_RYOAI_AI_REASONING_EFFORT=low",
       "",
       "TELEGRAM_API_BASE_URL=",
       "TELEGRAM_AUTO_CLEAR_WEBHOOK=true",
       "TELEGRAM_ALLOWED_UPDATES=message,edited_message",
-      "TELEGRAM_DEFAULT_BOT_KEY=ryoai_bot",
+      "TELEGRAM_DEFAULT_BOT_KEY=ryoai",
       "",
       "# Legacy fallback (still supported)",
       "TELEGRAM_BOT_TOKEN=",
       "",
       "# Preferred named bot entry",
-      "TELEGRAM_BOT_RYOAI_BOT_SERVER_BOT_ID=",
-      "TELEGRAM_BOT_RYOAI_BOT_TOKEN=",
-      "TELEGRAM_BOT_RYOAI_BOT_ROLE_PROFILE=",
-      "TELEGRAM_BOT_RYOAI_BOT_AI_CLIENT=",
-      "TELEGRAM_BOT_RYOAI_BOT_AI_MODEL=",
-      "TELEGRAM_BOT_RYOAI_BOT_AI_PERMISSION_MODE=",
-      "TELEGRAM_BOT_RYOAI_BOT_AI_REASONING_EFFORT=",
+      "TELEGRAM_BOT_RYOAI_SERVER_BOT_ID=",
+      "TELEGRAM_BOT_RYOAI_TOKEN=",
+      "TELEGRAM_BOT_RYOAI_ROLE_PROFILE=",
+      "TELEGRAM_BOT_RYOAI_AI_CLIENT=",
+      "TELEGRAM_BOT_RYOAI_AI_MODEL=",
+      "TELEGRAM_BOT_RYOAI_AI_PERMISSION_MODE=",
+      "TELEGRAM_BOT_RYOAI_AI_REASONING_EFFORT=",
       "",
     ].join("\n");
   }
@@ -2641,6 +2641,7 @@ function normalizeTelegramBotEnvKey(rawValue, fallback = "") {
     .trim()
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, "_")
+    .replace(/_bot$/g, "")
     .replace(/^_+|_+$/g, "");
   return normalized || fallback;
 }
@@ -5078,8 +5079,8 @@ TELEGRAM_API_BASE_URL=http://127.0.0.1:8999/api
 TELEGRAM_AUTO_CLEAR_WEBHOOK=false
 TELEGRAM_ALLOWED_UPDATES=message,edited_message,channel_post
 TELEGRAM_DEFAULT_BOT_KEY=review
-TELEGRAM_BOT_RYOAI_BOT_USERNAME=RyoAI_bot
-TELEGRAM_BOT_RYOAI_BOT_TOKEN=ryoai-token
+TELEGRAM_BOT_RYOAI_USERNAME=RyoAI_bot
+TELEGRAM_BOT_RYOAI_TOKEN=ryoai-token
 TELEGRAM_BOT_REVIEW_SERVER_BOT_ID=bot-review
 TELEGRAM_BOT_REVIEW_USERNAME=ReviewBot
 TELEGRAM_BOT_REVIEW_TOKEN=review-token
@@ -5108,7 +5109,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_bot"
+      && telegramEnvV2ByUsername.botKey === "ryoai"
       && Array.isArray(telegramEnvV2ByUsername.allowedUpdates)
       && telegramEnvV2ByUsername.allowedUpdates.includes("channel_post"),
     `bot=${String(telegramEnvV2ByUsername.botKey || "(none)")} updates=${String((telegramEnvV2ByUsername.allowedUpdates || []).join(","))}`,

package/lib/bot-commands.mjs

@@ -67,7 +67,11 @@ function suggestDisplayedAIModel(deps, clientName, rawModelValue = "") {
 }
 
 function normalizeServerBotIdentityText(rawValue) {
-  return String(rawValue || "").trim().replace(/^@+/, "").toLowerCase();
+  return String(rawValue || "")
+    .trim()
+    .replace(/^@+/, "")
+    .toLowerCase()
+    .replace(/_bot$/g, "");
 }
 
 function summarizeServerBotRoles(bots) {
@@ -2151,8 +2155,8 @@ async function addTelegramBot(ui, flags, deps) {
   if (nonInteractive && existingKeys.has(botKey)) {
     throw new Error(`Telegram bot key "${botKey}" already exists`);
   }
-  const serverGroupMatched = !nonInteractive && serverBot.matchMode === "group";
-  if (serverGroupMatched) {
+  const serverGroupMatched = serverBot.matchMode === "group";
+  if (serverGroupMatched && !nonInteractive) {
     process.stdout.write(
       `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`,
     );
@@ -2176,8 +2180,7 @@ async function addTelegramBot(ui, flags, deps) {
     || hasOwnFlag(flags, "reasoning-effort")
     || hasOwnFlag(flags, "ai-reasoning-effort");
   const autoApplyRoleDefaults = !nonInteractive && roleProfileAutoResolved && !aiFlagOverrides;
-  const autoUseServerRoleRouting = !nonInteractive
-    && serverGroupMatched
+  const autoUseServerRoleRouting = serverGroupMatched
     && !String(flags["role-profile"] || "").trim()
     && !aiFlagOverrides;
   const client = requireDependency(deps, "normalizeLocalAIClientName")(

package/lib/selftest-bot-commands.mjs

@@ -391,12 +391,12 @@ export async function runSelftestBotCommands(push, deps) {
       const groupedState = parseSimpleEnvText(fs.readFileSync(telegramEnvPath, "utf8"));
     push(
       "bot_add_guided_autoresolves_server_bot_group_without_role_prompt",
-        String(groupedState.TELEGRAM_BOT_RYOAI_BOT_USERNAME || "").trim() === ""
-          && String(groupedState.TELEGRAM_BOT_RYOAI_BOT_SERVER_BOT_ID || "") === ""
-          && String(groupedState.TELEGRAM_BOT_RYOAI_BOT_ROLE_PROFILE || "") === ""
-          && String(groupedState.TELEGRAM_BOT_RYOAI_BOT_AI_CLIENT || "") === ""
-          && String(groupedState.TELEGRAM_BOT_RYOAI_BOT_AI_PERMISSION_MODE || "") === "",
-        `username=${String(groupedState.TELEGRAM_BOT_RYOAI_BOT_USERNAME || "")} server_bot_id=${String(groupedState.TELEGRAM_BOT_RYOAI_BOT_SERVER_BOT_ID || "")} role=${String(groupedState.TELEGRAM_BOT_RYOAI_BOT_ROLE_PROFILE || "")}`,
+        String(groupedState.TELEGRAM_BOT_RYOAI_USERNAME || "").trim() === ""
+          && String(groupedState.TELEGRAM_BOT_RYOAI_SERVER_BOT_ID || "") === ""
+          && String(groupedState.TELEGRAM_BOT_RYOAI_ROLE_PROFILE || "") === ""
+          && String(groupedState.TELEGRAM_BOT_RYOAI_AI_CLIENT || "") === ""
+          && String(groupedState.TELEGRAM_BOT_RYOAI_AI_PERMISSION_MODE || "") === "",
+        `username=${String(groupedState.TELEGRAM_BOT_RYOAI_USERNAME || "")} server_bot_id=${String(groupedState.TELEGRAM_BOT_RYOAI_SERVER_BOT_ID || "")} role=${String(groupedState.TELEGRAM_BOT_RYOAI_ROLE_PROFILE || "")}`,
       );
 
       const groupedEditResult = await runCLI({
@@ -410,7 +410,7 @@ export async function runSelftestBotCommands(push, deps) {
           ...env,
           METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
             "1", // provider: telegram
-            "2", // bot entry: ryoai_bot
+            "2", // bot entry: ryoai
             "1", // keep token
             "2", // grouped role settings: edit one role
             "3", // select role to edit: worker
@@ -455,7 +455,7 @@ export async function runSelftestBotCommands(push, deps) {
         args: [
           "bot", "show",
           "--provider", "telegram",
-          "--bot-key", "ryoai_bot",
+          "--bot-key", "ryoai",
           "--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.90",
+  "version": "0.2.92",
   "description": "Metheus Governance MCP CLI (setup + stdio proxy)",
   "type": "module",
   "files": [