opencode-sesh 1.0.0 → 1.0.2

package/AGENTS.md

@@ -122,7 +122,7 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
   action must come **before** `reload`/`reload-sync`: placed after, fzf silently
   publishes an empty list (verified on 0.74.3).
 - Destructive actions confirm. `sesh-delete.sh` prompts on a TTY and refuses
-  without `--yes` when stdin is not one; the TUI arms on the first Ctrl-X and
+  without `--yes` when stdin is not one; the TUI arms on the first Option-D and
   commits on the second (or `y`).
 - The installer prefers the local opencode version for `@opencode-ai/*` and
   merges (never clobbers) the config `package.json`; opencode runs `bun install`
@@ -144,7 +144,7 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
   Row markers alone signal session state: a running agent animates a loading
   spinner marker, the open session shows its own ●, and every other idle row
   stays neutral (polled every 15 s); Option-P previews
-  a row and ctrl+x deletes one (armed, then confirmed). The section lists every
+  a row and option+d deletes one (armed, then confirmed). The section lists every
   session without a row cap and flex-grows to fill the sidebar, with overflow
   scrolling inside; the picker remains the place for transcript search.
   Sessions waiting on the user (unanswered questions, stuck runs) pin a
@@ -153,7 +153,7 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 - **Picker:** a custom dialog (not `DialogSelect`) grouped by
   project/directory, recency-ordered, resume via
   `api.route.navigate("session", …)`. `option+o` and the command palette open it;
-  Ctrl-X arms and then confirms a delete through `api.client.session.delete` and
+  Option-D arms and then confirms a delete through `api.client.session.delete` and
   removes the row only after the server confirms; Ctrl-F forks through
   `api.client.session.fork`; Ctrl-G scopes the list to the selected session's
   project.
@@ -203,11 +203,15 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 - **The sidebar never binds arrow keys globally.** Keyboard navigation is
   opt-in: clicking the *Sessions* heading (or its search box) activates a
   priority-20 layer, because a global `↑`/`↓` would hijack the main prompt.
+  Clicking outside the sidebar, opening a session, or navigating releases it
+  again (with search, hover and any armed delete), so the sidebar cannot
+  shadow the composer afterwards. Sidebar-internal clicks stop propagation so
+  the outside-click release cannot undo them.
   Cursor state is derived from `itemRows()`, so hover and cursor resolve to the
   same row. The section lists every session with no row cap
   (`tests/tui.mjs` asserts the cap stays out); overflow scrolls inside the
   stretched section.
-- **Delete in the TUI is two-step.** The first `ctrl+x` arms `pendingDelete`,
+- **Delete in the TUI is two-step.** The first `option+d` arms `pendingDelete`,
   the second (or `y`, or Enter in the picker footer) commits the armed row
   wherever the pointer or cursor is, and `n`/Esc (or a five-second timeout)
   cancels. Moving the pointer must never disarm: edge-hover flicker ate the

package/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2026-10-08
+
+### Fixed
+
+- **tui:** Release sidebar captures when focus returns to composer
+
+## [1.0.1] - 2026-10-08
+
+### Fixed
+
+- **tui:** Bind delete to option+d, readable selected rows, keep scroll on delete
+
 ## [1.0.0] - 2026-10-07
 
 ### Breaking changes
@@ -418,6 +430,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixture-database regression suite, TypeScript typechecking, and ShellCheck in
   CI.
 
