fix: Mac desktop notification sounds overlapping with our custom sounds (#766)

Author: charlesvien

apps/twig/src/main/services/notification/service.ts

@@ -14,15 +14,15 @@ export class NotificationService {
     log.info("Notification service initialized");
   }
 
-  send(title: string, body: string): void {
+  send(title: string, body: string, silent: boolean): void {
     if (!Notification.isSupported()) {
       log.warn("Notifications not supported on this platform");
       return;
     }
 
-    const notification = new Notification({ title, body });
+    const notification = new Notification({ title, body, silent });
     notification.show();
-    log.info("Notification sent", { title, body });
+    log.info("Notification sent", { title, body, silent });
   }
 
   showDockBadge(): void {

apps/twig/src/main/trpc/routers/notification.ts

@@ -9,7 +9,15 @@ const getService = () =>
 
 export const notificationRouter = router({
   send: publicProcedure
-    .input(z.object({ title: z.string(), body: z.string() }))
-    .mutation(({ input }) => getService().send(input.title, input.body)),
+    .input(
+      z.object({
+        title: z.string(),
+        body: z.string(),
+        silent: z.boolean(),
+      }),
+    )
+    .mutation(({ input }) =>
+      getService().send(input.title, input.body, input.silent),
+    ),
   showDockBadge: publicProcedure.mutation(() => getService().showDockBadge()),
 });

apps/twig/src/renderer/lib/notifications.ts

@@ -12,8 +12,12 @@ function truncateTitle(title: string): string {
   return `${title.slice(0, MAX_TITLE_LENGTH)}...`;
 }
 
-function sendDesktopNotification(title: string, body: string): void {
-  trpcVanilla.notification.send.mutate({ title, body }).catch((err) => {
+function sendDesktopNotification(
+  title: string,
+  body: string,
+  silent: boolean,
+): void {
+  trpcVanilla.notification.send.mutate({ title, body, silent }).catch((err) => {
     log.error("Failed to send notification", err);
   });
 }
@@ -40,26 +44,39 @@ export function notifyPromptComplete(
   const isWindowFocused = document.hasFocus();
   if (isWindowFocused) return;
 
+  const willPlayCustomSound = completionSound !== "none";
   playCompletionSound(completionSound, completionVolume);
 
   if (desktopNotifications) {
-    sendDesktopNotification("Twig", `"${truncateTitle(taskTitle)}" finished`);
+    sendDesktopNotification(
+      "Twig",
+      `"${truncateTitle(taskTitle)}" finished`,
+      willPlayCustomSound,
+    );
   }
   if (dockBadgeNotifications) {
     showDockBadge();
   }
 }
 
 export function notifyPermissionRequest(taskTitle: string): void {
-  const { desktopNotifications, dockBadgeNotifications } =
-    useSettingsStore.getState();
+  const {
+    completionSound,
+    completionVolume,
+    desktopNotifications,
+    dockBadgeNotifications,
+  } = useSettingsStore.getState();
   const isWindowFocused = document.hasFocus();
 
   if (!isWindowFocused) {
+    const willPlayCustomSound = completionSound !== "none";
+    playCompletionSound(completionSound, completionVolume);
+
     if (desktopNotifications) {
       sendDesktopNotification(
         "Twig",
         `"${truncateTitle(taskTitle)}" needs your input`,
+        willPlayCustomSound,
       );
     }
     if (dockBadgeNotifications) {