{praiseText}
++ {currentStep.instruction} +
+usePomodoroEffects()
@@ -12,10 +15,7 @@
import { useEffect, useRef } from 'react';
import { usePomodoroActionSignal } from '../store/usePomodoroStore';
-import { recordSession, playCompletionSound, sendNotification } from '../store/usePomodoroPersistence';
-import { soundPlayer } from '@/lib/audio/SoundPlayer';
import { triggerInkRipple } from '@/lib/animation/InkRipple';
-import type { PomodoroAction } from '../store/usePomodoroStore';
/**
* 番茄钟副作用 hook
@@ -44,125 +44,10 @@ export function usePomodoroEffects(): void {
if (signal.lastActionCounter === prevCounterRef.current) return;
prevCounterRef.current = signal.lastActionCounter;
- const action: PomodoroAction | null = signal.lastAction;
- if (!action) return;
-
- switch (action) {
- case 'start':
- soundPlayer.play('pomodoro_start');
- break;
-
- case 'pause':
- soundPlayer.play('pomodoro_pause');
- break;
-
- case 'exit_immersive':
- soundPlayer.play('pomodoro_pause');
- break;
-
- case 'tick_5min_warning':
- // store 已确保 mode !== 'class' 时才发出此信号
- soundPlayer.play('pomodoro_5min_warning');
- break;
-
- case 'tick_final':
- // store 已确保 mode !== 'class' 时才发出此信号
- soundPlayer.play('pomodoro_tick_final');
- break;
-
- case 'phase_complete':
- handlePhaseComplete(signal);
- break;
+ // 音效/会话记录/浏览器通知均由 store 内联执行，此处仅处理视觉反馈
+ if (signal.lastAction === 'phase_complete') {
+ // 水墨涟漪反馈：每次阶段完成时触发
+ triggerInkRipple(window.innerWidth / 2, window.innerHeight / 2);
}
}, [signal.lastActionCounter, signal.lastAction, signal]);
}
-
-// ─────────────────────────────────────────────────────────────
-// 内部：phase_complete 副作用处理
-// ─────────────────────────────────────────────────────────────
-
-interface PhaseCompletePayload {
- lastCompletedPhase: 'work' | 'short_break' | 'long_break' | null;
- isCycleComplete: boolean;
- lastSessionActualDuration: number | null;
- mode: 'class' | 'self_study';
- settings: {
- soundEnabled: boolean;
- notificationEnabled: boolean;
- workDuration: number;
- classDuration: number;
- };
- currentGoal: string | null;
-}
-
-function handlePhaseComplete(payload: PhaseCompletePayload): void {
- const {
- lastCompletedPhase,
- isCycleComplete,
- lastSessionActualDuration,
- mode,
- settings,
- currentGoal,
- } = payload;
-
- if (!lastCompletedPhase) return;
-
- // ── 水墨涟漪反馈：每次阶段完成时触发 ────────────────
- triggerInkRipple(window.innerWidth / 2, window.innerHeight / 2);
-
- // ── 记录会话（仅 work 阶段） ─────────────────────────────
- if (lastCompletedPhase === 'work') {
- const workMinutes = mode === 'class' ? settings.classDuration : settings.workDuration;
- const actualDuration = lastSessionActualDuration ?? workMinutes * 60;
-
- recordSession({
- mode,
- duration: workMinutes * 60,
- actualDuration,
- completedAt: new Date(),
- interrupted: false,
- goal: currentGoal ?? undefined,
- })
- .then(() => {
- // 触发成就检查（动态 import 避免循环依赖）
- import('@/lib/achievements/evaluator')
- .then(({ checkAchievements }) => {
- checkAchievements({ type: 'pomodoro_completed' })
- .then((unlocked) => {
- unlocked.forEach((a) => {
- window.dispatchEvent(
- new CustomEvent('achievement-unlocked', { detail: a }),
- );
- });
- })
- .catch(() => {});
- })
- .catch(() => {});
- })
- .catch(() => {});
- }
-
- // ── 播放音效（上课模式静默） ──────────────────────────────
- if (mode !== 'class') {
- if (settings.soundEnabled) {
- playCompletionSound();
- }
- if (lastCompletedPhase === 'work') {
- soundPlayer.play('pomodoro_work_complete');
- } else {
- soundPlayer.play('pomodoro_break_end');
- if (isCycleComplete) {
- soundPlayer.play('pomodoro_complete');
- }
- }
- }
-
- // ── 发送浏览器通知 ────────────────────────────────────────
- if (settings.notificationEnabled) {
- if (lastCompletedPhase === 'work') {
- sendNotification('又添了一段暖意', '继续深潜吧 ☕').catch(() => {});
- } else {
- sendNotification('休息结束！', '开始下一个番茄 🍅').catch(() => {});
- }
- }
-}
diff --git a/client/src/features/pomodoro/store/usePomodoroStore.test.ts b/client/src/features/pomodoro/store/usePomodoroStore.test.ts
index b9d31165..8fa59832 100644
--- a/client/src/features/pomodoro/store/usePomodoroStore.test.ts
+++ b/client/src/features/pomodoro/store/usePomodoroStore.test.ts
@@ -465,5 +465,54 @@ describe('Pomodoro Store', () => {
usePomodoroStore.getState().setMode('class');
expect(usePomodoroStore.getState().mode).toBe('class');
});
+
+ it('should reset completedCount when switching mode', () => {
+ // 上课模式累计了 7 个番茄后切到自习模式，计数应归零
+ // （回归：旧计数带入新模式导致首轮长休要等到 8 个番茄）
+ usePomodoroStore.setState({ mode: 'class', completedCount: 7 });
+ usePomodoroStore.getState().setMode('self_study');
+ expect(usePomodoroStore.getState().completedCount).toBe(0);
+ });
+
+ it('should NOT reset completedCount when setting the same mode', () => {
+ usePomodoroStore.setState({ mode: 'self_study', completedCount: 2 });
+ usePomodoroStore.getState().setMode('self_study');
+ expect(usePomodoroStore.getState().completedCount).toBe(2);
+ });
+ });
+
+ // ── class mode completedCount ────────────────────────────
+
+ describe('class mode completedCount', () => {
+ const completeWorkPhase = () => {
+ usePomodoroStore.setState({ phase: 'work', remainingSeconds: 1, isRunning: true });
+ usePomodoroStore.getState().tick(); // work → short_break
+ usePomodoroStore.setState({ remainingSeconds: 1, isRunning: true });
+ usePomodoroStore.getState().tick(); // short_break → work
+ };
+
+ it('should never enter long_break in class mode', () => {
+ usePomodoroStore.setState({
+ mode: 'class', phase: 'work', completedCount: 3,
+ isRunning: true, remainingSeconds: 1,
+ });
+ usePomodoroStore.getState().tick();
+ expect(usePomodoroStore.getState().phase).toBe('short_break');
+ });
+
+ it('should wrap completedCount within longBreakInterval in class mode (no unbounded growth)', () => {
+ // 回归：上课模式无长休导致计数永不归零、一直累加（实测 9/4）
+ usePomodoroStore.setState({ mode: 'class', completedCount: 0 });
+ for (let i = 0; i < 9; i++) completeWorkPhase();
+ const count = usePomodoroStore.getState().completedCount;
+ expect(count).toBeGreaterThanOrEqual(1);
+ expect(count).toBeLessThanOrEqual(DEFAULT_SETTINGS.longBreakInterval);
+ });
+
+ it('should wrap count via skip in class mode as well', () => {
+ usePomodoroStore.setState({ mode: 'class', phase: 'work', completedCount: 4 });
+ usePomodoroStore.getState().skip();
+ expect(usePomodoroStore.getState().completedCount).toBe(1);
+ });
});
});
diff --git a/client/src/features/pomodoro/store/usePomodoroStore.ts b/client/src/features/pomodoro/store/usePomodoroStore.ts
index 67f1e966..d299383f 100644
--- a/client/src/features/pomodoro/store/usePomodoroStore.ts
+++ b/client/src/features/pomodoro/store/usePomodoroStore.ts
@@ -44,6 +44,8 @@ interface PomodoroState {
sessionStartTime: number | null;
/** 当前番茄目标文字 */
currentGoal: string | null;
+ /** 首潜迷你会话标记：3 分钟体验潜水，会话时长按实际记录而非 settings 时长 */
+ isMiniDive: boolean;
/** 是否处于沉浸专注模式 */
isImmersive: boolean;
/** 退出沉浸后标记，用于 resume 时自动重入 */
@@ -64,6 +66,8 @@ interface PomodoroState {
lastSessionActualDuration: number | null;
start: () => void;
+ /** 开始首潜 3 分钟迷你体验（新手引导专用，不改动用户设置） */
+ startMiniDive: () => void;
pause: () => void;
resume: () => void;
reset: () => void;
@@ -90,6 +94,9 @@ const getPhaseDuration = (phase: Phase, settings: PomodoroSettings, mode?: Mode)
}
};
+/** 首潜迷你体验时长（3 分钟），见新手引导系统 */
+export const MINI_DIVE_SECONDS = 180;
+
const getNextPhase = (
currentPhase: Phase,
completedCount: number,
@@ -106,6 +113,24 @@ const getNextPhase = (
return 'work';
};
+/**
+ * 计算阶段结束后的完成计数：
+ * - 长休结束 → 归零（一轮完成）
+ * - 工作结束 → +1；上课模式无长休，计数达到周期上限后回绕，避免无限累加
+ * - 其他阶段 → 不变
+ */
+const getNextCount = (
+ phase: Phase,
+ completedCount: number,
+ longBreakInterval: number,
+ mode?: Mode,
+): number => {
+ if (phase === 'long_break') return 0;
+ if (phase !== 'work') return completedCount;
+ if (mode === 'class') return (completedCount % longBreakInterval) + 1;
+ return completedCount + 1;
+};
+
export const usePomodoroStore = create