metheus-governance-mcp-cli 0.2.88 → 0.2.90

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_MAIN_TOKEN`
+  - `TELEGRAM_BOT_TOKEN` or named Telegram bot mappings such as `TELEGRAM_BOT_RYOAI_BOT_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=main
+TELEGRAM_DEFAULT_BOT_KEY=ryoai_bot
 
 # Legacy fallback
 TELEGRAM_BOT_TOKEN=
 
 # Preferred named bot mapping
-TELEGRAM_BOT_MAIN_SERVER_BOT_ID=
+TELEGRAM_BOT_RYOAI_BOT_SERVER_BOT_ID=
 # Optional fallback only when server bot binding is unavailable
-# TELEGRAM_BOT_MAIN_USERNAME=<bot_username>
-TELEGRAM_BOT_MAIN_TOKEN=
-TELEGRAM_BOT_MAIN_ROLE_PROFILE=monitor
-TELEGRAM_BOT_MAIN_AI_CLIENT=codex
-TELEGRAM_BOT_MAIN_AI_MODEL=
-TELEGRAM_BOT_MAIN_AI_PERMISSION_MODE=read_only
-TELEGRAM_BOT_MAIN_AI_REASONING_EFFORT=low
+# 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
 
 # ~/.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 main
+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 main
-metheus-governance-mcp-cli bot migrate --provider telegram --bot-key main
+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 main
+metheus-governance-mcp-cli bot verify --provider telegram --bot-key ryoai_bot
 ```
 
 Behavior:
@@ -270,10 +270,10 @@ metheus-governance-mcp-cli bot global --provider telegram --non-interactive true
 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 main --non-interactive true
-metheus-governance-mcp-cli bot migrate --provider telegram --bot-key main --server-bot-id <server_bot_uuid> --bot-name <telegram_username> --role-profile monitor --ai-client codex --ai-permission-mode read_only --ai-reasoning-effort low --non-interactive true
-metheus-governance-mcp-cli bot remove --provider telegram --bot-key main --non-interactive true
-metheus-governance-mcp-cli bot verify --provider telegram --bot-key main --json true
+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

@@ -749,32 +749,32 @@ function providerEnvTemplate(provider) {
       "# TELEGRAM_BOT_TOKEN=<bot token>",
       "#",
       "# Preferred v2 multi-bot mapping:",
-      "# TELEGRAM_DEFAULT_BOT_KEY=main",
-      "# TELEGRAM_BOT_MAIN_SERVER_BOT_ID=<server bot uuid>",
-      "# TELEGRAM_BOT_MAIN_USERNAME=<optional fallback username when server binding is unavailable>",
-      "# TELEGRAM_BOT_MAIN_TOKEN=<bot token>",
-      "# TELEGRAM_BOT_MAIN_ROLE_PROFILE=monitor",
-      "# TELEGRAM_BOT_MAIN_AI_CLIENT=codex",
-      "# TELEGRAM_BOT_MAIN_AI_MODEL=",
-      "# TELEGRAM_BOT_MAIN_AI_PERMISSION_MODE=read_only",
-      "# TELEGRAM_BOT_MAIN_AI_REASONING_EFFORT=low",
+      "# 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_API_BASE_URL=",
       "TELEGRAM_AUTO_CLEAR_WEBHOOK=true",
       "TELEGRAM_ALLOWED_UPDATES=message,edited_message",
-      "TELEGRAM_DEFAULT_BOT_KEY=main",
+      "TELEGRAM_DEFAULT_BOT_KEY=ryoai_bot",
       "",
       "# Legacy fallback (still supported)",
       "TELEGRAM_BOT_TOKEN=",
       "",
       "# Preferred named bot entry",
-      "TELEGRAM_BOT_MAIN_SERVER_BOT_ID=",
-      "TELEGRAM_BOT_MAIN_TOKEN=",
-      "TELEGRAM_BOT_MAIN_ROLE_PROFILE=",
-      "TELEGRAM_BOT_MAIN_AI_CLIENT=",
-      "TELEGRAM_BOT_MAIN_AI_MODEL=",
-      "TELEGRAM_BOT_MAIN_AI_PERMISSION_MODE=",
-      "TELEGRAM_BOT_MAIN_AI_REASONING_EFFORT=",
+      "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=",
       "",
     ].join("\n");
   }
@@ -5078,8 +5078,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_MAIN_USERNAME=RyoAI_bot
-TELEGRAM_BOT_MAIN_TOKEN=main-token
+TELEGRAM_BOT_RYOAI_BOT_USERNAME=RyoAI_bot
+TELEGRAM_BOT_RYOAI_BOT_TOKEN=ryoai-token
 TELEGRAM_BOT_REVIEW_SERVER_BOT_ID=bot-review
 TELEGRAM_BOT_REVIEW_USERNAME=ReviewBot
 TELEGRAM_BOT_REVIEW_TOKEN=review-token
@@ -5107,8 +5107,8 @@ TELEGRAM_BOT_REVIEW_TOKEN=review-token
   push(
     "telegram_env_v2_bot_name_override_selects_matching_token",
     telegramEnvV2ByUsername.ok
-      && telegramEnvV2ByUsername.token === "main-token"
-      && telegramEnvV2ByUsername.botKey === "main"
+      && telegramEnvV2ByUsername.token === "ryoai-token"
+      && telegramEnvV2ByUsername.botKey === "ryoai_bot"
       && Array.isArray(telegramEnvV2ByUsername.allowedUpdates)
       && telegramEnvV2ByUsername.allowedUpdates.includes("channel_post"),
     `bot=${String(telegramEnvV2ByUsername.botKey || "(none)")} updates=${String((telegramEnvV2ByUsername.allowedUpdates || []).join(","))}`,

package/lib/bot-commands.mjs

@@ -724,12 +724,12 @@ function buildDerivedTelegramBotKey(parsedEnv, deps, preferredValues, { excludeK
   const candidates = uniqueNormalizedValues(
     [
       ...ensureArray(preferredValues),
-      "main",
+      "telegram_bot",
     ],
     deps,
-    "main",
+    "telegram_bot",
   );
-  const baseKey = candidates[0] || normalizeBotKey("main", "main") || "main";
+  const baseKey = candidates[0] || normalizeBotKey("telegram_bot", "telegram_bot") || "telegram_bot";
   for (const candidate of candidates) {
     if (!existingKeys.has(candidate)) {
       return candidate;
@@ -748,9 +748,24 @@ async function editTelegramBotGuided(ui, parsed, selected, current, flags, deps)
   let groupedServerName = "";
   let serverManagedIdentity = Boolean(current.serverBotID || current.__preferServerIdentity);
   if (!serverManagedIdentity) {
-    const initialServerBot = await autoResolveTelegramServerBot(current, flags, deps);
-    if (String(initialServerBot.botID || "").trim() || initialServerBot.matchMode === "group") {
+    const initialBinding = await resolveTelegramServerBindingDetails(
+      {
+        serverBotID: current.serverBotID,
+        botUsername: current.username,
+        botKey: current.key,
+        roleProfile: current.roleProfile,
+      },
+      flags,
+      deps,
+    );
+    if (initialBinding.ok && (String(initialBinding.serverBotID || "").trim() || initialBinding.mode === "group")) {
       serverManagedIdentity = true;
+      current.__preferServerIdentity = true;
+      if (initialBinding.mode === "single") {
+        current.serverBotID = String(initialBinding.serverBotID || "").trim();
+        current.roleProfile = String(initialBinding.role || current.roleProfile || "").trim();
+        applyRoleProfileDefaults(current, resolveRoleProfileDefaults(current.roleProfile, deps));
+      }
     }
   }
   let usernameAction = "keep";
@@ -2046,7 +2061,7 @@ async function addTelegramBot(ui, flags, deps) {
   const nonInteractive = boolFromRaw(flags["non-interactive"] ?? flags.yes, false);
   const normalizeBotKey = requireDependency(deps, "normalizeTelegramBotEnvKey");
   const existingKeys = new Set(telegramEntriesForDisplay(parsed, deps).map((entry) => entry.key));
-  const defaultKeyHint = normalizeBotKey(flags["bot-key"] || "main", "main");
+  const defaultKeyHint = normalizeBotKey(flags["bot-key"] || "telegram_bot", "telegram_bot");
 
   const token = nonInteractive
     ? String(flags.token || "").trim()
@@ -2783,7 +2798,7 @@ async function runBotMigrate(ui, flags, deps) {
   const nonInteractive = boolFromRaw(flags["non-interactive"] ?? flags.yes, false);
   const normalizeBotKey = requireDependency(deps, "normalizeTelegramBotEnvKey");
   const existingKeys = new Set(telegramEntriesForDisplay(parsed, deps).map((entry) => entry.key));
-  const defaultKeyHint = normalizeBotKey(flags["bot-key"] || parsed.TELEGRAM_DEFAULT_BOT_KEY || "main", "main");
+  const defaultKeyHint = normalizeBotKey(flags["bot-key"] || parsed.TELEGRAM_DEFAULT_BOT_KEY || "telegram_bot", "telegram_bot");
   const botKey = normalizeBotKey(
     nonInteractive
       ? String(flags["bot-key"] || defaultKeyHint).trim()

package/package.json

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