dsh-tg-bridge 1.3.3 → 1.3.5

package/bridge-kick.mjs

@@ -8,7 +8,7 @@
 //
 // Exit codes: 0 = nothing to do or started, 2 = start failed.
 
-import { spawnSync } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
 import { appendFileSync, existsSync, readFileSync, openSync, closeSync, unlinkSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
@@ -21,25 +21,48 @@ const KICK_LOG = join(DIR, 'kick.log');
 
 // Shared with setup.mjs: a restart holds this lock, so a tick that lands in the
 // middle of one must not start a second poller.
+//
+// A live holder used to disable supervision forever: the old code started the
+// bridge with spawnSync(), which blocks until the child EXITS — for a long-lived
+// bridge the tick never returned, kept this lock for hours, and every later tick
+// logged "restart in progress" and skipped (2026-10-24: supervisor dead from
+// 18:57 while the bridge lived). Two fixes: spawn() + unref() below, and
+// LOCK_MAX_AGE_MS here so even a genuinely wedged holder cannot wedge the guard.
 const LOCK = join(DIR, 'restart.lock');
+const LOCK_MAX_AGE_MS = 180_000;
+
 function acquireLock(owner) {
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
       const fd = openSync(LOCK, 'wx');
       writeFileSync(fd, JSON.stringify({ pid: process.pid, owner, ts: Date.now() }));
       closeSync(fd);
-      const release = () => { try { unlinkSync(LOCK); } catch {} };
+      // Remove only our own lock: after a stale-lock takeover the file belongs
+      // to the new holder, and a late exit must not steal it.
+      const release = () => {
+        try {
+          if (Number(JSON.parse(readFileSync(LOCK, 'utf8')).pid) === process.pid) unlinkSync(LOCK);
+        } catch {}
+      };
       process.on('exit', release);
       return release;
     } catch (error) {
       if (error.code !== 'EEXIST') return null;
       let held = 0;
-      try { held = Number(JSON.parse(readFileSync(LOCK, 'utf8')).pid) || 0; } catch {}
+      let heldTs = 0;
+      try {
+        const info = JSON.parse(readFileSync(LOCK, 'utf8'));
+        held = Number(info.pid) || 0;
+        heldTs = Number(info.ts) || 0;
+      } catch {}
+      const age = heldTs ? Date.now() - heldTs : Number.POSITIVE_INFINITY;
       let alive = false;
       if (held) {
         try { process.kill(held, 0); alive = true; } catch (e) { alive = e.code === 'EPERM'; }
       }
-      if (alive) return null;
+      // Age wins over liveness: a holder that has not finished a restart in
+      // LOCK_MAX_AGE_MS is wedged, not busy.
+      if (alive && age < LOCK_MAX_AGE_MS) return null;
       try { unlinkSync(LOCK); } catch {}
     }
   }
