@mikitasazan/notify 1.23.0 → 1.25.0

package/README.md

@@ -200,7 +200,7 @@ notify report --project playhub --json < payload.json   # весь объект
 - Автосоздания темы при первой отправке — сбой мог бы наплодить дублей;
   создание — явная команда `notify setup`.
 - Любых зависимостей, сборки, MarkdownV2, мультиязычности, троттла (троттл —
-  забота вызывающего кода, он есть в `zabukai/web/src/server/alert.ts` и там
+  забота вызывающего кода, он есть в `Zabukai/app/web/src/server/alert.ts` и там
   и остаётся: работает только внутри долгоживущего процесса, а CLI стартует
   заново на каждый вызов).
 

package/dist/cli.js

@@ -13,11 +13,11 @@
  *   notify deploy   --project playhub --status ok --commit "msg" [--commit-url "..."] --url "..."
  *   notify job      --project playhub --job "Game import" --status ok --stat "added=5" [--via vps] [--took "4m 12s"]
  *   notify report   --project playhub --title "Daily summary" --line "Games=1284"
- *   notify ci       --project zabukai  --status fail --branch master
- *   notify pr       --project zabukai  --action opened --number 142 --title "..."
- *   notify incident --project zabukai  --title "Redis is unreachable" --detail "$ERR"
+ *   notify ci       --project zabukai-app  --status fail --branch master
+ *   notify pr       --project zabukai-app  --action opened --number 142 --title "..."
+ *   notify incident --project zabukai-app  --title "Redis is unreachable" --detail "$ERR"
  *   notify session  --project mac-config --action "burning the limit"   # DEPRECATED alias of incident
- *   notify file     --project zabukai  --title "Full dialogues" --path ./out.txt [--filename name.txt]
+ *   notify file     --project zabukai-app  --title "Full dialogues" --path ./out.txt [--filename name.txt]
  *   notify <type> [--key stable-key]   # the task's key on the card's last line
  *   notify <type> --json < payload.json   # the whole event object on stdin
  *   notify setup <forum chat_id> <project key>   # create the tabs, see setup.ts

package/dist/events.d.ts

@@ -10,7 +10,7 @@
  *   - required fields are never added — only a new event type.
  * That keeps old caller code and a new package compatible both ways.
  */
-export type Project = 'playhub' | 'one-q' | 'zabukai' | 'game-publisher' | 'vault' | 'mac-config' | 'alitools' | 'htmlg' | '2roles' | 'market-lens';
+export type Project = 'playhub' | 'one-q' | 'zabukai-app' | 'zabukai-site' | 'game-publisher' | 'vault' | 'mac-config' | 'alitools' | 'htmlg' | '2roles' | 'market-lens';
 /**
  * The name of a project — THE NAME ITS REPOSITORY CARRIES, character for
  * character. One project, one name, everywhere: the repository, the folder on
@@ -27,6 +27,12 @@ export type Project = 'playhub' | 'one-q' | 'zabukai' | 'game-publisher' | 'vaul
  * Do not restore a prettified name here. To change how a project is written,
  * rename the REPOSITORY first, then bring this table and the chat title to it.
  *
+ * A product built from SEVERAL repositories gets one row per repository, not
+ * one row for the product: `zabukai-app` and `zabukai-site` are two rows that
+ * share one chat. The product's own name lives in `title` on their ROUTES
+ * rows, because that is the only place a name belongs to a chat rather than
+ * to a repository.
+ *
  * `cap()` guessed a name by capitalizing the key, which is how `htmlg` showed
  * up as «Htmlg»; this table exists so nothing guesses.
  *

package/dist/events.js

@@ -26,6 +26,12 @@
  * Do not restore a prettified name here. To change how a project is written,
  * rename the REPOSITORY first, then bring this table and the chat title to it.
  *
+ * A product built from SEVERAL repositories gets one row per repository, not
+ * one row for the product: `zabukai-app` and `zabukai-site` are two rows that
+ * share one chat. The product's own name lives in `title` on their ROUTES
+ * rows, because that is the only place a name belongs to a chat rather than
+ * to a repository.
+ *
  * `cap()` guessed a name by capitalizing the key, which is how `htmlg` showed
  * up as «Htmlg»; this table exists so nothing guesses.
  *
@@ -35,7 +41,8 @@
 export const DISPLAY = {
     playhub: 'playhub',
     'one-q': 'one-q',
-    zabukai: 'zabukai',
+    'zabukai-app': 'zabukai-app',
+    'zabukai-site': 'zabukai-site',
     'game-publisher': 'game-publisher',
     vault: 'vault',
     'mac-config': 'mac-config',

package/dist/routes.d.ts

@@ -4,12 +4,12 @@
  * the projects themselves.
  *
  * The scheme: ONE CHAT PER PROJECT. A project with a team is a forum
- * supergroup with an "⚙️ Ops" tab (robot notifications) and a "💬 Dev" tab
- * (people's live chat). A project the owner runs alone is a plain
- * supergroup without topics — the robots post straight into it and there
- * is nobody to talk to in a Dev tab (owner's rule of 2026-09-05; the first
- * such chat is `htmlg`). A plain chat has no `ops` number: the message
- * goes to the chat itself.
+ * supergroup with an "Ops" tab (robot notifications, native 🤖 topic icon)
+ * and a "Dev" tab (people's live chat, 💬). A project the owner runs alone
+ * is a plain supergroup without topics — the robots post straight into it
+ * and there is nobody to talk to in a Dev tab (owner's rule of 2026-09-05;
+ * the first such chat is `htmlg`). A plain chat has no `ops` number: the
+ * message goes to the chat itself.
  *
  * Why not one shared forum with a topic per project — that was the first
  * version, and it turned out to be a mistake: Telegram cannot hide one
@@ -30,6 +30,15 @@ import type { NotifyEvent, Project } from './events.ts';
 type Forum = {
     /** The id of the project's supergroup (forum or plain). */
     chat: string;
