metheus-governance-mcp-cli 0.2.104 → 0.2.106

package/README.md

@@ -58,9 +58,9 @@ TELEGRAM_BOT_TOKEN=
 ```
 
 ```env
-# ~/.metheus/telegram-bots/RyoAI_bot.env
+# ~/.metheus/telegram-bots/<ServerBotName>.env
 TELEGRAM_BOT_SERVER_BOT_ID=<server_bot_uuid>
-TELEGRAM_BOT_SERVER_NAME=RyoAI_bot
+TELEGRAM_BOT_SERVER_NAME=<ServerBotName>
 TELEGRAM_BOT_SERVER_ROLES=monitor,review,worker,approval
 TELEGRAM_BOT_SERVER_ROLE_IDS=monitor:<uuid>,review:<uuid>,worker:<uuid>,approval:<uuid>
 # Optional fallback only when server bot binding is unavailable
@@ -95,7 +95,7 @@ Runner template:
   },
   "role_profiles": {
     "monitor": {
-      "client": "codex",
+      "client": "gpt",
       "model": "",
       "permission_mode": "read_only",
       "reasoning_effort": "low"
@@ -106,7 +106,7 @@ Runner template:
       "bot_id": "<server_bot_uuid>",
       "bot_name": "<bot_name>",
       "role_profile": "monitor",
-      "client": "codex",
+      "client": "gpt",
       "model": "",
       "permission_mode": "read_only",
       "reasoning_effort": "low"
@@ -194,15 +194,18 @@ Fill provider bot secrets and provider-local transport options locally. Project
 Built-in helper command for legacy fallback/testing:
 
 ```bash
-metheus-governance-mcp-cli local-bot-bridge --client codex --no-update
+metheus-governance-mcp-cli local-bot-bridge --client gpt --no-update
 ```
 
 Supported `--client` values:
-- `codex`
+- `gpt`
 - `claude`
 - `gemini`
 - `sample`
 
+Compatibility note:
+- `codex` is still accepted as an alias for `gpt` because the GPT adapter runs through the Codex CLI binary.
+
 Use `sample` first for smoke tests before switching to a real AI client.
 
 Gemini CLI note:
@@ -230,22 +233,22 @@ Direct commands:
 
 ```bash
 metheus-governance-mcp-cli bot list
-metheus-governance-mcp-cli bot show --provider telegram --bot-name RyoAI_bot
+metheus-governance-mcp-cli bot show --provider telegram --bot-name <server_bot_name>
 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-name RyoAI_bot
-metheus-governance-mcp-cli bot migrate --provider telegram --bot-name RyoAI_bot
+metheus-governance-mcp-cli bot set-default --provider telegram --bot-name <server_bot_name>
+metheus-governance-mcp-cli bot migrate --provider telegram --bot-name <server_bot_name>
 metheus-governance-mcp-cli bot global --provider telegram
-metheus-governance-mcp-cli bot verify --provider telegram --bot-name RyoAI_bot
+metheus-governance-mcp-cli bot verify --provider telegram --bot-name <server_bot_name>
 ```
 
 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 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.
+- In the normal Telegram path, `bot add` does not ask for an advanced local selector, a server bot UUID, or an approval / worker / review / monitor choice.
 - For Telegram, the local bot file stem 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.
@@ -281,7 +284,7 @@ Behavior:
 - `bot verify` checks the configured local token, cross-checks the server bot binding, prints the effective runtime role profile summary that the runner will use, and shows which local runner routes currently point at this bot entry.
 - `bot show` prints one local bot entry in detail, including grouped role summaries when one server bot name expands to multiple roles and any linked local runner routes.
 - In `bot show` and `bot verify`, `saved_local_file` means the values already stored on disk under `~/.metheus/telegram-bots/*.env`, while `current_server_protocol` means the fresh `/api/v1/me/bots` response from the server right now.
-- `bot global` edits Telegram-wide local settings such as API base URL, allowed updates, and default bot key.
+- `bot global` edits Telegram-wide local settings such as API base URL, allowed updates, and the default Telegram bot selector.
 - `bot set-default` updates `TELEGRAM_DEFAULT_BOT_KEY`.
 - `bot migrate` moves legacy `TELEGRAM_BOT_TOKEN` into a named Telegram bot entry.
 
@@ -291,11 +294,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-name 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-name RyoAI_bot --non-interactive true
-metheus-governance-mcp-cli bot migrate --provider telegram --bot-name RyoAI_bot --server-bot-id <server_bot_uuid> --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-name RyoAI_bot --non-interactive true
-metheus-governance-mcp-cli bot verify --provider telegram --bot-name RyoAI_bot --json true
+metheus-governance-mcp-cli bot edit --provider telegram --bot-name <server_bot_name> --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-name <server_bot_name> --non-interactive true
+metheus-governance-mcp-cli bot migrate --provider telegram --bot-name <server_bot_name> --server-bot-id <server_bot_uuid> --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-name <server_bot_name> --non-interactive true
+metheus-governance-mcp-cli bot verify --provider telegram --bot-name <server_bot_name> --json true
 ```
 
 For direct Telegram adds, the CLI derives the local file name from the matched server bot name. You normally do not need `--bot-key` or `--username`. Treat `--bot-key` as an advanced compatibility selector only when you intentionally need to target an older local selector directly.
@@ -378,7 +381,7 @@ Execution model:
 - local runner stores workspace mapping and role profiles
 - runner resolves `project_id -> workspace_dir`
 - runner resolves server bot role to a local `role_profile`
-- runner executes the mapped client adapter (`codex` / `claude` / `gemini`)
+- runner executes the mapped client adapter (`gpt` / `claude` / `gemini`)
 - legacy `command` remains readable for migration, but execution is disabled by default unless `METHEUS_ALLOW_LEGACY_RUNNER_COMMAND=1`
 
 Commands:
@@ -421,7 +424,8 @@ Why `workspace_dir` matters:
 - without a valid project mapping, bots may answer with a generic local root instead of the real project workspace
 
 Role profile fields:
-- `client`: `codex`, `claude`, `gemini`, or `sample`
+- `client`: `gpt`, `claude`, `gemini`, or `sample`
+- `codex` is still accepted as a compatibility alias for `gpt`
 - `model`: optional CLI-specific model name
 - `permission_mode`: `read_only`, `workspace_write`, `danger_full_access`
 - `reasoning_effort`: `low`, `medium`, `high`

package/cli.mjs

@@ -185,7 +185,7 @@ const CTXPACK_PUSH_TOOL_NAMES = ["ctxpack.push", "ctxpack.update", "ctxpack.save
 const CLI_META = loadCLIMeta();
 const CLI_NAME = CLI_META.name || "metheus-governance-mcp-cli";
 const CLI_VERSION = CLI_META.version || "0.0.0";
-const DEFAULT_BOT_RUNNER_CLIENT = DEFAULT_LOCAL_AI_CLIENT;
+const DEFAULT_BOT_RUNNER_CLIENT = "gpt";
 const SELF_UPDATE_CHECK_INTERVAL_MS = 6 * 60 * 60 * 1000;
 const SELF_UPDATE_TIMEOUT_SECONDS = 6;
 const SELF_UPDATE_ENV_KEY = "METHEUS_CLI_AUTO_UPDATE";
@@ -253,7 +253,7 @@ function printUsage() {
       `  ${cmd} doctor [--project-id <uuid>] [--ctxpack-key <key>] [--base-url <url>] [--timeout-seconds <n>] [--strict <true|false>]`,
       `  ${cmd} proxy [--project-id <uuid>] [--ctxpack-key <key>] [--base-url <url>] [--workspace-dir <path|auto>] [--include-drafts <true|false>] [--auto-pull-on-conflict <true|false>] [--timeout-seconds <n>]`,
       `  ${cmd} selftest [--json <true|false>]`,
-      `  ${cmd} local-bot-bridge [--client <codex|claude|gemini|sample>] [--cwd <path>] [--model <name>] [--permission-mode <read_only|workspace_write|danger_full_access>] [--reasoning-effort <low|medium|high>]`,
+      `  ${cmd} local-bot-bridge [--client <gpt|claude|gemini|sample>] [--cwd <path>] [--model <name>] [--permission-mode <read_only|workspace_write|danger_full_access>] [--reasoning-effort <low|medium|high>]`,
       `  ${cmd} runner list [--json <true|false>]`,
       `  ${cmd} runner once [--route-name <name> | --bot-name <server_name> | --bot-id <uuid>] [--project-id <uuid>] [--provider <telegram|slack|kakaotalk>] [--role <monitor|review|worker|approval>] [--role-profile <name>] [--mentions-only <true|false>] [--reply-to-bot-messages <true|false>] [--direct-messages <true|false>] [--ignore-edited-messages <true|false>] [--dry-run-delivery <true|false>] [--context-comments <n>] [--archive-replies <true|false>]`,
       `  ${cmd} runner start [--route-name <name> | --bot-name <server_name> | --bot-id <uuid>] [--project-id <uuid>] [--provider <telegram|slack|kakaotalk>] [--role <monitor|review|worker|approval>] [--role-profile <name>] [--mentions-only <true|false>] [--reply-to-bot-messages <true|false>] [--direct-messages <true|false>] [--ignore-edited-messages <true|false>] [--dry-run-delivery <true|false>] [--poll-interval-ms <n>] [--context-comments <n>] [--archive-replies <true|false>]`,
@@ -832,7 +832,7 @@ function defaultLocalBotBridgeCommand(client = DEFAULT_BOT_RUNNER_CLIENT) {
 function defaultBotRunnerRoleProfiles() {
   return {
     monitor: {
-      client: "codex",
+      client: "gpt",
       model: "",
       permission_mode: "read_only",
       reasoning_effort: "low",
@@ -844,7 +844,7 @@ function defaultBotRunnerRoleProfiles() {
       reasoning_effort: "medium",
     },
     worker: {
-      client: "codex",
+      client: "gpt",
       model: "",
       permission_mode: "danger_full_access",
       reasoning_effort: "medium",
@@ -1243,6 +1243,7 @@ function normalizeBotRunnerConfigContents(parsed, filePath) {
   const defaults = defaultBotRunnerRoleProfiles();
   const rawRoleProfiles = safeObject(raw.role_profiles || raw.roleProfiles);
   const roleProfiles = {};
+  let migrated = rawVersion < BOT_RUNNER_CONFIG_VERSION;
   const roleProfileNames = new Set([
     ...Object.keys(defaults),
     ...Object.keys(rawRoleProfiles).map((name) => normalizeRunnerRoleProfileName(name)).filter(Boolean),
@@ -1253,6 +1254,10 @@ function normalizeBotRunnerConfigContents(parsed, filePath) {
       rawRoleProfiles[profileName],
       defaults[profileName] || {},
     );
+    const rawClient = String(safeObject(rawRoleProfiles[profileName]).client || safeObject(rawRoleProfiles[profileName]).cli || "").trim().toLowerCase();
+    if (rawClient === "codex") {
+      migrated = true;
+    }
   }
 
   const botBindings = {};
@@ -1262,6 +1267,10 @@ function normalizeBotRunnerConfigContents(parsed, filePath) {
     if (!binding.name || (!binding.botID && !binding.botName)) continue;
     if (!binding.roleProfile && !binding.client && !binding.model && !binding.permissionMode && !binding.reasoningEffort) continue;
     botBindings[binding.name] = binding;
+    const rawClient = String(safeObject(rawBinding).client || "").trim().toLowerCase();
+    if (rawClient === "codex") {
+      migrated = true;
+    }
   }
 
   const projectMappings = {};
@@ -1274,7 +1283,6 @@ function normalizeBotRunnerConfigContents(parsed, filePath) {
   }
 
   const routes = [];
-  let migrated = rawVersion < BOT_RUNNER_CONFIG_VERSION;
   for (const rawRoute of ensureArray(raw.routes)) {
     const routeSource = safeObject(rawRoute);
     const route = normalizeRunnerRoute(routeSource);

package/lib/bot-commands.mjs

@@ -228,7 +228,7 @@ function printBotUsage(deps) {
       `Behavior:`,
       `  - bot setup asks for provider first, then shows a numbered action menu.`,
       `  - 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.`,
+      `  - in the normal Telegram path, bot add does not ask for an advanced local selector or a server role/profile choice.`,
       `  - server bot name/UUID is the source of truth; --bot-key is an advanced compatibility selector only.`,
       `  - runner commands can auto-select by --bot-name or --bot-id when one enabled route matches. Use runner list first if you are unsure.`,
       `  - bot edit without flags asks for provider, existing entry, then walks field-by-field in a numbered flow.`,
@@ -813,7 +813,7 @@ function telegramEntryDisplayName(entry) {
 
 function displayLocalAIClientName(clientName) {
   const normalized = String(clientName || "").trim().toLowerCase();
-  if (normalized === "codex" || normalized === "gpt") return "GPT";
+  if (normalized === "gpt" || normalized === "codex") return "GPT";
   if (normalized === "claude") return "Claude";
   if (normalized === "gemini") return "Gemini";
   if (normalized === "sample") return "Sample";
@@ -1568,12 +1568,12 @@ async function chooseServerBot(ui, provider, baseURL, timeoutSeconds, deps, opti
       {
         value: "__manual__",
         label: "Manual entry",
-        description: "type the server bot UUID yourself",
+        description: "enter a server bot UUID manually",
       },
       {
         value: "__blank__",
         label: "Leave empty",
-        description: "skip server bot UUID binding",
+        description: "continue without a server bot binding",
       },
     ],
     { defaultIndex: 0 },
@@ -1618,12 +1618,12 @@ async function chooseServerBot(ui, provider, baseURL, timeoutSeconds, deps, opti
       {
         value: "__manual__",
         label: "Manual entry",
-        description: "type the server bot UUID yourself",
+        description: "enter a server bot UUID manually",
       },
       {
         value: "__blank__",
         label: "Leave empty",
-        description: "skip server bot UUID binding",
+        description: "continue without a server bot binding",
       },
     ],
     { defaultIndex: 0 },
@@ -1710,7 +1710,7 @@ async function resolveServerBotForNonInteractive(provider, flags, deps, options
     (bot) => normalizeServerBotIdentityText(bot.name) === requestedName,
   );
   if (!matchedByName.length) {
-    throw new Error(`no server bot matched ${requestedName}`);
+    throw new Error(`no server bot matched the requested server bot name "${requestedName}"`);
   }
   if (matchedByName.length === 1) {
     const match = matchedByName[0] || {};
@@ -1758,7 +1758,7 @@ async function promptAIClient(ui, deps, defaultValue = "") {
 
 function suggestedAIModelsForClient(clientName) {
   const normalizedClient = String(clientName || "").trim().toLowerCase();
-  if (normalizedClient === "codex") {
+  if (normalizedClient === "gpt") {
     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 model" },
@@ -1789,23 +1789,26 @@ async function promptAIModel(ui, deps, clientName, defaultValue = "", title = "S
   const normalizedClient = requireDependency(deps, "normalizeLocalAIClientName")(clientName || "", "");
   const currentValue = String(defaultValue || "").trim();
   const suggestions = suggestedAIModelsForClient(normalizedClient);
+  const currentMatchesSuggestions = currentValue && suggestions.some((item) => item.value === currentValue);
   const options = [
     { value: "", label: "(blank)", description: "leave AI model empty" },
   ];
-  if (currentValue && !suggestions.some((item) => item.value === currentValue)) {
+  options.push(...suggestions);
+  if (currentValue && !currentMatchesSuggestions) {
     options.push({
       value: currentValue,
-      label: currentValue,
-      description: "current saved model",
+      label: `Keep current custom model (${currentValue})`,
+      description: "reuse the model already saved on disk",
     });
   }
-  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 selectedIndex = currentMatchesSuggestions
+    ? Math.max(0, options.findIndex((item) => item.value === currentValue))
+    : (suggestions.length ? 1 : 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();
@@ -2154,6 +2157,11 @@ function resolveTelegramServerBindingDetailsFromBots(envConfig, bots, deps) {
   const normalizedServerIdentity = normalizeServerBotIdentityText(current.serverBotName || current.botUsername || current.botKey);
   const matches = bots.filter((bot) => normalizeServerBotIdentityText(bot.name) === normalizedServerIdentity);
   if (!matches.length) {
+    const unmatchedIdentity = String(current.botUsername || "").trim()
+      ? `@${String(current.botUsername || "").trim()}`
+      : String(current.serverBotName || "").trim()
+        ? `"${String(current.serverBotName || "").trim()}"`
+        : "this local Telegram bot";
     return {
       ok: false,
       mode: "missing",
@@ -2165,7 +2173,7 @@ function resolveTelegramServerBindingDetailsFromBots(envConfig, bots, deps) {
       serverBotID: "",
       effectiveRoleProfile: null,
       effectiveRoleProfiles: {},
-      detail: `no server bot matched ${current.botUsername ? `@${current.botUsername}` : current.botKey}`,
+      detail: `no server bot matched ${unmatchedIdentity}`,
     };
   }
   if (matches.length > 1) {
@@ -2422,12 +2430,12 @@ async function addTelegramBot(ui, flags, deps) {
     defaultKeyHint,
   );
   if (nonInteractive && existingKeys.has(botKey)) {
-    throw new Error(`Telegram bot key "${botKey}" already exists`);
+    throw new Error(`Telegram local selector "${botKey}" already exists`);
   }
   const serverGroupMatched = serverBot.matchMode === "group";
   if (serverGroupMatched && !nonInteractive) {
     process.stdout.write(
-      `Matched server Telegram bot "${serverBot.name || username || botKey}" with roles: ${ensureArray(serverBot.roles).join(", ")}. Runtime will use the server role, so local role/AI fields can stay empty.\n`,
+      `Matched server Telegram bot "${serverBot.name || username || "current Telegram bot"}" with roles: ${ensureArray(serverBot.roles).join(", ")}. Runtime will use the server role, so local role/AI fields can stay empty.\n`,
     );
   }
   const aiFlagOverrides = hasOwnFlag(flags, "client")
@@ -2528,7 +2536,7 @@ async function addTelegramBot(ui, flags, deps) {
   }
 
   const filePath = writeProviderEnvState("telegram", nextParsed, deps);
-  process.stdout.write(`Saved Telegram bot entry "${botKey}" to ${filePath}\n`);
+  process.stdout.write(`Saved Telegram bot file for "${String(serverBot.name || username || botKey).trim() || "telegram"}" to ${filePath}\n`);
 }
 
 async function editTelegramGlobalSettings(ui, flags, deps) {
@@ -2559,7 +2567,7 @@ async function editTelegramGlobalSettings(ui, flags, deps) {
       { value: "api", label: "API base URL", description: String(parsed.TELEGRAM_API_BASE_URL || "").trim() || "(empty)" },
       { value: "webhook", label: "Auto clear webhook", description: boolFromRaw(parsed.TELEGRAM_AUTO_CLEAR_WEBHOOK, true) ? "true" : "false" },
       { value: "updates", label: "Allowed updates", description: String(parsed.TELEGRAM_ALLOWED_UPDATES || "message,edited_message").trim() },
-      { value: "default", label: "Default bot key", description: String(parsed.TELEGRAM_DEFAULT_BOT_KEY || "").trim() || "(empty)" },
+      { value: "default", label: "Default Telegram bot", description: String(parsed.TELEGRAM_DEFAULT_BOT_KEY || "").trim() || "(empty)" },
     ],
     { defaultIndex: 0 },
   );
@@ -2669,7 +2677,7 @@ async function removeTelegramBot(ui, flags, deps) {
     nextParsed.TELEGRAM_DEFAULT_BOT_KEY = remaining[0]?.key || "";
   }
   const filePath = writeProviderEnvState("telegram", nextParsed, deps);
-  process.stdout.write(`Removed Telegram bot "${selected.key}" from ${filePath}\n`);
+  process.stdout.write(`Removed Telegram bot file for "${String(selected.serverBotName || selected.username || selected.key).trim() || "telegram"}" from ${filePath}\n`);
 }
 
 async function verifyProviderEntry(ui, provider, flags, deps) {
@@ -3105,7 +3113,7 @@ async function runBotRemove(ui, flags, deps) {
         nextParsed.TELEGRAM_DEFAULT_BOT_KEY = remaining[0]?.key || "";
       }
       const filePath = writeProviderEnvState("telegram", nextParsed, deps);
-      process.stdout.write(`Removed Telegram bot "${selected.key}" from ${filePath}\n`);
+      process.stdout.write(`Removed Telegram bot file for "${String(selected.serverBotName || selected.username || selected.key).trim() || "telegram"}" from ${filePath}\n`);
       return;
     }
     await removeTelegramBot(ui, flags, deps);
@@ -3178,11 +3186,11 @@ async function runBotMigrate(ui, flags, deps) {
   const botKey = normalizeBotKey(
     nonInteractive
       ? String(flags["bot-key"] || defaultKeyHint).trim()
-      : await promptRequiredLine(ui, "Local Telegram bot key for migrated entry", defaultKeyHint),
+      : await promptRequiredLine(ui, "Advanced local selector for migrated entry", defaultKeyHint),
     defaultKeyHint,
   );
   if (existingKeys.has(botKey)) {
-    throw new Error(`Telegram bot key "${botKey}" already exists`);
+    throw new Error(`Telegram local selector "${botKey}" already exists`);
   }
   const nextParsed = upsertTelegramEntry(parsed, {
     key: botKey,
@@ -3203,7 +3211,7 @@ async function runBotMigrate(ui, flags, deps) {
   }
   const filePath = writeProviderEnvState("telegram", nextParsed, deps);
   process.stdout.write(
-    `Migrated TELEGRAM_BOT_TOKEN to named entry "${botKey}" in ${filePath}${boolFromRaw(flags["keep-legacy-token"], false) ? " (legacy token preserved)" : ""}\n`,
+    `Migrated TELEGRAM_BOT_TOKEN to named entry selector "${botKey}" in ${filePath}${boolFromRaw(flags["keep-legacy-token"], false) ? " (legacy token preserved)" : ""}\n`,
   );
 }
 

package/lib/doctor-checks.mjs

@@ -63,7 +63,7 @@ export async function runDoctorProjectDestinationChecks({
       }
       const tokenDetailParts = [`configured (${envConfig.filePath})`];
       if (envConfig.botKey) {
-        tokenDetailParts.push(`bot=${envConfig.botKey}`);
+        tokenDetailParts.push(`local_selector=${envConfig.botKey}`);
       }
       if (envConfig.botUsername) {
         tokenDetailParts.push(`@${envConfig.botUsername}`);

package/lib/local-ai-adapters.mjs

@@ -3,8 +3,8 @@ import os from "node:os";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
 
-export const SUPPORTED_LOCAL_AI_CLIENTS = ["codex", "claude", "gemini", "sample"];
-export const DEFAULT_LOCAL_AI_CLIENT = "codex";
+export const SUPPORTED_LOCAL_AI_CLIENTS = ["gpt", "claude", "gemini", "sample"];
+export const DEFAULT_LOCAL_AI_CLIENT = "gpt";
 
 const SUPPORTED_PERMISSION_MODES = ["read_only", "workspace_write", "danger_full_access"];
 const SUPPORTED_REASONING_EFFORTS = ["low", "medium", "high"];
@@ -18,7 +18,7 @@ const GEMINI_HOME_SYNC_FILES = [
   "settings.json",
 ];
 const LOCAL_AI_MODEL_MAPPINGS = {
-  codex: [
+  gpt: [
     {
       display: "gpt-5.4",
       execution: "gpt-5.4",
@@ -589,8 +589,8 @@ 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 (["gpt", "openai-gpt", "openai", "codex"].includes(value)) {
+    return "gpt";
   }
   if (SUPPORTED_LOCAL_AI_CLIENTS.includes(value)) {
     return value;
@@ -734,7 +734,7 @@ export function runLocalAIClient({
     METHEUS_AI_RUNNER_REASONING_EFFORT: normalizedReasoningEffort,
     METHEUS_RUNNER_WORKSPACE_DIR: resolvedWorkspaceDir,
   };
-  if (normalizedClient === "codex") {
+  if (normalizedClient === "gpt") {
     return runCodexAdapter({
       promptText,
       workspaceDir: resolvedWorkspaceDir,

package/lib/selftest-bot-commands.mjs

@@ -95,7 +95,7 @@ function createMockServer(options = {}) {
     : [
       {
         id: "11111111-2222-3333-4444-555555555555",
-        name: "MonitorSelftestBot",
+        name: "ServerProtocolMonitorBot",
         provider: "telegram",
         bot_role: "monitor",
         is_active: true,
@@ -105,8 +105,8 @@ function createMockServer(options = {}) {
     ensureArray(options.telegramUsersByToken).length
       ? ensureArray(options.telegramUsersByToken)
       : [
-        ["selftest-main-token", "MonitorSelftestBot"],
-        ["selftest-edited-token", "MonitorSelftestBot"],
+        ["selftest-main-token", "ServerProtocolMonitorBot"],
+        ["selftest-edited-token", "ServerProtocolMonitorBot"],
       ],
   );
 
@@ -236,20 +236,20 @@ export async function runSelftestBotCommands(push, deps) {
   try {
     push(
       "display_model_labels_map_to_tested_execution_ids",
-      resolveLocalAIExecutionModel("codex", "gpt-5.4") === "gpt-5.4"
-        && resolveLocalAIExecutionModel("codex", "gpt-5.3-codex") === "gpt-5.3-codex"
-        && resolveLocalAIExecutionModel("codex", "gpt-5.3-codex-spark") === "gpt-5.3-codex-spark"
-        && resolveLocalAIExecutionModel("codex", "GPT-5.4") === "gpt-5.4"
-        && resolveLocalAIExecutionModel("codex", "GPT-5.3-CODEX") === "gpt-5.3-codex"
-        && resolveLocalAIExecutionModel("codex", "GPT-5.3-CODEX-Spark") === "gpt-5.3-codex-spark"
+      resolveLocalAIExecutionModel("gpt", "gpt-5.4") === "gpt-5.4"
+        && resolveLocalAIExecutionModel("gpt", "gpt-5.3-codex") === "gpt-5.3-codex"
+        && resolveLocalAIExecutionModel("gpt", "gpt-5.3-codex-spark") === "gpt-5.3-codex-spark"
+        && resolveLocalAIExecutionModel("gpt", "GPT-5.4") === "gpt-5.4"
+        && resolveLocalAIExecutionModel("gpt", "GPT-5.3-CODEX") === "gpt-5.3-codex"
+        && resolveLocalAIExecutionModel("gpt", "GPT-5.3-CODEX-Spark") === "gpt-5.3-codex-spark"
         && resolveLocalAIExecutionModel("claude", "Sonnet 4.6r") === "sonnet"
         && resolveLocalAIExecutionModel("claude", "Haiku 4.5") === "haiku"
         && resolveLocalAIExecutionModel("claude", "Opus 4.6") === "opus"
         && resolveLocalAIExecutionModel("gemini", "gemini-3.1-pro") === "auto-gemini-3",
       [
-        `gpt54=${resolveLocalAIExecutionModel("codex", "gpt-5.4")}`,
-        `gpt53codex=${resolveLocalAIExecutionModel("codex", "gpt-5.3-codex")}`,
-        `spark=${resolveLocalAIExecutionModel("codex", "gpt-5.3-codex-spark")}`,
+        `gpt54=${resolveLocalAIExecutionModel("gpt", "gpt-5.4")}`,
+        `gpt53codex=${resolveLocalAIExecutionModel("gpt", "gpt-5.3-codex")}`,
+        `spark=${resolveLocalAIExecutionModel("gpt", "gpt-5.3-codex-spark")}`,
         `claude=${resolveLocalAIExecutionModel("claude", "Sonnet 4.6r")}`,
         `gemini=${resolveLocalAIExecutionModel("gemini", "gemini-3.1-pro")}`,
       ].join(" "),
@@ -257,11 +257,11 @@ export async function runSelftestBotCommands(push, deps) {
 
     push(
       "blank_model_defaults_to_first_display_model_for_each_client",
-      suggestLocalAIModelDisplayName("codex", "") === "gpt-5.4"
+      suggestLocalAIModelDisplayName("gpt", "") === "gpt-5.4"
         && suggestLocalAIModelDisplayName("claude", "") === "Sonnet 4.6r"
         && suggestLocalAIModelDisplayName("gemini", "") === "gemini-3.1-pro",
       [
-        `codex=${suggestLocalAIModelDisplayName("codex", "")}`,
+        `gpt=${suggestLocalAIModelDisplayName("gpt", "")}`,
         `claude=${suggestLocalAIModelDisplayName("claude", "")}`,
         `gemini=${suggestLocalAIModelDisplayName("gemini", "")}`,
       ].join(" "),
@@ -290,6 +290,7 @@ export async function runSelftestBotCommands(push, deps) {
     const telegramApiBaseURL = `${baseURL}/telegram`;
     const telegramBotEntriesDir = path.join(tempHome, ".metheus", "telegram-bots");
     const telegramEnvPath = path.join(telegramBotEntriesDir, "global.env");
+    const botRunnerConfigPath = path.join(tempHome, ".metheus", "bot-runner.json");
     const readTelegramGlobals = () => parseSimpleEnvText(fs.readFileSync(telegramEnvPath, "utf8"));
     const readTelegramBotEntry = (selector) => {
       const requested = String(selector || "").trim().toLowerCase();
@@ -309,6 +310,42 @@ export async function runSelftestBotCommands(push, deps) {
       }
       return parseSimpleEnvText(fs.readFileSync(filePath, "utf8"));
     };
+    fs.mkdirSync(path.join(tempHome, ".metheus"), { recursive: true });
+    fs.writeFileSync(
+      botRunnerConfigPath,
+      `${JSON.stringify({
+        version: 2,
+        project_mappings: {},
+        role_profiles: {
+          monitor: {
+            client: "gpt",
+            model: "",
+            permission_mode: "read_only",
+            reasoning_effort: "low",
+          },
+          review: {
+            client: "claude",
+            model: "Sonnet 4.6r",
+            permission_mode: "danger_full_access",
+            reasoning_effort: "high",
+          },
+          worker: {
+            client: "gpt",
+            model: "gpt-5.4",
+            permission_mode: "danger_full_access",
+            reasoning_effort: "high",
+          },
+          approval: {
+            client: "claude",
+            model: "Sonnet 4.6r",
+            permission_mode: "danger_full_access",
+            reasoning_effort: "high",
+          },
+        },
+        routes: [],
+      }, null, 2)}\n`,
+      "utf8",
+    );
 
     const setupResult = await runCLI({
       cliPath,
@@ -359,29 +396,29 @@ export async function runSelftestBotCommands(push, deps) {
         ]),
       },
     });
-    const addState = readTelegramBotEntry("monitorselftestbot");
+    const addState = readTelegramBotEntry("serverprotocolmonitorbot");
     const addGlobals = readTelegramGlobals();
     push(
       "bot_add_guided_creates_named_telegram_entry",
-      String(addState.TELEGRAM_BOT_SERVER_NAME || "") === "MonitorSelftestBot"
+      String(addState.TELEGRAM_BOT_SERVER_NAME || "") === "ServerProtocolMonitorBot"
         && String(addState.TELEGRAM_BOT_SERVER_ROLES || "") === "monitor"
         && String(addState.TELEGRAM_BOT_TOKEN || "") === "selftest-main-token"
         && String(addState.TELEGRAM_BOT_ROLE_PROFILE || "") === "monitor"
-        && String(addState.TELEGRAM_BOT_AI_CLIENT || "") === "codex"
+        && String(addState.TELEGRAM_BOT_AI_CLIENT || "") === "gpt"
         && String(addState.TELEGRAM_BOT_AI_PERMISSION_MODE || "") === "read_only"
         && String(addState.TELEGRAM_BOT_AI_REASONING_EFFORT || "") === "low"
-        && String(addGlobals.TELEGRAM_DEFAULT_BOT_KEY || "") === "monitorselftestbot",
+        && String(addGlobals.TELEGRAM_DEFAULT_BOT_KEY || "") === "serverprotocolmonitorbot",
       `default=${String(addGlobals.TELEGRAM_DEFAULT_BOT_KEY || "")} token=${String(addState.TELEGRAM_BOT_TOKEN || "")} server_name=${String(addState.TELEGRAM_BOT_SERVER_NAME || "")} roles=${String(addState.TELEGRAM_BOT_SERVER_ROLES || "")} role=${String(addState.TELEGRAM_BOT_ROLE_PROFILE || "")} client=${String(addState.TELEGRAM_BOT_AI_CLIENT || "")}`,
     );
 
     const groupedMock = await createMockServer({
       serverBots: [
-        { id: "977ef999-c40b-4cf6-a142-ade246f1b9cf", name: "RyoAI_bot", provider: "telegram", bot_role: "approval", is_active: true },
-        { id: "d74b57de-a635-4bac-a20f-f8ada188cf97", name: "RyoAI_bot", provider: "telegram", bot_role: "worker", is_active: true },
-        { id: "bbae9450-4236-487c-9a05-61dc4a626215", name: "RyoAI_bot", provider: "telegram", bot_role: "review", is_active: true },
-        { id: "353896c5-3b6b-422f-9eeb-5dc9354f77b3", name: "RyoAI_bot", provider: "telegram", bot_role: "monitor", is_active: true },
+        { id: "977ef999-c40b-4cf6-a142-ade246f1b9cf", name: "GroupedServerProtocolBot", provider: "telegram", bot_role: "approval", is_active: true },
+        { id: "d74b57de-a635-4bac-a20f-f8ada188cf97", name: "GroupedServerProtocolBot", provider: "telegram", bot_role: "worker", is_active: true },
+        { id: "bbae9450-4236-487c-9a05-61dc4a626215", name: "GroupedServerProtocolBot", provider: "telegram", bot_role: "review", is_active: true },
+        { id: "353896c5-3b6b-422f-9eeb-5dc9354f77b3", name: "GroupedServerProtocolBot", provider: "telegram", bot_role: "monitor", is_active: true },
       ],
-      telegramUsersByToken: [["selftest-group-token", "RyoAI_bot"]],
+      telegramUsersByToken: [["selftest-group-token", "GroupedServerProtocolBot"]],
     }).listen();
     try {
       await runCLI({
@@ -410,11 +447,11 @@ export async function runSelftestBotCommands(push, deps) {
           ]),
         },
       });
-      const groupedState = readTelegramBotEntry("ryoai_bot");
+      const groupedState = readTelegramBotEntry("groupedserverprotocolbot");
     push(
       "bot_add_guided_autoresolves_server_bot_group_without_role_prompt",
         String(groupedState.TELEGRAM_BOT_SERVER_BOT_ID || "") === ""
-          && String(groupedState.TELEGRAM_BOT_SERVER_NAME || "") === "RyoAI_bot"
+          && String(groupedState.TELEGRAM_BOT_SERVER_NAME || "") === "GroupedServerProtocolBot"
           && String(groupedState.TELEGRAM_BOT_SERVER_ROLES || "") === "monitor,review,worker,approval"
           && String(groupedState.TELEGRAM_BOT_ROLE_PROFILE || "") === ""
           && String(groupedState.TELEGRAM_BOT_AI_CLIENT || "") === ""
@@ -433,13 +470,13 @@ export async function runSelftestBotCommands(push, deps) {
           ...env,
           METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
             "1", // provider: telegram
-            "2", // bot entry: ryoai_bot
+            "1", // bot entry: GroupedServerProtocolBot
             "1", // keep token
             "2", // grouped role settings: edit one role
             "3", // select role to edit: worker
             "2", // worker: edit settings
             "3", // worker AI client: claude
-            "3", // worker AI model: Sonnet 4.6r
+            "2", // worker AI model: Sonnet 4.6r
             "4", // worker permission: danger_full_access
             "4", // worker reasoning: high
             "y", // edit another role
@@ -462,15 +499,16 @@ export async function runSelftestBotCommands(push, deps) {
       );
       const groupedRunnerConfigPath = path.join(tempHome, ".metheus", "bot-runner.json");
       const groupedRunnerConfig = readJSON(fs.readFileSync(groupedRunnerConfigPath, "utf8"));
+      const groupedRoleProfiles = safeObject(groupedRunnerConfig.role_profiles || groupedRunnerConfig.roleProfiles);
       push(
       "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 || "") === "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 || "") === "gemini-3.1-pro",
-        `worker=${JSON.stringify(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).worker))} approval=${JSON.stringify(safeObject(safeObject(groupedRunnerConfig.role_profiles || {}).approval))}`,
+        String(safeObject(safeObject(groupedRoleProfiles).worker).client || "") === "claude"
+          && String(safeObject(safeObject(groupedRoleProfiles).worker).model || "") === "Sonnet 4.6r"
+          && String(safeObject(safeObject(groupedRoleProfiles).worker).permission_mode || "") === "danger_full_access"
+          && String(safeObject(safeObject(groupedRoleProfiles).worker).reasoning_effort || "") === "high"
+          && String(safeObject(safeObject(groupedRoleProfiles).approval).client || "") === "gemini"
+          && String(safeObject(safeObject(groupedRoleProfiles).approval).model || "") === "gemini-3.1-pro",
+        `worker=${JSON.stringify(safeObject(safeObject(groupedRoleProfiles).worker))} approval=${JSON.stringify(safeObject(safeObject(groupedRoleProfiles).approval))}`,
       );
 
       const groupedShowResult = await runCLI({
@@ -478,7 +516,7 @@ export async function runSelftestBotCommands(push, deps) {
         args: [
           "bot", "show",
           "--provider", "telegram",
-          "--bot-key", "ryoai_bot",
+          "--bot-key", "groupedserverprotocolbot",
           "--base-url", `http://127.0.0.1:${groupedMock.port}`,
           "--json", "true",
         ],
