metheus-governance-mcp-cli 0.2.79 → 0.2.81

package/README.md

@@ -226,12 +226,13 @@ metheus-governance-mcp-cli bot verify --provider telegram --bot-key main
 Behavior:
 
 - `bot setup` asks for `Telegram / Slack / KakaoTalk` first, then prompts with numbered actions.
-- `bot add` without flags now uses the shortest practical guided flow: provider -> token -> verify -> optional save-anyway only when verify fails -> optional username fallback only when verify cannot discover it -> optional default bot.
+- `bot add` without flags now uses the shortest practical guided flow: provider -> token -> verify -> optional save-anyway only when verify fails -> optional username fallback only when verify cannot discover it -> optional AI model selection when the resolved defaults leave it blank -> optional default bot.
 - In the normal Telegram path, `bot add` does not ask for a local bot key, a server bot UUID, or an approval / worker / review / monitor choice.
 - 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 now uses the same sequential flow every time: provider -> bot entry -> username/token review -> grouped server-role review when needed -> AI field choices -> default choice -> save.
+- when the CLI asks for `AI model`, it now shows client-specific model choices first and still allows manual entry when you need a custom model name.
 - if one server bot name maps to multiple server roles, `bot edit` keeps the Telegram env entry bound to the server identity and lets you review the local `role_profiles` for each detected role instead of forcing one role/profile UUID choice up front.
 - 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.
