dsh-tg-bridge 1.2.4 → 1.2.6

package/bridge.mjs

@@ -12,6 +12,7 @@ import {
 } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, basename } from 'node:path';
+import { fileURLToPath } from 'node:url';
 // Force IPv4 for every fetch. DNS returns an AAAA next to the A record, and
 // Happy Eyeballs happily picks the IPv6 path, which here costs ~5 s or dies
 // outright ("fetch failed" every 6 s, measured 22.10.2026: IPv4 0.34 s, IPv6
@@ -36,6 +37,10 @@ const CRED = join(DSH_HOME, '.credentials.yaml');
 const PENDING_DIR = join(DIR, 'pending');
 const DONE_FILE = join(DIR, 'done.json');
 const RESTART_MARKER = join(DIR, 'restart.pending');
+// `/restart confirm` leaves a note here for the process that replaces it: the
+// old code exits ~300 ms after spawning the new one, and without this the chat
+// saw "Перезапускаю мост…" and then silence — no proof the bot came back.
+const RESTART_NOTICE = join(fileURLToPath(new URL('.', import.meta.url)), 'restart-notice.json');
 const DONE_TTL_MS = 24 * 60 * 60 * 1000;
 // dsh.cmd runs the Electron binary as Node against this CLI entrypoint; the
 // bridge mirrors that exactly so no shell quoting of task text is needed.
@@ -853,10 +858,6 @@ async function startProgress(chatId, threadId, lang = 'ru') {
       chat_id: chatId,
       text: body(),
       disable_web_page_preview: true,
-      // Stop is available for as long as the turn runs; the keyboard is cleared
-      // when the status turns into the final line, so a stale button cannot be
-      // pressed after the work is over.
-      reply_markup: stopKeyboard(sessionKey(chatId, threadId), lang),
       ...(threadId > 0 ? { message_thread_id: threadId } : {}),
     });
     messageId = res.message_id;
@@ -1439,17 +1440,6 @@ const lastPrompt = new Map();
 const approvals = new Map();
 let approvalSeq = 0;
 
-function stopKeyboard(key, lang = 'ru') {
-  return {
-    inline_keyboard: [
-      [
-        { text: `⏹ ${t(lang, 'btn.stop')}`, callback_data: 'stop' },
-        { text: `📄 ${t(lang, 'btn.logs')}`, callback_data: 'logs' },
-      ],
-    ],
-  };
-}
-
 function errorKeyboard(key, lang = 'ru') {
   return {
     inline_keyboard: [
@@ -1670,6 +1660,23 @@ async function main() {
     const me = await tg('getMe');
     botUsername = me.username || '';
     log(`bot @${me.username}`);
+    // Confirm the restart in the topic it was asked from, not in the DM: the
+    // person who typed `/restart confirm` was looking at that thread.
+    try {
+      if (existsSync(RESTART_NOTICE)) {
+        const notice = JSON.parse(readFileSync(RESTART_NOTICE, 'utf8'));
+        unlinkSync(RESTART_NOTICE);
+        if (Date.now() - Number(notice.at || 0) < 10 * 60 * 1000) {
+          await send(
+            notice.chatId,
+            `✅ Мост перезапущен — на связи (pid ${process.pid}).\nТема и сессия прежние, можно продолжать.`,
+            notice.threadId || 0,
+          );
+        }
+      }
+    } catch (error) {
+      log(`restart notice failed: ${error.message}`);
+    }
     for (const id of config.allowedUserIds) {
       try { await send(id, `🤖 ${t(config.lang || 'ru', 'msg.started')}`); } catch {}
     }

package/control.mjs

@@ -554,6 +554,17 @@ export async function handleControl(ctx) {
       }
       say('Перезапускаю мост…');
       const bridge = fileURLToPath(new URL('./bridge.mjs', import.meta.url));
+      // Tell the replacement process where to confirm, so the chat does not go
+      // silent after "Перезапускаю мост…" (it did, twice on 2026-10-24).
+      try {
+        writeFileSync(
+          fileURLToPath(new URL('./restart-notice.json', import.meta.url)),
+          JSON.stringify({ chatId: ctx.chatId, threadId: ctx.threadId || 0, at: Date.now() }),
+          'utf8',
+        );
+      } catch (error) {
+        log(`restart notice not written: ${error.message}`);
+      }
       spawn(process.execPath, [bridge], { detached: true, stdio: 'ignore', windowsHide: true }).unref();
       setTimeout(() => process.exit(0), 300);
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tg-bridge",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Telegram bridge for DeepSeek Harness: text, voice, photos and project-per-topic sessions without opening the desktop app",
   "type": "module",
   "main": "bridge.mjs",