Skip to content

Commit 938ad7a

Browse files
rekram1-nodeopencode-agent[bot]jlongsterTarquinenvaprdev
authored
promote dev -> prod (#55589)
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com> Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com> Co-authored-by: James Long <longster@gmail.com> Co-authored-by: Tarquinen <78942835+Tarquinen@users.noreply.github.com> Co-authored-by: vprdev <mail@alanrice.me> Co-authored-by: Filip <34747899+neriousy@users.noreply.github.com> Co-authored-by: vegerot <5297725+vegerot@users.noreply.github.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Luca Barbato <luca.barbato@gmail.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent bb85f9f commit 938ad7a

14 files changed

Lines changed: 222 additions & 101 deletions

File tree

‎install‎

Lines changed: 20 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,6 @@ check_version() {
243243
fi
244244
}
245245

246-
unbuffered_sed() {
247-
if echo | sed -u -e "" >/dev/null 2>&1; then
248-
sed -nu "$@"
249-
elif echo | sed -l -e "" >/dev/null 2>&1; then
250-
sed -nl "$@"
251-
else
252-
local pad="$(printf "\n%512s" "")"
253-
sed -ne "s/$/\\${pad}/" "$@"
254-
fi
255-
}
256-
257246
print_progress() {
258247
local bytes="$1"
259248
local length="$2"
@@ -283,52 +272,34 @@ download_with_progress() {
283272
exec 4>/dev/null
284273
fi
285274

286-
local tmp_dir=${TMPDIR:-/tmp}
287-
local basename="${tmp_dir}/opencode_install_$$"
288-
local tracefile="${basename}.trace"
289-
290-
rm -f "$tracefile"
291-
mkfifo "$tracefile"
275+
local headers="${output}.headers"
292276

293277
# Hide cursor
294278
printf "\033[?25l" >&4
295279

296-
trap "trap - RETURN; rm -f \"$tracefile\"; printf '\033[?25h' >&4; exec 4>&-" RETURN
280+
trap "trap - RETURN; rm -f \"$headers\"; printf '\033[?25h' >&4; exec 4>&-" RETURN
297281

298-
(
299-
curl --trace-ascii "$tracefile" -fsL -o "$output" "$url"
300-
) &
282+
# Poll the file size on a timer so rendering cost stays fixed no matter how many bytes arrive.
283+
# Read the size with ls because busybox wc -c reads the whole file.
284+
curl -fsL -D "$headers" -o "$output" "$url" &
301285
local curl_pid=$!
302286

303-
unbuffered_sed \
304-
-e 'y/ACDEGHLNORTV/acdeghlnortv/' \
305-
-e '/^0000: content-length:/p' \
306-
-e '/^<= recv data/p' \
307-
"$tracefile" | \
308-
{
309-
local length=0
310-
local bytes=0
311-
312-
while IFS=" " read -r -a line; do
313-
[ "${#line[@]}" -lt 2 ] && continue
314-
local tag="${line[0]} ${line[1]}"
315-
316-
if [ "$tag" = "0000: content-length:" ]; then
317-
length="${line[2]}"
318-
length=$(echo "$length" | tr -d '\r')
319-
bytes=0
320-
elif [ "$tag" = "<= recv" ]; then
321-
local size="${line[3]}"
322-
bytes=$(( bytes + size ))
323-
if [ "$length" -gt 0 ]; then
324-
print_progress "$bytes" "$length"
325-
fi
326-
fi
327-
done
328-
}
287+
local length bytes
288+
while kill -0 "$curl_pid" 2>/dev/null; do
289+
if [ -f "$output" ]; then
290+
length=$(grep -i '^content-length:' "$headers" 2>/dev/null | tail -n 1 | tr -dc '0-9' || true)
291+
bytes=$(ls -ln "$output" | awk '{print $5}')
292+
print_progress "$bytes" "${length:-0}"
293+
fi
294+
sleep 0.1 2>/dev/null || sleep 1
295+
done
329296

330-
wait $curl_pid
331-
local ret=$?
297+
local ret=0
298+
wait "$curl_pid" || ret=$?
299+
if [ "$ret" -eq 0 ]; then
300+
bytes=$(ls -ln "$output" | awk '{print $5}')
301+
print_progress "$bytes" "$bytes"
302+
fi
332303
echo "" >&4
333304
return $ret
334305
}

‎packages/app/e2e/regression/settings.spec.ts‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, test, type Page } from "@playwright/test"
22
import type { ConfigEntry, OpenCodeEvent, WorktreeDirectory } from "@opencode/client/promise"
33
import { NO_PROVIDER, REMOTE_SERVER, SERVER, holdRoute, project, session } from "../utils/app"
4-
import { mockOpenCodeServer } from "../utils/mock-server"
4+
import { mockMissingLocation, mockOpenCodeServer } from "../utils/mock-server"
55
import { mockRemoteServer, mockWorkspace, openSettings, type WorkspaceInput } from "../utils/workspace"
66

77
const directory = "C:/Projects/settings-demo"
@@ -248,6 +248,41 @@ test("project settings open as a nested view that keeps its route", async ({ pag
248248
await expect(settings.getByRole("heading", { name: "Projects", exact: true })).toBeVisible()
249249
})
250250

251+
// The desktop app reopens its last settings URL on launch, so a crash on this page would repeat on every restart.
252+
test("a project whose folder is gone opens its settings with a notice", async ({ page }) => {
253+
await mockWorkspace(page, {
254+
name: "Settings demo",
255+
directory,
256+
provider: NO_PROVIDER,
257+
sessions: [],
258+
seed: { tabs: [] },
259+
})
260+
await mockMissingLocation(page, directory)
261+
262+
const plugins = page.waitForResponse((response) => {
263+
const url = new URL(response.url())
264+
265+
return url.pathname === "/api/plugin" && url.searchParams.get("location[directory]") === directory
266+
})
267+
268+
await page.goto(
269+
`/settings?server=${encodeURIComponent(SERVER)}&project=${encodeURIComponent(directory)}&tab=extensions`,
270+
)
271+
expect((await plugins).status()).toBe(404)
272+
const settings = page.getByTestId("settings-screen")
273+
const notice = settings.getByRole("status").filter({ hasText: "Project folder not found" })
274+
await expect(notice).toContainText(directory)
275+
await settings.getByRole("tab", { name: "Plugins", exact: true }).click()
276+
277+
await expect(
278+
settings.getByRole("tabpanel", { name: "Plugins", exact: true }).getByText("No plugins yet", { exact: true }),
279+
).toBeVisible()
280+
281+
await settings.getByRole("tab", { name: "General", exact: true }).click()
282+
await expect(settings.getByRole("textbox", { name: "Project name", exact: true })).toBeVisible()
283+
await expect(notice).toContainText(directory)
284+
})
285+
251286
for (const field of [
252287
{
253288
name: "color",

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,21 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
476476
return { server, pty: transport.pty, push }
477477
}
478478

479+
// Answers every Location-scoped request for `directory` as the server does once that folder is deleted.
480+
export function mockMissingLocation(page: Page, directory: string) {
481+
return page.route(
482+
(url) => url.pathname.startsWith("/api/") && url.searchParams.get("location[directory]") === directory,
483+
(route) =>
484+
route.fulfill({
485+
status: 404,
486+
// SAFETY: the server's wire body for a missing Location, which the client decodes into its own error.
487+
// oxlint-disable-next-line anti-slop-effect/no-manual-tagged-construction -- see SAFETY above
488+
json: { _tag: "LocationNotFoundError", location: { directory }, message: `Location not found: ${directory}` },
489+
headers: { "access-control-allow-origin": "*" },
490+
}),
491+
)
492+
}
493+
479494
// Mocks several servers on one page. Each origin gets its own handler and its own SSE transport for events.
480495
export async function mockServers(page: Page, servers: Record<string, Omit<MockServerConfig, "server" | "events">>) {
481496
return Object.fromEntries(

‎packages/app/src/new-session/route.tsx‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Navigate, useSearchParams } from "@solidjs/router"
2-
import { createMemo, Show, type ParentProps } from "solid-js"
2+
import { createMemo, ErrorBoundary, Show, type ParentProps } from "solid-js"
33
import { CommentsProvider } from "@/composer/comments"
44
import { FileProvider } from "@/workspaces/files/model"
55
import { useGlobal } from "@/runtime/server/runtime"
@@ -12,6 +12,7 @@ import { useTabs, type DraftTab } from "@/shell/tabs/tabs"
1212
import { SessionUIProvider } from "@/shell/routes/session-ui-provider"
1313
import NewSession from "@/new-session/screen"
1414
import { IncompatibleServerPanel } from "@/session/incompatible-server-panel"
15+
import { ErrorPage } from "@/shell/errors/error"
1516
import { SessionPanelFrame, SessionRouteFrame } from "@/session/session-frame"
1617

1718
export function DraftRoute() {
@@ -67,15 +68,25 @@ function ResolvedDraftContent(props: { draft: DraftTab }) {
6768
</SessionRouteFrame>
6869
}
6970
>
70-
<ModelsProvider directory={props.draft.directory}>
71-
<LocationProvider directory={props.draft.directory}>
72-
<SessionUIProvider directory={props.draft.directory} server={props.draft.server}>
73-
<DraftProviders>
74-
<NewSession draftId={props.draft.draftID} />
75-
</DraftProviders>
76-
</SessionUIProvider>
77-
</LocationProvider>
78-
</ModelsProvider>
71+
<ErrorBoundary
72+
fallback={(error) => (
73+
<SessionRouteFrame padded>
74+
<SessionPanelFrame raised>
75+
<ErrorPage error={error} />
76+
</SessionPanelFrame>
77+
</SessionRouteFrame>
78+
)}
79+
>
80+
<ModelsProvider directory={props.draft.directory}>
81+
<LocationProvider directory={props.draft.directory}>
82+
<SessionUIProvider directory={props.draft.directory} server={props.draft.server}>
83+
<DraftProviders>
84+
<NewSession draftId={props.draft.draftID} />
85+
</DraftProviders>
86+
</SessionUIProvider>
87+
</LocationProvider>
88+
</ModelsProvider>
89+
</ErrorBoundary>
7990
</Show>
8091
)
8192
}

‎packages/app/src/runtime/i18n/en.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,8 @@ export const dict = {
751751
"project.settings.worktree.startup.description": "Runs once after creating a new worktree",
752752
"project.settings.worktree.startup.hint.base": "Use $OPENCODE_WORKTREE_BASE for the base worktree.",
753753
"project.settings.worktree.startup.hint.new": "Use $OPENCODE_WORKTREE_PATH for the new worktree.",
754+
"project.settings.folderMissing.title": "Project folder not found",
755+
"project.settings.folderMissing.description": "Restore the folder or close this project.",
754756
"project.settings.extensions.description": "View extensions available to this project",
755757
"project.settings.extensions.tab.lsps": "LSPs",
756758
"project.settings.extensions.added": "Added to this project",

‎packages/app/src/settings/navigation.tsx‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import { Button } from "@opencode/ui/button"
22
import { Icon } from "@opencode/ui/icon"
33
import { Menu } from "@opencode/ui/menu"
44
import { Tabs } from "@opencode/ui/tabs"
5-
import { For, Show, type ComponentProps, type JSX } from "solid-js"
5+
import { createEffect, ErrorBoundary, For, on, Show, type ComponentProps, type JSX } from "solid-js"
66
import { useLanguage } from "@/runtime/i18n/language"
7+
import { ErrorPage } from "@/shell/errors/error"
78
import { useSettingsSurface } from "./surface"
89
import { SettingsSearch } from "./search"
910
import "./search.css"
@@ -142,7 +143,18 @@ export function SettingsNavigation(props: {
142143
</Show>
143144
</div>
144145
</aside>
145-
<div class="settings-content">{props.children}</div>
146+
<div class="settings-content">
147+
<ErrorBoundary
148+
fallback={(error, reset) => {
149+
// Keep a failed page inside the content area; choosing another page renders it again.
150+
createEffect(on(() => props.value, reset, { defer: true }))
151+
152+
return <ErrorPage error={error} />
153+
}}
154+
>
155+
{props.children}
156+
</ErrorBoundary>
157+
</div>
146158
</Tabs>
147159
)
148160
}

‎packages/app/src/settings/providers/extensions.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ export const SettingsExtensions: Component<{
2929
const serverSdk = useServerSDK()
3030
const data = useData()
3131

32+
// Reading `.latest` rethrows a failed fetch, so these lists fall back to empty instead of crashing the page.
3233
const [mcpList, { refetch: refetchMcp }] = createResource(
3334
() => serverSdk.connection.status() === "connected",
34-
() => serverSdk.api.mcp.list().then((result) => result.data),
35+
() =>
36+
serverSdk.api.mcp
37+
.list()
38+
.then((result) => result.data)
39+
.catch(() => []),
3540
{ initialValue: [] },
3641
)
3742

@@ -51,7 +56,11 @@ export const SettingsExtensions: Component<{
5156

5257
const [pluginList] = createResource(
5358
() => serverSdk.connection.status() === "connected",
54-
() => serverSdk.api.plugin.list().then((result) => result.data),
59+
() =>
60+
serverSdk.api.plugin
61+
.list()
62+
.then((result) => result.data)
63+
.catch(() => []),
5564
{ initialValue: [] },
5665
)
5766

‎packages/app/src/settings/workspaces/project-extensions.tsx‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { useServerSDK } from "@/runtime/server/client"
2121
import { useData } from "@/runtime/server/current"
2222
import { pluginLabels } from "@/providers/catalog/plugin"
2323
import { ExternalLink } from "@/runtime/platform/external-link"
24+
import { ProjectFolderMissing } from "./project-folder-missing"
2425
import { configuredLanguageServers } from "./project-lsp"
2526
import { SettingsList } from "@/settings/list"
2627
import "./project.css"
@@ -248,15 +249,25 @@ export const ProjectSettingsExtensions: Component<{
248249
data.location.mcp.server.list({ directory: directorySDK().directory })?.find((server) => server.name === name)
249250
?.status.status === "connected"
250251

252+
// Reading `.latest` rethrows a failed fetch, such as the project's plugin list after its folder is deleted, so these
253+
// lists fall back to empty instead of crashing the page.
251254
const [globalPluginList] = createResource(
252255
() => serverSDK.connection.status() === "connected",
253-
() => serverSDK.api.plugin.list().then((result) => result.data),
256+
() =>
257+
serverSDK.api.plugin
258+
.list()
259+
.then((result) => result.data)
260+
.catch(() => []),
254261
{ initialValue: [] },
255262
)
256263

257264
const [projectPluginList] = createResource(
258265
() => (serverSDK.connection.status() === "connected" ? directorySDK().directory : undefined),
259-
(directory) => serverSDK.api.plugin.list({ location: { directory } }).then((result) => result.data),
266+
(directory) =>
267+
serverSDK.api.plugin
268+
.list({ location: { directory } })
269+
.then((result) => result.data)
270+
.catch(() => []),
260271
{ initialValue: [] },
261272
)
262273

@@ -318,6 +329,7 @@ export const ProjectSettingsExtensions: Component<{
318329
</div>
319330

320331
<div class="settings-tab-body">
332+
<ProjectFolderMissing />
321333
<Tabs
322334
variant="pill"
323335
value={props.subtab ?? "mcps"}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { Icon } from "@opencode/ui/icon"
2+
import { Show } from "solid-js"
3+
import { useLanguage } from "@/runtime/i18n/language"
4+
import { useWorkspaceLocation } from "@/workspaces/location"
5+
import "./project.css"
6+
7+
export function ProjectFolderMissing() {
8+
const language = useLanguage()
9+
const location = useWorkspaceLocation()
10+
11+
return (
12+
<Show when={location().missing}>
13+
{(missing) => (
14+
<div role="status" class="project-settings-folder-missing">
15+
<Icon name="warning" class="project-settings-folder-missing-icon" />
16+
<div class="project-settings-folder-missing-copy">
17+
<span class="project-settings-folder-missing-title">
18+
{language.t("project.settings.folderMissing.title")}
19+
</span>
20+
<bdi dir="ltr" class="project-settings-folder-missing-path">
21+
{missing().directory}
22+
</bdi>
23+
<span>{language.t("project.settings.folderMissing.description")}</span>
24+
</div>
25+
</div>
26+
)}
27+
</Show>
28+
)
29+
}

0 commit comments

Comments
 (0)