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/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/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..76b98e2fa675 100644 --- a/packages/app/src/session/timeline/virtualizer.tsx +++ b/packages/app/src/session/timeline/virtualizer.tsx @@ -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" }} > -