diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx index f7654abe746b..11f1a1ccf998 100644 --- a/packages/app/src/app.tsx +++ b/packages/app/src/app.tsx @@ -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 } @@ -99,23 +100,26 @@ export function AppInterface(props: { canonicalLocalServer?: ServerConnection.Key servers?: Array router?: Component + 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) => ( - - - - - - - {props.children} - {rootProps.children} - - - - + + + + + + + + {props.children} + {rootProps.children} + + + + + ) return ( diff --git a/packages/app/src/providers/models/models.tsx b/packages/app/src/providers/models/models.tsx index be97525acb48..c83fa7b5376b 100644 --- a/packages/app/src/providers/models/models.tsx +++ b/packages/app/src/providers/models/models.tsx @@ -102,7 +102,7 @@ const createModelsController = (directory: Accessor) => { 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 } diff --git a/packages/app/src/runtime/embed.tsx b/packages/app/src/runtime/embed.tsx new file mode 100644 index 000000000000..44c603b0aa91 --- /dev/null +++ b/packages/app/src/runtime/embed.tsx @@ -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, + }), +}) diff --git a/packages/app/src/runtime/server/global-sync/utils.ts b/packages/app/src/runtime/server/global-sync/utils.ts index 3cddc558a21d..c027e40e6ce4 100644 --- a/packages/app/src/runtime/server/global-sync/utils.ts +++ b/packages/app/src/runtime/server/global-sync/utils.ts @@ -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 ?? {}])), } } diff --git a/packages/app/src/runtime/server/runtime.tsx b/packages/app/src/runtime/server/runtime.tsx index 639c845b0db7..d7b1c6390317 100644 --- a/packages/app/src/runtime/server/runtime.tsx +++ b/packages/app/src/runtime/server/runtime.tsx @@ -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" @@ -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, diff --git a/packages/app/src/session/screen.tsx b/packages/app/src/session/screen.tsx index 5643a68e78c9..d67674fc2469 100644 --- a/packages/app/src/session/screen.tsx +++ b/packages/app/src/session/screen.tsx @@ -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") @@ -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() @@ -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) @@ -198,7 +202,7 @@ export function SessionScreen(props: { session: SessionModel }) { const sessionPanelContent = () => ( <> - {mobileTabs()} + {mobileTabs()} {/* Surface query errors without suspending session metadata while messages load. */} {(error) => { @@ -273,7 +277,9 @@ export function SessionScreen(props: { session: SessionModel }) { return ( <> - + + +
diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx index 83e5566ec5bd..ea3fdaa9833f 100644 --- a/packages/app/src/session/timeline/message-timeline.tsx +++ b/packages/app/src/session/timeline/message-timeline.tsx @@ -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 = { @@ -357,6 +358,7 @@ function MessageTimelineView( pending: TimelineController["pending"] }, ) { + const embedded = useEmbedded() const language = useLanguage() const data = useData() const server = useServer() @@ -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({ @@ -574,7 +578,7 @@ function MessageTimelineView( }} renderRow={(row, onSizeChange) => } header={ - +
diff --git a/packages/app/src/session/timeline/virtualizer.tsx b/packages/app/src/session/timeline/virtualizer.tsx index d27bfcd8221b..40b2bc760c28 100644 --- a/packages/app/src/session/timeline/virtualizer.tsx +++ b/packages/app/src/session/timeline/virtualizer.tsx @@ -134,6 +134,7 @@ export function createTimelineVirtualizer(input: Input) { const measuredElements = new WeakSet() let touchStart: number | undefined let pointerHeld = false + let upwardIntent = false let maxScroll = 0 let virtualContent: HTMLDivElement | undefined let scrollTop = 0 @@ -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) => { @@ -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() } @@ -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 @@ -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 @@ -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" }} > -