Skip to content

Commit a86b514

Browse files
committed
fix(mobile): size inline MCP apps to their content
1 parent d720210 commit a86b514

4 files changed

Lines changed: 57 additions & 26 deletions

File tree

‎apps/mobile/src/features/threads/McpAppWebView.tsx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,10 @@ import { useEnvironmentQuery } from "../../state/query";
3838
import { enqueueThreadOutboxMessage } from "../../state/thread-outbox";
3939
import { useAtomCommand } from "../../state/use-atom-command";
4040
import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
41+
import { MCP_APP_INLINE_MAX_HEIGHT, mcpAppInlineHeight } from "./mcpAppSizing";
4142

42-
/** The feed reserves a fixed box for an app; a taller app scrolls inside it. */
43-
const MCP_APP_ROW_HEIGHT = 420;
4443
const ROW_BOTTOM_MARGIN = 8;
4544

46-
export function mcpAppRowHeight() {
47-
return MCP_APP_ROW_HEIGHT + ROW_BOTTOM_MARGIN;
48-
}
49-
5045
// The WebView loads a tiny outer page that hosts the app in a real
5146
// opaque-origin iframe, as web does, so the app's `window.parent` and the
5247
// `event.source` of host replies are a real window, which the MCP Apps SDK
@@ -104,7 +99,7 @@ const MAX_DOWNLOAD_BYTES = 25 * 1024 * 1024;
10499

