Shotlog - Screenshot Log

@@ -303,37 +303,22 @@ fn bring_webview_forward(channel: &str, port: u16) {     }     let channel = channel.to_string();     std::thread::spawn(move || {-        if let Some(hit) = find_webview_tab(&channel) {-            // Hydrogen has no "activate tab" verb, and move-tab rejects same-pane-            // moves — but move-tab AUTO-ACTIVATES in its target pane. So: BOUNCE.-            // Move to any other pane, then straight back to the original position-            // with --alert: net effect = tab surfaces to top with the ORANGE-            // update highlight, order preserved via --target-index.-            if let Some(other) = hit.other_pane {-                let m1 = std::process::Command::new("adom-cli")-                    .args(["hydrogen", "workspace", "move-tab",-                           "--from-panel-id", &hit.pane, "--tab-id", &hit.tab,-                           "--to-panel-id", &other])-                    .stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())-                    .status().map(|s| s.success()).unwrap_or(false);-                if m1 {-                    let m2 = std::process::Command::new("adom-cli")-                        .args(["hydrogen", "workspace", "move-tab",-                               "--from-panel-id", &other, "--tab-id", &hit.tab,-                               "--to-panel-id", &hit.pane,-                               "--target-index", &hit.index.to_string(),-                               "--alert", "--alert-duration", "6000"])-                        .stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())-                        .status().map(|s| s.success()).unwrap_or(false);-                    if m2 {-                        return;-                    }-                }-            }-            // Single-pane workspace (or a move failed): at least blink the tab.+        // GENTLE activate: `workspace active-tab` brings the tab to the front+        // WITHIN ITS OWN PANE — no tab moves, no iframe re-parenting, no+        // workspace-tree re-render. (The old approach bounced the tab through+        // the user's VS Code pane via move-tab, which re-rendered the whole+        // Hydrogen page and interrupted typing. Never do that.)+        let tab = format!("Shots: {channel}");+        let activated = std::process::Command::new("adom-cli")+            .args(["hydrogen", "workspace", "active-tab", "--name", &tab])+            .output()+            .map(|o| o.status.success()+                && String::from_utf8_lossy(&o.stdout).contains("204"))+            .unwrap_or(false);+        if activated {+            // Orange update indicator on the (now-front) tab.             let _ = std::process::Command::new("adom-cli")-                .args(["hydrogen", "alert", "set", "--name",-                       &format!("Shots: {channel}"), "-d", "6000"])+                .args(["hydrogen", "alert", "set", "--name", &tab, "-d", "6000"])                 .stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())                 .status();             return;@@ -343,57 +328,6 @@ fn bring_webview_forward(channel: &str, port: u16) {     }); } -/// A located webview tab: its pane, tab id, index within the pane, and some-/// OTHER pane usable for the activate-bounce (None in a single-pane workspace).-struct TabHit {-    pane: String,-    tab: String,-    index: usize,-    other_pane: Option<String>,-}--/// Locate the webview tab whose panelState URL contains `/log/<channel>/`.-fn find_webview_tab(channel: &str) -> Option<TabHit> {-    let out = std::process::Command::new("adom-cli")-        .args(["hydrogen", "workspace", "get"])-        .output()-        .ok()?;-    let v: serde_json::Value = serde_json::from_slice(&out.stdout).ok()?;-    let needle = format!("/log/{channel}/");-    // Collect all leaves in order, then find the tab.-    fn leaves<'a>(n: &'a serde_json::Value, acc: &mut Vec<&'a serde_json::Value>) {-        match n.get("type").and_then(|t| t.as_str()) {-            Some("leaf") => acc.push(n),-            Some("split") => {-                if let Some(c) = n.get("first") { leaves(c, acc); }-                if let Some(c) = n.get("second") { leaves(c, acc); }-            }-            _ => {}-        }-    }-    let root = v.get("root").unwrap_or(&v);-    let mut ls = Vec::new();-    leaves(root, &mut ls);-    let empty = Vec::new();-    for leaf in &ls {-        let pane = leaf.get("id").and_then(|i| i.as_str())?.to_string();-        for (idx, t) in leaf.get("tabs").and_then(|x| x.as_array()).unwrap_or(&empty).iter().enumerate() {-            // panelState may be a JSON object or a stringified one — either way-            // its serialization contains the viewer URL.-            let ps = t.get("panelState").map(|p| p.to_string()).unwrap_or_default();-            if ps.contains(&needle) {-                let tab = t.get("id").and_then(|i| i.as_str())?.to_string();-                let other_pane = ls.iter()-                    .filter_map(|l| l.get("id").and_then(|i| i.as_str()))-                    .find(|id| *id != pane)-                    .map(String::from);-                return Some(TabHit { pane, tab, index: idx, other_pane });-            }-        }-    }-    None-}- /// Force-open the viewer for a channel when a shot lands with NOBODY watching. /// Fallback only (see notify_surface). Debounced per-channel. Defaults to a slim /// ~20%-wide right-side panel so cross-thread shots auto-appear without taking