fix: preserve user-edited onboarding, gate resume button, re-check dialog on hide, dedupe reminders type

Author: VariableThe

src-tauri/src/commands/fs.rs

@@ -197,28 +197,24 @@ pub fn set_dialog_open(state: tauri::State<'_, crate::DialogState>, open: bool)
     state.is_open.store(open, Ordering::SeqCst);
 }
 
-fn write_onboarding_file(base: &Path, rel_path: &str, content: &str, is_new_version: bool) {
+fn write_onboarding_file(base: &Path, rel_path: &str, content: &str, _is_new_version: bool) {
     let path = base.join(rel_path);
     if let Some(parent) = path.parent() {
         let _ = fs::create_dir_all(parent);
     }
-    if !path.exists() || is_new_version {
+    // Only write if file doesn't exist — preserve user edits across version changes
+    if !path.exists() {
         let _ = fs::write(&path, content);
     }
 }
 
 #[tauri::command]
 pub fn remove_onboarding_files() -> Result<(), String> {
     if let Ok(base) = get_papercache_dir() {
-        let welcome = base.join("Welcome.md");
-        let _ = fs::remove_file(&welcome);
-
+        // Only remove generated onboarding content — preserve Welcome.md and commands/
         let onboarding_dir = base.join("onboarding");
         let _ = fs::remove_dir_all(&onboarding_dir);
 
-        let commands_dir = base.join("commands");
-        let _ = fs::remove_dir_all(&commands_dir);
-
         let marker = base.join(".onboarding_version");
         let _ = fs::remove_file(&marker);
     }
@@ -324,7 +320,7 @@ pub fn run_onboarding(app: &AppHandle) {
 
         write_onboarding_file(&base, "onboarding/Graph.md", &format!(
             "# Graph View\n\n\
-            Press **{0} + G** to open the interactive 2D knowledge graph.\n\n\
+            Press **{0} + G** to open the interactive 3D knowledge graph.\n\n\
             ## Features\n\n\
             - Every note is a flat circle node; internal links become edges between nodes\n\
             - Nodes cluster by folder with distinct HSL colors\n\

src-tauri/src/commands/notifications.rs

@@ -53,7 +53,9 @@ pub async fn schedule_reminders(
             let _ = app_clone.emit("reminder-fired", &key);
         });
 
-        new_handles.insert(reminder.key, handle);
+        if let Some(old) = new_handles.insert(reminder.key, handle) {
+            old.abort();
+        }
     }
 
     {

src-tauri/src/lib.rs

@@ -93,11 +93,14 @@ pub fn run() {
                                     let gen_at_spawn = gen.fetch_add(1, Ordering::SeqCst) + 1;
                                     let w2 = w.clone();
                                     let g2 = gen.clone();
+                                    let dialog_open = is_dialog_open.clone();
                                     std::thread::spawn(move || {
                                         std::thread::sleep(
                                             std::time::Duration::from_millis(200),
                                         );
-                                        if g2.load(Ordering::SeqCst) == gen_at_spawn {
+                                        if g2.load(Ordering::SeqCst) == gen_at_spawn
+                                            && !dialog_open.load(Ordering::SeqCst)
+                                        {
                                             let _ = w2.hide();
                                         }
                                     });

src/components/TimersPage.tsx

@@ -19,7 +19,6 @@ interface TimerItemProps {
   timer: Timer
   onRemove: (id: string) => void
   onPause: (id: string) => void
-  onResume: (id: string) => void
 }
 
 function formatTime(ms: number): string {
@@ -33,7 +32,7 @@ function formatTime(ms: number): string {
   return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
 }
 
-function TimerItem({ timer, onRemove, onPause, onResume }: TimerItemProps) {
+function TimerItem({ timer, onRemove, onPause }: TimerItemProps) {
   const tickTimer = useTimerStore((s) => s.tickTimer)
   const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 
@@ -76,13 +75,9 @@ function TimerItem({ timer, onRemove, onPause, onResume }: TimerItemProps) {
       <div className="timer-header">
         <span className="timer-label">{timer.label || 'Timer'}</span>
         <div className="timer-controls">
-          {!isCompleted && (
-            <button
-              className="timer-btn"
-              onClick={() => (isPaused ? onResume(timer.id) : onPause(timer.id))}
-              title={isPaused ? 'Resume' : 'Pause'}
-            >
-              {isPaused ? '▶' : '⏸'}
+          {timer.status === 'running' && (
+            <button className="timer-btn" onClick={() => onPause(timer.id)} title="Pause">
+              ⏸
             </button>
           )}
           <button
@@ -125,7 +120,6 @@ export function TimersPage({ onClose }: TimersPageProps) {
   const addTimer = useTimerStore((s) => s.addTimer)
   const removeTimer = useTimerStore((s) => s.removeTimer)
   const pauseTimer = useTimerStore((s) => s.pauseTimer)
-  const resumeTimer = useTimerStore((s) => s.resumeTimer)
   const completeTimer = useTimerStore((s) => s.completeTimer)
   const addToast = useAppStore((s) => s.addToast)
 
@@ -291,13 +285,7 @@ export function TimersPage({ onClose }: TimersPageProps) {
             </div>
           ) : (
             timers.map((t) => (
-              <TimerItem
-                key={t.id}
-                timer={t}
-                onRemove={handleRemove}
-                onPause={pauseTimer}
-                onResume={resumeTimer}
-              />
+              <TimerItem key={t.id} timer={t} onRemove={handleRemove} onPause={pauseTimer} />
             ))
           )}
         </div>

src/hooks/useReminders.ts

@@ -3,12 +3,7 @@ import { listen } from '@tauri-apps/api/event'
 import { useAppStore, type Note } from '../store/useAppStore'
 import { SETTINGS_KEYS } from '../lib/settingsKeys'
 import { parseAllTasks } from '../lib/taskUtils'
-
-interface ReminderPayload {
-  key: string
-  label: string
-  dueAt: number // Unix ms
-}
+import type { ReminderPayload } from '../types'
 
 // Monotonically increasing token to prevent stale scheduleReminders calls
 let scheduleToken = 0

src/store/useTimerStore.ts

@@ -77,10 +77,7 @@ export const useTimerStore = create<TimerState>((set) => ({
     }))
   },
 
-  resumeTimer: (id) => {
-    // Backend does not support pause/resume yet; resume via a fresh schedule
-    set((state) => ({
-      timers: state.timers.map((t) => (t.id === id ? { ...t, status: 'completed' } : t)),
-    }))
+  resumeTimer: () => {
+    // Backend does not support pause/resume yet; resume action is gated in the UI
   },
 }))