Skip to content

Commit eec4c77

Browse files
authored
Merge branch 'dev' into feat/canceled-prompts-in-history
2 parents 01e3504 + a03a2b6 commit eec4c77

182 files changed

Lines changed: 7481 additions & 5580 deletions

File tree

Some content is hidden

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

.github/VOUCHED.td

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@
1010
adamdotdevin
1111
-agusbasari29 AI PR slop
1212
ariane-emory
13+
-atharvau AI review spamming literally every PR
14+
-danieljoshuanazareth
15+
-danieljoshuanazareth
1316
edemaine
1417
-florianleibert
1518
fwang
1619
iamdavidhill
1720
jayair
1821
kitlangton
1922
kommander
23+
-opencode2026
2024
r44vc0rp
2125
rekram1-node
2226
-spider-yamet clawdbot/llm psychosis, spam pinging the team
2327
thdxr
24-
-OpenCode2026

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
1111

1212
jobs:
1313
deploy:
14-
runs-on: blacksmith-4vcpu-ubuntu-2404
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v3
1717

.github/workflows/vouch-manage-by-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ jobs:
3333
with:
3434
issue-id: ${{ github.event.issue.number }}
3535
comment-id: ${{ github.event.comment.id }}
36-
roles: admin,maintain
36+
roles: admin,maintain,write
3737
env:
3838
GITHUB_TOKEN: ${{ steps.committer.outputs.token }}

.opencode/command/changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
go through each PR merged since the last tag
2+
3+
for each PR spawn a subagent to summarize what the PR was about. focus on user facing changes. if it was entirely internal or code related you can ignore it. also skip docs updates. each subagent should append its summary to UPCOMING_CHANGELOG.md
4+
5+
once that is done, read UPCOMING_CHANGELOG.md and group it into sections for better readability. make sure all PR references are preserved

bun.lock

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

nix/hashes.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"nodeModules": {
3-
"x86_64-linux": "sha256-P0RJfQF8APTYVGP6hLJRrOkRSl5nVDNxdcGcZECPPJE=",
4-
"aarch64-linux": "sha256-ZtMjTcd35X3JhJIdn3DilFsp7i/IZIcNaKZFnSzW/nk=",
5-
"aarch64-darwin": "sha256-Uw/okFDRxxKQMfEsj8MXuHyhpugxZGgIKtu89Getlz8=",
6-
"x86_64-darwin": "sha256-ZySIgT1HbWZWnaQ0W0eURKC43BTupRmmply92JDFPWA="
3+
"x86_64-linux": "sha256-E5neEbBiwQDhIQ5QVhijpHCCP9hcxm319S9WrDKngSw=",
4+
"aarch64-linux": "sha256-lnwaGSEirl9izskDooB/xQ0ZdirW0t3/S+OoOnfYaoQ=",
5+
"aarch64-darwin": "sha256-RDxxW9NMlGMIdIxTsbOYVqxunflkILv2dA7JqjnJgm4=",
6+
"x86_64-darwin": "sha256-1tvvktu2NRg6N6ASuKzqzcEmMrzH3/LFey0Vxr4E8zg="
77
}
88
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "AI-powered development tool",
55
"private": true,
66
"type": "module",
7-
"packageManager": "bun@1.3.10",
7+
"packageManager": "bun@1.3.11",
88
"scripts": {
99
"dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
1010
"dev:desktop": "bun --cwd packages/desktop tauri dev",
@@ -26,7 +26,7 @@
2626
],
2727
"catalog": {
2828
"@effect/platform-node": "4.0.0-beta.35",
29-
"@types/bun": "1.3.9",
29+
"@types/bun": "1.3.11",
3030
"@octokit/rest": "22.0.0",
3131
"@hono/zod-validator": "0.4.2",
3232
"ulid": "3.0.1",

packages/app/e2e/actions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ export async function runTerminal(page: Page, input: { cmd: string; token: strin
175175
await expect.poll(() => terminalHas(page, { term, token: input.token }), { timeout }).toBe(true)
176176
}
177177

178-
export async function openPalette(page: Page) {
178+
export async function openPalette(page: Page, key = "K") {
179179
await defocus(page)
180-
await page.keyboard.press(`${modKey}+P`)
180+
await page.keyboard.press(`${modKey}+${key}`)
181181

182182
const dialog = page.getByRole("dialog")
183183
await expect(dialog).toBeVisible()

packages/app/e2e/app/palette.spec.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { test, expect } from "../fixtures"
2-
import { openPalette } from "../actions"
2+
import { closeDialog, openPalette } from "../actions"
33

44
test("search palette opens and closes", async ({ page, gotoSession }) => {
55
await gotoSession()
@@ -9,3 +9,12 @@ test("search palette opens and closes", async ({ page, gotoSession }) => {
99
await page.keyboard.press("Escape")
1010
await expect(dialog).toHaveCount(0)
1111
})
12+
13+
test("search palette also opens with cmd+p", async ({ page, gotoSession }) => {
14+
await gotoSession()
15+
16+
const dialog = await openPalette(page, "P")
17+
18+
await closeDialog(page, dialog)
19+
await expect(dialog).toHaveCount(0)
20+
})

packages/app/e2e/prompt/prompt-history.spec.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ test("prompt history restores unsent draft with arrow navigation", async ({ page
108108
await page.keyboard.type(draft)
109109
await wait(page, draft)
110110

111-
await edge(page, "start")
111+
// Clear the draft before navigating history (ArrowUp only works when prompt is empty)
112+
await prompt.fill("")
113+
await wait(page, "")
114+
112115
await page.keyboard.press("ArrowUp")
113116
await wait(page, second)
114117

@@ -119,7 +122,7 @@ test("prompt history restores unsent draft with arrow navigation", async ({ page
119122
await wait(page, second)
120123

121124
await page.keyboard.press("ArrowDown")
122-
await wait(page, draft)
125+
await wait(page, "")
123126
})
124127
})
125128

0 commit comments

Comments
 (0)