+[1.0.2]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.14.1...v1.0.0
 [0.14.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.14.0...v0.14.1
 [0.14.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.13.0...v0.14.0

package/README.md

@@ -18,14 +18,18 @@ grouped by directory, full-text searchable, and previewable from anywhere.
 [![GitHub stars](https://img.shields.io/github/stars/ozandogrultan/opencode-sesh?style=social)](https://github.com/ozandogrultan/opencode-sesh/stargazers)
 
 ```text
-❯ auth
-  ~/code/api                                 (8)
-  ├ Retry the OAuth token refresh       2h
-  ├ Login rate limiting notes          3d
-  └ auth middleware cleanup           11d
-  ~/code/web                                (3)
-  ├ Fix session cookie on Safari       1d
-  └ Redirect loop after logout         6d
+Sessions (8)                              ▾ hide
+  search…
+▾ …/Projects/portal                          (5)
+  ├○ Retry the OAuth token refr…            2h
+  ├○ Login rate limiting notes              3d
+  ├○ Draft the release notes                7d
+  ├○ Auth middleware cleanup               11d
+  └○ Rotate the signing keys                12d
+▾ ~/Projects/mobile                          (3)
+  ├○ Author avatar upload retry             1d
+  ├○ Fix session cookie on Safari           2d
+  └○ Auth redirect loop after log…          6d
 ```
 
 ## Why sesh
@@ -176,7 +180,7 @@ non-interactive `sesh-delete.sh` refuses unless given `--yes`.
 | `↑`/`↓`, `PgUp`/`PgDn`, `Home`/`End` | Move the selection |
 | Option-P | Toggle the transcript preview |
 | Enter | Open the selected session |
-| Ctrl-X | Delete the selected session (asks to confirm) |
+| Option-D | Delete the selected session (asks to confirm) |
 | Ctrl-F | Fork the selected session |
 | Ctrl-G | Toggle scope: the selected session's project, or every project |
 | Option-W / Option-S | Show only sessions needing input / pinned sessions |
@@ -197,7 +201,7 @@ workspace at its directory; outside cmux it shows a toast instead.
 Click the sidebar's `search…` box to filter recent sessions in place; click
 elsewhere or press Esc to leave search. Click the **Sessions** heading to drive
 the list from the keyboard instead of the mouse (`↑`/`↓` to move, Enter to open,
-Option-P to preview, Ctrl-S/Ctrl-D to pin, Ctrl-X to delete, Esc to leave). Pinned
+Option-P to preview, Ctrl-S/Ctrl-D to pin, Option-D to delete, Esc to leave). Pinned
 directories rise first, while sessions within each directory are ordered by
 last update, newest first. The section lists every session and scrolls to fill
 the sidebar, so click **▾ hide** to collapse it when you need the room.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sesh",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Browse, search, preview and resume opencode sessions from the terminal and the TUI.",
   "type": "module",
   "license": "MIT",

package/tui-plugins/sesh-panel/tui.tsx

@@ -1050,7 +1050,17 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     setSectionCollapsed((value) => !value)
   }
 
-  const openSession = (entry: Entry) => props.api.route.navigate("session", { sessionID: entry.id })
+  const openSession = (entry: Entry) => {
+    // Opening a session hands input back to the main view: release every
+    // sidebar capture first, so its key layers cannot shadow the composer's
+    // once the new session is open.
+    menu.close()
+    cancelDelete()
+    setNavActive(false)
+    setSearching(false)
+    setHovered(undefined)
+    props.api.route.navigate("session", { sessionID: entry.id })
+  }
 
   // Flat order of the rows a cursor can land on, so keyboard navigation and
   // mouse hover resolve to the same row.
@@ -1064,6 +1074,15 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     return `${route.name}:${id}`
   })
   createEffect(on(routeKey, () => menu.close(), { defer: true }))
