Skip to content

Commit 968dc99

Browse files
committed
chore: squash all-work branch changes
1 parent 5ef0ad3 commit 968dc99

File tree

101 files changed

+5091
-478
lines changed

Some content is hidden

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

101 files changed

+5091
-478
lines changed

.github/pull_request_template.md

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,45 @@
1-
### Issue for this PR
1+
## Problem
22

3-
Closes #
3+
Briefly describe what this PR fixes. What was broken, confusing, or missing?
44

5-
### Type of change
5+
For simple fixes: one sentence is enough.
6+
For complex features: explain the problem and why it matters.
67

7-
- [ ] Bug fix
8-
- [ ] New feature
9-
- [ ] Refactor / code improvement
10-
- [ ] Documentation
8+
Closes #XXXX
119

12-
### What does this PR do?
10+
---
1311

14-
Please provide a description of the issue, the changes you made to fix it, and why they work. It is expected that you understand why your changes work and if you do not understand why at least say as much so a maintainer knows how much to value the PR.
12+
## Changes
1513

16-
**If you paste a large clearly AI generated description here your PR may be IGNORED or CLOSED!**
14+
**For simple fixes**: 1-2 bullet points maximum
1715

18-
### How did you verify your code works?
16+
- Fix specific issue in `ComponentName`
17+
- Add missing feature to `ModuleName`
1918

20-
### Screenshots / recordings
19+
**For complex features**: concise breakdown
2120

22-
_If this is a UI change, please include a screenshot or recording._
21+
- `file.ext`: What changed
22+
- `file.ext`: What changed
23+
- Add tests for coverage
2324

24-
### Checklist
25+
---
2526

26-
- [ ] I have tested my changes locally
27-
- [ ] I have not included unrelated changes in this PR
27+
## Testing
2828

29-
_If you do not follow this template your PR will be automatically rejected._
29+
```bash
30+
# Test commands to verify this PR
31+
bun test path/to/test.test.ts
32+
# If applicable: run examples, manual testing steps, etc.
33+
```
34+
35+
---
36+
37+
### Additional Context (only if needed)
38+
39+
**Breaking changes**: What users need to know and migration steps
40+
41+
**Performance impact**: Before/after metrics if relevant
42+
43+
**Configuration**: New options or defaults
44+
45+
**Design decisions**: Why this approach over alternatives

bun.lock

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"packageManager": "bun@1.3.10",
88
"scripts": {
99
"dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
10-
"dev:desktop": "bun --cwd packages/desktop tauri dev",
10+
"dev:desktop": "bun run --cwd packages/desktop predev && bun --cwd packages/desktop tauri dev",
1111
"dev:web": "bun --cwd packages/app dev",
1212
"dev:storybook": "bun --cwd packages/storybook storybook",
1313
"typecheck": "bun turbo typecheck",

packages/app/e2e/actions.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
listItemKeyStartsWithSelector,
1818
workspaceItemSelector,
1919
workspaceMenuTriggerSelector,
20+
workspacePinToggleSelector,
2021
} from "./selectors"
2122

2223
export async function defocus(page: Page) {
@@ -711,3 +712,16 @@ export async function openWorkspaceMenu(page: Page, workspaceSlug: string) {
711712
await expect(menu).toBeVisible()
712713
return menu
713714
}
715+
716+
export async function setWorkspacePinned(page: Page, workspaceSlug: string, enabled: boolean) {
717+
const menu = await openWorkspaceMenu(page, workspaceSlug)
718+
const toggle = menu.locator(workspacePinToggleSelector(workspaceSlug)).first()
719+
await expect(toggle).toBeVisible()
720+
const name = await toggle.textContent()
721+
const pinned = (name ?? "").toLowerCase().includes("unpin")
722+
if (pinned === enabled) {
723+
await page.keyboard.press("Escape")
724+
return
725+
}
726+
await toggle.click({ force: true })
727+
}

packages/app/e2e/projects/projects-switch.spec.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { base64Decode } from "@opencode-ai/util/encode"
22
import type { Page } from "@playwright/test"
33
import { test, expect } from "../fixtures"
44
import { defocus, createTestProject, cleanupTestProject, openSidebar, sessionIDFromUrl, waitSlug } from "../actions"
5-
import { projectSwitchSelector, promptSelector, workspaceItemSelector, workspaceNewSessionSelector } from "../selectors"
5+
import { projectSwitchSelector, promptSelector } from "../selectors"
66
import { dirSlug, resolveDirectory } from "../utils"
77

88
async function workspaces(page: Page, directory: string, enabled: boolean) {
@@ -90,19 +90,8 @@ test("switching back to a project opens the latest workspace session", async ({
9090
const space = await resolveDirectory(dir)
9191
const next = dirSlug(space)
9292
trackDirectory(space)
93-
await openSidebar(page)
94-
95-
const item = page.locator(`${workspaceItemSelector(next)}, ${workspaceItemSelector(raw)}`).first()
96-
await expect(item).toBeVisible()
97-
await item.hover()
98-
99-
const btn = page.locator(`${workspaceNewSessionSelector(next)}, ${workspaceNewSessionSelector(raw)}`).first()
100-
await expect(btn).toBeVisible()
101-
await btn.click({ force: true })
102-
103-
// A new workspace can be discovered via a transient slug before the route and sidebar
104-
// settle to the canonical workspace path on Windows, so interact with either and assert
105-
// against the resolved workspace slug.
93+
// A new workspace can be discovered via a transient slug before the route settles to
94+
// the canonical workspace path on Windows.
10695
await waitSlug(page)
10796
await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))
10897

0 commit comments

Comments
 (0)