diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ae0205d60da1..a3f533d5cb31 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -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
diff --git a/bun.lock b/bun.lock
index 6288394976f0..79f7dde1ed80 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1025,7 +1025,7 @@
"@effect/platform-node-shared": "4.1.0",
"@effect/sql-sqlite-bun": "4.1.0",
"@effect/sql-sqlite-node": "4.1.0",
- "@hona/strobe": "0.31.0",
+ "@hona/strobe": "0.32.0",
"@kobalte/core": "0.13.13",
"@lydell/node-pty": "1.2.0-beta.12",
"@npmcli/arborist": "9.4.0",
@@ -1567,19 +1567,19 @@
"@happy-dom/global-registrator": ["@happy-dom/global-registrator@20.0.11", "", { "dependencies": { "@types/node": "^20.0.0", "happy-dom": "^20.0.11" } }, "sha512-GqNqiShBT/lzkHTMC/slKBrvN0DsD4Di8ssBk4aDaVgEn+2WMzE6DXxq701ndSXj7/0cJ8mNT71pM7Bnrr6JRw=="],
- "@hona/strobe": ["@hona/strobe@0.31.0", "", { "optionalDependencies": { "@hona/strobe-darwin-arm64": "0.31.0", "@hona/strobe-darwin-x64": "0.31.0", "@hona/strobe-linux-arm64": "0.31.0", "@hona/strobe-linux-x64": "0.31.0", "@hona/strobe-win32-arm64": "0.31.0", "@hona/strobe-win32-x64": "0.31.0" }, "bin": { "strobe": "bin/strobe.js" } }, "sha512-6fd7JLZTa8NPsRxHNAomd0jtpZUQWUEHhcKPwJ5hlTdQVtxjReZLg2pyEfrOb/YeVXgIallTKckWN3U6XuXFWQ=="],
+ "@hona/strobe": ["@hona/strobe@0.32.0", "", { "optionalDependencies": { "@hona/strobe-darwin-arm64": "0.32.0", "@hona/strobe-darwin-x64": "0.32.0", "@hona/strobe-linux-arm64": "0.32.0", "@hona/strobe-linux-x64": "0.32.0", "@hona/strobe-win32-arm64": "0.32.0", "@hona/strobe-win32-x64": "0.32.0" }, "bin": { "strobe": "bin/strobe.js" } }, "sha512-3Nj987aG7ku/gfrn8r0caMVTL9tLMqsdLVTy3EqxK5ciKnL12DgPdX8V+4wigK0Cf8Pv7SK1ATYx5Cd/xTzSbA=="],
- "@hona/strobe-darwin-arm64": ["@hona/strobe-darwin-arm64@0.31.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-FAOQ1SjUFH/MHTF4DQa3FSs5LANt1wiH+XAhvKUwg4lta/gICWX7cNwej41cpUFcJtakEmhiGim1jB+AQAu7/A=="],
+ "@hona/strobe-darwin-arm64": ["@hona/strobe-darwin-arm64@0.32.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-vaTJcNW7QvrPjCAHR+kmAsUl+DXzTByAs0WjAOSb038Adh2jtv6+ULdvtZlHZ+/rHo/ndYCkVXPP9YowL+wpmQ=="],
- "@hona/strobe-darwin-x64": ["@hona/strobe-darwin-x64@0.31.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-kexHXnetb+wh9k0M9pICBXc0pstzc6J01rnynfbxK+AcM0VOQ0cYzDJ7dJ4ixOJAfXMWZYvwviHpp9qb16vAxQ=="],
+ "@hona/strobe-darwin-x64": ["@hona/strobe-darwin-x64@0.32.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-gxnWFSHCABjB/90j3BrpN8F6lq5O3vC0Ini/e0iO0UNy4f2Ba88ElSFGGyLEkcvAir7cPRAl9kGzdLd660+1oA=="],
- "@hona/strobe-linux-arm64": ["@hona/strobe-linux-arm64@0.31.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-lUv3N326+mD4qkkcwB7pnVcWCdS+unG6dqxT3YfrIuhfzchJdAqjXlODZ9f8kEv2/TuKZjZO8UyVSbdUXJi9jg=="],
+ "@hona/strobe-linux-arm64": ["@hona/strobe-linux-arm64@0.32.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-F5OIl4mBl9cyBlSXF8e400QJ5reaTYRkZfCEzXqZR4b9JOpCV0hReuYxtS0Us40PvY7R8vEESSFlX/FIK+rrew=="],
- "@hona/strobe-linux-x64": ["@hona/strobe-linux-x64@0.31.0", "", { "os": "linux", "cpu": "x64" }, "sha512-rmpfK8no/ZF3+QuLc7bUGF3EjNuF1d9nXt9OHczVnO+RLB4kWkBSFYVNS9G1MZIF4M/nkfnGG7z7ouIKLBOg0w=="],
+ "@hona/strobe-linux-x64": ["@hona/strobe-linux-x64@0.32.0", "", { "os": "linux", "cpu": "x64" }, "sha512-Ha+OhF6Rx5HxbXwvMOi5L1iGzaxwL/DEU6egLFpBDMUwydDQ1HoEpUb+S20WUKb0PRsNAIeonFqtDrxvVh2AvA=="],
- "@hona/strobe-win32-arm64": ["@hona/strobe-win32-arm64@0.31.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-1vTucrWfULAOsqBN03K3s5OehHCwM5jaRn/ziCU84oF88fKZPtqLFBC0f+KaNs3pWyxxdbq8tEIb9hJ37xtjDw=="],
+ "@hona/strobe-win32-arm64": ["@hona/strobe-win32-arm64@0.32.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-o0++IqevYI3qYIJOMeY7KdOdSs22j910BxuDhJampIpPHurauK/Fn7igKlSUwo03Vrnjjp8fXKgvnK4zop+gxA=="],
- "@hona/strobe-win32-x64": ["@hona/strobe-win32-x64@0.31.0", "", { "os": "win32", "cpu": "x64" }, "sha512-ldVK/CW1PKP1fYr9+c1n+M6ZdcRFAHhTIGjKlkS/jpA9SDvR68bLTvVHZUIg1L9Db63WMMQNXDsElcJ9Fx8unA=="],
+ "@hona/strobe-win32-x64": ["@hona/strobe-win32-x64@0.32.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Bx47oNc1SQQ5u1O9oNbLCqHS6CwRXit9CXNdbfRtTBPws4CIhjB17M0BNq+HsRqyeuTVEDgp2Wk0T2S9sQzRmA=="],
"@hono/node-server": ["@hono/node-server@2.1.5", "", { "peerDependencies": { "hono": "^4 || ^5.0.0-0" } }, "sha512-MgP/I06GdvsilDspMk/qmRzpk8LOUStP6jFAbSRi40W09DhoyUn+Mj7eyKICPqeYKybOjVFLVIAQzvu1bfIa7Q=="],
diff --git a/package.json b/package.json
index c395f684705d..b3d6c12793a1 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/packages/app/e2e/regression/settings-wsl.spec.ts b/packages/app/e2e/regression/settings-wsl.spec.ts
index 4c8aec65db33..be4003fa10ac 100644
--- a/packages/app/e2e/regression/settings-wsl.spec.ts
+++ b/packages/app/e2e/regression/settings-wsl.spec.ts
@@ -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" })
diff --git a/packages/app/e2e/regression/timeline-geometry.spec.ts b/packages/app/e2e/regression/timeline-geometry.spec.ts
index 4e19574c8ec2..cbc41f76b774 100644
--- a/packages/app/e2e/regression/timeline-geometry.spec.ts
+++ b/packages/app/e2e/regression/timeline-geometry.spec.ts
@@ -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 },
},
diff --git a/packages/app/e2e/regression/timeline-stream.spec.ts b/packages/app/e2e/regression/timeline-stream.spec.ts
index fa7e6cc4108b..38b128fb4309 100644
--- a/packages/app/e2e/regression/timeline-stream.spec.ts
+++ b/packages/app/e2e/regression/timeline-stream.spec.ts
@@ -705,45 +705,6 @@ test("holds undelivered input still while live status above it comes and goes",
await expect.poll(lane).toBe(36)
})
-test("jumps from a finished shell's notice to its call", async ({ page }) => {
- await setupTimeline(page, {
- settings: { timelineDetail: detailed },
- sessionMessages: [
- userMessage(),
- assistantMessage([
- ...searches(0, 2),
- toolPart(
- "prt_notice_shell",
- "shell",
- "completed",
- { command: "bun serve.ts" },
- { output: "listening", metadata: { shellID: "shell_notice" } },
- ),
- ...searches(2, 2),
- textPart("prt_notice_notes", notes("Later", 80)),
- ]),
- {
- id: "msg_shell_finished",
- type: "synthetic",
- text: '\nlistening\n',
- description: "bun serve.ts",
- metadata: { source: "shell", shellID: "shell_notice", state: "completed" },
- time: { created: 1700000003000 },
- },
- ],
- })
-
- const notice = page.getByRole("button", { name: /^Shell finished/ })
- const shellTrigger = page.locator('[data-timeline-part-id="prt_notice_shell"] [data-slot="collapsible-trigger"]')
-
- await expect(notice).toBeInViewport()
- await expect(shellTrigger).toHaveCount(0)
- await notice.click()
-
- await expect(shellTrigger).toHaveAttribute("aria-expanded", "true")
- await expect(shellTrigger).toBeInViewport()
-})
-
test.describe("Working", () => {
test("shows Working between busy and reasoning states", async ({ page }) => {
const timeline = await setupTimeline(page, {
@@ -1039,7 +1000,7 @@ test("grows a streaming row without a ResizeObserver loop error", async ({ page
expect(await page.evaluate(() => document.documentElement.dataset.resizeObserverLoops)).toBeUndefined()
})
-test.describe("background shortcut", () => {
+test.describe("background work", () => {
test("does not offer a running subagent to the background", async ({ page }) => {
await setupTimeline(page, {
settings: { timelineDetail: { ...detailed, subagents: { placement: "separate" } } },
@@ -1177,7 +1138,7 @@ test.describe("background shortcut", () => {
}) => {
const childID = "ses_background_stale_call"
- // As after a lost completion notice: the call still reads running, while the child session has finished.
+ // The call records the launch; the child can finish without changing that metadata.
const timeline = await setupTimeline(page, {
settings: { timelineDetail: detailed },
sessionMessages: [
@@ -1194,7 +1155,7 @@ test.describe("background shortcut", () => {
name: "subagent",
state: {
status: "completed",
- input: { description: "Stale task", agent: "explore", background: true },
+ input: { description: "Stale task", agent: "explore" },
content: [{ type: "text", text: "working" }],
metadata: { sessionID: childID, status: "running" },
},
@@ -1209,7 +1170,9 @@ test.describe("background shortcut", () => {
const capsule = page.locator('[data-slot="session-activity-chip"]')
- await expect(page.locator('[data-timeline-part-id="call_stale"]')).toContainText("Stale task (background)")
+ await expect(
+ page.locator('[data-timeline-part-id="call_stale"]').getByText("Stale task", { exact: true }),
+ ).toBeVisible()
await expect(capsule).toHaveCount(0)
await timeline.transport.send(status("busy", 1, childID))
await expect(page.getByRole("button", { name: "1 subagent", exact: true })).toBeVisible()
@@ -1217,9 +1180,8 @@ test.describe("background shortcut", () => {
await expect(capsule).toHaveCount(0)
})
- test("separates blocking and already-backgrounded work into two rows", async ({ page }) => {
+ test("shows the shortcut for a blocking shell and lists background work in the capsule", async ({ page }) => {
const backgroundID = "ses_background_existing"
- const blockingID = "ses_background_blocking"
const timeline = await setupTimeline(page, {
settings: { timelineDetail: detailed },
@@ -1233,25 +1195,25 @@ test.describe("background shortcut", () => {
content: [
{
type: "tool",
- id: "call_backgrounded",
- name: "subagent",
+ id: "call_shell_backgrounded",
+ name: "shell",
state: {
status: "completed",
- input: { description: "Background task", agent: "explore" },
+ input: { command: "sleep 120" },
content: [{ type: "text", text: "working" }],
- metadata: { sessionID: backgroundID, status: "running" },
+ metadata: { shellID: "shell_backgrounded", status: "running" },
},
time: { created: 2, completed: 3 },
},
{
type: "tool",
- id: "call_shell_backgrounded",
- name: "shell",
+ id: "call_backgrounded",
+ name: "subagent",
state: {
status: "completed",
- input: { command: "sleep 120" },
+ input: { description: "Background task", agent: "explore" },
content: [{ type: "text", text: "working" }],
- metadata: { shellID: "shell_backgrounded", status: "running" },
+ metadata: { sessionID: backgroundID, status: "running" },
},
time: { created: 2, completed: 3 },
},
@@ -1267,12 +1229,8 @@ test.describe("background shortcut", () => {
{
type: "tool",
id: "call_blocking",
- name: "subagent",
- state: {
- status: "running",
- input: { description: "Foreground task", agent: "build" },
- metadata: { sessionID: blockingID },
- },
+ name: "shell",
+ state: { status: "running", input: { command: "sleep 10" }, metadata: { shellID: "shell_blocking" } },
time: { created: 4 },
},
],
@@ -1282,39 +1240,28 @@ test.describe("background shortcut", () => {
sessions: [
session(),
session({ id: backgroundID, parentID: sessionID, title: "Background task", agent: "explore" }),
- session({ id: blockingID, parentID: sessionID, title: "Foreground task", agent: "build" }),
],
sessionStatus: {
[sessionID]: { type: "busy" },
[backgroundID]: { type: "busy" },
- [blockingID]: { type: "busy" },
},
+ shellCommands: [
+ { id: "shell_backgrounded", command: "sleep 120" },
+ { id: "shell_blocking", command: "sleep 10" },
+ ].map((shell) => ({
+ ...shell,
+ status: "running" as const,
+ cwd: directory,
+ shell: "bash",
+ file: `/tmp/${shell.id}.out`,
+ metadata: { sessionID },
+ time: { started: 2 },
+ })),
})
- await timeline.transport.send({
- id: "evt_background_shell_created",
- created: 3,
- type: "shell.created",
- location: { directory },
- data: {
- info: {
- id: "shell_backgrounded",
- status: "running",
- command: "sleep 120",
- cwd: directory,
- shell: "bash",
- file: "/tmp/background.out",
- metadata: { sessionID },
- time: { started: 2 },
- },
- },
- })
const backgroundCard = page.locator('[data-timeline-part-id="call_backgrounded"]')
- const blockingCard = page.locator('[data-timeline-part-id="call_blocking"]')
await expect(backgroundHint(page)).toBeVisible()
- await expect(backgroundCard).toContainText("Background task (background)")
- await expect(blockingCard).toContainText("Foreground task")
- await expect(blockingCard).not.toContainText("(background)")
+ await expect(backgroundCard).toContainText("Background task")
const used = page
.locator('[data-timeline-part-ids="call_shell_backgrounded"]')
@@ -1322,18 +1269,18 @@ test.describe("background shortcut", () => {
await expect(used).toHaveText(/^Used\s*1\s*Shell$/)
await expect(used).toHaveAttribute("aria-expanded", "false")
- const activity = page.getByRole("button", { name: "2 subagents · 1 shell", exact: true })
- const list = page.getByRole("menu", { name: "2 subagents · 1 shell", exact: true })
+ const summary = "1 subagent · 1 shell"
+ const list = page.getByRole("menu", { name: summary, exact: true })
// The open menu hides the rest of the page from the accessibility tree, the capsule included.
- const capsule = page.getByRole("button", { name: "2 subagents · 1 shell", exact: true, includeHidden: true })
- const label = capsule.getByText("2 subagents · 1 shell", { exact: true })
+ const capsule = page.getByRole("button", { name: summary, exact: true, includeHidden: true })
+ const label = capsule.getByText(summary, { exact: true })
const glyph = await capsule.locator('[data-component="session-progress-indicator-v2"]').boundingBox()
const text = await label.boundingBox()
const inset = glyph!.x - (await capsule.boundingBox())!.x
- await activity.click()
+ await capsule.click()
await expect(list.locator('[data-slot="menu-v2-group-label"], [data-slot="menu-v2-separator"]')).toHaveCount(0)
- await expect(list.getByText("2 subagents · 1 shell", { exact: true })).toHaveCount(0)
+ await expect(list.getByText(summary, { exact: true })).toHaveCount(0)
await expect(label).toBeVisible()
// The panel opens above the capsule on its grid: row glyphs on the capsule's glyph, names and commands on its
@@ -1357,7 +1304,7 @@ test.describe("background shortcut", () => {
return (
panel!.y + panel!.height <= anchor!.y &&
- rows.length === 3 &&
+ rows.length === 2 &&
rows.every(
([left, start, end]) =>
Math.abs(left - glyph!.x) < 0.5 &&
@@ -1369,7 +1316,6 @@ test.describe("background shortcut", () => {
.toBe(true)
await expect(list.getByRole("menuitem")).toHaveText([
// The fixture starts every task near the epoch, so each row ends with an hours-long run time.
- /^Build\s*Foreground task\d+h \d{2}m$/,
/^Explore\s*Background task\d+h \d{2}m$/,
/^sleep 120\d+h \d{2}m$/,
])
@@ -1381,13 +1327,13 @@ test.describe("background shortcut", () => {
const interrupt = page.waitForRequest(
(request) =>
- request.method() === "POST" && new URL(request.url()).pathname === `/api/session/${blockingID}/interrupt`,
+ request.method() === "POST" && new URL(request.url()).pathname === `/api/session/${backgroundID}/interrupt`,
)
- const foreground = list.getByRole("menuitem", { name: /Foreground task/ })
+ const subagent = list.getByRole("menuitem", { name: /Background task/ })
- await foreground.hover()
- await foreground.getByRole("button", { name: "Interrupt subagent", exact: true }).click()
+ await subagent.hover()
+ await subagent.getByRole("button", { name: "Interrupt subagent", exact: true }).click()
await interrupt
await expect(list).toBeVisible()
@@ -1410,50 +1356,56 @@ test.describe("background shortcut", () => {
expect(kill.requests).toHaveLength(1)
await page.keyboard.press("Escape")
await expect(list).toHaveCount(0)
- await expect(backgroundCard).toContainText("Background task (background)")
await expect(backgroundCard.locator('[data-component="session-progress-indicator-v2"]')).toBeVisible()
await used.click()
await expect(
page.locator('[data-timeline-part-id="call_shell_backgrounded"] [data-component="text-shimmer"]'),
).toHaveAttribute("data-active", "true")
- // SAFETY: the transport forwards this payload unchanged, and the client marks a session idle from
- // `type` and `data.sessionID` alone; the child session's event needs no durable metadata here.
- await timeline.transport.send({
- id: "evt_background_succeeded",
- created: Date.now(),
- type: "session.execution.succeeded",
- data: { sessionID: backgroundID },
- } as never)
+ await timeline.send(status("idle", 1, backgroundID))
await expect(backgroundCard.locator('[data-component="session-progress-indicator-v2"]')).toHaveCount(0)
- await expect(backgroundCard).toContainText("Background task (background)")
+ await expect(backgroundCard).toContainText("Background task")
})
for (const fixture of [
{ name: "from far below", before: 40, searches: 40, after: 80 },
// The collapsed timeline fits the viewport, so it only becomes scrollable once the group opens.
- { name: "that opens the last row", before: 0, searches: 40, after: 0 },
+ { name: "in an initially unscrollable timeline", before: 0, searches: 40, after: 0 },
// Reaching the shell lands on the end of the timeline, which would otherwise follow new content again.
{ name: "at the end of the timeline", before: 40, searches: 0, after: 0 },
]) {
- // A starting subagent call is the pill's row that reveals its call; grouping subagents puts it inside the group.
- test(`holds a revealed call ${fixture.name} just under its stuck group header`, async ({ page }) => {
+ test(`holds the call revealed by a shell notice ${fixture.name} just under its stuck group header`, async ({
+ page,
+ }) => {
const timeline = await setupTimeline(page, {
- settings: { timelineDetail: { ...detailed, subagents: { placement: "grouped" } } },
- sessionStatus: { [sessionID]: { type: "busy" } },
- messages: [
+ settings: { timelineDetail: detailed },
+ sessionMessages: [
userMessage(),
- assistantMessage(
- [
- ...(fixture.before ? [textPart("prt_earlier", notes("Earlier", fixture.before))] : []),
- ...searches(0, 42 - fixture.searches),
- toolPart("prt_far_call", "subagent", "running", { description: "Map the far code", agent: "explore" }),
- // The open group outgrows the viewport, so aligning the group instead of the call misses it.
- ...searches(42 - fixture.searches, fixture.searches),
- ...(fixture.after ? [textPart("prt_follow_up", notes("Follow-up", fixture.after))] : []),
- ],
- { completed: false },
- ),
+ assistantMessage([
+ ...(fixture.before ? [textPart("prt_earlier", notes("Earlier", fixture.before))] : []),
+ ...searches(0, 42 - fixture.searches),
+ toolPart(
+ "prt_far_call",
+ "shell",
+ "completed",
+ { command: "bun serve.ts" },
+ {
+ output: "listening",
+ metadata: { shellID: "shell_notice", status: "running" },
+ },
+ ),
+ // The open group outgrows the viewport, so aligning the group instead of the call misses it.
+ ...searches(42 - fixture.searches, fixture.searches),
+ ...(fixture.after ? [textPart("prt_follow_up", notes("Follow-up", fixture.after))] : []),
+ ]),
+ {
+ id: "msg_1002_shell_finished",
+ type: "synthetic",
+ text: '\nlistening\n',
+ description: "bun serve.ts",
+ metadata: { source: "shell", shellID: "shell_notice", state: "completed" },
+ time: { created: 1700000003000 },
+ },
],
})
@@ -1472,26 +1424,25 @@ test.describe("background shortcut", () => {
})
.toBe(0)
- await expect(
- fixture.after ? page.getByText(`Follow-up note ${fixture.after}.`, { exact: true }) : group,
- ).toBeInViewport()
+ const notice = page.getByRole("button", { name: /^Shell finished/ })
+ await expect(notice).toBeInViewport()
await expect(call).toHaveCount(0)
- await page.getByRole("button", { name: "1 subagent", exact: true }).click()
- await page
- .getByRole("menu", { name: "1 subagent", exact: true })
- .getByRole("menuitem", { name: /Map the far code/ })
- .click()
+ await notice.click()
await expect(group).toHaveAttribute("aria-expanded", "true")
- await expect(call).toBeInViewport()
+ const trigger = call.locator('[data-slot="collapsible-trigger"]')
+ await expect(trigger).toHaveAttribute("aria-expanded", "true")
+ await expect(trigger).toBeInViewport()
// A call at the very end cannot rise under the header until more content arrives below it.
if (fixture.searches) await aligned()
// Nothing covers the row, so it takes the next click.
- await call.click({ trial: true })
+ await trigger.click({ trial: true })
// The agent keeps writing below the call; the call stays where it was revealed.
- await timeline.send(partUpdated(textPart("prt_late", notes("Late", 30))))
+ const late = assistantMessage([], { id: "msg_1003_late", completed: false, created: 1700000004000 })
+ await timeline.send(stepStarted(late))
+ await timeline.send(partUpdated({ id: "prt_late", messageID: late.id, type: "text", text: notes("Late", 30) }))
await expect(page.getByText("Late note 30.", { exact: true })).toBeAttached()
await aligned()
})
diff --git a/packages/app/e2e/utils/settings-wsl.fixture.tsx b/packages/app/e2e/utils/settings-wsl.fixture.tsx
index a6a2056528db..e1cf2601c869 100644
--- a/packages/app/e2e/utils/settings-wsl.fixture.tsx
+++ b/packages/app/e2e/utils/settings-wsl.fixture.tsx
@@ -11,7 +11,7 @@ import { ServerConnection } from "../../src/runtime/server/registry"
import { usePluginServers } from "../../src/runtime/plugin/servers"
/** The input of a WSL or SSH method this fixture answers. */
-type FixtureInput = { id?: string; name?: string }
+type FixtureInput = { id?: string; name?: string; target?: string; prompt?: string; value?: string }
/** A main-side method: SSH `start` answers with the state revision, the others with nothing. */
type FixtureMethod = (input: FixtureInput) => number | void
@@ -64,12 +64,14 @@ export function mount(input: {
const [store, setStore] = createStore<{
calls: string[]
connects: number
+ passphraseAnswered: boolean
available: boolean
state: WslServersState
ssh: SshState
}>({
calls: [],
connects: 0,
+ passphraseAnswered: false,
available: true,
ssh: {
revision: 0,
@@ -186,12 +188,41 @@ export function mount(input: {
const ssh = {
// Like main: a connect opens a new tunnel to a remote server with a new password.
- start() {
+ start(value) {
setStore("connects", (count) => count + 1)
+
+ if (!store.ssh.servers.length && value.id && value.target) {
+ const config = { id: value.id, target: value.target, name: value.name ?? "" }
+
+ setStore("ssh", (state) => ({
+ revision: state.revision + 1,
+ servers: [{ config, saved: false, stage: "connecting", detail: "" }],
+ }))
+
+ if (value.target === "ssh dev@key-fallback")
+ setSsh({
+ stage: "authentication",
+ prompt: { id: "key", text: "Enter passphrase for key 'id_ed25519':", confirm: false },
+ })
+
+ return store.ssh.revision
+ }
+
setSsh({ stage: "ready", http: { url: input.ssh ?? "", password: `ssh-${store.connects + 1}` } })
return store.ssh.revision
},
+ respond(value) {
+ const server = store.ssh.servers.find((item) => item.config.id === value.id)
+
+ if (!server?.prompt || server.prompt.id !== value.prompt) throw new Error("Unexpected SSH prompt")
+
+ if (value.prompt === "key" && value.value === "incorrect-passphrase")
+ return setStore("passphraseAnswered", true)
+
+ if (value.prompt !== "account" || value.value !== "fixture-password") throw new Error("Unexpected SSH answer")
+ setSsh({ saved: true, stage: "ready", prompt: undefined, http: { url: input.server, password: "ssh-1" } })
+ },
} satisfies Readonly>
const methods = new Map>>([
@@ -303,6 +334,41 @@ export function mount(input: {
/>
SSH plugin
+ !item.saved && item.stage === "connecting")}>
+
+
+ {/* askpass accepts the answer before ssh rejects the key and asks for the account password. */}
+
+
+
+
{/* The SSH tunnel dropping, which only main notices. */}
diff --git a/packages/app/src/composer/editor/editor.tsx b/packages/app/src/composer/editor/editor.tsx
index c1843b8b6634..6cbfda96575b 100644
--- a/packages/app/src/composer/editor/editor.tsx
+++ b/packages/app/src/composer/editor/editor.tsx
@@ -2,6 +2,7 @@ import {
createEffect,
createMemo,
createResource,
+ createSelector,
createSignal,
createUniqueId,
For,
@@ -16,6 +17,7 @@ import { createStore } from "solid-js/store"
import { Portal } from "solid-js/web"
import { createResizeObserver } from "@solid-primitives/resize-observer"
import { createMediaQuery } from "@solid-primitives/media"
+import { Key } from "@solid-primitives/keyed"
import { FileIcon } from "@opencode/ui/file-icon"
import { Icon } from "@opencode/ui/icon"
import { IconButton } from "@opencode/ui/icon-button"
@@ -1254,6 +1256,7 @@ function ComposerEditorPopover(props: {
}) {
const i18n = useI18n()
const listID = props.id ?? createUniqueId()
+ const active = createSelector(() => props.activeID)
let container: HTMLDivElement | undefined
const [store, setStore] = createStore({ maxHeight: COMPOSER_SUGGESTION_MAX_HEIGHT })
@@ -1397,34 +1400,34 @@ function ComposerEditorPopover(props: {
when={props.items.length > 0}
fallback={{props.emptyLabel}
}
>
-
+
{(item) => (
)}
-
+
diff --git a/packages/app/src/composer/editor/interaction.ts b/packages/app/src/composer/editor/interaction.ts
index fe6f63f9f1d6..41a149a0dedc 100644
--- a/packages/app/src/composer/editor/interaction.ts
+++ b/packages/app/src/composer/editor/interaction.ts
@@ -287,9 +287,12 @@ export function createComposerEditor(input: {
})
onCleanup(() => dispatchMentionSearch({ type: "disposed" }))
+ const contextOpen = createMemo(() => state.popover.type === "context")
+ const fileRows = createMemo(() => selectMentionFiles(mentionSearch()))
+
const contextList = useFilteredList({
items: (query) => {
- if (state.popover.type !== "context") return []
+ if (!contextOpen()) return []
const sessions = input.searchSessions?.(query) ?? []
@@ -301,12 +304,7 @@ export function createComposerEditor(input: {
const seen = new Set(recent.map((item) => item.id))
- return [
- ...fixed,
- ...sessions,
- ...recent,
- ...selectMentionFiles(mentionSearch()).filter((item) => !seen.has(item.id)),
- ]
+ return [...fixed, ...sessions, ...recent, ...fileRows().filter((item) => !seen.has(item.id))]
},
key: (item) => item.id,
filterKeys: ["label"],
diff --git a/packages/app/src/servers/connect/controller.ts b/packages/app/src/servers/connect/controller.ts
index f801b0d4ba56..cc6f6786e694 100644
--- a/packages/app/src/servers/connect/controller.ts
+++ b/packages/app/src/servers/connect/controller.ts
@@ -15,6 +15,7 @@ import {
type ServerOriginal,
} from "./machine"
import { useRedeemPairing } from "./redeem"
+import { redeemPairingLink } from "./pairing"
export type ServerConnectControllerOptions =
| { readonly surface: "screen"; readonly target: Extract }
@@ -30,14 +31,33 @@ export type ServerConnectControllerOptions =
readonly closing?: Accessor
}
-export function createServerConnectController(options: ServerConnectControllerOptions) {
- const language = useLanguage()
+type ServerConnectIO = {
+ camera: ServerCameraSupport
+ probeCamera: () => Promise
+ pageHref?: string
+ check: ReturnType
+ exchange: typeof redeemPairingLink
+ servers: Pick, "list" | "add" | "remove">
+}
+
+function useServerConnectIO(): ServerConnectIO {
const platform = usePlatform()
- const servers = useServers()
- const check = useCheckServerHealth()
+
+ return {
+ camera: cameraSupport(platform.platform),
+ probeCamera,
+ pageHref: platform.platform === "web" ? location.href : undefined,
+ check: useCheckServerHealth(),
+ exchange: redeemPairingLink,
+ servers: useServers(),
+ }
+}
+
+export function createServerConnectController(options: ServerConnectControllerOptions, io = useServerConnectIO()) {
+ const language = useLanguage()
// Shared with the scanner, so a retry after a failed check reuses the token of a spent one-time code.
- const redeem = useRedeemPairing()
- const initial = startServerConnect(options.target, cameraSupport(platform.platform))
+ const redeem = useRedeemPairing(io.exchange, io.pageHref)
+ const initial = startServerConnect(options.target, io.camera)
const [machine, setMachine] = createSignal(initial.state)
let timer: ReturnType | undefined
let cameraTimer: ReturnType | undefined
@@ -68,7 +88,7 @@ export function createServerConnectController(options: ServerConnectControllerOp
if (effect.type === "camera.probe") {
clearTimeout(cameraTimer)
cameraTimer = setTimeout(() => dispatch({ type: "camera.timed-out", attempt: effect.attempt }), effect.timeoutMs)
- void Promise.try(probeCamera).then(
+ void Promise.try(io.probeCamera).then(
(available) => dispatch({ type: "camera.settled", attempt: effect.attempt, available }),
() => dispatch({ type: "camera.settled", attempt: effect.attempt, available: false }),
)
@@ -91,7 +111,7 @@ export function createServerConnectController(options: ServerConnectControllerOp
error: { type: "connection-failed", url: effect.http.url },
})
- void Promise.try(() => check(effect.http)).then(
+ void Promise.try(() => io.check(effect.http)).then(
(result) =>
result.type === "healthy"
? dispatch({ type: "submit.succeeded", attempt: effect.attempt, http: effect.http })
@@ -116,6 +136,7 @@ export function createServerConnectController(options: ServerConnectControllerOp
if (effect.type === "save") {
const action = effect.action
+ const servers = io.servers
if (action.type === "connect") {
// Signing in again keeps the name the user gave this server.
@@ -153,12 +174,12 @@ export function createServerConnectController(options: ServerConnectControllerOp
if (effect.preferredUrl && effect.preferredUrl !== redeemed.pairing.url) {
const http = { url: effect.preferredUrl, password }
- if ((await check(http)).type === "healthy") return { type: "submit.succeeded", attempt: effect.attempt, http }
+ if ((await io.check(http)).type === "healthy") return { type: "submit.succeeded", attempt: effect.attempt, http }
}
const http = { url: redeemed.pairing.url, password }
- if ((await check(http)).type === "healthy") return { type: "submit.succeeded", attempt: effect.attempt, http }
+ if ((await io.check(http)).type === "healthy") return { type: "submit.succeeded", attempt: effect.attempt, http }
return { type: "submit.failed", attempt: effect.attempt, error: { type: "connection-failed", url: http.url } }
}
@@ -180,7 +201,7 @@ export function createServerConnectController(options: ServerConnectControllerOp
const view = createMemo(() =>
selectServerConnectView(machine(), {
surface: options.surface,
- pageHref: platform.platform === "web" ? location.href : undefined,
+ pageHref: io.pageHref,
t: (key) => language.t(key),
}),
)
diff --git a/packages/app/src/servers/connect/dialog.fixture.tsx b/packages/app/src/servers/connect/dialog.fixture.tsx
new file mode 100644
index 000000000000..587bb87cb25c
--- /dev/null
+++ b/packages/app/src/servers/connect/dialog.fixture.tsx
@@ -0,0 +1,159 @@
+import { Button } from "@opencode/ui/button"
+import { useDialog } from "@opencode/ui/context/dialog"
+import { createEffect, createSignal, onMount, Show, type ComponentProps } from "solid-js"
+import { createServerConnectController } from "./controller"
+import { DialogServer } from "./dialog"
+import type { ServerCameraSupport, ServerConnectEvent, ServerConnectTarget } from "./machine"
+import { PairingScanner } from "./scanner"
+
+export const address = "https://build.example.test"
+
+export const link = `${address}/auth/connect/example`
+
+type CameraScene = "ready" | "opening" | "denied" | "invalid" | "decode" | "redeeming" | "timeout"
+
+type Preset = {
+ camera?: ServerCameraSupport | "probing"
+ target?: Extract
+ events?: Extract[]
+ scanner?: CameraScene
+ exchange?: "expired" | "unreachable"
+ check?: "unreachable" | "pending"
+ closed?: boolean
+}
+
+export function serverStory(preset: Preset = {}) {
+ return { render: () => }
+}
+
+function Story(props: { preset: Preset }) {
+ const dialog = useDialog()
+
+ const [saved, setSaved] = createSignal("")
+
+ const open = () => {
+ setSaved("")
+ void dialog.show(() => (
+ setSaved(server.displayName ?? server.http.url)} />
+ ))
+ }
+
+ onMount(() => {
+ if (!props.preset.closed) open()
+ })
+
+ return (
+
+
+
{(name) => Saved {name()} in this preview.
}
+
+ )
+}
+
+function Preview(props: { preset: Preset; onSave: ComponentProps["onSave"] }) {
+ const preset = props.preset
+
+ const createForm: NonNullable["createForm"]> = (dialog) => {
+ const pending = new Promise(() => {})
+
+ let check = preset.check
+
+ let exchange = preset.exchange
+
+ const form = createServerConnectController(
+ { ...dialog, target: preset.target ?? { kind: "add" }, removeTabs() {} },
+ {
+ camera: preset.camera === "probing" ? "probe" : (preset.camera ?? "probe"),
+ probeCamera: () => (preset.camera === "probing" ? pending : Promise.resolve(true)),
+ pageHref: "https://lab.example.test",
+ servers: { list: [], add: (server) => server, remove() {} },
+ exchange: async (request) => {
+ if (request.code === "pending") return pending
+
+ if (exchange) {
+ const type = exchange
+ exchange = undefined
+
+ return { type }
+ }
+
+ return { type: "paired", pairing: { url: request.urls[0], password: "fixture" } }
+ },
+ check: async () => {
+ if (check === "pending") return pending
+
+ if (check === "unreachable") {
+ check = undefined
+
+ return { type: "unreachable" }
+ }
+
+ await new Promise((resolve) => setTimeout(resolve, 700))
+
+ return { type: "healthy" }
+ },
+ },
+ )
+
+ preset.events?.forEach(form.dispatch)
+
+ if (preset.scanner) {
+ let opened = false
+ createEffect(() => {
+ if (opened || !form.view().canScan) return
+ opened = true
+ form.dispatch({ type: "scan.started" })
+ })
+ }
+
+ return form
+ }
+
+ return (
+ }
+ />
+ )
+}
+
+function CameraPreview(props: ComponentProps & { scene: CameraScene }) {
+ let detect: ((data: string) => void) | undefined
+
+ const camera: NonNullable["camera"]> = (_, read, failed) => {
+ detect = read
+ let frame: ReturnType
+
+ return {
+ start: async () => {
+ if (props.scene === "denied") throw new Error("Camera permission denied")
+
+ if (props.scene === "opening") return new Promise(() => {})
+ frame = requestAnimationFrame(() => {
+ if (props.scene === "invalid") read("not a pairing code")
+
+ if (props.scene === "decode") failed()
+
+ if (props.scene === "redeeming" || props.scene === "timeout") read(`${address}/auth/connect/pending`)
+ })
+ },
+ stop() {},
+ destroy: () => cancelAnimationFrame(frame),
+ }
+ }
+
+ return (
+ <>
+
+
+
+
+ >
+ )
+}
diff --git a/packages/app/src/servers/connect/dialog.standalone.stories.tsx b/packages/app/src/servers/connect/dialog.standalone.stories.tsx
deleted file mode 100644
index 5a77ec7a6c3a..000000000000
--- a/packages/app/src/servers/connect/dialog.standalone.stories.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Button } from "@opencode/ui/button"
-import { useDialog } from "@opencode/ui/context/dialog"
-import { onMount } from "solid-js"
-import { DialogStoryRuntime, STORY_LOCKED_SERVER, STORY_SERVER } from "@/components-lab/dialog-story-runtime"
-import type { ServerConnection } from "@/runtime/server/registry"
-import { DialogServer } from "./dialog"
-
-const editableServer: ServerConnection.Http = {
- type: "http",
- displayName: "Build cluster",
- http: { url: STORY_SERVER.http.url },
-}
-
-function ServerDialogStory(props: { mode: "add" | "edit"; server?: ServerConnection.Http }) {
- const dialog = useDialog()
-
- const open = () => void dialog.show(() => )
-
- onMount(open)
-
- return (
-
- )
-}
-
-export default {
- title: "App/Dialogs/Add Server",
- id: "app-dialog-add-server",
-}
-
-export const PairingLink = {
- render: () => (
-
-
-
- ),
-}
-
-export const Password = {
- render: () => (
-
-
-
- ),
-}
-
-export const SignedOut = {
- render: () => (
-
-
-
- ),
-}
diff --git a/packages/app/src/servers/connect/dialog.stories.tsx b/packages/app/src/servers/connect/dialog.stories.tsx
new file mode 100644
index 000000000000..813e6faf55bd
--- /dev/null
+++ b/packages/app/src/servers/connect/dialog.stories.tsx
@@ -0,0 +1,71 @@
+import { address, link, serverStory } from "./dialog.fixture"
+import type { ServerConnectEvent, ServerConnectField, ServerConnectTarget } from "./machine"
+
+const field = (field: ServerConnectField, value: string) => ({ type: "field.changed", field, value }) as const
+
+const password = { type: "method.changed", method: "password" } satisfies ServerConnectEvent
+
+const submit = { type: "submitted" } satisfies ServerConnectEvent
+
+const edit = {
+ kind: "edit",
+ original: { url: address, displayName: "Build cluster", password: undefined, unauthorized: false },
+} satisfies ServerConnectTarget
+
+export default {
+ title: "App/Dialogs/Add Server",
+ id: "app-dialog-add-server",
+}
+
+export const PairingLink = serverStory()
+
+export const Password = serverStory({ events: [password] })
+
+export const ReadyToPair = serverStory({ events: [field("link", link), field("name", "Build cluster")] })
+
+export const InvalidLink = serverStory({ events: [field("link", "incomplete"), submit] })
+
+export const LegacyLink = serverStory({ events: [field("link", `${address}/connect#example`), submit] })
+
+export const ExpiredLink = serverStory({ events: [field("link", link), submit], exchange: "expired" })
+
+export const UnreachableLink = serverStory({ events: [field("link", link), submit], exchange: "unreachable" })
+
+export const InvalidAddress = serverStory({ events: [password, field("url", "file:///example"), submit] })
+
+export const ConnectionFailed = serverStory({ events: [password, field("url", address), submit], check: "unreachable" })
+
+export const MixedContent = serverStory({
+ events: [password, field("url", "http://build.example.test"), submit],
+ check: "unreachable",
+})
+
+export const Checking = serverStory({ events: [field("link", link), submit], check: "pending" })
+
+export const CameraProbing = serverStory({ camera: "probing" })
+
+export const CameraUnavailable = serverStory({ camera: "unavailable" })
+
+export const CameraInsecure = serverStory({ camera: "insecure" })
+
+export const NativePairing = serverStory({ camera: "none" })
+
+export const Scanning = serverStory({ scanner: "ready" })
+
+export const OpeningCamera = serverStory({ scanner: "opening" })
+
+export const RedeemingScan = serverStory({ scanner: "redeeming" })
+
+export const CameraError = serverStory({ scanner: "denied" })
+
+export const InvalidQrCode = serverStory({ scanner: "invalid" })
+
+export const DecodeFailed = serverStory({ scanner: "decode" })
+
+export const ScanTimedOut = serverStory({ scanner: "timeout" })
+
+export const EditPassword = serverStory({ target: edit })
+
+export const SignedOut = serverStory({ target: { ...edit, original: { ...edit.original, unauthorized: true } } })
+
+export const Closed = serverStory({ closed: true })
diff --git a/packages/app/src/servers/connect/dialog.tsx b/packages/app/src/servers/connect/dialog.tsx
index a17e27c3d03e..fa5d6ff07ff6 100644
--- a/packages/app/src/servers/connect/dialog.tsx
+++ b/packages/app/src/servers/connect/dialog.tsx
@@ -4,53 +4,43 @@ import { Divider } from "@opencode/ui/divider"
import { Icon } from "@opencode/ui/icon"
import { TextInput } from "@opencode/ui/text-input"
import { useDialog } from "@opencode/ui/context/dialog"
-import { type Component, Show, Suspense, createMemo, lazy, untrack } from "solid-js"
+import { type Component, type ComponentProps, Show, Suspense, createMemo, lazy, untrack } from "solid-js"
import { useGlobal } from "@/runtime/server/runtime"
import { useLanguage } from "@/runtime/i18n/language"
import { ServerConnection, useServers } from "@/runtime/server/registry"
import { useTabs } from "@/shell/tabs/tabs"
import { isServerUnauthorized } from "@/runtime/server/health-machine"
-import { createServerConnectController } from "./controller"
+import { createServerConnectController, type ServerConnectControllerOptions } from "./controller"
import type { ServerConnectField, ServerOriginal } from "./machine"
import { ConnectMethodSwitch } from "./method"
import "@/settings/settings.css"
const PairingScanner = lazy(() => import("./scanner").then((module) => ({ default: module.PairingScanner })))
-export const DialogServer: Component<{
+type DialogLifecycle = Pick<
+ Extract,
+ "surface" | "closing" | "onClose"
+>
+
+export function DialogServer(props: {
mode: "add" | "edit"
server?: ServerConnection.Http
onSave?: (server: ServerConnection.Http) => void
-}> = (props) => {
- const dialog = useDialog()
+ createForm?: (dialog: DialogLifecycle) => ReturnType
+ scanner?: Component>
+}) {
const language = useLanguage()
- const servers = useServers()
- const global = useGlobal()
- const tabs = useTabs()
- const edited = props.mode === "edit" ? props.server : undefined
-
- const originalOf = (server: ServerConnection.Http): ServerOriginal => ({
- url: server.http.url,
- displayName: server.displayName,
- password: server.http.password,
- unauthorized: isServerUnauthorized(global.servers.health[ServerConnection.key(server)]),
- })
-
- const original = createMemo(() => {
- const server = servers.list.find(
- (item): item is ServerConnection.Http => item.type === "http" && item.http.url === edited?.http.url,
- )
+ const dialog = useDialog()
+ const Scanner = props.scanner ?? PairingScanner
- return server && originalOf(server)
- })
+ const createForm =
+ props.createForm ??
+ ((dialog: DialogLifecycle) => createRegistryForm(dialog, props.mode === "edit" ? props.server : undefined))
- const form = createServerConnectController({
+ const form = createForm({
surface: "dialog",
- target: edited ? { kind: "edit", original: untrack(original) ?? originalOf(edited) } : { kind: "add" },
- original,
- removeTabs: (key) => tabs.removeServer(key),
closing: () => dialog.closing,
- // Close first: onSave may open the next dialog, such as the folder picker an interrupted action continues with.
+ // onSave may open the next dialog, such as the folder picker an interrupted action continues with.
onClose: (saved) => {
dialog.close()
@@ -98,9 +88,9 @@ export const DialogServer: Component<{
when={!view().scanning}
fallback={
{language.t("server.connect.camera.starting")}
}>
- form.dispatch({ type: "scan.cancelled" })}
+ form.dispatch({ type: "scan.cancelled" })}
onScan={(link) => form.dispatch({ type: "scan.completed", link })}
/>
@@ -233,3 +223,31 @@ export const DialogServer: Component<{
)
}
+
+function createRegistryForm(dialog: DialogLifecycle, edited: ServerConnection.Http | undefined) {
+ const servers = useServers()
+ const global = useGlobal()
+ const tabs = useTabs()
+
+ const originalOf = (server: ServerConnection.Http): ServerOriginal => ({
+ url: server.http.url,
+ displayName: server.displayName,
+ password: server.http.password,
+ unauthorized: isServerUnauthorized(global.servers.health[ServerConnection.key(server)]),
+ })
+
+ const original = createMemo(() => {
+ const server = servers.list.find(
+ (item): item is ServerConnection.Http => item.type === "http" && item.http.url === edited?.http.url,
+ )
+
+ return server && originalOf(server)
+ })
+
+ return createServerConnectController({
+ ...dialog,
+ target: edited ? { kind: "edit", original: untrack(original) ?? originalOf(edited) } : { kind: "add" },
+ original,
+ removeTabs: (key) => tabs.removeServer(key),
+ })
+}
diff --git a/packages/app/src/servers/connect/redeem.ts b/packages/app/src/servers/connect/redeem.ts
index b6ab401a0b22..bfd449423d21 100644
--- a/packages/app/src/servers/connect/redeem.ts
+++ b/packages/app/src/servers/connect/redeem.ts
@@ -1,5 +1,4 @@
import { useLanguage } from "@/runtime/i18n/language"
-import { usePlatform } from "@/runtime/platform/platform"
import { isMixedContent } from "./browser"
import { legacyPairingLink, pairingLink, redeemPairingLink, type Pairing } from "./pairing"
@@ -14,9 +13,8 @@ type Redeemed = { code?: string; pairing?: Pairing }
// Pasted and scanned links share one redeem path so every surface explains a failure the same way.
// Each form keeps the last token it redeemed: the code is spent, so a retry after a failed connection check reuses it,
// whichever form the link takes (a scanned QR payload, or the link the scanner then shows).
-export function useRedeemPairing(): RedeemPairing {
+export function useRedeemPairing(exchange: typeof redeemPairingLink, pageHref?: string): RedeemPairing {
const language = useLanguage()
- const platform = usePlatform()
const last: Redeemed = {}
return async (value) => {
@@ -32,7 +30,7 @@ export function useRedeemPairing(): RedeemPairing {
return { pairing: { url, password: last.pairing.password } }
}
- const result = await redeemPairingLink(link)
+ const result = await exchange(link)
if (result.type === "paired") {
last.code = link.code
@@ -44,7 +42,7 @@ export function useRedeemPairing(): RedeemPairing {
if (result.type === "expired") return { error: language.t("server.connect.link.expired") }
// A QR code can carry several addresses; the HTTPS page can reach none of them only when every one is plain HTTP.
- if (platform.platform === "web" && link.urls.every((url) => isMixedContent(location.href, url)))
+ if (pageHref && link.urls.every((url) => isMixedContent(pageHref, url)))
return { error: language.t("server.connect.mixedContent") }
return { error: language.t("server.connect.link.unreachable", { url: link.urls.join(", ") }) }
diff --git a/packages/app/src/servers/connect/scanner.tsx b/packages/app/src/servers/connect/scanner.tsx
index b5c9eb391026..42270042f2d6 100644
--- a/packages/app/src/servers/connect/scanner.tsx
+++ b/packages/app/src/servers/connect/scanner.tsx
@@ -16,7 +16,12 @@ import "./scanner.css"
// Redeems with the form's own redeem, so the form keeps the token and a failed connection check retries without the
// spent code; the form gets back a link it can show, and fills it in.
-export function PairingScanner(props: { redeem: RedeemPairing; onScan: (link: string) => void; onCancel: () => void }) {
+export function PairingScanner(props: {
+ redeem: RedeemPairing
+ onScan: (link: string) => void
+ onCancel: () => void
+ camera?: typeof createCamera
+}) {
const language = useLanguage()
const [scannerState, setScannerState] = createSignal(createScannerState())
const view = createMemo(() => selectScannerView(scannerState()))
@@ -103,21 +108,12 @@ export function PairingScanner(props: { redeem: RedeemPairing; onScan: (link: st
}
// QrScanner hides detached videos, so initialize only after this preview is mounted.
- const scanner = new QrScanner(video, (result) => dispatch({ type: "code.detected", data: result.data }), {
- preferredCamera: "environment",
- maxScansPerSecond: 10,
- returnDetailedScanResult: true,
- // QrScanner only logs a decoder that fails (for example, a worker the page may not start), so the preview
- // would look like it is still scanning.
- onDecodeError: (error) => {
- // The native BarcodeDetector engine reports an empty frame as "Scanner error: No QR code found".
- if (String(error).includes(QrScanner.NO_QR_CODE_FOUND)) return
- dispatch({ type: "decode.failed" })
- },
- })
+ const scanner = (props.camera ?? createCamera)(
+ video,
+ (data) => dispatch({ type: "code.detected", data }),
+ () => dispatch({ type: "decode.failed" }),
+ )
- // Terminal QR codes can be light-on-dark depending on the terminal theme.
- scanner.setInversionMode("both")
onCleanup(() => {
dispatch({ type: "disposed" })
scanner.destroy()
@@ -154,3 +150,24 @@ export function PairingScanner(props: { redeem: RedeemPairing; onScan: (link: st
)
}
+
+function createCamera(
+ video: HTMLVideoElement,
+ detect: (data: string) => void,
+ failed: () => void,
+): Pick {
+ const scanner = new QrScanner(video, (result) => detect(result.data), {
+ preferredCamera: "environment",
+ maxScansPerSecond: 10,
+ returnDetailedScanResult: true,
+ onDecodeError: (error) => {
+ // The native BarcodeDetector engine reports an empty frame as "Scanner error: No QR code found".
+ if (!String(error).includes(QrScanner.NO_QR_CODE_FOUND)) failed()
+ },
+ })
+
+ // Terminal QR codes can be light-on-dark depending on the terminal theme.
+ scanner.setInversionMode("both")
+
+ return scanner
+}
diff --git a/packages/app/src/servers/registry/row-menu.tsx b/packages/app/src/servers/registry/row-menu.tsx
index e8b01f57d4bd..99df529f9f68 100644
--- a/packages/app/src/servers/registry/row-menu.tsx
+++ b/packages/app/src/servers/registry/row-menu.tsx
@@ -1,15 +1,19 @@
import { Icon } from "@opencode/ui/icon"
import { IconButton } from "@opencode/ui/icon-button"
import { Menu } from "@opencode/ui/menu"
-import { type Component, Show } from "solid-js"
+import { type Component, createMemo, For, Show } from "solid-js"
import type { ServerActionsController } from "@/servers/registry/controller"
import { useLanguage } from "@/runtime/i18n/language"
import { ServerConnection } from "@/runtime/server/registry"
+import { createShellOptions } from "@/settings/general/behavior"
+import type { ShellSettingsController } from "@/settings/general/controllers"
export const ServerRowMenu: Component<{
server: ServerConnection.Any
domain: ServerActionsController
onEdit: (server: ServerConnection.Http) => void
+ shell?: ShellSettingsController
+ action?: string
open?: boolean
onOpenChange?: (open: boolean) => void
}> = (props) => {
@@ -23,6 +27,8 @@ export const ServerRowMenu: Component<{
canRemove={props.domain.connection.canRemove(key)}
canHide={props.domain.connection.canHide(key)}
hidden={props.domain.connection.isHidden(key)}
+ shell={props.shell}
+ action={props.action}
onEdit={props.onEdit}
onRemove={() => props.domain.connection.remove(key)}
onHide={() => props.domain.connection.setHidden(key, true)}
@@ -41,6 +47,9 @@ export function serverMenuLabels(language: ReturnType) {
remove: language.t("dialog.server.menu.remove"),
hide: language.t("dialog.server.menu.hide"),
show: language.t("dialog.server.menu.show"),
+ shell: language.t("settings.general.row.shell.title"),
+ shellAuto: language.t("settings.general.row.shell.autoDefault"),
+ shellTerminalOnly: language.t("settings.general.row.shell.terminalOnly"),
}
}
@@ -50,6 +59,8 @@ export const ServerRowMenuView: Component<{
canRemove: boolean
canHide?: boolean
hidden?: boolean
+ shell?: ShellSettingsController
+ action?: string
onEdit: (server: ServerConnection.Http) => void
onRemove: () => void
onHide?: () => void
@@ -68,6 +79,7 @@ export const ServerRowMenuView: Component<{
size="small"
icon={}
aria-label={props.labels.more}
+ data-action={props.action}
/>
@@ -83,6 +95,7 @@ export const ServerRowMenuView: Component<{
>
{props.labels.edit}
+ {(shell) => }
{props.labels.show}
@@ -99,3 +112,41 @@ export const ServerRowMenuView: Component<{
)
}
+
+function ShellSubmenu(props: { shell: ShellSettingsController; labels: ReturnType }) {
+ const options = createMemo(() =>
+ createShellOptions({ shells: props.shell.shells(), current: props.shell.current() }),
+ )
+
+ const current = () => options().find((option) => option.value === props.shell.current())?.id ?? "auto"
+
+ return (
+
+ {props.labels.shell}
+
+
+ {
+ const option = options().find((item) => item.id === id)
+
+ if (option) props.shell.select(option.value)
+ }}
+ >
+
+ {(option) => (
+
+ {option.id === "auto"
+ ? props.labels.shellAuto
+ : option.terminalOnly
+ ? `${option.name} (${props.labels.shellTerminalOnly})`
+ : option.name}
+
+ )}
+
+
+
+
+
+ )
+}
diff --git a/packages/app/src/settings/general/general.tsx b/packages/app/src/settings/general/general.tsx
index e5b72a2ea81d..d0631eeca24d 100644
--- a/packages/app/src/settings/general/general.tsx
+++ b/packages/app/src/settings/general/general.tsx
@@ -69,11 +69,7 @@ const WorkspaceDestinationSetting: Component = () => {
)
}
-export const ShellSetting: Component<{
- controller: ShellSettingsController
- /** Search reveals the row with the default action; the Servers page names the other servers' rows apart. */
- action?: string
-}> = (props) => {
+export const ShellSetting: Component<{ controller: ShellSettingsController }> = (props) => {
const language = useLanguage()
const options = createMemo(() =>
@@ -89,7 +85,7 @@ export const ShellSetting: Component<{
description={language.t("settings.general.row.shell.description")}
>