hop2 0.11.12 → 0.11.14

package/README.md

@@ -240,6 +240,37 @@ Agents working inside hop terminals can render formulas for the humans watching
 
 `hop math` renders a **2D Unicode layout** — fractions, roots, sums/limits, sub/superscripts, Greek + operators, and accents — with no dependencies. Inline-image rendering (Kitty/iTerm) is deferred until graphics support lands in the web client (xterm.js): the real payoff is math that renders *inside* a shared hop session, which the re-rendering clients can't show yet, so until then it's Unicode everywhere.
 
+### Show something a terminal cannot draw (`hop view`, `hop port`)
+
+A terminal can only print text, which makes it the wrong surface for the
+thing you most often want back from a long-running job: a plot, a report, a
+rendered write-up. `hop view` publishes a file behind hop's auth and prints a
+link — the web client and the phone app both open it in place, with the
+session's cookie, so nothing has to be public.
+
+```bash
+hop view --title "ROC curve: new model vs baseline" results/roc_curve.png
+hop view --title "Q3 analysis" report.html analysis.pdf
+generate_summary | hop view --name findings.md --title "What the profiler found" -
+hop view --list          # what this session published
+hop view --rm x.png      # unpublish
+```
+
+HTML, PDF, images, video and markdown all render (markdown is converted at
+serve time — headings, tables, fenced code). `--title` is what a human sees
+in the session's Views list, so it is worth writing properly. Published files
+are grouped **by session**: a result belongs to the conversation that
+produced it.
+
+For something live rather than a file, `hop port 5173` proxies a local web
+server through the same auth (WebSocket-safe, so dev-server hot reload
+works), attached to the current session — `--standalone` makes it a room of
+its own instead.
+
+Agents do this for you when the bundled skill is installed (`hop agent-skill
+install`): the convention is to hand over a titled view rather than describe
+a result in prose.
+
 ## Operations
 
 ### Logging and History

package/hay/apps/server/src/rooms.ts

@@ -24,6 +24,11 @@ export type ClientInfo = {
   // switcher wall): excluded from presence and client counts, and given a
   // small snapshot so a wall of tiles doesn't pull megabytes per open.
   source?: string;
+  // Stable per-browser-tab identity (device id + tab id). A tab holds one
+  // live connection per room, so a new attach bearing the same key means the
+  // previous connection is dead even if its socket never closed — it is
+  // evicted on the spot instead of haunting presence until TCP notices.
+  deviceKey?: string;
   colorIndex: number;
   cols: number;
   rows: number;
@@ -182,6 +187,7 @@ class ClientState {
   lastActive = now();
   socket: SocketAdapter;
   source: string;
+  deviceKey: string;
   // Declared fit: the size this client's viewport wants, updated by every
   // resize message whether or not it applied. Becomes the PTY size the
   // moment a keystroke makes this client the size owner.
@@ -192,6 +198,7 @@ class ClientState {
     this.id = info.id;
     this.name = info.name;
     this.source = info.source || "";
+    this.deviceKey = info.deviceKey || "";
     this.color = pickPresenceColor(info.colorIndex);
     this.socket = socket;
     this.cols = info.cols;
@@ -361,6 +368,19 @@ export class Room extends EventEmitter {
       this.cleanupTimer = null;
     }
 
+    // Same tab, same room: the newcomer replaces its predecessor. A phone
+    // that dropped off the network never sends a close, so its old
+    // connection would otherwise sit in presence as a second "iPhone"
+    // until TCP gives up on the corpse.
+    if (info.deviceKey) {
+      for (const [id, peer] of [...this.clients]) {
+        if (peer.deviceKey === info.deviceKey && peer.source !== "monitor") {
+          try { peer.socket.close(); } catch { /* already dead */ }
+          this.removeClient(id);
+        }
+      }
+    }
+
     const client = new ClientState(info, socket);
     this.clients.set(client.id, client);
     const created = !this.hasHadClient;

package/hay/apps/server/test/rooms.test.ts

@@ -1004,3 +1004,57 @@ describe("Room", () => {
     });
   });
 });
