metheus-governance-mcp-cli 0.2.70 → 0.2.71

package/README.md

@@ -231,8 +231,8 @@ Behavior:
 - For Telegram, the local env key is auto-generated from the matched server bot name or verified username, so you do not have to invent a separate local nickname first.
 - For Telegram, the CLI tries to match the verified bot identity against the server `me/bots` list first. If the server exposes one logical bot name with multiple roles such as `approval`, `worker`, `review`, and `monitor`, the CLI does not ask you to choose one UUID. It binds by server bot name and keeps the local role/AI fields empty so runtime can use the server bot role for each route.
 - When the Telegram username matches exactly one server bot role, the CLI still auto-fills the local `role_profile` and blank AI defaults from your local `bot-runner.json` `role_profiles` mapping.
-- `bot edit` without flags starts a guided numbered flow: provider -> bot entry -> guided edit -> step-by-step field choices.
-- In guided `bot edit`, changing the bound Telegram responsibility can also auto-fill blank local AI fields from the selected server role and skip redundant role/AI prompts.
+- `bot edit` without flags now uses the same sequential flow every time: provider -> bot entry -> username/token review -> AI field choices -> default choice -> save.
+- In the normal Telegram edit path, the CLI keeps or re-resolves the server bot binding automatically. It no longer asks you to pick `approval / worker / review / monitor` or a server bot UUID first.
 - `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.

package/lib/bot-commands.mjs

@@ -147,7 +147,8 @@ function printBotUsage(deps) {
       `  - bot add without flags uses the shortest practical guided flow: provider -> token -> verify -> optional username fallback -> optional default bot.`,
       `  - in the normal Telegram path, bot add does not ask for a local bot key or a server role/profile choice.`,
       `  - server bot name/UUID is the source of truth; local key is auto-derived unless you intentionally override it with --bot-key.`,
-      `  - bot edit without flags asks for provider, existing entry, then a numbered edit flow.`,
+      `  - bot edit without flags asks for provider, existing entry, then walks field-by-field in a numbered flow.`,
+      `  - in the normal Telegram edit path, the CLI keeps or re-resolves the server bot binding automatically instead of asking you to pick a server role/profile UUID first.`,
       `  - bot set-default / bot verify / bot remove also support guided numbered selection when run without flags.`,
       "",
     ].join("\n"),
@@ -594,58 +595,9 @@ function buildDerivedTelegramBotKey(parsedEnv, deps, preferredValues, { excludeK
 
 async function editTelegramBotGuided(ui, parsed, selected, current, flags, deps) {
   let serverRoleAutoResolved = "";
-  const aiFlagOverrides = hasOwnFlag(flags, "client")
-    || hasOwnFlag(flags, "ai-client")
-    || hasOwnFlag(flags, "model")
-    || hasOwnFlag(flags, "ai-model")
-    || hasOwnFlag(flags, "permission-mode")
-    || hasOwnFlag(flags, "ai-permission-mode")
-    || hasOwnFlag(flags, "reasoning-effort")
-    || hasOwnFlag(flags, "ai-reasoning-effort");
-  const bindingAction = await promptKeepChangeClear(ui, "Server bot binding", {
-    allowClear: true,
-    defaultValue: current.serverBotID ? "keep" : "change",
-  });
-  if (bindingAction === "change") {
-    const serverBot = await chooseServerBot(
-      ui,
-      "telegram",
-      flags["base-url"] || deps.defaultSiteURL,
-      intFromRaw(flags["timeout-seconds"], 15) || 15,
-      deps,
-      {
-        preferredUsername: current.username,
-        preferredName: current.username,
-      },
-    );
-    if (serverBot.matchMode === "group") {
-      current.serverBotID = "";
-      current.__preferServerIdentity = true;
-      if (!String(flags["role-profile"] || "").trim()) {
-        current.roleProfile = "";
-      }
-      if (!aiFlagOverrides) {
-        current.client = "";
-        current.model = "";
-        current.permissionMode = "";
-        current.reasoningEffort = "";
-      }
-      serverRoleAutoResolved = "__server_role_group__";
-      process.stdout.write(
-        `Matched server Telegram bot "${serverBot.name || current.username || current.key}" with roles: ${ensureArray(serverBot.roles).join(", ")}. Runtime will use the server role, so local role/AI fields can stay empty.\n`,
-      );
-    } else {
-      current.serverBotID = serverBot.botID;
-      current.__preferServerIdentity = true;
-      if (!current.roleProfile && serverBot.role) {
-        current.roleProfile = serverBot.role;
-      }
-      serverRoleAutoResolved = String(serverBot.role || current.roleProfile || "").trim();
-      applyRoleProfileDefaults(current, resolveRoleProfileDefaults(current.roleProfile || serverBot.role, deps));
-    }
-  } else if (bindingAction === "clear") {
-    current.serverBotID = "";
-    current.__preferServerIdentity = false;
+  if (current.serverBotID || current.__preferServerIdentity) {
+    current.__preferServerIdentity = true;
+    serverRoleAutoResolved = String(current.roleProfile || "").trim() || "__server_binding__";
   }
 
   const usernameAction = await promptKeepChangeClear(ui, "Telegram username", {
@@ -683,7 +635,29 @@ async function editTelegramBotGuided(ui, parsed, selected, current, flags, deps)
     }
   }
 
-  if (!serverRoleAutoResolved) {
+  if (!current.serverBotID || current.__preferServerIdentity || usernameAction === "change" || tokenAction === "change") {
+    const serverBot = await autoResolveTelegramServerBot(current, flags, deps);
+    if (serverBot.matchMode === "group") {
+      current.serverBotID = "";
+      current.__preferServerIdentity = true;
+      current.roleProfile = "";
+      serverRoleAutoResolved = "__server_role_group__";
+      process.stdout.write(
+        `Using server Telegram bot "${serverBot.name || current.username || current.key}" with roles: ${ensureArray(serverBot.roles).join(", ")}. Runtime will use the server role automatically.\n`,
+      );
+    } else if (String(serverBot.botID || "").trim()) {
+      current.serverBotID = String(serverBot.botID || "").trim();
+      current.__preferServerIdentity = true;
+      current.roleProfile = String(serverBot.role || current.roleProfile || "").trim();
+      serverRoleAutoResolved = String(serverBot.role || current.roleProfile || "").trim() || "__server_binding__";
+      applyRoleProfileDefaults(current, resolveRoleProfileDefaults(current.roleProfile || serverBot.role, deps));
+    } else if (current.serverBotID) {
+      current.__preferServerIdentity = true;
+      serverRoleAutoResolved = String(current.roleProfile || "").trim() || "__server_binding__";
+    }
+  }
+
+  if (!current.serverBotID && !current.__preferServerIdentity) {
     const roleAction = await promptKeepChangeClear(ui, "Role profile", {
       allowClear: true,
       defaultValue: current.roleProfile ? "keep" : "change",
@@ -696,70 +670,55 @@ async function editTelegramBotGuided(ui, parsed, selected, current, flags, deps)
     } else if (roleAction === "clear") {
       current.roleProfile = "";
     }
+  }
 
-    const clientAction = await promptKeepChangeClear(ui, "AI client", {
-      allowClear: true,
-      defaultValue: current.client ? "keep" : "change",
-    });
-    if (clientAction === "change") {
-      current.client = requireDependency(deps, "normalizeLocalAIClientName")(
-        await promptAIClient(ui, deps, current.client),
-        "",
-      );
-    } else if (clientAction === "clear") {
-      current.client = "";
-    }
-
-    const modelAction = await promptKeepChangeClear(ui, "AI model", {
-      allowClear: true,
-      defaultValue: current.model ? "keep" : "change",
-    });
-    if (modelAction === "change") {
-      current.model = await promptLine(ui, "AI model", current.model);
-    } else if (modelAction === "clear") {
-      current.model = "";
-    }
+  const clientAction = await promptKeepChangeClear(ui, "AI client", {
+    allowClear: true,
+    defaultValue: current.client ? "keep" : "change",
+  });
+  if (clientAction === "change") {
+    current.client = requireDependency(deps, "normalizeLocalAIClientName")(
+      await promptAIClient(ui, deps, current.client),
+      "",
+    );
+  } else if (clientAction === "clear") {
+    current.client = "";
+  }
 
-    const permissionAction = await promptKeepChangeClear(ui, "AI permission mode", {
-      allowClear: true,
-      defaultValue: current.permissionMode ? "keep" : "change",
-    });
-    if (permissionAction === "change") {
-      current.permissionMode = requireDependency(deps, "normalizeLocalAIPermissionMode")(
-        await promptPermissionMode(ui, current.permissionMode),
-        "",
-      );
-    } else if (permissionAction === "clear") {
-      current.permissionMode = "";
-    }
+  const modelAction = await promptKeepChangeClear(ui, "AI model", {
+    allowClear: true,
+    defaultValue: current.model ? "keep" : "change",
+  });
+  if (modelAction === "change") {
+    current.model = await promptLine(ui, "AI model", current.model);
+  } else if (modelAction === "clear") {
+    current.model = "";
+  }
 
-    const reasoningAction = await promptKeepChangeClear(ui, "AI reasoning effort", {
-      allowClear: true,
-      defaultValue: current.reasoningEffort ? "keep" : "change",
-    });
-    if (reasoningAction === "change") {
-      current.reasoningEffort = requireDependency(deps, "normalizeLocalAIReasoningEffort")(
-        await promptReasoningEffort(ui, current.reasoningEffort),
-        "",
-      );
-    } else if (reasoningAction === "clear") {
-      current.reasoningEffort = "";
-    }
+  const permissionAction = await promptKeepChangeClear(ui, "AI permission mode", {
+    allowClear: true,
+    defaultValue: current.permissionMode ? "keep" : "change",
+  });
+  if (permissionAction === "change") {
+    current.permissionMode = requireDependency(deps, "normalizeLocalAIPermissionMode")(
+      await promptPermissionMode(ui, current.permissionMode),
+      "",
+    );
+  } else if (permissionAction === "clear") {
+    current.permissionMode = "";
   }
 
-  const botKeyAction = await promptKeepChangeClear(ui, "Local bot key", {
-    allowClear: false,
-    defaultValue: "keep",
+  const reasoningAction = await promptKeepChangeClear(ui, "AI reasoning effort", {
+    allowClear: true,
+    defaultValue: current.reasoningEffort ? "keep" : "change",
   });
-  if (botKeyAction === "change") {
-    const normalizeBotKey = requireDependency(deps, "normalizeTelegramBotEnvKey");
-    let nextKey = normalizeBotKey(await promptRequiredLine(ui, "Local bot key", current.key), current.key);
-    const existing = new Set(telegramEntriesForDisplay(parsed, deps).map((entry) => entry.key).filter((key) => key !== current.key));
-    while (existing.has(nextKey)) {
-      process.stdout.write(`Telegram bot key "${nextKey}" already exists.\n`);
-      nextKey = normalizeBotKey(await promptRequiredLine(ui, "Local bot key", `${nextKey}_2`), `${nextKey}_2`);
-    }
-    current.key = nextKey;
+  if (reasoningAction === "change") {
+    current.reasoningEffort = requireDependency(deps, "normalizeLocalAIReasoningEffort")(
+      await promptReasoningEffort(ui, current.reasoningEffort),
+      "",
+    );
+  } else if (reasoningAction === "clear") {
+    current.reasoningEffort = "";
   }
 
   const defaultChoice = await promptChoice(
@@ -1339,6 +1298,43 @@ async function verifyTelegramTokenCandidate(provider, token, apiBaseURL, timeout
   return verifier(provider, buildTemporaryTelegramEnvConfig({ token, apiBaseURL }), timeoutSeconds);
 }
 
+async function autoResolveTelegramServerBot(current, flags, deps) {
+  const existingBotID = String(current?.serverBotID || "").trim();
+  const preferredUsername = String(current?.username || "").trim();
+  if (!preferredUsername) {
+    return {
+      botID: existingBotID,
+      role: String(current?.roleProfile || "").trim(),
+      name: "",
+      roles: [],
+      matchMode: existingBotID ? "existing" : "blank",
+    };
+  }
+  try {
+    return await resolveServerBotForNonInteractive(
+      "telegram",
+      {
+        "bot-name": preferredUsername,
+        "base-url": flags["base-url"] || deps.defaultSiteURL,
+        "timeout-seconds": intFromRaw(flags["timeout-seconds"], 15) || 15,
+      },
+      deps,
+      {
+        preferredUsername,
+        preferredName: preferredUsername,
+      },
+    );
+  } catch {
+    return {
+      botID: existingBotID,
+      role: String(current?.roleProfile || "").trim(),
+      name: "",
+      roles: [],
+      matchMode: existingBotID ? "existing" : "blank",
+    };
+  }
+}
+
 async function addTelegramBot(ui, flags, deps) {
   const state = loadProviderEnvState("telegram", deps);
   const parsed = { ...state.parsed };
@@ -1624,122 +1620,7 @@ async function editTelegramBot(ui, flags, deps) {
     saveTelegramBotEdit(parsed, selected, current, deps);
     return;
   }
-  const editMode = await promptChoice(
-    ui,
-    `How do you want to edit Telegram bot "${current.key}"?`,
-    [
-      { value: "guided", label: "Guided edit (Recommended)", description: "Step-by-step prompts with numbered choices" },
-      { value: "field_menu", label: "Field menu", description: "Choose one field at a time until save" },
-    ],
-    { defaultIndex: 0 },
-  );
-  if (editMode?.value === "guided") {
-    await editTelegramBotGuided(ui, parsed, selected, current, flags, deps);
-    return;
-  }
-  while (true) {
-    const choice = await promptChoice(
-      ui,
-      `Edit Telegram bot "${current.key}"`,
-      [
-        { value: "server_bot_id", label: "Server bot UUID", description: current.serverBotID || "-" },
-        { value: "username", label: "Telegram username", description: current.username ? `@${current.username}` : "-" },
-        { value: "token", label: "Telegram token", description: current.token ? maskSecret(current.token) : "-" },
-        { value: "role_profile", label: "Role profile", description: current.roleProfile || "-" },
-        { value: "client", label: "AI client", description: current.client || "-" },
-        { value: "model", label: "AI model", description: current.model || "-" },
-        { value: "permission", label: "AI permission mode", description: current.permissionMode || "-" },
-        { value: "reasoning", label: "AI reasoning effort", description: current.reasoningEffort || "-" },
-        { value: "bot_key", label: "Local bot key", description: current.key },
-        { value: "set_default", label: "Set as default bot", description: boolFromRaw(flags.default, false) || String(parsed.TELEGRAM_DEFAULT_BOT_KEY || "").trim() === current.key ? "yes" : "no" },
-        { value: "save", label: "Save changes" },
-      ],
-      { defaultIndex: 0 },
-    );
-    if (!choice) return;
-    if (choice.value === "save") {
-      saveTelegramBotEdit(parsed, selected, current, deps);
-      return;
-    }
-    if (choice.value === "server_bot_id") {
-      const serverBot = await chooseServerBot(
-        ui,
-        "telegram",
-        flags["base-url"] || deps.defaultSiteURL,
-        intFromRaw(flags["timeout-seconds"], 15) || 15,
-        deps,
-        {
-          preferredUsername: current.username,
-          preferredName: current.username,
-        },
-      );
-      if (serverBot.matchMode === "group") {
-        current.serverBotID = "";
-        process.stdout.write(
-          `Matched server Telegram bot "${serverBot.name || current.username || current.key}" with roles: ${ensureArray(serverBot.roles).join(", ")}. Keep role/AI fields empty if you want runtime role-based resolution.\n`,
-        );
-      } else {
-        current.serverBotID = serverBot.botID;
-        if (!current.roleProfile && serverBot.role) {
-          current.roleProfile = serverBot.role;
-        }
-      }
-    } else if (choice.value === "username") {
-      current.username = requireDependency(deps, "normalizeTelegramBotUsername")(
-        await promptLine(ui, "Telegram username (without @)", current.username),
-        "",
-      );
-    } else if (choice.value === "token") {
-      current.token = await promptRequiredLine(ui, "Telegram bot token", current.token);
-      if (await promptYesNo(ui, "Verify updated token now?", true)) {
-        const verifyResult = await verifyTelegramTokenCandidate(
-          "telegram",
-          current.token,
-          String(parsed.TELEGRAM_API_BASE_URL || "").trim(),
-          intFromRaw(flags["timeout-seconds"], 15) || 15,
-          deps,
-        );
-        process.stdout.write(`Verify: ${verifyResult.ok ? "OK" : "FAIL"}${verifyResult.detail ? ` - ${verifyResult.detail}` : ""}\n`);
-        const maybeUsername = extractVerifiedTelegramUsername(verifyResult.detail);
-        if (verifyResult.ok && maybeUsername && !current.username) {
-          current.username = maybeUsername;
-        }
-      }
-    } else if (choice.value === "role_profile") {
-      current.roleProfile = requireDependency(deps, "normalizeRunnerRoleProfileName")(
-        await promptTelegramRoleProfile(ui, deps, current.roleProfile),
-      );
-    } else if (choice.value === "client") {
-      current.client = requireDependency(deps, "normalizeLocalAIClientName")(
-        await promptAIClient(ui, deps, current.client),
-        "",
-      );
-    } else if (choice.value === "model") {
-      current.model = await promptLine(ui, "AI model", current.model);
-    } else if (choice.value === "permission") {
-      current.permissionMode = requireDependency(deps, "normalizeLocalAIPermissionMode")(
-        await promptPermissionMode(ui, current.permissionMode),
-        "",
-      );
-    } else if (choice.value === "reasoning") {
-      current.reasoningEffort = requireDependency(deps, "normalizeLocalAIReasoningEffort")(
-        await promptReasoningEffort(ui, current.reasoningEffort),
-        "",
-      );
-    } else if (choice.value === "bot_key") {
-      const normalizeBotKey = requireDependency(deps, "normalizeTelegramBotEnvKey");
-      let nextKey = normalizeBotKey(await promptRequiredLine(ui, "Local bot key", current.key), current.key);
-      const existing = new Set(telegramEntriesForDisplay(parsed, deps).map((entry) => entry.key).filter((key) => key !== current.key));
-      while (existing.has(nextKey)) {
-        process.stdout.write(`Telegram bot key "${nextKey}" already exists.\n`);
-        nextKey = normalizeBotKey(await promptRequiredLine(ui, "Local bot key", `${nextKey}_2`), `${nextKey}_2`);
-      }
-      current.key = nextKey;
-    } else if (choice.value === "set_default") {
-      parsed.TELEGRAM_DEFAULT_BOT_KEY = current.key;
-      process.stdout.write(`Default Telegram bot will be "${current.key}".\n`);
-    }
-  }
+  await editTelegramBotGuided(ui, parsed, selected, current, flags, deps);
 }
 
 async function removeTelegramBot(ui, deps) {

package/lib/selftest-bot-commands.mjs

@@ -381,11 +381,8 @@ export async function runSelftestBotCommands(push, deps) {
         METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
         "1", // provider: telegram
         "1", // bot entry: @monitorselftestbot
-        "1", // edit mode: guided
-        "1", // keep server bot binding
         "1", // keep username
         "1", // keep token
-        "1", // keep role profile
         "2", // change AI client
         "4", // gemini
         "2", // change AI model

package/package.json

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