@@ -17,28 +17,17 @@ import {
1717 setWorkspacesEnabled ,
1818 slugFromUrl ,
1919 waitDir ,
20+ waitSession ,
2021 waitSlug ,
2122} from "../actions"
2223import { inlineInputSelector , workspaceItemSelector } from "../selectors"
2324import { 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
7498test ( "can create a workspace" , async ( { page, project } ) => {
@@ -108,8 +132,17 @@ test("can create a workspace", async ({ page, project }) => {
108132test ( "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 - z 0 - 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 ) => {
0 commit comments