+
+describe("device-key eviction", () => {
+  // The room actively closes the predecessor's socket; a plain FakeSocket
+  // close is indistinguishable from a client-side close, so count them.
+  class TrackingSocket extends FakeSocket {
+    serverCloses = 0;
+    close() {
+      this.serverCloses += 1;
+      super.close();
+    }
+  }
+
+  const makeRoom = (name: string) => {
+    const manager = new RoomManager(() => new FakePty() as any);
+    return manager.getRoom(name, { cols: 80, rows: 24 }, "/tmp");
+  };
+
+  it("a same-key attach replaces the predecessor instead of joining it", () => {
+    const room = makeRoom("evict");
+    const ghost = new TrackingSocket();
+    const fresh = new FakeSocket();
+    room.attachClient({ id: "a", name: "iPhone", colorIndex: 0, cols: 80, rows: 24, deviceKey: "dev1.tab1" }, ghost);
+    room.attachClient({ id: "b", name: "iPhone", colorIndex: 1, cols: 80, rows: 24, deviceKey: "dev1.tab1" }, fresh);
+
+    expect(ghost.serverCloses).toBe(1);
+    const presence = findMessages(fresh, "presence").at(-1) as any;
+    expect(presence.clients.map((c: { id: string }) => c.id)).toEqual(["b"]);
+  });
+
+  it("different tabs from the same device coexist", () => {
+    const room = makeRoom("tabs");
+    const tabA = new TrackingSocket();
+    const tabB = new FakeSocket();
+    room.attachClient({ id: "a", name: "iPhone", colorIndex: 0, cols: 80, rows: 24, deviceKey: "dev1.tab1" }, tabA);
+    room.attachClient({ id: "b", name: "iPhone", colorIndex: 1, cols: 80, rows: 24, deviceKey: "dev1.tab2" }, tabB);
+
+    expect(tabA.serverCloses).toBe(0);
+    const presence = findMessages(tabB, "presence").at(-1) as any;
+    expect(presence.clients.map((c: { id: string }) => c.id).sort()).toEqual(["a", "b"]);
+  });
+
+  it("keyless clients (CLI, older bundles) are never evicted", () => {
+    const room = makeRoom("legacy");
+    const legacy = new TrackingSocket();
+    const keyed = new FakeSocket();
+    room.attachClient({ id: "a", name: "cli", colorIndex: 0, cols: 80, rows: 24 }, legacy);
+    room.attachClient({ id: "b", name: "iPhone", colorIndex: 1, cols: 80, rows: 24, deviceKey: "dev1.tab1" }, keyed);
+    room.attachClient({ id: "c", name: "iPhone", colorIndex: 2, cols: 80, rows: 24, deviceKey: "dev1.tab1" }, new FakeSocket());
+
+    expect(legacy.serverCloses).toBe(0);
+    const presence = findMessages(legacy, "presence").at(-1) as any;
+    expect(presence.clients.map((c: { id: string }) => c.id).sort()).toEqual(["a", "c"]);
+  });
+});

package/hay/apps/web/src/App.tsx

@@ -15,10 +15,12 @@ import { attachScrollFlywheel } from "./utils/scrollFlywheel";
 import { collectTerminalMatches, selectTerminalMatch } from "./utils/terminalSearch";
 import { createVoiceHold, speechRecognitionCtor } from "./utils/voiceHold";
 import { scanKeyboardProtocol } from "./utils/keyboardProtocol";
-import { originalPathHint } from "./utils/fileDrop";
+import { originalPathHint, pasteableUploadPaths } from "./utils/fileDrop";
 import { MobileKeyboard } from "./components/MobileKeyboard";
 import { SessionSwitcher } from "./components/SessionSwitcher";
 import { SecondaryPane } from "./components/SecondaryPane";
+import { ViewsPanel, hasUnseenViews, loadViewsSeen } from "./components/ViewsPanel";
+import type { ViewsSummary } from "./utils/switcherModel";
 
 const createRoomId = () => `room-${Math.random().toString(36).slice(2, 7)}`;
 
@@ -260,6 +262,7 @@ type SessionInfo = {
   tagline?: string;
   parked?: boolean;
   archived?: boolean;
+  views?: ViewsSummary;
 };
 
 // Check if embedded in Hop
@@ -279,6 +282,30 @@ const resolveInitialName = () => {
   return fromParams ?? stored ?? (injected && injected !== "Guest" ? injected : null) ?? "User";
 };
 
