@goodandready/dsh-messenger-gateway 0.3.20 → 0.3.22

package/lib/commands.js

@@ -1,70 +1,74 @@
-export const DEFAULT_TELEGRAM_COMMANDS = [
-  { command: 'start', description: 'Подключение и приветствие' },
-  { command: 'help', description: 'Список команд' },
-  { command: 'new', description: 'Новая сессия агента' },
-  { command: 'whoami', description: 'Показать ваш Telegram id' },
-  { command: 'stop', description: 'Прервать текущий ответ' },
-  { command: 'pair', description: 'Одобрить код сопряжения: /pair CODE' },
-  { command: 'sethome', description: 'Home: /sethome [name]' },
-  { command: 'home', description: 'Список home-каналов' },
-  { command: 'model', description: 'Интерактивный выбор или смена модели' },
-  { command: 'top', description: 'Ресурсы сервера: CPU, RAM, uptime, сессии' },
-  { command: 'topic', description: 'Создать новый форум-топик под задачу: /topic <имя>' },
-  { command: 'status', description: 'Статус шлюза' },
-  { command: 'setalert', description: 'Назначить этот чат каналом алертов' },
-  { command: 'alert', description: 'Статус канала алертов: /alert [test]' },
-  { command: 'keyboard', description: 'Клавиатура быстрых действий: /keyboard on|off' },
-  { command: 'role', description: 'Роль и персона агента: /role [name]' },
-  { command: 'skills', description: 'Список активных инструментов и навыков' },
-  { command: 'tools', description: 'Список активных инструментов' },
-  { command: 'fork', description: 'Форк текущей сессии в новую ветку' },
-  { command: 'export', description: 'Экспорт истории диалога в Markdown' },
-  { command: 'rewind', description: 'Откат сообщений: /rewind [N]' },
-  { command: 'files', description: 'Файловый менеджер рабочей папки: /files [dir]' },
-  { command: 'get', description: 'Скачать файл в Telegram: /get <path>' },
-  { command: 'remind', description: 'Напоминание: /remind <время> <текст>' },
-  { command: 'voice', description: 'Голосовые ответы: /voice on|off|status' },
-  { command: 'tts', description: 'Озвучка в этом чате: /tts on|off|status' },
-  { command: 'mute', description: 'Не присылать уведомления в этот чат' },
-  { command: 'unmute', description: 'Вернуть уведомления в этот чат' },
-]
-
-export function normalizeTelegramCommands(commands) {
-  const source = Array.isArray(commands) && commands.length ? commands : DEFAULT_TELEGRAM_COMMANDS
-  const out = []
-  const seen = new Set()
-  for (const raw of source) {
-    if (!raw || typeof raw !== 'object') continue
-    let command = String(raw.command || '').trim().replace(/^\//, '')
-    const description = String(raw.description || '').trim()
-    if (!command || !description) continue
-    command = command.slice(0, 32).toLowerCase()
-    if (seen.has(command)) continue
-    seen.add(command)
-    out.push({ command, description: description.slice(0, 256) })
-  }
-  return out.length ? out : [...DEFAULT_TELEGRAM_COMMANDS]
-}
-
-export function mergeDynamicCommands(baseCommands = DEFAULT_TELEGRAM_COMMANDS, dynamicCommands = [], maxTotal = 100) {
-  const normalizedBase = normalizeTelegramCommands(baseCommands)
-  const out = [...normalizedBase]
-  const seen = new Set(out.map((c) => c.command))
-
-  for (const item of dynamicCommands || []) {
-    if (out.length >= maxTotal) break
-    if (!item || typeof item !== 'object') continue
-    let command = String(item.command || item.name || '').trim().replace(/^\//, '').toLowerCase()
-    // Telegram format: lowercase alphanumeric and underscore only, 1-32 chars
-    command = command.replace(/[^a-z0-9_]/g, '_').slice(0, 32)
-    if (!command || seen.has(command)) continue
-    let description = String(item.description || item.title || `Скилл ${command}`).trim()
-    if (!description) description = `Скилл ${command}`
-    description = description.slice(0, 256)
-    seen.add(command)
-    out.push({ command, description })
-  }
-
-  return out.slice(0, maxTotal)
-}
-
+export const DEFAULT_TELEGRAM_COMMANDS = [
+  { command: 'start', description: 'Connect and show greeting' },
+  { command: 'help', description: 'Show commands help' },
+  { command: 'new', description: 'Start a new agent session' },
+  { command: 'whoami', description: 'Show your messenger user ID' },
+  { command: 'stop', description: 'Interrupt current turn' },
+  { command: 'pair', description: 'Approve pairing code: /pair CODE' },
+  { command: 'sethome', description: 'Set home: /sethome [name]' },
+  { command: 'home', description: 'List registered home channels' },
+  { command: 'model', description: 'Interactive model selector' },
+  { command: 'top', description: 'System resources: CPU, RAM, uptime' },
+  { command: 'topic', description: 'Create forum topic: /topic <name>' },
+  { command: 'status', description: 'Gateway and bot status' },
+  { command: 'setalert', description: 'Designate channel for alerts' },
+  { command: 'alert', description: 'Alert channel status: /alert [test]' },
+  { command: 'keyboard', description: 'Toggle quick actions: /keyboard on|off' },
+  { command: 'role', description: 'Switch persona: /role [name]' },
+  { command: 'bind', description: 'Bind preset/persona to forum topic: /bind <name>' },
+  { command: 'preset', description: 'Show or switch agent preset: /preset [name]' },
+  { command: 'cron', description: 'Manage recurring reports: /cron' },
+  { command: 'skills', description: 'List active tools & skills' },
+  { command: 'tools', description: 'List active tools' },
+  { command: 'fork', description: 'Fork session into new branch' },
+  { command: 'export', description: 'Export history to Markdown' },
+  { command: 'rewind', description: 'Rewind turns: /rewind [N]' },
+  { command: 'files', description: 'Workspace file explorer: /files [dir]' },
+  { command: 'get', description: 'Download file to messenger: /get <path>' },
+  { command: 'remind', description: 'Set reminder: /remind <time> <text>' },
+  { command: 'voice', description: 'Voice reply mode: /voice on|off|status' },
+  { command: 'tts', description: 'Speech in this chat: /tts on|off|status' },
+  { command: 'mute', description: 'Mute notifications in this chat' },
+  { command: 'unmute', description: 'Unmute notifications in this chat' },
+  { command: 'update', description: 'Check or install plugin update: /update [now]' },
+]
+
+export function normalizeTelegramCommands(commands) {
+  const source = Array.isArray(commands) && commands.length ? commands : DEFAULT_TELEGRAM_COMMANDS
+  const out = []
+  const seen = new Set()
+  for (const raw of source) {
+    if (!raw || typeof raw !== 'object') continue
+    let command = String(raw.command || '').trim().replace(/^\//, '')
+    const description = String(raw.description || '').trim()
+    if (!command || !description) continue
+    command = command.slice(0, 32).toLowerCase()
+    if (seen.has(command)) continue
+    seen.add(command)
+    out.push({ command, description: description.slice(0, 256) })
+  }
+  return out.length ? out : [...DEFAULT_TELEGRAM_COMMANDS]
+}
+
+export function mergeDynamicCommands(baseCommands = DEFAULT_TELEGRAM_COMMANDS, dynamicCommands = [], maxTotal = 100) {
+  const normalizedBase = normalizeTelegramCommands(baseCommands)
+  const out = [...normalizedBase]
+  const seen = new Set(out.map((c) => c.command))
+
+  for (const item of dynamicCommands || []) {
+    if (out.length >= maxTotal) break
+    if (!item || typeof item !== 'object') continue
+    let command = String(item.command || item.name || '').trim().replace(/^\//, '').toLowerCase()
+    // Telegram format: lowercase alphanumeric and underscore only, 1-32 chars
+    command = command.replace(/[^a-z0-9_]/g, '_').slice(0, 32)
+    if (!command || seen.has(command)) continue
+    let description = String(item.description || item.title || `Skill ${command}`).trim()
+    if (!description) description = `Skill ${command}`
+    description = description.slice(0, 256)
+    seen.add(command)
+    out.push({ command, description })
+  }
+
+  return out.slice(0, maxTotal)
+}
+

package/lib/config.js

@@ -1,104 +1,104 @@
-import z from '@deepseek-ai/schemastery'
-
-const HomeEntry = z.object({
-  name: z.string().default('default'),
-  chatId: z.union([z.number(), z.string()]),
-  threadId: z.number().default(0),
-})
-
-export const PluginConfig = z.object({
-  enabled: z.boolean().default(true),
-  internalBaseURL: z.string().default('http://127.0.0.1:3080'),
-  telegram: z.object({
-    enabled: z.boolean().default(false),
-    botToken: z.string().role('secret').default(''),
-    allowedUserIds: z.array(z.number()).default([]),
-    pollTimeoutSeconds: z.number().default(50),
-    pollIntervalMs: z.number().default(500),
-    commands: z.array(z.object({
-      command: z.string(),
-      description: z.string(),
-    })).default([]),
-    textFormat: z.union([z.const('html'), z.const('plain')]).default('html').description('html: Markdown→Telegram HTML; plain: без разметки'),
-    homeChatId: z.union([z.number(), z.string()]).default('').description('Legacy default home chatId'),
-    homeThreadId: z.number().default(0),
-    homes: z.array(HomeEntry).default([]).description('Named homes (forum topics / channels)'),
-    pairingEnabled: z.boolean().default(true).description('Issue pairing codes to unknown users when allowlist is non-empty'),
-    streaming: z.boolean().default(false).description('If true, edit one Telegram message while tokens arrive; default off'),
-    streamEditIntervalMs: z.number().default(1200),
-    progressEnabled: z.boolean().default(true),
-    approvalsEnabled: z.boolean().default(true),
-    groupsEnabled: z.boolean().default(true).description('Process group/supergroup messages'),
-    groupRequireMention: z.boolean().default(true).description('In groups, only respond to @mention, reply-to-bot, or /commands'),
-    reactionsEnabled: z.boolean().default(true).description('React with 👀 while processing a turn'),
-    statusIndicator: z.boolean().default(false).description('Opt-in: set bot short description to Online/Offline (bots have no presence)'),
-    statusOnline: z.string().default('Online'),
-    statusOffline: z.string().default('Offline'),
-    transport: z.union([z.const('poll'), z.const('webhook')]).default('poll'),
-    webhookUrl: z.string().default(''),
-    webhookSecret: z.string().role('secret').default(''),
-    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(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),
-      events: z.array(z.string()).default(['task_done', 'error']),
-      home: z.string().default('default'),
-      excludeSessionPrefixes: z.array(z.string()).default(['msgw-']),
-    }).default({ enabled: false }),
-    alerts: z.object({
-      enabled: z.boolean().default(false),
-      chatId: z.union([z.number(), z.string()]).default(''),
-      threadId: z.number().default(0),
-      home: z.string().default(''),
-      events: z.array(z.string()).default(['error', 'pairing']),
-    }).default({ enabled: false }),
-    forumMirror: z.object({
-      enabled: z.boolean().default(false),
-      chatId: z.union([z.number(), z.string()]).default(''),
-    }).default({ enabled: false }),
-    forumMirrorChatId: z.union([z.number(), z.string()]).default(''),
-    forumMirrorEnabled: z.boolean().default(false),
-  }),
-  discord: z.object({
-    enabled: z.boolean().default(false),
-    botToken: z.string().role('secret').default(''),
-    webhookUrl: z.string().default(''),
-  }).default({ enabled: false }),
-  slack: z.object({
-    enabled: z.boolean().default(false),
-    botToken: z.string().role('secret').default(''),
-    webhookUrl: z.string().default(''),
-  }).default({ enabled: false }),
-  webhooks: z.object({
-    enabled: z.boolean().default(true),
-    secret: z.string().role('secret').default(''),
-  }).default({ enabled: true }),
-  media: z.object({
-    cacheDir: z.string().default(''),
-    maxDocBytes: z.number().default(20 * 1024 * 1024),
-    maxTextInjectBytes: z.number().default(100 * 1024),
-    maxImageBytes: z.number().default(20 * 1024 * 1024),
-  }),
-  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(''),
-    model: z.string().default(''),
-    cwd: z.string().default(''),
-    instructionPrefix: z.string().default(''),
-    maxMessageLength: z.number().default(4000),
-    idleTimeoutMs: z.number().default(3_600_000),
-    turnTimeoutMs: z.number().default(600_000),
-    photoOnlyMode: z.union([z.const('prompt'), z.const('run')]).default('prompt'),
-    sessionScope: z.union([z.const('chat'), z.const('user')]).default('user')
-      .description('In groups: user = per-user session; chat = shared session for the chat/topic'),
-  }),
-})
-
-export const Config = PluginConfig
+import z from '@deepseek-ai/schemastery'
+
+const HomeEntry = z.object({
+  name: z.string().default('default'),
+  chatId: z.union([z.number(), z.string()]),
+  threadId: z.number().default(0),
+})
+
+export const PluginConfig = z.object({
+  enabled: z.boolean().default(true),
+  internalBaseURL: z.string().default('http://127.0.0.1:3080'),
+  telegram: z.object({
+    enabled: z.boolean().default(false),
+    botToken: z.string().role('secret').default(''),
+    allowedUserIds: z.array(z.number()).default([]),
+    pollTimeoutSeconds: z.number().default(50),
+    pollIntervalMs: z.number().default(500),
+    commands: z.array(z.object({
+      command: z.string(),
+      description: z.string(),
+    })).default([]),
+    textFormat: z.union([z.const('html'), z.const('plain')]).default('html').description('html: Markdown→Telegram HTML; plain: unformatted plain text'),
+    homeChatId: z.union([z.number(), z.string()]).default('').description('Legacy default home chatId'),
+    homeThreadId: z.number().default(0),
+    homes: z.array(HomeEntry).default([]).description('Named homes (forum topics / channels)'),
+    pairingEnabled: z.boolean().default(true).description('Issue pairing codes to unknown users when allowlist is non-empty'),
+    streaming: z.boolean().default(false).description('If true, edit one Telegram message while tokens arrive; default off'),
+    streamEditIntervalMs: z.number().default(1200),
+    progressEnabled: z.boolean().default(true),
+    approvalsEnabled: z.boolean().default(true),
+    groupsEnabled: z.boolean().default(true).description('Process group/supergroup messages'),
+    groupRequireMention: z.boolean().default(true).description('In groups, only respond to @mention, reply-to-bot, or /commands'),
+    reactionsEnabled: z.boolean().default(true).description('React with 👀 while processing a turn'),
+    statusIndicator: z.boolean().default(false).description('Opt-in: set bot short description to Online/Offline (bots have no presence)'),
+    statusOnline: z.string().default('Online'),
+    statusOffline: z.string().default('Offline'),
+    transport: z.union([z.const('poll'), z.const('webhook')]).default('poll'),
+    webhookUrl: z.string().default(''),
+    webhookSecret: z.string().role('secret').default(''),
+    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(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),
+      events: z.array(z.string()).default(['task_done', 'error']),
+      home: z.string().default('default'),
+      excludeSessionPrefixes: z.array(z.string()).default(['msgw-']),
+    }).default({ enabled: false }),
+    alerts: z.object({
+      enabled: z.boolean().default(false),
+      chatId: z.union([z.number(), z.string()]).default(''),
+      threadId: z.number().default(0),
+      home: z.string().default(''),
+      events: z.array(z.string()).default(['error', 'pairing']),
+    }).default({ enabled: false }),
+    forumMirror: z.object({
+      enabled: z.boolean().default(false),
+      chatId: z.union([z.number(), z.string()]).default(''),
+    }).default({ enabled: false }),
+    forumMirrorChatId: z.union([z.number(), z.string()]).default(''),
+    forumMirrorEnabled: z.boolean().default(false),
+  }),
+  discord: z.object({
+    enabled: z.boolean().default(false),
+    botToken: z.string().role('secret').default(''),
+    webhookUrl: z.string().default(''),
+  }).default({ enabled: false }),
+  slack: z.object({
+    enabled: z.boolean().default(false),
+    botToken: z.string().role('secret').default(''),
+    webhookUrl: z.string().default(''),
+  }).default({ enabled: false }),
+  webhooks: z.object({
+    enabled: z.boolean().default(true),
+    secret: z.string().role('secret').default(''),
+  }).default({ enabled: true }),
+  media: z.object({
+    cacheDir: z.string().default(''),
+    maxDocBytes: z.number().default(20 * 1024 * 1024),
+    maxTextInjectBytes: z.number().default(100 * 1024),
+    maxImageBytes: z.number().default(20 * 1024 * 1024),
+  }),
+  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(''),
+    model: z.string().default(''),
+    cwd: z.string().default(''),
+    instructionPrefix: z.string().default(''),
+    maxMessageLength: z.number().default(4000),
+    idleTimeoutMs: z.number().default(3_600_000),
+    turnTimeoutMs: z.number().default(600_000),
+    photoOnlyMode: z.union([z.const('prompt'), z.const('run')]).default('prompt'),
+    sessionScope: z.union([z.const('chat'), z.const('user')]).default('user')
+      .description('In groups: user = per-user session; chat = shared session for the chat/topic'),
+  }),
+})
+
+export const Config = PluginConfig

