@hienlh/ppm 0.9.39 → 0.9.40

package/src/services/telegram-notification.service.ts

@@ -1,6 +1,7 @@
 import { configService } from "./config.service.ts";
 import { tunnelService } from "./tunnel.service.ts";
 import { getLocalIp } from "../lib/network-utils.ts";
+import { getApprovedPairedChats } from "./db.service.ts";
 import type { TelegramConfig } from "../types/config.ts";
 import type { NotificationPayload } from "./notification.service.ts";
 
@@ -12,12 +13,15 @@ function escapeHtml(str: string): string {
 }
 
 class TelegramNotificationService {
-  /** Send notification to Telegram. No-op if not configured. */
+  /** Send notification to all approved paired chats. No-op if not configured. */
   async send(payload: NotificationPayload): Promise<void> {
     const config = configService.get("telegram") as TelegramConfig | undefined;
-    if (!config?.bot_token || !config?.chat_id) return;
+    if (!config?.bot_token) return;
     if (!BOT_TOKEN_RE.test(config.bot_token)) return;
 
+    const approvedChats = getApprovedPairedChats();
+    if (approvedChats.length === 0) return;
+
     const deviceName = (configService.get("device_name") as string) || "PPM";
     const deepLink = this.buildDeepLink(payload);
 
@@ -27,31 +31,50 @@ class TelegramNotificationService {
       text += `\n\n<a href="${deepLink}">Open in PPM</a>`;
     }
 
-    await this.callApi(config.bot_token, config.chat_id, text);
+    // Send to all approved paired chats in parallel
+    await Promise.allSettled(
+      approvedChats.map((chat) =>
+        this.callApi(config.bot_token, chat.telegram_chat_id, text),
+      ),
+    );
   }
 
-  /** Send a test message. Returns { ok, error? } */
-  async sendTest(botToken: string, chatId: string): Promise<{ ok: boolean; error?: string }> {
+  /** Send a test message to all approved paired chats. Returns { ok, error? } */
+  async sendTest(botToken: string): Promise<{ ok: boolean; error?: string }> {
     if (!BOT_TOKEN_RE.test(botToken)) return { ok: false, error: "Invalid bot token format" };
+
+    const approvedChats = getApprovedPairedChats();
+    if (approvedChats.length === 0) {
+      return { ok: false, error: "No approved paired chats. Pair a device in PPMBot settings first." };
+    }
+
     const deviceName = (configService.get("device_name") as string) || "PPM";
     const text = `<b>${escapeHtml(deviceName)} — Test</b>\nTelegram notifications are working!`;
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), 10_000);
-    try {
-      const res = await fetch(`https://api.telegram.org/bot${botToken}/sendMessage`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ chat_id: chatId, text, parse_mode: "HTML" }),
-        signal: controller.signal,
-      });
-      const json = (await res.json()) as { ok: boolean; description?: string };
-      if (!json.ok) return { ok: false, error: json.description || "Unknown error" };
-      return { ok: true };
-    } catch (e) {
-      return { ok: false, error: (e as Error).message };
-    } finally {
-      clearTimeout(timeout);
+
+    const results = await Promise.allSettled(
+      approvedChats.map(async (chat) => {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), 10_000);
+        try {
+          const res = await fetch(`https://api.telegram.org/bot${botToken}/sendMessage`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ chat_id: chat.telegram_chat_id, text, parse_mode: "HTML" }),
+            signal: controller.signal,
+          });
+          const json = (await res.json()) as { ok: boolean; description?: string };
+          if (!json.ok) throw new Error(json.description || "Unknown error");
+        } finally {
+          clearTimeout(timeout);
+        }
+      }),
+    );
+
+    const failed = results.filter((r) => r.status === "rejected");
+    if (failed.length === results.length) {
+      return { ok: false, error: (failed[0] as PromiseRejectedResult).reason?.message || "All sends failed" };
     }
