Skip to content

Commit 4988d4a

Browse files
committed
refactor(app): share inbox and project session renaming
1 parent 95b207d commit 4988d4a

4 files changed

Lines changed: 76 additions & 22 deletions

File tree

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,6 +1858,39 @@ test("opening a session from the inbox keeps the list's scroll position and rows
18581858
expect(await list.evaluate((element) => element.scrollTop)).toBe(offset)
18591859
})
18601860

1861+
test("renaming an inbox card updates the same session on Home", async ({ page }) => {
1862+
await mockWorkspace(page, {
1863+
name: "RenameInbox",
1864+
sessions: [
1865+
{ id: "ses_rename_inbox", title: "Original inbox title" },
1866+
{ id: "ses_rename_kept", title: "Unchanged title" },
1867+
],
1868+
seed: { settings: { appearance: { tabLayout: "inbox" } }, tabs: [] },
1869+
})
1870+
await page.goto("/")
1871+
const inbox = page.locator('[data-slot="sidebar-inbox"]')
1872+
1873+
const home = page.locator('[data-component="home-session-row-container"][data-session-id="ses_rename_inbox"]')
1874+
1875+
await expect(home).toContainText("Original inbox title")
1876+
await inbox
1877+
.locator('[data-slot="sidebar-inbox-item"]')
1878+
.filter({ hasText: "Original inbox title" })
1879+
.click({ button: "right" })
1880+
await page.getByRole("menuitem", { name: "Rename", exact: true }).click()
1881+
const dialog = page.getByRole("dialog")
1882+
1883+
await dialog.getByRole("textbox").fill("Renamed inbox title")
1884+
await dialog.getByRole("button", { name: "Save", exact: true }).click()
1885+
await expect(dialog).toBeHidden()
1886+
await expect(
1887+
inbox.locator('[data-slot="sidebar-inbox-item"]').filter({ hasText: "Renamed inbox title" }),
1888+
).toHaveCount(1)
1889+
await expect(inbox.getByText("Original inbox title", { exact: true })).toHaveCount(0)
1890+
await expect(inbox.getByText("Unchanged title", { exact: true })).toBeVisible()
1891+
await expect(home).toContainText("Renamed inbox title")
1892+
})
1893+
18611894
test("the inbox Archived dialog searches only archived sessions and restores the selected session", async ({
18621895
page,
18631896
}) => {
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import type { SessionInfo } from "@opencode/client/promise"
2+
import { useQueryClient } from "@tanstack/solid-query"
3+
import { useLanguage } from "@/runtime/i18n/language"
4+
import { ServerConnection } from "@/runtime/server/registry"
5+
import { useGlobal } from "@/runtime/server/runtime"
6+
7+
export function createSessionRenamer() {
8+
const global = useGlobal()
9+
10+
const language = useLanguage()
11+
12+
const queryClient = useQueryClient()
13+
14+
return async (server: ServerConnection.Key, session: SessionInfo, title: string) => {
15+
const ctx = global.serverCtx(server)
16+
17+
const conn = global.servers.list().find((item) => ServerConnection.key(item) === server)
18+
19+
if (!ctx || !conn) throw new Error(language.t("common.requestFailed"))
20+
await ctx.sdk.api.session.update({ sessionID: session.id, title })
21+
ctx.data.session.remember({ ...(ctx.data.session.get(session.id) ?? session), title })
22+
ctx.data.session.invalidate(session.id)
23+
void ctx.data.session.sync(session.id).catch(() => undefined)
24+
void queryClient.invalidateQueries({ queryKey: ["home-sessions", conn], exact: true })
25+
void queryClient.invalidateQueries({ queryKey: ["inbox-sessions", conn], exact: true })
26+
void queryClient.invalidateQueries({ queryKey: ["inbox-archived-sessions", conn], exact: true })
27+
}
28+
}

‎packages/app/src/shell/titlebar/inbox-model.ts‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { sessionFormRequest, sessionPermissionRequest, sessionTreeIDs } from "@/
1616
import { notifySessionTabsRemoved } from "./session-events"
1717
import { errorMessage } from "@/shell/layout/helpers"
1818
import { showToast } from "@/shell/notifications/toast"
19+
import { createSessionRenamer } from "@/session/commands/rename-session"
1920
import { workingSince } from "./inbox-working"
2021
import {
2122
INITIAL_INBOX_BRANCH_STATE,
@@ -67,6 +68,8 @@ export function createSessionInbox(options: { archived?: boolean } = {}) {
6768
const language = useLanguage()
6869
const queryClient = useQueryClient()
6970

71+
const rename = createSessionRenamer()
72+
7073
const [clock, setClock] = createStore({ second: Date.now(), minute: Date.now() })
7174
const timer = setInterval(() => setClock("minute", Date.now()), 60_000)
7275
onCleanup(() => clearInterval(timer))
@@ -456,15 +459,7 @@ export function createSessionInbox(options: { archived?: boolean } = {}) {
456459
if (!entry.ctx.data.session.get(entry.session.id)) entry.ctx.data.session.remember(entry.session)
457460
entry.ctx.notification.session.markRead(entry.session.id)
458461
},
459-
rename: async (entry: InboxEntry, title: string) => {
460-
await entry.ctx.sdk.api.session.update({ sessionID: entry.session.id, title })
461-
entry.ctx.data.session.remember({ ...(entry.ctx.data.session.get(entry.session.id) ?? entry.session), title })
462-
entry.ctx.data.session.invalidate(entry.session.id)
463-
void entry.ctx.data.session.sync(entry.session.id).catch(() => undefined)
464-
void queryClient.invalidateQueries({ queryKey: ["home-sessions", entry.conn], exact: true })
465-
void queryClient.invalidateQueries({ queryKey: ["inbox-sessions", entry.conn], exact: true })
466-
void queryClient.invalidateQueries({ queryKey: ["inbox-archived-sessions", entry.conn], exact: true })
467-
},
462+
rename: (entry: InboxEntry, title: string) => rename(entry.server, entry.session, title),
468463
archive: (entry: InboxEntry) =>
469464
entry.ctx.sdk.api.session
470465
.update({ sessionID: entry.session.id, archived: true })

‎packages/app/src/shell/titlebar/project-session-row.tsx‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { showToast } from "@/shell/notifications/toast"
1717
import { sessionTreeIDs } from "@/session/requests/session-request-tree"
1818
import { sessionLabel } from "@/session/title"
1919
import { createSessionExporter } from "@/session/commands/export-session"
20+
import { createSessionRenamer } from "@/session/commands/rename-session"
2021
import { SessionReadMenuItem } from "@/session/session-read-menu-item"
2122
import { notifySessionTabsRemoved } from "./session-events"
2223
import {
@@ -49,6 +50,8 @@ export function ProjectSessionRow(props: {
4950

5051
const exporter = createSessionExporter()
5152

53+
const rename = createSessionRenamer()
54+
5255
const exportTarget = () => ({ server: props.server, sessionID: props.session.id })
5356

5457
const status = useSessionTabAvatarState(
@@ -58,18 +61,6 @@ export function ProjectSessionRow(props: {
5861
() => props.session,
5962
)
6063

61-
// Refreshes the title even when the dialog already stopped waiting, so a late save still shows.
62-
const rename = async (title: string) => {
63-
const current = ctx()
64-
65-
if (!current) throw new Error(language.t("common.requestFailed"))
66-
await current.sdk.api.session.update({ sessionID: props.session.id, title })
67-
current.data.session.remember({ ...(current.data.session.get(props.session.id) ?? props.session), title })
68-
current.data.session.invalidate(props.session.id)
69-
void current.data.session.sync(props.session.id).catch(() => undefined)
70-
void queryClient.invalidateQueries({ queryKey: ["home-sessions", connection()], exact: true })
71-
}
72-
7364
function DeleteDialog() {
7465
const confirm = () => {
7566
const current = ctx()
@@ -170,7 +161,14 @@ export function ProjectSessionRow(props: {
170161
>
171162
<Menu.Item
172163
disabled={!ctx()}
173-
onSelect={() => dialog.show(() => <RenameDialog title={sessionLabel(props.session)} onRename={rename} />)}
164+
onSelect={() =>
165+
dialog.show(() => (
166+
<RenameDialog
167+
title={sessionLabel(props.session)}
168+
onRename={(title) => rename(props.server, props.session, title)}
169+
/>
170+
))
171+
}
174172
>
175173
{language.t("common.rename")}
176174
</Menu.Item>

0 commit comments

Comments
 (0)