Shotlog - Screenshot Log

@@ -122,6 +122,7 @@ pub fn create_router(state: Arc<AppState>) -> Router {         .route("/api/prefs", get(get_prefs))         .route("/api/prefs", post(set_prefs))         .route("/api/log", post(post_log))+        .route("/api/notice", post(post_notice))         .route("/prompt", get(serve_prompt))         .route("/api/paste", post(post_paste))         .route("/api/open", post(open_in_vscode))@@ -145,6 +146,27 @@ async fn log_redirect(Path(channel): Path<String>) -> Redirect {     Redirect::permanent(&format!("/log/{channel}/")) } +/// One-shot human-facing notice, delivered as a toast by the next page that+/// completes the WS welcome (fresh for 10 min, single delivery). Set by the+/// broker itself (pup fallback / recovery) or by any AI via POST /api/notice -+/// the toast is the narration channel to the human ("tried pup, it was down,+/// fell back to webview").+fn notice_cell() -> &'static std::sync::Mutex<Option<(String, std::time::Instant)>> {+    static CELL: std::sync::OnceLock<std::sync::Mutex<Option<(String, std::time::Instant)>>> = std::sync::OnceLock::new();+    CELL.get_or_init(|| std::sync::Mutex::new(None))+}+fn set_notice(text: &str) {+    *notice_cell().lock().unwrap() = Some((text.to_string(), std::time::Instant::now()));+    println!("{} NOTICE queued for the human: {text}", ts());+}+fn take_notice() -> Option<String> {+    let mut g = notice_cell().lock().unwrap();+    match g.take() {+        Some((t, at)) if at.elapsed().as_secs() < 600 => Some(t),+        _ => None,+    }+}+ fn icon_response(bytes: &'static [u8], mime: &'static str) -> Response {     let mut res = bytes.into_response();     res.headers_mut()@@ -324,6 +346,24 @@ async fn post_log(Json(req): Json<LogRequest>) -> Json<serde_json::Value> {     Json(serde_json::json!({"ok": true})) } +#[derive(Deserialize)]+struct NoticeRequest {+    text: String,+}++/// Queue a one-shot toast for the human: the next page to complete the WS+/// welcome shows it (10 min freshness). The broker uses this for pup+/// fallback/recovery narration; AIs may POST here to explain a surface change.+async fn post_notice(Json(req): Json<NoticeRequest>) -> Json<serde_json::Value> {+    let mut text = req.text.replace(['\n', '\r'], " ");+    text.truncate(240);+    if text.is_empty() {+        return Json(serde_json::json!({"ok": false, "error": "empty text"}));+    }+    set_notice(&text);+    Json(serde_json::json!({"ok": true, "delivered": "on next viewer welcome (10 min freshness)"}))+}+ #[derive(Deserialize)] struct CanvasPrefRequest {     channel: String,@@ -736,6 +776,7 @@ fn force_open_pup(channel: &str, fallback_ratio: f64) {             }         }         println!("{} WARN: pup never came up for '{channel}' - falling back to a webview so the shots aren't invisible (no choice recorded).", ts());+        set_notice("Tried to open pup (your default) - it was unreachable, so I fell back to this webview so shots stay visible. I'll keep retrying and move you back to pup automatically once it's up.");         crate::open::open_webview(&channel, None, None, 8820, true, fallback_ratio);     }); }@@ -763,10 +804,22 @@ fn recover_pup_from_fallback(channel: &str, port: u16) {             std::thread::sleep(std::time::Duration::from_secs(2));             if crate::open::broker_has_pup_viewer(port) {                 println!("{} DECISION pup is back and CONNECTED - closing the fallback webview (it was never a choice).", ts());+                set_notice("pup is back - your shotlog moved here and the fallback webview was closed.");                 let out = std::process::Command::new("adom-cli")                     .args(["hydrogen", "workspace", "remove-tab", "--name", "Shotlog"])                     .output();-                let closed = out.map(|o| o.status.success()).unwrap_or(false);+                let mut closed = out.as_ref().map(|o| o.status.success()+                    && !String::from_utf8_lossy(&o.stdout).contains("\"error\"")).unwrap_or(false);+                if !closed {+                    // Last tab in its pane: Hydrogen requires closing the pane.+                    let text = out.map(|o| format!("{}{}", String::from_utf8_lossy(&o.stdout), String::from_utf8_lossy(&o.stderr))).unwrap_or_default();+                    if text.contains("Cannot remove all tabs") {+                        closed = std::process::Command::new("adom-cli")+                            .args(["hydrogen", "workspace", "remove-tab", "--name", "Shotlog", "--mode", "all"])+                            .stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())+                            .status().map(|s| s.success()).unwrap_or(false);+                    }+                }                 if !closed {                     println!("{} WARN: fallback webview tab close failed - pup is live, human may see both surfaces.", ts());                 }@@ -1293,7 +1346,11 @@ async fn ws_all_connection(mut socket: WebSocket, state: Arc<AppState>) {     let mut conn_surface: String = "browser".into();     state.store.register_viewer("_all", vid, "browser".into(), true, None).await;     let _ = socket.send(Message::Text(-        serde_json::json!({"type": "welcome", "version": boot_stamp()}).to_string().into()+        {+        let mut w = serde_json::json!({"type": "welcome", "version": boot_stamp()});+        if let Some(n) = take_notice() { w["notice"] = serde_json::json!(n); }+        w.to_string().into()+    }     )).await;     loop {         tokio::select! {@@ -1388,7 +1445,11 @@ async fn ws_connection(mut socket: WebSocket, channel: String, state: Arc<AppSta     state.store.register_viewer(&channel, vid, "browser".into(), true, None).await;     // Version handshake: stale pages reload themselves on mismatch.     let _ = socket.send(Message::Text(-        serde_json::json!({"type": "welcome", "version": boot_stamp()}).to_string().into()+        {+        let mut w = serde_json::json!({"type": "welcome", "version": boot_stamp()});+        if let Some(n) = take_notice() { w["notice"] = serde_json::json!(n); }+        w.to_string().into()+    }     )).await;      loop {