package/lib/content-guard.js

@@ -7,8 +7,8 @@
 export function ensureContentArray(content) {
   if (Array.isArray(content)) return content
   if (typeof content === 'string') {
-    return content ? [{ type: 'text', text: content }] : [{ type: 'text', text: '(пустое сообщение)' }]
+    return content ? [{ type: 'text', text: content }] : [{ type: 'text', text: '(empty message)' }]
   }
   if (content && typeof content === 'object' && content.type) return [content]
-  return [{ type: 'text', text: String(content ?? '(пустое сообщение)') }]
+  return [{ type: 'text', text: String(content ?? '(empty message)') }]
 }

package/lib/documents.js

@@ -5,16 +5,16 @@ import { inflateRawSync } from 'node:zlib'
 /** Format a cached inbound document/video path for the agent (fs tools). */
 export function formatInboundDocument(att, parsed = null) {
   const kind = att?.kind || 'document'
-  const labels = { video: 'Видео', sticker: 'Стикер', animation: 'GIF', document: 'Документ' }
-  const label = labels[kind] || 'Файл'
+  const labels = { video: 'Video', sticker: 'Sticker', animation: 'GIF', document: 'Document' }
+  const label = labels[kind] || 'File'
   const name = att?.name ? ` ${att.name}` : ''
   const mime = att?.mime ? ` (${att.mime})` : ''
   const emoji = att?.emoji ? ` emoji=${att.emoji}` : ''
-  let base = `[${label}${name}${mime}${emoji}]\nПуть: ${att.path}`
+  let base = `[${label}${name}${mime}${emoji}]\nPath: ${att.path}`
 
   if (parsed?.text) {
-    const truncNote = parsed.truncated ? ' (содержимое усечено)' : ''
-    base += `\n\n[Распознанный текст из файла${truncNote}]:\n\`\`\`\n${parsed.text}\n\`\`\``
+    const truncNote = parsed.truncated ? ' (content truncated)' : ''
+    base += `\n\n[Extracted text from file${truncNote}]:\n\`\`\`\n${parsed.text}\n\`\`\``
   }
   return base
 }
