@goodandready/dsh-messenger-gateway 0.3.8 → 0.3.10

package/README.md

@@ -65,7 +65,10 @@ Spoken replies use Telegram `sendVoice`. If TTS returns MP3 (or other non-Opus a
 | `/whoami` | Your Telegram user id |
 | `/new` | New agent session |
 | `/stop` | Abort the current turn |
-| `/model` `/status` | Model / gateway status |
+| `/model` | Interactive 2-step model picker (providers → models) or `/model <prov> <mod>` |
+| `/status` | Gateway status and session counters |
+| `/top` | Live server resources: RSS/Heap memory, uptime, active chats, reminders |
+| `/topic <name>` | Create a new Telegram forum topic in supergroups and start an isolated session |
 | `/role [name]` | Switch agent persona (`coder`, `architect`, `reviewer`, `writer`, `translator`, `concise`) |
 | `/skills` `/tools` | List active agent tools and capabilities |
 | `/fork` | Fork current session into a new independent session |

package/lib/adapters/telegram.js

@@ -23,7 +23,6 @@ export function buildQuickActionsKeyboard() {
       [{ text: '🎙️ /voice' }, { text: '📊 /status' }],
     ],
     resize_keyboard: true,
-    is_persistent: true,
   }
 }
 
@@ -47,7 +46,7 @@ export class TelegramAdapter {
     this.groupsEnabled = opts.groupsEnabled !== false
     this.groupRequireMention = opts.groupRequireMention !== false
     this.reactionsEnabled = opts.reactionsEnabled !== false
-    this.quickActions = opts.quickActions !== false
+    this.quickActions = opts.quickActions === true
     this.artifactPreviews = opts.artifactPreviews !== false
     this.transport = opts.transport === 'webhook' ? 'webhook' : 'poll'
     this.statusIndicator = opts.statusIndicator === true
@@ -509,9 +508,11 @@ export class TelegramAdapter {
     const { text: formatted, parseMode } = this.formatOutgoingText(text, payload)
     const chunks = splitText(formatted, TELEGRAM_MAX)
     const plainChunks = splitText(text, TELEGRAM_MAX)
-    const effectiveMarkup = (replyMarkup === undefined && this.quickActions && !threadId)
-      ? buildQuickActionsKeyboard()
-      : replyMarkup
+    const effectiveMarkup = replyMarkup !== undefined
+      ? replyMarkup
+      : (this.quickActions && !threadId
+          ? buildQuickActionsKeyboard()
+          : (!threadId ? REMOVE_REPLY_KEYBOARD : undefined))
     for (let i = 0; i < chunks.length; i++) {
       const params = {
         chat_id: chatId,
@@ -555,4 +556,13 @@ export class TelegramAdapter {
   async sendTo(chatId, payload, opts = {}) {
     return this.sendReply(chatId, undefined, payload, normalizeThreadId(opts.threadId))
   }
+
+  async createForumTopic(chatId, name, opts = {}) {
+    return this.call('createForumTopic', {
+      chat_id: chatId,
+      name,
+      icon_color: opts.iconColor,
+      icon_custom_emoji_id: opts.iconCustomEmojiId,
+    })
+  }
 }

package/lib/commands.js

@@ -7,7 +7,9 @@ export const DEFAULT_TELEGRAM_COMMANDS = [
   { command: 'pair', description: 'Одобрить код сопряжения: /pair CODE' },
   { command: 'sethome', description: 'Home: /sethome [name]' },
   { command: 'home', description: 'Список home-каналов' },
-  { command: 'model', description: 'Показать или сменить модель' },
+  { command: 'model', description: 'Интерактивный выбор или смена модели' },
+  { command: 'top', description: 'Ресурсы сервера: CPU, RAM, uptime, сессии' },
+  { command: 'topic', description: 'Создать новый форум-топик под задачу: /topic <имя>' },
   { command: 'status', description: 'Статус шлюза' },
   { command: 'setalert', description: 'Назначить этот чат каналом алертов' },
   { command: 'alert', description: 'Статус канала алертов: /alert [test]' },

package/lib/config.js

@@ -40,7 +40,7 @@ export const PluginConfig = z.object({
     webhookPath: z.string().default('/dsh-messenger-gateway/telegram/webhook'),
     voiceMode: z.union([z.const('mirror'), z.const('always'), z.const('off')]).default('mirror')
       .description('mirror: TTS when inbound was voice; always/off override (per-user /voice wins)'),
-    quickActions: z.boolean().default(true).description('Show persistent quick actions keyboard in Telegram (/new, /stop, /voice, /status)'),
+    quickActions: z.boolean().default(false).description('Show quick actions keyboard in Telegram (/new, /stop, /voice, /status)'),
     artifactPreviews: z.boolean().default(true).description('Render diagrams and formatted tables as previews'),
     notifyBridge: z.object({
       enabled: z.boolean().default(false),
@@ -79,6 +79,7 @@ export const PluginConfig = z.object({
   tts: z.object({
     enabled: z.boolean().default(false),
     maxChars: z.number().default(4000),
+    voiceSummary: z.boolean().default(false).description('Speak concise TL;DR summary while full text is sent to chat'),
   }),
   agent: z.object({
     provider: z.string().default(''),

package/lib/gateway.js

@@ -25,6 +25,8 @@ import { createPersonaStore, getPersona, listPersonas, BUILTIN_PERSONAS } from '
 import { exportSessionToMarkdown, rewindSession } from './session-ops.js'
 import { formatAlertMessage, resolveAlertTarget } from './alerts.js'
 import { createScheduler, parseRelativeTime, formatRemaining } from './scheduler.js'
+import { listModelCatalog, buildProvidersKeyboard, buildModelsKeyboard, getStoredModelSelection } from './models.js'
+import { buildQuickActionsKeyboard, REMOVE_REPLY_KEYBOARD } from './adapters/telegram.js'
 import { createPairingStore } from './pairing.js'
 import {
   extractTextDelta, extractToolName, buildStreamPreview, formatProgressLine,
@@ -359,6 +361,100 @@ export class Gateway {
       pending.resolve({ buttonId: action.id || buttonId, data: cb.data })
       return
     }
+
+    // Model picker interactive flow
+    if (cb.data?.startsWith('mdl:')) {
+      const parts = cb.data.split(':')
+      const sub = parts[1]
+      // Step 2: Selected provider -> show its models (10 per page)
+      if (sub === 'p') {
+        const providerId = parts[2]
+        const current = this.resolveAgentModel()
+        const catalog = await listModelCatalog(this.ctx, current)
+        const models = catalog.modelsByProvider.get(providerId) || []
+        if (!models.length) {
+          await cb.answer('Нет доступных моделей у этого провайдера')
+          return
+        }
+        const kb = buildModelsKeyboard(providerId, models, current.model, 0)
+        await cb.answer()
+        const text = [
+          `🤖 <b>Провайдер:</b> <code>${providerId}</code>`,
+          `Выберите модель (страница ${kb.page + 1}/${kb.totalPages}):`,
+        ].join('\n')
+        try {
+          if (cb.editMessage) await cb.editMessage(text, kb)
+        } catch {}
+        return
+      }
+      // Pagination for models
+      if (sub === 'pg') {
+        const providerId = parts[2]
+        const page = parseInt(parts[3], 10) || 0
+        const current = this.resolveAgentModel()
+        const catalog = await listModelCatalog(this.ctx, current)
+        const models = catalog.modelsByProvider.get(providerId) || []
+        const kb = buildModelsKeyboard(providerId, models, current.model, page)
+        await cb.answer()
+        const text = [
+          `🤖 <b>Провайдер:</b> <code>${providerId}</code>`,
+          `Выберите модель (страница ${kb.page + 1}/${kb.totalPages}):`,
+        ].join('\n')
+        try {
+          if (cb.editMessage) await cb.editMessage(text, kb)
+        } catch {}
+        return
+      }
+      // Back to providers
+      if (sub === 'back') {
+        const current = this.resolveAgentModel()
+        const catalog = await listModelCatalog(this.ctx, current)
+        const kb = buildProvidersKeyboard(catalog.providers, current)
+        await cb.answer()
+        const text = [
+          '🤖 <b>Выберите провайдера:</b>',
+          `Текущая: <code>${current.provider}/${current.model}</code>`,
+        ].join('\n')
+        try {
+          if (cb.editMessage) await cb.editMessage(text, kb)
+        } catch {}
+        return
+      }
+      // Select model
+      if (sub === 's') {
+        const key = parts[2]
+        const stored = getStoredModelSelection(key)
+        if (!stored) {
+          await cb.answer('Сессия выбора модели истекла, вызовите /model заново')
+          return
+        }
+        const { provider, model } = stored
+        try {
+          const adm = this.ctx.get('agentDefaultModel')
+          if (adm?.saveSelection) {
+            await adm.saveSelection({ provider, model })
+          }
+          this.config.agent = { ...this.config.agent, provider, model }
+          try {
+            await this.hooks?.persistAgentModel?.({ provider, model })
+          } catch (e) {
+            this.ctx.logger?.warn?.(`persist agent model: ${e.message}`)
+          }
+          await cb.answer(`Выбрана ${model}`)
+          try {
+            if (cb.editMessage) await cb.editMessage(`✅ Модель успешно переключена на: <b>${provider}/${model}</b>`, REMOVE_KEYBOARD)
+          } catch {}
+        } catch (err) {
+          await cb.answer(`Ошибка: ${err.message}`)
+        }
+        return
+      }
+      if (sub === 'cur') {
+        await cb.answer()
+        return
+      }
+    }
+
     await cb.answer()
   }
 
@@ -462,7 +558,7 @@ export class Gateway {
     const parts = text.split(/\s+/)
     const cmd = parts[0].toLowerCase().split('@')[0]
     const { reply, userId, chatId, threadId = 0, platform } = input
-    if (cmd === '/start') return reply('Шлюз подключён. Пишите сообщение агенту. /help — команды.')
+    if (cmd === '/start') return reply('Шлюз подключён. Пишите сообщение агенту. /help — команды.', { replyMarkup: REMOVE_REPLY_KEYBOARD })
     if (cmd === '/help') {
       return reply([
         'Команды:',
@@ -705,8 +801,18 @@ export class Gateway {
         }
       }
       try {
-        const sel = this.resolveAgentModel()
-        return reply(`Текущая модель: ${sel.provider}/${sel.model}\nСмена: /model <provider> <model>`)
+        const current = this.resolveAgentModel()
+        const catalog = await listModelCatalog(this.ctx, current)
+        if (!catalog.providers.length) {
+          return reply(`Текущая модель: <code>${current.provider}/${current.model}</code>\nСмена: <code>/model &lt;provider&gt; &lt;model&gt;</code>`)
+        }
+        const kb = buildProvidersKeyboard(catalog.providers, current)
+        return reply([
+          '🤖 <b>Выберите провайдера:</b>',
+          `Текущая модель: <code>${current.provider}/${current.model}</code>`,
+        ].join('\n'), {
+          replyMarkup: kb,
+        })
       } catch (e) {
         return reply(e.message)
       }
@@ -826,6 +932,16 @@ export class Gateway {
     }
     if (cmd === '/voice') {
       const sub = String(parts[1] || 'status').toLowerCase()
+      if (sub === 'summary') {
+        const val = parts[2]?.toLowerCase()
+        if (val === 'on' || val === 'off') {
+          if (!this.config.tts) this.config.tts = {}
+          this.config.tts.voiceSummary = val === 'on'
+          return reply(`Голосовое саммари (TL;DR): ${val === 'on' ? 'включено' : 'выключено'}`)
+        }
+        const state = this.config.tts?.voiceSummary ? 'on' : 'off'
+        return reply(`Голосовое саммари (TL;DR): ${state}\nПереключение: <code>/voice summary on|off</code>`)
+      }
       if (sub === 'on' || sub === 'off') {
         this.voicePrefs.set(userId, sub === 'on')
         return reply(sub === 'on' ? 'Голосовые ответы: on (для вас)' : 'Голосовые ответы: off (для вас)')
@@ -833,7 +949,84 @@ export class Gateway {
       const pref = this.voicePrefs.get(userId)
       const mode = this.tg().voiceMode || 'mirror'
       const prefLine = pref === null ? 'не задан (/voice on|off)' : (pref ? 'on' : 'off')
-      return reply(`voiceMode=${mode}\nваш /voice: ${prefLine}\nglobal tts: ${this.config.tts?.enabled ? 'on' : 'off'}`)
+      const summaryState = this.config.tts?.voiceSummary ? 'on' : 'off'
+      return reply(`voiceMode=${mode}\nваш /voice: ${prefLine}\nglobal tts: ${this.config.tts?.enabled ? 'on' : 'off'}\nvoice summary: ${summaryState}`)
+    }
+    if (cmd === '/topic') {
+      const topicName = parts.slice(1).join(' ').trim()
+      if (!topicName) {
+        return reply('Использование: <code>/topic &lt;название&gt;</code>\nСоздает новый топик в супергруппе и изолированную сессию под задачу.')
+      }
+      const tgAdapter = this.getAdapter('telegram')
+      if (!tgAdapter?.createForumTopic) {
+        return reply('Создание топиков доступно только в Telegram.')
+      }
+      try {
+        const res = await tgAdapter.createForumTopic(chatId, topicName)
+        const newThreadId = res?.message_thread_id
+        await reply(`🎯 Создан новый топик <b>«${topicName}»</b> (ID: <code>${newThreadId}</code>).\nПерейдите в созданный топик для работы над задачей!`)
+        if (newThreadId) {
+          await tgAdapter.sendTo(chatId, {
+            text: `👋 Привет! Это изолированная сессия для задачи <b>«${topicName}»</b>.\nЧем могу помочь?`,
+          }, { threadId: newThreadId })
+        }
+        return
+      } catch (err) {
+        return reply(`Не удалось создать топик: ${err.message}\n(Убедитесь, что бот является администратором группы и включены темы/форумы)`)
+      }
+    }
+    if (cmd === '/top') {
+      const mem = process.memoryUsage()
+      const rssMb = (mem.rss / 1024 / 1024).toFixed(1)
+      const heapMb = (mem.heapUsed / 1024 / 1024).toFixed(1)
+      const sec = Math.floor((Date.now() - this.stats.startedAt) / 1000)
+      const hh = String(Math.floor(sec / 3600)).padStart(2, '0')
+      const mm = String(Math.floor((sec % 3600) / 60)).padStart(2, '0')
+      const ss = String(sec % 60).padStart(2, '0')
+      let activeReminders = 0
+      try { activeReminders = (await this.scheduler.list()).length } catch {}
+      let currentModel = 'не задана'
+      try {
+        const m = this.resolveAgentModel()
+        currentModel = `${m.provider}/${m.model}`
+      } catch {}
+
+      return reply([
+        '📊 <b>DSH System & Resources:</b>',
+        `• <b>Память (RSS):</b> ${rssMb} MB`,
+        `• <b>Heap:</b> ${heapMb} MB`,
+        `• <b>Аптайм:</b> ${hh}:${mm}:${ss}`,
+        `• <b>Активных чатов:</b> ${this.chats.size}`,
+        `• <b>Напоминаний в очереди:</b> ${activeReminders}`,
+        `• <b>Активная модель:</b> <code>${currentModel}</code>`,
+        `• <b>Сообщений отправлено:</b> ${this.stats.sent}`,
+        `• <b>Ошибок:</b> ${this.stats.errors}`,
+      ].join('\n'))
+    }
+    if (cmd === '/keyboard') {
+      const sub = String(parts[1] || '').toLowerCase()
+      const tgAdapter = this.getAdapter('telegram')
+      if (sub === 'on') {
+        if (tgAdapter) tgAdapter.quickActions = true
+        return reply('Клавиатура быстрых действий включена.', {
+          replyMarkup: buildQuickActionsKeyboard(),
+        })
+      }
+      if (sub === 'off') {
+        if (tgAdapter) tgAdapter.quickActions = false
+        return reply('Клавиатура быстрых действий выключена.', {
+          replyMarkup: REMOVE_REPLY_KEYBOARD,
+        })
+      }
+      const curState = tgAdapter?.quickActions ? 'включена' : 'выключена'
+      return reply([
+        '⌨️ <b>Клавиатура быстрых действий:</b>',
+        `Текущее состояние: <b>${curState}</b>`,
+        '',
+        'Команды:',
+        '<code>/keyboard on</code> — показать кнопки',
+        '<code>/keyboard off</code> — скрыть кнопки',
+      ].join('\n'))
     }
     if (cmd === '/tts') {
       const sub = String(parts[1] || 'status').toLowerCase()
@@ -1094,7 +1287,8 @@ export class Gateway {
         chatPref: chatTtsPref,
       })
       if (speak && !signal.aborted) {
-        const ttsText = prepareTtsText(answer, this.config.tts?.maxChars)
+        const isVoiceSummary = this.config.tts?.voiceSummary === true
+        const ttsText = prepareTtsText(answer, this.config.tts?.maxChars, { voiceSummary: isVoiceSummary })
         if (ttsText) {
           try {
             const spoken = await speakText(this.baseUrl(), ttsText, signal)

package/lib/index.js

@@ -326,7 +326,7 @@ export function apply(ctx, config) {
 
       const dest = target || { platform, chatId, threadId, home }
       try {
-        const result = await gw.messengerSend(dest, { text, files })
+        const result = await gw.messengerSend(dest, { text, files, replyMarkup: payload.replyMarkup })
         writeJson(res, 200, { ok: true, sent: result })
       } catch (err) {
         writeJson(res, 500, { ok: false, error: err.message })

package/lib/models.js

@@ -0,0 +1,106 @@
+export const MODEL_PAGE_SIZE = 10
+
+export async function listModelCatalog(ctx, fallback = {}) {
+  const result = {
+    providers: [],
+    modelsByProvider: new Map(),
+  }
+
+  // 1. Try ctx.llm if available
+  if (ctx?.llm?.listProviders) {
+    try {
+      const providers = await ctx.llm.listProviders()
+      for (const p of providers || []) {
+        const pId = p.id || p
+        result.providers.push({ id: pId, name: p.name || pId })
+        try {
+          const models = await ctx.llm.listModels(pId)
+          result.modelsByProvider.set(
+            pId,
+            (models || []).map((m) => ({ id: m.id || m, name: m.name || m.id || m }))
+          )
+        } catch {
+          result.modelsByProvider.set(pId, [])
+        }
+      }
+    } catch {}
+  }
+
+  // 2. If no providers from ctx.llm, check settings / fallback
+  if (!result.providers.length && fallback.provider) {
+    result.providers.push({ id: fallback.provider, name: fallback.provider })
+    if (fallback.model) {
+      result.modelsByProvider.set(fallback.provider, [{ id: fallback.model, name: fallback.model }])
+    }
+  }
+
+  return result
+}
+
+// In-memory registry for model picker callback tokens to avoid 64-byte Telegram limit
+const modelIndexStore = new Map()
+let modelIndexCounter = 0
+
+export function storeModelSelection(provider, model) {
+  const key = String(++modelIndexCounter)
+  modelIndexStore.set(key, { provider, model, time: Date.now() })
+  // Cleanup entries older than 1 hour
+  if (modelIndexStore.size > 200) {
+    const cutoff = Date.now() - 3600000
+    for (const [k, v] of modelIndexStore.entries()) {
+      if (v.time < cutoff) modelIndexStore.delete(k)
+    }
+  }
+  return key
+}
+
+export function getStoredModelSelection(key) {
+  return modelIndexStore.get(key)
+}
+
+export function buildProvidersKeyboard(providers, current = {}) {
+  const rows = []
+  for (const p of providers) {
+    const isCurrent = p.id === current.provider
+    rows.push([{
+      text: `${isCurrent ? '✅ ' : '🔹 '}${p.name || p.id}`,
+      callback_data: `mdl:p:${p.id}`,
+    }])
+  }
+  return { inline_keyboard: rows }
+}
+
+export function buildModelsKeyboard(providerId, models, currentModel, page = 0, pageSize = MODEL_PAGE_SIZE) {
+  const totalPages = Math.ceil(models.length / pageSize) || 1
+  const curPage = Math.max(0, Math.min(page, totalPages - 1))
+  const start = curPage * pageSize
+  const pageModels = models.slice(start, start + pageSize)
+
+  const rows = []
+  for (const m of pageModels) {
+    const isCurrent = m.id === currentModel
+    const key = storeModelSelection(providerId, m.id)
+    rows.push([{
+      text: `${isCurrent ? '✅ ' : ''}${m.name || m.id}`,
+      callback_data: `mdl:s:${key}`,
+    }])
+  }
+
+  // Navigation row
+  const navRow = []
+  if (curPage > 0) {
+    navRow.push({ text: '⬅️', callback_data: `mdl:pg:${providerId}:${curPage - 1}` })
+  }
+  if (totalPages > 1) {
+    navRow.push({ text: `${curPage + 1}/${totalPages}`, callback_data: `mdl:cur` })
+  }
+  if (curPage < totalPages - 1) {
+    navRow.push({ text: '➡️', callback_data: `mdl:pg:${providerId}:${curPage + 1}` })
+  }
+  if (navRow.length) rows.push(navRow)
+
+  // Back row
+  rows.push([{ text: '🔙 Назад к провайдерам', callback_data: 'mdl:back' }])
+
+  return { inline_keyboard: rows, page: curPage, totalPages }
+}

package/lib/tts.js

@@ -19,8 +19,26 @@ export function stripMarkdownForSpeech(text) {
     .trim()
 }
 
-export function prepareTtsText(answer, maxChars = DEFAULT_TTS_MAX_CHARS) {
-  const stripped = stripMarkdownForSpeech(answer)
+export function prepareVoiceSummary(text, maxChars = 300) {
+  const stripped = stripMarkdownForSpeech(text)
+  if (!stripped) return ''
+  const sentences = stripped.split(/(?<=[.!?])\s+/)
+  let summary = ''
+  for (const s of sentences) {
+    if ((summary + ' ' + s).trim().length <= maxChars) {
+      summary = (summary ? summary + ' ' + s : s).trim()
+    } else {
+      break
+    }
+  }
+  if (!summary) summary = stripped.slice(0, maxChars).trim()
+  return summary
+}
+
+export function prepareTtsText(answer, maxChars = DEFAULT_TTS_MAX_CHARS, opts = {}) {
+  const isSummary = opts.voiceSummary === true
+  const source = isSummary ? prepareVoiceSummary(answer, Math.min(Number(maxChars) || 300, 400)) : answer
+  const stripped = stripMarkdownForSpeech(source)
   if (!stripped || stripped.length < 2) return ''
   const limit = Math.max(1, Number(maxChars) || DEFAULT_TTS_MAX_CHARS)
   return stripped.slice(0, limit)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-messenger-gateway",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
   "license": "MIT",
   "type": "module",