@@ -258,8 +259,8 @@ Non-interactive examples:
 ```bash
 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 codex --ai-model gpt-5-codex --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 claude-sonnet-4 --ai-permission-mode danger_full_access --ai-reasoning-effort high
+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

package/lib/bot-commands.mjs

@@ -624,12 +624,21 @@ function telegramEntryDisplayName(entry) {
   return String(current.key || "").trim() || "(unnamed)";
 }
 
+function displayLocalAIClientName(clientName) {
+  const normalized = String(clientName || "").trim().toLowerCase();
+  if (normalized === "codex" || normalized === "gpt") return "GPT";
+  if (normalized === "claude") return "Claude";
+  if (normalized === "gemini") return "Gemini";
+  if (normalized === "sample") return "Sample";
+  return String(clientName || "").trim();
+}
+
 function telegramEntryDisplayDescription(entry) {
   const current = safeObject(entry);
   const detail = [
     current.key ? `key:${current.key}` : "",
     current.serverBotID ? `server:${current.serverBotID}` : "",
-    current.client ? `AI:${current.client}` : "",
+    current.client ? `AI:${displayLocalAIClientName(current.client)}` : "",
   ].filter(Boolean);
   return detail.join(" ");
 }
@@ -832,7 +841,7 @@ async function editTelegramBotGuided(ui, parsed, selected, current, flags, deps)
       defaultValue: current.model ? "keep" : "change",
     });
     if (modelAction === "change") {
-      current.model = await promptLine(ui, "AI model", current.model);
+      current.model = await promptAIModel(ui, deps, current.client, current.model);
     } else if (modelAction === "clear") {
       current.model = "";
     }
@@ -936,7 +945,7 @@ function renderBotListPayload(provider, state, deps) {
 function formatRoleProfileOutputLine(profile) {
   const current = safeObject(profile);
   return [
-    current.client ? `client=${current.client}` : "client=(blank)",
+    current.client ? `client=${displayLocalAIClientName(current.client)}` : "client=(blank)",
     current.model ? `model=${current.model}` : "model=(blank)",
     current.permissionMode ? `permission=${current.permissionMode}` : "permission=(blank)",
     current.reasoningEffort ? `reasoning=${current.reasoningEffort}` : "reasoning=(blank)",
@@ -1084,7 +1093,7 @@ function printBotShow(provider, state, entry, deps, extras = {}) {
     process.stdout.write(`  username: ${selectedEntry.username ? `@${selectedEntry.username}` : "-"}\n`);
     process.stdout.write(`  token: ${selectedEntry.token ? maskSecret(selectedEntry.token) : "(not configured)"}\n`);
     process.stdout.write(`  role_profile: ${selectedEntry.roleProfile || "-"}\n`);
-    process.stdout.write(`  ai_client: ${selectedEntry.client || "-"}\n`);
+    process.stdout.write(`  ai_client: ${selectedEntry.client ? displayLocalAIClientName(selectedEntry.client) : "-"}\n`);
     process.stdout.write(`  ai_model: ${selectedEntry.model || "-"}\n`);
     process.stdout.write(`  permission_mode: ${selectedEntry.permissionMode || "-"}\n`);
     process.stdout.write(`  reasoning_effort: ${selectedEntry.reasoningEffort || "-"}\n`);
@@ -1442,13 +1451,70 @@ async function promptAIClient(ui, deps, defaultValue = "") {
   const clients = ensureArray(deps.supportedLocalAIClients || []);
   const options = [
     { value: "", label: "(blank)", description: "leave AI client empty" },
-    ...clients.map((client) => ({ value: client, label: client })),
+    ...clients.map((client) => ({ value: client, label: displayLocalAIClientName(client) || client })),
   ];
   const selectedIndex = Math.max(0, options.findIndex((item) => item.value === String(defaultValue || "").trim()));
   const selected = await promptChoice(ui, "Select AI client", options, { defaultIndex: selectedIndex });
   return String(selected?.value || "").trim();
 }
 
+function suggestedAIModelsForClient(clientName) {
+  const normalizedClient = String(clientName || "").trim().toLowerCase();
+  if (normalizedClient === "codex") {
+    return [
+      { value: "GPT-5.4", label: "GPT-5.4", description: "recommended GPT model" },
+      { value: "GPT-5.3-CODEX", label: "GPT-5.3-CODEX", description: "stable GPT codex-style model" },
+      { value: "GPT-5.3-CODEX-Spark", label: "GPT-5.3-CODEX-Spark", description: "faster GPT codex-style model" },
+    ];
+  }
+  if (normalizedClient === "claude") {
+    return [
+      { value: "Sonnet 4.6r", label: "Sonnet 4.6r", description: "recommended Claude Sonnet model" },
+      { value: "Haiku 4.5", label: "Haiku 4.5", description: "faster Claude Haiku model" },
+      { value: "Opus 4.6", label: "Opus 4.6", description: "highest-capability Claude model" },
+    ];
+  }
+  if (normalizedClient === "gemini") {
+    return [
+      { value: "Gemini 3.1 Pro", label: "Gemini 3.1 Pro", description: "recommended Gemini model" },
+    ];
+  }
+  if (normalizedClient === "sample") {
+    return [
+      { value: "sample", label: "sample", description: "sample adapter model placeholder" },
+    ];
+  }
+  return [];
+}
+
+async function promptAIModel(ui, deps, clientName, defaultValue = "", title = "Select AI model") {
+  const normalizedClient = requireDependency(deps, "normalizeLocalAIClientName")(clientName || "", "");
+  const currentValue = String(defaultValue || "").trim();
+  const suggestions = suggestedAIModelsForClient(normalizedClient);
+  const options = [
+    { value: "", label: "(blank)", description: "leave AI model empty" },
+  ];
+  if (currentValue && !suggestions.some((item) => item.value === currentValue)) {
+    options.push({
+      value: currentValue,
+      label: currentValue,
+      description: "current saved model",
+    });
+  }
+  options.push(...suggestions);
+  options.push({
+    value: "__manual__",
+    label: "Manual entry",
+    description: "type the model name yourself",
+  });
+  const selectedIndex = Math.max(0, options.findIndex((item) => item.value === currentValue));
+  const selected = await promptChoice(ui, title, options, { defaultIndex: selectedIndex >= 0 ? selectedIndex : 0 });
+  if (String(selected?.value || "") === "__manual__") {
+    return String(await promptRequiredLine(ui, "AI model", currentValue)).trim();
+  }
+  return String(selected?.value || "").trim();
+}
+
 async function promptPermissionMode(ui, defaultValue = "") {
   const options = [
     { value: "", label: "(blank)", description: "leave permission mode empty" },
@@ -1553,7 +1619,7 @@ function currentRoleProfileState(roleName, deps) {
 function formatRoleProfileSummary(profile) {
   const current = safeObject(profile);
   return [
-    current.client ? `client:${current.client}` : "client:(blank)",
+    current.client ? `client:${displayLocalAIClientName(current.client)}` : "client:(blank)",
     current.model ? `model:${current.model}` : "model:(blank)",
     current.permissionMode ? `permission:${current.permissionMode}` : "permission:(blank)",
     current.reasoningEffort ? `reasoning:${current.reasoningEffort}` : "reasoning:(blank)",
@@ -1632,7 +1698,7 @@ async function promptRoleExecutionProfile(ui, roleName, deps) {
     await promptAIClient(ui, deps, current.client),
     "",
   );
-  current.model = await promptLine(ui, `AI model for role "${current.role}"`, current.model);
+  current.model = await promptAIModel(ui, deps, current.client, current.model, `Select AI model for role "${current.role}"`);
   current.permissionMode = requireDependency(deps, "normalizeLocalAIPermissionMode")(
     await promptPermissionMode(ui, current.permissionMode),
     "",
@@ -2086,8 +2152,8 @@ async function addTelegramBot(ui, flags, deps) {
     : (autoUseServerRoleRouting
       ? getAIModelFlag(flags)
       : (autoApplyRoleDefaults
-        ? firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model])
-        : await promptLine(ui, "AI model", firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))));
+        ? await promptAIModel(ui, deps, client, firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))
+        : await promptAIModel(ui, deps, client, firstNonEmptyString([getAIModelFlag(flags), roleProfileDefaults.model]))));
   const permissionMode = requireDependency(deps, "normalizeLocalAIPermissionMode")(
     nonInteractive
       ? firstNonEmptyString([getAIPermissionModeFlag(flags), roleProfileDefaults.permissionMode])
@@ -2109,6 +2175,17 @@ async function addTelegramBot(ui, flags, deps) {
     "",
   );
 
+  if (serverGroupMatched) {
+    await maybePromptGroupedServerRoleProfiles(
+      ui,
+      {
+        name: String(serverBot.name || username || botKey).trim(),
+        roles: preferredRoleSort(serverBot.roles),
+      },
+      deps,
+    );
+  }
+
   const nextParsed = upsertTelegramEntry(parsed, {
     key: botKey,
     serverBotID: String(getServerBotIDFlag(flags) || serverBot.botID || "").trim(),

package/lib/local-ai-adapters.mjs

@@ -358,6 +358,9 @@ function runSampleAdapter(payload) {
 
 export function normalizeLocalAIClientName(rawValue, fallback = DEFAULT_LOCAL_AI_CLIENT) {
   const value = String(rawValue || "").trim().toLowerCase();
+  if (["gpt", "openai-gpt", "openai"].includes(value)) {
+    return "codex";
+  }
   if (SUPPORTED_LOCAL_AI_CLIENTS.includes(value)) {
     return value;
   }

package/lib/selftest-bot-commands.mjs

@@ -364,14 +364,14 @@ export async function runSelftestBotCommands(push, deps) {
             "3", // select role to edit: worker
             "2", // worker: edit settings
             "3", // worker AI client: claude
-            "worker-sonnet-4",
+            "2", // worker AI model: Sonnet 4.6r
             "4", // worker permission: danger_full_access
             "4", // worker reasoning: high
             "y", // edit another role
             "3", // select role to edit: approval
             "2", // approval: edit settings
             "4", // approval AI client: gemini
-            "approval-pro-2",
+            "2", // approval AI model: Gemini 3.1 Pro
             "4", // approval permission: danger_full_access
             "4", // approval reasoning: high
             "n", // stop editing roles
@@ -388,13 +388,13 @@ export async function runSelftestBotCommands(push, deps) {
       const groupedRunnerConfigPath = path.join(tempHome, ".metheus", "bot-runner.json");
       const groupedRunnerConfig = readJSON(fs.readFileSync(groupedRunnerConfigPath, "utf8"));
       push(
-        "bot_edit_grouped_server_roles_updates_role_profiles",
+      "bot_edit_grouped_server_roles_updates_role_profiles",
         String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).worker).client || "") === "claude"
-          && String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).worker).model || "") === "worker-sonnet-4"
+          && String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).worker).model || "") === "Sonnet 4.6r"
           && String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).worker).permission_mode || "") === "danger_full_access"
           && String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).worker).reasoning_effort || "") === "high"
           && String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).approval).client || "") === "gemini"
-          && String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).approval).model || "") === "approval-pro-2",
+          && String(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).approval).model || "") === "Gemini 3.1 Pro",
         `worker=${JSON.stringify(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).worker))} approval=${JSON.stringify(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).approval))}`,
       );
 
@@ -503,7 +503,7 @@ export async function runSelftestBotCommands(push, deps) {
         "2", // change AI client
         "4", // gemini
         "2", // change AI model
-        "guided-gemini-pro",
+        "2", // gemini model: Gemini 3.1 Pro
         "2", // change permission mode
         "3", // workspace_write
         "2", // change reasoning effort
@@ -522,7 +522,7 @@ export async function runSelftestBotCommands(push, deps) {
     push(
       "bot_edit_guided_prompts_update_ai_binding_fields",
       String(guidedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_CLIENT || "") === "gemini"
-        && String(guidedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "") === "guided-gemini-pro"
+        && String(guidedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "") === "Gemini 3.1 Pro"
         && String(guidedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_PERMISSION_MODE || "") === "workspace_write"
         && String(guidedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_REASONING_EFFORT || "") === "medium",
       `client=${String(guidedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_CLIENT || "")} model=${String(guidedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "")}`,
@@ -537,7 +537,7 @@ export async function runSelftestBotCommands(push, deps) {
         "--non-interactive", "true",
         "--token", "selftest-edited-token",
         "--client", "claude",
-        "--model", "claude-3.7-sonnet",
+        "--model", "Sonnet 4.6r",
         "--permission-mode", "workspace_write",
         "--reasoning-effort", "medium",
       ],
@@ -548,7 +548,7 @@ export async function runSelftestBotCommands(push, deps) {
       "bot_edit_updates_ai_binding_fields",
       String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_TOKEN || "") === "selftest-edited-token"
         && String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_CLIENT || "") === "claude"
-        && String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "") === "claude-3.7-sonnet"
+        && String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "") === "Sonnet 4.6r"
         && String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_PERMISSION_MODE || "") === "workspace_write"
         && String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_REASONING_EFFORT || "") === "medium",
       `client=${String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_CLIENT || "")} model=${String(editedState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "")}`,
@@ -683,8 +683,8 @@ export async function runSelftestBotCommands(push, deps) {
         "--timeout-seconds", "5",
         "--server-bot-id", mock.bots[0].id,
         "--token", "selftest-main-token",
-        "--ai-client", "codex",
-        "--ai-model", "gpt-5-codex",
+        "--ai-client", "gpt",
+        "--ai-model", "GPT-5.4",
         "--ai-permission-mode", "read_only",
         "--ai-reasoning-effort", "low",
         "--verify", "true",
@@ -697,7 +697,7 @@ export async function runSelftestBotCommands(push, deps) {
       String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_SERVER_BOT_ID || "") === mock.bots[0].id
         && String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_USERNAME || "") === ""
         && String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_CLIENT || "") === "codex"
-        && String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "") === "gpt-5-codex"
+        && String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "") === "GPT-5.4"
         && String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_PERMISSION_MODE || "") === "read_only"
         && String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_REASONING_EFFORT || "") === "low",
       `client=${String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_CLIENT || "")} model=${String(aliasAddState.TELEGRAM_BOT_MONITORSELFTESTBOT_AI_MODEL || "")}`,

package/package.json

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