diff --git a/src/hooks/session-notification.test.ts b/src/hooks/session-notification.test.ts index cf895ba98..3bee39f0b 100644 --- a/src/hooks/session-notification.test.ts +++ b/src/hooks/session-notification.test.ts @@ -365,4 +365,99 @@ describe("session-notification", () => { // then - only one notification should be sent expect(notificationCalls).toHaveLength(1) }) + + test("should use terminal-notifier with -activate when available on darwin", async () => { + // given - terminal-notifier is available and __CFBundleIdentifier is set + spyOn(sender, "sendSessionNotification").mockRestore() + const notifyCalls: string[] = [] + const mockCtx = { + $: async (cmd: TemplateStringsArray | string, ...values: any[]) => { + const cmdStr = typeof cmd === "string" + ? cmd + : cmd.reduce((acc, part, i) => acc + part + (values[i] ?? ""), "") + notifyCalls.push(cmdStr) + return { stdout: "", stderr: "", exitCode: 0 } + }, + } as any + spyOn(utils, "getTerminalNotifierPath").mockResolvedValue("/usr/local/bin/terminal-notifier") + const originalEnv = process.env.__CFBundleIdentifier + process.env.__CFBundleIdentifier = "com.mitchellh.ghostty" + + // when - sendSessionNotification is called directly on darwin + await sender.sendSessionNotification(mockCtx, "darwin", "Test Title", "Test Message") + + // then - notification uses terminal-notifier with -activate flag + expect(notifyCalls.length).toBeGreaterThanOrEqual(1) + const tnCall = notifyCalls.find(c => c.includes("terminal-notifier")) + expect(tnCall).toBeDefined() + expect(tnCall).toContain("-activate") + expect(tnCall).toContain("com.mitchellh.ghostty") + + // cleanup + if (originalEnv !== undefined) { + process.env.__CFBundleIdentifier = originalEnv + } else { + delete process.env.__CFBundleIdentifier + } + }) + + test("should fall back to osascript when terminal-notifier is not available", async () => { + // given - terminal-notifier is NOT available + spyOn(sender, "sendSessionNotification").mockRestore() + const notifyCalls: string[] = [] + const mockCtx = { + $: async (cmd: TemplateStringsArray | string, ...values: any[]) => { + const cmdStr = typeof cmd === "string" + ? cmd + : cmd.reduce((acc, part, i) => acc + part + (values[i] ?? ""), "") + notifyCalls.push(cmdStr) + return { stdout: "", stderr: "", exitCode: 0 } + }, + } as any + spyOn(utils, "getTerminalNotifierPath").mockResolvedValue(null) + spyOn(utils, "getOsascriptPath").mockResolvedValue("/usr/bin/osascript") + + // when - sendSessionNotification is called directly on darwin + await sender.sendSessionNotification(mockCtx, "darwin", "Test Title", "Test Message") + + // then - notification uses osascript (fallback) + expect(notifyCalls.length).toBeGreaterThanOrEqual(1) + const osascriptCall = notifyCalls.find(c => c.includes("osascript")) + expect(osascriptCall).toBeDefined() + const tnCall = notifyCalls.find(c => c.includes("terminal-notifier")) + expect(tnCall).toBeUndefined() + }) + + test("should use terminal-notifier without -activate when __CFBundleIdentifier is not set", async () => { + // given - terminal-notifier available but no bundle ID + spyOn(sender, "sendSessionNotification").mockRestore() + const notifyCalls: string[] = [] + const mockCtx = { + $: async (cmd: TemplateStringsArray | string, ...values: any[]) => { + const cmdStr = typeof cmd === "string" + ? cmd + : cmd.reduce((acc, part, i) => acc + part + (values[i] ?? ""), "") + notifyCalls.push(cmdStr) + return { stdout: "", stderr: "", exitCode: 0 } + }, + } as any + spyOn(utils, "getTerminalNotifierPath").mockResolvedValue("/usr/local/bin/terminal-notifier") + const originalEnv = process.env.__CFBundleIdentifier + delete process.env.__CFBundleIdentifier + + // when - sendSessionNotification is called directly on darwin + await sender.sendSessionNotification(mockCtx, "darwin", "Test Title", "Test Message") + + // then - terminal-notifier used but without -activate flag + expect(notifyCalls.length).toBeGreaterThanOrEqual(1) + const tnCall = notifyCalls.find(c => c.includes("terminal-notifier")) + expect(tnCall).toBeDefined() + expect(tnCall).not.toContain("-activate") + + // cleanup + if (originalEnv !== undefined) { + process.env.__CFBundleIdentifier = originalEnv + } + }) + })