+  // Navigating away also releases the sidebar's keyboard captures: a nav,
+  // search, hover or armed delete left over from the previous session must
+  // not shadow the composer's keys in the next one.
+  createEffect(on(routeKey, () => {
+    cancelDelete()
+    setNavActive(false)
+    setSearching(false)
+    setHovered(undefined)
+  }, { defer: true }))
   createEffect(() => {
     const state = menuState()
     if (state && !itemRows().some((entry) => entry.id === state.entry.id)) menu.close()
@@ -1149,6 +1168,8 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     return true
   }
 
+  let sidebarScroll: { scrollTop: number } | undefined
+
   const deleteEntry = async (entry: Entry) => {
     cancelDelete()
     if (deleting()) return
@@ -1165,8 +1186,14 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         props.api.ui.toast({ message: "Session was not deleted", variant: "error" })
         return
       }
+      const scrollTop = sidebarScroll?.scrollTop ?? 0
       setEntries(remaining)
       setHovered(undefined)
+      const restore = () => {
+        if (sidebarScroll) sidebarScroll.scrollTop = scrollTop
+      }
+      queueMicrotask(restore)
+      setTimeout(restore, 0)
       props.api.ui.toast({ message: `Deleted "${truncate(entry.title, 40)}"`, variant: "info" })
       if (currentID() === entry.id) props.api.route.navigate("home")
     } catch {
@@ -1240,7 +1267,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
           },
         },
         {
-          key: "ctrl+x",
+          key: "alt+d",
           desc: "Confirm delete",
           preventDefault: true,
           cmd: () => {
@@ -1268,6 +1295,12 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
       return
     }
     if (searching()) setSearching(false)
+    // A click anywhere outside the sidebar means input is back in the main
+    // view: release the nav layer, hover shortcuts and any armed delete so
+    // the sidebar's keys and rows stop shadowing the composer.
+    cancelDelete()
+    if (navActive()) setNavActive(false)
+    setHovered(undefined)
   }
 
   onMount(() => {
@@ -1317,7 +1350,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
           cmd: () => openSidebarPreview(entry),
         },
         {
-          key: "ctrl+x",
+          key: "alt+d",
           desc: "Delete session",
           preventDefault: true,
           cmd: () => {
@@ -1338,6 +1371,8 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
 
   // Keyboard navigation is opt-in (click the "Sessions" heading or the search
   // box) so the sidebar never steals the arrow keys from the main prompt.
+  // Clicking anywhere outside the sidebar, opening a session, or navigating
+  // releases it again, so its layers cannot shadow the composer afterwards.
   createEffect(() => {
     disposeNav?.()
     disposeNav = undefined
@@ -1364,7 +1399,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         },
       },
       {
-        key: "ctrl+x",
+        key: "alt+d",
         desc: "Delete session",
         preventDefault: true,
         cmd: () => {
@@ -1442,7 +1477,10 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
   return (
     <box flexDirection="column" paddingRight={1} flexGrow={1} flexShrink={1}>
       <box flexDirection="row" justifyContent="space-between" gap={1}>
-        <text flexShrink={1} onMouseDown={() => {
+        <text flexShrink={1} onMouseDown={(event: { stopPropagation: () => void }) => {
+          // Sidebar-internal: keep this click from reaching the root handler,
+          // which would release the nav layer this toggle just activated.
+          event.stopPropagation()
           if (!sectionCollapsed()) setNavActive((value) => !value)
         }}>
           <b>Sessions</b>
@@ -1454,7 +1492,10 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
             <span style={{ fg: theme().warning }}> · {waitingEntries().length} need input</span>
           </Show>
         </text>
-        <text flexShrink={0} style={{ fg: theme().textMuted }} onMouseDown={toggleSection}>
+        <text flexShrink={0} style={{ fg: theme().textMuted }} onMouseDown={(event: { stopPropagation: () => void }) => {
+          event.stopPropagation()
+          toggleSection()
+        }}>
           {sectionCollapsed() ? "▸ show" : "▾ hide"}
         </text>
       </box>
@@ -1463,7 +1504,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         when={entries().length > 0}
         fallback={
           <text style={{ fg: theme().textMuted }}>
-            {loadFailed() ? "Session list unavailable · will retry" : "No sessions yet · alt+o to browse"}
+            {loadFailed() ? "Session list unavailable · will retry" : "No sessions yet · option+o to browse"}
           </text>
         }
       >
@@ -1473,7 +1514,10 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
           paddingLeft={1}
           paddingRight={1}
           backgroundColor={searching() ? theme().backgroundElement : RGBA.fromInts(0, 0, 0, 0)}
-          onMouseDown={() => {
+          onMouseDown={(event: { stopPropagation: () => void }) => {
+            // Sidebar-internal: the root handler must not see this click, or
+            // it would clear the search this box just activated.
+            event.stopPropagation()
             insideSearchBox = true
             setSearching(true)
           }}
@@ -1489,12 +1533,16 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
             {searching() ? "▏" : ""}
           </text>
           <Show when={query()}>
-            <text flexShrink={0} style={{ fg: theme().textMuted }} onMouseDown={() => setQuery("")}>
+            <text flexShrink={0} style={{ fg: theme().textMuted }} onMouseDown={(event: { stopPropagation: () => void }) => {
+              event.stopPropagation()
+              setQuery("")
+            }}>
               ✕
             </text>
           </Show>
         </box>
         <scrollbox
+          ref={(node: { scrollTop: number }) => (sidebarScroll = node)}
           flexGrow={1}
           flexShrink={1}
           verticalScrollbarOptions={{ visible: false }}
@@ -1504,7 +1552,10 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
           <For each={tree()}>
           {(row) => {
             if (row.kind === "group") return (
-              <box flexDirection="row" paddingTop={1} onMouseDown={() => toggleGroup(row.dir)}>
+              <box flexDirection="row" paddingTop={1} onMouseDown={(event: { stopPropagation: () => void }) => {
+                event.stopPropagation()
+                toggleGroup(row.dir)
+              }}>
                 <text flexGrow={1} flexShrink={1} wrapMode="none">
                   <span style={{ fg: theme().textMuted }}>{collapsed()[row.dir] ? "▸ " : "▾ "}</span>
                   <b>{props.pins().directories.includes(row.dir) ? "★ " : ""}{truncate(row.label, SIDEBAR_GROUP_WIDTH - (props.pins().directories.includes(row.dir) ? 2 : 0))}</b>
@@ -1541,7 +1592,13 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                   if (event.button === RIGHT_BUTTON) {
                     event.stopPropagation()
                     menu.open(row.entry, event.x, event.y)
-                  } else void openSession(row.entry)
+                  } else {
+                    // Sidebar-internal: openSession releases the sidebar's own
+                    // captures, so this click must not also reach the root
+                    // handler as an outside click.
+                    event.stopPropagation()
+                    void openSession(row.entry)
+                  }
                 }}
               >
                 <text flexShrink={0}>
@@ -1567,7 +1624,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                   matchColor={theme().warning}
                 />
                 <text flexShrink={0} style={{ fg: isPendingDelete(row.entry.id) ? theme().error : theme().textMuted }}>
-                  {isPendingDelete(row.entry.id) ? "ctrl+x again" : ago(row.entry.updated)}
+                  {isPendingDelete(row.entry.id) ? "option+d again" : ago(row.entry.updated)}
                 </text>
               </box>
             )
@@ -1575,14 +1632,14 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         </For>
         </scrollbox>
         <Show when={remaining() > 0}>
-          <text style={{ fg: theme().textMuted }}>{`… ${remaining()} more · alt+o for all`}</text>
+          <text style={{ fg: theme().textMuted }}>{`… ${remaining()} more · option+o for all`}</text>
         </Show>
         <Show when={query().trim() && filteredEntries().length === 0}>
-            <text style={{ fg: theme().textMuted }}>No title or directory matches · alt+o to search transcripts</text>
+            <text style={{ fg: theme().textMuted }}>No title or directory matches · option+o to search transcripts</text>
         </Show>
         <Show when={navActive()}>
           <box paddingTop={1}>
-            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · alt+p preview · ctrl+s/d pin · ctrl+x delete · esc done</text>
+            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · option+p preview · ctrl+s/d pin · option+d delete · esc done</text>
           </box>
         </Show>
       </Show>
@@ -1734,7 +1791,7 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
       priority: 25,
       bindings: [
         { key: "y", desc: "Confirm delete", preventDefault: true, cmd: () => { confirmArmed() } },
-        { key: "ctrl+x", desc: "Confirm delete", preventDefault: true, cmd: () => { confirmArmed() } },
+        { key: "alt+d", desc: "Confirm delete", preventDefault: true, cmd: () => { confirmArmed() } },
         { key: "enter", desc: "Confirm delete", preventDefault: true, cmd: () => { confirmArmed() } },
         { key: "n", desc: "Cancel delete", preventDefault: true, cmd: cancelDelete },
         { key: "escape", desc: "Cancel delete", preventDefault: true, cmd: cancelDelete },
@@ -1790,7 +1847,7 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
           cmd: () => preview.open(entry),
         },
         {
-          key: "ctrl+x",
+          key: "alt+d",
           desc: "Delete session",
           preventDefault: true,
           cmd: () => {
@@ -1851,7 +1908,7 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
             <box flexDirection="row" gap={1}>
               <text style={{ fg: theme().textMuted }}>Recent sessions</text>
               <text style={{ fg: theme().textMuted }}>
-                {loadFailed() ? "· list unavailable, will retry" : "· none yet, alt+o to browse"}
+                {loadFailed() ? "· list unavailable, will retry" : "· none yet, option+o to browse"}
               </text>
             </box>
           }
@@ -1859,7 +1916,7 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
           <box flexDirection="row" justifyContent="space-between" gap={2}>
             <box flexDirection="row" gap={1}>
               <text style={{ fg: theme().textMuted }}>Recent sessions</text>
-              <text style={{ fg: theme().textMuted }}>· alt+o for all</text>
+              <text style={{ fg: theme().textMuted }}>· option+o for all</text>
             </box>
             <box
               flexDirection="row"
@@ -1916,14 +1973,14 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
                 />
                 <text flexShrink={0} style={{ fg: pendingDelete() === entry.id ? theme().error : theme().textMuted }}>
                   {pendingDelete() === entry.id
-                    ? "ctrl+x again"
+                    ? "option+d again"
                     : `${props.pins().directories.includes(entry.dir) ? "★ " : ""}${prettyDir(entry.dir, home)} · ${ago(entry.updated)}`}
                 </text>
               </box>
             )}
           </For>
           <Show when={visible().length === 0}>
-              <text style={{ fg: theme().textMuted }}>No title or directory matches · alt+o to search transcripts</text>
+              <text style={{ fg: theme().textMuted }}>No title or directory matches · option+o to search transcripts</text>
           </Show>
         </Show>
       </box>
@@ -2104,7 +2161,7 @@ const tui: TuiPlugin = async (api) => {
     // lets it size to content, so a taller picker drifts downward. Pin the
     // content height and offset it up by the same amount to keep it centred.
     const dialogWidth = Math.min(116, api.renderer.width - 2)
-    const CHROME_ROWS = 12
+    const CHROME_ROWS = 13
     const listHeight = () => Math.max(6, Math.floor(termHeight * 0.75) - CHROME_ROWS)
     const dialogHeight = () => listHeight() + CHROME_ROWS
     const dialogOffset = () => Math.min(0, Math.floor(termHeight / 4 - dialogHeight() / 2 - 1))
@@ -2115,6 +2172,7 @@ const tui: TuiPlugin = async (api) => {
     ))
 
     let previousSelection: Entry[] = []
+    let deletedAt: number | undefined
     createEffect(() => {
       const rows = selectableEntries()
       const position = rows.findIndex((entry) => entry.id === previousSelection[cursor()]?.id)
@@ -2122,12 +2180,17 @@ const tui: TuiPlugin = async (api) => {
         rows.some((entry, index) => entry.id !== previousSelection[index]?.id))) {
         // A search/filter/collapse changed the tree: reveal the retained row or
         // start at the first result rather than leaving a stale window open.
-        const next = position >= 0 ? position : 0
-        setCursor(next)
-        const id = rows[next]?.id
-        setViewportStart(position < 0 || next === 0 ? 0 : Math.max(0, pickerRows().findIndex(
-          (row) => row.kind === "item" && row.entry.id === id,
-        )))
+        if (deletedAt !== undefined) {
+          setCursor(Math.max(0, Math.min(deletedAt, rows.length - 1)))
+          deletedAt = undefined
+        } else {
+          const next = position >= 0 ? position : 0
+          setCursor(next)
+          const id = rows[next]?.id
+          setViewportStart(position < 0 || next === 0 ? 0 : Math.max(0, pickerRows().findIndex(
+            (row) => row.kind === "item" && row.entry.id === id,
+          )))
+        }
       } else if (cursor() >= rows.length) setCursor(Math.max(0, rows.length - 1))
       previousSelection = rows
     })
@@ -2260,6 +2323,8 @@ const tui: TuiPlugin = async (api) => {
           api.ui.toast({ message: "Session was not deleted", variant: "error" })
           return
         }
+        deletedAt = selectableEntries().findIndex((item) => item.id === entry.id)
+        if (deletedAt < 0) deletedAt = undefined
         setAllEntries(remaining)
         api.ui.toast({ message: `Deleted "${truncate(entry.title, 40)}"`, variant: "info" })
         if (currentSessionID() === entry.id) api.route.navigate("home")
@@ -2285,7 +2350,7 @@ const tui: TuiPlugin = async (api) => {
             },
           },
           {
-            key: "ctrl+x",
+            key: "alt+d",
             desc: "Confirm delete",
             preventDefault: true,
             cmd: () => {
@@ -2367,7 +2432,7 @@ const tui: TuiPlugin = async (api) => {
           if (entry) onTogglePin("directories", entry.dir)
         } },
         {
-          key: "ctrl+x",
+          key: "alt+d",
           desc: "Delete session",
           preventDefault: true,
           cmd: () => {
@@ -2422,6 +2487,7 @@ const tui: TuiPlugin = async (api) => {
           flexDirection="column"
           height={dialogHeight()}
           marginTop={dialogOffset()}
+          paddingTop={1}
           paddingBottom={1}
           gap={1}
           backgroundColor={api.theme.current.backgroundPanel}
@@ -2534,7 +2600,7 @@ const tui: TuiPlugin = async (api) => {
                       paddingRight={4}
                       backgroundColor={
                         row.entry.id === selectableEntries()[cursor()]?.id
-                          ? api.theme.current.primary
+                          ? api.theme.current.backgroundElement
                           : RGBA.fromInts(0, 0, 0, 0)
                       }
                       onMouseMove={() => {
@@ -2549,7 +2615,7 @@ const tui: TuiPlugin = async (api) => {
                     >
                       <box flexDirection="row" gap={1}>
                       <text flexShrink={0} style={{ fg: row.entry.id === selectableEntries()[cursor()]?.id
-                        ? api.theme.current.selectedListItemText : api.theme.current.textMuted }}>
+                        ? api.theme.current.text : api.theme.current.textMuted }}>
                         {row.last ? "└" : "├"}
                       </text>
                       <Show when={row.entry.id === currentSessionID()}>
@@ -2558,7 +2624,7 @@ const tui: TuiPlugin = async (api) => {
                           style={{
                             fg:
                               row.entry.id === selectableEntries()[cursor()]?.id
-                                ? api.theme.current.selectedListItemText
+                                ? api.theme.current.text
                                 : api.theme.current.primary,
                           }}
                         >
@@ -2571,12 +2637,12 @@ const tui: TuiPlugin = async (api) => {
                         bold={row.entry.id === selectableEntries()[cursor()]?.id}
                         color={
                           row.entry.id === selectableEntries()[cursor()]?.id
-                            ? api.theme.current.selectedListItemText
+                            ? api.theme.current.text
                             : api.theme.current.text
                         }
                         matchColor={
                           row.entry.id === selectableEntries()[cursor()]?.id
-                            ? api.theme.current.selectedListItemText
+                            ? api.theme.current.text
                             : api.theme.current.warning
                         }
                       />
@@ -2587,7 +2653,7 @@ const tui: TuiPlugin = async (api) => {
                             pendingDelete()?.id === row.entry.id
                               ? api.theme.current.error
                               : row.entry.id === selectableEntries()[cursor()]?.id
-                                ? api.theme.current.selectedListItemText
+                                ? api.theme.current.text
                                 : api.theme.current.textMuted,
                         }}
                       >
@@ -2608,7 +2674,7 @@ const tui: TuiPlugin = async (api) => {
                             <Highlighted
                               text={match()}
                               query={query()}
-                              color={row.entry.id === selectableEntries()[cursor()]?.id ? api.theme.current.selectedListItemText : api.theme.current.textMuted}
+                              color={row.entry.id === selectableEntries()[cursor()]?.id ? api.theme.current.text : api.theme.current.textMuted}
                               matchColor={api.theme.current.warning}
                             />
                           </box>
@@ -2646,10 +2712,10 @@ const tui: TuiPlugin = async (api) => {
             >
               {pendingDelete()
                 ? `Delete "${truncate(pendingDelete()!.title, 40)}"? y confirm · n cancel`
-                : "↑↓ move · enter open · ctrl+g project · alt+w input · alt+s pinned · alt+p preview"}
+                : "↑↓ move · enter open · ctrl+g project · option+w input · option+s pinned · option+p preview"}
             </text>
             <Show when={!pendingDelete()}>
-              <text style={{ fg: api.theme.current.textMuted }}>ctrl+s/d pin · ctrl+x delete · ctrl+f fork · esc close</text>
+              <text style={{ fg: api.theme.current.textMuted }}>ctrl+s/d pin · option+d delete · ctrl+f fork · esc close</text>
             </Show>
           </box>
           <Show when={showPreview()}>
@@ -2903,7 +2969,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
                   paddingRight={1}
                   backgroundColor={
                     index() === cursor()
-                      ? api.theme.current.primary
+                      ? api.theme.current.backgroundElement
                       : RGBA.fromInts(0, 0, 0, 0)
                   }
                   onMouseDown={() => {
@@ -2918,7 +2984,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
                     style={{
                       fg:
                         index() === cursor()
-                          ? api.theme.current.selectedListItemText
+                          ? api.theme.current.text
                           : api.theme.current.text,
                     }}
                   >
@@ -2929,7 +2995,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
                     style={{
                       fg:
                         index() === cursor()
-                          ? api.theme.current.selectedListItemText
+                          ? api.theme.current.text
                           : api.theme.current.warning,
                     }}
                   >
@@ -2940,7 +3006,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
                     style={{
                       fg:
                         index() === cursor()
-                          ? api.theme.current.selectedListItemText
+                          ? api.theme.current.text
                           : api.theme.current.textMuted,
                     }}
                   >