Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
# web + desktop packages
packages/app/ @Hona @Brendonovich
packages/desktop/ @Hona @Brendonovich

# GUI plugin SDK
# changes here must be meticulous - pls chat first :)
packages/plugin/src/gui/ @Hona

# CI and releases. Release jobs that hold secrets run only .github/workflows/release.yml and .github/release/,
# which makes this path the release security boundary.
# which makes this path the release security boundary. It is the only path that needs a code owner review.
/.github/ @thdxr
16 changes: 8 additions & 8 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@effect/sql-sqlite-node": "4.1.0",
"@npmcli/arborist": "9.4.0",
"@types/bun": "1.4.3",
"@hona/strobe": "0.31.0",
"@hona/strobe": "0.32.0",
"@types/cross-spawn": "6.0.6",
"@octokit/rest": "22.0.0",
"@opentui/core": "0.8.4",
Expand Down
61 changes: 61 additions & 0 deletions packages/app/e2e/regression/settings-wsl.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,67 @@ test("adding an SSH server while the SSH plugin is down fails instead of connect
await expect(dialog.getByRole("button", { name: "Add server", exact: true })).toBeEnabled()
})

test("adding an SSH server closes the dialog when the connection is ready", async ({ page }) => {
await mockOpenCodeServer(page, {
directory: "/repo",
project: project({ id: "proj_ssh_add", directory: "/repo" }),
provider: NO_PROVIDER,
sessions: [],
pageMessages: () => ({ items: [] }),
})
await page.goto(`/e2e/utils/settings-wsl.html?${new URLSearchParams({ server: SERVER, mode: "ready" })}`)
const settings = page.getByTestId("settings-screen")

await settings.getByRole("tab", { name: "Servers", exact: true }).click()
await settings.getByRole("button", { name: "Add server", exact: true }).press("Enter")
await page.getByRole("menuitem", { name: "Add SSH server", exact: true }).click()
const dialog = page.getByRole("dialog")

await dialog.getByRole("textbox", { name: "Host or SSH command" }).fill("ssh devbox")
await dialog.getByRole("button", { name: "Add server", exact: true }).click()
await expect(dialog.getByRole("button", { name: "Connecting over SSH…", exact: true })).toBeDisabled()
// The fixture control sits behind the modal.
await page.getByText("Finish SSH connection", { exact: true }).dispatchEvent("click")
await expect(dialog).toHaveCount(0)
await expect(settings.getByRole("region", { name: "devbox", exact: true })).toBeVisible()
})

test("SSH asks for the account password after a rejected key passphrase", async ({ page }) => {
await mockOpenCodeServer(page, {
directory: "/repo",
project: project({ id: "proj_ssh_fallback", directory: "/repo" }),
provider: NO_PROVIDER,
sessions: [],
pageMessages: () => ({ items: [] }),
})
await page.goto(`/e2e/utils/settings-wsl.html?${new URLSearchParams({ server: SERVER, mode: "ready" })}`)
const settings = page.getByTestId("settings-screen")

await settings.getByRole("tab", { name: "Servers", exact: true }).click()
await settings.getByRole("button", { name: "Add server", exact: true }).press("Enter")
await page.getByRole("menuitem", { name: "Add SSH server", exact: true }).click()
const dialog = page.getByRole("dialog")

await dialog.getByRole("textbox", { name: "Host or SSH command" }).fill("ssh dev@key-fallback")
await dialog.getByRole("button", { name: "Add server", exact: true }).click()
const key = dialog.getByRole("textbox", { name: "Enter passphrase for key 'id_ed25519':", exact: true })

await key.fill("incorrect-passphrase")
await dialog.getByRole("button", { name: "Continue", exact: true }).click()
// Release main's two snapshots separately, after the response RPC has returned.
await page.getByText("Clear SSH passphrase prompt", { exact: true }).dispatchEvent("click")
await expect(key).toBeDisabled()
await page.getByText("Request SSH account password", { exact: true }).dispatchEvent("click")
const account = dialog.getByRole("textbox", { name: "dev@key-fallback's password:", exact: true })

await expect(account).toBeEditable()
await expect(account).toHaveValue("")
await account.fill("fixture-password")
await dialog.getByRole("button", { name: "Continue", exact: true }).click()
await expect(dialog).toHaveCount(0)
await expect(settings.getByRole("region", { name: "key-fallback", exact: true })).toBeVisible()
})

test("WSL session and draft tabs outlive the plugin going away until the server is removed", async ({ page }) => {
const directory = "/home/ubuntu/project"
const wsl = session({ id: "ses_wsl_tabs", directory, title: "WSL tabs session" })
Expand Down
10 changes: 5 additions & 5 deletions packages/app/e2e/regression/timeline-geometry.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -767,16 +767,16 @@ async function scrollsBehindComposerRegion(
content: [
{
type: "tool",
id: "call_running_subagent",
name: "subagent",
id: "call_blocking_shell",
name: "shell",
state: {
status: "running",
input: { description: "Trace frame budget", agent: "explore" },
metadata: { sessionID: "ses_running_subagent" },
input: { command: "bun test" },
metadata: {},
},
time: { created: 2 },
},
{ type: "text", id: "prt_timeline_end", text: "The last answer ends above the composer region." },
{ type: "text", text: "The last answer ends above the composer region." },
],
time: { created: 2 },
},
Expand Down
Loading
Loading