Skip to content

Commit dcc2996

Browse files
author
Marc
committed
chore: sync upstream release v1.18.21
1 parent 82f4069 commit dcc2996

172 files changed

Lines changed: 10111 additions & 3433 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.

‎.kernel-oops/upstream-release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.18.19
1+
v1.18.21

‎bun.lock‎

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

‎packages/app/e2e/regression/file-browser-sidebar-tab-switch.spec.ts‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,39 @@ test("keeps the file-browser sidebar mounted when switching file tabs", async ({
6060
await expect.poll(() => viewport.evaluate((element) => element.scrollTop)).toBe(scrolled)
6161
})
6262

63+
test("keeps previous file search results visible while the next search loads", async ({ page }) => {
64+
const searchPending = Promise.withResolvers<void>()
65+
await setup(page, async ({ query }) => {
66+
if (query === "file-0") return ["file-00.ts"]
67+
if (query === "file-7") {
68+
await searchPending.promise
69+
return ["file-79.ts"]
70+
}
71+
return []
72+
})
73+
74+
await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
75+
await expectSessionTitle(page, title)
76+
77+
const panel = page.locator("#review-panel")
78+
await panel.getByRole("button", { name: "Open file" }).click()
79+
const filter = panel.getByRole("combobox", { name: "Filter files" })
80+
await filter.fill("file-0")
81+
await expect(panel.getByRole("option", { name: "file-00.ts" })).toBeVisible()
82+
83+
const nextSearch = page.waitForRequest((request) => {
84+
const url = new URL(request.url())
85+
return url.pathname === "/find/file" && url.searchParams.get("query") === "file-7"
86+
})
87+
await filter.fill("file-7")
88+
await nextSearch
89+
await expect(panel.getByRole("option", { name: "file-00.ts" })).toBeVisible()
90+
91+
searchPending.resolve()
92+
await expect(panel.getByRole("option", { name: "file-79.ts" })).toBeVisible()
93+
await expect(panel.getByRole("option", { name: "file-00.ts" })).toBeHidden()
94+
})
95+
6396
type Probed = HTMLElement & { __e2eProbe?: string }
6497

6598
async function writeProbe(page: Page) {
@@ -74,7 +107,10 @@ async function readProbe(page: Page) {
74107
.evaluate((el) => (el as Probed).__e2eProbe)
75108
}
76109

77-
async function setup(page: Page) {
110+
async function setup(
111+
page: Page,
112+
findFiles?: (input: { query: string; dirs?: string; limit?: number }) => unknown | Promise<unknown>,
113+
) {
78114
await mockOpenCodeServer(page, {
79115
directory,
80116
project: {
@@ -119,6 +155,7 @@ async function setup(page: Page) {
119155
}))
120156
},
121157
fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
158+
findFiles,
122159
pageMessages: () => ({ items: [] }),
123160
})
124161

‎packages/app/e2e/utils/mock-server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export interface MockServerConfig {
2626
questions?: unknown[] | (() => unknown[])
2727
fileList?: (path: string) => unknown | Promise<unknown>
2828
fileContent?: (path: string) => unknown | Promise<unknown>
29-
findFiles?: (input: { query: string; dirs?: string; limit?: number }) => unknown
29+
findFiles?: (input: { query: string; dirs?: string; limit?: number }) => unknown | Promise<unknown>
3030
sessionStatus?: Record<string, unknown> | (() => Record<string, unknown>)
3131
}
3232

‎packages/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/app",
3-
"version": "1.18.19",
3+
"version": "1.18.21",
44
"description": "",
55
"type": "module",
66
"exports": {

‎packages/app/src/pages/layout.tsx‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -972,17 +972,6 @@ export default function LegacyLayout(props: ParentProps) {
972972
keybind: "shift+alt+arrowdown",
973973
onSelect: () => navigateSessionByUnseen(1),
974974
},
975-
{
976-
id: "session.archive",
977-
title: language.t("command.session.archive"),
978-
category: language.t("command.category.session"),
979-
keybind: "mod+shift+backspace",
980-
disabled: !params.dir || !params.id,
981-
onSelect: () => {
982-
const session = currentSessions().find((s) => s.id === params.id)
983-
if (session) void archiveSession(session)
984-
},
985-
},
986975
{
987976
id: "workspace.new",
988977
title: language.t("workspace.new"),

0 commit comments

Comments
 (0)