Skip to content
This repository was archived by the owner on Nov 10, 2026. It is now read-only.
Closed
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
28 changes: 16 additions & 12 deletions packages/app/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { TabsProvider } from "@/shell/tabs/tabs"
import { WslServersProvider } from "@/servers/wsl/context"
import { ErrorPage } from "@/shell/errors/error"
import { AppRoutes, File, preloadRoute } from "@/shell/routes/routes"
import { EmbeddedProvider } from "@/runtime/embed"

export { preloadRoute }

Expand Down Expand Up @@ -99,23 +100,26 @@ export function AppInterface(props: {
canonicalLocalServer?: ServerConnection.Key
servers?: Array<ServerConnection.Any>
router?: Component<BaseRouterProps>
embedded?: boolean
}) {
// The visual layout lives in the router root so it remains mounted across
// route changes. Draft and session routes override only their server-bound data
// providers beneath it.
const Root = (rootProps: ParentProps) => (
<TabsProvider>
<GlobalProvider>
<BodyTypography />
<CommandProvider>
<DesktopCommands />
<HighlightsProvider>
{props.children}
{rootProps.children}
</HighlightsProvider>
</CommandProvider>
</GlobalProvider>
</TabsProvider>
<EmbeddedProvider embedded={props.embedded}>
<TabsProvider>
<GlobalProvider>
<BodyTypography />
<CommandProvider>
<DesktopCommands />
<HighlightsProvider>
{props.children}
{rootProps.children}
</HighlightsProvider>
</CommandProvider>
</GlobalProvider>
</TabsProvider>
</EmbeddedProvider>
)

return (
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/providers/models/models.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const createModelsController = (directory: Accessor<string | undefined>) => {
if (state === "show") return true
if (latestSet().has(key)) return true
const date = release().get(key)
if (!date?.isValid) return true
if (!date?.isValid || date.toMillis() === 0) return true
return false
}

Expand Down
8 changes: 8 additions & 0 deletions packages/app/src/runtime/embed.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { createSimpleContext } from "@opencode-ai/ui/context"

export const { use: useEmbedded, provider: EmbeddedProvider } = createSimpleContext({
name: "Embedded",
init: (props: { embedded?: boolean }) => ({
embedded: props.embedded ?? false,
}),
})
2 changes: 1 addition & 1 deletion packages/app/src/runtime/server/global-sync/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export function normalizeProviderList(
status: model.status,
options: model.settings ?? {},
headers: model.headers ?? {},
release_date: new Date(model.time.released).toISOString().slice(0, 10),
release_date: model.time.released ? new Date(model.time.released).toISOString().slice(0, 10) : "",
variants: Object.fromEntries(model.variants.map((variant) => [variant.id, variant.settings ?? {}])),
}
}
Expand Down
12 changes: 9 additions & 3 deletions packages/app/src/session/screen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { createSessionTimelineInteraction } from "./timeline/interaction"
import { ActiveSessionComposerRegion, createActiveSessionRegion } from "./composer/region"
import { SessionIdentityHeader } from "./session-identity-header"
import { createAnimatedPresence } from "@/runtime/animated-presence"
import { useEmbedded } from "@/runtime/embed"

const SessionMobileFiles = lazy(async () => {
const { SessionMobileFiles } = await import("./files/session-mobile-files")
Expand All @@ -38,6 +39,7 @@ const SessionMobileFiles = lazy(async () => {

export function SessionScreen(props: { session: SessionModel }) {
const session = props.session
const embedded = useEmbedded()
const server = useServer()
const detailsProject = createMemo(() => {
const info = session.data.info()
Expand Down Expand Up @@ -125,7 +127,9 @@ export function SessionScreen(props: { session: SessionModel }) {
return key
})
const review = createSessionReview({ session, screen, deferRender: () => store.deferRender })
const mobileView = createMemo(() => (screen.terminal.open() ? "terminal" : review.mobile.tab()))
const mobileView = createMemo(() =>
embedded.embedded ? "session" : screen.terminal.open() ? "terminal" : review.mobile.tab(),
)
const conversationVisible = createMemo(() => isDesktop() || mobileView() === "session")
createEffect(() => {
if (!isDesktop() && screen.terminal.open()) setStore("mobileTerminalCached", true)
Expand Down Expand Up @@ -198,7 +202,7 @@ export function SessionScreen(props: { session: SessionModel }) {

const sessionPanelContent = () => (
<>
<Show when={!isDesktop() && !!session.identity.params.id}>{mobileTabs()}</Show>
<Show when={!embedded.embedded && !isDesktop() && !!session.identity.params.id}>{mobileTabs()}</Show>
{/* Surface query errors without suspending session metadata while messages load. */}
<Show when={timeline.resource.error}>
{(error) => {
Expand Down Expand Up @@ -273,7 +277,9 @@ export function SessionScreen(props: { session: SessionModel }) {

return (
<>
<SessionHeader />
<Show when={!embedded.embedded}>
<SessionHeader />
</Show>
<div class="flex-1 min-h-0 flex flex-col gap-2 px-2 pb-[var(--shell-bottom-inset,8px)] pt-[var(--shell-top-inset,8px)]">
<div ref={screen.panel.ref} class="relative flex-1 min-h-0 flex flex-col md:flex-row gap-2">
<div
Expand Down
4 changes: 4 additions & 0 deletions packages/app/src/session/session-identity-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { pathKey } from "@/workspaces/path-key"
import { isWorkspaceDirectory } from "@/workspaces/paths"
import { sessionHref } from "@/shell/routes/session"
import { sessionTitle } from "./title"
import { useEmbedded } from "@/runtime/embed"

export function SessionTitleHeader(props: ParentProps) {
return (
Expand All @@ -25,6 +26,7 @@ export function SessionTitleHeader(props: ParentProps) {
}

export function SessionIdentityHeader(props: { sessionID: string; session?: SessionInfo }) {
const embedded = useEmbedded()
const server = useServer()
const tabs = useTabs()
const settings = useSettings()
Expand Down Expand Up @@ -79,6 +81,8 @@ export function SessionIdentityHeader(props: { sessionID: string; session?: Sess
navigate(sessionHref(server.key, id))
}

if (embedded.embedded) return

return (
<Show when={title() || parentTitle() || showProjectIcon()}>
<SessionTitleHeader>
Expand Down
8 changes: 6 additions & 2 deletions packages/app/src/session/timeline/message-timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { displayName, getProjectAvatarSource, projectForSession } from "@/shell/
import { parseCommentNote, readPromptPresentation } from "@/composer/comment-note"
import { useCommand } from "@/shell/commands/command"
import { useSettings } from "@/settings/model"
import { useEmbedded } from "@/runtime/embed"
import { SessionTitleHeader } from "../session-identity-header"

type BackgroundTask = {
Expand Down Expand Up @@ -357,6 +358,7 @@ function MessageTimelineView(
pending: TimelineController["pending"]
},
) {
const embedded = useEmbedded()
const language = useLanguage()
const data = useData()
const server = useServer()
Expand Down Expand Up @@ -411,7 +413,9 @@ function MessageTimelineView(
}),
)
const turnPadding = () => "px-4 md:px-5"
const showHeader = createMemo(() => !props.hideHeader && (props.data.showHeader() || workspaceSession()))
const showHeader = createMemo(
() => !embedded.embedded && !props.hideHeader && (props.data.showHeader() || workspaceSession()),
)
const pinned = createMemo(() => props.pinned)
const messageByID = projection.messageByID
const virtualized = createTimelineVirtualizer({
Expand Down Expand Up @@ -574,7 +578,7 @@ function MessageTimelineView(
}}
renderRow={(row, onSizeChange) => <rowRenderer.Row row={row} onSizeChange={onSizeChange} />}
header={
<Show when={!props.hideHeader}>
<Show when={!props.hideHeader && !embedded.embedded}>
<SessionTitleHeader>
<div class="h-12 w-full flex items-center justify-between gap-2">
<div class="flex items-center gap-1 min-w-0 flex-1">
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/session/timeline/virtualizer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ export function createTimelineVirtualizer(input: Input) {
class="relative min-w-0 w-full h-full"
style={{ "--sticky-accordion-top": input.showHeader() ? "48px" : "0px" }}
>
<Show when={input.showHeader()} fallback={<div aria-hidden="true" class="h-4 md:hidden" />}>
<Show when={input.showHeader()} fallback={<div aria-hidden="true" class="h-4" />}>
{props.header}
</Show>
<div
Expand Down
30 changes: 18 additions & 12 deletions packages/app/src/shell/shell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ToastRegion } from "@/shell/notifications/toast"
import { TitlebarRightProvider } from "@/shell/titlebar/right-slot"
import { useSettingsSurface } from "@/settings/surface"
import { useSettings } from "@/settings/model"
import { useEmbedded } from "@/runtime/embed"

const DebugBar = lazy(() => import("@/shell/debug/debug-bar").then((module) => ({ default: module.DebugBar })))
const SettingsScreen = lazy(() => import("@/settings/shell").then((module) => ({ default: module.SettingsScreen })))
Expand All @@ -16,14 +17,15 @@ export default function Layout(props: ParentProps) {
const platform = usePlatform()
const settings = useSettingsSurface()
const preferences = useSettings()
const embedded = useEmbedded()
const mobile = createMediaQuery("(max-width: 767px)")
const [state, setState] = createStore({
debugTools: false,
tabsWidth: 260,
tabsMount: undefined as HTMLElement | undefined,
})
const verticalTabs = () => preferences.appearance.tabLayout() === "vertical" && !mobile()
const bottomTitlebar = () => mobile() && preferences.general.mobileTitlebarPosition() === "bottom"
const bottomTitlebar = () => !embedded.embedded && mobile() && preferences.general.mobileTitlebarPosition() === "bottom"

const update: TitlebarUpdate = {
get version() {
Expand All @@ -43,25 +45,29 @@ export default function Layout(props: ParentProps) {
class="relative bg-v2-background-bg-deep flex-1 min-h-0 min-w-0 flex flex-col select-none [&_input]:select-text [&_textarea]:select-text [&_[contenteditable]]:select-text"
style={{
// Native Windows chrome supplies the gap; retain paint clearance for the panels' outer outlines.
"--shell-top-inset": bottomTitlebar()
"--shell-top-inset": embedded.embedded
? "8px"
: bottomTitlebar()
? "max(0px, calc(8px - env(safe-area-inset-top, 0px)))"
: platform.platform === "desktop" && platform.os === "windows"
? "1px"
: "8px",
"--shell-bottom-inset": bottomTitlebar() ? "8px" : "max(0px, calc(8px - env(safe-area-inset-bottom, 0px)))",
}}
>
<Titlebar
update={update}
verticalTabs={verticalTabs() ? { mount: state.tabsMount } : undefined}
debugTools={
import.meta.env.DEV
? { visible: state.debugTools, toggle: () => setState("debugTools", (value) => !value) }
: undefined
}
/>
<Show when={!embedded.embedded}>
<Titlebar
update={update}
verticalTabs={verticalTabs() ? { mount: state.tabsMount } : undefined}
debugTools={
import.meta.env.DEV
? { visible: state.debugTools, toggle: () => setState("debugTools", (value) => !value) }
: undefined
}
/>
</Show>
<div class="flex flex-1 min-h-0 min-w-0 flex-row">
<Show when={verticalTabs()}>
<Show when={!embedded.embedded && verticalTabs()}>
<aside
ref={(element) => setState("tabsMount", element)}
data-slot="vertical-tabs-sidebar"
Expand Down
4 changes: 3 additions & 1 deletion packages/client/src/promise/generated/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,9 @@ export function make(options: ClientOptions) {
const fetch = options.fetch ?? globalThis.fetch

const prepare = (descriptor: RequestDescriptor, requestOptions?: RequestOptions) => {
const url = new URL(descriptor.path, options.baseUrl)
const baseUrl = new URL(options.baseUrl)
if (!baseUrl.pathname.endsWith("/")) baseUrl.pathname += "/"
const url = new URL(descriptor.path.replace(/^\//, ""), baseUrl)
for (const [key, value] of Object.entries(descriptor.query ?? {})) appendQuery(url.searchParams, key, value)
const headers = new Headers(options.headers)
for (const [key, value] of Object.entries(descriptor.headers ?? {})) {
Expand Down
10 changes: 8 additions & 2 deletions packages/client/src/solid/pty.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function createPtyClient(api: OpenCodeClient, options: PtyClientOptions)
location: input.location,
"x-opencode-ticket": "1",
})
const url = new URL(`/api/pty/${encodeURIComponent(input.ptyID)}/connect`, options.url)
const url = socketUrl(`/api/pty/${encodeURIComponent(input.ptyID)}/connect`, options.url)
if (input.location?.directory) url.searchParams.set("location[directory]", input.location.directory)
if (input.location?.workspace) url.searchParams.set("location[workspace]", input.location.workspace)
if (input.cursor !== undefined) url.searchParams.set("cursor", String(input.cursor))
Expand All @@ -47,7 +47,7 @@ export function createPersistentPtyClient(api: OpenCodeClient, options: PtyClien
ptyID: input.ptyID,
"x-opencode-ticket": "1",
})
const url = new URL(`/api/experimental/persistent-pty/${encodeURIComponent(input.ptyID)}/connect`, options.url)
const url = socketUrl(`/api/experimental/persistent-pty/${encodeURIComponent(input.ptyID)}/connect`, options.url)
url.searchParams.set("ticket", token.ticket)
url.searchParams.set("cursor", String(input.cursor))
url.searchParams.set("attachment_id", input.attachmentID)
Expand All @@ -61,3 +61,9 @@ export function createPersistentPtyClient(api: OpenCodeClient, options: PtyClien
},
}
}

function socketUrl(path: string, base: string): URL {
const url = new URL(base)
if (!url.pathname.endsWith('/')) url.pathname += '/'
return new URL(path.replace(/^\//, ''), url)
}
15 changes: 15 additions & 0 deletions packages/client/test/promise.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,21 @@ test("config.get returns ordered config entries for a location", async () => {
expect(request?.url).toBe("http://localhost:3000/api/config?location%5Bdirectory%5D=%2Ftmp%2Fproject")
})

test("preserves a path-prefixed base URL", async () => {
let request: Request | undefined
const client = OpenCode.make({
baseUrl: "http://localhost:3000/proxy",
fetch: async (input, init) => {
request = input instanceof Request ? input : new Request(input, init)
return Response.json({ healthy: true, version: "2.0.0" })
},
})

await client.health.get()

expect(request?.url).toBe("http://localhost:3000/proxy/api/health")
})

test("vcs.base and committed diffs preserve location and explicit base on the wire", async () => {
const requests: Request[] = []
const location = { directory: "/repo", project: { id: "global", directory: "/repo", canonical: "/repo" } }
Expand Down
8 changes: 4 additions & 4 deletions packages/client/test/solid-pty.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ describe("createPtyClient", () => {
).toBe(socket)
expect(request?.method).toBe("POST")
expect(request?.url).toBe(
"https://server.example/api/pty/pty_1/connect-token?location%5Bdirectory%5D=%2Frepo%2Fworktree&location%5Bworkspace%5D=workspace_1",
"https://server.example/base/api/pty/pty_1/connect-token?location%5Bdirectory%5D=%2Frepo%2Fworktree&location%5Bworkspace%5D=workspace_1",
)
expect(request?.headers.get("authorization")).toBe("Basic credential")
expect(request?.headers.get("x-opencode-ticket")).toBe("1")
expect(socketURL?.toString()).toBe(
"wss://server.example/api/pty/pty_1/connect?location%5Bdirectory%5D=%2Frepo%2Fworktree&location%5Bworkspace%5D=workspace_1&cursor=42&ticket=ticket-1",
"wss://server.example/base/api/pty/pty_1/connect?location%5Bdirectory%5D=%2Frepo%2Fworktree&location%5Bworkspace%5D=workspace_1&cursor=42&ticket=ticket-1",
)
expect(socket.binaryType).toBe("arraybuffer")
})
Expand Down Expand Up @@ -90,11 +90,11 @@ describe("createPersistentPtyClient", () => {

expect(await pty.connect({ ptyID: "pty_1", cursor: 42, attachmentID: "attachment_1", takeover: true })).toBe(socket)
expect(request?.method).toBe("POST")
expect(request?.url).toBe("https://server.example/api/experimental/persistent-pty/pty_1/connect-token")
expect(request?.url).toBe("https://server.example/base/api/experimental/persistent-pty/pty_1/connect-token")
expect(request?.headers.get("authorization")).toBe("Basic credential")
expect(request?.headers.get("x-opencode-ticket")).toBe("1")
expect(socketURL?.toString()).toBe(
"wss://server.example/api/experimental/persistent-pty/pty_1/connect?ticket=persistent-ticket&cursor=42&attachment_id=attachment_1&takeover=true&input_protocol=1",
"wss://server.example/base/api/experimental/persistent-pty/pty_1/connect?ticket=persistent-ticket&cursor=42&attachment_id=attachment_1&takeover=true&input_protocol=1",
)
expect(socket.binaryType).toBe("arraybuffer")
})
Expand Down
Loading
Loading