@goodandready/dsh-messenger-gateway 0.3.21 → 0.3.22

package/lib/client.js

@@ -114,6 +114,43 @@ window.__ModuleLoader__.load({
       'stats.errors': 'Delivery Errors',
       'stats.uptime': 'Gateway Uptime',
       'stats.active_chats': 'Active Chats in Memory',
+      // Updater
+      'updater.title': 'Plugin Self-Updater',
+      'updater.desc': 'Check npmjs registry for updates and upgrade in-place.',
+      'updater.current': 'Current version: {version}',
+      'updater.checking': 'Checking for updates…',
+      'updater.available': 'Update available: v{version}',
+      'updater.upToDate': 'Up to date',
+      'updater.btn_check': 'Check for Updates',
+      'updater.btn_update': 'Update to v{version}',
+      'updater.updating': 'Updating…',
+      'updater.success': 'Updated to v{version}! Please restart DSH service if required.',
+      'updater.failed': 'Update failed: {error}',
+      'updater.check_failed': 'Update check failed: {error}',
+      // Discord
+      discord: 'Discord Gateway',
+      discordSub: 'Discord bot and outbound webhook delivery settings.',
+      enableDiscord: 'Enable Discord',
+      disableDiscord: 'Disable Discord',
+      discordToken: 'Discord Bot Token',
+      discordTokenHint: 'From Discord Developer Portal. Leave empty to keep existing.',
+      discordWebhook: 'Discord Webhook URL',
+      discordWebhookHint: 'Incoming webhook for sending messages/notifications.',
+      discordChannels: 'Allowed Discord Channel IDs',
+      discordChannelsHint: 'Comma-separated channel IDs. Leave empty to allow all configured.',
+      // Slack
+      slack: 'Slack Gateway',
+      slackSub: 'Slack bot and incoming webhook settings.',
+      enableSlack: 'Enable Slack',
+      disableSlack: 'Disable Slack',
+      slackToken: 'Slack Bot Token (xoxb-…)',
+      slackTokenHint: 'Bot User OAuth Token. Leave empty to keep existing.',
+      slackWebhook: 'Slack Webhook URL',
+      slackWebhookHint: 'Incoming webhook URL for channel notifications.',
+      slackDefaultChannel: 'Slack Default Channel',
+      slackDefaultChannelHint: 'Default channel or member ID for outbound messages (e.g. #general or C12345).',
+      // Cron badge
+      'badge.cron_count': 'Cron: {count}',
     }
 
     const zh = {
@@ -217,6 +254,43 @@ window.__ModuleLoader__.load({
       'stats.errors': '发送错误数',
       'stats.uptime': '运行时间',
       'stats.active_chats': '内存中活跃聊天数',
+      // Updater
+      'updater.title': '插件自更新',
+      'updater.desc': '从 npmjs 仓库检查更新并直接就地升级。',
+      'updater.current': '当前版本: {version}',
+      'updater.checking': '正在检查更新…',
+      'updater.available': '发现新版本: v{version}',
+      'updater.upToDate': '已是最新版本',
+      'updater.btn_check': '检查更新',
+      'updater.btn_update': '更新至 v{version}',
+      'updater.updating': '正在更新…',
+      'updater.success': '已更新至 v{version}！如需生效请重启 DSH 服务。',
+      'updater.failed': '更新失败: {error}',
+      'updater.check_failed': '检查更新失败: {error}',
+      // Discord
+      discord: 'Discord 网关',
+      discordSub: 'Discord 机器人与出站 Webhook 设置。',
+      enableDiscord: '启用 Discord',
+      disableDiscord: '停用 Discord',
+      discordToken: 'Discord 机器人令牌',
+      discordTokenHint: '从 Discord 开发者平台获取。留空保持现有配置。',
+      discordWebhook: 'Discord Webhook URL',
+      discordWebhookHint: '用于发送消息或通知的传入 Webhook。',
+      discordChannels: '允许的 Discord 频道 ID',
+      discordChannelsHint: '逗号分隔的频道 ID。留空允许所有已配置频道。',
+      // Slack
+      slack: 'Slack 网关',
+      slackSub: 'Slack 机器人与 Webhook 设置。',
+      enableSlack: '启用 Slack',
+      disableSlack: '停用 Slack',
+      slackToken: 'Slack 机器人令牌 (xoxb-…)',
+      slackTokenHint: 'Bot 用户 OAuth 令牌。留空保持现有配置。',
+      slackWebhook: 'Slack Webhook URL',
+      slackWebhookHint: '用于频道通知的传入 Webhook URL。',
+      slackDefaultChannel: 'Slack 默认频道',
+      slackDefaultChannelHint: '出站消息的默认频道或成员 ID (例如 #general 或 C12345)。',
+      // Cron badge
+      'badge.cron_count': '定时任务: {count}',
     }
 
     function useActiveLocale(ctx) {
@@ -369,11 +443,13 @@ window.__ModuleLoader__.load({
       )
     }
 
-    const SETTINGS_KEYS = ['enabled', 'telegram', 'agent', 'media', 'tts']
+    const SETTINGS_KEYS = ['enabled', 'telegram', 'discord', 'slack', 'agent', 'media', 'tts']
 
     function draftFromStored(s) {
       const src = (s && typeof s === 'object') ? s : {}
       const t = src.telegram || {}
+      const d = src.discord || {}
+      const sl = src.slack || {}
       const a = src.agent || {}
       const m = src.media || {}
       const tts = src.tts || {}
@@ -411,6 +487,18 @@ window.__ModuleLoader__.load({
           botToken: t.botToken || '',
           webhookSecret: t.webhookSecret || '',
         },
+        discord: {
+          enabled: d.enabled === true,
+          botToken: d.botToken || '',
+          webhookUrl: d.webhookUrl || '',
+          allowedChannelIds: Array.isArray(d.allowedChannelIds) ? d.allowedChannelIds : [],
+        },
+        slack: {
+          enabled: sl.enabled === true,
+          botToken: sl.botToken || '',
+          webhookUrl: sl.webhookUrl || '',
+          defaultChannel: sl.defaultChannel || '',
+        },
         agent: {
           provider: a.provider || '',
           model: a.model || '',
@@ -441,6 +529,18 @@ window.__ModuleLoader__.load({
       const [token, setToken] = React.useState('')
       const [webhookSecret, setWebhookSecret] = React.useState('')
       const [allowText, setAllowText] = React.useState('')
+      const [discordToken, setDiscordToken] = React.useState('')
+      const [slackToken, setSlackToken] = React.useState('')
+      const [discordChannelsText, setDiscordChannelsText] = React.useState('')
+      const [updateState, setUpdateState] = React.useState({
+        checking: false,
+        updating: false,
+        currentVersion: '',
+        latestVersion: '',
+        updateAvailable: false,
+        error: '',
+        notice: '',
+      })
       const [pending, setPending] = React.useState([])
       const [status, setStatus] = React.useState(null)
       const [smokeResult, setSmokeResult] = React.useState(null)
@@ -472,6 +572,7 @@ window.__ModuleLoader__.load({
         if (snapStatus === 'ready' && cfg === null) {
           setCfg(draftFromStored(stored))
           setAllowText(idsToText(stored?.telegram?.allowedUserIds))
+          setDiscordChannelsText(idsToText(stored?.discord?.allowedChannelIds))
         }
       }, [snapStatus, stored, cfg])
 
@@ -503,6 +604,61 @@ window.__ModuleLoader__.load({
         return () => clearInterval(timer)
       }, [loadStatus, loadPairing])
 
+      const loadUpdateStatus = React.useCallback(async () => {
+        setUpdateState((s) => ({ ...s, checking: true, error: '' }))
+        try {
+          const res = await fetch(`${ROUTE_PREFIX}/update`, { cache: 'no-store' })
+          const data = await res.json().catch(() => ({}))
+          if (res.ok && data.ok) {
+            setUpdateState((s) => ({
+              ...s,
+              checking: false,
+              currentVersion: data.currentVersion || '',
+              latestVersion: data.latestVersion || '',
+              updateAvailable: !!data.updateAvailable,
+            }))
+          } else {
+            setUpdateState((s) => ({ ...s, checking: false, error: data.error || `HTTP ${res.status}` }))
+          }
+        } catch (e) {
+          setUpdateState((s) => ({ ...s, checking: false, error: String(e.message || e) }))
+        }
+      }, [])
+
+      const handleTriggerUpdate = async () => {
+        if (updateState.updating) return
+        setUpdateState((s) => ({ ...s, updating: true, error: '', notice: '' }))
+        try {
+          const res = await fetch(`${ROUTE_PREFIX}/update`, {
+            method: 'POST',
+            credentials: 'same-origin',
+            headers: {
+              'Content-Type': 'application/json',
+              'x-dsh-plugin-update': '1',
+            },
+          })
+          const data = await res.json().catch(() => ({}))
+          if (!res.ok || !data.ok) throw new Error(data.error || `HTTP ${res.status}`)
+          setUpdateState((s) => ({
+            ...s,
+            updating: false,
+            updateAvailable: false,
+            currentVersion: data.updatedVersion || s.latestVersion,
+            notice: t('updater.success', { version: data.updatedVersion || s.latestVersion }),
+          }))
+        } catch (e) {
+          setUpdateState((s) => ({
+            ...s,
+            updating: false,
+            error: t('updater.failed', { error: String(e.message || e) }),
+          }))
+        }
+      }
+
+      React.useEffect(() => {
+        loadUpdateStatus()
+      }, [loadUpdateStatus])
+
       const handleSmoke = async () => {
         setBusy('smoke')
         setErr('')
@@ -531,6 +687,8 @@ window.__ModuleLoader__.load({
         ...base,
         ...patch,
         telegram: { ...base.telegram, ...(patch.telegram || {}) },
+        discord: { ...base.discord, ...(patch.discord || {}) },
+        slack: { ...base.slack, ...(patch.slack || {}) },
         tts: { ...base.tts, ...(patch.tts || {}) },
         agent: { ...base.agent, ...(patch.agent || {}) },
         media: { ...base.media, ...(patch.media || {}) },
@@ -546,6 +704,9 @@ window.__ModuleLoader__.load({
           if (token.trim()) next.telegram = { ...next.telegram, botToken: token.trim() }
           if (webhookSecret.trim()) next.telegram = { ...next.telegram, webhookSecret: webhookSecret.trim() }
           next.telegram.allowedUserIds = textToIds(allowText)
+          if (discordToken.trim()) next.discord = { ...next.discord, botToken: discordToken.trim() }
+          if (slackToken.trim()) next.slack = { ...next.slack, botToken: slackToken.trim() }
+          next.discord.allowedChannelIds = textToIds(discordChannelsText)
 
           const broken = []
           for (const key of SETTINGS_KEYS) {
@@ -564,6 +725,8 @@ window.__ModuleLoader__.load({
           setCfg(next)
           setToken('')
           setWebhookSecret('')
+          setDiscordToken('')
+          setSlackToken('')
           setMsg(t('saved'))
           setTimeout(() => setMsg(''), 3000)
           await loadPairing()
@@ -628,6 +791,13 @@ window.__ModuleLoader__.load({
                   { className: 'msgw-badge msgw-badge-warn' },
                   t('badge.pairing_count', { count: pendingCount })
                 )
+              : null,
+            (status?.scheduledCount > 0)
+              ? React.createElement(
+                  'span',
+                  { className: 'msgw-badge msgw-badge-ok' },
+                  t('badge.cron_count', { count: status.scheduledCount })
+                )
               : null
           ),
           React.createElement('div', { className: 'msgw-page-sub' }, t('header.sub'))
@@ -637,6 +807,60 @@ window.__ModuleLoader__.load({
         err ? React.createElement('div', { className: 'msgw-alert-err' }, err) : null,
         msg ? React.createElement('div', { className: 'msgw-alert-ok' }, msg) : null,
 
+        // Self-Updater Card
+        React.createElement(
+          'div',
+          { className: 'msgw-section-card' },
+          React.createElement(
+            'div',
+            { className: 'msgw-section-title' },
+            React.createElement('span', null, `🚀 ${t('updater.title')}`),
+            React.createElement(
+              'div',
+              { className: 'msgw-row' },
+              React.createElement(
+                'button',
+                {
+                  type: 'button',
+                  className: 'msgw-btn msgw-btn-mini',
+                  disabled: updateState.checking || updateState.updating,
+                  onClick: loadUpdateStatus,
+                },
+                updateState.checking ? t('updater.checking') : t('updater.btn_check')
+              ),
+              updateState.updateAvailable
+                ? React.createElement(
+                    'button',
+                    {
+                      type: 'button',
+                      className: 'msgw-btn msgw-btn-mini msgw-btn-primary',
+                      disabled: updateState.updating,
+                      onClick: handleTriggerUpdate,
+                    },
+                    updateState.updating ? t('updater.updating') : t('updater.btn_update', { version: updateState.latestVersion })
+                  )
+                : null
+            )
+          ),
+          React.createElement('div', { className: 'msgw-section-desc' }, t('updater.desc')),
+          React.createElement(
+            'div',
+            { className: 'msgw-row', style: { fontSize: '13px' } },
+            React.createElement('span', { style: { color: 'var(--dsw-alias-label-secondary)' } },
+              t('updater.current', { version: updateState.currentVersion || status?.version || '...' })
+            ),
+            updateState.checking
+              ? React.createElement('span', { className: 'msgw-badge msgw-badge-warn' }, t('updater.checking'))
+              : updateState.updateAvailable
+                ? React.createElement('span', { className: 'msgw-badge msgw-badge-warn' }, t('updater.available', { version: updateState.latestVersion }))
+                : updateState.currentVersion && !updateState.error
+                  ? React.createElement('span', { className: 'msgw-badge msgw-badge-ok' }, `✓ ${t('updater.upToDate')}`)
+                  : null
+          ),
+          updateState.notice ? React.createElement('div', { className: 'msgw-alert-ok' }, updateState.notice) : null,
+          updateState.error ? React.createElement('div', { className: 'msgw-alert-err' }, updateState.error) : null
+        ),
+
         // Card 1: Telegram Connection & Bot
         React.createElement(
           'div',
@@ -949,6 +1173,101 @@ window.__ModuleLoader__.load({
           )
         ),
 
+        // Card: Discord Gateway
+        React.createElement(
+          'div',
+          { className: 'msgw-section-card' },
+          React.createElement(
+            'div',
+            { className: 'msgw-section-title' },
+            React.createElement('span', null, `🎮 ${t('discord')}`),
+            React.createElement(
+              'button',
+              {
+                type: 'button',
+                className: `msgw-btn msgw-btn-mini ${cfg.discord?.enabled ? 'msgw-btn-danger' : 'msgw-btn-primary'}`,
+                disabled: !!busy,
+                onClick: () => save({ discord: { enabled: !cfg.discord?.enabled } }),
+              },
+              cfg.discord?.enabled ? t('disableDiscord') : t('enableDiscord')
+            )
+          ),
+          React.createElement('div', { className: 'msgw-section-desc' }, t('discordSub')),
+          React.createElement(Field, { label: t('discordToken'), hint: t('discordTokenHint') },
+            React.createElement('input', {
+              type: 'password',
+              className: 'msgw-input',
+              value: discordToken,
+              placeholder: (status?.config?.discord?.botTokenConfigured || cfg.discord?.botTokenConfigured) ? '••••••••••••••••' : 'Discord Bot Token',
+              onChange: (e) => setDiscordToken(e.target.value),
+            })
+          ),
+          React.createElement(Field, { label: t('discordWebhook'), hint: t('discordWebhookHint') },
+            React.createElement('input', {
+              className: 'msgw-input',
+              value: cfg.discord?.webhookUrl || '',
+              placeholder: 'https://discord.com/api/webhooks/...',
+              onChange: (e) => setCfg({ ...cfg, discord: { ...cfg.discord, webhookUrl: e.target.value } }),
+            })
+          ),
+          React.createElement(Field, { label: t('discordChannels'), hint: t('discordChannelsHint') },
+            React.createElement('textarea', {
+              className: 'msgw-textarea',
+              value: discordChannelsText,
+              onChange: (e) => setDiscordChannelsText(e.target.value),
+              rows: 2,
+              placeholder: '123456789012345678, 987654321098765432',
+            })
+          )
+        ),
+
+        // Card: Slack Gateway
+        React.createElement(
+          'div',
+          { className: 'msgw-section-card' },
+          React.createElement(
+            'div',
+            { className: 'msgw-section-title' },
+            React.createElement('span', null, `💼 ${t('slack')}`),
+            React.createElement(
+              'button',
+              {
+                type: 'button',
+                className: `msgw-btn msgw-btn-mini ${cfg.slack?.enabled ? 'msgw-btn-danger' : 'msgw-btn-primary'}`,
+                disabled: !!busy,
+                onClick: () => save({ slack: { enabled: !cfg.slack?.enabled } }),
+              },
+              cfg.slack?.enabled ? t('disableSlack') : t('enableSlack')
+            )
+          ),
+          React.createElement('div', { className: 'msgw-section-desc' }, t('slackSub')),
+          React.createElement(Field, { label: t('slackToken'), hint: t('slackTokenHint') },
+            React.createElement('input', {
+              type: 'password',
+              className: 'msgw-input',
+              value: slackToken,
+              placeholder: (status?.config?.slack?.botTokenConfigured || cfg.slack?.botTokenConfigured) ? '••••••••••••••••' : 'xoxb-...',
+              onChange: (e) => setSlackToken(e.target.value),
+            })
+          ),
+          React.createElement(Field, { label: t('slackWebhook'), hint: t('slackWebhookHint') },
+            React.createElement('input', {
+              className: 'msgw-input',
+              value: cfg.slack?.webhookUrl || '',
+              placeholder: 'https://hooks.slack.com/services/...',
+              onChange: (e) => setCfg({ ...cfg, slack: { ...cfg.slack, webhookUrl: e.target.value } }),
+            })
+          ),
+          React.createElement(Field, { label: t('slackDefaultChannel'), hint: t('slackDefaultChannelHint') },
+            React.createElement('input', {
+              className: 'msgw-input',
+              value: cfg.slack?.defaultChannel || '',
+              placeholder: '#general or C12345678',
+              onChange: (e) => setCfg({ ...cfg, slack: { ...cfg.slack, defaultChannel: e.target.value } }),
+            })
+          )
+        ),
+
         // Card 6: Pairing Requests
         React.createElement(
           'div',

package/lib/commands.js

@@ -1,73 +1,74 @@
-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' },
-]
-
-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)
-}
-
+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)
+}
+