@@ -25,11 +25,11 @@ export function documentOnlyHint(attachments, userText) {
   if (!docs.length) return ''
   if (docs.length === 1) {
     const k = docs[0].kind
-    if (k === 'sticker') return '[Пользователь отправил стикер]'
-    if (k === 'video' || k === 'animation') return '[Пользователь отправил видео]'
-    return '[Пользователь отправил файл]'
+    if (k === 'sticker') return '[User sent a sticker]'
+    if (k === 'video' || k === 'animation') return '[User sent a video]'
+    return '[User sent a file]'
   }
-  return `[Пользователь отправил ${docs.length} файла]`
+  return `[User sent ${docs.length} files]`
 }
 
 export const TEXT_INJECT_EXTS = new Set([

package/lib/file-manager.js

@@ -32,7 +32,7 @@ export async function listFiles(baseCwd, subPath = '.', opts = {}) {
   try {
     st = await stat(target)
   } catch (err) {
-    return { ok: false, error: `Каталог не найден: ${err.message}` }
+    return { ok: false, error: `Directory not found: ${err.message}` }
   }
 
   if (!st.isDirectory()) {
@@ -41,7 +41,7 @@ export async function listFiles(baseCwd, subPath = '.', opts = {}) {
       isDirectory: false,
       currentPath: relativePath,
       entries: [{ name: relativePath, size: st.size, isDirectory: false }],
-      formattedText: `📄 <b>${relativePath}</b> (${formatFileSize(st.size)})\nДля скачивания: <code>/get ${relativePath}</code>`,
+      formattedText: `📄 <b>${relativePath}</b> (${formatFileSize(st.size)})\nDownload: <code>/get ${relativePath}</code>`,
     }
   }
 
@@ -81,12 +81,12 @@ export async function listFiles(baseCwd, subPath = '.', opts = {}) {
   const sliced = entries.slice(0, maxEntries)
 
   const lines = [
-    `📂 <b>Файлы: <code>${relativePath === '.' ? '/' : `/${relativePath}`}</code></b> (${total} элементов):`,
+    `📂 <b>Files: <code>${relativePath === '.' ? '/' : `/${relativePath}`}</code></b> (${total} items):`,
     '',
   ]
 
   if (relativePath !== '.') {
-    lines.push('📁 <code>..</code> (на уровень выше: <code>/files ..</code>)')
+    lines.push('📁 <code>..</code> (parent folder: <code>/files ..</code>)')
   }
 
   for (const e of sliced) {
@@ -98,10 +98,10 @@ export async function listFiles(baseCwd, subPath = '.', opts = {}) {
   }
 
   if (total > maxEntries) {
-    lines.push(`\n<i>... и ещё ${total - maxEntries} файлов</i>`)
+    lines.push(`\n<i>... and ${total - maxEntries} more files</i>`)
   }
 
-  lines.push('\nСкачать файл: <code>/get <файл></code>\nПереход по папкам: <code>/files <папка></code>')
+  lines.push('\nDownload file: <code>/get <file></code>\nNavigate directory: <code>/files <dir></code>')
 
   return {
     ok: true,
@@ -119,17 +119,17 @@ export async function getFileForDownload(baseCwd, relativePath, maxBytes = 50 *
   try {
     st = await stat(target)
   } catch (err) {
-    return { ok: false, error: `Файл не найден: ${safeRel}` }
+    return { ok: false, error: `File not found: ${safeRel}` }
   }
 
   if (st.isDirectory()) {
-    return { ok: false, error: `«${safeRel}» является каталогом, а не файлом. Список: /files ${safeRel}` }
+    return { ok: false, error: `"${safeRel}" is a directory, not a file. List: /files ${safeRel}` }
   }
 
   if (st.size > maxBytes) {
     return {
       ok: false,
-      error: `Файл слишком большой (${formatFileSize(st.size)} > ${formatFileSize(maxBytes)}).`,
+      error: `File is too large (${formatFileSize(st.size)} > ${formatFileSize(maxBytes)}).`,
     }
   }