@@ -512,7 +550,7 @@ export async function runSelftestBotCommands(push, deps) {
       args: [
         "bot", "show",
         "--provider", "telegram",
-        "--bot-key", "monitorselftestbot",
+        "--bot-key", "serverprotocolmonitorbot",
         "--base-url", baseURL,
         "--json", "true",
       ],
@@ -543,7 +581,7 @@ export async function runSelftestBotCommands(push, deps) {
       args: [
         "bot", "show",
         "--provider", "telegram",
-        "--bot-key", "monitorselftestbot",
+        "--bot-key", "serverprotocolmonitorbot",
         "--base-url", baseURL,
         "--json", "true",
       ],
@@ -552,8 +590,8 @@ export async function runSelftestBotCommands(push, deps) {
     const showWithRoutesPayload = readJSON(showWithRoutesResult.stdout);
     push(
       "bot_show_returns_selected_telegram_entry",
-      safeObject(showPayload.entry).key === "monitorselftestbot"
-        && safeObject(showPayload.entry).client === "codex"
+      safeObject(showPayload.entry).key === "serverprotocolmonitorbot"
+        && safeObject(showPayload.entry).client === "gpt"
         && safeObject(showPayload.serverBinding).mode === "single",
       `key=${String(safeObject(showPayload.entry).key || "")} client=${String(safeObject(showPayload.entry).client || "")} mode=${String(safeObject(showPayload.serverBinding).mode || "")}`,
     );
@@ -574,12 +612,12 @@ export async function runSelftestBotCommands(push, deps) {
         ...env,
         METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
         "1", // provider: telegram
-        "1", // bot entry: @monitorselftestbot
+        "2", // bot entry: @serverprotocolmonitorbot
         "1", // keep token
         "2", // change AI client
         "4", // gemini
         "2", // change AI model
-        "3", // gemini model: gemini-3.1-pro
+        "2", // gemini model: gemini-3.1-pro
         "2", // change permission mode
         "3", // workspace_write
         "2", // change reasoning effort
@@ -594,7 +632,7 @@ export async function runSelftestBotCommands(push, deps) {
       !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 = readTelegramBotEntry("monitorselftestbot");
+    const guidedState = readTelegramBotEntry("serverprotocolmonitorbot");
     push(
       "bot_edit_guided_prompts_update_ai_binding_fields",
       String(guidedState.TELEGRAM_BOT_AI_CLIENT || "") === "gemini"
@@ -609,7 +647,7 @@ export async function runSelftestBotCommands(push, deps) {
       args: [
         "bot", "edit",
         "--provider", "telegram",
-        "--bot-key", "monitorselftestbot",
+        "--bot-key", "serverprotocolmonitorbot",
         "--non-interactive", "true",
         "--token", "selftest-edited-token",
         "--client", "claude",
@@ -619,7 +657,7 @@ export async function runSelftestBotCommands(push, deps) {
       ],
       env,
     });
-    const editedState = readTelegramBotEntry("monitorselftestbot");
+    const editedState = readTelegramBotEntry("serverprotocolmonitorbot");
     push(
       "bot_edit_updates_ai_binding_fields",
       String(editedState.TELEGRAM_BOT_TOKEN || "") === "selftest-edited-token"
@@ -637,7 +675,7 @@ export async function runSelftestBotCommands(push, deps) {
         ...env,
         METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
           "1", // provider: telegram
-          "1", // bot entry: @monitorselftestbot
+          "2", // bot entry: @serverprotocolmonitorbot
           "1", // confirm set default
         ]),
       },
@@ -645,7 +683,7 @@ export async function runSelftestBotCommands(push, deps) {
     const guidedDefaultState = readTelegramGlobals();
     push(
       "bot_set_default_guided_selects_entry",
-      String(guidedDefaultState.TELEGRAM_DEFAULT_BOT_KEY || "") === "monitorselftestbot",
+      String(guidedDefaultState.TELEGRAM_DEFAULT_BOT_KEY || "") === "serverprotocolmonitorbot",
       `default=${String(guidedDefaultState.TELEGRAM_DEFAULT_BOT_KEY || "")}`,
     );
 
@@ -660,7 +698,7 @@ export async function runSelftestBotCommands(push, deps) {
         ...env,
         METHEUS_SCRIPTED_PROMPT_ANSWERS: JSON.stringify([
           "1", // provider: telegram
-          "1", // bot entry: @monitorselftestbot
+          "2", // bot entry: @serverprotocolmonitorbot
           "2", // output format: json
         ]),
       },
@@ -680,7 +718,7 @@ export async function runSelftestBotCommands(push, deps) {
       args: [
         "bot", "set-default",
         "--provider", "telegram",
-        "--bot-key", "monitorselftestbot",
+        "--bot-key", "serverprotocolmonitorbot",
         "--non-interactive", "true",
       ],
       env,
@@ -688,7 +726,7 @@ export async function runSelftestBotCommands(push, deps) {
     const defaultState = readTelegramGlobals();
     push(
       "bot_set_default_updates_default_bot_key",
-      String(defaultState.TELEGRAM_DEFAULT_BOT_KEY || "") === "monitorselftestbot",
+      String(defaultState.TELEGRAM_DEFAULT_BOT_KEY || "") === "serverprotocolmonitorbot",
       `default=${String(defaultState.TELEGRAM_DEFAULT_BOT_KEY || "")}`,
     );
 
@@ -697,7 +735,7 @@ export async function runSelftestBotCommands(push, deps) {
       args: [
         "bot", "verify",
         "--provider", "telegram",
-        "--bot-key", "monitorselftestbot",
+        "--bot-key", "serverprotocolmonitorbot",
         "--base-url", baseURL,
         "--timeout-seconds", "5",
         "--json", "true",
@@ -727,7 +765,7 @@ export async function runSelftestBotCommands(push, deps) {
       args: [
         "bot", "remove",
         "--provider", "telegram",
-        "--bot-key", "monitorselftestbot",
+        "--bot-key", "serverprotocolmonitorbot",
         "--non-interactive", "true",
       ],
       env,
@@ -745,7 +783,7 @@ export async function runSelftestBotCommands(push, deps) {
     const telegramEntry = safeObject(listPayload[0]);
     push(
       "bot_remove_deletes_named_telegram_entry",
-      !ensureArray(telegramEntry.entries).some((entry) => String(safeObject(entry).key || "") === "monitorselftestbot"),
+      !ensureArray(telegramEntry.entries).some((entry) => String(safeObject(entry).key || "") === "serverprotocolmonitorbot"),
       `entries=${String(ensureArray(telegramEntry.entries).length)}`,
     );
 
@@ -767,13 +805,13 @@ export async function runSelftestBotCommands(push, deps) {
       ],
       env,
     });
-    const aliasAddState = readTelegramBotEntry("monitorselftestbot");
+    const aliasAddState = readTelegramBotEntry("serverprotocolmonitorbot");
     push(
       "bot_add_accepts_ai_prefixed_option_aliases",
       String(aliasAddState.TELEGRAM_BOT_SERVER_BOT_ID || "") === mock.bots[0].id
-        && String(aliasAddState.TELEGRAM_BOT_SERVER_NAME || "") === "MonitorSelftestBot"
+        && String(aliasAddState.TELEGRAM_BOT_SERVER_NAME || "") === "ServerProtocolMonitorBot"
         && String(aliasAddState.TELEGRAM_BOT_SERVER_ROLES || "") === "monitor"
-        && String(aliasAddState.TELEGRAM_BOT_AI_CLIENT || "") === "codex"
+        && String(aliasAddState.TELEGRAM_BOT_AI_CLIENT || "") === "gpt"
         && String(aliasAddState.TELEGRAM_BOT_AI_MODEL || "") === "gpt-5.4"
         && String(aliasAddState.TELEGRAM_BOT_AI_PERMISSION_MODE || "") === "read_only"
         && String(aliasAddState.TELEGRAM_BOT_AI_REASONING_EFFORT || "") === "low",
@@ -792,7 +830,7 @@ export async function runSelftestBotCommands(push, deps) {
     const guidedRemoveBeforePayload = ensureArray(readJSON(guidedRemoveBeforeList.stdout));
     const guidedRemoveBeforeEntry = safeObject(guidedRemoveBeforePayload[0]);
     const guidedRemoveEntries = ensureArray(guidedRemoveBeforeEntry.entries);
-    const explicitEntryIndex = guidedRemoveEntries.findIndex((entry) => String(safeObject(entry).key || "") === "monitorselftestbot");
+    const explicitEntryIndex = guidedRemoveEntries.findIndex((entry) => String(safeObject(entry).key || "") === "serverprotocolmonitorbot");
 
     await runCLI({
       cliPath,
@@ -838,7 +876,7 @@ export async function runSelftestBotCommands(push, deps) {
         "--provider", "telegram",
         "--bot-key", "legacy_main",
         "--bot-id", mock.bots[0].id,
-        "--bot-name", "MonitorSelftestBot",
+        "--bot-name", "ServerProtocolMonitorBot",
         "--role-profile", "monitor",
         "--client", "codex",
         "--permission-mode", "read_only",

package/lib/selftest-runner-scenarios.mjs

@@ -186,9 +186,9 @@ export async function runSelftestRunnerScenarios(push, deps) {
       project_id: selftestProjectID,
       provider: "telegram",
       role: "monitor",
-      bot_name: "RyoAI_bot",
+      bot_name: "ServerProtocolMonitorBot",
     }),
-    { name: "RyoAI_bot", role: "review" },
+    { name: "ServerProtocolMonitorBot", role: "review" },
     normalizeBotRunnerConfigContents(
       {
         version: 2,
@@ -211,7 +211,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
           },
         },
         bot_bindings: {
-          RyoAI_bot: {
+          ServerProtocolMonitorBot: {
             role_profile: "approval",
           },
         },
@@ -237,9 +237,9 @@ export async function runSelftestRunnerScenarios(push, deps) {
       project_id: selftestProjectID,
       provider: "telegram",
       role: "monitor",
-      bot_name: "RyoAI_bot",
+      bot_name: "ServerProtocolMonitorBot",
     }),
-    { name: "RyoAI_bot", role: "monitor" },
+    { name: "ServerProtocolMonitorBot", role: "monitor" },
     normalizeBotRunnerConfigContents(
       {
         version: 2,
@@ -257,7 +257,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
           },
         },
         bot_bindings: {
-          RyoAI_bot: {
+          ServerProtocolMonitorBot: {
             role_profile: "monitor",
             client: "claude",
             reasoning_effort: "high",
@@ -435,7 +435,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
             provider: "telegram",
             role: "monitor",
             role_profile: "monitor",
-            bot_name: "RyoAI_bot",
+            bot_name: "ServerProtocolMonitorBot",
             destination_label: "AI incubating CHAT ROOM",
             archive_work_item_id: "304ce77a-7032-421c-aeda-bc54daf088dd",
           },
@@ -451,7 +451,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
         provider: "telegram",
         role: "monitor",
         "role-profile": "monitor",
-        "bot-name": "RyoAI_bot",
+        "bot-name": "ServerProtocolMonitorBot",
         "dry-run-delivery": true,
       },
       "once",
@@ -463,7 +463,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
         && resolvedRunnerRoute.name === "telegram-monitor"
         && resolvedRunnerRoute.destinationLabel === "AI incubating CHAT ROOM"
         && resolvedRunnerRoute.dryRunDelivery === true
-        && runnerRouteKey(resolvedRunnerRoute) === "telegram-monitor::11111111-1111-1111-1111-111111111111::telegram::monitor::RyoAI_bot::AI incubating CHAT ROOM",
+        && runnerRouteKey(resolvedRunnerRoute) === "telegram-monitor::11111111-1111-1111-1111-111111111111::telegram::monitor::ServerProtocolMonitorBot::AI incubating CHAT ROOM",
       `name=${resolvedRunnerRoute.name || "(none)"} destination=${resolvedRunnerRoute.destinationLabel || "(none)"} key=${runnerRouteKey(resolvedRunnerRoute)}`,
     );
   } catch (err) {
@@ -515,7 +515,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
             provider: "telegram",
             role: "monitor",
             role_profile: "monitor",
-            bot_name: "RyoAI_bot",
+            bot_name: "ServerProtocolMonitorBot",
             destination_label: "AI incubating CHAT ROOM",
           },
         ],
@@ -527,7 +527,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
       `${JSON.stringify({
         version: 1,
         routes: {
-          "-::11111111-1111-1111-1111-111111111111::telegram::monitor::RyoAI_bot::-": {
+          "-::11111111-1111-1111-1111-111111111111::telegram::monitor::ServerProtocolMonitorBot::-": {
             last_processed_comment_id: "comment-a",
             last_processed_created_at: "2026-03-13T06:00:00.000Z",
             last_source_message_id: 41,
@@ -543,7 +543,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
     process.env.HOME = migrationHome;
     process.env.USERPROFILE = migrationHome;
     const migratedRunnerState = loadBotRunnerState();
-    const canonicalRunnerStateKey = "telegram-monitor::11111111-1111-1111-1111-111111111111::telegram::monitor::RyoAI_bot::AI incubating CHAT ROOM";
+    const canonicalRunnerStateKey = "telegram-monitor::11111111-1111-1111-1111-111111111111::telegram::monitor::ServerProtocolMonitorBot::AI incubating CHAT ROOM";
     const persistedRunnerState = tryJsonParse(
       fs.readFileSync(path.join(migrationMetheusDir, "bot-runner-state.json"), "utf8"),
     );
@@ -552,7 +552,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
       migratedRunnerState.migrated === true
         && migratedRunnerState.migratedKeys.length === 1
         && Boolean(migratedRunnerState.routes[canonicalRunnerStateKey])
-        && !migratedRunnerState.routes["-::11111111-1111-1111-1111-111111111111::telegram::monitor::RyoAI_bot::-"]
+        && !migratedRunnerState.routes["-::11111111-1111-1111-1111-111111111111::telegram::monitor::ServerProtocolMonitorBot::-"]
         && Boolean(safeObject(persistedRunnerState.routes)[canonicalRunnerStateKey]),
       `migrated=${String(migratedRunnerState.migrated)} key=${canonicalRunnerStateKey}`,
     );
@@ -619,7 +619,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
       },
     },
     mentionOnlyRoute,
-    { name: "RyoAI_bot", role: "monitor" },
+    { name: "ServerProtocolMonitorBot", role: "monitor" },
   );
   push(
     "telegram_trigger_mentions_only_skips_unmentioned_group_message",
@@ -634,13 +634,13 @@ export async function runSelftestRunnerScenarios(push, deps) {
         kind: "telegram_message",
         chatID: "-100123",
         chatType: "supergroup",
-        body: "hello @RyoAI_bot",
+        body: "hello @ServerProtocolMonitorBot",
         mentionUsernames: ["ryoai_bot"],
         replyToSenderIsBot: false,
       },
     },
     mentionOnlyRoute,
-    { name: "RyoAI_bot", role: "monitor" },
+    { name: "ServerProtocolMonitorBot", role: "monitor" },
   );
   push(
     "telegram_trigger_mentions_only_accepts_bot_mention",
@@ -650,7 +650,7 @@ export async function runSelftestRunnerScenarios(push, deps) {
 
   const botReplyArchiveComment = formatBotReplyArchiveComment({
     provider: "telegram",
-    bot: { id: "bot-1", name: "RyoAI_bot", role: "monitor" },
+    bot: { id: "bot-1", name: "ServerProtocolMonitorBot", role: "monitor" },
     destination: { chatID: "-100123", label: "Main Room" },
     replyText: "hello",
     messageID: 4321,

package/lib/selftest-telegram-e2e.mjs

@@ -234,7 +234,7 @@ export async function runSelftestTelegramE2E(push, deps) {
     const e2eTelegramToken = "123456:test-token";
     const e2eBot = {
       id: "55555555-5555-4555-8555-555555555555",
-      name: "RyoAI_bot",
+      name: "ServerProtocolMonitorBot",
       role: "monitor",
     };
     const e2eDestination = {
@@ -356,7 +356,7 @@ export async function runSelftestTelegramE2E(push, deps) {
         && e2eResult.execution_mode === "role_profile"
         && e2eResult.role_profile === "monitor"
         && telegramE2EServer.state.sentMessages.length === 1
-        && String(telegramE2EServer.state.sentMessages[0]?.text || "").trim() === "Acknowledged: hello @RyoAI_bot"
+        && String(telegramE2EServer.state.sentMessages[0]?.text || "").trim() === "Acknowledged: hello @ServerProtocolMonitorBot"
         && intFromRawAllowZero(telegramE2EServer.state.sentMessages[0]?.reply_to_message_id, 0) === 41
         && telegramE2EServer.state.chatActions.length >= 1
         && Boolean(mirroredReply)

package/package.json

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

package/postinstall.mjs

@@ -75,7 +75,7 @@ function botRunnerTemplate() {
       },
       role_profiles: {
         monitor: {
-          client: "codex",
+          client: "gpt",
           model: "",
           permission_mode: "read_only",
           reasoning_effort: "low",
@@ -87,7 +87,7 @@ function botRunnerTemplate() {
           reasoning_effort: "medium",
         },
         worker: {
-          client: "codex",
+          client: "gpt",
           model: "",
           permission_mode: "danger_full_access",
           reasoning_effort: "medium",
@@ -104,7 +104,7 @@ function botRunnerTemplate() {
           bot_id: "<server_bot_uuid>",
           bot_name: "<bot_name>",
           role_profile: "monitor",
-          client: "codex",
+          client: "gpt",
           model: "",
           permission_mode: "read_only",
           reasoning_effort: "low",