+    return { ok: true };
   }
 
   private buildDeepLink(payload: NotificationPayload): string | null {

package/src/types/config.ts

@@ -6,7 +6,6 @@ export interface PushConfig {
 
 export interface TelegramConfig {
   bot_token: string;
-  chat_id: string;
 }
 
 export interface PPMBotConfig {
@@ -99,7 +98,6 @@ export const DEFAULT_CONFIG: PpmConfig = {
   },
   telegram: {
     bot_token: "",
-    chat_id: "",
   },
   clawbot: {
     enabled: false,

package/src/web/components/settings/ppmbot-settings-section.tsx

@@ -3,7 +3,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Switch } from "@/components/ui/switch";
 import { api } from "@/lib/api-client";
-import { Trash2, CheckCircle, Clock } from "lucide-react";
+import { Trash2, CheckCircle, Clock, Send } from "lucide-react";
 
 interface PPMBotConfig {
   enabled: boolean;
@@ -16,6 +16,10 @@ interface PPMBotConfig {
   debounce_ms: number;
 }
 
+interface TelegramConfig {
+  bot_token: string;
+}
+
 interface PairedChat {
   id: number;
   telegram_chat_id: string;
@@ -32,6 +36,11 @@ export function PPMBotSettingsSection() {
   const [saving, setSaving] = useState(false);
   const [status, setStatus] = useState<{ type: "ok" | "err"; msg: string } | null>(null);
 
+  // Bot token (from telegram config)
+  const [tokenInput, setTokenInput] = useState("");
+  const [tokenConfigured, setTokenConfigured] = useState(false);
+  const [tokenSaving, setTokenSaving] = useState(false);
+
   const [enabled, setEnabled] = useState(false);
   const [defaultProject, setDefaultProject] = useState("");
   const [systemPrompt, setSystemPrompt] = useState("");
@@ -42,6 +51,7 @@ export function PPMBotSettingsSection() {
   const [pairedChats, setPairedChats] = useState<PairedChat[]>([]);
   const [approveCode, setApproveCode] = useState("");
   const [approving, setApproving] = useState(false);
+  const [testing, setTesting] = useState(false);
 
   const fetchPairedChats = useCallback(async () => {
     try {
@@ -60,9 +70,28 @@ export function PPMBotSettingsSection() {
       setShowThinking(data.show_thinking);
       setDebounceMs(data.debounce_ms);
     }).catch(() => {});
+    api.get<TelegramConfig>("/api/settings/telegram").then((data) => {
+      setTokenConfigured(!!data.bot_token);
+    }).catch(() => {});
     fetchPairedChats();
   }, [fetchPairedChats]);
 
+  const saveToken = async () => {
+    if (!tokenInput.trim()) return;
+    setTokenSaving(true);
+    setStatus(null);
+    try {
+      await api.put<TelegramConfig>("/api/settings/telegram", { bot_token: tokenInput });
+      setTokenConfigured(true);
+      setTokenInput("");
+      setStatus({ type: "ok", msg: "Bot token saved" });
+    } catch (e) {
+      setStatus({ type: "err", msg: (e as Error).message });
+    } finally {
+      setTokenSaving(false);
+    }
+  };
+
   const save = async () => {
     setSaving(true);
     setStatus(null);
@@ -110,10 +139,51 @@ export function PPMBotSettingsSection() {
     }
   };
 
+  const handleTestNotification = async () => {
+    setTesting(true);
+    setStatus(null);
+    try {
+      await api.post("/api/settings/telegram/test", {});
+      setStatus({ type: "ok", msg: "Test notification sent to all paired devices!" });
+    } catch (e) {
+      setStatus({ type: "err", msg: (e as Error).message });
+    } finally {
+      setTesting(false);
+    }
+  };
+
   if (!config) return <p className="text-xs text-muted-foreground">Loading...</p>;
 
+  const approvedCount = pairedChats.filter((c) => c.status === "approved").length;
+
   return (
     <div className="space-y-4">
+      {/* Bot Token */}
+      <div className="space-y-1.5">
+        <label className="text-[11px] text-muted-foreground">Telegram Bot Token</label>
+        <div className="flex gap-1.5">
+          <Input
+            type="password"
+            placeholder={tokenConfigured ? "••••••  (saved)" : "123456:ABC-DEF..."}
+            value={tokenInput}
+            onChange={(e) => setTokenInput(e.target.value)}
+            className="h-7 text-xs flex-1"
+          />
+          <Button
+            variant="outline"
+            size="sm"
+            className="h-7 text-xs shrink-0 cursor-pointer"
+            disabled={tokenSaving || !tokenInput.trim()}
+            onClick={saveToken}
+          >
+            {tokenSaving ? "..." : "Save"}
+          </Button>
+        </div>
+        <p className="text-[10px] text-muted-foreground">
+          Create a bot via <b>@BotFather</b> on Telegram. Used for both chat and notifications.
+        </p>
+      </div>
+
       {/* Enable/Disable */}
       <div className="flex items-center justify-between">
         <div>
@@ -130,6 +200,7 @@ export function PPMBotSettingsSection() {
         <p className="text-xs font-medium">Paired Devices</p>
         <p className="text-[10px] text-muted-foreground">
           Send any message to the bot on Telegram to get a pairing code. Enter it below to approve.
+          Notifications are sent to all approved devices.
         </p>
 
         <div className="flex gap-2">
@@ -189,6 +260,20 @@ export function PPMBotSettingsSection() {
             ))}
           </div>
         )}
+
+        {/* Test notification button */}
+        {tokenConfigured && approvedCount > 0 && (
+          <Button
+            variant="outline"
+            size="sm"
+            className="h-7 text-xs gap-1 w-full cursor-pointer"
+            disabled={testing}
+            onClick={handleTestNotification}
+          >
+            <Send className="size-3" />
+            {testing ? "Sending..." : "Test Notification"}
+          </Button>
+        )}
       </div>
 
       {/* Default Project */}
@@ -201,7 +286,7 @@ export function PPMBotSettingsSection() {
           className="h-7 text-xs"
         />
         <p className="text-[10px] text-muted-foreground">
-          Project used when starting a new chat. Must match a project name in PPM.
+          Project used when starting a new chat. Leave empty for default workspace (~/.ppm/bot/).
         </p>
       </div>
 

package/src/web/components/settings/settings-tab.tsx

@@ -11,7 +11,6 @@ import { useSettingsStore, type Theme } from "@/stores/settings-store";
 import { cn } from "@/lib/utils";
 import { AISettingsSection } from "./ai-settings-section";
 import { KeyboardShortcutsSection } from "./keyboard-shortcuts-section";
-import { TelegramSettingsSection } from "./telegram-settings-section";
 import { ProxySettingsSection } from "./proxy-settings-section";
 import { McpSettingsSection } from "./mcp-settings-section";
 import { ExtensionManagerSection } from "./extension-manager-section";
@@ -276,10 +275,13 @@ function NotificationsContent({ isSubscribed, loading, permission, pushError, su
 
       <Separator />
 
-      {/* Telegram */}
-      <section className="space-y-2">
+      {/* Telegram — redirect to PPMBot */}
+      <section className="space-y-1">
         <h3 className="text-xs font-medium text-muted-foreground">Telegram</h3>
-        <TelegramSettingsSection />
+        <p className="text-[11px] text-muted-foreground">
+          Telegram notifications are sent to all approved devices in PPMBot settings.
+          Configure your bot token and pair devices there.
+        </p>
       </section>
     </div>
   );