diff --git a/bun.lock b/bun.lock index dc78725ae7b7..8552b2bb7915 100644 --- a/bun.lock +++ b/bun.lock @@ -195,7 +195,7 @@ "solid-js": "catalog:", }, "peerDependencies": { - "effect": "catalog:", + "effect": "4.0.1", "solid-js": ">=1.9.0", }, "optionalPeers": [ diff --git a/packages/app/FORGE.md b/packages/app/FORGE.md new file mode 100644 index 000000000000..9206df80b270 --- /dev/null +++ b/packages/app/FORGE.md @@ -0,0 +1,89 @@ +# Forge embedding on v2.0.32 + +This fork's stable baseline is upstream `843a6c514e606b436a7fe713422ace0a93ad3d61` +(v2.0.32). The lower integration commit has exactly that tree; the upper layer +contains the Forge UI ports. Do not replay the old fork's test timing changes or +overwrite stable's generated clients. + +## Host contract + +- Import `AppBaseProviders`, `AppInterface`, `PlatformProvider`, `Platform`, and + `ServerConnection` from `@opencode/app`. The package scope changed from + `@opencode-ai/*` to `@opencode/*`. +- Mount `PlatformProvider` outside `AppBaseProviders`, then render + `AppInterface embedded servers={[connection]} router={HostRouter}` inside it. + `AppBaseProviders` includes the stable `ExtensionRoot`; keep it mounted. +- `AppInterface` no longer accepts `defaultServer`. `Platform` no longer has + `getDefaultServer` or `setDefaultServer`. The route selects the server. +- An HTTP connection is `{ type: "http", http: { url, password? } }`. Its key is + `ServerConnection.key(connection)`. Use the full absolute task proxy URL, + such as `https://forge.owner.sh/api/v2/opencode-host/`. +- A session route is + `/server/${base64Encode(ServerConnection.key(connection))}/session/${sessionID}`; + import `base64Encode` from `@opencode/util/encode`. A host-owned + `createMemoryHistory()` can select it with + `history.set({ value: route, replace: true, scroll: false })`. Pass a stable + router component rendering ``. +- Mount and load the app bundle inside the iframe's own window/document. Give + its root a bounded full height and dispose the Solid render root on teardown. + Styles, theme/font writes, keyboard handlers, workers, and platform callbacks + then belong to that iframe. Namespace host-provided storage for the stable UI + when running it beside the legacy UI. +- The web platform must supply `platform: "web"`, `openExternal`, `restart`, + and `notify`. `storage`, `draftStore`, and `fetch` remain optional host hooks. + No desktop extension bridge is required for web rendering. + +Embedded mode hides the titlebar, vertical tab sidebar, session identity header, +mobile view tabs, and floating review toggle. Mobile stays on the conversation. +The timeline retains a 16px headerless inset at both viewport sizes. Standalone +mode keeps upstream layout and extension behavior. + +Server controllers are disposed on provider teardown through the same disposer +used for credential changes and server removal, including the credentials map. +The timeline waits for document adoption before attaching and recovers silent +scroll resets without taking over native touch momentum or size compensation. + +`time.released === 0` becomes an empty `release_date`, allowing undated custom +models to remain visible. `charon_execute` and `executor_execute` display +expandable JavaScript and output; native `execute` retains its console label and +plain code. Highlighting uses the existing Markdown worker and falls back to raw +code if unavailable. + +## Dependencies and build + +Install the complete stable workspace with its lockfile: + +```sh +mise x bun@1.4.2 -- bun install --frozen-lockfile +mise x bun@1.4.2 -- bun run check +mise x bun@1.4.2 -- bun run --cwd packages/app build +``` + +For focused iteration, run `bun typecheck` in `packages/app` and +`packages/session-ui`. The build emits `packages/app/dist`. + +The stable app directly needs the local `@opencode/client`, `schema`, +`gui-extensions`, `session-ui`, `ui`, and `util` packages. Preserve their +transitive workspace dependencies, including `protocol`, `plugin-browser`, and +`plugin`; adding only the old app/ui aliases is insufficient. Stable also moves +to Effect 4.0.1, Solid 1.9.15, Vite 8.2.2, and Tailwind 4.3.3 for the app. +Keep the lockfile patches, especially Solid, TanStack virtual-core, and the +stable Vite/worker configuration. `@opencode/app/vite` exports the app's Vite +plugins and configures its source alias, workers, Tailwind, and Solid compiler. + +Keep the stable entry's dependency resolution separate from legacy package +aliases when building both UIs. Compile the stable sources and load their CSS +inside the iframe. Do not alias stable packages back to the legacy vendored tree. + +Stable already preserves path prefixes for generated HTTP calls, PTY sockets, +and persistent PTY sockets. HTTP and socket routes append `/api/...` to the +connection URL. The app request queue classifies paths relative to the current +server URL so prefixed SSE bypasses the queue, filesystem/git reads use the slow +slots, and worktree creation keeps its ten-minute response-header budget. The +host proxy still needs to support both HTTP and WebSocket requests and streaming +responses. + +Before rollout, verify the parent wrapper against a v2.0.32 sandbox: session +load and streaming, task switches/remounts, mobile scrolling, tool expansion, +undated model visibility, and HTTP plus both PTY paths. A fork build alone does +not establish those host/runtime contracts. diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx index 78d11175f81e..0c6cba8b2c04 100644 --- a/packages/app/src/app.tsx +++ b/packages/app/src/app.tsx @@ -18,6 +18,7 @@ import { TabsProvider } from "@/shell/tabs/tabs" import { ErrorPage } from "@/shell/errors/error" import { AppRoutes, File, preloadRoute } from "@/shell/routes/routes" import { ExtensionRoot } from "@/runtime/extension/root" +import { EmbeddedProvider } from "@/runtime/embed" export { preloadRoute } @@ -89,21 +90,25 @@ export function AppInterface(props: { canonicalLocalServer?: ServerConnection.Key servers?: Array router?: Component + /** Hide application navigation when the host owns the surrounding chrome. */ + 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/runtime/embed.tsx b/packages/app/src/runtime/embed.tsx new file mode 100644 index 000000000000..4e123fcde3ab --- /dev/null +++ b/packages/app/src/runtime/embed.tsx @@ -0,0 +1,17 @@ +import { createContext, useContext, type ParentProps } from "solid-js" + +const EmbeddedContext = createContext({ embedded: false }) + +export function EmbeddedProvider(props: ParentProps<{ embedded?: boolean }>) { + const value = { + get embedded() { + return props.embedded ?? false + }, + } + + return {props.children} +} + +export function useEmbedded() { + return useContext(EmbeddedContext) +} diff --git a/packages/app/src/runtime/server/client.tsx b/packages/app/src/runtime/server/client.tsx index 94e52285cbd6..35e88834f868 100644 --- a/packages/app/src/runtime/server/client.tsx +++ b/packages/app/src/runtime/server/client.tsx @@ -127,7 +127,10 @@ export function createServerTransport(input: { http: ServerConnection.HttpBase; readonly api: ServerApi readonly pty: ReturnType } { - const queue = createRequestQueue({ fetch: input.fetch ?? globalThis.fetch }) + const queue = createRequestQueue({ + fetch: input.fetch ?? globalThis.fetch, + baseUrl: (): string => state.current.http.url, + }) const build = (http: ServerConnection.HttpBase) => { const api = createApiForServer({ server: http, fetch: queue.fetch }) diff --git a/packages/app/src/runtime/server/global-sync/utils.ts b/packages/app/src/runtime/server/global-sync/utils.ts index fa168b62730b..68194a37ced3 100644 --- a/packages/app/src/runtime/server/global-sync/utils.ts +++ b/packages/app/src/runtime/server/global-sync/utils.ts @@ -112,7 +112,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/request-queue.ts b/packages/app/src/runtime/server/request-queue.ts index 04d88a530052..4cc043685f71 100644 --- a/packages/app/src/runtime/server/request-queue.ts +++ b/packages/app/src/runtime/server/request-queue.ts @@ -35,6 +35,8 @@ function isSetupRequest(method: string, pathname: string) { export function createRequestQueue(input: { fetch: typeof globalThis.fetch + /** The current server URL, including a reverse proxy's path prefix. */ + baseUrl?: () => string limit?: number slowLimit?: number stallMs?: number @@ -119,7 +121,15 @@ export function createRequestQueue(input: { const fetch: typeof globalThis.fetch = Object.assign( async (resource: RequestInfo | URL, init?: RequestInit) => { const request = new Request(resource, init) - const pathname = new URL(request.url).pathname + const url = new URL(request.url) + const baseUrl = input.baseUrl?.() + const server = baseUrl ? new URL(baseUrl) : undefined + const prefix = server?.pathname.replace(/\/+$/, "") ?? "" + + const pathname = + server?.origin === url.origin && prefix && url.pathname.startsWith(`${prefix}/`) + ? url.pathname.slice(prefix.length) + : url.pathname // The event stream is long-lived; never count it against the request budget. if (pathname === "/api/event") return base(request) diff --git a/packages/app/src/runtime/server/runtime.tsx b/packages/app/src/runtime/server/runtime.tsx index 13e686e8c334..97e1ecfadef7 100644 --- a/packages/app/src/runtime/server/runtime.tsx +++ b/packages/app/src/runtime/server/runtime.tsx @@ -1,5 +1,15 @@ import { createSimpleContext } from "@opencode/ui/context" -import { Accessor, batch, createEffect, createMemo, createResource, createRoot, getOwner, untrack } from "solid-js" +import { + Accessor, + batch, + createEffect, + createMemo, + createResource, + createRoot, + getOwner, + onCleanup, + untrack, +} from "solid-js" import { createServerProjects, RECENTLY_CLOSED_DISPLAY_LIMIT, ServerConnection, useServers } from "./registry" import { pathKey } from "@/workspaces/path-key" import { useServerHealth } from "@/runtime/server/health" @@ -91,6 +101,11 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext( } }) + // Detached roots otherwise keep reconnecting their event streams after the host unmounts the app. + onCleanup(() => { + for (const key of serverCtxDisposers.keys()) disposeServerCtx(key) + }) + return { servers: { list: () => server.list, diff --git a/packages/app/src/session/screen.tsx b/packages/app/src/session/screen.tsx index fb5a261f0e8d..b1b5ebb733cb 100644 --- a/packages/app/src/session/screen.tsx +++ b/packages/app/src/session/screen.tsx @@ -38,6 +38,7 @@ import { SessionReviewToggle } from "./header/session-header-actions" import { SessionRunningMenu } from "./header/session-running-menu" import { createAnimatedPresence } from "@/runtime/animated-presence" import { createTimelineCache } from "./timeline/cache" +import { useEmbedded } from "@/runtime/embed" export function SessionScreenView(props: { session: SessionModel }) { // The timeline cache captures its owner when created, so link handling must be provided above it. @@ -66,6 +67,7 @@ function SessionScreenContent(props: { const host = useExtensionHost() const attachment = useExtensionAttachment() const settings = useSettings() + const embedded = useEmbedded() const isDesktop = session.isDesktop const bottomMobileTabs = () => settings.general.mobileTitlebarPosition() === "bottom" const sidebar = createPanelSidebar() @@ -191,7 +193,7 @@ function SessionScreenContent(props: { const dockView = createMemo(() => mobile.entries().find((entry) => entry.provider.region === "dock")) const mobileView = createMemo(() => - screen.dock.open() ? (dockView()?.key ?? "session") : attachment.mobile.current(), + embedded.embedded ? "session" : screen.dock.open() ? (dockView()?.key ?? "session") : attachment.mobile.current(), ) const mobileEntry = createMemo(() => { @@ -304,7 +306,9 @@ function SessionScreenContent(props: { input={composer.drop.input()} identity={session.layout.tabKey} /> - {mobileTabs()} + + {mobileTabs()} + {/* Surface query errors without suspending session metadata while messages load. */} {(error) => { @@ -363,7 +367,9 @@ function SessionScreenContent(props: { )} - {mobileTabs()} + + {mobileTabs()} + ) @@ -372,7 +378,7 @@ function SessionScreenContent(props: {
{/* Keep the control outside panel animations. */} - +
) { + const embedded = useEmbedded() const server = useServer() const tabs = useTabs() const language = useLanguage() @@ -379,7 +381,7 @@ export function SessionIdentityHeader(props: ParentProps<{ sessionID: string; se const workspaceSession = createMemo(() => !!pending() || isWorkspaceDirectory(project(), directory() ?? "")) return ( - +
diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx index 85acc85e02bc..ca22beec5527 100644 --- a/packages/app/src/session/timeline/message-timeline.tsx +++ b/packages/app/src/session/timeline/message-timeline.tsx @@ -27,6 +27,7 @@ import { parseVoiceDelegation } from "./voice-delegation" import { useCommand } from "@/shell/commands/command" import { SessionAncestorTrail, SessionProjectMenu, SessionTitleHeader } from "../session-identity-header" import { SessionHeaderSpacer } from "@/session/header/session-header" +import { useEmbedded } from "@/runtime/embed" import { SessionRunningMenu } from "@/session/header/session-running-menu" type BlockingTask = { type: "shell" | "subagent"; partID: string; id?: string; label?: string } @@ -123,6 +124,7 @@ function MessageTimelineView( pending: TimelineController["pending"] }, ) { + const embedded = useEmbedded() const language = useLanguage() const server = useServer() const data = server.ctx.data @@ -162,7 +164,11 @@ function MessageTimelineView( void data.location.vcs.sync({ directory }).catch(() => undefined) }) const turnPadding = () => "px-4 md:px-6" - 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 @@ -461,7 +467,7 @@ function MessageTimelineView( )} header={ - +
diff --git a/packages/app/src/session/timeline/virtualizer.tsx b/packages/app/src/session/timeline/virtualizer.tsx index fe26622eaf1d..b0eb518fd8af 100644 --- a/packages/app/src/session/timeline/virtualizer.tsx +++ b/packages/app/src/session/timeline/virtualizer.tsx @@ -28,6 +28,7 @@ import { createMediaQuery } from "@solid-primitives/media" import type { createTimelineProjection } from "./projection" import { observeElementOffsetReconnectAware } from "./observe-element-offset" import { filterVirtualIndexes } from "./virtual-items" +import { useEmbedded } from "@/runtime/embed" const fallbackItemSize = 60 @@ -92,9 +93,10 @@ type ViewProps = { export function createTimelineVirtualizer(input: Input) { const language = useLanguage() + const embedded = useEmbedded() const active = () => input.active?.() !== false const isDesktop = createMediaQuery("(min-width: 768px)") - const topOffset = () => (input.showHeader() ? 64 : isDesktop() ? 0 : 16) + const topOffset = () => (input.showHeader() ? 64 : embedded.embedded || !isDesktop() ? 16 : 0) const ownerSessionKey = input.sessionKey() const entry = cache.get(ownerSessionKey) const cached = entry?.presentationKey === input.presentationKey?.() ? entry : undefined @@ -185,6 +187,7 @@ export function createTimelineVirtualizer(input: Input) { let touchScrolling = false let touchAdjustment = 0 let pointerHeld = false + let upwardIntent = false let maxScroll = 0 let virtualContent: HTMLDivElement | undefined let scrollTop = 0 @@ -232,6 +235,7 @@ export function createTimelineVirtualizer(input: Input) { return observeElementOffsetReconnectAware(instance, reportOffset, () => { if (!active()) return + recoverSilentOffset() virtualContent?.querySelectorAll("[data-index]").forEach(virtualizer.measureElement) if (input.pinned()) virtualizer.scrollToEnd() @@ -636,15 +640,37 @@ 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 + let adoptionObserver: ResizeObserver | undefined + let mounted = true + + const bind = () => { + // Solid templates start in an inert document; TanStack needs the adopted node's window to attach observers. + if (!mounted || 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 + + if (active()) input.setScrollRef(root) + viewportObserver?.observe(root) + settleColdBottom() + } - if (active()) input.setScrollRef(root) - viewportObserver?.observe(root) - settleColdBottom() + if (root.ownerDocument.defaultView) { + bind() + + return + } + + adoptionObserver = new ResizeObserver(bind) + adoptionObserver.observe(root) + onCleanup(() => { + mounted = false + adoptionObserver?.disconnect() + }) + queueMicrotask(bind) } // Upward input is the one intent geometry cannot recover: nudging up while still a pixel from @@ -653,7 +679,10 @@ export function createTimelineVirtualizer(input: Input) { releaseAnchor() input.onUserScroll(event.target) - if (event.deltaY < 0) input.onUnpin() + if (event.deltaY < 0) { + upwardIntent = true + input.onUnpin() + } } const handleListTouchStart = (event: TouchEvent) => { @@ -693,6 +722,7 @@ export function createTimelineVirtualizer(input: Input) { // A nested scrollport owns the intent. If it chains into the timeline at a // boundary, the resulting native timeline scroll below will unpin instead. if (touchNested) return + upwardIntent = true input.onUnpin() } @@ -744,7 +774,10 @@ export function createTimelineVirtualizer(input: Input) { releaseAnchor() 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 @@ -763,11 +796,55 @@ export function createTimelineVirtualizer(input: Input) { // An anchor holds its tool even when reaching it lands at the end; only the user's own scroll lets it go. if (maxScroll <= 1 || (atEnd && arrived && !rendering.anchor)) input.onPin() else if ((pointerHeld || touchScrolling) && scrollTop < previousTop - endEpsilon) input.onUnpin() + upwardIntent = false settleColdBottom() input.onScheduleScrollState(root) input.onHistoryScroll() } + function recoverSilentOffset() { + if (!embedded.embedded) return + const root = listRoot() + + // Native touch scrolling owns its offset until momentum and the translated size compensation settle. + if ( + !active() || + !root?.isConnected || + !root.clientHeight || + !reportOffset || + touchScrolling || + rendering.scrollAdjustment + ) + 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 = Math.max(0, root.scrollHeight - root.clientHeight) + const target = input.pinned() ? 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() + } + + createEffect(() => { + if (!embedded.embedded) return + // Detached hosts can reset scrollTop without a scroll event or a route reconnect notification. + const offsetCheck = window.setInterval(recoverSilentOffset, 100) + onCleanup(() => window.clearInterval(offsetCheck)) + }) + function View(props: ViewProps) { function VirtualRow(rowProps: { rowKey: string }) { let element: HTMLDivElement @@ -888,7 +965,10 @@ export function createTimelineVirtualizer(input: Input) { class="relative min-w-0 w-full h-full" style={{ "--sticky-accordion-top": input.showHeader() ? "48px" : "0px" }} > -