fix(onboarding): address review review findings for existing user detection, note provisioning, and routing effect timing

Author: VariableThe

src-tauri/src/commands/fs.rs

@@ -234,6 +234,30 @@ pub fn remove_onboarding_files() -> Result<(), String> {
     Ok(())
 }
 
+fn has_user_notes(dir: &Path) -> bool {
+    if let Ok(entries) = fs::read_dir(dir) {
+        for entry in entries.filter_map(Result::ok) {
+            let path = entry.path();
+            if path.is_dir() {
+                if has_user_notes(&path) {
+                    return true;
+                }
+            } else if path.is_file() {
+                if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
+                    if name.ends_with(".md")
+                        && !name.starts_with("Welcome")
+                        && !name.starts_with("New Features")
+                        && !name.starts_with("Shortcuts")
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    false
+}
+
 pub fn run_onboarding(app: &AppHandle) {
     let is_hyprland = std::env::var("HYPRLAND_INSTANCE_SIGNATURE").is_ok() || std::env::var("HYPRLAND_CMD").is_ok();
     let mod_key = if is_hyprland { "Alt" } else { "Command/Ctrl" };
@@ -242,23 +266,7 @@ pub fn run_onboarding(app: &AppHandle) {
         let version = app.package_info().version.to_string();
         let version_marker = base.join(".onboarding_version");
         let last_version = fs::read_to_string(&version_marker).ok();
-        let is_existing_user = version_marker.exists() || {
-            let mut count = 0;
-            if let Ok(entries) = fs::read_dir(&base) {
-                for entry in entries.filter_map(Result::ok) {
-                    if let Some(name) = entry.path().file_name().and_then(|n| n.to_str()) {
-                        if name.ends_with(".md")
-                            && !name.starts_with("Welcome")
-                            && !name.starts_with("New Features")
-                            && !name.starts_with("Shortcuts")
-                        {
-                            count += 1;
-                        }
-                    }
-                }
-            }
-            count > 0
-        };
+        let is_existing_user = version_marker.exists() || has_user_notes(&base);
         let is_new_version = last_version.as_deref() != Some(&version);
 
         if is_new_version {
@@ -449,7 +457,7 @@ pub fn run_onboarding(app: &AppHandle) {
         let note_filename = format!("New Features in v{}.md", version);
         let note_target_path = base.join(&note_filename);
 
-        if is_existing_user && !note_target_path.exists() {
+        if is_existing_user && is_new_version && !note_target_path.exists() {
             if let Ok(entries) = fs::read_dir(&base) {
                 for entry in entries.filter_map(Result::ok) {
                     let path = entry.path();

src/App.tsx

@@ -110,21 +110,22 @@ function App() {
       const lastSeenVersion = localStorage.getItem('papercache-last-seen-version')
 
       if (lastSeenVersion !== currentVersion) {
-        localStorage.setItem('papercache-last-seen-version', currentVersion)
         const targetId = `New Features in v${currentVersion}.md`
         const targetIndex = notes.findIndex((n) => {
           const filename = n.id.split('/').pop() || ''
           return filename === targetId
         })
 
         if (targetIndex !== -1) {
+          localStorage.setItem('papercache-last-seen-version', currentVersion)
           setCurrentNoteIndex(targetIndex)
         } else if (lastSeenVersion === null) {
           const welcomeIndex = notes.findIndex((n) => {
             const filename = n.id.split('/').pop() || ''
             return filename === 'Welcome.md'
           })
           if (welcomeIndex !== -1) {
+            localStorage.setItem('papercache-last-seen-version', currentVersion)
             setCurrentNoteIndex(welcomeIndex)
           }
         }