Skip to content

Commit 7aac8f7

Browse files
committed
feat(app): use server projects and track used projects on home
- The GUI project list comes from the server (GET /api/project) everywhere, in its order (most recently active first), and follows project.updated: unknown projects join, archived ones leave, activity re-sorts. "Add project" resolves the directory on the server and reloads the list. - Home lists only the server projects this client has used (per server, by project ID), with a Close menu item that hides a project until it is used again. The new-session location dialog lists used projects first, then the rest; Settings and the command palette keep the full list. - Projects sharing one directory under several IDs collapse to the most recently active one on Home and in the location dialog. - The directory list older builds stored is migrated once per server to used project IDs after the server list loads, then dropped. - Removed local project reordering, recently closed, close-as-hide of the local list, the per-directory icon override cache and the opencode-test path filter.
1 parent 61c1a79 commit 7aac8f7

59 files changed

Lines changed: 547 additions & 935 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 106 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import type { OpenCodeEvent } from "@opencode/client/promise"
12
import { expect, test, type Page } from "@playwright/test"
2-
import { expectPath, holdRoute, NO_PROVIDER, project, REMOTE_SERVER, seed, sessionHref } from "../utils/app"
3+
import { expectPath, holdRoute, NO_PROVIDER, project, REMOTE_SERVER, seed, sessionHref, T0 } from "../utils/app"
34
import { mockOpenCodeServer } from "../utils/mock-server"
45
import { fixture, mockStressTimeline } from "../utils/session-fixture"
5-
import { mockRemoteServer } from "../utils/workspace"
6+
import { mockRemoteServer, newSessionLocation } from "../utils/workspace"
67
import { APP_READY_TIMEOUT, expectAppVisible } from "../utils/waits"
78

89
test.use({ serviceWorkers: "block" })
@@ -12,10 +13,7 @@ const row = (page: Page, title: string) =>
1213

1314
async function openHome(page: Page, input: Parameters<typeof mockStressTimeline>[1] = {}) {
1415
await mockStressTimeline(page, input)
15-
await seed(page, {
16-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
17-
lastProject: { local: fixture.directory },
18-
})
16+
await seed(page, { usedProjects: { local: [fixture.project.id] } })
1917
await page.goto("/")
2018
}
2119

