Skip to content

Refactor sidebar to use worktrees panel as primary git entry point #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markwylde merged 3 commits into from
Jul 5, 2026
Merged

Refactor sidebar to use worktrees panel as primary git entry point #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49b2fd7
refactor: unify sidebar git actions around worktree panel status
markwylde Jul 5, 2026
82dbf92
chore: remove deprecated worktrees sidebar settings
markwylde Jul 5, 2026
95ac114
test: update git sidebar e2e for worktree panel
markwylde Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions e2e/file-explorer-sidebar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,14 @@ test('git sidebar pane lists grouped working tree changes and opens a diff', asy
const gitPane = mainWindow
.locator('.sidebar-pane')
.filter({ has: mainWindow.locator('.sidebar-pane__title', { hasText: 'Git' }) })
const worktree = gitPane.locator('.worktrees-panel__worktree').first()
await expect(worktree.locator('.worktrees-panel__worktree-name')).toContainText('git-pane-changes', {
timeout: 6000,
})
await worktree.locator('.worktrees-panel__worktree-toggle').click()

// The Staged Changes group lists the added file with an "A" badge.
const stagedGroup = gitPane.locator('.git-panel__group').filter({ hasText: 'Staged Changes' })
const stagedGroup = worktree.locator('.git-panel__group').filter({ hasText: 'Staged Changes' })
const stagedRow = stagedGroup.locator('.git-panel__row').filter({ hasText: 'staged-new.txt' })
await expect(stagedRow).toBeVisible({ timeout: 6000 })
await expect(stagedRow.locator('.git-panel__badge')).toHaveText('A')
Expand All @@ -272,7 +277,7 @@ test('git sidebar pane lists grouped working tree changes and opens a diff', asy
await mainWindow.keyboard.press('Escape')

// The Changes group lists the modified and untracked files.
const changesGroup = gitPane.locator('.git-panel__group').filter({ hasText: /^Changes/ })
const changesGroup = worktree.locator('.git-panel__group').filter({ hasText: /^Changes/ })
const modifiedRow = changesGroup.locator('.git-panel__row').filter({ hasText: 'README.md' })
const untrackedRow = changesGroup.locator('.git-panel__row').filter({ hasText: 'untracked.txt' })
await expect(modifiedRow.locator('.git-panel__badge')).toHaveText('M')
Expand All @@ -281,8 +286,8 @@ test('git sidebar pane lists grouped working tree changes and opens a diff', asy
// Modified files are colour-coded amber, matching the file tree.
await expect(modifiedRow.locator('.git-panel__icon')).toHaveCSS('color', 'rgb(226, 192, 141)')

// The pane header shows the branch name and a total change count of 3.
await expect(gitPane.locator('.sidebar-pane__count')).toHaveText('3')
// The pane header shows the branch name and the number of worktrees.
await expect(gitPane.locator('.sidebar-pane__count')).toHaveText('1')
await expect(gitPane.locator('.sidebar-pane__branch')).toHaveText(/^(main|master)$/)

// Clicking a tracked change opens it in the file viewer.
Expand All @@ -292,9 +297,7 @@ test('git sidebar pane lists grouped working tree changes and opens a diff', asy
// Collapsing the Git pane hides the change list...
await gitPane.locator('.sidebar-pane__header').click()
await expect(gitPane.locator('.git-panel__row')).toHaveCount(0)
// ...but the push-agent button stays available in the collapsed header.
await expect(gitPane).toHaveClass(/sidebar-pane--collapsed/)
await expect(gitPane.getByLabel('Commit and push with an AI agent')).toBeVisible()
})

test('git sidebar pane shows no changes for a clean repository', async ({ createWorkspace, mainWindow }) => {
Expand All @@ -319,9 +322,14 @@ test('git sidebar pane shows no changes for a clean repository', async ({ create
const gitPane = mainWindow
.locator('.sidebar-pane')
.filter({ has: mainWindow.locator('.sidebar-pane__title', { hasText: 'Git' }) })
const worktree = gitPane.locator('.worktrees-panel__worktree').first()
await expect(worktree.locator('.worktrees-panel__worktree-name')).toContainText('git-pane-clean', {
timeout: 6000,
})
await worktree.locator('.worktrees-panel__worktree-toggle').click()

await expect(gitPane.locator('.git-panel__message')).toHaveText('No changes', { timeout: 6000 })
await expect(gitPane.locator('.git-panel__row')).toHaveCount(0)
await expect(worktree.locator('.git-panel__message')).toHaveText('No changes', { timeout: 6000 })
await expect(worktree.locator('.git-panel__row')).toHaveCount(0)
})

test('git sidebar pane renders a nested tree and offers a push menu', async ({
Expand Down Expand Up @@ -353,27 +361,31 @@ test('git sidebar pane renders a nested tree and offers a push menu', async ({
const gitPane = mainWindow
.locator('.sidebar-pane')
.filter({ has: mainWindow.locator('.sidebar-pane__title', { hasText: 'Git' }) })
const worktree = gitPane.locator('.worktrees-panel__worktree').first()
await expect(worktree.locator('.worktrees-panel__worktree-name')).toContainText('git-pane-tree', {
timeout: 6000,
})
await worktree.locator('.worktrees-panel__worktree-toggle').click()

// Tree is the default view: nested folder rows are rendered.
const utilRow = gitPane.locator('.git-panel__row').filter({ hasText: 'util.ts' })
const utilRow = worktree.locator('.git-panel__row').filter({ hasText: 'util.ts' })
await expect(utilRow).toBeVisible({ timeout: 6000 })
// A single section has no redundant group header (the "Git" pane header covers it).
await expect(gitPane.locator('.git-panel__group-header')).toHaveCount(0)
await expect(gitPane.locator('.git-panel__folder-name').filter({ hasText: 'src' })).toBeVisible()
await expect(gitPane.locator('.git-panel__folder-name').filter({ hasText: 'lib' })).toBeVisible()
// A single section has no redundant group header (the worktree row covers it).
await expect(worktree.locator('.git-panel__group-header')).toHaveCount(0)
await expect(worktree.locator('.git-panel__folder-name').filter({ hasText: 'src' })).toBeVisible()
await expect(worktree.locator('.git-panel__folder-name').filter({ hasText: 'lib' })).toBeVisible()
// In tree mode the row does not repeat the directory path.
await expect(utilRow.locator('.git-panel__dir')).toHaveCount(0)

// Collapsing the "lib" folder hides its files.
await gitPane.locator('.git-panel__folder').filter({ hasText: 'lib' }).click()
await worktree.locator('.git-panel__folder').filter({ hasText: 'lib' }).click()
await expect(utilRow).toHaveCount(0)
// Re-expand.
await gitPane.locator('.git-panel__folder').filter({ hasText: 'lib' }).click()
await worktree.locator('.git-panel__folder').filter({ hasText: 'lib' }).click()
await expect(utilRow).toBeVisible()

// The sidebar header exposes a push-agent menu (replacing the old
// tree/list toggle) offering the four commit-and-push actions.
const pushButton = gitPane.getByLabel('Commit and push with an AI agent')
// The worktree row exposes a push-agent menu offering the four commit-and-push actions.
const pushButton = worktree.getByLabel(/Commit and push .* with an AI agent/)
await expect(pushButton).toBeVisible()
await pushButton.click()

Expand Down
Loading
Loading