[Release] v1.1.2 — fix duplicate eid on TTDL-spawned recurrence

Author: 83noit

CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [1.1.2] - 2026-03-04
+
+### Fixed
+
+- **Duplicate `eid:` on TTDL-spawned recurrence instances**: completing a
+  recurring task via `ttdl done` directly caused `todo_lib`'s
+  `cleanup_cloned_task()` to inherit the parent's `eid:` on the spawned next
+  instance (only `tmr:` and `spent:` are stripped by the library).  The
+  previous fix in v1.1.0 covered completions triggered *by* `remtodo sync`
+  but not external completions.  A pre-sync dedup pass now detects tasks
+  sharing an `eid:`, keeps it on the baseline copy (matched against the
+  stored `task_line_hash`), and strips it from duplicates so the spawn
+  receives a fresh Reminder on the next sync.  Recurring tasks may now be
+  completed freely via either `remtodo sync` or `ttdl done`.
+
 ## [1.1.1] - 2026-03-03
 
 ### Added

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "remtodo"
-version = "1.1.1"
+version = "1.1.2"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -233,7 +233,7 @@ mod tests {
 
     #[test]
     fn expand_tilde_absolute_path_unchanged() {
-        let p = "/home/user/Notes/Tasks/todo.txt";
+        let p = "/Users/benb/Notes/Tasks/Todo.md";
         assert_eq!(expand_tilde(p), p);
     }
 

src/config.rs

@@ -601,6 +601,69 @@ fn sync_once(
     }
     let mut current_state = state_opt.unwrap();
 
+    // Strip duplicate eid: tags caused by external tools (e.g. TTDL completing a
+    // recurring task directly).  `todo::done()` in todo_lib inherits all tags
+    // including `eid:`, so the spawned next-instance ends up sharing the eid of the
+    // completed parent.  Our own `collect_recurrence_spawns` strips the eid, but that
+    // only runs for completions triggered *by* remtodo.  When TTDL is used directly
+    // we must detect and fix the duplication here before the engine sees the tasks.
+    //
+    // Rule: for each eid that appears on more than one task, keep the eid on the task
+    // whose `task_line_hash` matches state (the "baseline" copy).  If none match
+    // state, keep the eid on the first (earliest) occurrence.  Strip from all others.
+    {
+        use std::collections::HashMap;
+        let mut first_by_eid: HashMap<String, usize> = HashMap::new();
+        for (i, t) in current_tasks.iter().enumerate() {
+            if let Some(eid) = t.tags.get("eid").map(|e| e.as_str()) {
+                if !eid.is_empty() && !eid.starts_with("na") && !eid.starts_with("ns") {
+                    first_by_eid.entry(eid.to_string()).or_insert(i);
+                }
+            }
+        }
+        // Collect indices that need their eid stripped.
+        let mut strip_indices: Vec<usize> = Vec::new();
+        for (i, t) in current_tasks.iter().enumerate() {
+            if let Some(eid) = t.tags.get("eid").map(|e| e.as_str()) {
+                if eid.is_empty() || eid.starts_with("na") || eid.starts_with("ns") {
+                    continue;
+                }
+                let canonical = *first_by_eid.get(eid).unwrap_or(&i);
+                if i != canonical {
+                    // Prefer the copy whose hash matches state as the canonical one.
+                    let state_hash = current_state
+                        .items
+                        .get(eid)
+                        .map(|s| s.task_line_hash)
+                        .unwrap_or(0);
+                    let current_hash = task_line_hash(t);
+                    let canonical_hash = task_line_hash(&current_tasks[canonical]);
+                    if state_hash != 0 && current_hash == state_hash && canonical_hash != state_hash
+                    {
+                        // This copy matches state — it becomes canonical; strip the other.
+                        strip_indices.push(canonical);
+                        *first_by_eid.get_mut(eid).unwrap() = i;
+                    } else {
+                        strip_indices.push(i);
+                    }
+                }
+            }
+        }
+        for idx in strip_indices {
+            let eid = current_tasks[idx]
+                .tags
+                .get("eid")
+                .cloned()
+                .unwrap_or_default();
+            current_tasks[idx].update_tag("eid:");
+            debug!(
+                "Stripped duplicate eid:{} from TTDL-spawned recurrence instance '{}' (index {idx})",
+                eid,
+                extract_title(&current_tasks[idx])
+            );
+        }
+    }
+
     if !dry_run {
         create_pre_sync_backup(output, &state_path, state_dir)?;
     }

src/main.rs

@@ -42,7 +42,7 @@ mod tests {
             "completionDate": null,
             "creationDate": "2026-02-20",
             "lastModifiedDate": "2026-02-20T10:00:00Z",
-            "notes": "Call back dentist",
+            "notes": "Get 2% from Costco",
             "list": "Tasks"
         }"#;
         let r: Reminder = serde_json::from_str(json).unwrap();
@@ -58,7 +58,7 @@ mod tests {
             r.last_modified_date,
             Some("2026-02-20T10:00:00Z".to_string())
         );
-        assert_eq!(r.notes, Some("Call back dentist".to_string()));
+        assert_eq!(r.notes, Some("Get 2% from Costco".to_string()));
         assert_eq!(r.list, "Tasks");
     }
 

