metheus-governance-mcp-cli 0.2.77 → 0.2.79

package/lib/bot-commands.mjs

@@ -711,22 +711,32 @@ async function editTelegramBotGuided(ui, parsed, selected, current, flags, deps)
   let serverRoleAutoResolved = "";
   let groupedServerRoles = [];
   let groupedServerName = "";
-  if (current.serverBotID || current.__preferServerIdentity) {
-    current.__preferServerIdentity = true;
-    serverRoleAutoResolved = String(current.roleProfile || "").trim() || "__server_binding__";
+  let serverManagedIdentity = Boolean(current.serverBotID || current.__preferServerIdentity);
+  if (!serverManagedIdentity) {
+    const initialServerBot = await autoResolveTelegramServerBot(current, flags, deps);
+    if (String(initialServerBot.botID || "").trim() || initialServerBot.matchMode === "group") {
+      serverManagedIdentity = true;
+    }
   }
-
-  const usernameAction = await promptKeepChangeClear(ui, "Telegram username", {
-    allowClear: true,
-    defaultValue: current.username ? "keep" : "change",
-  });
-  if (usernameAction === "change") {
-    current.username = requireDependency(deps, "normalizeTelegramBotUsername")(
-      await promptRequiredLine(ui, "Telegram username (without @)", current.username),
-      "",
-    );
-  } else if (usernameAction === "clear") {
+  let usernameAction = "keep";
+  if (serverManagedIdentity) {
+    current.__preferServerIdentity = true;
     current.username = "";
+    serverRoleAutoResolved = String(current.roleProfile || "").trim() || "__server_binding__";
+    process.stdout.write("Telegram username is managed from server bot info and cannot be edited here.\n");
+  } else {
+    usernameAction = await promptKeepChangeClear(ui, "Telegram username", {
+      allowClear: true,
+      defaultValue: current.username ? "keep" : "change",
+    });
+    if (usernameAction === "change") {
+      current.username = requireDependency(deps, "normalizeTelegramBotUsername")(
+        await promptRequiredLine(ui, "Telegram username (without @)", current.username),
+        "",
+      );
+    } else if (usernameAction === "clear") {
+      current.username = "";
+    }
   }
 
   const tokenAction = await promptKeepChangeClear(ui, "Telegram token", {
@@ -1113,19 +1123,16 @@ function printBotShow(provider, state, entry, deps, extras = {}) {
   process.stdout.write(`  token: ${token ? maskSecret(token) : "(not configured)"}\n`);
 }
 
-async function chooseTelegramEntry(ui, parsedEnv, deps, title = "Select Telegram bot entry") {
+async function chooseTelegramEntry(ui, parsedEnv, deps, title = "Select Telegram bot entry", flags = {}) {
   const entries = telegramEntriesForDisplay(parsedEnv, deps);
   if (!entries.length) {
     throw new Error("no Telegram bot entries are configured");
   }
+  const displayRows = await buildTelegramEntrySelectionRows(entries, flags, deps);
   const selected = await promptChoice(
     ui,
     title,
-    entries.map((entry) => ({
-      value: entry.key,
-      label: `${telegramEntryDisplayName(entry)}${entry.isDefault ? " [default]" : ""}`,
-      description: telegramEntryDisplayDescription(entry),
-    })),
+    displayRows,
     { defaultIndex: 0 },
   );
   return entries.find((entry) => entry.key === selected.value) || entries[0];
@@ -1154,7 +1161,7 @@ async function resolveTelegramEntryForShow(ui, parsedEnv, flags, deps) {
   if (nonInteractive) {
     throw new Error("Telegram bot selector is required when multiple entries exist; pass --bot-key, --bot-id, or --bot-name");
   }
-  return chooseTelegramEntry(ui, parsedEnv, deps, "Select Telegram bot entry");
+  return chooseTelegramEntry(ui, parsedEnv, deps, "Select Telegram bot entry", flags);
 }
 
 async function chooseServerBot(ui, provider, baseURL, timeoutSeconds, deps, options = {}) {
@@ -1715,34 +1722,11 @@ async function maybePromptGroupedServerRoleProfiles(ui, serverBot, deps) {
   return true;
 }
 
-async function resolveTelegramServerBindingDetails(envConfig, flags, deps) {
+function resolveTelegramServerBindingDetailsFromBots(envConfig, bots, deps) {
   const current = safeObject(envConfig);
   if (!String(current.serverBotID || "").trim() && !String(current.botUsername || "").trim() && !String(current.botKey || "").trim()) {
     return null;
   }
-  const lookup = await requireDependency(deps, "listServerBots")({
-    provider: "telegram",
-    baseURL: flags["base-url"] || deps.defaultSiteURL,
-    timeoutSeconds: intFromRaw(flags["timeout-seconds"], 15) || 15,
-  });
-  if (!lookup?.ok) {
-    return {
-      ok: false,
-      mode: "lookup_error",
-      matchedBy: "",
-      name: "",
-      role: "",
-      roles: [],
-      effectiveRoleProfile: null,
-      effectiveRoleProfiles: {},
-      detail: `server bot lookup unavailable: ${lookup?.error || "unknown error"}`,
-    };
-  }
-  const bots = ensureArray(lookup.bots).map((bot) => ({
-    id: String(bot?.id || "").trim(),
-    role: String(bot?.role || bot?.bot_role || "").trim(),
-    name: String(bot?.name || "").trim(),
-  })).filter((bot) => bot.id);
   const resolveGroupedPayload = (matches, matchedBy) => {
     const roles = preferredRoleSort(summarizeServerBotRoles(matches));
     return {
@@ -1827,6 +1811,88 @@ async function resolveTelegramServerBindingDetails(envConfig, flags, deps) {
   };
 }
 
+async function resolveTelegramServerBindingDetails(envConfig, flags, deps) {
+  const lookup = await requireDependency(deps, "listServerBots")({
+    provider: "telegram",
+    baseURL: flags["base-url"] || deps.defaultSiteURL,
+    timeoutSeconds: intFromRaw(flags["timeout-seconds"], 15) || 15,
+  });
+  if (!lookup?.ok) {
+    return {
+      ok: false,
+      mode: "lookup_error",
+      matchedBy: "",
+      name: "",
+      role: "",
+      roles: [],
+      effectiveRoleProfile: null,
+      effectiveRoleProfiles: {},
+      detail: `server bot lookup unavailable: ${lookup?.error || "unknown error"}`,
+    };
+  }
+  const bots = ensureArray(lookup.bots).map((bot) => ({
+    id: String(bot?.id || "").trim(),
+    role: String(bot?.role || bot?.bot_role || "").trim(),
+    name: String(bot?.name || "").trim(),
+  })).filter((bot) => bot.id);
+  return resolveTelegramServerBindingDetailsFromBots(envConfig, bots, deps);
+}
+
+async function buildTelegramEntrySelectionRows(entries, flags, deps) {
+  const listServerBots = requireDependency(deps, "listServerBots");
+  let bots = [];
+  try {
+    const lookup = await listServerBots({
+      provider: "telegram",
+      baseURL: flags["base-url"] || deps.defaultSiteURL,
+      timeoutSeconds: intFromRaw(flags["timeout-seconds"], 15) || 15,
+    });
+    bots = ensureArray(lookup?.bots).map((bot) => ({
+      id: String(bot?.id || "").trim(),
+      role: String(bot?.role || bot?.bot_role || "").trim(),
+      name: String(bot?.name || "").trim(),
+    })).filter((bot) => bot.id);
+  } catch {
+    bots = [];
+  }
+  return ensureArray(entries).map((entry) => {
+    const current = safeObject(entry);
+    const binding = bots.length
+      ? resolveTelegramServerBindingDetailsFromBots(
+        {
+          serverBotID: current.serverBotID,
+          botUsername: current.username,
+          botKey: current.key,
+          roleProfile: current.roleProfile,
+        },
+        bots,
+        deps,
+      )
+      : null;
+    const serverName = String(binding?.name || "").trim();
+    const singleRole = String(binding?.role || "").trim();
+    const groupedRoles = ensureArray(binding?.roles).filter(Boolean);
+    let label = telegramEntryDisplayName(entry);
+    if (serverName && singleRole) {
+      label = `${serverName} [${singleRole}]`;
+    } else if (serverName && groupedRoles.length) {
+      label = `${serverName} [${groupedRoles.join(", ")}]`;
+    } else if (serverName) {
+      label = serverName;
+    }
+    const descriptionParts = [
+      current.key ? `local:${current.key}` : "",
+      current.serverBotID ? `server:${current.serverBotID}` : "",
+      current.client ? `AI:${current.client}` : "",
+    ].filter(Boolean);
+    return {
+      value: current.key,
+      label: `${label}${current.isDefault ? " [default]" : ""}`,
+      description: descriptionParts.join(" "),
+    };
+  });
+}
+
 function buildTemporaryTelegramEnvConfig({ token, apiBaseURL }) {
   return {
     ok: true,
@@ -2115,7 +2181,7 @@ async function editTelegramGlobalSettings(ui, flags, deps) {
       process.stdout.write("No Telegram bot entries exist yet.\n");
       return;
     }
-    const selected = await chooseTelegramEntry(ui, parsed, deps, "Select default Telegram bot");
+    const selected = await chooseTelegramEntry(ui, parsed, deps, "Select default Telegram bot", flags);
     parsed.TELEGRAM_DEFAULT_BOT_KEY = selected.key;
   }
   const filePath = writeProviderEnvState("telegram", parsed, deps);
@@ -2128,7 +2194,7 @@ async function editTelegramBot(ui, flags, deps) {
   const nonInteractive = boolFromRaw(flags["non-interactive"] ?? flags.yes, false);
   const selected = nonInteractive
     ? findTelegramEntryByFlags(parsed, flags, deps)
-    : await chooseTelegramEntry(ui, parsed, deps);
+    : await chooseTelegramEntry(ui, parsed, deps, "Select Telegram bot entry", flags);
   if (!selected) {
     throw new Error("Telegram bot selector is required for non-interactive edit");
   }
@@ -2168,10 +2234,10 @@ async function editTelegramBot(ui, flags, deps) {
   await editTelegramBotGuided(ui, parsed, selected, current, flags, deps);
 }
 
-async function removeTelegramBot(ui, deps) {
+async function removeTelegramBot(ui, flags, deps) {
   const state = loadProviderEnvState("telegram", deps);
   const parsed = { ...state.parsed };
-  const selected = await chooseTelegramEntry(ui, parsed, deps, "Select Telegram bot entry to remove");
+  const selected = await chooseTelegramEntry(ui, parsed, deps, "Select Telegram bot entry to remove", flags);
   if (!selected) return;
   if (!await promptConfirmChoice(ui, `Remove Telegram bot "${selected.key}"?`, {
     confirmLabel: "Remove bot",
@@ -2206,7 +2272,7 @@ async function verifyProviderEntry(ui, provider, flags, deps) {
         botName: requestedBotName,
       };
     } else {
-      const selected = await chooseTelegramEntry(ui, state.parsed, deps, "Select Telegram bot entry to verify");
+      const selected = await chooseTelegramEntry(ui, state.parsed, deps, "Select Telegram bot entry to verify", flags);
       selectors = {
         botKey: selected.key,
         botID: selected.serverBotID,
@@ -2546,7 +2612,7 @@ async function runBotRemove(ui, flags, deps) {
       process.stdout.write(`Removed Telegram bot "${selected.key}" from ${filePath}\n`);
       return;
     }
-    await removeTelegramBot(ui, deps);
+    await removeTelegramBot(ui, flags, deps);
     return;
   }
   await removeTokenOnlyProvider(ui, provider, flags, deps);
@@ -2573,7 +2639,7 @@ async function runBotSetDefault(ui, flags, deps) {
   const nonInteractive = boolFromRaw(flags["non-interactive"] ?? flags.yes, false);
   const selected = nonInteractive
     ? findTelegramEntryByFlags(parsed, flags, deps)
-    : await chooseTelegramEntry(ui, parsed, deps, "Select default Telegram bot");
+    : await chooseTelegramEntry(ui, parsed, deps, "Select default Telegram bot", flags);
   if (!selected) {
     throw new Error("Telegram bot selector is required for set-default");
   }

package/lib/selftest-bot-commands.mjs

@@ -347,7 +347,7 @@ export async function runSelftestBotCommands(push, deps) {
         `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 || "")}`,
       );
 
-      await runCLI({
+      const groupedEditResult = await runCLI({
         cliPath,
         args: [
           "bot", "edit",
@@ -359,7 +359,6 @@ export async function runSelftestBotCommands(push, deps) {
           METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
             "1", // provider: telegram
             "2", // bot entry: ryoai_bot
-            "1", // keep username
             "1", // keep token
             "2", // grouped role settings: edit one role
             "3", // select role to edit: worker
@@ -381,6 +380,11 @@ export async function runSelftestBotCommands(push, deps) {
           ]),
         },
       });
+      push(
+        "bot_edit_grouped_server_roles_skips_local_username_prompt",
+        !String(groupedEditResult.stdout || "").includes("Telegram username (without @)"),
+        String(groupedEditResult.stdout || "").split(/\r?\n/).filter((line) => line.includes("Telegram username")).join(" | ") || "username prompt skipped",
+      );
       const groupedRunnerConfigPath = path.join(tempHome, ".metheus", "bot-runner.json");
       const groupedRunnerConfig = readJSON(fs.readFileSync(groupedRunnerConfigPath, "utf8"));
       push(
@@ -487,7 +491,7 @@ export async function runSelftestBotCommands(push, deps) {
       `routes=${JSON.stringify(safeObject(showWithRoutesPayload.routeLinks))}`,
     );
 
-    await runCLI({
+    const guidedEditResult = await runCLI({
       cliPath,
       args: ["bot", "edit"],
       env: {
@@ -495,7 +499,6 @@ export async function runSelftestBotCommands(push, deps) {
         METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
         "1", // provider: telegram
         "1", // bot entry: @monitorselftestbot
-        "1", // keep username
         "1", // keep token
         "2", // change AI client
         "4", // gemini
@@ -510,6 +513,11 @@ export async function runSelftestBotCommands(push, deps) {
         ]),
       },
     });
+    push(
+      "bot_edit_single_server_binding_skips_local_username_prompt",
+      !String(guidedEditResult.stdout || "").includes("Telegram username (without @)"),
+      String(guidedEditResult.stdout || "").split(/\r?\n/).filter((line) => line.includes("Telegram username")).join(" | ") || "username prompt skipped",
+    );
     const guidedState = parseSimpleEnvText(fs.readFileSync(telegramEnvPath, "utf8"));
     push(
       "bot_edit_guided_prompts_update_ai_binding_fields",

package/package.json

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