dsh-telegram-bot 0.1.0 → 0.1.1

package/README.md

@@ -14,26 +14,26 @@ The bot connects to Telegram, enforces the allowlists, and bridges DSH agent ses
 - **Allowed chats** — Telegram chat ids or `@channelnames`; empty means private chats only.
 - **Enable bot** toggle.
 - **Restart bot** button — reapplies the saved settings and restarts long polling.
-- **Quick controls on the Plugins page** — the bundle's detail page shows token state, access counts, and the same restart button. The bundle switch itself is the on/off control; turning the plugin off unmounts it and aborts polling.
+- **Plugins page** — the bundle page is informational and points to Settings → Telegram. The bundle switch above it is the plugin on/off control; turning it off unmounts the runtime and aborts polling.
 - **Agent bridge** — an ordinary text message in a session topic starts a DSH agent turn in that session, with assistant text streamed back.
-- **DM topics** — `/sessions` in **All** is the single place for DSH sessions: choose a workspace, then create a new session in it or open an existing one. The selected session continues in its own topic.
+- **DM topics** — `/sessions` in **All** is the single place for DSH sessions: choose a workspace, then create a new session in it or open an existing one. The selected session continues in its own topic. Requires **Threaded mode** in @BotFather → Bot Settings.
 - **All and System topics** — All is Telegram's default topic and the management hub; System receives bot lifecycle notifications, mirrored into All.
-- **Thinking and tool calls** — reasoning deltas and tool calls are mirrored into the topic, with independent **Show model thinking** / **Show tool calls** switches.
+- **Thinking and tool calls** — reasoning deltas and tool calls are mirrored into the topic, with independent **Show model thinking** / **Show tool calls** switches. Thinking is a 10-line rolling window; the tool-call message shows the last ten calls.
 - **Commands** — `/start`, `/help`, `/sessions`, `/stop`, `/status`, `/current`, `/menu`, `/rename`, `/last`, `/restart`, `/id`, `/ping`.
 - **Approval prompts** — when a tool asks for approval, the session topic gets a styled prompt with **Deny** and **Allow** inline buttons; the decision resolves the exact pending request.
 - **Session controls** — an inline 2×2 panel in each session topic: **Model** (Flash/Pro), **Effort** (off/low/high/max), **Mode** (permission preset), and **Context** (window, last request usage, and cache-hit percentage). Telegram reply keyboards are chat-wide, so the controls are a per-topic inline panel rather than a bottom keyboard.
-- **Recovery** — `/last [n]` shows the latest assistant answer(s) from the bound session, useful after switching between Web and Telegram. `/rename <name>` changes the Telegram topic title; `/restart` restarts the Telegram runtime; `/menu` reposts the bottom controls.
+- **Recovery** — `/last [n]` shows the latest assistant answer(s) from the bound session, useful after switching between Web and Telegram. `/rename <name>` changes the Telegram topic title; `/restart` restarts the Telegram runtime; `/menu` opens the inline session controls.
 - **Language** — bot messages and the Telegram command menu default to English; a Settings selector switches them to Russian.
 - **Formatting** — assistant Markdown (headings, bold, lists, code, links, tables) is converted to Telegram MarkdownV2.
-- **Command hints** — the runtime publishes the list with `setMyCommands`, so Telegram shows the commands and descriptions when the user types `/`. English is the default; Russian clients get localized descriptions.
+- **Command hints** — the runtime publishes the list with `setMyCommands`, so Telegram shows the commands and descriptions when the user types `/`. The descriptions follow the selected Bot language; English is the default.
 - English and Russian page copy; Russian is registered as an optional language pack.
 
 ## Install
 
-From this checkout:
+From this checkout, run in the repository root:
 
 ```sh
-npx @deepseek-ai/dsh plugin --profile web add /home/boobaw/dsh-plugin-tg-bot
+npx @deepseek-ai/dsh plugin --profile web add .
 ```
 
 After publishing to npm:
