@@ -342,6 +350,19 @@ export function NewTaskModal({ open, onClose, editTask }: Props) {
{notifyEnabled && (
diff --git a/desktop/src/hooks/useScheduledTaskDesktopNotifications.test.tsx b/desktop/src/hooks/useScheduledTaskDesktopNotifications.test.tsx
new file mode 100644
index 00000000..0c8efca1
--- /dev/null
+++ b/desktop/src/hooks/useScheduledTaskDesktopNotifications.test.tsx
@@ -0,0 +1,129 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { render } from '@testing-library/react'
+import { useScheduledTaskDesktopNotifications } from './useScheduledTaskDesktopNotifications'
+
+const { listMock, getRecentRunsMock, notifyDesktopMock } = vi.hoisted(() => ({
+ listMock: vi.fn(),
+ getRecentRunsMock: vi.fn(),
+ notifyDesktopMock: vi.fn(),
+}))
+
+vi.mock('../api/tasks', () => ({
+ tasksApi: {
+ list: listMock,
+ getRecentRuns: getRecentRunsMock,
+ },
+}))
+
+vi.mock('../lib/desktopNotifications', () => ({
+ notifyDesktop: notifyDesktopMock,
+}))
+
+function Harness() {
+ useScheduledTaskDesktopNotifications()
+ return null
+}
+
+describe('useScheduledTaskDesktopNotifications', () => {
+ beforeEach(() => {
+ vi.useFakeTimers()
+ localStorage.clear()
+ listMock.mockReset()
+ getRecentRunsMock.mockReset()
+ notifyDesktopMock.mockReset()
+ })
+
+ it('does not notify old runs on first poll and notifies new desktop-enabled task runs later', async () => {
+ listMock.mockResolvedValue({
+ tasks: [{
+ id: 'task-1',
+ name: 'Daily review',
+ cron: '* * * * *',
+ prompt: 'review',
+ enabled: true,
+ createdAt: 1,
+ notification: { enabled: true, channels: ['desktop'] },
+ }],
+ })
+ getRecentRunsMock
+ .mockResolvedValueOnce({
+ runs: [{
+ id: 'run-old',
+ taskId: 'task-1',
+ taskName: 'Daily review',
+ startedAt: '2026-05-03T00:00:00.000Z',
+ completedAt: '2026-05-03T00:00:01.000Z',
+ status: 'completed',
+ prompt: 'review',
+ output: 'old result',
+ }],
+ })
+ .mockResolvedValueOnce({
+ runs: [
+ {
+ id: 'run-old',
+ taskId: 'task-1',
+ taskName: 'Daily review',
+ startedAt: '2026-05-03T00:00:00.000Z',
+ completedAt: '2026-05-03T00:00:01.000Z',
+ status: 'completed',
+ prompt: 'review',
+ output: 'old result',
+ },
+ {
+ id: 'run-new',
+ taskId: 'task-1',
+ taskName: 'Daily review',
+ startedAt: '2026-05-03T00:01:00.000Z',
+ completedAt: '2026-05-03T00:01:01.000Z',
+ status: 'failed',
+ prompt: 'review',
+ error: 'provider timeout',
+ },
+ ],
+ })
+
+ render(
)
+ await vi.waitFor(() => expect(getRecentRunsMock).toHaveBeenCalledTimes(1))
+ expect(notifyDesktopMock).not.toHaveBeenCalled()
+
+ await vi.advanceTimersByTimeAsync(30_000)
+ await vi.waitFor(() => expect(notifyDesktopMock).toHaveBeenCalledTimes(1))
+ expect(notifyDesktopMock).toHaveBeenCalledWith({
+ dedupeKey: 'scheduled-task:run-new',
+ title: '定时任务 Daily review',
+ body: '失败: provider timeout',
+ })
+ })
+
+ it('ignores task runs without the desktop notification channel', async () => {
+ listMock.mockResolvedValue({
+ tasks: [{
+ id: 'task-1',
+ name: 'IM only',
+ cron: '* * * * *',
+ prompt: 'review',
+ enabled: true,
+ createdAt: 1,
+ notification: { enabled: true, channels: ['telegram'] },
+ }],
+ })
+ getRecentRunsMock.mockResolvedValue({
+ runs: [{
+ id: 'run-1',
+ taskId: 'task-1',
+ taskName: 'IM only',
+ startedAt: '2026-05-03T00:00:00.000Z',
+ completedAt: '2026-05-03T00:00:01.000Z',
+ status: 'completed',
+ prompt: 'review',
+ }],
+ })
+
+ render(
)
+ await vi.waitFor(() => expect(getRecentRunsMock).toHaveBeenCalledTimes(1))
+ await vi.advanceTimersByTimeAsync(30_000)
+
+ expect(notifyDesktopMock).not.toHaveBeenCalled()
+ })
+})
diff --git a/desktop/src/hooks/useScheduledTaskDesktopNotifications.ts b/desktop/src/hooks/useScheduledTaskDesktopNotifications.ts
new file mode 100644
index 00000000..7bf70ad3
--- /dev/null
+++ b/desktop/src/hooks/useScheduledTaskDesktopNotifications.ts
@@ -0,0 +1,117 @@
+import { useEffect } from 'react'
+import { tasksApi } from '../api/tasks'
+import { notifyDesktop } from '../lib/desktopNotifications'
+import type { CronTask, TaskRun } from '../types/task'
+
+const POLL_INTERVAL_MS = 30_000
+const NOTIFIED_RUNS_STORAGE_KEY = 'cc-haha.notifiedDesktopTaskRuns.v1'
+const MAX_STORED_RUN_IDS = 200
+
+function isTerminalRun(run: TaskRun): boolean {
+ return run.status === 'completed' || run.status === 'failed' || run.status === 'timeout'
+}
+
+function hasDesktopNotification(task: CronTask | undefined): boolean {
+ return !!task?.notification?.enabled && task.notification.channels.includes('desktop')
+}
+
+function readNotifiedRunIds(): Set
{
+ try {
+ const raw = localStorage.getItem(NOTIFIED_RUNS_STORAGE_KEY)
+ const parsed = raw ? JSON.parse(raw) : []
+ return new Set(Array.isArray(parsed) ? parsed.filter((id): id is string => typeof id === 'string') : [])
+ } catch {
+ return new Set()
+ }
+}
+
+function writeNotifiedRunIds(runIds: Set): void {
+ try {
+ const trimmed = [...runIds].slice(-MAX_STORED_RUN_IDS)
+ localStorage.setItem(NOTIFIED_RUNS_STORAGE_KEY, JSON.stringify(trimmed))
+ } catch {
+ // Notification dedupe is best-effort; storage failures should not break the app.
+ }
+}
+
+function formatTaskRunNotification(run: TaskRun): { title: string; body: string } {
+ const status = run.status === 'completed'
+ ? '完成'
+ : run.status === 'failed'
+ ? '失败'
+ : '超时'
+ const detail = run.error || run.output || run.prompt
+ const body = detail
+ ? `${status}: ${detail.slice(0, 160)}`
+ : `状态: ${status}`
+
+ return {
+ title: `定时任务 ${run.taskName || run.taskId}`,
+ body,
+ }
+}
+
+export function collectDesktopNotifiableRuns(
+ tasks: CronTask[],
+ runs: TaskRun[],
+ notifiedRunIds: Set,
+): TaskRun[] {
+ const taskById = new Map(tasks.map((task) => [task.id, task]))
+ return runs
+ .filter((run) => isTerminalRun(run))
+ .filter((run) => hasDesktopNotification(taskById.get(run.taskId)))
+ .filter((run) => !notifiedRunIds.has(run.id))
+ .sort((a, b) => Date.parse(a.completedAt ?? a.startedAt) - Date.parse(b.completedAt ?? b.startedAt))
+}
+
+export function useScheduledTaskDesktopNotifications(): void {
+ useEffect(() => {
+ let stopped = false
+ let initialized = false
+
+ const poll = async () => {
+ try {
+ const [{ tasks }, { runs }] = await Promise.all([
+ tasksApi.list(),
+ tasksApi.getRecentRuns(50),
+ ])
+ if (stopped) return
+
+ const notifiedRunIds = readNotifiedRunIds()
+ const pendingRuns = collectDesktopNotifiableRuns(tasks, runs, notifiedRunIds)
+
+ if (!initialized) {
+ for (const run of pendingRuns) notifiedRunIds.add(run.id)
+ writeNotifiedRunIds(notifiedRunIds)
+ initialized = true
+ return
+ }
+
+ for (const run of pendingRuns) {
+ const notification = formatTaskRunNotification(run)
+ notifyDesktop({
+ dedupeKey: `scheduled-task:${run.id}`,
+ title: notification.title,
+ body: notification.body,
+ })
+ notifiedRunIds.add(run.id)
+ }
+ writeNotifiedRunIds(notifiedRunIds)
+ } catch (err) {
+ if (typeof console !== 'undefined') {
+ console.warn('[scheduledTaskNotifications] failed to poll task runs:', err)
+ }
+ }
+ }
+
+ void poll()
+ const interval = window.setInterval(() => {
+ void poll()
+ }, POLL_INTERVAL_MS)
+
+ return () => {
+ stopped = true
+ window.clearInterval(interval)
+ }
+ }, [])
+}
diff --git a/desktop/src/i18n/locales/en.ts b/desktop/src/i18n/locales/en.ts
index 11a426a7..d44a52b0 100644
--- a/desktop/src/i18n/locales/en.ts
+++ b/desktop/src/i18n/locales/en.ts
@@ -553,6 +553,18 @@ export const en = {
'settings.general.thinkingDescription': 'Controls whether new sessions start with model thinking enabled. When off, compatible providers such as DeepSeek receive an explicit non-thinking parameter.',
'settings.general.thinkingEnabled': 'Enable thinking mode',
'settings.general.thinkingHint': 'Turn this off to start new sessions with --thinking disabled; useful for DeepSeek V4 Flash/Pro and other non-thinking workflows.',
+ 'settings.general.notificationsTitle': 'System Notifications',
+ 'settings.general.notificationsDescription': 'Use native OS notifications for permission prompts and scheduled task results.',
+ 'settings.general.notificationsEnabled': 'Enable system notifications',
+ 'settings.general.notificationsHintOn': 'When enabled, the app will request notification permission and use the OS notification center.',
+ 'settings.general.notificationsHintOff': 'When disabled, permission prompts and scheduled tasks will not send desktop notifications.',
+ 'settings.general.notificationsStatus': 'Permission',
+ 'settings.general.notificationsStatusGranted': 'Granted',
+ 'settings.general.notificationsStatusDenied': 'Blocked by system settings',
+ 'settings.general.notificationsStatusDefault': 'Not requested',
+ 'settings.general.notificationsStatusUnsupported': 'Unavailable in this environment',
+ 'settings.general.notificationsAuthorize': 'Authorize',
+ 'settings.general.notificationsOpenSettings': 'Open Settings',
'settings.general.webFetchPreflightTitle': 'WebFetch Preflight',
'settings.general.webFetchPreflightDescription': 'Desktop sessions skip Claude\'s domain preflight by default to avoid false failures on third-party providers and restricted networks.',
'settings.general.webFetchPreflightEnabled': 'Skip WebFetch domain preflight',
@@ -842,9 +854,11 @@ export const en = {
'newTask.notification': 'Notification',
'newTask.notifyOnComplete': 'Push notification on completion',
'newTask.notifyChannels': 'Notification channels',
- 'newTask.notifyHint': 'Send the task title and result to your IM channels when done.',
+ 'newTask.notifyHint': 'Send a native desktop notification or IM message when the task finishes.',
+ 'newTask.notifyDesktop': 'Desktop',
'newTask.notConfigured': 'Not configured',
'newTask.noChannelConfigured': 'No IM channels configured yet. Go to Settings → IM Adapters to set up.',
+ 'newTask.noChannelSelected': 'Select at least one notification channel.',
// ─── Cron Descriptions ──────────────────────────────────────
'cron.everyMinute': 'Runs every minute',
diff --git a/desktop/src/i18n/locales/zh.ts b/desktop/src/i18n/locales/zh.ts
index 7e01828e..1a98596b 100644
--- a/desktop/src/i18n/locales/zh.ts
+++ b/desktop/src/i18n/locales/zh.ts
@@ -555,6 +555,18 @@ export const zh: Record = {
'settings.general.thinkingDescription': '控制新会话是否启用模型思考。关闭后，DeepSeek 等兼容供应商会收到显式非思考模式参数。',
'settings.general.thinkingEnabled': '启用思考模式',
'settings.general.thinkingHint': '关闭后会以 --thinking disabled 启动新会话；适合 DeepSeek V4 Flash/Pro 等需要非思考模式的模型。',
+ 'settings.general.notificationsTitle': '系统通知',
+ 'settings.general.notificationsDescription': '使用操作系统原生通知提醒授权确认和定时任务结果。',
+ 'settings.general.notificationsEnabled': '启用系统通知',
+ 'settings.general.notificationsHintOn': '开启后会请求系统通知权限，并通过系统通知中心提醒。',
+ 'settings.general.notificationsHintOff': '关闭后，授权确认和定时任务都不会发送桌面通知。',
+ 'settings.general.notificationsStatus': '权限',
+ 'settings.general.notificationsStatusGranted': '已授权',
+ 'settings.general.notificationsStatusDenied': '已被系统设置阻止',
+ 'settings.general.notificationsStatusDefault': '尚未请求',
+ 'settings.general.notificationsStatusUnsupported': '当前环境不可用',
+ 'settings.general.notificationsAuthorize': '授权通知',
+ 'settings.general.notificationsOpenSettings': '打开系统设置',
'settings.general.webFetchPreflightTitle': 'WebFetch 预检',
'settings.general.webFetchPreflightDescription': '桌面端默认跳过 Claude 的域名预检，避免第三方服务商或受限网络下出现误报失败。',
'settings.general.webFetchPreflightEnabled': '跳过 WebFetch 域名预检',
@@ -844,9 +856,11 @@ export const zh: Record = {
'newTask.notification': '通知',
'newTask.notifyOnComplete': '完成后推送通知',
'newTask.notifyChannels': '通知渠道',
- 'newTask.notifyHint': '任务完成后将标题和结果推送到 IM 渠道。',
+ 'newTask.notifyHint': '任务完成后发送原生桌面通知或 IM 消息。',
+ 'newTask.notifyDesktop': '桌面',
'newTask.notConfigured': '未配置',
'newTask.noChannelConfigured': '尚未配置任何 IM 渠道，请前往 设置 → IM 接入 进行配置。',
+ 'newTask.noChannelSelected': '请至少选择一个通知渠道。',
// ─── Cron 描述 ──────────────────────────────────────
'cron.everyMinute': '每分钟执行',
diff --git a/desktop/src/lib/desktopNotifications.test.ts b/desktop/src/lib/desktopNotifications.test.ts
new file mode 100644
index 00000000..bf6ddaec
--- /dev/null
+++ b/desktop/src/lib/desktopNotifications.test.ts
@@ -0,0 +1,128 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const notificationPluginMock = vi.hoisted(() => ({
+ isPermissionGranted: vi.fn(),
+ requestPermission: vi.fn(),
+ sendNotification: vi.fn(),
+}))
+
+vi.mock('@tauri-apps/plugin-notification', () => notificationPluginMock)
+
+import {
+ getDesktopNotificationPermission,
+ notifyDesktop,
+ requestDesktopNotificationPermission,
+ resetDesktopNotificationsForTests,
+ setNativeNotificationSenderForTests,
+} from './desktopNotifications'
+import { useSettingsStore } from '../stores/settingsStore'
+
+describe('desktopNotifications', () => {
+ beforeEach(() => {
+ vi.useRealTimers()
+ resetDesktopNotificationsForTests()
+ notificationPluginMock.isPermissionGranted.mockReset()
+ notificationPluginMock.requestPermission.mockReset()
+ notificationPluginMock.sendNotification.mockReset()
+ useSettingsStore.setState({ desktopNotificationsEnabled: true })
+ })
+
+ it('requests native notification permission before sending through the Tauri plugin', async () => {
+ notificationPluginMock.isPermissionGranted.mockResolvedValue(false)
+ notificationPluginMock.requestPermission.mockResolvedValue('granted')
+
+ notifyDesktop({
+ dedupeKey: 'permission:1',
+ title: 'Permission required',
+ body: 'Approve command execution',
+ })
+
+ await vi.waitFor(() => expect(notificationPluginMock.sendNotification).toHaveBeenCalledTimes(1))
+ expect(notificationPluginMock.isPermissionGranted).toHaveBeenCalledTimes(1)
+ expect(notificationPluginMock.requestPermission).toHaveBeenCalledTimes(1)
+ expect(notificationPluginMock.sendNotification).toHaveBeenCalledWith({
+ title: 'Permission required',
+ body: 'Approve command execution',
+ })
+ })
+
+ it('does not fall back to sound when native notification permission is denied', async () => {
+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+ notificationPluginMock.isPermissionGranted.mockResolvedValue(false)
+ notificationPluginMock.requestPermission.mockResolvedValue('denied')
+
+ notifyDesktop({ title: 'Permission required' })
+
+ await vi.waitFor(() => expect(warnSpy).toHaveBeenCalled())
+ expect(notificationPluginMock.sendNotification).not.toHaveBeenCalled()
+ expect(warnSpy).toHaveBeenCalledWith(
+ '[desktopNotifications] native notification permission was not granted',
+ )
+ warnSpy.mockRestore()
+ })
+
+ it('does not send or consume dedupe keys when desktop notifications are disabled', async () => {
+ const sender = vi.fn(async () => true)
+ setNativeNotificationSenderForTests(sender)
+ useSettingsStore.setState({ desktopNotificationsEnabled: false })
+
+ notifyDesktop({ dedupeKey: 'permission:1', title: 'Permission required' })
+ await new Promise((resolve) => setTimeout(resolve, 0))
+ expect(sender).not.toHaveBeenCalled()
+
+ useSettingsStore.setState({ desktopNotificationsEnabled: true })
+ notifyDesktop({ dedupeKey: 'permission:1', title: 'Permission required' })
+ await vi.waitFor(() => expect(sender).toHaveBeenCalledTimes(1))
+ })
+
+ it('reports and requests native notification permission', async () => {
+ notificationPluginMock.isPermissionGranted.mockResolvedValueOnce(false).mockResolvedValueOnce(false)
+ notificationPluginMock.requestPermission.mockResolvedValue('granted')
+ Object.defineProperty(window, 'Notification', {
+ configurable: true,
+ value: { permission: 'default' },
+ })
+
+ await expect(getDesktopNotificationPermission()).resolves.toBe('default')
+ await expect(requestDesktopNotificationPermission()).resolves.toBe('granted')
+ expect(notificationPluginMock.requestPermission).toHaveBeenCalledTimes(1)
+ })
+
+ it('sends a native notification once for a dedupe key', async () => {
+ const sender = vi.fn(async () => true)
+ setNativeNotificationSenderForTests(sender)
+
+ notifyDesktop({
+ dedupeKey: 'permission:1',
+ title: 'Permission required',
+ body: 'Approve command execution',
+ })
+ notifyDesktop({
+ dedupeKey: 'permission:1',
+ title: 'Permission required',
+ body: 'Approve command execution',
+ })
+ await vi.waitFor(() => expect(sender).toHaveBeenCalledTimes(1))
+
+ expect(sender).toHaveBeenCalledWith({
+ title: 'Permission required',
+ body: 'Approve command execution',
+ })
+ })
+
+ it('throttles bursts within the same cooldown scope', async () => {
+ vi.useFakeTimers()
+ const sender = vi.fn(async () => true)
+ setNativeNotificationSenderForTests(sender)
+
+ notifyDesktop({ dedupeKey: 'permission:1', cooldownScope: 'permission', title: 'One' })
+ notifyDesktop({ dedupeKey: 'permission:2', cooldownScope: 'permission', title: 'Two' })
+ await vi.runAllTimersAsync()
+ expect(sender).toHaveBeenCalledTimes(1)
+
+ vi.advanceTimersByTime(751)
+ notifyDesktop({ dedupeKey: 'permission:3', cooldownScope: 'permission', title: 'Three' })
+ await vi.runAllTimersAsync()
+ expect(sender).toHaveBeenCalledTimes(2)
+ })
+})
diff --git a/desktop/src/lib/desktopNotifications.ts b/desktop/src/lib/desktopNotifications.ts
new file mode 100644
index 00000000..6e5b06a7
--- /dev/null
+++ b/desktop/src/lib/desktopNotifications.ts
@@ -0,0 +1,154 @@
+import { useSettingsStore } from '../stores/settingsStore'
+
+const DEFAULT_COOLDOWN_MS = 750
+
+export type DesktopNotificationOptions = {
+ title: string
+ body?: string
+ dedupeKey?: string
+ cooldownScope?: string
+ cooldownMs?: number
+}
+
+type NativeNotificationSender = (options: { title: string; body?: string }) => Promise | boolean
+export type DesktopNotificationPermission = NotificationPermission | 'unsupported'
+
+const notifiedKeys = new Set()
+const lastNotificationAtByScope = new Map()
+let overrideNativeNotificationSender: NativeNotificationSender | null = null
+
+function readBrowserNotificationPermission(): DesktopNotificationPermission {
+ if (typeof window === 'undefined' || !('Notification' in window)) {
+ return 'unsupported'
+ }
+ return window.Notification.permission
+}
+
+function detectPlatform(): 'darwin' | 'win32' | 'linux' | 'unknown' {
+ const platform = typeof navigator !== 'undefined' ? navigator.platform.toLowerCase() : ''
+ const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase() : ''
+ const raw = `${platform} ${userAgent}`
+ if (raw.includes('mac')) return 'darwin'
+ if (raw.includes('win')) return 'win32'
+ if (raw.includes('linux')) return 'linux'
+ return 'unknown'
+}
+
+function getNotificationSettingsUrl(): string | null {
+ switch (detectPlatform()) {
+ case 'darwin':
+ return 'x-apple.systempreferences:com.apple.preference.notifications'
+ case 'win32':
+ return 'ms-settings:notifications'
+ default:
+ return null
+ }
+}
+
+export async function getDesktopNotificationPermission(): Promise {
+ try {
+ const { isPermissionGranted } = await import('@tauri-apps/plugin-notification')
+ if (await isPermissionGranted()) return 'granted'
+ } catch {
+ // Fall back to the Web Notification permission state below.
+ }
+ return readBrowserNotificationPermission()
+}
+
+export async function requestDesktopNotificationPermission(): Promise {
+ try {
+ const {
+ isPermissionGranted,
+ requestPermission,
+ } = await import('@tauri-apps/plugin-notification')
+
+ if (await isPermissionGranted()) return 'granted'
+ return await requestPermission()
+ } catch {
+ return readBrowserNotificationPermission()
+ }
+}
+
+export async function openDesktopNotificationSettings(): Promise {
+ const url = getNotificationSettingsUrl()
+ if (!url) return false
+
+ try {
+ const { open } = await import('@tauri-apps/plugin-shell')
+ await open(url)
+ return true
+ } catch {
+ try {
+ window.open(url, '_blank', 'noopener,noreferrer')
+ return true
+ } catch {
+ return false
+ }
+ }
+}
+
+async function sendNativeNotification(options: { title: string; body?: string }): Promise {
+ const {
+ isPermissionGranted,
+ requestPermission,
+ sendNotification,
+ } = await import('@tauri-apps/plugin-notification')
+
+ let permissionGranted = await isPermissionGranted()
+ if (!permissionGranted) {
+ const permission = await requestPermission()
+ permissionGranted = permission === 'granted'
+ }
+
+ if (!permissionGranted) {
+ return false
+ }
+
+ sendNotification(options)
+ return true
+}
+
+export function notifyDesktop(options: DesktopNotificationOptions): void {
+ if (!useSettingsStore.getState().desktopNotificationsEnabled) {
+ return
+ }
+
+ if (options.dedupeKey && notifiedKeys.has(options.dedupeKey)) {
+ return
+ }
+
+ const cooldownScope = options.cooldownScope
+ if (cooldownScope) {
+ const now = Date.now()
+ const lastNotificationAt = lastNotificationAtByScope.get(cooldownScope) ?? 0
+ if (now - lastNotificationAt < (options.cooldownMs ?? DEFAULT_COOLDOWN_MS)) {
+ return
+ }
+ lastNotificationAtByScope.set(cooldownScope, now)
+ }
+
+ if (options.dedupeKey) {
+ notifiedKeys.add(options.dedupeKey)
+ }
+
+ const sender = overrideNativeNotificationSender ?? sendNativeNotification
+ void Promise.resolve(sender({ title: options.title, body: options.body })).then((sent) => {
+ if (!sent && typeof console !== 'undefined') {
+ console.warn('[desktopNotifications] native notification permission was not granted')
+ }
+ }).catch((err) => {
+ if (typeof console !== 'undefined') {
+ console.warn('[desktopNotifications] failed to send native notification:', err)
+ }
+ })
+}
+
+export function resetDesktopNotificationsForTests(): void {
+ notifiedKeys.clear()
+ lastNotificationAtByScope.clear()
+ overrideNativeNotificationSender = null
+}
+
+export function setNativeNotificationSenderForTests(sender: NativeNotificationSender | null): void {
+ overrideNativeNotificationSender = sender
+}
diff --git a/desktop/src/pages/Settings.tsx b/desktop/src/pages/Settings.tsx
index 7881bd7e..b4067485 100644
--- a/desktop/src/pages/Settings.tsx
+++ b/desktop/src/pages/Settings.tsx
@@ -31,6 +31,12 @@ import { ClaudeOfficialLogin } from '../components/settings/ClaudeOfficialLogin'
import { useUpdateStore } from '../stores/updateStore'
import { formatBytes } from '../lib/formatBytes'
import { isTauriRuntime } from '../lib/desktopRuntime'
+import {
+ getDesktopNotificationPermission,
+ openDesktopNotificationSettings,
+ requestDesktopNotificationPermission,
+ type DesktopNotificationPermission,
+} from '../lib/desktopNotifications'
export function Settings() {
const [activeTab, setActiveTab] = useState('providers')
@@ -883,17 +889,31 @@ function GeneralSettings() {
setTheme,
skipWebFetchPreflight,
setSkipWebFetchPreflight,
+ desktopNotificationsEnabled,
+ setDesktopNotificationsEnabled,
webSearch,
setWebSearch,
} = useSettingsStore()
const t = useTranslation()
const [webSearchDraft, setWebSearchDraft] = useState(webSearch)
+ const [notificationPermission, setNotificationPermission] = useState('default')
+ const [notificationActionRunning, setNotificationActionRunning] = useState(false)
const webSearchDirty = JSON.stringify(webSearchDraft) !== JSON.stringify(webSearch)
useEffect(() => {
setWebSearchDraft(webSearch)
}, [webSearch])
+ useEffect(() => {
+ let cancelled = false
+ getDesktopNotificationPermission().then((permission) => {
+ if (!cancelled) setNotificationPermission(permission)
+ })
+ return () => {
+ cancelled = true
+ }
+ }, [])
+
const EFFORT_LABELS: Record = {
low: t('settings.general.effort.low'),
medium: t('settings.general.effort.medium'),
@@ -919,6 +939,46 @@ function GeneralSettings() {
{ value: 'disabled', label: t('settings.general.webSearch.mode.disabled') },
]
+ const notificationStatusLabel: Record = {
+ granted: t('settings.general.notificationsStatusGranted'),
+ denied: t('settings.general.notificationsStatusDenied'),
+ default: t('settings.general.notificationsStatusDefault'),
+ unsupported: t('settings.general.notificationsStatusUnsupported'),
+ }
+
+ const handleDesktopNotificationsToggle = async (enabled: boolean) => {
+ await setDesktopNotificationsEnabled(enabled)
+ if (!enabled) return
+
+ setNotificationActionRunning(true)
+ try {
+ const permission = await requestDesktopNotificationPermission()
+ setNotificationPermission(permission)
+ if (permission === 'denied') {
+ await openDesktopNotificationSettings()
+ }
+ } finally {
+ setNotificationActionRunning(false)
+ }
+ }
+
+ const handleNotificationPermissionAction = async () => {
+ setNotificationActionRunning(true)
+ try {
+ if (notificationPermission === 'denied') {
+ await openDesktopNotificationSettings()
+ } else {
+ const permission = await requestDesktopNotificationPermission()
+ setNotificationPermission(permission)
+ if (permission === 'denied') {
+ await openDesktopNotificationSettings()
+ }
+ }
+ } finally {
+ setNotificationActionRunning(false)
+ }
+ }
+
return (
{/* Appearance selector */}
@@ -1000,6 +1060,52 @@ function GeneralSettings() {
+
+
{t('settings.general.notificationsTitle')}
+
{t('settings.general.notificationsDescription')}
+
+
+ {desktopNotificationsEnabled && (
+
+
+ {t('settings.general.notificationsStatus')}: {notificationStatusLabel[notificationPermission]}
+
+ {notificationPermission !== 'granted' && notificationPermission !== 'unsupported' && (
+
+ )}
+
+ )}
+
+
{t('settings.general.webFetchPreflightTitle')}
{t('settings.general.webFetchPreflightDescription')}
diff --git a/desktop/src/stores/chatStore.test.ts b/desktop/src/stores/chatStore.test.ts
index b518964e..7eeb9094 100644
--- a/desktop/src/stores/chatStore.test.ts
+++ b/desktop/src/stores/chatStore.test.ts
@@ -15,6 +15,7 @@ const {
markCompletedAndDismissedMock,
resetCompletedTasksMock,
refreshTasksMock,
+ notifyDesktopMock,
cliTaskStoreSnapshot,
} = vi.hoisted(() => ({
sendMock: vi.fn(),
@@ -29,12 +30,17 @@ const {
markCompletedAndDismissedMock: vi.fn(),
resetCompletedTasksMock: vi.fn(async () => {}),
refreshTasksMock: vi.fn(),
+ notifyDesktopMock: vi.fn(),
cliTaskStoreSnapshot: {
tasks: [] as Array<{ id: string; subject: string; status: string; activeForm?: string }>,
sessionId: null as string | null,
},
}))
+vi.mock('../lib/desktopNotifications', () => ({
+ notifyDesktop: notifyDesktopMock,
+}))
+
vi.mock('../api/websocket', () => ({
wsManager: {
connect: vi.fn(),
@@ -113,6 +119,7 @@ describe('chatStore history mapping', () => {
markCompletedAndDismissedMock.mockReset()
resetCompletedTasksMock.mockReset()
refreshTasksMock.mockReset()
+ notifyDesktopMock.mockReset()
cliTaskStoreSnapshot.tasks = []
cliTaskStoreSnapshot.sessionId = null
useSessionRuntimeStore.setState({ selections: {} })
@@ -686,6 +693,12 @@ describe('chatStore history mapping', () => {
type: 'tool_use',
toolUseId: 'tool-ask-1',
})
+ expect(notifyDesktopMock).toHaveBeenCalledWith({
+ dedupeKey: 'permission:perm-ask-1',
+ cooldownScope: 'permission-prompt',
+ title: 'Claude Code Haha 需要你的确认',
+ body: 'AskUserQuestion 请求执行，正在等待允许。',
+ })
})
it('sends permission mode updates to the active session only', () => {
@@ -993,6 +1006,12 @@ describe('chatStore history mapping', () => {
expect(
useChatStore.getState().sessions[TEST_SESSION_ID]?.chatState,
).toBe('permission_pending')
+ expect(notifyDesktopMock).toHaveBeenCalledWith({
+ dedupeKey: 'computer-use-permission:cu-1',
+ cooldownScope: 'permission-prompt',
+ title: 'Claude Code Haha 需要你的确认',
+ body: 'Open Finder and inspect a file',
+ })
})
it('keeps delayed text blocks from one streamed assistant turn in a single message', () => {
diff --git a/desktop/src/stores/chatStore.ts b/desktop/src/stores/chatStore.ts
index 754948da..00550aae 100644
--- a/desktop/src/stores/chatStore.ts
+++ b/desktop/src/stores/chatStore.ts
@@ -7,6 +7,7 @@ import { useCLITaskStore } from './cliTaskStore'
import { useSessionRuntimeStore } from './sessionRuntimeStore'
import { useTabStore } from './tabStore'
import { randomSpinnerVerb } from '../config/spinnerVerbs'
+import { notifyDesktop } from '../lib/desktopNotifications'
import { AGENT_LIFECYCLE_TYPES } from '../types/team'
import type { MessageEntry } from '../types/session'
import type { PermissionMode } from '../types/settings'
@@ -670,6 +671,14 @@ export const useChatStore = create
((set, get) => ({
break
case 'permission_request':
+ notifyDesktop({
+ dedupeKey: `permission:${msg.requestId}`,
+ cooldownScope: 'permission-prompt',
+ title: 'Claude Code Haha 需要你的确认',
+ body: msg.toolName
+ ? `${msg.toolName} 请求执行，正在等待允许。`
+ : '有一个工具请求正在等待允许。',
+ })
update((s) => ({
pendingPermission: {
requestId: msg.requestId,
@@ -698,6 +707,12 @@ export const useChatStore = create((set, get) => ({
break
case 'computer_use_permission_request':
+ notifyDesktop({
+ dedupeKey: `computer-use-permission:${msg.requestId}`,
+ cooldownScope: 'permission-prompt',
+ title: 'Claude Code Haha 需要你的确认',
+ body: msg.request.reason || 'Computer Use 正在等待允许。',
+ })
update(() => ({
pendingComputerUsePermission: {
requestId: msg.requestId,
diff --git a/desktop/src/stores/settingsStore.test.ts b/desktop/src/stores/settingsStore.test.ts
index 02a57ada..ab6246a0 100644
--- a/desktop/src/stores/settingsStore.test.ts
+++ b/desktop/src/stores/settingsStore.test.ts
@@ -20,3 +20,60 @@ describe('settingsStore locale defaults', () => {
expect(useSettingsStore.getState().locale).toBe('en')
})
})
+
+describe('settingsStore desktop notification persistence', () => {
+ beforeEach(() => {
+ vi.resetModules()
+ vi.clearAllMocks()
+ window.localStorage.clear()
+ })
+
+ it('persists the latest desktop notification toggle when saves overlap', async () => {
+ const pendingSaves: Array<() => void> = []
+ const updateUser = vi.fn(
+ () =>
+ new Promise<{ ok: true }>((resolve) => {
+ pendingSaves.push(() => resolve({ ok: true }))
+ }),
+ )
+
+ vi.doMock('../api/settings', () => ({
+ settingsApi: {
+ getUser: vi.fn(),
+ updateUser,
+ getPermissionMode: vi.fn(),
+ setPermissionMode: vi.fn(),
+ getCliLauncherStatus: vi.fn(),
+ },
+ }))
+ vi.doMock('../api/models', () => ({
+ modelsApi: {
+ list: vi.fn(),
+ getCurrent: vi.fn(),
+ setCurrent: vi.fn(),
+ getEffort: vi.fn(),
+ setEffort: vi.fn(),
+ },
+ }))
+
+ const { useSettingsStore } = await import('./settingsStore')
+
+ const firstSave = useSettingsStore.getState().setDesktopNotificationsEnabled(false)
+ await vi.waitFor(() => {
+ expect(updateUser).toHaveBeenCalledWith({ desktopNotificationsEnabled: false })
+ })
+
+ const secondSave = useSettingsStore.getState().setDesktopNotificationsEnabled(true)
+ expect(useSettingsStore.getState().desktopNotificationsEnabled).toBe(true)
+
+ pendingSaves.shift()?.()
+ await vi.waitFor(() => {
+ expect(updateUser).toHaveBeenCalledWith({ desktopNotificationsEnabled: true })
+ })
+ pendingSaves.shift()?.()
+ await Promise.all([firstSave, secondSave])
+
+ expect(updateUser).toHaveBeenLastCalledWith({ desktopNotificationsEnabled: true })
+ expect(useSettingsStore.getState().desktopNotificationsEnabled).toBe(true)
+ })
+})
diff --git a/desktop/src/stores/settingsStore.ts b/desktop/src/stores/settingsStore.ts
index 81668221..182401a8 100644
--- a/desktop/src/stores/settingsStore.ts
+++ b/desktop/src/stores/settingsStore.ts
@@ -6,6 +6,7 @@ import type { Locale } from '../i18n'
import { useUIStore } from './uiStore'
const LOCALE_STORAGE_KEY = 'cc-haha-locale'
+let desktopNotificationsSaveQueue: Promise = Promise.resolve()
function getStoredLocale(): Locale {
try {
@@ -25,6 +26,7 @@ type SettingsStore = {
locale: Locale
theme: ThemeMode
skipWebFetchPreflight: boolean
+ desktopNotificationsEnabled: boolean
webSearch: WebSearchSettings
isLoading: boolean
error: string | null
@@ -37,6 +39,7 @@ type SettingsStore = {
setLocale: (locale: Locale) => void
setTheme: (theme: ThemeMode) => Promise
setSkipWebFetchPreflight: (enabled: boolean) => Promise
+ setDesktopNotificationsEnabled: (enabled: boolean) => Promise
setWebSearch: (settings: WebSearchSettings) => Promise
}
@@ -50,6 +53,7 @@ export const useSettingsStore = create((set, get) => ({
locale: getStoredLocale(),
theme: useUIStore.getState().theme,
skipWebFetchPreflight: true,
+ desktopNotificationsEnabled: true,
webSearch: { mode: 'auto', tavilyApiKey: '', braveApiKey: '' },
isLoading: false,
error: null,
@@ -75,6 +79,7 @@ export const useSettingsStore = create((set, get) => ({
thinkingEnabled: userSettings.alwaysThinkingEnabled !== false,
theme,
skipWebFetchPreflight: userSettings.skipWebFetchPreflight !== false,
+ desktopNotificationsEnabled: userSettings.desktopNotificationsEnabled !== false,
webSearch: normalizeWebSearchSettings(userSettings.webSearch),
isLoading: false,
error: null,
@@ -150,6 +155,27 @@ export const useSettingsStore = create((set, get) => ({
}
},
+ setDesktopNotificationsEnabled: async (enabled) => {
+ const prev = get().desktopNotificationsEnabled
+ set({ desktopNotificationsEnabled: enabled })
+ const save = desktopNotificationsSaveQueue
+ .catch(() => undefined)
+ .then(async () => {
+ if (get().desktopNotificationsEnabled !== enabled) return
+ await settingsApi.updateUser({ desktopNotificationsEnabled: enabled })
+ })
+
+ desktopNotificationsSaveQueue = save
+
+ try {
+ await save
+ } catch {
+ if (get().desktopNotificationsEnabled === enabled) {
+ set({ desktopNotificationsEnabled: prev })
+ }
+ }
+ },
+
setWebSearch: async (webSearch) => {
const prev = get().webSearch
const next = normalizeWebSearchSettings(webSearch)
diff --git a/desktop/src/types/settings.ts b/desktop/src/types/settings.ts
index 0880fe4b..188955b4 100644
--- a/desktop/src/types/settings.ts
+++ b/desktop/src/types/settings.ts
@@ -27,6 +27,7 @@ export type UserSettings = {
permissionMode?: PermissionMode
theme?: ThemeMode
skipWebFetchPreflight?: boolean
+ desktopNotificationsEnabled?: boolean
webSearch?: WebSearchSettings
[key: string]: unknown
}
diff --git a/desktop/src/types/task.ts b/desktop/src/types/task.ts
index 9ccbbba3..f8904da2 100644
--- a/desktop/src/types/task.ts
+++ b/desktop/src/types/task.ts
@@ -2,7 +2,7 @@
export type TaskNotificationConfig = {
enabled: boolean
- channels: ('telegram' | 'feishu')[]
+ channels: ('desktop' | 'telegram' | 'feishu')[]
}
export type CronTask = {
diff --git a/src/server/services/cronService.ts b/src/server/services/cronService.ts
index a20ab924..0e147f5d 100644
--- a/src/server/services/cronService.ts
+++ b/src/server/services/cronService.ts
@@ -13,7 +13,7 @@ import { ApiError } from '../middleware/errorHandler.js'
export type TaskNotificationConfig = {
enabled: boolean
- channels: ('telegram' | 'feishu')[]
+ channels: ('desktop' | 'telegram' | 'feishu')[]
}
export type CronTask = {
diff --git a/src/server/services/notificationService.ts b/src/server/services/notificationService.ts
index 024d427b..91b9542c 100644
--- a/src/server/services/notificationService.ts
+++ b/src/server/services/notificationService.ts
@@ -224,7 +224,10 @@ export async function sendTaskNotification(
run: TaskRun,
notification: TaskNotificationConfig,
): Promise {
- if (!notification.enabled || notification.channels.length === 0) return
+ const imChannels = notification.channels.filter((channel): channel is 'telegram' | 'feishu' =>
+ channel === 'telegram' || channel === 'feishu',
+ )
+ if (!notification.enabled || imChannels.length === 0) return
let config: AdapterFileConfig
try {
@@ -236,7 +239,7 @@ export async function sendTaskNotification(
const markdown = buildMarkdown(run)
- for (const channel of notification.channels) {
+ for (const channel of imChannels) {
try {
if (channel === 'telegram') {
const botToken = config.telegram?.botToken