@@ -93,25 +116,37 @@ function main() {
   const restartPending = existsSync(marker);
 
   const filePid = pidFromFile();
+  // Cheap path first: a live pid file is authoritative for a healthy bridge, so
+  // the minute tick costs one kill(0) instead of a PowerShell process scan.
+  if (filePid && alive(filePid)) {
+    if (restartPending) log(`marker present but pid ${filePid} alive`);
+    return 0;
+  }
+  // Only when the pid file is stale or missing: scan for a bridge that started
+  // without writing one.
   const live = bridgePids();
-  if (live.length > 0 || (filePid && alive(filePid))) {
-    if (restartPending && live.length === 0) log(`marker present but pid ${filePid} alive`);
+  if (live.length > 0) {
+    log(`pid file stale (${filePid || 'missing'}), bridge ${live.join(',')} alive — not starting`);
     return 0;
   }
 
   log(restartPending ? 'marker present and no bridge: starting' : 'no bridge: starting');
-  const child = spawnSync(process.execPath, ['--dns-result-order=ipv4first', BRIDGE], {
-    cwd: DIR,
-    detached: true,
-    stdio: 'ignore',
-    windowsHide: true,
-  });
-  if (child.error) {
-    log(`start failed: ${child.error.message}`);
+  // spawn(), NOT spawnSync(): spawnSync waits for the child to exit, and this
+  // child is meant to outlive the tick.
+  let child;
+  try {
+    child = spawn(process.execPath, ['--dns-result-order=ipv4first', BRIDGE], {
+      cwd: DIR,
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: true,
+    });
+  } catch (error) {
+    log(`start failed: ${error.message}`);
     return 2;
   }
-  try { readFileSync; } catch {}
-  log('start issued');
+  child.unref();
+  log(`start issued pid=${child.pid ?? '?'}`);
   return 0;
 }
 

package/bridge.mjs

@@ -11,7 +11,7 @@ import {
   readdirSync, statSync, openSync, fsyncSync, closeSync, renameSync, writeFileSync as writeFd,
 } from 'node:fs';
 import { homedir } from 'node:os';
-import { join, basename } from 'node:path';
+import { join, basename, isAbsolute } 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
@@ -25,7 +25,7 @@ net.setDefaultAutoSelectFamily(false);
 import { noticeIsObsolete } from './queue-notice.mjs';
 import { immediateKind } from './immediate.mjs';
 import { writeSteerJob } from './steer-queue.mjs';
-import { handleControl, CONTROL_COMMANDS } from './control.mjs';
+import { handleControl, CONTROL_COMMANDS, modelOf } from './control.mjs';
 import { renderPrices } from './prices.mjs';
 import { t, resolveLang } from './i18n.mjs';
 
@@ -109,6 +109,11 @@ const turnStartedAt = new Map();
 try {
   Object.assign(config, JSON.parse(readFileSync(join(DIR, 'config.json'), 'utf8')));
 } catch {}
+// Old installs wrote these paths relative to the bridge directory, but turns
+// run from the project cwd, where "./transcribe.py" does not exist. Resolve
+// once at load so voice and vision work regardless of the topic's directory.
+if (config.voice?.script && !isAbsolute(config.voice.script)) config.voice.script = join(DIR, config.voice.script);
+if (config.vision?.patch && !isAbsolute(config.vision.patch)) config.vision.patch = join(DIR, config.vision.patch);
 
 const state = (() => {
   if (!existsSync(STATE)) return { offset: 0, sessions: {} };
@@ -1190,7 +1195,10 @@ ${t(lang, 'help.body')}`,
       api: tg,
       sendFile: (p, caption = '') => sendFile(chatId, threadId, p, caption),
       seedTopic: ensureTopicSeed,
-      prices: (filter) => renderPrices(filter, { model: (config.vision && config.vision.model) || 'deepseek-v4.1-flash-1017' }),
+      prices: (filter) => {
+        const route = modelOf(config.profile || 'headless');
+        return renderPrices(filter, { model: route.model, provider: route.provider, lang });
+      },
       reply: (out) => send(chatId, out, threadId),
       stopTurn: (k) => {
         const child = activeTurns.get(k);
@@ -1228,7 +1236,7 @@ ${t(lang, 'help.body')}`,
   // Turn telemetry for the log: what the agent did, how much it cost, on which
   // model. Without it /logs shows only "in" and "sent" — useless when asking
   // "why did this take 9 minutes".
-  const telemetry = { steps: 0, tools: 0, inputTokens: 0, cacheReadTokens: 0, model: config.primaryModel || 'deepseek-v4.1-flash-1017' };
+  const telemetry = { steps: 0, tools: 0, inputTokens: 0, cacheReadTokens: 0, model: modelOf(config.profile || 'headless').model };
   const onEvent = (event) => {
     try {
       // The id of the session this process actually works in. A new topic has

package/cli.mjs

@@ -143,7 +143,10 @@ function writeConfig({ userId, cwd, voice }, dryRun) {
     ...example,
     allowedUserIds: [Number(userId)],
     cwd,
-    voice: { ...example.voice, enabled: Boolean(voice) },
+    // Turns run from the user's project directory, so these must be absolute:
+    // a relative "./transcribe.py" silently disables voice and vision.
+    voice: { ...example.voice, enabled: Boolean(voice), script: join(RUNTIME, 'transcribe.py') },
+    vision: { ...example.vision, patch: join(RUNTIME, 'patches', 'vision.yml') },
   };
   delete config._comment;
   if (dryRun) {

package/control.mjs

@@ -17,6 +17,7 @@ const PROFILES = join(DSH_HOME, 'profiles');
 const APP = join(process.env.LOCALAPPDATA || '', 'Programs', 'DeepSeek Harness');
 const EXE = join(APP, 'DeepSeek Harness.exe');
 const DSH_CMD = join(APP, 'resources', 'runtime', 'cli', 'bin', 'dsh.cmd');
+const CLI_JS = join(APP, 'resources', 'app.asar', 'dsh', 'node_modules', '@deepseek-ai', 'dsh-desktop-host', 'lib', 'cli.js');
 
 /** Live DSH app PIDs (empty when the app is not running). */
 function listPids() {
@@ -204,10 +205,16 @@ function removeBundle(profile, name) {
 /** Run `dsh plugin ...` (which forwards to pnpm) and collect its output. */
 function dshPlugin(profile, args, timeoutMs = 180000) {
   return new Promise((resolve) => {
-    const child = spawn(DSH_CMD, ['plugin', '--profile', profile, ...args], {
-      windowsHide: true,
-      shell: false,
-    });
+    // Spawning the .cmd shim with shell:false fails with EINVAL on modern Node.
+    // Run the real CLI entry through the Electron binary instead, like the
+    // bridge does for turns; fall back to a plain `dsh` on other platforms.
+    const useExe = process.platform === 'win32' && existsSync(EXE) && existsSync(join(APP, 'resources', 'app.asar'));
+    const child = useExe
+      ? spawn(EXE, ['--expose-internals', CLI_JS, 'plugin', '--profile', profile, ...args], {
+          windowsHide: true,
+          env: { ...process.env, ELECTRON_RUN_AS_NODE: '1' },
+        })
+      : spawn('dsh', ['plugin', '--profile', profile, ...args], { windowsHide: true });
     let out = '';
     const timer = setTimeout(() => child.kill(), timeoutMs);
     child.stdout.setEncoding('utf8');
@@ -350,7 +357,7 @@ export const CONTROL_COMMANDS = [
 ];
 
 export async function handleControl(ctx) {
-  const { command, arg, send, reply, log, profile, state, key, config } = ctx;
+  const { command, arg, send, reply, log, profile, state, key, config, lang } = ctx;
   const say = (text) => reply(text);
 
   // One command for one job: `/plugins` is both the list and the way to change
@@ -369,30 +376,37 @@ export async function handleControl(ctx) {
 
   switch (effective) {
     case '/status': {
-      const head = modelOf('headless');
-      const desk = modelOf('desktop');
-      const deskPlugins = pluginsOf('desktop');
+      const activeProfile = config.profile || 'headless';
+      const head = modelOf(activeProfile);
       const session = state.sessions[key] || '(ещё нет)';
       const active = ctx.activeTurns ? ctx.activeTurns.size : 0;
-      say(
-        [
-          `Голова: ${config.profile} (${head.provider}/${head.model})`,
-          `UI: desktop (${desk.provider}/${desk.model}) — плагинов ${deskPlugins.bundles.length}, отключено ${deskPlugins.disabled.length}`,
-          `Ветка: ${ctx.threadId || 'общая'}`,
-          `Сессия: ${session}`,
-          `Ходов в работе: ${active}`,
-          `Плагины: ${deskPlugins.bundles.length} | скиллы: ${skillsOf().length}`,
-          `DSH_HOME: ${DSH_HOME}`,
-        ].join('\n'),
-      );
+      const lines = [
+        `Профиль: ${activeProfile} (${head.provider}/${head.model})`,
+        `Ветка: ${ctx.threadId || 'общая'}`,
+        `Сессия: ${session}`,
+        `Ходов в работе: ${active}`,
+        `Скиллы: ${skillsOf().length}`,
+        `DSH_HOME: ${DSH_HOME}`,
+      ];
+      // The desktop profile only matters when this install actually has one.
+      if (existsSync(join(PROFILES, 'desktop', 'cordis.patch.yml'))) {
+        const desk = modelOf('desktop');
+        const deskPlugins = pluginsOf('desktop');
+        lines.splice(1, 0, `UI: desktop (${desk.provider}/${desk.model}) — плагинов ${deskPlugins.bundles.length}`);
+      }
+      say(lines.join('\n'));
       return true;
     }
 
     case '/models': {
-      const head = modelOf('headless');
-      const ids = modelsOf('headless');
+      const activeProfile = config.profile || 'headless';
+      const head = modelOf(activeProfile);
+      const ids = modelsOf(activeProfile);
       say(
-        [`Модель сейчас: ${head.model}`, 'Доступные:', ...ids.map((id) => `  ${id === head.model ? '*' : ' '} ${id}`)].join('\n'),
+        [
+          ids.length > 0 ? `Модель сейчас: ${head.model}` : `В профиле ${activeProfile} нет списка моделей`,
+          ...(ids.length > 0 ? ['Доступные:', ...ids.map((id) => `  ${id === head.model ? '*' : ' '} ${id}`)] : []),
+        ].join('\n'),
       );
       return true;
     }
@@ -403,18 +417,19 @@ export async function handleControl(ctx) {
         say('Использование: /model <id> [both]  (/models — список)');
         return true;
       }
-      if (!setModel('headless', wanted)) {
-        say(`Неизвестная модель «${wanted}». /models — список.`);
+      const activeProfile = config.profile || 'headless';
+      if (!setModel(activeProfile, wanted)) {
+        say(`Не смог переключить ${activeProfile} на «${wanted}»: в профиле нет строки agent-default-model. /models — список.`);
         return true;
       }
       const desktop = scope === 'both' ? setModel('desktop', wanted) : false;
-      say(`Модель headless → ${wanted}${desktop ? ', desktop → ' + wanted : ''}. Действует со следующего хода.`);
+      say(`Модель ${activeProfile} → ${wanted}${desktop ? ', desktop → ' + wanted : ''}. Действует со следующего хода.`);
       return true;
     }
 
     case '/sessions': {
       const limit = Number.parseInt(arg, 10) > 0 ? Math.min(Number.parseInt(arg, 10), 20) : 8;
-      const rows = recentSessions(config.cwd, limit);
+      const rows = recentSessions((state.cwd && state.cwd[key]) || config.cwd, limit);
       if (rows.length === 0) {
         say('Сессий не нашёл.');
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tg-bridge",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "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/prices.mjs

@@ -99,49 +99,121 @@ function usd(value) {
   return `$${value < 0.01 ? value.toFixed(4) : value.toFixed(2)}`;
 }
 
+const WORDS = {
+  en: {
+    prices: 'Prices',
+    now: 'Current',
+    cheap: 'Cheapest with context >= 128k:',
+    none: 'No models matched the filter.',
+    fail: 'Could not fetch prices',
+    unknown: 'not found in the catalog',
+  },
+  ru: {
+    prices: 'Цены',
+    now: 'Сейчас',
+    cheap: 'Дешёвые модели с контекстом ≥128k:',
+    none: 'Ничего не нашлось по фильтру.',
+    fail: 'Не смог получить цены',
+    unknown: 'в каталоге не найден',
+  },
+  zh: {
+    prices: '价格',
+    now: '当前',
+    cheap: '上下文 ≥128k 的最便宜模型：',
+    none: '没有符合筛选条件的模型。',
+    fail: '无法获取价格',
+    unknown: '目录中未找到',
+  },
+};
+
 /**
- * Render `/prices [filter]`.
+ * Find a model by id. Providers prefix ids differently (`openai/gpt-4o`,
+ * `gpt-4o`, `unorouter/gpt-4o:free`), so exact match first, then the shortest
+ * id that contains the wanted token.
+ */
+export function findModel(models, wanted) {
+  const needle = String(wanted ?? '').trim().toLowerCase();
+  if (!needle) return null;
+  const exact = models.find((model) => model.id.toLowerCase() === needle);
+  if (exact) return exact;
+  const matches = models.filter((model) => model.id.toLowerCase().includes(needle));
+  matches.sort((a, b) => a.id.length - b.id.length);
+  return matches[0] || null;
+}
+
+/**
+ * Render `/prices [filter]` from every catalog we can reach, so the answer does
+ * not depend on one provider: the unorouter page carries live prices for its
+ * own routes, models.dev covers the rest of the market. Both are merged; the
+ * current model is looked up in the merged list.
  * @param {string} filter optional text to match model ids
- * @param {{ model?: string }} options current route, for a "you are here" line
+ * @param {{ model?: string, provider?: string, lang?: string }} options
  */
 export async function renderPrices(filter = '', options = {}) {
+  const lang = WORDS[options.lang] ? options.lang : 'en';
+  const words = WORDS[lang];
+  const [page, dev] = await Promise.allSettled([
+    fetchText(MODELS_PAGE),
+    fetchText(MODELS_DEV, 30000),
+  ]);
+
   let models = [];
-  let source = '';
-  try {
-    models = parseModelsPage(await fetchText(MODELS_PAGE));
-    source = 'unorouter';
-  } catch (error) {
-    models = [];
+  const sources = [];
+  if (page.status === 'fulfilled') {
+    const parsed = parseModelsPage(page.value);
+    if (parsed.length > 0) {
+      models.push(...parsed);
+      sources.push('unorouter');
+    }
   }
-  if (models.length === 0) {
+  if (dev.status === 'fulfilled') {
     try {
-      models = parseModelsDev(JSON.parse(await fetchText(MODELS_DEV, 30000)));
-      source = 'models.dev (страница unorouter недоступна)';
-    } catch (error) {
-      return `Не смог получить цены ни со страницы unorouter, ни с models.dev: ${error.message}`;
-    }
+      const parsed = parseModelsDev(JSON.parse(dev.value));
+      if (parsed.length > 0) {
+        models.push(...parsed);
+        sources.push('models.dev');
+      }
+    } catch {}
+  }
+  if (models.length === 0) {
+    const reason = dev.status === 'rejected'
+      ? dev.reason?.message
+      : page.status === 'rejected'
+        ? page.reason?.message
+        : 'catalogs parsed to 0 models';
+    return `${words.fail}: ${reason}`;
   }
 
+  // The live page wins on duplicate ids; models.dev fills the rest.
+  const seen = new Set();
+  models = models.filter((model) => {
+    const id = model.id.toLowerCase();
+    if (seen.has(id)) return false;
+    seen.add(id);
+    return true;
+  });
+
   const wanted = String(filter ?? '').trim().toLowerCase();
-  let rows = models.filter((m) => (m.context ?? 0) >= 128000 || m.context === null);
+  let rows = models.filter((m) => ((m.context ?? 0) >= 128000 || m.context === null) && m.inputPrice > 0);
   if (wanted) rows = rows.filter((m) => m.id.toLowerCase().includes(wanted));
   rows.sort((a, b) => a.inputPrice - b.inputPrice);
 
-  const lines = [`Цены: ${source}`, ''];
-  if (options.model) {
-    const current = models.find((m) => m.id.toLowerCase().includes(String(options.model).toLowerCase()));
+  const lines = [`${words.prices}: ${sources.join(' + ')}`, ''];
+  if (options.model && options.model !== '?') {
+    const current = findModel(models, options.model);
+    const name = options.provider ? `${options.provider}/${options.model}` : options.model;
     lines.push(
       current
-        ? `Сейчас: ${options.model} — вход ${usd(current.inputPrice)}, выход ${usd(current.outputPrice)} за 1M`
-        : `Сейчас: ${options.model} (в каталоге не найден)`,
+        ? `${words.now}: ${name} — ${usd(current.inputPrice)} / ${usd(current.outputPrice)} per 1M`
+        : `${words.now}: ${name} (${words.unknown})`,
       ''
     );
   }
-  lines.push('Дешёвые модели с контекстом ≥128k:');
+  lines.push(words.cheap);
   for (const model of rows.slice(0, 12)) {
     const context = model.context ? `${Math.round(model.context / 1000)}k` : '?';
     lines.push(`• ${model.id} — ${usd(model.inputPrice)} / ${usd(model.outputPrice)} · ${context}`);
   }
-  if (rows.length === 0) lines.push('Ничего не нашлось по фильтру.');
+  if (rows.length === 0) lines.push(words.none);
   return lines.join('\n');
 }

package/setup.mjs

@@ -286,11 +286,30 @@ async function main() {
   if (recentConflict) fail('a stale poller still owns getUpdates (409 in the last 90s) — kill it, then re-run setup');
   else ok('no 409 conflicts in the last 90s');
 
+  // 4. Scheduled task: point it at the GUARDED HIDDEN launcher (wscript + bridge-kick).
+  //    Two reasons it must be the guarded supervisor and not a direct node.exe start:
+  //    (a) a console action on an Interactive-logon task pops a window at every logon
+  //        and repetition — wscript with window style 0 never shows one;
+  //    (b) starting bridge.mjs directly here races the one-minute tick: both see "no
+  //        bridge" and both start a poller (409 getUpdates Conflict). Going through
+  //        bridge-kick.mjs means every start happens under restart.lock after a check.
+  const vbsPath = join(BRIDGE_DIR, 'bridge-kick-hidden.vbs');
+  writeFileSync(
+    vbsPath,
+    [
+      "' hidden launcher: DSH bridge supervisor tick (no console window)",
+      'Set sh = CreateObject("WScript.Shell")',
+      `sh.CurrentDirectory = "${BRIDGE_DIR}"`,
+      `rc = sh.Run("""${NODE}"" ""${join(BRIDGE_DIR, 'bridge-kick.mjs')}""", 0, True)`,
+      'WScript.Quit rc',
+      '',
+    ].join('\r\n'),
+  );
   const task = run('powershell', [
     '-NoProfile', '-NonInteractive', '-Command',
-    `$a = New-ScheduledTaskAction -Execute '${NODE}' -Argument '"--dns-result-order=ipv4first" "${BRIDGE}"' -WorkingDirectory '${BRIDGE_DIR}'; Set-ScheduledTask -TaskName 'DSH-TG-Bridge' -Action $a | Out-Null; 'ok'`,
+    `$a = New-ScheduledTaskAction -Execute 'C:\\Windows\\System32\\wscript.exe' -Argument '//B //Nologo "${vbsPath}"'; Set-ScheduledTask -TaskName 'DSH-TG-Bridge' -Action $a | Out-Null; 'ok'`,
   ]);
-  if ((task.stdout || '').includes('ok')) ok('scheduled task DSH-TG-Bridge now uses the same flags');
+  if ((task.stdout || '').includes('ok')) ok('scheduled task DSH-TG-Bridge now runs the guarded hidden supervisor');
   else warn(`scheduled task not updated: ${(task.stderr || '').trim().slice(0, 160)}`);
 
   // 5. Bot menu.