dsh-tg-bridge 1.5.2 → 1.5.4

package/README.md

@@ -92,6 +92,15 @@ What `init` does:
 `init` flags: `--cwd <path>` (default `~/Projects`), `--voice` (enable
 voice transcription), `--dry-run` (show what would be written, change nothing).
 
+Optional provider settings live in `config.json`:
+
+| Key | Meaning |
+|---|---|
+| `providerKeys` | extra env var names to pass to a turn, read from `~/.dsh/.credentials.yaml`; default `[]` |
+| `pricesUrl` | public model page for `/prices`; default `""` uses models.dev only |
+| `vision.patch` | overlay for photo turns; default `""` (photos are text-only until set) |
+| `fallbackModels` | free-model fallbacks; default `[]` |
+
 Get your id from [@userinfobot](https://t.me/userinfobot), the token from
 [@BotFather](https://t.me/BotFather).
 
@@ -106,9 +115,11 @@ Three things without which the bot will stay silent in a group or work only half
 3. **Pin Messages** permission for the bot. Only needed to pin the first
    message of a topic; without it the bridge keeps working but will not pin.
 
-You do not need to set up the command menu by hand: the bridge installs it on start,
-in Russian, English and Chinese at once. The full settings table, permissions, checks and
-common errors are in [docs/TELEGRAM-SETUP.md](docs/TELEGRAM-SETUP.md).
+You do not need to set up the command menu by hand: `init` and `setup` install it
+in Russian, English and Chinese at once. The menu is not refreshed by a plain
+bridge restart, so after adding commands run `dsh-tg menu`. The full settings
+table, permissions, checks and common errors are in
+[docs/TELEGRAM-SETUP.md](docs/TELEGRAM-SETUP.md).
 
 **Autostart** is installed by the setup: `launchd` on macOS, `systemd --user` on
 Linux. On Windows `setup` registers the `DSH-TG-Bridge` task, which runs the
@@ -216,9 +227,9 @@ node ~/.dsh/tg-bridge/say.mjs --thought "checking why the watchdog fired twice"
 ```
 
 The note is appended to `~/.dsh/tg-bridge/thoughts/<chat>_<thread>.jsonl`; the progress
-message shows the last two as `💭` lines. Inside a turn the chat and thread come from
-`DSH_TG_CHAT` / `DSH_TG_THREAD`, so the command needs no ids. `--thought` never sends a
-Telegram message on its own.
+message shows the last two as `💭` lines. The command needs no ids: it falls back to the
+newest turn's thought file, because tool shells do not inherit the bridge environment.
+`--thought` never sends a Telegram message on its own.
 
 ### Goals and tasks
 

package/bridge.mjs

@@ -259,6 +259,30 @@ function readSecret(name) {
   return m ? m[1] : '';
 }
 
+/**
+ * Env vars for the provider keys this install needs.
+ *
+ * A headless turn inherits the bridge's environment, and the credentials
+ * service only resolves providers the app knows about. Extra providers are
+ * therefore declared per install in `config.json` as
+ * `"providerKeys": ["MY_PROVIDER_API_KEY"]`, and each name is read from
+ * `~/.dsh/.credentials.yaml` under the same name. Nothing is hardcoded: an
+ * install that runs on the app's own providers sets an empty list and gets
+ * exactly the inherited environment.
+ */
+function providerKeys(cfg) {
+  const out = {};
+  const names = Array.isArray(cfg.providerKeys) ? cfg.providerKeys : [];
+  for (const name of names) {
+    if (!/^[A-Z][A-Z0-9_]*$/.test(String(name))) continue;
+    try {
+      const value = readSecret(name) || (process.env[name] || '').trim();
+      if (value) out[name] = value;
+    } catch {}
+  }
+  return out;
+}
+
 /**
  * The bot token can be stored under three names: the plain one that `dsh-tg
  * init` writes, the suffixed one DSH generates when the secret is added through
@@ -740,13 +764,10 @@ function runTurn(task, sessionId, key = '', onEvent = null, extraArgs = [], cwd
         DSH_TG_CHAT: String(key).split(':')[0] || '',
         DSH_TG_THREAD: String(key).split(':')[1] || '0',
         ELECTRON_RUN_AS_NODE: '1',
-        UNOROUTER_API_KEY: readSecret('UNOROUTER_API_KEY'),
-        // Free fallback providers: their keys live next to the main one and are
-        // passed explicitly, because the credentials service only resolves the
-        // providers it knows about.
-        TAYNIK_API_KEY: readSecret('TAYNIK_API_KEY'),
-        NEURALDEEP_API_KEY: readSecret('NEURALDEEP_API_KEY'),
-        IKHDEV_PRO_API_KEY: readSecret('IKHDEV_PRO_API_KEY'),
+        // Provider keys the profile cannot resolve on its own. Configured per
+        // install (`providerKeys`, see config.example.json); a key listed in
+        // `~/.dsh/.credentials.yaml` is passed by its own name.
+        ...providerKeys(config),
       },
       windowsHide: true,
     });
@@ -1248,7 +1269,14 @@ ${t(lang, 'help.body')}`,
       seedTopic: ensureTopicSeed,
       prices: (filter) => {
         const route = modelOf(config.profile || 'headless');
-        return renderPrices(filter, { model: route.model, provider: route.provider, lang });
+        // A provider page is optional: without `pricesUrl` the answer comes from
+        // the public models.dev catalog, so no install is tied to one vendor.
+        return renderPrices(filter, {
+          model: route.model,
+          provider: route.provider,
+          pageUrl: config.pricesUrl || '',
+          lang,
+        });
       },
       reply: (out) => send(chatId, out, threadId),
       stopTurn: (k) => {

package/cli.mjs

@@ -37,15 +37,19 @@ const RUNTIME_FILES = [
  */
 function syncRuntime() {
   if (resolve(DIR) === resolve(RUNTIME)) return;
-  mkdirSync(join(RUNTIME, 'patches'), { recursive: true });
   for (const file of RUNTIME_FILES) {
     if (existsSync(join(DIR, file))) copyFileSync(join(DIR, file), join(RUNTIME, file));
   }
-  try {
-    for (const patch of readdirSync(join(DIR, 'patches'))) {
-      copyFileSync(join(DIR, 'patches', patch), join(RUNTIME, 'patches', patch));
-    }
-  } catch {}
+  // Model overlays ship in `patches/` of the package. A checkout without that
+  // directory is valid: fallbacks and vision are then simply not configured.
+  if (existsSync(join(DIR, 'patches'))) {
+    mkdirSync(join(RUNTIME, 'patches'), { recursive: true });
+    try {
+      for (const patch of readdirSync(join(DIR, 'patches'))) {
+        copyFileSync(join(DIR, 'patches', patch), join(RUNTIME, 'patches', patch));
+      }
+    } catch {}
+  }
   console.log(`  код: скопирован из ${DIR} в ${RUNTIME}`);
 }
 
@@ -146,7 +150,9 @@ function writeConfig({ userId, cwd, voice }, dryRun) {
     // 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') },
+    // Vision is opt-in: without a patch the bridge logs that photos cannot be
+    // read instead of forcing one provider's model onto every install.
+    vision: { ...example.vision, patch: example.vision?.patch ? join(RUNTIME, 'patches', 'vision.yml') : '' },
   };
   delete config._comment;
   if (dryRun) {

package/config.example.json

@@ -3,6 +3,8 @@
   "allowedUserIds": [],
   "profile": "headless",
   "cwd": "",
+  "providerKeys": [],
+  "pricesUrl": "",
   "turnIdleMs": 120000,
   "turnTimeoutMs": 0,
   "busyNoticeMs": 45000,
@@ -12,23 +14,7 @@
   "pinTopicSeed": true,
   "plainText": false,
   "servers": {},
-  "fallbackModels": [
-    {
-      "model": "glm-5.3-flash:free",
-      "patch": "./patches/model-glm-5.3-flash_free.yml",
-      "free": true
-    },
-    {
-      "model": "deepseek-v4.1-flash:free",
-      "patch": "./patches/model-deepseek-v4.1-flash_free.yml",
-      "free": true
-    },
-    {
-      "model": "kimi-k3:free",
-      "patch": "./patches/model-kimi-k3_free.yml",
-      "free": true
-    }
-  ],
+  "fallbackModels": [],
   "voice": {
     "enabled": false,
     "python": "",
@@ -41,7 +27,7 @@
     "echo": true
   },
   "vision": {
-    "patch": "./patches/vision.yml",
-    "model": "gemini-3.8-flash"
+    "patch": "",
+    "model": ""
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tg-bridge",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Telegram bridge for DeepSeek Harness: text, voice, photos and project-per-topic sessions without opening the desktop app",
   "type": "module",
   "main": "plugin-bridge.mjs",
@@ -58,8 +58,7 @@
     "README.md",
     "LICENSE",
     "config.example.json",
-    "patches/",
-    "queue-notice.mjs",
+        "queue-notice.mjs",
     "immediate.mjs",
     "say.mjs",
     "steer-queue.mjs",

package/prices.mjs

@@ -1,12 +1,10 @@
-// prices.mjs — unorouter model prices without the metrics plugin.
+// prices.mjs — model prices without a provider-specific plugin.
 //
-// The plugin `dsh-unorouter-metrics` never mounted, so `/prices` had nothing to
-// read. This module fetches the public models page directly, parses the table
-// and renders a short answer: what the current route costs, and the cheapest
-// models that still fit the context floor. Fallback is models.dev, which has
-// no uptime data but is stable JSON.
+// `/prices` reads the public models.dev catalog by default. An install that
+// wants live prices from its own provider can point `pricesUrl` at that
+// provider's public model page; the parser is generic, so no vendor is baked
+// into the code.
 
-const MODELS_PAGE = 'https://unorouter.com/en/models';
 const MODELS_DEV = 'https://models.dev/api.json';
 const UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36';
 
@@ -128,7 +126,7 @@ const WORDS = {
 
 /**
  * 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
+ * `gpt-4o`, `vendor/gpt-4o:free`), so exact match first, then the shortest
  * id that contains the wanted token.
  */
 export function findModel(models, wanted) {
@@ -142,31 +140,33 @@ export function findModel(models, wanted) {
 }
 
 /**
- * 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.
+ * Render `/prices [filter]` from the public market catalog, plus an optional
+ * provider page configured as `pricesUrl`. Neither source is required: if one
+ * is down the other still answers, and with no `pricesUrl` only models.dev is
+ * queried.
  * @param {string} filter optional text to match model ids
- * @param {{ model?: string, provider?: string, lang?: string }} options
+ * @param {{ model?: string, provider?: string, pageUrl?: 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),
-  ]);
+  const pageUrl = String(options.pageUrl || '').trim();
+  const jobs = [fetchText(MODELS_DEV, 30000)];
+  if (pageUrl) jobs.unshift(fetchText(pageUrl));
+  const results = await Promise.allSettled(jobs);
+  const page = pageUrl ? results[0] : null;
+  const dev = pageUrl ? results[1] : results[0];
 
   let models = [];
   const sources = [];
-  if (page.status === 'fulfilled') {
+  if (page?.status === 'fulfilled') {
     const parsed = parseModelsPage(page.value);
     if (parsed.length > 0) {
       models.push(...parsed);
-      sources.push('unorouter');
+      try { sources.push(new URL(pageUrl).hostname.replace(/^www\./i, '')); } catch { sources.push('provider'); }
     }
   }
-  if (dev.status === 'fulfilled') {
+  if (dev?.status === 'fulfilled') {
     try {
       const parsed = parseModelsDev(JSON.parse(dev.value));
       if (parsed.length > 0) {
@@ -176,9 +176,9 @@ export async function renderPrices(filter = '', options = {}) {
     } catch {}
   }
   if (models.length === 0) {
-    const reason = dev.status === 'rejected'
+    const reason = dev?.status === 'rejected'
       ? dev.reason?.message
-      : page.status === 'rejected'
+      : page?.status === 'rejected'
         ? page.reason?.message
         : 'catalogs parsed to 0 models';
     return `${words.fail}: ${reason}`;

package/say.mjs

@@ -7,14 +7,14 @@
 //
 //   node say.mjs --steer <job-id> "text"
 //   node say.mjs --chat <chat-id> [--thread <id>] "text"
-//   node say.mjs --thought "short note"   (chat/thread come from DSH_TG_CHAT/DSH_TG_THREAD)
+//   node say.mjs --thought "short note"   (no ids needed)
 //
 // `--thought` does not send a message: it appends to the turn's thought file,
 // and the live progress message shows the last two notes as 💭 lines.
 //
 // With `--steer` the chat/thread come from the job file and an ack marker is
 // written, which suppresses the bridge's fallback line.
-import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 
@@ -63,6 +63,21 @@ function parse(argv) {
   return out;
 }
 
+function activeThoughtFile() {
+  try {
+    const files = readdirSync(THOUGHTS)
+      .filter((name) => name.endsWith('.jsonl'))
+      .map((name) => ({ name, mtime: statSync(join(THOUGHTS, name)).mtimeMs }))
+      .sort((a, b) => b.mtime - a.mtime);
+    if (!files.length) return null;
+    const [chat, thread] = files[0].name.replace(/\.jsonl$/, '').split('_');
+    if (!Number(chat)) return null;
+    return { chatId: Number(chat), threadId: Number(thread) || 0 };
+  } catch {
+    return null;
+  }
+}
+
 async function main() {
   const args = parse(process.argv.slice(2));
   if (!args.text) usage();
@@ -70,6 +85,15 @@ async function main() {
   let chatId = args.chatId || Number(process.env.DSH_TG_CHAT || 0);
   let threadId = args.threadId || Number(process.env.DSH_TG_THREAD || 0);
   let jobPath = '';
+  // Tool shells do not inherit the bridge's env, so fall back to the thought
+  // file the bridge touched at the start of the newest turn.
+  if (!chatId && args.thought) {
+    const active = activeThoughtFile();
+    if (active) {
+      chatId = active.chatId;
+      threadId = active.threadId;
+    }
+  }
   if (args.steer) {
     const found = jobOf(args.steer);
     if (!found) {

package/patches/model-deepseek-v4.1-flash_free.yml

@@ -1,4 +0,0 @@
-- id: agent-default-model
-  config:
-    provider: unorouter
-    model: deepseek-v4.1-flash:free

package/patches/model-glm-5.3-flash_free.yml

@@ -1,4 +0,0 @@
-- id: agent-default-model
-  config:
-    provider: unorouter
-    model: glm-5.3-flash:free

package/patches/model-kimi-k3_free.yml

@@ -1,4 +0,0 @@
-- id: agent-default-model
-  config:
-    provider: unorouter
-    model: kimi-k3:free

package/patches/vision.yml

@@ -1,10 +0,0 @@
-# Vision overlay for photo turns.
-#
-# The default headless route (deepseek-v4.1-flash-1017) declares no image input,
-# so `read_image` fails with "model does not declare image input". This overlay
-# is applied ONLY to turns that carry a picture: it points the agent at a
-# vision-capable model from the same provider, leaving text turns untouched.
-- id: agent-default-model
-  config:
-    provider: unorouter
-    model: gemini-3.8-flash