metheus-governance-mcp-cli 0.2.97 → 0.2.99

package/README.md

@@ -23,7 +23,6 @@ npm install -g metheus-governance-mcp-cli@latest
 
 Install creates local provider settings templates here:
 
-- `~/.metheus/telegram.env`
 - `~/.metheus/telegram-bots/`
 - `~/.metheus/slack.env`
 - `~/.metheus/kakaotalk.env`
@@ -32,8 +31,9 @@ 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` as a legacy Telegram fallback in `telegram.env`
-  - one Telegram bot file per entry in `~/.metheus/telegram-bots/<bot-key>.env`
+  - 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/<server-bot-name>.env`
   - `SLACK_BOT_TOKEN`
   - `KAKAOTALK_BOT_TOKEN`
 - Server-side Metheus stores project chat destination metadata separately:
@@ -41,23 +41,23 @@ These files are for local provider bot secrets, local transport options, and opt
   - `chat_id` / channel / room identifier
   - label / active state
 - Do not put project chat destination identifiers in local env files.
-- Telegram-wide settings stay in `telegram.env`; Telegram per-bot secrets and AI fields live in `telegram-bots/*.env`.
+- Telegram-wide settings now live in `telegram-bots/_global.env`; Telegram per-bot secrets and AI fields live in `telegram-bots/*.env`.
 
 Example templates:
 
 ```env
-# ~/.metheus/telegram.env
+# ~/.metheus/telegram-bots/_global.env
 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=
@@ -164,7 +164,6 @@ metheus-governance-mcp-cli setup --project-id <project_uuid> --ctxpack-key "<ctx
 
 `setup` also ensures local provider templates exist:
 
-- `~/.metheus/telegram.env`
 - `~/.metheus/telegram-bots/`
 - `~/.metheus/slack.env`
 - `~/.metheus/kakaotalk.env`
@@ -172,8 +171,8 @@ 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.env`
-- per-bot secrets move to `~/.metheus/telegram-bots/<bot-key>.env`
+- Telegram-wide settings stay in `~/.metheus/telegram-bots/_global.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.
@@ -183,7 +182,7 @@ Fill provider bot secrets and provider-local transport options locally. Project
 - which provider/role bot profile to use
 - which `project_id -> workspace_dir` mapping to apply locally
 - which role profile maps to which local CLI/model/permission/reasoning policy
-- which server bot maps to which local LLM execution profile via `telegram.env` or fallback `bot_bindings`
+- which server bot maps to which local LLM execution profile via `telegram-bots/_global.env`, `telegram-bots/*.env`, or fallback `bot_bindings`
 
 Built-in helper command for legacy fallback/testing:
 
@@ -224,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:
@@ -259,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`
@@ -281,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.
@@ -398,7 +397,7 @@ Recommended production path:
 - keep `project_mappings.<project_id>.workspace_dir` aligned to that teammate's actual local project folder
 - let `ctxpack pull` or project connection refresh the mapping automatically
 - keep per-role execution policy under `role_profiles`
-- keep per-bot LLM binding primarily in `~/.metheus/telegram.env`
+- keep Telegram-wide binding defaults in `~/.metheus/telegram-bots/_global.env`
 - use `bot_bindings` in `bot-runner.json` only as local fallback/override
 - runner resolution order is: explicit `route.role_profile` -> provider env bot binding -> `bot_bindings` -> server bot role -> `route.role`
 
@@ -471,7 +470,7 @@ Notes:
 - `local-bot-bridge` reads stdin JSON from the runner and can call Codex/Claude/Gemini for you
 - `route.command` fallback is disabled by default; enable it only temporarily with `METHEUS_ALLOW_LEGACY_RUNNER_COMMAND=1`
 - today this automation path is implemented for Telegram end-to-end
-- prefer `TELEGRAM_API_BASE_URL=` inside `~/.metheus/telegram.env` for per-bot local Telegram API overrides; `METHEUS_TELEGRAM_API_BASE_URL` remains a process-level fallback mainly for mock/regression testing
+- prefer `TELEGRAM_API_BASE_URL=` inside `~/.metheus/telegram-bots/_global.env` for local Telegram API overrides; `METHEUS_TELEGRAM_API_BASE_URL` remains a process-level fallback mainly for mock/regression testing
 - Slack can use direct local send, but automatic inbound runner flow is not completed yet
 - KakaoTalk config can be stored now, but direct send/runner flow is not implemented yet
 - `doctor` now reports provider support for both enabled runner routes and active project chat destinations

package/cli.mjs

@@ -154,9 +154,11 @@ const AUTH_STORE_RELATIVE_PATH = path.join(".metheus", "governance-mcp-auth.json
 const BOT_RUNNER_CONFIG_RELATIVE_PATH = path.join(".metheus", "bot-runner.json");
 const BOT_RUNNER_STATE_RELATIVE_PATH = path.join(".metheus", "bot-runner-state.json");
 const BOT_RUNNER_CONFIG_VERSION = 2;
+const TELEGRAM_LEGACY_ENV_RELATIVE_PATH = path.join(".metheus", "telegram.env");
+const TELEGRAM_GLOBAL_ENV_RELATIVE_PATH = path.join(".metheus", "telegram-bots", "_global.env");
 const PROVIDER_ENV_CONFIG = {
   telegram: {
-    relativePath: path.join(".metheus", "telegram.env"),
+    relativePath: TELEGRAM_GLOBAL_ENV_RELATIVE_PATH,
     tokenKey: "TELEGRAM_BOT_TOKEN",
     label: "Telegram",
     verifyURL: "https://api.telegram.org",
@@ -736,6 +738,10 @@ function providerEnvFilePath(provider) {
   return resolveHomeFilePath(providerEnvConfig(provider).relativePath);
 }
 
+function telegramLegacyEnvFilePath() {
+  return resolveHomeFilePath(TELEGRAM_LEGACY_ENV_RELATIVE_PATH);
+}
+
 function telegramBotEntriesDirPath() {
   return resolveHomeFilePath(".metheus/telegram-bots");
 }
@@ -751,7 +757,8 @@ function providerEnvTemplate(provider) {
     return [
       "# Metheus local Telegram bot settings",
       "# Keep this file on your machine only. Do not commit it.",
-      "# Store only Telegram-wide settings here.",
+      "# Store Telegram-wide settings here.",
+      "# This global file now lives in ~/.metheus/telegram-bots/_global.env.",
       "# Per-bot secrets and AI settings live in ~/.metheus/telegram-bots/<bot-key>.env.",
       "# Project chat destinations must be managed on the Metheus server.",
       "",
@@ -1037,6 +1044,23 @@ function isCompatibleLegacyLocalBotBridgeCommand(command, roleProfile) {
 }
 
 function ensureProviderEnvTemplate(provider) {
+  if (normalizeBotProvider(provider) === "telegram") {
+    const filePath = providerEnvFilePath(provider);
+    const legacyFilePath = telegramLegacyEnvFilePath();
+    const existedBefore = fs.existsSync(filePath) || fs.existsSync(legacyFilePath);
+    try {
+      const state = readTelegramEnvState();
+      writeTelegramEnvState(state.parsed);
+      return {
+        filePath,
+        created: !existedBefore,
+        existed: existedBefore,
+        normalized: true,
+      };
+    } catch (err) {
+      return { filePath, created: false, existed: false, error: String(err?.message || err) };
+    }
+  }
   const filePath = providerEnvFilePath(provider);
   try {
     if (fs.existsSync(filePath)) {
@@ -2642,7 +2666,6 @@ function normalizeTelegramBotEnvKey(rawValue, fallback = "") {
     .trim()
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, "_")
-    .replace(/_bot$/g, "")
     .replace(/^_+|_+$/g, "");
   return normalized || fallback;
 }
@@ -2703,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(),
@@ -2733,11 +2762,33 @@ 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 [];
   return fs.readdirSync(dirPath, { withFileTypes: true })
-    .filter((item) => item.isFile() && /\.env$/i.test(item.name))
+    .filter((item) => item.isFile() && /\.env$/i.test(item.name) && item.name.toLowerCase() !== "_global.env")
     .map((item) => path.join(dirPath, item.name))
     .sort((left, right) => left.localeCompare(right))
     .map((filePath) => {
@@ -2775,14 +2826,20 @@ function buildMergedTelegramEnvParsed(globalParsed, entries) {
 
 function readTelegramEnvState() {
   const filePath = providerEnvFilePath("telegram");
+  const legacyFilePath = telegramLegacyEnvFilePath();
+  let sourceFilePath = filePath;
   try {
-    if (!fs.existsSync(filePath)) {
+    if (!fs.existsSync(filePath) && fs.existsSync(legacyFilePath)) {
+      sourceFilePath = legacyFilePath;
+    } else if (!fs.existsSync(filePath)) {
       fs.mkdirSync(path.dirname(filePath), { recursive: true });
       fs.writeFileSync(filePath, providerEnvTemplate("telegram"), "utf8");
     }
   } catch (err) {
     return {
       filePath,
+      legacyFilePath,
+      sourceFilePath,
       entriesDirPath: telegramBotEntriesDirPath(),
       parsed: {},
       globalParsed: {},
@@ -2790,7 +2847,7 @@ function readTelegramEnvState() {
       error: String(err?.message || err),
     };
   }
-  const raw = fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf8") : "";
+  const raw = fs.existsSync(sourceFilePath) ? fs.readFileSync(sourceFilePath, "utf8") : "";
   const globalParsedRaw = parseSimpleEnvText(raw);
   const inlineEntries = collectTelegramEnvBotEntries(globalParsedRaw);
   const fileEntries = loadTelegramBotEntriesFromFiles();
@@ -2804,8 +2861,11 @@ function readTelegramEnvState() {
     }
   });
   const entries = Array.from(mergedEntries.values());
+  globalParsed.TELEGRAM_DEFAULT_BOT_KEY = remapTelegramDefaultBotKey(globalParsed.TELEGRAM_DEFAULT_BOT_KEY || "", entries);
   return {
     filePath,
+    legacyFilePath,
+    sourceFilePath,
     entriesDirPath: telegramBotEntriesDirPath(),
     parsed: buildMergedTelegramEnvParsed(globalParsed, entries),
     globalParsed,
@@ -2822,18 +2882,20 @@ 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.",
-    "# Store only Telegram-wide settings here.",
+    "# Store Telegram-wide settings here.",
+    "# This global file lives in ~/.metheus/telegram-bots/_global.env.",
     "# Per-bot secrets and AI settings live in ~/.metheus/telegram-bots/<bot-key>.env.",
     "",
     `TELEGRAM_API_BASE_URL=${formatProviderEnvValue(parsed.TELEGRAM_API_BASE_URL || "")}`,
@@ -2906,6 +2968,7 @@ function writeTelegramEnvState(parsedEnv) {
     }
   });
   const globalFilePath = providerEnvFilePath("telegram");
+  const legacyFilePath = telegramLegacyEnvFilePath();
   fs.mkdirSync(path.dirname(globalFilePath), { recursive: true });
   fs.writeFileSync(globalFilePath, renderNormalizedTelegramEnv(globalParsed), {
     encoding: "utf8",
@@ -2923,13 +2986,16 @@ function writeTelegramEnvState(parsedEnv) {
     });
   });
   fs.readdirSync(entriesDirPath, { withFileTypes: true })
-    .filter((item) => item.isFile() && /\.env$/i.test(item.name))
+    .filter((item) => item.isFile() && /\.env$/i.test(item.name) && item.name.toLowerCase() !== "_global.env")
     .forEach((item) => {
       const filePath = path.resolve(path.join(entriesDirPath, item.name));
       if (!activeFiles.has(filePath)) {
         fs.rmSync(filePath, { force: true });
       }
     });
+  if (legacyFilePath !== globalFilePath && fs.existsSync(legacyFilePath)) {
+    fs.rmSync(legacyFilePath, { force: true });
+  }
   return globalFilePath;
 }
 
@@ -2964,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;
@@ -5347,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)")}`,
   );
@@ -5361,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(","))}`,
@@ -5374,7 +5440,7 @@ TELEGRAM_BOT_REVIEW_TOKEN=review-token
   try {
     process.env.USERPROFILE = telegramEnvNormalizeTempHome;
     process.env.HOME = telegramEnvNormalizeTempHome;
-    const normalizeTestEnvPath = providerEnvFilePath("telegram");
+    const normalizeTestEnvPath = telegramLegacyEnvFilePath();
     fs.mkdirSync(path.dirname(normalizeTestEnvPath), { recursive: true });
     fs.writeFileSync(
       normalizeTestEnvPath,
@@ -5386,9 +5452,10 @@ TELEGRAM_BOT_REVIEW_TOKEN=review-token
       ].join("\n"),
       "utf8",
     );
-    ensureProviderEnvTemplate("telegram");
-    normalizedGlobalText = fs.readFileSync(normalizeTestEnvPath, "utf8");
-    normalizedBotText = fs.readFileSync(telegramBotEntryFilePath("ryoai"), "utf8");
+    const normalizedState = readTelegramEnvState();
+    writeTelegramEnvState(normalizedState.parsed);
+    normalizedGlobalText = fs.readFileSync(providerEnvFilePath("telegram"), "utf8");
+    normalizedBotText = fs.readFileSync(telegramBotEntryFilePath("ryoai_bot"), "utf8");
   } finally {
     if (previousUserProfile === undefined) delete process.env.USERPROFILE;
     else process.env.USERPROFILE = previousUserProfile;
@@ -5397,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/selftest-bot-commands.mjs

@@ -288,8 +288,8 @@ export async function runSelftestBotCommands(push, deps) {
     const env = buildSpawnEnv(tempHome);
     const baseURL = `http://127.0.0.1:${mock.port}`;
     const telegramApiBaseURL = `${baseURL}/telegram`;
-    const telegramEnvPath = path.join(tempHome, ".metheus", "telegram.env");
     const telegramBotEntriesDir = path.join(tempHome, ".metheus", "telegram-bots");
+    const telegramEnvPath = path.join(telegramBotEntriesDir, "_global.env");
     const readTelegramGlobals = () => parseSimpleEnvText(fs.readFileSync(telegramEnvPath, "utf8"));
     const readTelegramBotEntry = (botKey) => {
       const filePath = path.join(telegramBotEntriesDir, `${String(botKey || "").trim()}.env`);
@@ -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.97",
+  "version": "0.2.99",
   "description": "Metheus Governance MCP CLI (setup + stdio proxy)",
   "type": "module",
   "files": [