@link-assistant/hive-mind 1.69.10 → 1.69.12

package/src/locales/ru.lino

@@ -80,6 +80,10 @@ ru
   limits.current_week_sonnet_only "Текущая неделя (только Sonnet)"
   limits.disabled_by_admin "`--show-limits` отключён администратором бота."
   limits.disk_space "Дисковое пространство"
+  limits.duration_day_short "д"
+  limits.duration_hour_short "ч"
+  limits.duration_minute_short "мин"
+  limits.duration_second_short "с"
   limits.end "Конец"
   limits.five_hour_session "5-часовой сеанс"
   limits.five_min_load_avg "средняя нагрузка за 5 мин"
@@ -92,9 +96,41 @@ ru
   limits.passed "прошло"
   limits.plan "План"
   limits.ram "RAM"
+  limits.reason_claude_5_hour_session "Лимит 5-часового сеанса Claude {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_claude_running "Процесс Claude уже выполняется"
+  limits.reason_claude_weekly "Недельный лимит Claude {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_codex_5_hour_session "Лимит 5-часового сеанса Codex {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_codex_running "Процесс Codex уже выполняется"
+  limits.reason_codex_weekly "Недельный лимит Codex {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_cpu_usage "Использование CPU {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_disk_usage "Использование диска {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_gemini_running "Процесс Gemini CLI уже выполняется"
+  limits.reason_github_api "Использование GitHub API {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_min_interval "Минимальный интервал между командами ещё не прошёл"
+  limits.reason_qwen_running "Процесс Qwen Code уже выполняется"
+  limits.reason_ram_usage "Использование RAM {{currentPercent}}% (порог: {{thresholdPercent}})"
+  limits.reason_threshold_exceeded "Превышен порог {{metric}}"
+  limits.remaining "осталось {{duration}}"
   limits.requests "запросов"
   limits.resets_at "Сброс {{time}}"
   limits.resets_in "Сброс через {{duration}}"
+  limits.resource_limit_exceeded "Превышен лимит ресурсов"
+  limits.solve_queue_status "Статус очереди solve"
+  limits.queue_completed "Завершено"
+  limits.queue_failed "С ошибкой"
+  limits.queue_and_more "и ещё {{count}}"
+  limits.queue_pending "ожидает"
+  limits.queue_processing "выполняется"
+  limits.queue_processes "процессов: {{count}}"
+  limits.queue_status_cancelled "отменено"
+  limits.queue_status_failed "ошибка"
+  limits.queue_status_queued "в очереди"
+  limits.queue_status_started "запущено"
+  limits.queue_status_starting "запускается"
+  limits.queue_status_waiting "ожидание"
+  limits.queue_waiting_current_command "ожидание текущей команды"
+  limits.queue_waiting_in_queue "Ожидание в очереди"
+  limits.queues "Очереди"
   limits.seven_day_all_models "7 дней, все модели"
   limits.seven_day_sonnet_only "7 дней, только Sonnet"
   limits.session "сеанс"
@@ -107,10 +143,12 @@ ru
   telegram.fetching_limits "🔄 Получение лимитов использования..."
   telegram.gathering_version "🔄 Сбор информации о версии..."
   telegram.usage_limits_title "📊 *Лимиты использования*"
-  telegram.version_information_title "🤖 *Информация о версии*"
+  telegram.version_information_title "🤖 *Информация о версиях*"
+  telegram.formatting_fallback_warning "⚠️ Обнаружена ошибка форматирования. Показываю обычный текст."
   telegram.limits_only_in_groups "❌ Команда /limits работает только в групповых чатах. Добавьте бота в группу и сделайте его администратором."
   telegram.version_only_in_groups "❌ Команда /version работает только в групповых чатах. Добавьте бота в группу и сделайте его администратором."
   telegram.solve_only_in_groups "❌ Команда {{commandDisplay}} работает только в групповых чатах. Добавьте бота в группу и сделайте его администратором."
+  telegram.solve_queue_only_in_groups "❌ Команда /solve_queue работает только в групповых чатах. Добавьте бота в группу и сделайте его администратором."
   telegram.hive_only_in_groups "❌ Команда /hive работает только в групповых чатах. Добавьте бота в группу и сделайте его администратором."
   telegram.solve_disabled "❌ Команда solve отключена в этом экземпляре бота."
   telegram.hive_disabled "❌ Команда /hive отключена в этом экземпляре бота."
@@ -215,6 +253,20 @@ ru
   language.ru "Русский"
   language.zh "Китайский"
   language.hi "Хинди"
+  version.ai_agents "AI-агенты"
+  version.browsers "Браузеры"
+  version.browser_automation "Автоматизация браузера"
+  version.connected "подключено"
+  version.development_tools "Инструменты разработки"
+  version.environment "Среда"
+  version.architecture "Архитектура"
+  version.kernel "Ядро"
+  version.not_connected "не подключено"
+  version.os "ОС"
+  version.platform "Платформа"
+  version.process_running_restart_needed "Запущенный процесс: `{{processVersion}}` (требуется перезапуск)"
+  version.system "Система"
+  version.version "Версия"
   prompt.user.issue_to_solve "Задача для решения: {{issueUrl}}"
   prompt.user.issue_linked_to_pr "Задача для решения: задача, связанная с PR #{{prNumber}}"
   prompt.user.prepared_branch "Подготовленная ветка: {{branchName}}"

package/src/locales/zh.lino

@@ -80,6 +80,10 @@ zh
   limits.current_week_sonnet_only "本周（仅 Sonnet）"
   limits.disabled_by_admin "`--show-limits` 已被机器人管理员禁用。"
   limits.disk_space "磁盘空间"
+  limits.duration_day_short "天"
+  limits.duration_hour_short "小时"
+  limits.duration_minute_short "分钟"
+  limits.duration_second_short "秒"
   limits.end "结束"
   limits.five_hour_session "5 小时会话"
   limits.five_min_load_avg "5 分钟平均负载"
@@ -92,9 +96,41 @@ zh
   limits.passed "已过"
   limits.plan "方案"
   limits.ram "内存"
+  limits.reason_claude_5_hour_session "Claude 5 小时会话限额为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_claude_running "Claude 进程已在运行"
+  limits.reason_claude_weekly "Claude 每周限额为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_codex_5_hour_session "Codex 5 小时会话限额为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_codex_running "Codex 进程已在运行"
+  limits.reason_codex_weekly "Codex 每周限额为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_cpu_usage "CPU 使用率为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_disk_usage "磁盘使用率为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_gemini_running "Gemini CLI 进程已在运行"
+  limits.reason_github_api "GitHub API 使用率为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_min_interval "尚未达到命令之间的最小间隔"
+  limits.reason_qwen_running "Qwen Code 进程已在运行"
+  limits.reason_ram_usage "内存使用率为 {{currentPercent}}%（阈值：{{thresholdPercent}}）"
+  limits.reason_threshold_exceeded "{{metric}} 超过阈值"
+  limits.remaining "剩余 {{duration}}"
   limits.requests "请求"
   limits.resets_at "{{time}} 重置"
   limits.resets_in "{{duration}} 后重置"
+  limits.resource_limit_exceeded "资源限额已超出"
+  limits.solve_queue_status "Solve 队列状态"
+  limits.queue_completed "已完成"
+  limits.queue_failed "失败"
+  limits.queue_and_more "还有 {{count}} 个"
+  limits.queue_pending "等待"
+  limits.queue_processing "处理中"
+  limits.queue_processes "{{count}} 个进程"
+  limits.queue_status_cancelled "已取消"
+  limits.queue_status_failed "失败"
+  limits.queue_status_queued "已排队"
+  limits.queue_status_started "已启动"
+  limits.queue_status_starting "正在启动"
+  limits.queue_status_waiting "等待中"
+  limits.queue_waiting_current_command "等待当前命令"
+  limits.queue_waiting_in_queue "在队列中等待"
+  limits.queues "队列"
   limits.seven_day_all_models "7 天所有模型"
   limits.seven_day_sonnet_only "7 天仅 Sonnet"
   limits.session "会话"
@@ -108,9 +144,11 @@ zh
   telegram.gathering_version "🔄 正在收集版本信息……"
   telegram.usage_limits_title "📊 *使用限额*"
   telegram.version_information_title "🤖 *版本信息*"
+  telegram.formatting_fallback_warning "⚠️ 检测到格式错误。正在显示纯文本备用内容。"
   telegram.limits_only_in_groups "❌ /limits 命令仅在群聊中有效。请将本机器人加入群组并设为管理员。"
   telegram.version_only_in_groups "❌ /version 命令仅在群聊中有效。请将本机器人加入群组并设为管理员。"
   telegram.solve_only_in_groups "❌ {{commandDisplay}} 命令仅在群聊中有效。请将本机器人加入群组并设为管理员。"
+  telegram.solve_queue_only_in_groups "❌ /solve_queue 命令仅在群聊中有效。请将本机器人加入群组并设为管理员。"
   telegram.hive_only_in_groups "❌ /hive 命令仅在群聊中有效。请将本机器人加入群组并设为管理员。"
   telegram.solve_disabled "❌ 此机器人实例已禁用 solve 命令。"
   telegram.hive_disabled "❌ 此机器人实例已禁用 /hive 命令。"
@@ -215,6 +253,20 @@ zh
   language.ru "俄语"
   language.zh "中文"
   language.hi "印地语"
+  version.ai_agents "AI 代理"
+  version.browsers "浏览器"
+  version.browser_automation "浏览器自动化"
+  version.connected "已连接"
+  version.development_tools "开发工具"
+  version.environment "环境"
+  version.architecture "架构"
+  version.kernel "内核"
+  version.not_connected "未连接"
+  version.os "操作系统"
+  version.platform "平台"
+  version.process_running_restart_needed "正在运行的进程：`{{processVersion}}`（需要重启）"
+  version.system "系统"
+  version.version "版本"
   prompt.user.issue_to_solve "要解决的问题：{{issueUrl}}"
   prompt.user.issue_linked_to_pr "要解决的问题：与 PR #{{prNumber}} 关联的问题"
   prompt.user.prepared_branch "为你准备的分支：{{branchName}}"

package/src/solve.mjs

@@ -148,6 +148,14 @@ const cleanupWrapper = async () => {
 const interruptWrapper = createInterruptWrapper({ cleanupContext, checkForUncommittedChanges, shouldAttachLogs, attachLogToGitHub, getLogFile, sanitizeLogContent, $, log });
 initializeExitHandler(getAbsoluteLogPath, log, cleanupWrapper, interruptWrapper, ({ code, reason }) => notifyIssueAboutPrePullRequestFailure({ code, reason, argv, globalState: global, $, log, getLogFile, shouldAttachLogs, attachLogToGitHub, sanitizeLogContent, rawCommand }));
 installGlobalExitHandlers();
+const markFailureNotificationPosted = targetType => {
+  global.preExitFailureNotificationPosted = true;
+  if (targetType === 'pr') {
+    global.pullRequestFailureNotificationPosted = true;
+  } else if (targetType === 'issue') {
+    global.prePullRequestFailureNotificationPosted = true;
+  }
+};
 
 // Now handle argument validation that was moved from early checks
 let issueUrl = argv['issue-url'] || argv._[0];
@@ -900,6 +908,7 @@ try {
           });
 
           if (logUploadSuccess) {
+            markFailureNotificationPosted('pr');
             await log('  ✅ Logs uploaded successfully');
           } else {
             // Issue #1212: Always show log upload failures (not just verbose)
@@ -924,6 +933,7 @@ try {
 
           const posted = await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: failureComment });
           if (posted.ok) {
+            markFailureNotificationPosted('pr');
             await log(`   Posted failure comment to PR${posted.commentId ? ` (id=${posted.commentId})` : ''}`);
           }
         } catch (error) {
@@ -1078,6 +1088,7 @@ try {
         });
 
         if (logUploadSuccess) {
+          markFailureNotificationPosted(logTargetType);
           await log(`  📎 Failure logs posted to ${logTargetLabel}`);
         } else {
           // Issue #1212: Always show log upload failures (not just verbose)

package/src/solve.pre-pr-failure-notifier.lib.mjs

@@ -1,5 +1,7 @@
 import { getTrackedToolCommentIds, postTrackedComment, SOLUTION_DRAFT_FAILED_MARKER } from './tool-comments.lib.mjs';
 
+export const FORK_DIVERGENCE_RESOLUTION_OPTION = '--allow-fork-divergence-resolution-using-force-push-with-lease';
+
 const truncate = (value, maxLength = 2000) => {
   const text = value === null || value === undefined ? '' : String(value);
   if (text.length <= maxLength) return text;
@@ -8,10 +10,24 @@ const truncate = (value, maxLength = 2000) => {
 
 const fence = value => truncate(value || 'Unknown error').replaceAll('```', '` ` `');
 
+const isForkDivergenceFailure = reason => {
+  const normalizedReason = String(reason || '').toLowerCase();
+  return normalizedReason.includes('fork divergence') || (normalizedReason.includes('fork') && normalizedReason.includes('non-fast-forward')) || normalizedReason.includes('force-with-lease');
+};
+
 export function buildPrePullRequestFailureActionSection(reason = '') {
   const normalizedReason = String(reason || '').toLowerCase();
   const isForkOrRecoveryFailure = normalizedReason.includes('fork') || normalizedReason.includes('auto-recovery') || normalizedReason.includes('repository setup');
 
+  if (isForkDivergenceFailure(reason)) {
+    return `### What you can do
+- If the fork's default branch can be overwritten safely, rerun with \`${FORK_DIVERGENCE_RESOLUTION_OPTION}\` to allow a guarded force-with-lease sync.
+- If the fork has commits you need to preserve, resolve the divergence manually, then rerun the solver.
+- If this requires elevated Hive Mind access, ask a Hive Mind administrator to handle the affected fork or repository.
+
+Administrator-only CLI details, if any, are printed in the solver terminal log rather than in this GitHub comment.`;
+  }
+
   if (isForkOrRecoveryFailure) {
     return `### What you can do
 - If the affected fork or repository belongs to you, remove, rename, archive, initialize, or otherwise repair it in GitHub, then rerun the solver.
@@ -36,6 +52,42 @@ export function shouldNotifyIssueAboutPrePullRequestFailure({ code, globalState
   return getTrackedToolCommentIds().size === 0;
 }
 
+export function resolvePreExitFailureNotificationTarget({ code, globalState }) {
+  if (code === 0) return null;
+  if (!globalState?.owner || !globalState?.repo) return null;
+  if (globalState.preExitFailureNotificationPosted || globalState.preExitFailureNotificationInProgress) return null;
+
+  const owner = globalState.owner;
+  const repo = globalState.repo;
+  const issueNumber = globalState.issueNumber || null;
+  const prNumber = globalState.createdPR?.number || globalState.prNumber || null;
+
+  if (prNumber) {
+    if (globalState.pullRequestFailureNotificationPosted || globalState.pullRequestFailureNotificationInProgress) return null;
+    return {
+      targetType: 'pr',
+      targetNumber: prNumber,
+      owner,
+      repo,
+      issueNumber,
+      prNumber,
+    };
+  }
+
+  if (!issueNumber) return null;
+  if (globalState.prePullRequestFailureNotificationPosted || globalState.prePullRequestFailureNotificationInProgress) return null;
+  if (getTrackedToolCommentIds().size !== 0) return null;
+
+  return {
+    targetType: 'issue',
+    targetNumber: issueNumber,
+    owner,
+    repo,
+    issueNumber,
+    prNumber: null,
+  };
+}
+
 export function buildPrePullRequestFailureComment({ reason, owner, repo, issueNumber, argv = {}, logAttachmentAttempted = false }) {
   const tool = argv.tool || 'claude';
   const modelLine = argv.model ? `\n- **Requested model**: \`${argv.model}\`` : '';
@@ -62,60 +114,124 @@ ${logLine}
 `;
 }
 
+export function buildExistingPullRequestFailureComment({ reason, owner, repo, prNumber, issueNumber = null, argv = {}, logAttachmentAttempted = false }) {
+  const tool = argv.tool || 'claude';
+  const modelLine = argv.model ? `\n- **Requested model**: \`${argv.model}\`` : '';
+  const issueLine = issueNumber ? `\n- **Linked issue**: #${issueNumber}` : '';
+  const logLine = logAttachmentAttempted ? 'Log attachment was attempted but failed. Check the solver terminal log for the complete failure output.' : 'Logs were not attached because `--attach-logs` was not enabled.';
+  const actionSection = buildPrePullRequestFailureActionSection(reason);
+
+  return `## 🚨 ${SOLUTION_DRAFT_FAILED_MARKER}
+
+The automated solver stopped while continuing this existing pull request, so the failure details are posted here for review.
+
+### Failure
+- **Repository**: \`${owner}/${repo}\`
+- **Pull request**: #${prNumber}${issueLine}
+- **Tool**: \`${tool}\`${modelLine}
+
+**Reason**
+\`\`\`text
+${fence(reason)}
+\`\`\`
+
+${actionSection}
+
+${logLine}
+`;
+}
+
+const markNotificationPosted = ({ globalState, targetType }) => {
+  globalState.preExitFailureNotificationPosted = true;
+  if (targetType === 'pr') {
+    globalState.pullRequestFailureNotificationPosted = true;
+  } else {
+    globalState.prePullRequestFailureNotificationPosted = true;
+  }
+};
+
 export async function notifyIssueAboutPrePullRequestFailure(options) {
   const { code, reason, argv = {}, globalState = globalThis, $, log = async () => {}, getLogFile, shouldAttachLogs = false, attachLogToGitHub, sanitizeLogContent, rawCommand = null, postComment = postTrackedComment } = options;
 
-  if (!shouldNotifyIssueAboutPrePullRequestFailure({ code, globalState })) {
+  const target = resolvePreExitFailureNotificationTarget({ code, globalState });
+  if (!target) {
     return { notified: false, skipped: true };
   }
 
-  const owner = globalState.owner;
-  const repo = globalState.repo;
-  const issueNumber = globalState.issueNumber;
-  globalState.prePullRequestFailureNotificationInProgress = true;
+  const { owner, repo, issueNumber, prNumber, targetType, targetNumber } = target;
+  const targetLabel = targetType === 'pr' ? `pull request #${targetNumber}` : `issue #${targetNumber}`;
+  globalState.preExitFailureNotificationInProgress = true;
+  if (targetType === 'pr') {
+    globalState.pullRequestFailureNotificationInProgress = true;
+  } else {
+    globalState.prePullRequestFailureNotificationInProgress = true;
+  }
 
   try {
     if (shouldAttachLogs && getLogFile && attachLogToGitHub && sanitizeLogContent) {
-      await log(`\n📄 Notifying issue #${issueNumber} about pre-PR failure with logs...`);
-      const uploaded = await attachLogToGitHub({
-        logFile: getLogFile(),
-        targetType: 'issue',
-        targetNumber: issueNumber,
-        owner,
-        repo,
-        $,
-        log,
-        sanitizeLogContent,
-        verbose: argv.verbose,
-        errorMessage: `The solver stopped before creating a pull request.\n\nReason: ${reason || 'Unknown error'}`,
-        requestedModel: argv.originalModel || argv.model,
-        tool: argv.tool || 'claude',
-      });
-      if (uploaded) {
-        globalState.prePullRequestFailureNotificationPosted = true;
-        return { notified: true, method: 'log-upload' };
+      await log(`\n📄 Notifying ${targetLabel} about solver failure with logs...`);
+      const errorPrefix = targetType === 'pr' ? `The solver stopped while continuing pull request #${targetNumber}.` : 'The solver stopped before creating a pull request.';
+      try {
+        const uploaded = await attachLogToGitHub({
+          logFile: getLogFile(),
+          targetType,
+          targetNumber,
+          owner,
+          repo,
+          $,
+          log,
+          sanitizeLogContent,
+          verbose: argv.verbose,
+          errorMessage: `${errorPrefix}\n\nReason: ${reason || 'Unknown error'}`,
+          failureActionSection: buildPrePullRequestFailureActionSection(reason),
+          requestedModel: argv.originalModel || argv.model,
+          tool: argv.tool || 'claude',
+        });
+        if (uploaded) {
+          markNotificationPosted({ globalState, targetType });
+          return { notified: true, method: 'log-upload' };
+        }
+      } catch (error) {
+        const message = error && error.message ? error.message : String(error);
+        await log(`  ⚠️  Could not upload solver failure log: ${message}`, { level: 'warning' });
       }
     }
 
-    await log(`\n💬 Notifying issue #${issueNumber} about pre-PR failure...`);
-    const body = buildPrePullRequestFailureComment({
-      reason,
-      owner,
-      repo,
-      issueNumber,
-      argv,
-      rawCommand,
-      logAttachmentAttempted: shouldAttachLogs,
-    });
-    const posted = await postComment({ $, owner, repo, targetNumber: issueNumber, body });
+    await log(`\n💬 Notifying ${targetLabel} about solver failure...`);
+    const body =
+      targetType === 'pr'
+        ? buildExistingPullRequestFailureComment({
+            reason,
+            owner,
+            repo,
+            prNumber,
+            issueNumber,
+            argv,
+            rawCommand,
+            logAttachmentAttempted: shouldAttachLogs,
+          })
+        : buildPrePullRequestFailureComment({
+            reason,
+            owner,
+            repo,
+            issueNumber,
+            argv,
+            rawCommand,
+            logAttachmentAttempted: shouldAttachLogs,
+          });
+    const posted = await postComment({ $, owner, repo, targetNumber, body });
     if (posted.ok) {
-      globalState.prePullRequestFailureNotificationPosted = true;
-      await log(`  ✅ Pre-PR failure comment posted to issue #${issueNumber}${posted.commentId ? ` (id=${posted.commentId})` : ''}`);
+      markNotificationPosted({ globalState, targetType });
+      await log(`  ✅ Solver failure comment posted to ${targetLabel}${posted.commentId ? ` (id=${posted.commentId})` : ''}`);
       return { notified: true, method: 'comment', commentId: posted.commentId || null };
     }
-    await log(`  ⚠️  Could not post pre-PR failure comment: ${posted.stderr || 'unknown error'}`, { level: 'warning' });
+    await log(`  ⚠️  Could not post solver failure comment: ${posted.stderr || 'unknown error'}`, { level: 'warning' });
     return { notified: false, error: posted.stderr || 'unknown error' };
   } finally {
+    globalState.preExitFailureNotificationInProgress = false;
+    if (targetType === 'pr') {
+      globalState.pullRequestFailureNotificationInProgress = false;
+    }
     globalState.prePullRequestFailureNotificationInProgress = false;
   }
 }

package/src/telegram-bot.mjs

@@ -40,7 +40,7 @@ const { applySolveToolAlias, getFirstParsedPositionalArg, getSolveCommandNameFro
 const { executeStartScreen: executeStartScreenCommand, buildExecuteAndUpdateMessage } = await import('./telegram-command-execution.lib.mjs');
 const { isChatStopped, getChatStopInfo, getStoppedChatRejectMessage, DEFAULT_STOP_REASON } = await import('./telegram-start-stop-command.lib.mjs');
 const { isOldMessage: _isOldMessage, isGroupChat: _isGroupChat, isChatAuthorized: _isChatAuthorized, isForwardedOrReply: _isForwardedOrReply, extractCommandFromText, extractGitHubUrl: _extractGitHubUrl } = await import('./telegram-message-filters.lib.mjs');
-const { safeReply } = await import('./telegram-safe-reply.lib.mjs');
+const { installTelegramFormattingFallback, safeEditMessageText, safeReply } = await import('./telegram-safe-reply.lib.mjs');
 const { registerTerminalWatchCommand, startAutoTerminalWatchForSession } = await import('./telegram-terminal-watch-command.lib.mjs');
 const { launchBotWithRetry } = await import('./telegram-bot-launcher.lib.mjs');
 const { trackSession, startSessionMonitoring, hasActiveSessionForUrlAsync } = await import('./session-monitor.lib.mjs');
@@ -315,6 +315,7 @@ const { Telegraf } = telegrafModule;
 const bot = new Telegraf(BOT_TOKEN, {
   handlerTimeout: Infinity, // Remove default 90s timeout; command handlers like /solve spawn long-running processes
 });
+installTelegramFormattingFallback(bot.telegram, { verbose: VERBOSE });
 
 // Track bot startup time (Unix seconds to match Telegram's message.date format)
 const BOT_START_TIME = Math.floor(Date.now() / 1000);
@@ -514,7 +515,7 @@ bot.command('help', async ctx => {
     allowTopicHint: topicId ? `TELEGRAM_ALLOWED_TOPICS="(${chatId} ${topicId})"` : '',
   });
 
-  await ctx.reply(message, { parse_mode: 'Markdown' });
+  await safeReply(ctx, message, { fallbackLocale: helpLocale });
 });
 
 bot.command('limits', async ctx => {
@@ -564,10 +565,10 @@ bot.command('limits', async ctx => {
   const claudeError = limits.claude.success ? null : limits.claude.error;
   const codexError = limits.codex.success ? null : limits.codex.error;
   const solveQueue = getSolveQueue({ verbose: VERBOSE });
-  const queueStatus = await solveQueue.formatStatus();
+  const queueStatus = await solveQueue.formatStatus({ locale: userLocale });
   const codexSection = formatCodexLimitsSection(limits.codex.success ? limits.codex : null, codexError, { locale: userLocale });
   const message = t('telegram.usage_limits_title', {}, { locale: userLocale }) + '\n\n' + formatUsageMessage(limits.claude.success ? limits.claude.usage : null, limits.disk.success ? limits.disk.diskSpace : null, limits.github.success ? limits.github.githubRateLimit : null, limits.cpu.success ? limits.cpu.cpuLoad : null, limits.memory.success ? limits.memory.memory : null, claudeError, [codexSection, queueStatus], { locale: userLocale });
-  await ctx.telegram.editMessageText(fetchingMessage.chat.id, fetchingMessage.message_id, undefined, message, { parse_mode: 'Markdown' });
+  await safeEditMessageText(ctx.telegram, fetchingMessage.chat.id, fetchingMessage.message_id, undefined, message, { parse_mode: 'Markdown', fallbackLocale: userLocale, verbose: VERBOSE });
 });
 bot.command('version', async ctx => {
   VERBOSE && console.log('[VERBOSE] /version command received');
@@ -585,8 +586,8 @@ bot.command('version', async ctx => {
     reply_to_message_id: ctx.message.message_id,
   });
   const result = await getVersionInfo(VERBOSE);
-  if (!result.success) return await ctx.telegram.editMessageText(fetchingMessage.chat.id, fetchingMessage.message_id, undefined, `❌ ${escapeMarkdownV2(result.error, { preserveCodeBlocks: true })}`, { parse_mode: 'MarkdownV2' });
-  await ctx.telegram.editMessageText(fetchingMessage.chat.id, fetchingMessage.message_id, undefined, t('telegram.version_information_title', {}, { locale: versionLocale }) + '\n\n' + formatVersionMessage(result.versions), { parse_mode: 'Markdown' });
+  if (!result.success) return await safeEditMessageText(ctx.telegram, fetchingMessage.chat.id, fetchingMessage.message_id, undefined, `❌ ${escapeMarkdownV2(result.error, { preserveCodeBlocks: true })}`, { parse_mode: 'MarkdownV2', fallbackLocale: versionLocale, verbose: VERBOSE });
+  await safeEditMessageText(ctx.telegram, fetchingMessage.chat.id, fetchingMessage.message_id, undefined, t('telegram.version_information_title', {}, { locale: versionLocale }) + '\n\n' + formatVersionMessage(result.versions, { locale: versionLocale }), { parse_mode: 'Markdown', fallbackLocale: versionLocale, verbose: VERBOSE });
 });
 
 const { registerLanguageCommand } = await import('./telegram-language-command.lib.mjs');
@@ -598,7 +599,7 @@ registerAcceptInvitesCommand(bot, sharedCommandOpts);
 const { registerMergeCommand } = await import('./telegram-merge-command.lib.mjs');
 registerMergeCommand(bot, sharedCommandOpts);
 const { registerSolveQueueCommand } = await import('./telegram-solve-queue-command.lib.mjs');
-const { handleSolveQueueCommand } = registerSolveQueueCommand(bot, { ...sharedCommandOpts, getSolveQueue });
+const { handleSolveQueueCommand } = registerSolveQueueCommand(bot, { ...sharedCommandOpts, getSolveQueue, safeReply, resolveLocale: resolveLocaleFromTelegramCtx });
 const { registerSubscribeCommands } = await import('./telegram-subscribers.lib.mjs'); // #1688
 registerSubscribeCommands(bot, sharedCommandOpts);
 const { registerTaskCommands } = await import('./telegram-task-command.lib.mjs');
@@ -848,7 +849,7 @@ async function handleSolveCommand(ctx) {
     await safeReply(ctx, t('telegram.url_session_running', { url: escapeMarkdown(normalizedUrl), session: activeSession.sessionName }, { locale: solveLocale }), { reply_to_message_id: ctx.message.message_id });
     return;
   }
-  const check = await solveQueue.canStartCommand({ tool: solveTool }); // Skip Claude limits for agent (#1159)
+  const check = await solveQueue.canStartCommand({ tool: solveTool, locale: solveLocale }); // Skip Claude limits for agent (#1159)
   const queueStats = solveQueue.getStats();
   // Handle rejection: threshold strategy is 'reject' — fail immediately (issue #1267)
   if (check.rejected) {