dsh-tg-bridge 1.2.1 → 1.2.3

package/README.md

@@ -157,6 +157,7 @@ Telegram → bridge.mjs → dsh --profile headless --json → ответ
 - [docs/ROADMAP.md](docs/ROADMAP.md) — что дальше
 - [docs/UX-ANALYSIS.md](docs/UX-ANALYSIS.md) — разбор интерактива
 - [docs/ACCEPTANCE.md](docs/ACCEPTANCE.md) — критерии приёмки
+- [docs/COST.md](docs/COST.md) — сколько стоит один ход и как это уменьшить
 - [docs/CHANGELOG.md](docs/CHANGELOG.md) — история изменений
 - [docs/RELEASE-CRITERIA.md](docs/RELEASE-CRITERIA.md) — критерии готовности релиза
 

package/bridge.mjs

@@ -73,6 +73,8 @@ const config = {
 };
 /** Turns currently running, keyed like sessions — `/stop` kills one. */
 const activeTurns = new Map();
+/** Wall-clock start of the running turn per session key, for the queue notice. */
+const turnStartedAt = new Map();
 try {
   Object.assign(config, JSON.parse(readFileSync(join(DIR, 'config.json'), 'utf8')));
 } catch {}
@@ -466,6 +468,37 @@ function commandOf(text) {
   return `/${match[1].toLowerCase().replace(/[.-]+/g, '')}`;
 }
 
+/**
+ * Commands that must run *now*, not behind the turn they are about.
+ *
+ * Everything in a topic used to be queued, so `/stop` waited for the very turn
+ * it was supposed to kill — on 2026-10-24 a 26-minute turn swallowed `/stop`
+ * and the person got "ход уже идёт" instead of an interruption. These few
+ * commands touch no turn state, so they can run concurrently with one.
+ */
+const IMMEDIATE_COMMANDS = new Set([
+  'stop',
+  'logs',
+  'status',
+  'queue',
+  'help',
+  'version',
+  'doctor',
+  'restart',
+]);
+
+/** Canonical immediate command name for a message, or '' when it must queue. */
+function immediateCommandOf(text) {
+  const trimmed = String(text ?? '').trim();
+  if (!trimmed.startsWith('/')) return '';
+  const head = trimmed.split(/\s+/)[0];
+  const collapsed = commandOf(head).replace(/^\//, '');
+  if (collapsed === 'apprestart' || collapsed === 'apprestartconfirm' || collapsed === 'restartconfirm') {
+    return 'restart';
+  }
+  return IMMEDIATE_COMMANDS.has(collapsed) ? collapsed : '';
+}
+
 /**
  * Turn model markdown into plain readable text.
  *
@@ -1368,9 +1401,15 @@ function enqueue(key, task, onBusy) {
   const queued = queues.has(key);
   const run = prev
     .then(() => acquire())
-    .then(() => task())
+    .then(() => {
+      // Remember when the turn actually started: the queue notice has to say
+      // "идёт уже 24 мин", not just "занято" — silence is what reads as a hang.
+      turnStartedAt.set(key, Date.now());
+      return task();
+    })
     .catch((error) => log(`turn queue error ${key}: ${error.message}`))
     .finally(() => {
+      turnStartedAt.delete(key);
       release();
       if (queues.get(key) === run) queues.delete(key);
       // A deferred restart waits for exactly this moment: the answer is out and
@@ -1649,6 +1688,17 @@ async function main() {
     }
     const queueKey = sessionKey(msg.chat.id, threadOf(msg));
     const thread = threadOf(msg);
+    // `/stop` behind the turn it should kill is a no-op; run the few commands
+    // that only read or kill state outside the per-topic queue.
+    const immediate = immediateCommandOf(msg.text ?? '');
+    if (immediate) {
+      log(`command ${immediate} handled outside the queue`);
+      Promise.resolve()
+        .then(() => handleMessage(msg))
+        .then(() => ack(update.update_id))
+        .catch((error) => log(`command ${immediate} failed: ${error.message}`));
+      return;
+    }
     enqueue(
       queueKey,
       async () => {
@@ -1669,7 +1719,14 @@ async function main() {
         ? async () => {
             await new Promise((resolve) => setTimeout(resolve, Number(config.busyNoticeMs ?? 45000)));
             if (!queues.has(queueKey)) return; // already finished
-            await send(msg.chat.id, '⏳ В этой теме ещё идёт предыдущий ход — твоё сообщение в очереди.', thread);
+            const started = turnStartedAt.get(queueKey);
+            const mins = started ? Math.max(1, Math.round((Date.now() - started) / 60000)) : 0;
+            const howLong = mins > 0 ? `идёт уже ${mins} мин` : 'ещё идёт';
+            await send(
+              msg.chat.id,
+              `⏳ Предыдущий ход ${howLong} — твоё сообщение в очереди.\nЕсли это затянулось, /stop прервёт ход, и я сразу возьмусь за твоим.`,
+              thread,
+            );
           }
         : undefined,
     );

package/package.json

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