Altium - the Altium Bridge

@@ -15,7 +15,12 @@ use std::time::Duration; static BADGED: Mutex<BTreeSet<i64>> = Mutex::new(BTreeSet::new()); static LAST_DRIVING: AtomicI64 = AtomicI64::new(0); static IDLE_WATCHER: AtomicBool = AtomicBool::new(false);-static PROGRESS_STOP: Mutex<BTreeMap<String, std::sync::Arc<AtomicBool>>> = Mutex::new(BTreeMap::new());+struct ProgressHandle {+    stop: std::sync::Arc<AtomicBool>,+    failed: std::sync::Arc<AtomicBool>,+}++static PROGRESS_STOP: Mutex<BTreeMap<String, ProgressHandle>> = Mutex::new(BTreeMap::new());  pub const IDLE_CLEAR_SEC: i64 = 300; @@ -130,10 +135,17 @@ fn taskbar_progress(state: &str, value: Option<i64>) -> bool { }  /// Begin a progress bar for `verb`, paced by its measured estimate (marquee when none).+///+/// The FINAL clear is painted by this ticker thread, not by `end_activity_progress`: every paint+/// is an ab round trip, so a clear painted from another thread can lose the race to a tick still+/// in flight — leaving a stale partial bar parked on Altium's taskbar icon forever (John saw+/// exactly that, 2026-09-02, minutes after the Rust swap). Paints are sequential within this+/// thread, so a clear IT paints is guaranteed to be last. pub fn start_activity_progress(verb: &str, estimate_s: Option<f64>, confidence: &str) {     let stop = std::sync::Arc::new(AtomicBool::new(false));+    let failed = std::sync::Arc::new(AtomicBool::new(false));     if let Ok(mut g) = PROGRESS_STOP.lock() {-        g.insert(verb.to_string(), stop.clone());+        g.insert(verb.to_string(), ProgressHandle { stop: stop.clone(), failed: failed.clone() });     }     let est = estimate_s.filter(|e| *e > 0.0 && confidence != "unknown");     let _ = std::thread::Builder::new().name(format!("altium-progress-{verb}")).spawn(move || {@@ -142,15 +154,18 @@ pub fn start_activity_progress(verb: &str, estimate_s: Option<f64>, confidence:             None => {                 taskbar_progress("indeterminate", None);                 while !stop.load(Ordering::Relaxed) {-                    std::thread::sleep(Duration::from_secs(1));+                    std::thread::sleep(Duration::from_millis(250));                 }             }             Some(e) => {                 let mut fails = 0u32;-                while !stop.load(Ordering::Relaxed) {-                    std::thread::sleep(Duration::from_millis(700));-                    if stop.load(Ordering::Relaxed) {-                        break;+                'ticks: while !stop.load(Ordering::Relaxed) {+                    // sleep in small slices so the final clear lands promptly after the verb ends+                    for _ in 0..7 {+                        std::thread::sleep(Duration::from_millis(100));+                        if stop.load(Ordering::Relaxed) {+                            break 'ticks;+                        }                     }                     let pct = ((95.0 * started.elapsed().as_secs_f64() / e) as i64).min(95);                     if taskbar_progress("normal", Some(pct)) {@@ -158,30 +173,29 @@ pub fn start_activity_progress(verb: &str, estimate_s: Option<f64>, confidence:                     } else {                         fails += 1; // window may not exist yet during a cold launch — keep trying                         if fails > 120 {-                            return;+                            break; // still fall through to the clear below                         }                     }                 }             }         }+        // terminal frames, from THIS thread only+        if failed.load(Ordering::Relaxed) {+            taskbar_progress("error", Some(100));+            std::thread::sleep(Duration::from_millis(1200));+        }+        taskbar_progress("none", None);+        if let Some(h) = main_hwnd() {+            // cancel Windows' own orange attention flash (John: "can u not orange flash the taskbar")+            taskbar(json!({"hwnd": h, "flash": "stop"}));+        }     }); }  pub fn end_activity_progress(verb: &str, failed: bool) {-    let stop = PROGRESS_STOP.lock().ok().and_then(|mut g| g.remove(verb));-    if let Some(s) = stop {-        s.store(true, Ordering::Relaxed);-    } else {-        return; // no bar was started for this verb-    }-    if failed {-        taskbar_progress("error", Some(100));-        std::thread::sleep(Duration::from_millis(1200));-    }-    taskbar_progress("none", None);-    if let Some(h) = main_hwnd() {-        // cancel Windows' own orange attention flash (John: "can u not orange flash the taskbar")-        taskbar(json!({"hwnd": h, "flash": "stop"}));+    if let Some(h) = PROGRESS_STOP.lock().ok().and_then(|mut g| g.remove(verb)) {+        h.failed.store(failed, Ordering::Relaxed);+        h.stop.store(true, Ordering::Relaxed); // the ticker paints the clear (see above)     } }