+    /**
+     * The chat's own title, wherever it cannot be derived from the project key:
+     * a product of several repositories (every row sharing that chat carries
+     * the same `title`), and a team forum whose product name is prettier than
+     * its repository key (owner's rule of 2026-09-10: a FORUM wears the
+     * product's own name; a solo chat wears the repository's). Left out
+     * everywhere else, where `chatTitle()` derives the name from the project.
+     */
+    title?: string;
     /**
      * The "⚙️ Ops" tab — robots write here. Absent for a plain chat without
      * topics (a solo project): the message then goes to the chat itself.
@@ -47,9 +56,13 @@ export declare const ROUTES: Record<Project, Forum>;
 /**
  * A solo project's chat is «<Name> · Ops»; a team forum is just the name — the
  * forum already carries its own «Ops»/«Dev» tabs, so the chat's own title
- * does not need to repeat the word. The real Telegram chat title and this
- * function must agree: the avatar scripts and the name-drift check both read
- * it through `notify routes --json`, not by asking Telegram.
+ * does not need to repeat the word. A chat shared by several repositories of
+ * one product, or a forum whose product name differs from the repo key,
+ * carries the product's name in `title`, and every row sharing that chat
+ * repeats it, so any of them answers with the same title. The real
+ * Telegram chat title and this function must agree: the avatar scripts and the
+ * name-drift check both read it through `notify routes --json`, not by asking
+ * Telegram.
  */
 export declare const chatTitle: (p: Project) => string;
 export type Target = {

package/dist/routes.js

@@ -1,11 +1,17 @@
 import { DISPLAY, severity } from "./events.js";
 export const ROUTES = {
-    // The only project with a team, and so the only forum left. ops/dev =
-    // 22/23, not 3/4: the old tabs were deleted by hand on 27.07.2026, and
-    // Telegram removes a topic's messages along with it. A recreated topic
-    // gets a NEW id — a topic's id is the id of its first message, it is
-    // never reused.
-    zabukai: { chat: '-1004299939100', ops: 22, dev: 23 },
+    // Zabukai is one product built from two repositories, so it is two rows
+    // sharing one forum: an Ops tab EACH, because a card belongs to the
+    // repository it came from, and ONE Dev tab, because the people talking in
+    // it are one team working on one product (owner's rule, 09.09.2026).
+    //
+    // ops/dev = 22/23, not 3/4: the old tabs were deleted by hand on
+    // 27.07.2026, and Telegram removes a topic's messages along with it. A
+    // recreated topic gets a NEW id — a topic's id is the id of its first
+    // message, it is never reused. 962 is the site's Ops tab, created
+    // 09.09.2026.
+    'zabukai-app': { chat: '-1004299939100', title: 'Zabukai', ops: 22, dev: 23 },
+    'zabukai-site': { chat: '-1004299939100', title: 'Zabukai', ops: 962, dev: 23 },
     // Every row below is a project the owner runs alone. Their Topics were
     // turned off on 06.09.2026 and their `ops` numbers went with them: a card
     // now goes to the chat itself. Sending a thread id into a chat that is no
@@ -25,17 +31,23 @@ export const ROUTES = {
     // runs it alone.
     '2roles': { chat: '-1004314188744' },
     // Created 09.09.2026 by create-ops-chat.py as «Market Lens»: the owner and
-    // Semyon, so a forum; the tab numbers come from `notify setup`.
-    'market-lens': { chat: '-1004489147617', ops: 4, dev: 5 }
+    // Semyon, so a forum; the tab numbers come from `notify setup`. A forum
+    // wears the product's own name even when it is one repository (owner's
+    // rule of 2026-09-10) — hence `title`, like Zabukai above.
+    'market-lens': { chat: '-1004489147617', title: 'Market Lens', ops: 4, dev: 5 }
 };
 /**
  * A solo project's chat is «<Name> · Ops»; a team forum is just the name — the
  * forum already carries its own «Ops»/«Dev» tabs, so the chat's own title
- * does not need to repeat the word. The real Telegram chat title and this
- * function must agree: the avatar scripts and the name-drift check both read
- * it through `notify routes --json`, not by asking Telegram.
+ * does not need to repeat the word. A chat shared by several repositories of
+ * one product, or a forum whose product name differs from the repo key,
+ * carries the product's name in `title`, and every row sharing that chat
+ * repeats it, so any of them answers with the same title. The real
+ * Telegram chat title and this function must agree: the avatar scripts and the
+ * name-drift check both read it through `notify routes --json`, not by asking
+ * Telegram.
  */
-export const chatTitle = (p) => ROUTES[p].ops === undefined ? `${DISPLAY[p]} · Ops` : DISPLAY[p];
+export const chatTitle = (p) => ROUTES[p].title ?? (ROUTES[p].ops === undefined ? `${DISPLAY[p]} · Ops` : DISPLAY[p]);
 /**
  * Where an event goes. Everything goes to its own project's "Ops" tab; a
  * red one arrives there too, just with sound.

package/dist/setup.js

@@ -1,24 +1,42 @@
 /**
- * `notify setup "<Project name>"` creates the "⚙️ Ops" and "💬 Dev" tabs in a
- * forum that already exists, and prints the ready line for `ROUTES`.
+ * `notify setup <forum chat_id> <project key>` creates the "Ops" and "Dev"
+ * tabs in a forum that already exists, and prints the ready line for `ROUTES`.
+ *
+ * Tab shape (the standard tests/check-telegram-shape.py enforces): plain
+ * titles with a NATIVE topic icon, never an emoji in the title text — Ops
+ * carries 🤖 (robots post there), Dev carries 💬 (people talk there). The
+ * icon ids below are documents of Telegram's topic-icon sticker set,
+ * resolved live on 2026-09-10; ⚙️ is NOT in that set, which is why the
+ * robot glyph is 🤖.
+ *
+ * A product of SEVERAL repositories shares one forum, one Ops tab PER
+ * repository (a card belongs to the repo it came from) and ONE Dev tab.
+ * The Bot API cannot list a forum's topics, so the shape is decided from
+ * `ROUTES` itself: peers are rows that already point at this chat.
  *
  * The bot cannot create the forum supergroup itself — Telegram only allows a
- * real account to do that. So the order for a new project is:
+ * real account to do that. So the order for a new project is
+ * (mac-config's tg-forums skill, scripts/create-ops-chat.py --forum does all
+ * of step 1):
  *   1. create a group in Telegram, turn on "Topics" in it, add
  *      @mikita_ops_bot as an admin with the "Manage topics" right;
- *   2. run `notify setup <chat_id>` — it creates both tabs and prints the line;
+ *   2. run `notify setup <chat_id> <project key>` — it creates the tabs and
+ *      prints the line;
  *   3. paste the line into `src/routes.ts`.
- *
- * Step 1 happens once per project and takes half a minute. Steps 2 and 3 are
- * mechanical.
  */
+import { ROUTES } from "./routes.js";
 const log = (msg) => console.error(`[notify] ${msg}`);
-const createTopic = async (token, chat, name, color) => {
+// Documents of Telegram's topic-icon set (InputStickerSetEmojiDefaultTopicIcons):
+// 🤖 for Ops, 💬 for Dev. A wrong id here writes a dead icon into every new
+// forum — tests/check-telegram-shape.py catches a dropped icon live.
+const OPS_ICON_ID = '5309832892262654231'; // 🤖
+const DEV_ICON_ID = '5417915203100613993'; // 💬
+const createTopic = async (token, chat, name, iconId, color) => {
     try {
         const res = await fetch(`https://api.telegram.org/bot${token}/createForumTopic`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ chat_id: chat, name, icon_color: color }),
+            body: JSON.stringify({ chat_id: chat, name, icon_color: color, icon_custom_emoji_id: iconId }),
             signal: AbortSignal.timeout(10_000)
         });
         const body = (await res.json());
@@ -40,21 +58,35 @@ export const setupTopic = async (chatId, projectKey) => {
         log('no OPS_BOT_TOKEN — cannot create the tabs');
         return;
     }
-    const ops = await createTopic(token, chatId, '⚙️ Ops', 9367192);
-    const dev = await createTopic(token, chatId, '💬 Dev', 7322096);
+    // The Bot API cannot enumerate topics, so the forum's shape is read from
+    // ROUTES: a row already pointing here is a peer repository of the same
+    // product.
+    const existing = ROUTES[projectKey];
+    if (existing && existing.chat === chatId && existing.ops !== undefined) {
+        log(`${projectKey} is already in ROUTES with ops=${existing.ops} — nothing to create`);
+        return;
+    }
+    const peers = Object.entries(ROUTES).filter(([key, row]) => key !== projectKey && row.chat === chatId);
+    // A second repository of the same product gets its name on its own Ops tab;
+    // the product's FIRST tab is plain "Ops" (rename it when a second repo
+    // joins — tests/check-telegram-shape.py goes red until it is done).
+    const opsTitle = peers.length > 0 ? `Ops · ${projectKey}` : 'Ops';
+    const sharedDev = peers.map(([, row]) => row.dev).find((id) => id !== undefined);
+    const ops = await createTopic(token, chatId, opsTitle, OPS_ICON_ID, 9367192);
+    const dev = sharedDev ?? (await createTopic(token, chatId, 'Dev', DEV_ICON_ID, 7322096));
     // Partial success: if only Ops was created, print it. Otherwise running the
     // command again would create A DIFFERENT Ops topic, and the old id would be lost.
     if (ops === null) {
         log('Ops was not created — check: is the bot a group admin with "Manage topics", and are topics on?');
         return;
     }
-    if (dev === null) {
+    if (dev === null || dev === undefined) {
         log(`Ops created (id=${ops}), Dev was not — add Dev by hand or run again, and keep ops=${ops}`);
         log('add to src/routes.ts (fill dev in afterwards):');
         log(`  ${JSON.stringify(projectKey)}: { chat: '${chatId}', ops: ${ops}, dev: <fill in> },`);
         return;
     }
-    log(`tabs created: Ops=${ops}, Dev=${dev}`);
+    log(`tabs created: Ops="${opsTitle}" (${ops}), Dev (${dev})${sharedDev ? ' [shared with a peer repo]' : ''}`);
     log('add to src/routes.ts:');
     log(`  ${JSON.stringify(projectKey)}: { chat: '${chatId}', ops: ${ops}, dev: ${dev} },`);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikitasazan/notify",
-  "version": "1.23.0",
+  "version": "1.25.0",
   "description": "Единая типизированная отправка Telegram-уведомлений (форум-темы, маршрутизация, ретраи) для всех проектов",
   "type": "module",
   "license": "MIT",