dsh-tg-bridge 1.3.0 → 1.3.2

package/bridge.mjs

@@ -1469,18 +1469,53 @@ function steerRunningTurn(msg, text, sessionId, thread) {
     say: SAY,
   });
   log(`steer ${job.id} -> ${sessionId} (${text.length} chars)`);
-  const timer = setTimeout(async () => {
+  watchSteer(job, msg, text, thread, lang);
+  return job;
+}
+
+/**
+ * Follow one steer job until it is either acknowledged by the model or taken by
+ * the plugin.
+ *
+ * Two failure modes need cover: a model that stays silent (one neutral line
+ * after 90 s), and a job that never reached the agent because the turn ended
+ * first — that addition must become its own turn instead of expiring unseen in
+ * the directory.
+ */
+function watchSteer(job, msg, text, thread, lang) {
+  const key = sessionKey(msg.chat.id, thread);
+  const acked = () => existsSync(join(STEER_DIR, 'acks', `${job.id}.json`));
+  const consumed = () => existsSync(join(STEER_DIR, 'done', `${job.id}.json`));
+  const check = async (attempt) => {
     try {
-      if (existsSync(join(STEER_DIR, 'acks', `${job.id}.json`))) return;
-      if (!activeTurns.has(key)) return; // turn ended; its answer is the reply
-      log(`steer ${job.id} unacknowledged after 90s; sending fallback`);
-      await send(msg.chat.id, t(lang, 'steer.ackFallback'), thread);
+      if (acked() || consumed()) return;
+      if (activeTurns.has(key)) {
+        if (attempt === 0) {
+          log(`steer ${job.id} unacknowledged after 90s; sending fallback`);
+          await send(msg.chat.id, t(lang, 'steer.ackFallback'), thread);
+        }
+        setTimeout(() => check(attempt + 1), 60_000).unref?.();
+        return;
+      }
+      // The turn is over and the plugin never picked the job up: deliver it as
+      // a turn of its own, otherwise the person's addition is silently lost.
+      const pending = join(STEER_DIR, `${job.id}.json`);
+      if (!existsSync(pending)) return;
+      try { unlinkSync(pending); } catch {}
+      log(`steer ${job.id} not consumed by the turn; re-queued as a new turn`);
+      enqueue(key, () => handleMessage({
+        chat: msg.chat,
+        from: msg.from,
+        message_id: 0,
+        message_thread_id: thread || undefined,
+        is_topic_message: thread > 0,
+        text,
+      }));
     } catch (error) {
-      log(`steer fallback failed: ${error.message}`);
+      log(`steer watch failed for ${job.id}: ${error.message}`);
     }
-  }, 90_000);
-  timer.unref?.();
-  return job;
+  };
+  setTimeout(() => check(0), 90_000).unref?.();
 }
 
 function enqueue(key, task, onBusy) {

package/package.json

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

package/plugin/steer-inbox/index.js

@@ -6,6 +6,7 @@
 // `steer()` — next-step input, not a queued next turn — which is what makes
 // "добавь ещё вот это" land inside the current work instead of after it.
 import { mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, appendFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 
@@ -83,6 +84,12 @@ function apply(ctx, config = {}) {
           'Then continue the work and include this addition. Do not repeat that line in the final answer.',
         ].join('\n');
         agent.steer({
+          // DSH stores the steered message verbatim and validates the session
+          // log on load: an event whose message has no `id`/`role` makes every
+          // later turn fail with "event at seq N lacks an identified message",
+          // and the whole topic dies until the log is repaired by hand.
+          id: randomUUID(),
+          role: 'user',
           content: [{ type: 'text', text: `${String(job.text ?? '')}${line}` }],
           source: { kind: 'tg-bridge' },
         });