@delt/claude-alarm 0.8.1 → 0.9.0

package/dist/cli.js

@@ -190,11 +190,24 @@ var init_crash_guard = __esm({
   }
 });
 
+// src/shared/peer-name.ts
+function isValidPeerName(name) {
+  return typeof name === "string" && name.trim() !== "" && SAFE_PEER_NAME.test(name);
+}
+var SAFE_PEER_NAME;
+var init_peer_name = __esm({
+  "src/shared/peer-name.ts"() {
+    "use strict";
+    SAFE_PEER_NAME = /^[^\u0000-\u001f\u007f"\\[\]]{1,128}$/;
+  }
+});
+
 // src/hub/session-manager.ts
 var SessionManager;
 var init_session_manager = __esm({
   "src/hub/session-manager.ts"() {
     "use strict";
+    init_peer_name();
     SessionManager = class {
       sessions = /* @__PURE__ */ new Map();
       register(session) {
@@ -217,7 +230,7 @@ var init_session_manager = __esm({
         } 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(sessionId2) {
         const session = this.sessions.get(sessionId2);
@@ -232,6 +245,13 @@ var init_session_manager = __esm({
         }
         return session;
       }
+      setPeerName(sessionId2, peerName2) {
+        const session = this.sessions.get(sessionId2);
+        if (session) {
+          session.peerName = isValidPeerName(peerName2) ? peerName2 : void 0;
+        }
+        return session;
+      }
       updateActivity(sessionId2) {
         const session = this.sessions.get(sessionId2);
         if (session) {
@@ -378,7 +398,7 @@ var init_telegram = __esm({
     init_logger();
     init_constants();
     TELEGRAM_API = "https://api.telegram.org/bot";
-    TelegramBot = class {
+    TelegramBot = class _TelegramBot {
       config;
       offset = 0;
       polling = false;
@@ -610,33 +630,45 @@ ${this.mdToHtml(message)}`;
       }
       /** Send a permission request with inline buttons */
       async sendPermissionRequest(sessionId2, 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 {
@@ -736,6 +768,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(path8) {
+        const m = /\.([a-z0-9]+)$/i.exec(path8 || "");
+        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(
@@ -1093,7 +1159,7 @@ var init_server = __esm({
             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
@@ -1107,6 +1173,15 @@ var init_server = __esm({
             }
             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);
@@ -1481,12 +1556,13 @@ var init_hub_client = __esm({
     init_logger();
     init_constants();
     HubClient = class {
-      constructor(sessionId2, sessionName2, hubHost2 = DEFAULT_HUB_HOST, hubPort2 = DEFAULT_HUB_PORT, token) {
+      constructor(sessionId2, sessionName2, hubHost2 = DEFAULT_HUB_HOST, hubPort2 = DEFAULT_HUB_PORT, token, getPeerName = () => void 0) {
         this.sessionId = sessionId2;
         this.sessionName = sessionName2;
         this.hubHost = hubHost2;
         this.hubPort = hubPort2;
         this.token = token;
+        this.getPeerName = getPeerName;
       }
       ws = null;
       reconnectTimer = null;
@@ -1511,7 +1587,8 @@ var init_hub_client = __esm({
                 connectedAt: Date.now(),
                 lastActivity: Date.now(),
                 cwd: process.cwd(),
-                channelEnabled: true
+                channelEnabled: true,
+                peerName: this.getPeerName()
               }
             };
             this.ws.send(JSON.stringify(registration));
@@ -1579,6 +1656,53 @@ var init_hub_client = __esm({
   }
 });
 
+// src/channel/peer-name.ts
+import fs5 from "fs";
+import os2 from "os";
+import path5 from "path";
+function findPeerName(records, env) {
+  const valid = records.filter((r) => typeof r === "object" && r !== null);
+  const nameOf = (match) => {
+    const rec = valid.find(match);
+    return isValidPeerName(rec?.name) ? rec.name : void 0;
+  };
+  if (env.messagingSocket) {
+    const bySocket = nameOf((r) => r.messagingSocketPath === env.messagingSocket);
+    if (bySocket) return bySocket;
+  }
+  if (env.sessionId) return nameOf((r) => r.sessionId === env.sessionId);
+  return void 0;
+}
+function readPeerName(env = process.env) {
+  const lookup = {
+    messagingSocket: env.CLAUDE_CODE_MESSAGING_SOCKET,
+    sessionId: env.CLAUDE_CODE_SESSION_ID
+  };
+  if (!lookup.messagingSocket && !lookup.sessionId) return void 0;
+  const configDir = env.CLAUDE_CONFIG_DIR || path5.join(os2.homedir(), ".claude");
+  const dir = path5.join(configDir, "sessions");
+  let files;
+  try {
+    files = fs5.readdirSync(dir).filter((f) => f.endsWith(".json"));
+  } catch {
+    return void 0;
+  }
+  const records = [];
+  for (const f of files) {
+    try {
+      records.push(JSON.parse(fs5.readFileSync(path5.join(dir, f), "utf8")));
+    } catch {
+    }
+  }
+  return findPeerName(records, lookup);
+}
+var init_peer_name2 = __esm({
+  "src/channel/peer-name.ts"() {
+    "use strict";
+    init_peer_name();
+  }
+});
+
 // src/channel/server.ts
 var server_exports2 = {};
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -1589,10 +1713,19 @@ import {
 } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
 import { randomUUID as randomUUID4 } from "crypto";
-import path5 from "path";
+import path6 from "path";
 async function main() {
   logger.info(`Starting MCP channel server (session: ${sessionId})`);
   hubClient.connect();
+  const refreshPeerName = () => {
+    const next = readPeerName();
+    if (next === peerName) return;
+    peerName = next;
+    logger.info(`Peer name: ${next ?? "(none)"}`);
+    hubClient.send({ type: "peer_name", sessionId, peerName: next });
+  };
+  setTimeout(refreshPeerName, 2e3).unref();
+  setInterval(refreshPeerName, 3e4).unref();
   hubClient.onMessage(async (msg) => {
     if (msg.type === "message_to_session" && msg.sessionId === sessionId) {
       logger.info(`Message from dashboard: ${msg.content}`);
@@ -1639,7 +1772,7 @@ ${msg.content}` : "";
     process.exit(0);
   });
 }
-var sessionId, sessionName, server, config, hubHost, hubPort, hubToken, hubClient, PermissionRequestSchema;
+var sessionId, sessionName, peerName, server, config, hubHost, hubPort, hubToken, hubClient, PermissionRequestSchema;
 var init_server2 = __esm({
   "src/channel/server.ts"() {
     "use strict";
@@ -1647,8 +1780,10 @@ var init_server2 = __esm({
     init_constants();
     init_config();
     init_hub_client();
+    init_peer_name2();
     sessionId = randomUUID4();
-    sessionName = process.env.CLAUDE_ALARM_SESSION_NAME ?? path5.basename(process.cwd());
+    sessionName = process.env.CLAUDE_ALARM_SESSION_NAME ?? path6.basename(process.cwd());
+    peerName = readPeerName();
     server = new Server(
       {
         name: CHANNEL_SERVER_NAME,
@@ -1671,6 +1806,8 @@ REPLYING:
 
 IMAGES: If a channel message contains "[Image: ...] Read the file to view it: <path>", use the Read tool on that path before responding \u2014 otherwise the image is invisible to you.
 
+ROUTING: If a dashboard message has lines like [claude-alarm] @X = SendMessage to "Y", do what the message asks and deliver the result with the SendMessage tool to exactly "Y". Never guess other recipients. Then reply to the dashboard with what you sent.
+
 STATUS: Call status("working") before starting a long task, status("waiting_input") when blocked on user input, status("idle") when finished responding.
 
 NOTIFICATIONS:
@@ -1687,7 +1824,8 @@ NOTIFICATIONS:
       sessionName,
       hubHost,
       hubPort,
-      hubToken
+      hubToken,
+      () => peerName
     );
     server.setRequestHandler(ListToolsRequestSchema, async () => ({
       tools: [
@@ -1824,11 +1962,11 @@ init_constants();
 init_logger();
 init_crash_guard();
 import { spawn } from "child_process";
-import fs5 from "fs";
-import path6 from "path";
+import fs6 from "fs";
+import path7 from "path";
 import readline from "readline";
 import { fileURLToPath as fileURLToPath2 } from "url";
-var __dirname2 = path6.dirname(fileURLToPath2(import.meta.url));
+var __dirname2 = path7.dirname(fileURLToPath2(import.meta.url));
 function printUsage() {
   console.log(`
 claude-alarm - Monitor Claude Code sessions with notifications
@@ -1849,8 +1987,8 @@ Quick start:
 }
 async function checkForUpdates() {
   try {
-    const pkgPath = path6.join(__dirname2, "..", "package.json");
-    const pkg = JSON.parse(fs5.readFileSync(pkgPath, "utf-8"));
+    const pkgPath = path7.join(__dirname2, "..", "package.json");
+    const pkg = JSON.parse(fs6.readFileSync(pkgPath, "utf-8"));
     const currentVersion = pkg.version;
     const res = await fetch("https://registry.npmjs.org/@delt/claude-alarm/latest", {
       signal: AbortSignal.timeout(3e3)
@@ -1873,25 +2011,25 @@ async function hubStart(daemon) {
   const port = config2.hub.port ?? DEFAULT_HUB_PORT;
   const displayHost = host === "0.0.0.0" ? "127.0.0.1" : host;
   checkForUpdates();
-  if (fs5.existsSync(PID_FILE)) {
-    const pid = parseInt(fs5.readFileSync(PID_FILE, "utf-8").trim(), 10);
+  if (fs6.existsSync(PID_FILE)) {
+    const pid = parseInt(fs6.readFileSync(PID_FILE, "utf-8").trim(), 10);
     if (isProcessRunning(pid)) {
       console.log(`Hub is already running (PID: ${pid}) on http://${displayHost}:${port}`);
       return;
     }
-    fs5.unlinkSync(PID_FILE);
+    fs6.unlinkSync(PID_FILE);
   }
   if (daemon) {
     ensureConfigDir();
-    const logFd = fs5.openSync(LOG_FILE, "a");
-    const hubScript = path6.join(__dirname2, "hub", "server.js");
+    const logFd = fs6.openSync(LOG_FILE, "a");
+    const hubScript = path7.join(__dirname2, "hub", "server.js");
     const child = spawn(process.execPath, [hubScript], {
       detached: true,
       stdio: ["ignore", logFd, logFd],
       env: { ...process.env }
     });
     if (child.pid) {
-      fs5.writeFileSync(PID_FILE, String(child.pid), "utf-8");
+      fs6.writeFileSync(PID_FILE, String(child.pid), "utf-8");
       child.unref();
       console.log(`Hub started as daemon (PID: ${child.pid})`);
       console.log(`Dashboard: http://${displayHost}:${port}`);
@@ -1911,11 +2049,11 @@ async function hubStart(daemon) {
     const hub = new HubServer2(config2);
     await hub.start();
     ensureConfigDir();
-    fs5.writeFileSync(PID_FILE, String(process.pid), "utf-8");
+    fs6.writeFileSync(PID_FILE, String(process.pid), "utf-8");
     const shutdown = async () => {
       console.log("\nShutting down...");
       await hub.stop();
-      if (fs5.existsSync(PID_FILE)) fs5.unlinkSync(PID_FILE);
+      if (fs6.existsSync(PID_FILE)) fs6.unlinkSync(PID_FILE);
       process.exit(0);
     };
     process.on("SIGINT", shutdown);
@@ -1923,18 +2061,18 @@ async function hubStart(daemon) {
   }
 }
 function hubStop() {
-  if (!fs5.existsSync(PID_FILE)) {
+  if (!fs6.existsSync(PID_FILE)) {
     console.log("Hub is not running (no PID file found)");
     return;
   }
-  const pid = parseInt(fs5.readFileSync(PID_FILE, "utf-8").trim(), 10);
+  const pid = parseInt(fs6.readFileSync(PID_FILE, "utf-8").trim(), 10);
   try {
     process.kill(pid, "SIGTERM");
     console.log(`Hub stopped (PID: ${pid})`);
   } catch {
     console.log("Hub process not found (may have already stopped)");
   }
-  fs5.unlinkSync(PID_FILE);
+  fs6.unlinkSync(PID_FILE);
 }
 async function hubStatus() {
   const config2 = loadConfig();
@@ -1942,8 +2080,8 @@ async function hubStatus() {
   const port = config2.hub.port ?? DEFAULT_HUB_PORT;
   const displayHost = host === "0.0.0.0" ? "127.0.0.1" : host;
   let pidInfo = "not running";
-  if (fs5.existsSync(PID_FILE)) {
-    const pid = parseInt(fs5.readFileSync(PID_FILE, "utf-8").trim(), 10);
+  if (fs6.existsSync(PID_FILE)) {
+    const pid = parseInt(fs6.readFileSync(PID_FILE, "utf-8").trim(), 10);
     if (isProcessRunning(pid)) {
       pidInfo = `running (PID: ${pid})`;
     } else {
@@ -2015,7 +2153,7 @@ function ask(question) {
 }
 async function init() {
   const dir = process.cwd();
-  const projectName = path6.basename(dir);
+  const projectName = path7.basename(dir);
   console.log(`
 claude-alarm init for "${projectName}"
 `);
@@ -2035,11 +2173,11 @@ claude-alarm init for "${projectName}"
     if (port) env.CLAUDE_ALARM_HUB_PORT = port;
     if (token) env.CLAUDE_ALARM_HUB_TOKEN = token;
   }
-  const mcpPath = path6.join(dir, ".mcp.json");
+  const mcpPath = path7.join(dir, ".mcp.json");
   let mcpConfig = {};
-  if (fs5.existsSync(mcpPath)) {
+  if (fs6.existsSync(mcpPath)) {
     try {
-      mcpConfig = JSON.parse(fs5.readFileSync(mcpPath, "utf-8"));
+      mcpConfig = JSON.parse(fs6.readFileSync(mcpPath, "utf-8"));
     } catch {
       mcpConfig = {};
     }
@@ -2050,7 +2188,7 @@ claude-alarm init for "${projectName}"
     args: ["-y", "@delt/claude-alarm", "serve"],
     env
   };
-  fs5.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
+  fs6.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
   console.log(`
 \u2713 Created ${mcpPath}`);
   if (remote.toLowerCase() !== "y") {