@delt/claude-alarm 0.8.1 → 0.9.0

package/dist/index.js

@@ -41,6 +41,12 @@ var WS_PATH_DASHBOARD = "/ws/dashboard";
 var CHANNEL_SERVER_NAME = "claude-alarm";
 var CHANNEL_SERVER_VERSION = "0.1.0";
 
+// src/shared/peer-name.ts
+var SAFE_PEER_NAME = /^[^\u0000-\u001f\u007f"\\[\]]{1,128}$/;
+function isValidPeerName(name) {
+  return typeof name === "string" && name.trim() !== "" && SAFE_PEER_NAME.test(name);
+}
+
 // src/hub/session-manager.ts
 var SessionManager = class {
   sessions = /* @__PURE__ */ new Map();
@@ -64,7 +70,7 @@ var SessionManager = class {
     } else {
       session.displayName = baseName;
     }
-    this.sessions.set(session.id, { ...session });
+    this.sessions.set(session.id, { ...session, peerName: isValidPeerName(session.peerName) ? session.peerName : void 0 });
   }
   unregister(sessionId) {
     const session = this.sessions.get(sessionId);
@@ -79,6 +85,13 @@ var SessionManager = class {
     }
     return session;
   }
+  setPeerName(sessionId, peerName) {
+    const session = this.sessions.get(sessionId);
+    if (session) {
+      session.peerName = isValidPeerName(peerName) ? peerName : void 0;
+    }
+    return session;
+  }
   updateActivity(sessionId) {
     const session = this.sessions.get(sessionId);
     if (session) {
@@ -210,7 +223,7 @@ import fs from "fs";
 import path2 from "path";
 import { randomUUID } from "crypto";
 var TELEGRAM_API = "https://api.telegram.org/bot";
-var TelegramBot = class {
+var TelegramBot = class _TelegramBot {
   config;
   offset = 0;
   polling = false;
@@ -442,33 +455,45 @@ ${this.mdToHtml(message)}`;
   }
   /** Send a permission request with inline buttons */
   async sendPermissionRequest(sessionId, sessionLabel, requestId, toolName, description, inputPreview) {
+    const isNotify = toolName.endsWith("__notify") || toolName === "notify";
     let preview = inputPreview;
+    let kind = "code";
+    let lang = "";
     let truncated = false;
     try {
       const p = JSON.parse(inputPreview);
-      if (p.command) preview = `$ ${p.command}`;
-      else if (p.title && p.message) preview = p.message;
-      else if (p.file_path) {
+      if (p.command) {
+        preview = `$ ${p.command}`;
+        lang = "bash";
+      } else if (p.title && p.message) {
+        preview = p.message;
+        kind = "prose";
+      } else if (p.file_path) {
         preview = p.file_path;
+        lang = this.langOf(p.file_path);
         if (p.content) {
           preview += "\n" + p.content.slice(0, 3e3);
           if (p.content.length > 500) truncated = true;
         }
       } else if (p.content && typeof p.content === "string") {
         preview = p.content.slice(0, 3e3);
+        if (isNotify) kind = "prose";
         if (p.content.length > 500) truncated = true;
       }
     } catch {
       truncated = true;
       const cmdMatch = inputPreview.match(/"command"\s*:\s*"((?:[^"\\]|\\.)*)"/);
       const contentMatch = inputPreview.match(/"content"\s*:\s*"((?:[^"\\]|\\.)*)"/);
-      if (cmdMatch) preview = `$ ${cmdMatch[1]}`;
-      else if (contentMatch) preview = contentMatch[1].slice(0, 3e3);
+      if (cmdMatch) {
+        preview = `$ ${cmdMatch[1]}`;
+        lang = "bash";
+      } else if (contentMatch) preview = contentMatch[1].slice(0, 3e3);
     }
     const truncNote = truncated ? "\n\n<i>...truncated</i>" : "";
     const previewSlice = preview.slice(0, 3e3);
     const isShort = !previewSlice.includes("\n") && previewSlice.length < 100;
-    const previewHtml = isShort ? `<code>${this.escHtml(previewSlice)}</code>` : this.escHtml(previewSlice);
+    const langAttr = lang ? ` class="language-${lang}"` : "";
+    const previewHtml = kind === "prose" ? this.mdToHtml(previewSlice) : isShort ? `<code>${this.escHtml(previewSlice)}</code>` : `<pre><code${langAttr}>${this.escHtml(previewSlice)}</code></pre>`;
     let displayTool = toolName;
     if ((toolName.endsWith("__notify") || toolName === "notify") && inputPreview) {
       try {
@@ -568,6 +593,40 @@ ${label}`);
   escHtml(s) {
     return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
   }
+  static LANG_BY_EXT = {
+    js: "javascript",
+    mjs: "javascript",
+    cjs: "javascript",
+    jsx: "javascript",
+    ts: "typescript",
+    tsx: "typescript",
+    py: "python",
+    rb: "ruby",
+    go: "go",
+    java: "java",
+    kt: "kotlin",
+    rs: "rust",
+    php: "php",
+    cs: "csharp",
+    sh: "bash",
+    bash: "bash",
+    zsh: "bash",
+    ps1: "powershell",
+    json: "json",
+    yml: "yaml",
+    yaml: "yaml",
+    xml: "xml",
+    sql: "sql",
+    md: "markdown",
+    html: "html",
+    vue: "html",
+    css: "css",
+    scss: "scss"
+  };
+  langOf(path5) {
+    const m = /\.([a-z0-9]+)$/i.exec(path5 || "");
+    return m ? _TelegramBot.LANG_BY_EXT[m[1].toLowerCase()] ?? "" : "";
+  }
   /** Convert markdown to Telegram HTML (escape first, then apply formatting) */
   mdToHtml(s) {
     let text = s.replace(
@@ -1019,7 +1078,7 @@ var HubServer = class {
         this.sessions.register(session);
         this.channelSockets.set(session.id, ws);
         if (isLocal) this.localChannels.add(session.id);
-        logger.info(`Session registered: ${session.id} (${session.name}, channel: ${session.channelEnabled ?? false})`);
+        logger.info(`Session registered: ${session.id} (${session.name}, channel: ${session.channelEnabled ?? false}, peer: ${session.peerName ?? "-"})`);
         this.broadcastToDashboards({
           type: isReregister ? "session_updated" : "session_connected",
           session
@@ -1033,6 +1092,15 @@ var HubServer = class {
         }
         break;
       }
+      case "peer_name": {
+        if (this.channelSockets.get(msg.sessionId) !== ws) break;
+        const updated = this.sessions.setPeerName(msg.sessionId, msg.peerName);
+        if (updated) {
+          logger.info(`Peer name for ${msg.sessionId}: ${msg.peerName ?? "-"}`);
+          this.broadcastToDashboards({ type: "session_updated", session: updated });
+        }
+        break;
+      }
       case "notify": {
         this.sessions.updateActivity(msg.sessionId);
         const notifySession = this.sessions.get(msg.sessionId);
@@ -1399,12 +1467,13 @@ if (process.argv[1] && (process.argv[1].endsWith("hub/server.js") || process.arg
 // src/channel/hub-client.ts
 import WebSocket2 from "ws";
 var HubClient = class {
-  constructor(sessionId, sessionName, hubHost = DEFAULT_HUB_HOST, hubPort = DEFAULT_HUB_PORT, token) {
+  constructor(sessionId, sessionName, hubHost = DEFAULT_HUB_HOST, hubPort = DEFAULT_HUB_PORT, token, getPeerName = () => void 0) {
     this.sessionId = sessionId;
     this.sessionName = sessionName;
     this.hubHost = hubHost;
     this.hubPort = hubPort;
     this.token = token;
+    this.getPeerName = getPeerName;
   }
   ws = null;
   reconnectTimer = null;
@@ -1429,7 +1498,8 @@ var HubClient = class {
             connectedAt: Date.now(),
             lastActivity: Date.now(),
             cwd: process.cwd(),
-            channelEnabled: true
+            channelEnabled: true,
+            peerName: this.getPeerName()
           }
         };
         this.ws.send(JSON.stringify(registration));