fix: App启动初始化番茄钟+设置页返回按钮+API本地模式401不踢登录+批量选择hook

Author: Aparencia

client/src/App.tsx

@@ -35,13 +35,19 @@ import { WorldRecap } from '@/features/retention/components/WorldRecap';
 import { WorldSoundscape } from '@/lib/audio/WorldSoundscape';
 import '@/stores/useSettingsStore'; // 导入以触发音效设置初始化
 import { startPomodoroScheduler } from '@/features/pomodoro/lib/pomodoroScheduler';
+import { usePomodoroStore } from '@/features/pomodoro/store/usePomodoroStore';
 
 // 启动时预加载所有音效（不阻塞渲染）
 soundPlayer.preloadAll();
 
 // 番茄钟全局计时调度器：tick 驱动与页面生命周期解耦（切页后计时不停摆）
 startPomodoroScheduler();
 
+// 番茄钟持久化初始化：此前 initialize 仅在设置页挂载时触发（PomodoroSettingsPage），
+// 深潜主页启动不加载——用户设置的时长/预设刷新后回退默认值（25 分钟），
+// 且完成的番茄按默认时长落库（学习脉搏数据失真）。App 启动即初始化，幂等安全。
+usePomodoroStore.getState().initialize().catch(() => {});
+
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {

client/src/features/beta/LicenseActivation.tsx

@@ -10,7 +10,7 @@ import { Key, Check, AlertTriangle, Sparkles, ExternalLink } from 'lucide-react'
 import { Button, Input, useToast } from '@/components/ui';
 import { cn } from '@/lib/utils';
 import { useBetaStore } from '@/features/beta/betaStore';
-import { type License, type LicenseType } from '@/types/beta';
+import { type License, type LicenseType, type UserTier } from '@/types/beta';
 import { useAuth } from '@/lib/auth/AuthContext';
 
 /** 激活码格式校验正则 */

client/src/features/pomodoro/pages/PomodoroSettingsPage.tsx

@@ -4,7 +4,7 @@
 import { useState, useEffect, useRef } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { motion } from 'framer-motion';
-import { Timer, Zap, Bell, Save, RotateCcw, GraduationCap, Sparkles, CheckCircle2, Music, Volume2, Brain, Plus, Pencil, Trash2, Layers, ChevronUp, ChevronDown } from 'lucide-react';
+import { Timer, Zap, Bell, Save, RotateCcw, GraduationCap, Sparkles, CheckCircle2, Music, Volume2, Brain, Plus, Pencil, Trash2, Layers, ChevronUp, ChevronDown, ArrowLeft } from 'lucide-react';
 import { AIThinkingIndicator } from '@/components/ui/AIThinkingIndicator';
 import { Button, Card, Input, useToast } from '@/components/ui';
 import { cn } from '@/lib/utils';
@@ -196,10 +196,25 @@ export default function PomodoroSettingsPage() {
       animate="visible"
       variants={{ hidden: {}, visible: { transition: { staggerChildren: 0.07, delayChildren: 0.06 } } }}
     >
-      <motion.h1
-        className="text-h1 font-semibold text-text-primary mb-kb-lg"
+      <motion.div
+        className="flex items-center gap-2 mb-kb-lg"
         variants={{ hidden: { opacity: 0, y: -12, scale: 0.97 }, visible: { opacity: 1, y: 0, transition: { duration: 0.35 } } }}
-      >深潜设置</motion.h1>
+      >
+        {/* 返回深潜模块（内测反馈：设置页此前无出口，只能 Esc 退到 3D 场景） */}
+        <Tip text="返回深潜">
+          <button
+            onClick={() => navigate('/pomodoro')}
+            aria-label="返回深潜"
+            className="p-1.5 rounded-kb-full text-text-tertiary hover:text-text-primary hover:bg-bg-tertiary transition-all duration-kb-fast"
+          >
+            <ArrowLeft className="w-icon-md h-icon-md" strokeWidth={1.5} />
+          </button>
+        </Tip>
+        <motion.h1
+          className="text-h1 font-semibold text-text-primary"
+          variants={{ hidden: { opacity: 0, y: -12, scale: 0.97 }, visible: { opacity: 1, y: 0, transition: { duration: 0.35 } } }}
+        >深潜设置</motion.h1>
+      </motion.div>
 
       {/* Duration settings */}
       <motion.div variants={{ hidden: { opacity: 0, y: 16, scale: 0.97 }, visible: { opacity: 1, y: 0, transition: { duration: 0.35 } } }}>

client/src/hooks/useBatchSelection.ts

@@ -0,0 +1,75 @@
+/**
+ * 批量选择状态 hook（萤火海沟批量整理模式的通用化）
+ *
+ * @ai-context: 统一 batchMode + selectedIds 状态机，供笔记列表 / 闪卡列表等
+ * 需要批量操作的模块复用。退出批量模式时自动清空选中；toggle 支持
+ * shiftKey 语义由调用方自行决定（默认单选切换）。
+ * @ai-context: Shared batch-selection state machine, extracted from the
+ * Inspiration batch mode; auto-clears selection when batch mode is exited.
+ */
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+interface UseBatchSelectionOptions<T extends { id: string }> {
+  /** 参与全选的候选列表（全选基于当前可见/过滤结果） */
+  items: T[];
+  /** 进入批量模式时是否自动全选 */
+  selectAllOnEnter?: boolean;
+}
+
+export function useBatchSelection<T extends { id: string }>({
+  items,
+  selectAllOnEnter = false,
+}: UseBatchSelectionOptions<T>) {
+  const [batchMode, setBatchMode] = useState(false);
+  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
+
+  // 退出批量模式时清空选中（与萤火海沟行为一致）
+  useEffect(() => {
+    if (!batchMode) setSelectedIds(new Set());
+  }, [batchMode]);
+
+  // 进入批量模式时可选全选
+  useEffect(() => {
+    if (batchMode && selectAllOnEnter) {
+      setSelectedIds(new Set(items.map((i) => i.id)));
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [batchMode, selectAllOnEnter]);
+
+  const toggle = useCallback((id: string) => {
+    setSelectedIds((prev) => {
+      const next = new Set(prev);
+      if (next.has(id)) {
+        next.delete(id);
+      } else {
+        next.add(id);
+      }
+      return next;
+    });
+  }, []);
+
+  const selectAll = useCallback(() => {
+    setSelectedIds(new Set(items.map((i) => i.id)));
+  }, [items]);
+
+  const clear = useCallback(() => {
+    setSelectedIds(new Set());
+  }, []);
+
+  const enter = useCallback(() => setBatchMode(true), []);
+  const exit = useCallback(() => setBatchMode(false), []);
+
+  const count = useMemo(() => selectedIds.size, [selectedIds]);
+
+  return {
+    batchMode,
+    setBatchMode,
+    selectedIds,
+    toggle,
+    selectAll,
+    clear,
+    enter,
+    exit,
+    count,
+  };
+}

client/src/lib/http/apiClient.ts

@@ -66,7 +66,12 @@ function createClient(baseUrlOrGetter: string | (() => string)) {
 
         // 仅当刷新本身失败（refresh token 真正过期/失效）才判定为登录过期
         if (refreshError || !refreshed?.access_token) {
-          window.dispatchEvent(new CustomEvent('kb:session-expired'));
+          // 仅当 Supabase 存在会话（云端模式）才判定登录过期；本地优先/未登录
+          // 用户无会话时，网关 401（凭证缺失/失效）只抛普通错误，不踢登录
+          const { data: { session: current } } = await supabase.auth.getSession();
+          if (current) {
+            window.dispatchEvent(new CustomEvent('kb:session-expired'));
+          }
           throw new Error('HTTP 401: 登录已过期');
         }
 
@@ -146,7 +151,11 @@ function createClient(baseUrlOrGetter: string | (() => string)) {
       if (response.status === 401) {
         const { data: { session: refreshed }, error: refreshError } = await refreshSessionShared();
         if (refreshError || !refreshed?.access_token) {
-          window.dispatchEvent(new CustomEvent('kb:session-expired'));
+          // 同上：无 Supabase 会话时网关 401 不触发登录过期（本地模式）
+          const { data: { session: current } } = await supabase.auth.getSession();
+          if (current) {
+            window.dispatchEvent(new CustomEvent('kb:session-expired'));
+          }
           throw new Error('HTTP 401: 登录已过期');
         }
         headers.set('Authorization', `Bearer ${refreshed.access_token}`);