105100
/**
106101
* A captured MCP App, hosted in a WebView over the MCP Apps bridge: inline as
107-
* a fixed row of the thread feed, or full screen in its own modal screen. A
102+
* a content-sized row of the thread feed, or full screen in its own modal screen. A
108103
* WebView cannot move between the two without reloading, so each is its own
109104
* view of the app: the inline one is torn down before full screen opens, and
110105
* comes back when it closes.
@@ -119,7 +114,7 @@ export function ThreadMcpApp(props: {
119114
readonly revision: string;
120115
readonly app: McpAppReference;
121116
readonly width: number;
122-
/** Full screen fills its screen; inline is the feed's fixed row. */
117+
/** Full screen fills its screen; inline follows the app's reported height. */
123118
readonly displayMode?: "inline" | "fullscreen";
124119
/** Full screen only: leaves it, back to the inline row. */
125120
readonly onExitFullscreen?: () => void;
@@ -128,8 +123,12 @@ export function ThreadMcpApp(props: {
128123
}) {
129124
// One reference per app: a new object with the same content (a refetch, a
130125
// rerender) must not rebuild the host of a document that is already live.
126+
const [height, setHeight] = useState(MCP_APP_INLINE_MAX_HEIGHT);
131127
const [app, setApp] = useState(props.app);
132-
if (!mcpAppReferencesEqual(app, props.app)) setApp(props.app);
128+
if (!mcpAppReferencesEqual(app, props.app)) {
129+
setApp(props.app);
130+
setHeight(MCP_APP_INLINE_MAX_HEIGHT);
131+
}
133132
const fullscreen = props.displayMode === "fullscreen";
134133
const navigation = useNavigation();
135134
const insets = useSafeAreaInsets();
@@ -183,6 +182,7 @@ export function ThreadMcpApp(props: {
183182
return;
184183
}
185184
setLoaded(false);
185+
setHeight(MCP_APP_INLINE_MAX_HEIGHT);
186186
// The first URL's token may have expired by now; the asset query keeps
187187
// a refreshed one, which this new view can load.
188188
if (asset._tag === "Success") setUri(asset.url);
@@ -194,6 +194,7 @@ export function ThreadMcpApp(props: {
194194
// loads the asset query's current URL: the first one's token may be gone.
195195
const setDocumentKey = (next: (value: number) => number) => {
196196
setLoaded(false);
197+
setHeight(MCP_APP_INLINE_MAX_HEIGHT);
197198
setNavigatedAway(false);
198199
if (asset._tag === "Success") setUri(asset.url);
199200
setDocumentKeyState(next);
@@ -296,11 +297,12 @@ export function ThreadMcpApp(props: {
296297
styles: { variables: mcpAppStyleVariables(current.theme.variables) },
297298
displayMode: isFullscreen ? "fullscreen" : "inline",
298299
availableDisplayModes: ["inline", "fullscreen"],
299-
// Both are fixed boxes, so the app is told its exact size.
300-
containerDimensions: {
301-
width: current.props.width,
302-
height: isFullscreen ? (current.props.height ?? MCP_APP_ROW_HEIGHT) : MCP_APP_ROW_HEIGHT,
303-
},
300+
containerDimensions: isFullscreen
301+
? {
302+
width: current.props.width,
303+
height: current.props.height ?? MCP_APP_INLINE_MAX_HEIGHT,
304+
}
305+
: { width: current.props.width, maxHeight: MCP_APP_INLINE_MAX_HEIGHT },
304306
platform: "mobile",
305307
locale: Intl.DateTimeFormat().resolvedOptions().locale,
306308
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
@@ -475,9 +477,11 @@ export function ThreadMcpApp(props: {
475477
void hostRef.current?.teardown().then(() => setClosed(true));
476478
}
477479
},
478-
// Both modes are fixed boxes, so the app's own height only decides
479-
// whether it scrolls inside one.
480-
onSizeChanged: () => undefined,
480+
onSizeChanged: (size) => {
481+
if (latest.current.props.displayMode === "fullscreen") return;
482+
const nextHeight = mcpAppInlineHeight(size.height);
483+
if (nextHeight !== undefined) setHeight(nextHeight);
484+
},
481485
});
482486
hostRef.current = next;
483487
return () => {
@@ -510,7 +514,7 @@ export function ThreadMcpApp(props: {
510514
if (presentedFullscreen) {
511515
return (
512516
<View
513-
style={{ height: MCP_APP_ROW_HEIGHT, marginBottom: ROW_BOTTOM_MARGIN }}
517+
style={{ height, marginBottom: ROW_BOTTOM_MARGIN }}
514518
className="items-center justify-center rounded-lg border border-border"
515519
>
516520
<Text className="text-sm text-foreground-muted">
@@ -523,7 +527,7 @@ export function ThreadMcpApp(props: {
523527
if (closed) {
524528
return (
525529
<View
526-
style={{ height: MCP_APP_ROW_HEIGHT, marginBottom: ROW_BOTTOM_MARGIN }}
530+
style={{ height, marginBottom: ROW_BOTTOM_MARGIN }}
527531
className="items-center justify-center gap-2 rounded-lg border border-border"
528532
>
529533
<Text className="text-sm text-foreground-muted">The {app.server} app was closed</Text>
@@ -541,11 +545,7 @@ export function ThreadMcpApp(props: {
541545
}
542546

543547
return (
544-
<View
545-
style={
546-
fullscreen ? { flex: 1 } : { height: MCP_APP_ROW_HEIGHT, marginBottom: ROW_BOTTOM_MARGIN }
547-
}
548-
>
548+
<View style={fullscreen ? { flex: 1 } : { height, marginBottom: ROW_BOTTOM_MARGIN }}>
549549
{navigatedAway ? (
550550
<View className="flex-1 items-center justify-center">
551551
<Text className="text-sm text-foreground-muted">

‎apps/mobile/src/features/threads/ThreadFeed.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ import type { QueuedThreadMessage } from "../../state/thread-outbox-model";
188188
import { resolveThreadFeedFixedItemSize } from "./thread-feed-item-size";
189189
import { htmlRenderFrameHeight } from "@t3tools/shared/htmlRender";
190190
import { htmlRenderRowHeight, ThreadHtmlRender } from "./HtmlRenderWebView";
191-
import { mcpAppRowHeight, ThreadMcpApp } from "./McpAppWebView";
191+
import { ThreadMcpApp } from "./McpAppWebView";
192192
import { useMarkdownCodeHighlight } from "./markdownCodeHighlightState";
193193
import {
194194
assetEnvironment,
@@ -1601,6 +1601,7 @@ function renderFeedEntry(
16011601
if (entry.type === "mcp-app") {
16021602
return (
16031603
<ThreadMcpApp
1604+
key={entry.app.attachmentId}
16041605
environmentId={props.environmentId}
16051606
threadId={entry.sourceThreadId}
16061607
conversationThreadId={props.threadId}
@@ -2930,7 +2931,6 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
29302931
if (entry.type === "html-render") {
29312932
return htmlRenderRowHeight(htmlRenderFrameHeight(entry.render, contentWidth));
29322933
}
2933-
if (entry.type === "mcp-app") return mcpAppRowHeight();
29342934
if (workRowSizing.fixedRowHeight === undefined) {
29352935
return undefined;
29362936
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
3+
import { mcpAppInlineHeight } from "./mcpAppSizing";
4+
5+
describe("inline MCP app height", () => {
6+
it.each([undefined, NaN, Infinity, -Infinity])(
7+
"ignores invalid or absent height %s",
8+
(height) => {
9+
expect(mcpAppInlineHeight(height)).toBeUndefined();
10+
},
11+
);
12+
13+
it.each([
14+
[-10, 80],
15+
[0, 80],
16+
[149.6, 150],
17+
[420, 420],
18+
[2000, 420],
19+
])("sizes content height %s within the inline viewport", (height, expected) => {
20+
expect(mcpAppInlineHeight(height)).toBe(expected);
21+
});
22+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { clampMcpAppHeight } from "@t3tools/shared/mcpApp";
2+
3+
/** Taller apps scroll inside the inline view; full screen fills its own screen. */
4+
export const MCP_APP_INLINE_MAX_HEIGHT = 420;
5+
6+
export function mcpAppInlineHeight(height: number | undefined): number | undefined {
7+
if (height === undefined || !Number.isFinite(height)) return undefined;
8+
return Math.min(MCP_APP_INLINE_MAX_HEIGHT, clampMcpAppHeight(height));
9+
}

0 commit comments

Comments
 (0)