Skip to content
This repository was archived by the owner on Nov 10, 2026. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
10 changes: 9 additions & 1 deletion packages/app/src/runtime/server/runtime.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createSimpleContext } from "@opencode-ai/ui/context"
import { Accessor, createEffect, createMemo, createResource, createRoot, getOwner } from "solid-js"
import { Accessor, createEffect, createMemo, createResource, createRoot, getOwner, onCleanup } from "solid-js"
import { createStore } from "solid-js/store"
import { createServerProjects, RECENTLY_CLOSED_DISPLAY_LIMIT, ServerConnection, useServers } from "./registry"
import { pathKey } from "@/workspaces/path-key"
Expand Down Expand Up @@ -73,6 +73,14 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext(
}
})

// These roots outlive the provider unless disposed here. A leaked root keeps its event stream
// open and reconnecting, so repeated remounts exhaust the browser's per-origin connections.
onCleanup(() => {
for (const dispose of serverCtxDisposers.values()) dispose()
serverCtxDisposers.clear()
serverCtxs.clear()
})

return {
servers: {
list: () => server.list,
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
77 changes: 66 additions & 11 deletions packages/app/src/session/timeline/virtualizer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export function createTimelineVirtualizer(input: Input) {
const measuredElements = new WeakSet<Element>()
let touchStart: number | undefined
let pointerHeld = false
let upwardIntent = false
let maxScroll = 0
let virtualContent: HTMLDivElement | undefined
let scrollTop = 0
Expand Down Expand Up @@ -343,21 +344,43 @@ export function createTimelineVirtualizer(input: Input) {

const bindListRoot = (root: HTMLDivElement) => {
if (root === listRoot()) return
// TanStack owns anchoring; browser scroll anchoring would fight its adjustments.
root.style.overflowAnchor = "none"
setListRoot(root)
scrollTop = root.scrollTop
maxScroll = root.scrollHeight - root.clientHeight
input.setScrollRef(root)
viewportObserver?.observe(root)
settleColdBottom()
let adoptionObserver: ResizeObserver | undefined
let active = true
const bind = () => {
// Solid can mount inside an inert template document. TanStack captures its
// window on attachment and cannot install observers until the node is adopted.
if (!active || root === listRoot() || !root.ownerDocument.defaultView) return
adoptionObserver?.disconnect()
// TanStack owns anchoring; browser scroll anchoring would fight its adjustments.
root.style.overflowAnchor = "none"
setListRoot(root)
scrollTop = root.scrollTop
maxScroll = root.scrollHeight - root.clientHeight
input.setScrollRef(root)
viewportObserver?.observe(root)
settleColdBottom()
}
if (root.ownerDocument.defaultView) {
bind()
return
}
adoptionObserver = new ResizeObserver(bind)
adoptionObserver.observe(root)
onCleanup(() => {
active = false
adoptionObserver?.disconnect()
})
queueMicrotask(bind)
}

// Upward input is the one intent geometry cannot recover: nudging up while still a pixel from
// the end must stop following, even though the resulting position still looks like the end.
const handleListWheel = (event: WheelEvent & { currentTarget: HTMLDivElement }) => {
input.onUserScroll(event.target)
if (event.deltaY < 0) input.onUnpin()
if (event.deltaY < 0) {
upwardIntent = true
input.onUnpin()
}
}

const handleListTouchStart = (event: TouchEvent) => {
Expand All @@ -371,6 +394,7 @@ export function createTimelineVirtualizer(input: Input) {
// Dragging the content downward reveals earlier messages.
if (current <= touchStart) return
touchStart = current
upwardIntent = true
input.onUnpin()
}

Expand Down Expand Up @@ -398,7 +422,10 @@ export function createTimelineVirtualizer(input: Input) {
if (!isScrollKeyTarget(event.target, key)) return
if (scrollKeyOwner(event.currentTarget, event.target, key) !== event.currentTarget) return
input.onUserScroll(event.currentTarget)
if (upwardKeys.has(key)) input.onUnpin()
if (upwardKeys.has(key)) {
upwardIntent = true
input.onUnpin()
}
}

// Following resumes by arriving at the end, either by scrolling there or by content shrinking
Expand All @@ -414,11 +441,39 @@ export function createTimelineVirtualizer(input: Input) {
const arrived = scrollTop > previousTop + endEpsilon || maxScroll < previousMaxScroll
if (maxScroll <= 1 || (atEnd && arrived)) input.onPin()
else if (pointerHeld && scrollTop < previousTop - endEpsilon) input.onUnpin()
upwardIntent = false
settleColdBottom()
input.onScheduleScrollState(root)
input.onHistoryScroll()
}

let offsetCheck: number | undefined
onMount(() => {
// A remounted scroll view can reset scrollTop without dispatching scroll. Restore
// the last observed position before TanStack paints rows for the wrong offset.
offsetCheck = window.setInterval(() => {
const root = listRoot()
if (!root?.isConnected || !reportOffset) return
const observed = virtualizer.scrollOffset ?? 0
if (Math.abs(root.scrollTop - observed) <= 1) return
if (pointerHeld && root.scrollTop < observed) input.onUnpin()
if (!pointerHeld && !upwardIntent && root.scrollTop < observed - 1 && scrollTop > 1) {
const end = root.scrollHeight - root.clientHeight
const target = maxScroll - scrollTop <= endEpsilon ? end : Math.min(scrollTop, end)
if (target > root.scrollTop + 1) root.scrollTop = target
}
reportOffset(root.scrollTop, false)
if (input.pinned()) virtualizer.scrollToEnd()
scrollTop = root.scrollTop
maxScroll = root.scrollHeight - root.clientHeight
input.onScheduleScrollState(root)
input.onHistoryScroll()
}, 100)
})
onCleanup(() => {
if (offsetCheck !== undefined) window.clearInterval(offsetCheck)
})

function View(props: ViewProps) {
function VirtualRow(rowProps: { rowKey: string }) {
let element: HTMLDivElement
Expand Down Expand Up @@ -523,7 +578,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
Loading
Loading