@@ -81,8 +79,6 @@ test("the session context menu renames, exports, and deletes a Home session", as
8179
test("the Home shortcut focuses session search, and the Home button leaves focus alone", async ({ page }) => {
8280
await mockStressTimeline(page)
8381
await seed(page, {
84-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
85-
lastProject: { local: fixture.directory },
8682
tabs: [fixture.sourceID],
8783
})
8884
await page.goto(sessionHref(fixture.sourceID))
@@ -105,6 +101,104 @@ test("the Home shortcut focuses session search, and the Home button leaves focus
105101
await expect(search).not.toBeFocused()
106102
})
107103

104+
const entry = (name: string, active: number, id = `proj_${name}`) =>
105+
project({
106+
id,
107+
directory: `C:/OpenCode/${name}`,
108+
name,
109+
time: { created: T0, updated: T0, active: T0 + active },
110+
})
111+
112+
async function homeProjects(page: Page, projects: unknown[]) {
113+
const directory = "C:/OpenCode/home"
114+
const server = await mockOpenCodeServer(page, {
115+
directory,
116+
project: project({ id: "proj_home", directory }),
117+
projects: () => projects,
118+
provider: NO_PROVIDER,
119+
sessions: [],
120+
pageMessages: () => ({ items: [] }),
121+
})
122+
123+
return { server, rows: page.locator('[data-component="home-project-row"] [data-slot="home-row-label"]') }
124+
}
125+
126+
test("Home lists the used server projects by recent activity, hides them, and lists them again once used", async ({
127+
page,
128+
}) => {
129+
// `recent` was first resolved under another ID, so one directory has two projects.
130+
const listed = [entry("unused", 4), entry("recent", 3), entry("older", 2), entry("oldest", 1)]
131+
listed.push(entry("recent", 0, "proj_recent_before_git"))
132+
const view = await homeProjects(page, listed)
133+
await seed(page, { usedProjects: { local: ["proj_recent_before_git", "proj_older", "proj_oldest"] } })
134+
await page.goto("/")
135+
await expect(view.rows).toHaveText(["recent", "older", "oldest"])
136+
137+
// Activity moves a project up and an archived project leaves; a project this client never used stays out.
138+
const active = { ...listed[3]!, time: { ...listed[3]!.time, active: T0 + 5 } }
139+
const archived = { ...listed[2]!, time: { ...listed[2]!.time, archived: T0 + 6 } }
140+
const fresh = entry("fresh", 7)
141+
listed.splice(0, listed.length, fresh, active, listed[0]!, listed[1]!, listed[4]!)
142+
await view.server.push(
143+
[active, archived, fresh].map((data, index) => ({
144+
id: `evt_home_project_${index}`,
145+
created: T0 + index,
146+
type: "project.updated",
147+
data,
148+
})) as OpenCodeEvent[],
149+
)
150+
await expect(view.rows).toHaveText(["oldest", "recent"])
151+
152+
const recent = page.locator('[data-component="home-project-row"]').filter({ hasText: "recent" })
153+
await recent.locator("..").getByRole("button", { name: "More options", exact: true }).click()
154+
await page.getByRole("menuitem", { name: "Close", exact: true }).click()
155+
await expect(view.rows).toHaveText(["oldest"])
156+
157+
// The location dialog lists every server project once: used ones first, then the rest, each by recency.
158+
await page
159+
.locator('[data-component="home-project-row"]')
160+
.filter({ hasText: "oldest" })
161+
.locator("..")
162+
.getByRole("button", { name: "New session", exact: true })
163+
.click()
164+
await newSessionLocation(page).click()
165+
const options = page.getByRole("dialog").getByRole("option")
166+
await expect(options.locator(".command-palette-title")).toHaveText([
167+
"oldest",
168+
"fresh",
169+
"unused",
170+
"recent",
171+
"Add project",
172+
])
173+
await options.filter({ hasText: "C:/OpenCode/recent" }).click()
174+
await expect(newSessionLocation(page)).toContainText("recent")
175+
await page.getByRole("button", { name: "Home", exact: true }).click()
176+
await expect(view.rows).toHaveText(["oldest", "recent"])
177+
})
178+
179+
test("Home migrates the directories an older build listed to the server's current projects", async ({ page }) => {
180+
const view = await homeProjects(page, [
181+
entry("api", 3),
182+
entry("web", 2),
183+
entry("api", 1, "proj_api_before_remote"),
184+
entry("docs", 0),
185+
])
186+
await seed(page, {
187+
legacyProjects: {
188+
local: [
189+
{ worktree: "C:/OpenCode/api", expanded: true },
190+
{ worktree: "C:/OpenCode/web/packages/app" },
191+
{ worktree: "C:/OpenCode/gone" },
192+
],
193+
},
194+
})
195+
await page.goto("/")
196+
await expect(view.rows).toHaveText(["api", "web"])
197+
await expect
198+
.poll(() => page.evaluate(() => JSON.parse(localStorage.getItem("opencode.global.dat:server") ?? "{}")))
199+
.toMatchObject({ usedProjectIDs: { local: ["proj_api", "proj_web"] }, projects: {} })
200+
})
201+
108202
test("Home shows loaded sessions before the location request resolves", async ({ page }) => {
109203
const location = await holdRoute(page, (url) => url.pathname === "/api/location")
110204
await openHome(page)
@@ -217,7 +311,6 @@ const worktree =
217311
for (const state of [
218312
{ name: "local", directory: fixture.directory, icon: "monitor" },
219313
{ name: "worktree", directory: worktree, icon: "outline-worktree" },
220-
{ name: "closed worktree", directory: recovery, icon: "outline-worktree", recovery: "closed" },
221314
{ name: "unopened worktree", directory: recovery, icon: "outline-worktree", recovery: "unopened" },
222315
]) {
223316
test(`the session project menu opens settings and Home for a ${state.name} project`, async ({ page }) => {
@@ -239,25 +332,10 @@ for (const state of [
239332
state.recovery && input.sessionID === fixture.targetID ? messages.promise : Promise.resolve(),
240333
})
241334

242-
// An unopened project has no stored project list or tabs.
243-
if (state.recovery !== "unopened")
244-
await seed(page, {
245-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
246-
lastProject: { local: fixture.directory },
247-
tabs: [fixture.sourceID, fixture.targetID],
248-
})
335+
// An unopened project has no stored tabs.
336+
if (state.recovery !== "unopened") await seed(page, { tabs: [fixture.sourceID, fixture.targetID] })
249337
const name = fixture.project.name
250-
251-
if (state.recovery === "closed") {
252-
await page.goto("/")
253-
const project = page.locator('[data-component="home-project-row"]').filter({ hasText: name })
254-
await project.locator("..").getByRole("button", { name: "More options", exact: true }).click()
255-
await page.getByRole("menuitem", { name: "Close", exact: true }).click()
256-
await expect(project).toHaveCount(0)
257-
await page.locator(`[data-titlebar-tab-link][href="${sessionHref(fixture.targetID)}"]`).click()
258-
}
259-
260-
if (state.recovery !== "closed") await page.goto(sessionHref(fixture.targetID))
338+
await page.goto(sessionHref(fixture.targetID))
261339

262340
const header = page.locator("[data-session-title]")
263341
const trigger = header.getByRole("button", { name, exact: true })
@@ -312,7 +390,7 @@ for (const state of [
312390

313391
test("the project menu path arrow has a glyph when the page has an older icon sprite", async ({ page }) => {
314392
await mockStressTimeline(page)
315-
await seed(page, { projects: { local: [{ worktree: fixture.directory, expanded: true }] }, tabs: [fixture.targetID] })
393+
await seed(page, { tabs: [fixture.targetID] })
316394
// A page cached before the arrow icon shipped carries a sprite without it.
317395
await page.route(
318396
(url) => url.pathname === sessionHref(fixture.targetID),

‎packages/app/e2e/regression/mobile-session.spec.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const rows = 2
99

1010
async function openStress(page: Page, extra: SeedInput = {}) {
1111
await seed(page, {
12-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
12+
usedProjects: { local: [fixture.project.id] },
1313
tabs: [fixture.sourceID, fixture.targetID],
1414
...extra,
1515
})
@@ -22,7 +22,6 @@ for (const position of ["top", "bottom"] as const) {
2222
await page.setViewportSize({ width: 390, height: 844 })
2323
await mockStressTimeline(page, { fileList: () => [], pty: {} })
2424
await openStress(page, {
25-
lastProject: { local: fixture.directory },
2625
settings: { general: { mobileTitlebarPosition: position } },
2726
})
2827
await page.goto(sessionHref(fixture.targetID))
@@ -236,7 +235,7 @@ test("the summary's changes row switches the view and keeps the side tabs", asyn
236235
fileList: (path) => (path ? [] : [fileNode(fixture.directory, "README.md")]),
237236
fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
238237
})
239-
await openStress(page, { lastProject: { local: fixture.directory } })
238+
await openStress(page)
240239
await page.goto(sessionHref(fixture.targetID))
241240

242241
// One click previews the file in place of the Open file tab.
@@ -293,7 +292,7 @@ test("a narrow-screen palette pick keeps the view, and the side region shows the
293292
findFiles: ({ query }) => ("README.md".includes(query) ? [fileNode(fixture.directory, "README.md")] : []),
294293
pty: {},
295294
})
296-
await openStress(page, { lastProject: { local: fixture.directory } })
295+
await openStress(page)
297296
await page.goto(sessionHref(fixture.targetID))
298297

299298
const tabs = page.getByRole("tablist", { name: "Session view", exact: true })

‎packages/app/e2e/regression/multi-server.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,7 @@ test("a project's auto-accept choice overrides the default in both directions",
242242
onPermissionReply: (reply) => replies.push(reply.permissionID),
243243
},
244244
})
245-
await seed(page, {
246-
projects: { local: [{ worktree: "/work/api" }, { worktree: "/work/web" }] },
247-
tabs: [api.id, web.id],
248-
})
245+
await seed(page, { tabs: [api.id, web.id] })
249246
const dock = page.locator('[data-component="dock-prompt"][data-kind="permission"]')
250247
const settings = page.getByTestId("settings-screen")
251248

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { OpenCodeEvent, SessionMessageInfo } from "@opencode/client/promise"
22
import { expect, test, type Locator, type Page } from "@playwright/test"
33
import { base64Encode } from "@opencode/util/encode"
4-
import { SERVER, holdRoute, project, provider, session, workspaceKey } from "../utils/app"
4+
import { SERVER, holdRoute, project, provider, session } from "../utils/app"
55
import { openFileLauncher } from "../utils/side-panel"
66
import { mockOpenCodeServer } from "../utils/mock-server"
77
import { fileDiff, fileNode, openSession } from "../utils/workspace"
@@ -269,19 +269,14 @@ for (const listed of [false, true]) {
269269
name: "BrowserRepo",
270270
sessions: [{ id: "ses_browserrepo", title: "BrowserRepo", directory }],
271271
fileList: (path) => (path ? [] : [fileNode(directory, "README.md")]),
272-
seed: {
273-
panes: { ses_browserrepo: { review: true } },
274-
// The user also opened the subfolder as its own sidebar project and renamed it there.
275-
...(listed && {
276-
projects: {
277-
local: [
278-
{ worktree: root, expanded: true },
279-
{ worktree: directory, expanded: true },
280-
],
281-
},
282-
storage: { [workspaceKey(directory, "project")]: { value: { name: "Custom app" } } },
283-
}),
284-
},
272+
// The server also lists the subfolder as its own project, renamed.
273+
...(listed && {
274+
projects: [
275+
project({ id: "proj_browserrepo", directory: root, name: "BrowserRepo" }),
276+
project({ id: "proj_browserrepo_app", directory, name: "Custom app" }),
277+
],
278+
}),
279+
seed: { panes: { ses_browserrepo: { review: true } } },
285280
})
286281
const panel = page.locator("#review-panel")
287282
await openFileLauncher(panel)

‎packages/app/e2e/regression/session-header.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ for (const direction of ["ltr", "rtl"] as const) {
1111
test(`session header groups controls and exposes session details in ${direction}`, async ({ page }) => {
1212
await mockStressTimeline(page)
1313
await seed(page, {
14-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
15-
lastProject: { local: fixture.directory },
1614
tabs: [fixture.sourceID, fixture.targetID],
1715
settings: { general: { showStatus: true } },
1816
})

‎packages/app/e2e/regression/session-summary.spec.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ test("multiple desktop connections show the session's server name", async ({ pag
572572
{ url: SERVER, name: "Design server" },
573573
{ url: "http://secondary.test", name: "Other server" },
574574
],
575-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
576575
})
577576
await page.goto(sessionHref(fixture.targetID))
578577
await page.getByRole("button", { name: "Session details", exact: true }).click()

‎packages/app/e2e/regression/settings-search.spec.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ async function open(page: Page, input: { count?: number; seed?: SeedInput } = {}
3030
project: { icon: { color: "orange" } },
3131
provider: NO_PROVIDER,
3232
projects,
33-
seed: {
34-
tabs: [],
35-
...(projects ? { projects: { local: projects.map((item) => ({ worktree: item.worktree })) } } : {}),
36-
...input.seed,
37-
},
33+
seed: { tabs: [], ...input.seed },
3834
})
3935

4036
const view = {
@@ -348,10 +344,6 @@ test("multi-server results navigate to the named server and keep the query on re
348344
const view = await open(page, {
349345
seed: {
350346
servers: [{ url: REMOTE_SERVER, name: "Build server" }],
351-
projects: {
352-
local: [{ worktree: directory, expanded: true }],
353-
[REMOTE_SERVER]: [{ worktree: "/remote/opencode", expanded: true }],
354-
},
355347
},
356348
})
357349

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,23 @@ test("single-server settings expose scoped pages without a server picker", async
134134
expect((await updated).postDataJSON()).toEqual({ shell: "bash" })
135135
})
136136

137-
test("project list menus rename, close, edit, add, and stay inside the scrollport", async ({ page }) => {
137+
test("project list menus rename, edit, add, and stay inside the scrollport", async ({ page }) => {
138138
const projects = ["rebase", "dinocms", "opencode", "Playground"].map((name, index) =>
139139
project({ id: `project-${index}`, directory: `/projects/${name}`, name }),
140140
)
141+
const added = project({ id: "project-added", directory: "/projects/added", name: "added" })
141142

142143
const { settings } = await open(page, {
143144
name: "rebase",
144145
directory: "/projects/rebase",
145146
project: { id: "project-0" },
146147
projects,
148+
// The server registers a project when it first resolves its directory.
149+
onLocationGet: (directory) => {
150+
if (directory === added.worktree && !projects.includes(added)) projects.push(added)
151+
},
147152
sessions: [],
148153
fileList: () => [],
149-
seed: { projects: { local: projects.map((item) => ({ worktree: item.worktree, expanded: true })) } },
150154
})
151155

152156
await settings.getByRole("tab", { name: "Projects", exact: true }).click()
@@ -157,7 +161,7 @@ test("project list menus rename, close, edit, add, and stay inside the scrollpor
157161
const more = card.getByRole("button", { name: "More options", exact: true })
158162
await more.click()
159163
const menu = page.getByRole("menu")
160-
await expect(menu.getByRole("menuitem")).toHaveText(["Edit", "Rename", "Clear notifications", "Close"])
164+
await expect(menu.getByRole("menuitem")).toHaveText(["Edit", "Rename", "Clear notifications"])
161165
await menu.getByRole("menuitem", { name: "Edit", exact: true }).click()
162166
await expect(panel.getByRole("heading", { name: "rebase", exact: true })).toBeVisible()
163167
await settings.getByRole("button", { name: "Back to projects", exact: true }).click()
@@ -183,14 +187,6 @@ test("project list menus rename, close, edit, add, and stay inside the scrollpor
183187
await expect(panel).toHaveJSProperty("scrollWidth", await panel.evaluate((element) => element.clientWidth))
184188
await page.setViewportSize({ width: 1280, height: 720 })
185189

186-
await list
187-
.getByRole("listitem")
188-
.filter({ hasText: "dinocms" })
189-
.getByRole("button", { name: "More options", exact: true })
190-
.click()
191-
await page.getByRole("menuitem", { name: "Close", exact: true }).click()
192-
await expect(panel.getByRole("button", { name: "dinocms", exact: true })).toHaveCount(0)
193-
194190
await more.click()
195191
await menu.getByRole("menuitem", { name: "Rename", exact: true }).click()
196192
const rename = panel.getByRole("textbox", { name: "Rename", exact: true })
@@ -224,7 +220,7 @@ test("project settings open as a nested view that keeps its route", async ({ pag
224220
await expect(settings.getByRole("tab", { name: "Scripts", exact: true })).toHaveCount(0)
225221
const menu = page.getByRole("menu")
226222
await settings.locator(".settings-tab-header").getByRole("button", { name: "More options", exact: true }).click()
227-
await expect(menu.getByRole("menuitem")).toHaveText(["Clear notifications", "Close"])
223+
await expect(menu.getByRole("menuitem")).toHaveText(["Clear notifications"])
228224
// Escape must reach the menu, not the settings screen behind it.
229225
await expect.poll(() => menu.evaluate((element) => element.contains(document.activeElement))).toBe(true)
230226
await page.keyboard.press("Escape")

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,8 +751,6 @@ test("inactive tabs load attention and inbox, but read the transcript only on se
751751
}),
752752
})
753753
await seed(page, {
754-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
755-
lastProject: { local: fixture.directory },
756754
tabs: [fixture.sourceID, fixture.targetID, fixture.childID],
757755
})
758756

@@ -824,7 +822,6 @@ test("five loaded workspace tabs stay rendered and reactive through repeated swi
824822

825823
// Each worktree session resolves to its own location in the shared project (the mock echoes the requested one).
826824
await seed(page, {
827-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
828825
tabs: sessions.map((item) => item.id),
829826
})
830827
await page.goto(sessionHref(sessions[0]!.id))

‎packages/app/e2e/regression/timeline-cache.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,6 @@ function tab(page: Page, sessionID: string) {
449449
async function openTabs(page: Page, input: Partial<MockServerConfig>, extra: SeedInput = {}) {
450450
const mock = await mockStressTimeline(page, input)
451451
await seed(page, {
452-
projects: { local: [{ worktree: fixture.directory, expanded: true }] },
453-
lastProject: { local: fixture.directory },
454452
tabs: [fixture.sourceID, fixture.targetID],
455453
...extra,
456454
})

0 commit comments

Comments
 (0)