@@ -44,7 +44,7 @@ npx @deepseek-ai/dsh plugin --profile web add dsh-telegram-bot
 
 `dsh plugin add` installs the package and selects its bundle in `dsh.profile.bundles` when the package declares `dsh.bundle`. Restart `dsh web` if the running profile does not pick the new bundle up through HMR.
 
-Then open **Settings → Telegram** (or **Plugins → dsh-telegram-bot**) in the Web UI.
+Then open **Settings → Telegram** (or **Plugins → Telegram Bot**) in the Web UI.
 
 ## Configure
 
@@ -67,10 +67,11 @@ The token field reports only whether a token is configured. A token supplied by
 ### First run
 
 1. Create a bot with [@BotFather](https://t.me/BotFather) and save its token in **Settings → Telegram**.
-2. Open the bot chat, tap the bot name and enable **Topics**. **All** is Telegram's default topic; the bot creates **System** for lifecycle notifications.
-3. Send `/start` in **All**. With an empty user list the bot replies with your user id and chat id.
-4. Add your user id to **Allowed users** and press **Save** (or **Restart bot**).
-5. In **All** send `/sessions` to create a new session or pick an existing DSH session. The dialog continues in its own topic.
+2. In @BotFather open the bot's **Bot Settings → Threaded mode** and enable it. Without this, private-chat topics cannot be created.
+3. Open the bot chat, tap the bot name and enable **Topics**. **All** is Telegram's default topic; the bot creates **System** for lifecycle notifications.
+4. Send `/start` in **All**. With an empty user list the bot replies with your user id and chat id, plus the Threaded-mode reminder.
+5. Add your user id to **Allowed users** and press **Save** (or **Restart bot**).
+6. In **All** send `/sessions` to create a new session or pick an existing DSH session. The dialog continues in its own topic.
 
 The runtime starts only when **Enable bot** is on, a token is configured, and the profile process is running. It logs connection and polling diagnostics with the `[telegram]` prefix. Runtime state is at `$DSH_HOME/telegram/status.json`, and the topic → session mapping is at `$DSH_HOME/telegram/state.json` (neither contains the token).
 
@@ -127,15 +128,13 @@ No browser and no port are opened. `Ctrl+C` stops the process; `$DSH_HOME/telegr
 
 ## Plugins page
 
-The bundle detail page in **Plugins** renders a compact card with:
+The bundle detail page in **Plugins** is a short informational panel:
 
-- token state and the current number of allowed users/chats;
-- **Restart bot**;
-- a pointer to **Settings → Telegram** for editing the full lists.
+- it points to **Settings → Telegram** for token, access lists, language and display options;
+- it lists the manual configuration files for headless setups;
+- it does not duplicate the settings controls.
 
-There is deliberately no bot on/off switch on this page: the bundle switch above the card disables the whole plugin, and the runtime's `ctx.effect` cleanup aborts polling when it unmounts. **Settings → Telegram → Enable bot** remains a soft pause that keeps the plugin loaded.
-
-The full page remains in Settings because allowlist editing needs room for chips and validation.
+The bundle switch above the panel is the plugin on/off control. **Settings → Telegram → Enable bot** is a soft pause that keeps the plugin loaded but stops polling.
 
 ## Security
 
@@ -178,11 +177,9 @@ A Git URL or tarball also works for DSH (`dsh plugin add github:you/dsh-telegram
 
 ## Roadmap
 
-1. Approval and question answerers with inline buttons.
-2. Tool-call cards and richer streaming presentation.
-3. File attachments and voice input.
-4. Model/preset selection from the chat.
-5. Multiple chats and group/topic routing.
+1. File attachments and voice input.
+2. Multiple chats and group/topic routing.
+3. Richer tool-result summaries.
 
 ## License
 

package/client.js

@@ -10,7 +10,7 @@ window.__ModuleLoader__.load({
     const { Button, SettingsSecretField, Switch } = primitives
     const h = React.createElement
 
-    /** Loader row id / settings namespace, equal to the package name. */
+    /** Loader row id / settings namespace; the npm package name is dsh-telegram-bot. */
     const NS = 'telegram-bot'
     /** Default credential reference holding the Telegram bot token. */
     const DEFAULT_TOKEN_REF = 'TELEGRAM_BOT_TOKEN'
@@ -51,7 +51,6 @@ window.__ModuleLoader__.load({
       saving: 'Saving…',
       saved: 'Saved.',
       restart: 'Restart bot',
-      restarting: 'Restarting…',
       restartRequested: 'Restart requested. Check Telegram or the DSH log.',
       restartFailed: 'The Host did not accept the restart request.',
       bundleSummary: 'Telegram bot',
@@ -61,20 +60,6 @@ window.__ModuleLoader__.load({
       pluginConfigSettings: 'plugin settings (cordis.patch.yml)',
       pluginConfigToken: 'bot token (credential store)',
       pluginConfigEnv: 'token fallback for headless deployments',
-      running: 'Running',
-      stopped: 'Stopped',
-      runtimeMissingShort: 'Host not loaded',
-      on: 'On',
-      off: 'Off',
-      pluginRuntimeHint: 'Runtime state from this DSH process. Turning the bundle off stops polling.',
-      pluginQuickControls: 'Quick controls',
-      pluginDisplay: 'Display',
-      bundleSettingsHint: 'Full allowlists are in Settings → Telegram.',
-      tokenConfiguredShort: 'token configured',
-      tokenMissingShort: 'no token',
-      usersShort: 'users',
-      chatsShort: 'chats',
-      bundleDisableHint: 'Turning the plugin off in Plugins stops polling.',
       hostNeedsRestart: 'The Telegram runtime is not loaded in this DSH process yet. Restart dsh web once; after that this page can restart the bot.',
       discard: 'Discard',
       saveFailed: 'The Host did not accept these values.',
@@ -121,7 +106,6 @@ window.__ModuleLoader__.load({
       saving: 'Сохранение…',
       saved: 'Сохранено.',
       restart: 'Перезапустить бота',
-      restarting: 'Перезапуск…',
       restartRequested: 'Запрошен перезапуск. Проверьте Telegram или лог DSH.',
       restartFailed: 'Host не принял запрос на перезапуск.',
       bundleSummary: 'Telegram-бот',
@@ -131,20 +115,6 @@ window.__ModuleLoader__.load({
       pluginConfigToken: 'токен бота (credential store)',
       pluginConfigEnv: 'fallback токена для headless',
       pluginPageLocation: 'Открой Settings → Telegram, чтобы настроить плагин.',
-      running: 'Работает',
-      stopped: 'Остановлен',
-      runtimeMissingShort: 'Host не загружен',
-      on: 'Вкл',
-      off: 'Выкл',
-      pluginRuntimeHint: 'Состояние runtime в этом процессе DSH. Выключение bundle останавливает polling.',
-      pluginQuickControls: 'Быстрые настройки',
-      pluginDisplay: 'Отображение',
-      bundleSettingsHint: 'Полные списки доступа — в Settings → Telegram.',
-      tokenConfiguredShort: 'токен настроен',
-      tokenMissingShort: 'нет токена',
-      usersShort: 'пользователей',
-      chatsShort: 'чатов',
-      bundleDisableHint: 'Выключение плагина в Plugins останавливает polling.',
       hostNeedsRestart: 'Telegram runtime ещё не загружен в этот процесс DSH. Перезапусти dsh web один раз; после этого кнопка рестарта заработает.',
       discard: 'Отменить',
       saveFailed: 'Host не принял эти значения.',
@@ -189,22 +159,9 @@ window.__ModuleLoader__.load({
       .dtb-message{min-height:20px;font-size:12px;line-height:20px}
       .dtb-messageOk{color:var(--dsw-alias-state-success-primary)}
       .dtb-messageError{color:var(--dsw-alias-state-error-primary)}
-      .dtb-bundle{display:flex;flex-direction:column;gap:12px}
       .dtb-plugin{display:flex;flex-direction:column;gap:16px;padding-top:4px}
-      .dtb-pluginTop{display:flex;flex-direction:column;gap:8px}
-      .dtb-bundleMeta{display:flex;flex-wrap:wrap;align-items:center;gap:8px}
-      .dtb-pluginGrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}
-      .dtb-stat{display:flex;flex-direction:column;gap:2px;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-1)}
-      .dtb-statLabel{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:16px}
-      .dtb-statValue{font-size:15px;line-height:22px;font-weight:600}
-      .dtb-pluginSection{display:flex;flex-direction:column;gap:10px}
-      .dtb-pluginSectionTitle{margin:0;font-size:13px;font-weight:600;line-height:20px}
-      .dtb-pluginControls{display:flex;flex-direction:column;gap:10px}
-      .dtb-pluginControl{display:flex;align-items:center;justify-content:space-between;gap:16px}
-      .dtb-pluginActions{display:flex;align-items:center;gap:10px;flex-wrap:wrap}
       .dtb-notice{margin:0;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px}
       .dtb-loading{padding:16px 0;color:var(--dsw-alias-label-tertiary);font-size:13px}
-      .dtb-note{margin:0;color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:17px}
       @media (max-width:560px){.dtb-toggleRow{align-items:flex-start;flex-direction:column;gap:8px}.dtb-footer{align-items:stretch;flex-direction:column}.dtb-footerActions{justify-content:flex-end}}
     `
 
@@ -715,11 +672,11 @@ window.__ModuleLoader__.load({
 
 
     /**
-     * Compact controls on the Plugins page's bundle detail. The full allowlists
-     * stay in Settings → Telegram; this card owns the restart and token/status
-     * summary. The bundle switch itself is the plugin's on/off control.
-     * @param props - locale reader, settings form, credential operations, view.
-     * @returns the summary line or the quick controls.
+     * Informational card on the Plugins page's bundle detail. All controls live
+     * in Settings → Telegram; this card only points there and lists the manual
+     * configuration files. The bundle switch is the plugin's on/off control.
+     * @param props - locale reader and slot view.
+     * @returns the summary line or the settings pointer.
      */
     function BundleSettings(props) {
       const { t, view } = props
@@ -809,7 +766,7 @@ window.__ModuleLoader__.load({
                 name: 'plugins.bundle.config',
                 key: 'dsh-telegram-bot',
                 locale: NS,
-                inject: () => ({ t, form, token }),
+                inject: () => ({ t }),
               },
               BundleSettings,
             ),

package/index.js

@@ -1,14 +1,10 @@
 /**
  * Host half of dsh-telegram-bot.
  *
- * It owns two things:
- *  - the editable settings namespace (`enabled`, allowlists, restart request);
- *  - a deliberately small Telegram long-polling runtime, so the Restart button
- *    and the allowlists do something real before the full agent bridge lands.
- *
- * The runtime answers only a handful of diagnostic commands. Wiring Telegram
- * chats to DSH agents is the next step; keeping this layer small means a bad
- * token or a conflicting poller can never take the Host down.
+ * It owns the editable settings namespace, the Telegram long-polling runtime,
+ * the DM-topic session browser, and the bridge between Telegram topics and
+ * DSH agent sessions. Keeping the runtime isolated means a bad token or a
+ * conflicting poller cannot take the Host down.
  */
 import z from '@deepseek-ai/schemastery'
 import { mkdir, readFile, rename, writeFile } from 'node:fs/promises'
@@ -18,13 +14,11 @@ import { homedir } from 'node:os'
 import { basename, join, resolve } from 'node:path'
 import telegramifyMarkdown from 'telegramify-markdown'
 
-/** Loader row id; keep it equal to the package name and the client namespace. */
+/** Loader row id and settings namespace; the npm package name stays dsh-telegram-bot. */
 export const name = 'telegram-bot'
 
 /** Default credential reference holding the bot token. */
 const DEFAULT_TOKEN_REF = 'TELEGRAM_BOT_TOKEN'
-/** Telegram Bot API root; the token is appended per request. */
-const API_ROOT = 'https://api.telegram.org'
 /** Long-poll timeout requested from Telegram, in seconds. */
 const POLL_TIMEOUT_SECONDS = 25
 /** Pause after a failed poll before trying again, in milliseconds. */
@@ -436,7 +430,7 @@ let runtimeStatus = {
   transport: 'https-ipv4',
   version: '0.3.0',
   agentBridge: 'v1',
-  codeRevision: 'format-4',
+  codeRevision: 'threaded-mode',
   lastPollAt: 0,
   lastMessageAt: 0,
   lastChatId: null,
@@ -540,7 +534,6 @@ export function apply(ctx, config) {
         thinkingMessageId: null,
         thinkingTimer: null,
         thinkingLastText: '',
-        thinkingIsStatus: false,
         tools: [],
         toolMessageId: null,
         toolTimer: null,
@@ -577,19 +570,6 @@ export function apply(ctx, config) {
     await persistState()
   }
 
-  /**
-   * Remove one topic's session binding without deleting the session.
-   * @param chat - chat bridge state.
-   */
-  async function unbindSession(chat) {
-    const sessionId = chat.sessionId
-    chat.sessionId = undefined
-    chat.boundAgent = undefined
-    delete state.threads[chat.key]
-    if (typeof sessionId === 'string') delete state.sessions[sessionId]
-    await persistState()
-  }
-
   /** @returns the configured session working directory. */
   function cwdOf() {
     const configured = readLive(config.cwd, process.cwd())
@@ -1004,7 +984,7 @@ export function apply(ctx, config) {
   }
 
   /**
-   * Send one HTML-safe diagnostic message.
+   * Send one HTML-formatted message.
    * @param chatId - target chat.
    * @param text - message body.
    * @param signal - runtime lifetime.
@@ -1499,7 +1479,6 @@ export function apply(ctx, config) {
     chat.thinkingText = ''
     chat.thinkingLastText = ''
     chat.thinkingMessageId = null
-    chat.thinkingIsStatus = false
     chat.tools = []
     chat.toolLastText = ''
     chat.toolMessageId = null
@@ -1625,7 +1604,6 @@ export function apply(ctx, config) {
     }
     if (frame.type === 'chunk' && frame.chunk?.type === 'reasoning-delta') {
       if (readLive(config.showThinking, true) !== true) return
-      chat.thinkingIsStatus = false
       chat.thinkingText += frame.chunk.text
       scheduleThinking(chat)
       return
@@ -1669,7 +1647,7 @@ export function apply(ctx, config) {
   }
 
   /**
-   * Flush the final assistant text, replacing or splitting the placeholder.
+   * Flush the final assistant text into the first answer message and split it.
    * @param chat - chat bridge state.
    */
   async function finalizeChat(chat) {
@@ -1922,7 +1900,7 @@ export function apply(ctx, config) {
     return [
       [
         { text: `🤖 ${modelLabel(current.model)}`, callback_data: 'o:model' },
-        { text: `🧠 ${tr('Effort', 'Режим')}: ${effortLabel(current.reasoningEffort)}`, callback_data: 'o:effort' },
+        { text: `🧠 ${tr('Effort', 'Усилие')}: ${effortLabel(current.reasoningEffort)}`, callback_data: 'o:effort' },
       ],
       [
         { text: `🛡 ${permissionLabel(permission)}`, callback_data: 'o:mode' },
@@ -2103,7 +2081,7 @@ export function apply(ctx, config) {
         const message = messageOf(error).toLowerCase()
         if (message.includes('duplicate') || message.includes('already')) continue
         if (message.includes('forum') || message.includes('topic')) {
-          throw new Error(tr('Enable Topics in the bot chat: tap the bot name → Topics.', 'Включи Topics в чате с ботом: имя бота сверху → Topics.'))
+          throw new Error(tr('Enable Threaded mode in @BotFather → Bot Settings, then enable Topics in the bot chat (tap the bot name → Topics).', 'Включи Threaded mode в @BotFather → Bot Settings, затем включи Topics в чате с ботом (имя бота сверху → Topics).'))
         }
         throw error
       }
@@ -2484,8 +2462,7 @@ export function apply(ctx, config) {
   }
 
   /**
-   * Answer one authorized message. This is intentionally a diagnostic surface
-   * until the DSH Agent bridge replaces it.
+   * Handle one authorized Telegram message and dispatch its command or prompt.
    * @param message - Telegram message.
    * @param signal - runtime lifetime.
    * @param type - Telegram update key, for diagnostics.
@@ -2533,8 +2510,8 @@ export function apply(ctx, config) {
         await send(
           chat.id,
           tr(
-            `Setup mode.\nYour user id: <code>${from.id}</code>\nYour chat id: <code>${chat.id}</code>\n\nAdd the user id to <b>Settings → Telegram → Allowed users</b>, then press Restart.`,
-            `Режим настройки.\nТвой user id: <code>${from.id}</code>\nТвой chat id: <code>${chat.id}</code>\n\nДобавь user id в <b>Settings → Telegram → Allowed users</b> и нажми Restart.`,
+            `Setup mode.\nYour user id: <code>${from.id}</code>\nYour chat id: <code>${chat.id}</code>\n\nAdd the user id to <b>Settings → Telegram → Allowed users</b>, then press Restart.\n\nBefore opening sessions, enable <b>Threaded mode</b> in @BotFather → Bot Settings.`,
+            `Режим настройки.\nТвой user id: <code>${from.id}</code>\nТвой chat id: <code>${chat.id}</code>\n\nДобавь user id в <b>Settings → Telegram → Allowed users</b> и нажми Restart.\n\nПеред открытием сессий включи <b>Threaded mode</b> в @BotFather → Bot Settings.`,
           ),
           signal,
           threadId,
@@ -2581,6 +2558,7 @@ export function apply(ctx, config) {
           (inSession
             ? `${tr('Current session', 'Текущая сессия')}: <code>${chatState.sessionId}</code>\n`
             : `${tr('Global topic. Choose a session or create a new one.', 'Глобальный чат. Выбери сессию или создай новую.')}\n`) +
+          `\n<b>${tr('First run', 'Первый запуск')}:</b> @BotFather → Bot Settings → <b>Threaded mode</b> → ${tr('Enable', 'Включить')}.\n` +
           `${tr('Commands', 'Команды')}: /sessions, /current, /menu, /rename, /last, /stop, /restart, /status, /id, /ping.`,
         signal,
         threadId,
@@ -2944,5 +2922,3 @@ export function apply(ctx, config) {
     'dsh-telegram-bot: runtime',
   )
 }
-
-export { preprocessTables, toTelegramMarkdown, splitAnswerText, fitAnswerText }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-telegram-bot",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Telegram sessions, topics, model controls and approvals for DeepSeek Harness.",
   "type": "module",
   "main": "index.js",
@@ -52,10 +52,10 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/boobaw/dsh-telegram-bot.git"
+    "url": "git+https://github.com/Boobaw/dsh-telegram-bot.git"
   },
-  "homepage": "https://github.com/boobaw/dsh-telegram-bot#readme",
+  "homepage": "https://github.com/Boobaw/dsh-telegram-bot#readme",
   "bugs": {
-    "url": "https://github.com/boobaw/dsh-telegram-bot/issues"
+    "url": "https://github.com/Boobaw/dsh-telegram-bot/issues"
   }
 }