+// Stable connection identity: device half persists per browser, tab half per
+// tab. The server evicts a previous connection bearing the same key on
+// attach — a reconnect replaces its own ghost in presence instead of sitting
+// next to it — while two real tabs (different tab halves) coexist.
+const randomKeyPart = () =>
+  (window.crypto?.randomUUID?.() || Math.random().toString(36).slice(2)).replace(/-/g, "").slice(0, 10);
+const resolveDeviceKey = () => {
+  try {
+    let device = localStorage.getItem("hop_device_id");
+    if (!device) {
+      device = randomKeyPart();
+      localStorage.setItem("hop_device_id", device);
+    }
+    let tab = sessionStorage.getItem("hop_tab_id");
+    if (!tab) {
+      tab = randomKeyPart();
+      sessionStorage.setItem("hop_tab_id", tab);
+    }
+    return `${device}.${tab}`;
+  } catch {
+    return ""; // storage unavailable (private mode quota) — no eviction key
+  }
+};
+
 // Per-session "seen" markers, shared with the session manager page via
 // localStorage (same origin). Keyed by internal session name; values are the
 // server's own lastActivityAt/bellSeq so no cross-device clock comparison
@@ -568,6 +595,9 @@ const App = () => {
   // layer calls through this ref to avoid declaration-order coupling.
   const switchSessionRef = useRef<((s: SessionInfo) => void) | null>(null);
   const [shortcutHelpOpen, setShortcutHelpOpen] = useState(false);
+  // Published views (`hop view`). `session` scopes the panel to one session;
+  // an object with none open it fleet-wide. Null = closed.
+  const [viewsOpen, setViewsOpen] = useState<{ session?: string } | null>(null);
   const sessionsRef = useRef(sessions);
   sessionsRef.current = sessions;
   // Claude Code titles its process with a bare version number; hop's session
@@ -993,13 +1023,51 @@ const App = () => {
   };
 
   // ── Drag-and-drop onto the terminal ──
-  // A browser never reveals a dropped file's real path, so a file drop can't
-  // paste one. Catch the drop and teach the working gesture instead: the
-  // OS-specific copy-path hotkey (⌘⌥C in Finder / Ctrl+Shift+C in Explorer).
-  // Dragged TEXT (a path string from anywhere) pastes normally.
+  // A browser never reveals a dropped file's real path — but it does hand
+  // over the BYTES, and hop's host is the machine the session runs on. So a
+  // drop uploads: the file lands in a per-session staging dir on the host
+  // and the terminal receives the path it can actually open. Dragged TEXT (a
+  // path string from anywhere) still pastes as text. The old copy-path hint
+  // remains the fallback for a host too old to have the upload endpoint.
   const [dropActive, setDropActive] = useState(false);
+  const [uploading, setUploading] = useState<{ done: number; total: number } | null>(null);
   const dragDepthRef = useRef(0);
   const platformString = `${navigator.platform || ""} ${navigator.userAgent || ""}`;
+
+  const uploadDroppedFiles = async (files: File[]) => {
+    const room = activeSessionRoomRef.current;
+    if (!room) return;
+    setUploading({ done: 0, total: files.length });
+    const landed: string[] = [];
+    try {
+      for (const file of files) {
+        const res = await fetch(
+          `/api/sessions/upload?name=${encodeURIComponent(room)}&filename=${encodeURIComponent(file.name)}`,
+          { method: "POST", body: file }
+        );
+        if (!res.ok) {
+          // 404 means this host predates uploads: fall back to teaching the
+          // OS copy-path gesture rather than failing silently.
+          const detail = await res.json().catch(() => null);
+          pushNotice(res.status === 404 ? originalPathHint(platformString) : (detail?.error || `Upload failed (${res.status})`));
+          return;
+        }
+        const data = await res.json();
+        if (data?.path) landed.push(String(data.path));
+        setUploading((u) => (u ? { ...u, done: u.done + 1 } : u));
+      }
+      if (landed.length > 0) {
+        termRef.current?.paste(pasteableUploadPaths(landed));
+        pushNotice(landed.length === 1
+          ? `Uploaded to ${landed[0]}`
+          : `Uploaded ${landed.length} files — paths pasted`);
+      }
+    } catch {
+      pushNotice(originalPathHint(platformString));
+    } finally {
+      setUploading(null);
+    }
+  };
   // Without these guards a drop that misses the target navigates the whole
   // page to the file, killing the session view.
   useEffect(() => {
@@ -1464,7 +1532,7 @@ const App = () => {
     const hex = (c?: string) => (c || "").replace("#", "").slice(0, 6);
     const url = `${wsUrl}?room=${encodeURIComponent(nextSession.room)}&name=${encodeURIComponent(
       nextSession.name
-    )}&cols=${cols}&rows=${rows}&replay=${replay}&bg=${hex(surface.background)}&fg=${hex(surface.foreground)}`;
+    )}&cols=${cols}&rows=${rows}&replay=${replay}&bg=${hex(surface.background)}&fg=${hex(surface.foreground)}&device=${encodeURIComponent(resolveDeviceKey())}`;
 
     wsRef.current?.close();
     setStatus("connecting");
@@ -2858,7 +2926,12 @@ const App = () => {
           parked: s.parked === true,
           archived: s.archived === true,
           hasLocalCli: s.hasLocalCli === true,
-          folderId: typeof s.folderId === "string" ? s.folderId : null
+          folderId: typeof s.folderId === "string" ? s.folderId : null,
+          // Only present when the session has published — the switcher chip
+          // and the Views dot both key off its absence meaning "nothing here".
+          views: s.views && Number(s.views.count) > 0
+            ? { ...s.views, count: Number(s.views.count), latestAt: Number(s.views.latestAt) || 0 }
+            : undefined
         });
       }
 
@@ -3588,6 +3661,15 @@ const App = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [session]);
 
+  // How many sessions have published something this browser hasn't opened.
+  // Rides the 5s /api/sessions poll rather than fetching the manifest again;
+  // `viewsOpen` is a dep because closing the panel is what rewrites the
+  // seen-markers this reads — without it the dot stayed lit after a read.
+  const unseenViewSessions = useMemo(() => {
+    const seen = loadViewsSeen();
+    return sessions.filter((s) => hasUnseenViews(s.internalName || s.name, s.views?.latestAt, seen)).length;
+  }, [sessions, viewsOpen]);
+
   const sessionStyle = isMobile
     ? ({ "--mobile-keyboard-height": `${keyboardVisible ? keyboardHeight : 0}px` } as CSSProperties)
     : undefined;
@@ -3636,6 +3718,15 @@ const App = () => {
               Sessions
               <kbd>{isMacPlatform ? "⌘K" : "⌃⇧K"}</kbd>
             </button>
+            <button
+              type="button"
+              className="topbar-sessions-btn"
+              title="Files agents published with hop view"
+              onClick={() => setViewsOpen({})}
+            >
+              Views
+              {unseenViewSessions > 0 && <span className="views-chip-dot" aria-label="New views" />}
+            </button>
             <button
               type="button"
               className="topbar-sessions-btn"
@@ -3671,7 +3762,7 @@ const App = () => {
             onRefresh={() => fetchSessions({ showLoading: false })}
             onNotice={showToast}
             tileWsBase={resolveWsUrl()}
-            
+            onOpenViews={(scope) => setViewsOpen({ session: scope })}
             userName={name}
             terminalTheme={resolveTerminalTheme(themeMode)}
           />
@@ -3848,6 +3939,13 @@ const App = () => {
                 }}>
                   Fit
                 </button>
+                {/* The drawer is the only menu on mobile, where the topbar's
+                    Views button is hidden — without this entry the phone had
+                    to go through the switcher to reach a published result. */}
+                <button type="button" className="quick-btn" onClick={() => { setDrawerOpen(false); setViewsOpen({}); }}>
+                  Views
+                  {unseenViewSessions > 0 && <span className="views-chip-dot" aria-label="New views" />}
+                </button>
                 {/* Mobile gets the in-app switcher; desktop keeps the manager page */}
                 {isMobile && isEmbeddedInHop() ? (
                   <button type="button" className="quick-btn" onClick={() => { setDrawerOpen(false); setSwitcherOpen(true); }}>
@@ -4084,8 +4182,9 @@ const App = () => {
                     e.preventDefault();
                     dragDepthRef.current = 0;
                     setDropActive(false);
-                    if ((e.dataTransfer?.files?.length || 0) > 0) {
-                      pushNotice(originalPathHint(platformString));
+                    const files = Array.from(e.dataTransfer?.files || []);
+                    if (files.length > 0) {
+                      void uploadDroppedFiles(files);
                       return;
                     }
                     // A dragged text snippet (e.g. a path string) pastes like
@@ -4110,9 +4209,13 @@ const App = () => {
                       </span>
                     </div>
                   )}
-                  {dropActive && (
+                  {(dropActive || uploading) && (
                     <div className="terminal-drop-overlay" aria-hidden="true">
-                      <span>{originalPathHint(platformString)}</span>
+                      <span>
+                        {uploading
+                          ? `Uploading ${uploading.total > 1 ? `${uploading.done + 1} of ${uploading.total}` : "file"}…`
+                          : "Drop to upload — the path pastes into this session"}
+                      </span>
                     </div>
                   )}
                   {isMobile && status === "connecting" && (
@@ -4346,6 +4449,7 @@ const App = () => {
             tileWsBase={resolveWsUrl()}
             onFocusSession={focusSessionInPlace}
             folders={folders}
+            onOpenViews={(scope) => setViewsOpen({ session: scope })}
             userName={name}
             terminalTheme={resolveTerminalTheme(themeMode)}
             onOpenSettings={() => {
@@ -4480,6 +4584,11 @@ const App = () => {
           {toast && <div className="terminal-toast" role="status" aria-live="polite">{toast}</div>}
         </main>
       )}
+      {/* Outside the mode ternary on purpose: Views opens from the hub, from a
+          session, and from over the switcher, and it must outlive a switch. */}
+      {viewsOpen && (
+        <ViewsPanel session={viewsOpen.session} sessions={sessions} onClose={() => setViewsOpen(null)} />
+      )}
     </div>
   );
 };

package/hay/apps/web/src/components/SessionSwitcher.tsx

@@ -28,6 +28,7 @@ import {
 } from "../utils/switcherModel";
 import { scanKeyboardProtocol } from "../utils/keyboardProtocol";
 import { DigestCard } from "./DigestCard";
+import { hasUnseenViews, loadViewsSeen } from "./ViewsPanel";
 
 // Full-screen, in-app session switcher (mobile-first). Hot sessions — current,
 // attention, most recent — are preview cards; the tail is compact rows grouped
@@ -103,6 +104,9 @@ type Props = {
   onOpenSettings?: () => void;
   onToggleKeyboard?: () => void;
   onFind?: () => void;
+  // Open the Views panel. No argument = the whole fleet (header button); an
+  // internalName = just that session (a card's chip).
+  onOpenViews?: (session?: string) => void;
 };
 
 type Sheet = {
@@ -1130,7 +1134,8 @@ export const SessionSwitcher = ({
   terminalTheme,
   onOpenSettings,
   onToggleKeyboard,
-  onFind
+  onFind,
+  onOpenViews
 }: Props) => {
   // View state survives a REFRESH but not a new tab: sessionStorage, not
   // localStorage. Reloading the page (or hop reconnecting) used to dump the
@@ -1480,6 +1485,15 @@ export const SessionSwitcher = ({
     () => filterSessionsByOrigin(sessions, originScope),
     [sessions, originScope]
   );
+  // Read once per session-list refresh rather than per card: every tile on a
+  // 30-session wall hitting localStorage on each of the wall's frequent
+  // re-renders is a synchronous cost the tile previews cannot absorb. The
+  // 5s poll's new array is also what re-reads markers the panel just wrote.
+  const viewsSeen = useMemo(() => loadViewsSeen(), [sessions]);
+  const unseenViewSessions = useMemo(
+    () => visibleSessions.filter((s) => hasUnseenViews(sessionKey(s), s.views?.latestAt, viewsSeen)).length,
+    [visibleSessions, viewsSeen]
+  );
   // Parked sessions leave the wall but stay one glance away in a collapsed
   // section — and the FILTER still searches them, so a parked session is
   // never more than ⌘K + a few letters from coming back.
@@ -1651,6 +1665,10 @@ export const SessionSwitcher = ({
     if (!deepSearch || deepSearch.status !== "done" || deepSearch.q !== filter.trim()) return [];
     const seen = new Set<string>();
     if (model.mode === "filter") model.rows.forEach((r) => seen.add(sessionKey(r)));
+    else if (model.mode === "manual") {
+      model.rows.forEach((r) => seen.add(sessionKey(r)));
+      model.folders.forEach((f) => f.rows.forEach((r) => seen.add(sessionKey(r))));
+    }
     extraContentMatches.forEach((m) => seen.add(sessionKey(m.session)));
     const out: Array<{ session: SwitcherSession; snippet: string }> = [];
     for (const m of deepSearch.rows) {
@@ -1669,7 +1687,7 @@ export const SessionSwitcher = ({
       if (model.mode === "filter") return [...model.rows, ...extraContentMatches.map((m) => m.session), ...extraDeepMatches.map((m) => m.session)];
       // Folder rows come first because that is their visual order; keyboard
       // ↑/↓ and Enter must traverse what the eye sees, foldered included.
-      if (model.mode === "manual") return [...model.folders.flatMap((f) => f.rows), ...model.rows, ...extraContentMatches.map((m) => m.session)];
+      if (model.mode === "manual") return [...model.folders.flatMap((f) => f.rows), ...model.rows, ...extraContentMatches.map((m) => m.session), ...extraDeepMatches.map((m) => m.session)];
       if (model.mode === "project") return model.groups.flatMap((g) => g.rows);
       return [...model.hero, ...model.groups.flatMap((g) => g.rows)];
     },
@@ -1789,15 +1807,20 @@ export const SessionSwitcher = ({
       if (document.activeElement?.closest?.(".switcher-live-tile, .switcher-focus-tile")) return;
       if (event.key === "Escape") {
         event.preventDefault();
+        // Escape unwinds one layer at a time, innermost first. A typed query
+        // is a layer: Escape clears it and leaves you on the full wall.
+        // Dismissing the whole switcher out from under a search meant losing
+        // your place to undo one word.
         if (sheet) setSheet(null);
         else if (focusedKey) setFocusedKey(null);
+        else if (filter) setFilter("");
         else if (dismissable) onClose();
       }
     };
     window.addEventListener("keydown", onKey);
     return () => window.removeEventListener("keydown", onKey);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open, sheet, focusedKey]);
+  }, [open, sheet, focusedKey, filter]);
 
   // Tile previews: EVERY session gets a preview tile. Hot tiles (the
   // attention/recency heroes) refresh each tick; the long tail refreshes at a
@@ -2494,6 +2517,22 @@ export const SessionSwitcher = ({
             </span>
           )}
           {!current && s.starting && !s.active && <span className="switcher-chip starting">STARTING</span>}
+          {/* A result waiting on this session is worth as much as its status:
+              a published PDF or write-up was otherwise invisible from the wall.
+              stopPropagation on pointerdown keeps the long-press sheet out of
+              it, the same way the inline action buttons do. */}
+          {onOpenViews && s.views && s.views.count > 0 && (
+            <button
+              type="button"
+              className={"switcher-chip views" + (hasUnseenViews(key, s.views.latestAt, viewsSeen) ? " fresh" : "")}
+              title={s.views.latestTitle || s.views.latestName || "Published views"}
+              aria-label={`${s.views.count} published view${s.views.count === 1 ? "" : "s"} in ${s.displayName}`}
+              onClick={(e) => { e.stopPropagation(); onOpenViews(key); }}
+              onPointerDown={(e) => e.stopPropagation()}
+            >
+              ◧ {s.views.count}
+            </button>
+          )}
           {waitingOnUser(preview) && (
             <span className="switcher-chip waiting" title="Claude is asking how to resume this conversation — open it and choose">
               NEEDS YOU
@@ -2579,6 +2618,50 @@ export const SessionSwitcher = ({
   const sheetSession = sheet?.session;
   const sheetAgentPermitted = sheetSession?.agentPermitted === true;
 
+  // Content/history hits plus the full-history row, rendered below whatever
+  // the mode showed. Manual mode keeps its own branch under a query (filtering
+  // narrows the user's order in place), so this tail must ride along there
+  // too — search reaches past the name tier in every mode, not just Recent.
+  const searchTail = filter.trim() ? (
+    <>
+      {extraContentMatches.length > 0 && (
+        <section className="switcher-group">
+          <h3 className="switcher-group-label">found in terminal output{contentTruncated ? " · most recent sessions only" : ""}</h3>
+          <div className="switcher-grid">
+            {extraContentMatches.map(({ session: s, snippet }) => renderCard(s, snippet))}
+          </div>
+        </section>
+      )}
+      {extraDeepMatches.length > 0 && (
+        <section className="switcher-group">
+          <h3 className="switcher-group-label">found in full history</h3>
+          <div className="switcher-grid">
+            {extraDeepMatches.map(({ session: s, snippet }) => renderCard(s, snippet))}
+          </div>
+        </section>
+      )}
+      {filter.trim().length >= 3 && (
+        <div className="switcher-deep-row">
+          {!deepSearch ? (
+            <button type="button" className="switcher-deep-btn" onClick={runDeepSearch}>
+              Search full history for “{filter.trim()}”
+            </button>
+          ) : deepSearch.status === "loading" ? (
+            <span className="switcher-deep-note">searching full history…</span>
+          ) : deepSearch.status === "unavailable" ? (
+            <span className="switcher-deep-note">full-history search unavailable on this host</span>
+          ) : (
+            <span className="switcher-deep-note">
+              {extraDeepMatches.length > 0
+                ? `${extraDeepMatches.length} more in full history`
+                : "nothing further back matches"}
+            </span>
+          )}
+        </div>
+      )}
+    </>
+  ) : null;
+
   return (
     <div
       // tile-dense: too narrow for inline actions. tile-micro: too short for
@@ -2652,6 +2735,16 @@ export const SessionSwitcher = ({
               </svg>
             </button>
           )}
+          {/* The hub renders this wall as the whole page, so this is the only
+              fleet-wide way in to Views when no session is open. */}
+          {onOpenViews && (
+            <button type="button" className="switcher-action" aria-label="Published views" title="Files agents published with hop view" onClick={() => onOpenViews()}>
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <rect x="3" y="4" width="18" height="16" rx="2"/><path d="M10 4v16"/>
+              </svg>
+              {unseenViewSessions > 0 && <span className="views-chip-dot" aria-label="New views" />}
+            </button>
+          )}
           {onOpenSettings && (
             <button type="button" className="switcher-action" aria-label="Settings" title="Settings" onClick={onOpenSettings}>
               <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
@@ -2766,46 +2859,12 @@ export const SessionSwitcher = ({
           // cards at the current zoom, same as the wall — the screen content
           // is usually WHY you're looking for the session.
           <>
-            {model.rows.length === 0 && extraContentMatches.length === 0 ? (
+            {model.rows.length === 0 && extraContentMatches.length === 0 && extraDeepMatches.length === 0 ? (
               <div className="switcher-empty">No sessions match “{filter.trim()}”</div>
             ) : (
               <div className="switcher-grid">{model.rows.map((s) => renderCard(s))}</div>
             )}
-            {extraContentMatches.length > 0 && (
-              <section className="switcher-group">
-                <h3 className="switcher-group-label">found in terminal output{contentTruncated ? " · most recent sessions only" : ""}</h3>
-                <div className="switcher-grid">
-                  {extraContentMatches.map(({ session: s, snippet }) => renderCard(s, snippet))}
-                </div>
-              </section>
-            )}
-            {extraDeepMatches.length > 0 && (
-              <section className="switcher-group">
-                <h3 className="switcher-group-label">found in full history</h3>
-                <div className="switcher-grid">
-                  {extraDeepMatches.map(({ session: s, snippet }) => renderCard(s, snippet))}
-                </div>
-              </section>
-            )}
-            {filter.trim().length >= 3 && (
-              <div className="switcher-deep-row">
-                {!deepSearch ? (
-                  <button type="button" className="switcher-deep-btn" onClick={runDeepSearch}>
-                    Search full history for “{filter.trim()}”
-                  </button>
-                ) : deepSearch.status === "loading" ? (
-                  <span className="switcher-deep-note">searching full history…</span>
-                ) : deepSearch.status === "unavailable" ? (
-                  <span className="switcher-deep-note">full-history search unavailable on this host</span>
-                ) : (
-                  <span className="switcher-deep-note">
-                    {extraDeepMatches.length > 0
-                      ? `${extraDeepMatches.length} more in full history`
-                      : "nothing further back matches"}
-                  </span>
-                )}
-              </div>
-            )}
+            {searchTail}
           </>
         ) : model.mode === "project" ? (
           <>
@@ -2831,7 +2890,9 @@ export const SessionSwitcher = ({
         ) : model.mode === "manual" ? (
           <>
             {model.rows.length === 0 && model.folders.every((f) => f.rows.length === 0) ? (
-              <div className="switcher-empty">{filter.trim() ? "No matches" : "No sessions"}</div>
+              extraContentMatches.length === 0 && extraDeepMatches.length === 0 && (
+                <div className="switcher-empty">{filter.trim() ? "No matches" : "No sessions"}</div>
+              )
             ) : (
               <>
                 <p className="switcher-hint">
@@ -2908,6 +2969,7 @@ export const SessionSwitcher = ({
                 <div className="switcher-grid">{model.rows.map((s) => renderCard(s))}</div>
               </>
             )}
+            {searchTail}
           </>
         ) : (
           <>