Shotlog - Screenshot Log

@@ -268,6 +268,16 @@ body.compact .card-popups .ph { padding-top: 4px; } .card-refbar .rb-copy:hover { color: #fff; background: rgba(0,184,176,.30); border-color: var(--accent-bright); } .card-refbar .rb-copy.done { opacity: 1; color: var(--accent-bright); border-color: rgba(0,184,176,.5); } @media (hover: none) { .card-refbar .rb-copy { opacity: .8; } }+/* delete (trash): hover-revealed, pushed to the far right, red when armed */+.card-refbar .rb-del { margin-left: auto; padding: 2px 5px; border-radius: 5px; cursor: pointer; flex-shrink: 0;+  display: inline-flex; align-items: center; justify-content: center; font: inherit; line-height: 1.5;+  color: var(--text3); background: transparent; border: 1px solid transparent; opacity: 0; transition: opacity .12s, color .12s, border-color .12s, background .12s; }+.card-refbar .rb-del svg { width: 13px; height: 13px; display: block; }+.shot-card:hover .card-refbar .rb-del, .card-refbar .rb-del:focus-visible, .card-refbar .rb-del.armed { opacity: 1; }+.card-refbar .rb-del:hover { color: var(--danger); border-color: rgba(248,81,73,.45); background: rgba(248,81,73,.09); }+.card-refbar .rb-del.armed { color: #fff; background: var(--danger); border-color: var(--danger); font-weight: 700; }+.card-refbar .rb-del .lbl { font-size: 10.5px; padding: 0 2px; }+@media (hover: none) { .card-refbar .rb-del { opacity: .8; } } .card-refbar .rb-tag { color: var(--accent-bright); background: rgba(0,184,176,.12); border: 1px solid rgba(0,184,176,.45);   border-radius: 5px; padding: 0 6px; max-width: 70%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } /* caption pill (gold): an annotated shot carries a longer caption from the@@ -773,9 +783,9 @@ body:not(.compact) .card-refbar .rb-cap { display: none; }       </div>       <div class="set-row">         <h4 class="set-name" title="webview_bring_forward"><span class="prefix">Notifications: </span><span class="title">Bring the webview tab forward</span></h4>-        <p class="set-desc">When a shot lands and the Shotlog webview is open but behind another tab in its pane, pull it to the front (default). Turn it off if you live in webviews and do not want to be pulled away: you stay on whatever tab you were reading, and the webview still receives every shot (including auto-captures from the read-hook) in the background, so it is fully up to date the moment you switch to it. This is about the Hydrogen tab; the switch above is about channel tabs inside shotlog.</p>-        <div class="set-ctl"><button class="toggle" id="prefBringFwd" role="switch" aria-checked="true" aria-label="Bring the webview tab forward" data-tooltip="On (default): every new shot pulls the Shotlog tab to the front of its pane. Off: the tab stays where it is; shots keep arriving in the background."><span class="toggle-track"><span class="toggle-thumb"></span></span></button></div>-        <div class="set-foot"><span class="default-hint">Default: On</span><span class="ai-chip"><span class="lbl">or say to your AI</span>stop shotlog pulling its webview tab to the front</span></div>+        <p class="set-desc">Off (default): when a shot lands the Shotlog tab stays where it is; the webview still receives every shot (including auto-captures from the read-hook) in the background, so it is fully up to date the moment you switch to it, and nothing you are reading or recording gets covered. On: a new shot pulls the Shotlog tab to the front of its pane, except when another webview is the active tab there (then it only badges). This is about the Hydrogen tab; the switch above is about channel tabs inside shotlog.</p>+        <div class="set-ctl"><button class="toggle" id="prefBringFwd" role="switch" aria-checked="false" aria-label="Bring the webview tab forward" data-tooltip="Off (default): the Shotlog tab stays where it is when shots arrive. On: a new shot pulls the Shotlog tab to the front of its pane, unless another webview is active there."><span class="toggle-track"><span class="toggle-thumb"></span></span></button></div>+        <div class="set-foot"><span class="default-hint">Default: Off</span><span class="ai-chip"><span class="lbl">or say to your AI</span>stop shotlog pulling its webview tab to the front</span></div>       </div>     </section>     <section class="settings-card" id="cardGallery">@@ -1005,6 +1015,7 @@ body:not(.compact) .card-refbar .rb-cap { display: none; }     'stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +     '<rect x="9" y="9" width="12" height="12" rx="2"/>' +     '<path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>';+  const ICON_TRASH = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 6h18"/><path d="M8 6V4a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v2"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6M14 11v6"/></svg>';   const ICON_DONE = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" ' +     'stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +     '<polyline points="20 6 9 17 4 12"/></svg>';@@ -1311,6 +1322,23 @@ body:not(.compact) .card-refbar .rb-cap { display: none; }           } else { legacyCopy(txt, done); }         });         rb.appendChild(cp); }+      // DELETE one shot (John, 2026-10-21): hover-revealed trash at the far+      // right of the ref bar; two clicks (the button itself becomes the+      // confirmation, red, disarms after 4s), then the shot and its files are+      // gone on the broker and every open viewer drops the card.+      { const del=document.createElement('button'); del.className='rb-del';+        del.innerHTML=ICON_TRASH; del.setAttribute('aria-label','Delete shot #'+e.id);+        del.setAttribute('data-tooltip','Delete shot #'+e.id+' (click twice: the second click confirms). Removes the image and its files for good.');+        let armT=null;+        const disarm=()=>{ del.classList.remove('armed'); del.innerHTML=ICON_TRASH; del.removeAttribute('data-armed'); clearTimeout(armT); };+        del.addEventListener('click', ev=>{ ev.stopPropagation();+          if(!del.dataset.armed){ del.dataset.armed='1'; del.classList.add('armed'); del.innerHTML='<span class="lbl">delete?</span>'; armT=setTimeout(disarm,4000); return; }+          disarm(); del.disabled=true;+          fetch('api/delete?channel='+encodeURIComponent(channel)+'&filename='+encodeURIComponent(e.filename),{method:'DELETE'})+            .then(r=>r.json()).then(r=>{ if(r.ok){ removeCard(channel, e.id); showToast('deleted shot #'+e.id+(r.bytes_freed?' ('+Math.max(1,Math.round(r.bytes_freed/1024))+' KB freed)':''), 4000); }+              else { del.disabled=false; showToast('could not delete: '+(r.error||'unknown'), 6000); } })+            .catch(()=>{ del.disabled=false; showToast('could not reach the broker', 4000); }); });+        rb.appendChild(del); }       // The caption pill comes AFTER the copy button (Ray, 2026-10-16): the       // button copies "#id handle", so it sits beside them, not past the caption.       if (e.auto_description && e.description) {@@ -1547,6 +1575,18 @@ body:not(.compact) .card-refbar .rb-cap { display: none; }       '<div class="tt-prompt"><span class="lbl">say to your AI</span>show me your progress in shotlog as you go</div>'+       cnt;   }+  // Drop one shot from local state and the feed (own delete, or another+  // viewer's, via the ctrl channel). Idempotent.+  function removeCard(chName, id){+    const c = chans.get(chName);+    if (c && c.entries) { const i=c.entries.findIndex(x=>x.id===id); if(i>=0) c.entries.splice(i,1); }+    if (chName === channel) {+      const el = feed.querySelector(`[data-id="${id}"]`);+      if (el) { el.remove(); shotCount=Math.max(0, shotCount-1); updateCount(); }+      if (!feed.querySelector('.shot-card')) { feed.innerHTML='<div class="empty">No screenshots yet in '+esc(channel)+'</div>'; }+    }+    renderTabs();+  }   function updateCount(){ const t = shotCount? shotCount+(shotCount===1?' shot':' shots'):'';     $('shotCount').textContent = t;     // Surface the count in the channel-name tooltip too, since .subject-meta is@@ -1878,8 +1918,8 @@ body:not(.compact) .card-refbar .rb-cap { display: none; }       // Live status in every card title (recomputed truth, never a cached claim).       const st=(id,txt,ok)=>{ const el=$(id); if(!el) return; el.textContent=txt; el.classList.toggle('ok', !!ok); };       st('stHook', p.read_hook!==false ? 'active' : 'off', p.read_hook!==false);-      $('prefBringFwd').setAttribute('aria-checked', String(p.webview_bring_forward!==false));-      st('stNotify', (p.update_alerts===true?'flashes on':'flashes off')+' · '+(p.update_autoswitch!==false?'auto-switch on':'auto-switch off')+' · '+(p.webview_bring_forward!==false?'tab comes forward':'tab stays put'), false);+      $('prefBringFwd').setAttribute('aria-checked', String(p.webview_bring_forward===true));+      st('stNotify', (p.update_alerts===true?'flashes on':'flashes off')+' · '+(p.update_autoswitch!==false?'auto-switch on':'auto-switch off')+' · '+(p.webview_bring_forward===true?'tab comes forward':'tab stays put'), false);       st('stGallery', p.compact!==false ? 'compact' : 'classic', false);       st('stCanvas', p.default_canvas||'webview', false);       st('stLayout', own ? ('own column, '+(p.own_column_width??10)+'% wide') : ('shared pane'+(p.webview_autosize===true?', auto-sized':'')), false);@@ -2051,6 +2091,10 @@ body:not(.compact) .card-refbar .rb-cap { display: none; }           document.body.classList.toggle('compact', APREFS.compact!==false);           return;         }+        if (msg.type==='deleted' && msg.channel) {+          removeCard(msg.channel, msg.id);+          return;+        }         if (msg.type==='cleared-all') {           // Someone wiped everything. If it was THIS page's clear button, it           // already wiped locally and showed the detailed shots/threads/size

@@ -1046,6 +1046,35 @@ fn flash_pup_session(session: &str) { /// shotlog tabs are never cross-touched), then `move-tab` to its own pane: /// Hydrogen auto-activates it (surfaces to top) and `--alert` paints the ORANGE /// update highlight on the tab. Falls back to create-or-refresh if not found.+/// Is a DIFFERENT webview tab the active tab in the pane that holds `tab`?+/// (false on any lookup failure, so the raise behaves as before.)+fn another_webview_active_in_pane(tab: &str) -> bool {+    const WEBVIEW_PANEL_TYPE: &str = "adom/a1b2c3d4-0031-4000-a000-000000000031";+    let found = std::process::Command::new("adom-cli")+        .args(["hydrogen", "workspace", "find-tab", tab]).output().ok()+        .and_then(|o| serde_json::from_slice::<serde_json::Value>(&o.stdout).ok());+    let Some(my_id) = found.as_ref().and_then(|v| v.get("tabId").and_then(|t| t.as_str())).map(String::from) else { return false };+    let Some(layout) = std::process::Command::new("adom-cli")+        .args(["hydrogen", "workspace", "get"]).output().ok()+        .and_then(|o| serde_json::from_slice::<serde_json::Value>(&o.stdout).ok()) else { return false };+    fn walk(v: &serde_json::Value, my_id: &str, wv: &str) -> Option<bool> {+        if v.get("type").and_then(|t| t.as_str()) == Some("leaf") {+            let tabs = v.get("tabs").and_then(|t| t.as_array())?;+            if !tabs.iter().any(|t| t.get("id").and_then(|i| i.as_str()) == Some(my_id)) { return None; }+            let idx = v.get("activeTabIndex").and_then(|i| i.as_u64()).unwrap_or(0) as usize;+            let active = tabs.get(idx)?;+            let is_me = active.get("id").and_then(|i| i.as_str()) == Some(my_id);+            let is_webview = active.get("panelType").and_then(|p| p.as_str()) == Some(wv);+            return Some(!is_me && is_webview);+        }+        for k in ["root", "layout", "data", "first", "second"] {+            if let Some(c) = v.get(k) { if let Some(r) = walk(c, my_id, wv) { return Some(r); } }+        }+        None+    }+    walk(&layout, &my_id, WEBVIEW_PANEL_TYPE).unwrap_or(false)+}+ fn bring_webview_forward(channel: &str, port: u16, alerts: bool, bring_forward: bool) {     if !bring_forward && !alerts {         return;   // nothing to do: the background webview already has the shot@@ -1065,7 +1094,11 @@ fn bring_webview_forward(channel: &str, port: u16, alerts: bool, bring_forward:         // Setting "Bring the webview tab forward" (default OFF): only when ON         // does the Shotlog tab get pulled to the front of its pane. OFF leaves         // the human where they are; the webview still receives every shot.-        let activated = if bring_forward {+        // Even when ON: never steal the active tab from ANOTHER WEBVIEW in the+        // same pane (wiki issue #9: a dashboard being screen-recorded was+        // covered by Shotlog on every image read). Badge instead. Raising over+        // a non-webview tab (editor, terminal) is still fine.+        let activated = if bring_forward && !another_webview_active_in_pane(&tab) {             std::process::Command::new("adom-cli")                 .args(["hydrogen", "workspace", "active-tab", "--name", &tab])                 .output()@@ -1584,17 +1617,20 @@ async fn delete_entry(         None => return Json(serde_json::json!({ "ok": false, "error": "missing filename" })),     }; -    // Delete the PNG and JSON sidecar from disk-    let channel_dir = state.store.base_dir().join(&channel);-    let png_path = channel_dir.join(&filename);-    let json_path = png_path.with_extension("json");-    std::fs::remove_file(&png_path).ok();-    std::fs::remove_file(&json_path).ok();--    // Remove from in-memory entries-    state.store.delete_entry(&channel, &filename).await;--    Json(serde_json::json!({ "ok": true, "deleted": filename }))+    if channel.contains("..") || channel.contains('/') || filename.contains("..") || filename.contains('/') {+        return Json(serde_json::json!({ "ok": false, "error": "invalid path" }));+    }+    // One shot, gone for good: entry + every file it owns. Every open viewer+    // drops the card via the ctrl channel.+    match state.store.delete_entry(&channel, &filename).await {+        Some((entry, bytes)) => {+            println!("{} DECISION deleted shot #{} '{}' from '{}' ({} KB)", ts(), entry.id, filename, channel, bytes / 1024);+            let frame = serde_json::json!({"type": "deleted", "channel": channel, "id": entry.id, "filename": filename});+            let _ = state.store.ctrl_tx.send(frame.to_string());+            Json(serde_json::json!({ "ok": true, "deleted": filename, "id": entry.id, "bytes_freed": bytes }))+        }+        None => Json(serde_json::json!({ "ok": false, "error": "no such shot" })),+    } }  // WebSocket: client connects to /ws/<channel>, receives new entries as JSON text frames