Skip to content

Commit 95b207d

Browse files
committed
feat(app): mark sessions read or unread from their menus
1 parent 05099ea commit 95b207d

15 files changed

Lines changed: 502 additions & 20 deletions

File tree

‎packages/app/e2e/regression/tabs.spec.ts‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,11 @@ for (const [tabLayout, direction, label] of [
334334
await tabB.click({ button: "right" })
335335
await expect(menu.getByRole("menuitem")).toHaveText([
336336
"Rename",
337+
"Export…",
337338
"Close tab",
338339
"Close other tabs",
339340
label,
340-
"Delete session…",
341+
"Delete…",
341342
])
342343
await menu.getByRole("menuitem", { name: "Close other tabs", exact: true }).click()
343344
await expect(titles).toHaveText([b.title])
@@ -439,15 +440,15 @@ for (const tabLayout of ["horizontal", "vertical"] as const) {
439440
await expect(title).toHaveText(a.title)
440441

441442
await title.click({ button: "right" })
442-
await page.getByRole("menuitem", { name: "Delete session…", exact: true }).click()
443+
await page.getByRole("menuitem", { name: "Delete…", exact: true }).click()
443444

444445
const dialog = page.getByRole("dialog")
445446
await dialog.getByRole("button", { name: "Cancel", exact: true }).click()
446447
await expect(dialog).toHaveCount(0)
447448
await expect(title).toHaveText(a.title)
448449

449450
await title.click({ button: "right" })
450-
await page.getByRole("menuitem", { name: "Delete session…", exact: true }).click()
451+
await page.getByRole("menuitem", { name: "Delete…", exact: true }).click()
451452
await dialog.getByRole("button", { name: "Delete session", exact: true }).click()
452453
await remove
453454
await expect(title).toHaveCount(0)
@@ -668,6 +669,60 @@ test("an unread tab whose run failed shows the failed dot, as the inbox does", a
668669
await expect(tab(b.id).locator('[data-mark="unread"]')).toBeHidden()
669670
await expect(tab(c.id).locator('[data-mark="unread"]')).toBeVisible()
670671
await expect(tab(c.id).locator('[data-mark="failed"]')).toBeHidden()
672+
673+
await tab(c.id).locator("[data-titlebar-tab-link]").click({ button: "right" })
674+
await page.getByRole("menuitem", { name: "Mark as read", exact: true }).click()
675+
await expect(tab(c.id).locator('[data-mark="unread"]')).toBeHidden()
676+
await tab(c.id).locator("[data-titlebar-tab-link]").click({ button: "right" })
677+
await expect(page.getByRole("menu").getByRole("menuitem")).toHaveText([
678+
"Rename",
679+
"Export…",
680+
"Mark as unread",
681+
"Close tab",
682+
"Close other tabs",
683+
"Close tabs to the right",
684+
"Delete…",
685+
])
686+
await page.getByRole("menuitem", { name: "Mark as unread", exact: true }).click()
687+
await expect(tab(c.id).locator('[data-mark="unread"]')).toBeVisible()
688+
await tab(c.id).locator("[data-titlebar-tab-link]").click()
689+
await expectPath(page, sessionHref(c.id))
690+
await tab(c.id).locator("[data-titlebar-tab-link]").click({ button: "right" })
691+
await page.getByRole("menuitem", { name: "Mark as unread", exact: true }).click()
692+
await page.mouse.move(0, 0)
693+
await expect(tab(c.id).locator('[data-mark="unread"]')).toBeVisible()
694+
await expect(tab(c.id).locator('[data-slot="tab-status"]')).toHaveCSS("opacity", "1")
695+
await tab(a.id).locator("[data-titlebar-tab-link]").click()
696+
await expectPath(page, sessionHref(a.id))
697+
await expect(tab(c.id).locator('[data-mark="unread"]')).toBeVisible()
698+
await tab(c.id).locator("[data-titlebar-tab-link]").click()
699+
await expectPath(page, sessionHref(c.id))
700+
await expect(tab(c.id).locator('[data-mark="unread"]')).toBeHidden()
701+
await tab(a.id).locator("[data-titlebar-tab-link]").click()
702+
await expectPath(page, sessionHref(a.id))
703+
await expect(tab(c.id).locator('[data-mark="unread"]')).toBeHidden()
704+
})
705+
706+
test("an unfocused window preserves a restored manual unread reminder", async ({ page }) => {
707+
// Playwright emulates focus for each page, so model a background window explicitly.
708+
await page.addInitScript(() => {
709+
document.hasFocus = () => false
710+
})
711+
await mockWorkspace(page, {
712+
name: "BackgroundUnread",
713+
sessions: [a, { ...c, time: { created: T0, updated: T0, idle: T0, viewed: T0 } }],
714+
seed: { storage: { "opencode.global.dat:notification.manual-unread": { sessions: [c.id] } } },
715+
})
716+
await page.goto(sessionHref(c.id))
717+
await expectSessionTitle(page, c.title)
718+
const tab = page.locator(`[data-titlebar-tab-slot]:has(a[href="${sessionHref(c.id)}"])`)
719+
720+
await expect(tab.locator('[data-mark="unread"]')).toBeVisible()
721+
await page.evaluate(() => {
722+
document.hasFocus = Document.prototype.hasFocus.bind(document)
723+
window.dispatchEvent(new Event("focus"))
724+
})
725+
await expect(tab.locator('[data-mark="unread"]')).toBeHidden()
671726
})
672727

673728
test("vertical tabs resize, scroll, show shortcut hints, and navigate", async ({ page }) => {
@@ -2066,6 +2121,17 @@ test("the inbox keeps every unread result separate from expandable Recent, inclu
20662121
await inbox.getByRole("button", { name: "Show less", exact: true }).click()
20672122
await expect(recent).toHaveCount(10)
20682123
await expect(unread).toHaveCount(12)
2124+
2125+
const marked = page.getByText("Read session 1", { exact: true })
2126+
2127+
await recent.filter({ has: marked }).click({ button: "right" })
2128+
await page.getByRole("menuitem", { name: "Mark as unread", exact: true }).click()
2129+
await expect(unread.filter({ has: marked })).toHaveCount(1)
2130+
await expect(recent.filter({ has: marked })).toHaveCount(0)
2131+
await unread.filter({ has: marked }).click({ button: "right" })
2132+
await page.getByRole("menuitem", { name: "Mark as read", exact: true }).click()
2133+
await expect(recent.filter({ has: marked })).toHaveCount(1)
2134+
await expect(unread.filter({ has: marked })).toHaveCount(0)
20692135
})
20702136

20712137
test("the inbox waits for initial requests and orders attention by waiting age rather than last update", async ({

‎packages/app/e2e/utils/mock-api.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,7 @@ const Group = HttpApiGroup.make("mock")
388388
.add(
389389
HttpApiEndpoint.post("sessionView", "/api/session/:sessionID/view", {
390390
params: SessionParams,
391-
success: NoContent,
392-
}),
393-
)
394-
.add(
395-
HttpApiEndpoint.post("sessionView", "/api/session/:sessionID/view", {
396-
params: SessionParams,
391+
payload: Schema.Struct({ idle: Schema.Number }),
397392
success: NoContent,
398393
}),
399394
)

‎packages/app/e2e/utils/mock-server.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,25 @@ function mockHandlers(
12631263
}),
12641264
sessionRemove: () => noContent,
12651265
sessionShell: () => noContent,
1266-
sessionView: () => noContent,
1266+
sessionView: (ctx) =>
1267+
Effect.sync(() => {
1268+
const session = config.sessions.find((item) => item.id === ctx.params.sessionID)
1269+
1270+
if (!session) return
1271+
const time = currentSession(session, config.directory).time
1272+
1273+
session.time = { ...time, viewed: Math.max(time.viewed ?? 0, ctx.payload.idle) }
1274+
state.emit([
1275+
{
1276+
id: `evt_viewed_${session.id}_${ctx.payload.idle}`,
1277+
created: Date.now(),
1278+
type: "session.viewed",
1279+
durable: { aggregateID: session.id, seq: 1, version: 1 },
1280+
location: { directory: requestDirectory(config, ctx.request) },
1281+
data: { sessionID: session.id, idle: ctx.payload.idle },
1282+
},
1283+
])
1284+
}).pipe(Effect.andThen(noContent)),
12671285
sessionForm: (ctx) =>
12681286
Effect.succeed({
12691287
data: resolve(config.forms ?? []).filter(

‎packages/app/src/home/sessions/view.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { ServerConnection } from "@/runtime/server/registry"
1616
import { SessionTabAvatarView } from "@/shell/layout/session-tab-avatar"
1717
import { showToast } from "@/shell/notifications/toast"
1818
import { sessionLabel } from "@/session/title"
19+
import { SessionReadMenuItem } from "@/session/session-read-menu-item"
1920
import { shouldOpenSessionInBackground } from "./open"
2021
import { createAltHold } from "./alt-hold"
2122
import "./view.css"
@@ -867,6 +868,7 @@ function HomeSessionRow(
867868
>
868869
{props.language.t("common.export")}…
869870
</Menu.Item>
871+
<SessionReadMenuItem server={props.server} session={props.record.session} />
870872
<Menu.Separator />
871873
<Menu.Item onSelect={() => props.onDeleteSession(props.server, props.record.session)}>
872874
{props.language.t("common.delete")}…

‎packages/app/src/runtime/i18n/en.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,6 +1210,9 @@ export const dict = {
12101210
"settings.permissions.tool.doom_loop.title": "Doom Loop",
12111211
"settings.permissions.tool.doom_loop.description": "Detect repeated tool calls with identical input",
12121212

1213+
"session.markRead": "Mark as read",
1214+
"session.markUnread": "Mark as unread",
1215+
12131216
"session.delete.failed.title": "Failed to delete session",
12141217
"session.delete.title": "Delete session",
12151218
"session.delete.confirm": 'Delete session "{{name}}"?',

‎packages/app/src/session/route.tsx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import { createSessionResolution } from "./session-resolution"
3333
import { SessionScreenView } from "./screen"
3434
import { PreparingComposer } from "./preparing-composer"
3535
import { ComposerFocusProvider } from "./composer/focus"
36+
import { INITIAL_SESSION_VIEWED_STATE, transitionSessionViewed, type SessionViewedState } from "./viewed-machine"
3637

3738
export function TargetSessionRouteContent() {
3839
const params = useParams<{ serverKey: string; id: string }>()
@@ -255,6 +256,23 @@ function MarkSessionViewed(props: { sessionID: () => string | undefined }) {
255256
makeEventListener(window, "blur", update)
256257
makeEventListener(document, "visibilitychange", update)
257258

259+
const viewed = createMemo<SessionViewedState>(
260+
(previous) =>
261+
transitionSessionViewed(previous, {
262+
type: "changed",
263+
sessionID: props.sessionID(),
264+
focused: focus.window,
265+
ready: notification.session.ready(),
266+
}),
267+
INITIAL_SESSION_VIEWED_STATE,
268+
)
269+
270+
createEffect(
271+
on(viewed, (state) => {
272+
if (state.status === "viewed") notification.session.opened(state.sessionID)
273+
}),
274+
)
275+
258276
// Viewed state is shared by every client, so only a focused window reports what its user has seen.
259277
// markViewed reads the session's idle watermark, so a turn finishing while it stays open re-runs this.
260278
createEffect(() => {
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import { createMemo, Show } from "solid-js"
2+
import type { SessionInfo } from "@opencode/client/promise"
3+
import { Menu } from "@opencode/ui/menu"
4+
import { useLanguage } from "@/runtime/i18n/language"
5+
import { ServerConnection } from "@/runtime/server/registry"
6+
import { useGlobal } from "@/runtime/server/runtime"
7+
import { useSessionTabAvatarState } from "@/shell/layout/project-avatar-state"
8+
9+
export function SessionReadMenuItem(props: { server: ServerConnection.Key; session: SessionInfo | undefined }) {
10+
const language = useLanguage()
11+
12+
const global = useGlobal()
13+
14+
const session = createMemo(() => {
15+
const snapshot = props.session
16+
17+
return snapshot ? (global.serverCtx(props.server)?.data.session.get(snapshot.id) ?? snapshot) : undefined
18+
})
19+
20+
const status = useSessionTabAvatarState(
21+
() => props.server,
22+
() => session()?.id ?? "",
23+
() => true,
24+
session,
25+
)
26+
27+
const select = () => {
28+
const ctx = global.serverCtx(props.server)
29+
30+
const current = session()
31+
32+
if (!ctx || !current) return
33+
34+
// Home and inbox indexes may have a session that has not been loaded yet.
35+
if (!ctx.data.session.get(current.id)) ctx.data.session.remember(current)
36+
37+
if (status.unread()) return ctx.notification.session.markRead(current.id)
38+
ctx.notification.session.markUnread(current.id)
39+
}
40+
41+
return (
42+
<Show
43+
when={
44+
session() &&
45+
global.serverCtx(props.server)?.notification.session.ready() &&
46+
!status.loading() &&
47+
!status.attention() &&
48+
(status.unread() || session()?.time.idle !== undefined)
49+
}
50+
>
51+
<Menu.Item onSelect={select}>{language.t(status.unread() ? "session.markRead" : "session.markUnread")}</Menu.Item>
52+
</Show>
53+
)
54+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { expect, test } from "bun:test"
2+
import { INITIAL_SESSION_VIEWED_STATE, transitionSessionViewed } from "./viewed-machine"
3+
4+
test("a visit is viewed once, after focus and storage are ready", () => {
5+
const background = transitionSessionViewed(INITIAL_SESSION_VIEWED_STATE, {
6+
type: "changed",
7+
sessionID: "a",
8+
focused: false,
9+
ready: true,
10+
})
11+
12+
expect(background).toEqual({ status: "waiting", sessionID: "a" })
13+
const loading = transitionSessionViewed(background, { type: "changed", sessionID: "a", focused: true, ready: false })
14+
15+
expect(loading).toBe(background)
16+
const viewed = transitionSessionViewed(loading, { type: "changed", sessionID: "a", focused: true, ready: true })
17+
18+
expect(viewed).toEqual({ status: "viewed", sessionID: "a" })
19+
expect(transitionSessionViewed(viewed, { type: "changed", sessionID: "a", focused: false, ready: true })).toBe(viewed)
20+
expect(transitionSessionViewed(viewed, { type: "changed", sessionID: "a", focused: true, ready: true })).toBe(viewed)
21+
const left = transitionSessionViewed(viewed, { type: "changed", sessionID: undefined, focused: true, ready: true })
22+
23+
expect(left).toBe(INITIAL_SESSION_VIEWED_STATE)
24+
expect(transitionSessionViewed(left, { type: "changed", sessionID: "a", focused: true, ready: true })).not.toBe(
25+
viewed,
26+
)
27+
})
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
export type SessionViewedState =
2+
| { readonly status: "waiting"; readonly sessionID?: string }
3+
| { readonly status: "viewed"; readonly sessionID: string }
4+
5+
export type SessionViewedEvent = {
6+
readonly type: "changed"
7+
readonly sessionID: string | undefined
8+
readonly focused: boolean
9+
readonly ready: boolean
10+
}
11+
12+
export const INITIAL_SESSION_VIEWED_STATE: SessionViewedState = Object.freeze({ status: "waiting" })
13+
14+
export function transitionSessionViewed(state: SessionViewedState, event: SessionViewedEvent): SessionViewedState {
15+
if (!event.sessionID) return INITIAL_SESSION_VIEWED_STATE
16+
17+
if (state.status === "viewed" && state.sessionID === event.sessionID) return state
18+
19+
if (event.focused && event.ready) return { status: "viewed", sessionID: event.sessionID }
20+
21+
if (state.sessionID === event.sessionID) return state
22+
23+
return { status: "waiting", sessionID: event.sessionID }
24+
}

0 commit comments

Comments
 (0)