src/reminder.rs

@@ -5035,11 +5035,11 @@ sticky_tracking = "auto""#;
         // Task as it looks after the user assigned priority C in todo.txt.
         // The To-do push_filter requires @joint AND (@today OR due=..+1d).
         // This task has @joint but no @today and no due → off filter.
-        let task = task_from_line(&format!("(C) Folding table @joint eid:{eid}"));
+        let task = task_from_line(&format!("(C) Chairs @ Sarah @joint eid:{eid}"));
         let current_hash = task_line_hash(&task);
 
         // State: was pulled from To-do with no priority (hash differs → user edited)
-        let mut item = synced_item_with_hash(eid, "Folding table", current_hash + 1, false);
+        let mut item = synced_item_with_hash(eid, "Chairs @ Sarah", current_hash + 1, false);
         item.fields.list = "To-do".to_string();
 
         let state = state_with_items(vec![item]);
@@ -5065,10 +5065,10 @@ sticky_tracking = "auto""#;
         use super::compute_release_set;
 
         let eid = "eid-joint-always";
-        let task = task_from_line(&format!("(C) Extension cord @joint eid:{eid}"));
+        let task = task_from_line(&format!("(C) Tupperware lid @joint eid:{eid}"));
         let current_hash = task_line_hash(&task);
 
-        let mut item = synced_item_with_hash(eid, "Extension cord", current_hash + 1, false);
+        let mut item = synced_item_with_hash(eid, "Tupperware lid", current_hash + 1, false);
         item.fields.list = "To-do".to_string();
 
         let state = state_with_items(vec![item]);
@@ -5137,12 +5137,12 @@ sticky_tracking = "auto""#;
         let eid = "eid-real-workflow";
 
         // After triage: user added priority C, task has @joint but no @today, no near due.
-        let task = task_from_line(&format!("(C) Extension cord @joint eid:{eid} #buy"));
+        let task = task_from_line(&format!("(C) Tupperware lid @joint eid:{eid} #buy"));
         let current_hash = task_line_hash(&task);
 
         // State: pulled from To-do, no priority (hash differs)
         let mut state_item =
-            synced_item_with_hash(eid, "Extension cord #buy", current_hash + 1, false);
+            synced_item_with_hash(eid, "Tupperware lid #buy", current_hash + 1, false);
         state_item.fields.list = "To-do".to_string();
         let state = state_with_items(vec![state_item]);
 
@@ -5162,7 +5162,7 @@ sticky_tracking = "auto""#;
         );
 
         let reminder = ReminderBuilder::new(eid)
-            .title("Extension cord #buy")
+            .title("Tupperware lid #buy")
             .list("To-do")
             .build();
         let actions = compute_sync_actions_ext(

src/sync/engine.rs

@@ -357,7 +357,7 @@ mod tests {
             completion_date: Some("2026-02-28".to_string()),
             creation_date: None,
             last_modified_date: None,
-            notes: Some("call back dentist".to_string()),
+            notes: Some("2% from Costco".to_string()),
             list: "Shopping".to_string(),
         };
 
@@ -370,7 +370,7 @@ mod tests {
         assert_eq!(update.is_completed, Some(true));
         assert_eq!(update.completion_date, Some(Some("2026-02-28".to_string())));
         assert_eq!(update.due_date, Some(Some("2026-03-01".to_string())));
-        assert_eq!(update.notes, Some(Some("call back dentist".to_string())));
+        assert_eq!(update.notes, Some(Some("2% from Costco".to_string())));
     }
 
     #[test]
@@ -385,7 +385,7 @@ mod tests {
             completion_date: None,
             creation_date: None,
             last_modified_date: None,
-            notes: Some("fragile".to_string()),
+            notes: Some("organic".to_string()),
             list: "Shopping".to_string(),
         };
 
@@ -395,7 +395,7 @@ mod tests {
         assert_eq!(input.list_name, "Shopping");
         assert_eq!(input.priority, 5);
         assert_eq!(input.due_date, Some("2026-03-01".to_string()));
-        assert_eq!(input.notes, Some("fragile".to_string()));
+        assert_eq!(input.notes, Some("organic".to_string()));
         assert!(!input.is_completed);
         assert!(input.completion_date.is_none());
     }