Skip to content

Commit b043676

Browse files
engineerCopilot
andcommitted
feat(app): add Recently Active dashboard, session tree view, and worktree visibility
Co-authored-by: Copilot <[email protected]>
1 parent 9247adb commit b043676

47 files changed

Lines changed: 3202 additions & 1399 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/actions.ts‎

Lines changed: 75 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,68 @@ export async function openSettings(page: Page) {
311311
return dialog
312312
}
313313

314+
export async function seedProjects(page: Page, input: { directory: string; extra?: string[]; serverUrl?: string }) {
315+
await page.addInitScript(
316+
(args: { directory: string; serverUrl: string; extra: string[] }) => {
317+
const key = "opencode.global.dat:server"
318+
const defaultKey = "opencode.settings.dat:defaultServerUrl"
319+
const raw = localStorage.getItem(key)
320+
const parsed = (() => {
321+
if (!raw) return undefined
322+
try {
323+
return JSON.parse(raw) as unknown
324+
} catch {
325+
return undefined
326+
}
327+
})()
328+
329+
const store = parsed && typeof parsed === "object" ? (parsed as Record<string, unknown>) : {}
330+
const list = Array.isArray(store.list) ? store.list : []
331+
const lastProject = store.lastProject && typeof store.lastProject === "object" ? store.lastProject : {}
332+
const projects = store.projects && typeof store.projects === "object" ? store.projects : {}
333+
const nextProjects = { ...(projects as Record<string, unknown>) }
334+
const nextList = list.includes(args.serverUrl) ? list : [args.serverUrl, ...list]
335+
336+
const add = (origin: string, directory: string) => {
337+
const current = nextProjects[origin]
338+
const items = Array.isArray(current) ? current : []
339+
const existing = items.filter(
340+
(p): p is { worktree: string; expanded?: boolean } =>
341+
!!p &&
342+
typeof p === "object" &&
343+
"worktree" in p &&
344+
typeof (p as { worktree?: unknown }).worktree === "string",
345+
)
346+
347+
nextProjects[origin] = [{ worktree: directory, expanded: true }, ...existing.filter((p) => p.worktree !== directory)]
348+
}
349+
350+
const directories = [args.directory, ...args.extra]
351+
for (const directory of directories) {
352+
add("local", directory)
353+
add(args.serverUrl, directory)
354+
}
355+
356+
const nextLastProject = {
357+
...(lastProject as Record<string, string>),
358+
local: args.directory,
359+
[args.serverUrl]: args.directory,
360+
}
361+
362+
localStorage.setItem(
363+
key,
364+
JSON.stringify({
365+
list: nextList,
366+
projects: nextProjects,
367+
lastProject: nextLastProject,
368+
}),
369+
)
370+
localStorage.setItem(defaultKey, args.serverUrl)
371+
},
372+
{ directory: input.directory, serverUrl: input.serverUrl ?? serverUrl, extra: input.extra ?? [] },
373+
)
374+
}
375+
314376
export async function createTestProject(input?: { serverUrl?: string }) {
315377
const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-e2e-project-"))
316378
const id = `e2e-${path.basename(root)}`
@@ -870,22 +932,19 @@ export async function openProjectMenu(page: Page, projectSlug: string) {
870932
}
871933

872934
export async function setWorkspacesEnabled(page: Page, projectSlug: string, enabled: boolean) {
873-
const current = () =>
874-
page
875-
.getByRole("button", { name: "New workspace" })
876-
.first()
877-
.isVisible()
878-
.then((x) => x)
879-
.catch(() => false)
880-
881-
if ((await current()) === enabled) return
882-
883-
if (enabled) {
884-
await page.reload()
885-
await openSidebar(page)
886-
if ((await current()) === enabled) return
935+
const state = async () => {
936+
const menu = await openProjectMenu(page, projectSlug)
937+
const toggle = menu.locator(projectWorkspacesToggleSelector(projectSlug)).first()
938+
await expect(toggle).toBeVisible()
939+
const text = ((await toggle.textContent()) ?? "").trim().toLowerCase()
940+
await page.keyboard.press("Escape").catch(() => undefined)
941+
if (text.includes("disable")) return true
942+
if (text.includes("enable")) return false
943+
throw new Error(`Unexpected workspaces toggle label for ${projectSlug}: ${text}`)
887944
}
888945

946+
if ((await state()) === enabled) return
947+
889948
const flip = async (timeout?: number) => {
890949
const menu = await openProjectMenu(page, projectSlug)
891950
const toggle = menu.locator(projectWorkspacesToggleSelector(projectSlug)).first()
@@ -913,14 +972,8 @@ export async function setWorkspacesEnabled(page: Page, projectSlug: string, enab
913972
if (matched) break
914973
}
915974

916-
if ((await current()) !== enabled) {
917-
await page.reload()
918-
await openSidebar(page)
919-
}
920-
921-
const expected = enabled ? "New workspace" : "New session"
922-
await expect.poll(current, { timeout: 60_000 }).toBe(enabled)
923-
await expect(page.getByRole("button", { name: expected }).first()).toBeVisible({ timeout: 30_000 })
975+
if (!flipped) await flip()
976+
await expect.poll(() => state(), { timeout: 10_000 }).toBe(enabled)
924977
}
925978

926979
export async function openWorkspaceMenu(page: Page, workspaceSlug: string) {

‎packages/app/e2e/projects/workspaces.spec.ts‎

Lines changed: 105 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,17 @@ import {
1717
setWorkspacesEnabled,
1818
slugFromUrl,
1919
waitDir,
20+
waitSession,
2021
waitSlug,
2122
} from "../actions"
2223
import { inlineInputSelector, workspaceItemSelector } from "../selectors"
2324
import { dirSlug } from "../utils"
2425

25-
async function setupWorkspaceTest(page: Page, project: { slug: string; trackDirectory: (directory: string) => void }) {
26-
const rootSlug = project.slug
27-
await openSidebar(page)
28-
29-
await setWorkspacesEnabled(page, rootSlug, true)
30-
31-
await page.getByRole("button", { name: "New workspace" }).first().click()
32-
const next = await resolveSlug(await waitSlug(page, [rootSlug]))
33-
await waitDir(page, next.directory)
34-
project.trackDirectory(next.directory)
35-
36-
await openSidebar(page)
37-
26+
async function waitWorkspaceItem(page: Page, slug: string) {
3827
await expect
3928
.poll(
4029
async () => {
41-
const item = page.locator(workspaceItemSelector(next.slug)).first()
30+
const item = page.locator(workspaceItemSelector(slug)).first()
4231
try {
4332
await item.hover({ timeout: 500 })
4433
return true
@@ -49,6 +38,21 @@ async function setupWorkspaceTest(page: Page, project: { slug: string; trackDire
4938
{ timeout: 60_000 },
5039
)
5140
.toBe(true)
41+
}
42+
43+
async function setupWorkspaceTest(page: Page, project: { slug: string }) {
44+
const rootSlug = project.slug
45+
await openSidebar(page)
46+
47+
await setWorkspacesEnabled(page, rootSlug, true)
48+
49+
await page.getByRole("button", { name: "New workspace" }).first().click()
50+
const next = await resolveSlug(await waitSlug(page, [rootSlug]))
51+
await waitDir(page, next.directory)
52+
project.trackDirectory(next.directory)
53+
54+
await openSidebar(page)
55+
await waitWorkspaceItem(page, next.slug)
5256

5357
return { rootSlug, slug: next.slug, directory: next.directory }
5458
}
@@ -59,16 +63,36 @@ test("can enable and disable workspaces from project menu", async ({ page, proje
5963

6064
await openSidebar(page)
6165

62-
await expect(page.getByRole("button", { name: "New session" }).first()).toBeVisible()
63-
await expect(page.getByRole("button", { name: "New workspace" })).toHaveCount(0)
66+
await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()
67+
await waitWorkspaceItem(page, slug)
6468

65-
await setWorkspacesEnabled(page, project.slug, true)
66-
await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()
67-
await expect(page.locator(workspaceItemSelector(project.slug)).first()).toBeVisible()
69+
await setWorkspacesEnabled(page, slug, false)
70+
await expect(page.getByRole("button", { name: "New session" }).first()).toBeVisible()
71+
await expect(page.locator(workspaceItemSelector(slug))).toHaveCount(0)
72+
73+
await setWorkspacesEnabled(page, slug, true)
74+
await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()
75+
await waitWorkspaceItem(page, slug)
76+
})
77+
})
78+
79+
test("existing git workspaces auto-show after reload", async ({ page, withProject }) => {
80+
await page.setViewportSize({ width: 1400, height: 800 })
6881

69-
await setWorkspacesEnabled(page, project.slug, false)
70-
await expect(page.getByRole("button", { name: "New session" }).first()).toBeVisible()
71-
await expect(page.locator(workspaceItemSelector(project.slug))).toHaveCount(0)
82+
await withProject(async ({ directory, slug, trackDirectory }) => {
83+
const created = await createSdk(directory).worktree.create().then((result) => result.data)
84+
if (!created?.directory) throw new Error("Failed to create workspace")
85+
86+
trackDirectory(created.directory)
87+
88+
await page.reload()
89+
await waitSession(page, { directory })
90+
await openSidebar(page)
91+
92+
await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()
93+
await waitWorkspaceItem(page, slug)
94+
await waitWorkspaceItem(page, dirSlug(created.directory))
95+
})
7296
})
7397

7498
test("can create a workspace", async ({ page, project }) => {
@@ -108,8 +132,17 @@ test("can create a workspace", async ({ page, project }) => {
108132
test("non-git projects keep workspace mode disabled", async ({ page, project }) => {
109133
await page.setViewportSize({ width: 1400, height: 800 })
110134

111-
const nonGit = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-e2e-project-nongit-"))
112-
const nonGitSlug = dirSlug(nonGit)
135+
await withProject(async ({ slug }) => {
136+
const name = path
137+
.basename(base64Decode(slug))
138+
.toLowerCase()
139+
.replace(/[^a-z0-9]+/g, "-")
140+
.replace(/^-+/, "")
141+
.replace(/-+$/, "")
142+
const pattern = new RegExp(`${name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}-\\d{4}-\\d{2}-\\d{2}-\\d{2}-\\d{2}(?:-\\d+)?`)
143+
144+
await openSidebar(page)
145+
await setWorkspacesEnabled(page, slug, true)
113146

114147
await fs.writeFile(path.join(nonGit, "README.md"), "# e2e nongit\n")
115148

@@ -249,6 +282,54 @@ test("can reorder workspaces by drag and drop", async ({ page, project }) => {
249282
{ timeout: 60_000 },
250283
)
251284
.toBe(true)
285+
286+
await expect(page.locator(workspaceItemSelector(next.slug)).first()).toBeVisible()
287+
await expect(page.locator(workspaceItemSelector(next.slug)).getByText(pattern).first()).toBeVisible()
288+
289+
await cleanupTestProject(next.directory)
290+
})
291+
})
292+
293+
test("non-git projects keep workspace mode disabled", async ({ page, withProject }) => {
294+
await page.setViewportSize({ width: 1400, height: 800 })
295+
296+
const nonGit = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-e2e-project-nongit-"))
297+
const nonGitSlug = dirSlug(nonGit)
298+
299+
await fs.writeFile(path.join(nonGit, "README.md"), "# e2e nongit\n")
300+
301+
try {
302+
await withProject(async () => {
303+
await page.goto(`/${nonGitSlug}/session`)
304+
305+
await expect.poll(() => slugFromUrl(page.url()), { timeout: 30_000 }).not.toBe("")
306+
307+
const activeDir = await resolveSlug(slugFromUrl(page.url())).then((item) => item.directory)
308+
expect(path.basename(activeDir)).toContain("opencode-e2e-project-nongit-")
309+
310+
await openSidebar(page)
311+
await expect(page.getByRole("button", { name: "New workspace" })).toHaveCount(0)
312+
313+
const trigger = page.locator('[data-action="project-menu"]').first()
314+
const hasMenu = await trigger
315+
.isVisible()
316+
.then((x) => x)
317+
.catch(() => false)
318+
if (!hasMenu) return
319+
320+
await trigger.click({ force: true })
321+
322+
const menu = page.locator(dropdownMenuContentSelector).first()
323+
await expect(menu).toBeVisible()
324+
325+
const toggle = menu.locator('[data-action="project-workspaces-toggle"]').first()
326+
327+
await expect(toggle).toBeVisible()
328+
await expect(toggle).toBeDisabled()
329+
await expect(menu.getByRole("menuitem", { name: "New workspace" })).toHaveCount(0)
330+
})
331+
} finally {
332+
await cleanupTestProject(nonGit)
252333
}
253334

254335
const drag = async (from: string, to: string) => {

‎packages/app/e2e/selectors.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ export const promptVariantSelector = '[data-component="prompt-variant-control"]'
1313
export const settingsLanguageSelectSelector = '[data-action="settings-language"]'
1414
export const settingsColorSchemeSelector = '[data-action="settings-color-scheme"]'
1515
export const settingsThemeSelector = '[data-action="settings-theme"]'
16-
export const settingsCodeFontSelector = '[data-action="settings-code-font"]'
17-
export const settingsUIFontSelector = '[data-action="settings-ui-font"]'
16+
export const settingsFontSelector = '[data-action="settings-font"]'
1817
export const settingsNotificationsAgentSelector = '[data-action="settings-notifications-agent"]'
1918
export const settingsNotificationsPermissionsSelector = '[data-action="settings-notifications-permissions"]'
2019
export const settingsNotificationsErrorsSelector = '[data-action="settings-notifications-errors"]'
@@ -23,6 +22,7 @@ export const settingsSoundsPermissionsSelector = '[data-action="settings-sounds-
2322
export const settingsSoundsErrorsSelector = '[data-action="settings-sounds-errors"]'
2423
export const settingsUpdatesStartupSelector = '[data-action="settings-updates-startup"]'
2524
export const settingsReleaseNotesSelector = '[data-action="settings-release-notes"]'
25+
export const settingsVoiceAutoSpeakSelector = '[data-action="settings-voice-autospeak"]'
2626

2727
const sidebarNavSelector = '[data-component="sidebar-nav-desktop"]'
2828

0 commit comments

Comments
 (0)