From 3d5f29a7a218873725ab9c6f94e9d6aed4011e03 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Wed, 15 Apr 2026 21:16:05 +0200
Subject: [PATCH] feat: continued post qa for servers in app (#5818)

* fix: intercom in app

* feat: Logs.vue dynamic console resizing with window + padding problem

* fix: search highlight with decorator + change to be better

* fix: qa

* fix: allow paper+purpur into app csp

* fix: lint
---
 apps/app-frontend/src/App.vue                 |  21 ++-
 .../src/components/ui/SplashScreen.vue        |  42 +++--
 .../src/pages/hosting/manage/Index.vue        |  37 +++-
 .../app-frontend/src/pages/instance/Index.vue |  11 +-
 apps/app/tauri.conf.json                      |   2 +-
 .../routes/api/intercom/messenger-jwt.get.ts  |   6 +-
 .../ui/src/components/base/BaseTerminal.vue   |  28 +--
 .../composables/server-manage-core-runtime.ts |  44 +++++
 packages/ui/src/composables/terminal.ts       |  11 ++
 .../ui/src/composables/use-server-image.ts    |  14 +-
 .../console/composables/console-filtering.ts  | 176 +++++++++++++++---
 .../shared/console/composables/index.ts       |   4 +
 .../ui/src/layouts/shared/console/layout.vue  |  20 +-
 .../manage/components/ServerManageStats.vue   |  30 ++-
 .../layouts/wrapped/hosting/manage/root.vue   |  19 +-
 15 files changed, 379 insertions(+), 86 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index d8148524d..a7488f53b 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -60,6 +60,7 @@ import { useQuery } from '@tanstack/vue-query'
 import { getVersion } from '@tauri-apps/api/app'
 import { invoke } from '@tauri-apps/api/core'
 import { getCurrentWindow } from '@tauri-apps/api/window'
+import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { type } from '@tauri-apps/plugin-os'
 import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
@@ -446,7 +447,7 @@ router.afterEach((to, from, failure) => {
 		failed: failure,
 	})
 	setTimeout(() => {
-		if (!suspensePending) {
+		if (!suspensePending && stateInitialized.value) {
 			loading.stopLoading()
 		}
 	}, 100)
@@ -504,9 +505,27 @@ setupAuthProvider(credentials, async (_redirectPath) => {
 	await signIn()
 })
 
+async function validateSession(sessionToken) {
+	try {
+		const response = await tauriFetch(`${config.labrinthBaseUrl}/v2/user`, {
+			method: 'GET',
+			headers: { Authorization: sessionToken },
+		})
+		if (response.status === 401) return false
+		return true
+	} catch {
+		return true
+	}
+}
+
 async function fetchCredentials() {
 	const creds = await getCreds().catch(handleError)
 	if (creds && creds.user_id) {
+		if (creds.session && !(await validateSession(creds.session))) {
+			await logout().catch(handleError)
+			credentials.value = null
+			return
+		}
 		creds.user = await get_user(creds.user_id, 'bypass').catch(handleError)
 	}
 	credentials.value = creds ?? null
diff --git a/apps/app-frontend/src/components/ui/SplashScreen.vue b/apps/app-frontend/src/components/ui/SplashScreen.vue
index d15c6fb4d..790589bf0 100644
--- a/apps/app-frontend/src/components/ui/SplashScreen.vue
+++ b/apps/app-frontend/src/components/ui/SplashScreen.vue
@@ -100,24 +100,38 @@ const loadingProgress = ref(0)
 const hidden = ref(false)
 const message = ref()
 
+// const MIN_DISPLAY_MS = 1000
+// const mountedAt = Date.now()
+
 const loading = useLoading()
 
-watch(loading, (newValue) => {
-	if (!newValue.barEnabled) {
-		if (loading.loading) {
-			loadingProgress.value = 0
-			fakeLoadingIncrease()
-		} else {
-			loadingProgress.value = 100
-			doneLoading.value = true
+watch(
+	loading,
+	(newValue) => {
+		if (!newValue.barEnabled) {
+			if (loading.loading) {
+				loadingProgress.value = 0
+				fakeLoadingIncrease()
+			} else {
+				// const elapsed = Date.now() - mountedAt
+				// const delay = Math.max(0, MIN_DISPLAY_MS - elapsed)
 
-			setTimeout(() => {
-				hidden.value = true
-				loading.setEnabled(true)
-			}, 50)
+				// setTimeout(() => {
+				// 	if (loading.loading) return
+
+				loadingProgress.value = 100
+				doneLoading.value = true
+
+				setTimeout(() => {
+					hidden.value = true
+					loading.setEnabled(true)
+				}, 50)
+				// }, delay)
+			}
 		}
-	}
-})
+	},
+	{ immediate: true },
+)
 
 function fakeLoadingIncrease() {
 	if (loadingProgress.value < 95) {
diff --git a/apps/app-frontend/src/pages/hosting/manage/Index.vue b/apps/app-frontend/src/pages/hosting/manage/Index.vue
index c9837956e..fe4b1702f 100644
--- a/apps/app-frontend/src/pages/hosting/manage/Index.vue
+++ b/apps/app-frontend/src/pages/hosting/manage/Index.vue
@@ -1,10 +1,12 @@
 <template>
-	<div class="h-full w-full py-6">
+	<div class="h-full w-full pt-6">
 		<ServersManageRootLayout
 			:server-id="serverId"
 			:reload-page="() => router.go(0)"
 			:resolve-viewer="resolveViewer"
 			:show-copy-id-action="themeStore.devMode"
+			:auth-user="authUser"
+			:fetch-intercom-token="fetchIntercomToken"
 			:navigate-to-billing="() => openUrl('https://modrinth.com/settings/billing')"
 			:navigate-to-servers="() => router.push('/hosting/manage')"
 			:browse-modpacks="
@@ -48,10 +50,12 @@
 import type { Archon, Labrinth } from '@modrinth/api-client'
 import { injectAuth, LoadingIndicator, ServersManageRootLayout } from '@modrinth/ui'
 import { useQuery } from '@tanstack/vue-query'
+import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { computed, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
+import { config } from '@/config'
 import { get_user } from '@/helpers/cache'
 import { get as getCreds } from '@/helpers/mr_auth'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
@@ -97,6 +101,37 @@ watch(
 	},
 )
 
+const authUser = computed(() => {
+	const user = auth.user.value
+	if (!user?.id) return undefined
+	return {
+		id: user.id,
+		username: user.username,
+		email: user.email ?? '',
+		created: user.created,
+	}
+})
+
+async function fetchIntercomToken(): Promise<{ token: string }> {
+	const credentials = await getCreds()
+	if (!credentials?.session) {
+		throw new Error('Not authenticated')
+	}
+	const response = await tauriFetch(
+		`${config.siteUrl}/api/intercom/messenger-jwt?server_id=${encodeURIComponent(serverId.value)}`,
+		{
+			method: 'GET',
+			headers: {
+				Authorization: `Bearer ${credentials.session}`,
+			},
+		},
+	)
+	if (!response.ok) {
+		throw new Error(`Failed to fetch Intercom token: ${response.status}`)
+	}
+	return (await response.json()) as { token: string }
+}
+
 async function resolveViewer(): Promise<{ userId: string | null; userRole: string | null }> {
 	const credentials = await getCreds().catch(() => null)
 	if (!credentials?.user_id) {
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index 7357c7472..4b57df3bf 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -1,6 +1,9 @@
 <template>
-	<div v-if="instance">
-		<div class="p-6 pr-2 pb-4" @contextmenu.prevent.stop="(event) => handleRightClick(event)">
+	<div v-if="instance" class="flex h-full flex-col">
+		<div
+			class="shrink-0 p-6 pr-2 pb-4"
+			@contextmenu.prevent.stop="(event) => handleRightClick(event)"
+		>
 			<ExportModal ref="exportModal" :instance="instance" />
 			<InstanceSettingsModal
 				:key="instance.path"
@@ -205,10 +208,10 @@
 				</template>
 			</ContentPageHeader>
 		</div>
-		<div class="px-6">
+		<div class="shrink-0 px-6">
 			<NavTabs :links="tabs" />
 		</div>
-		<div v-if="!!instance" class="p-6 pt-4">
+		<div v-if="!!instance" class="min-h-0 flex-1 overflow-y-auto p-6 pt-4">
 			<RouterView
 				v-if="route.path.startsWith('/instance')"
 				v-slot="{ Component }"
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index 06d1d350a..f7fe7c0e9 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -87,7 +87,7 @@
 			"capabilities": ["ads", "core", "plugins"],
 			"csp": {
 				"default-src": "'self' customprotocol: asset:",
-				"connect-src": "ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.nodes.modrinth.com https://*.posthog.com https://posthog.modrinth.com https://*.sentry.io https://api.mclo.gs http://textures.minecraft.net https://textures.minecraft.net https://js.stripe.com https://*.stripe.com wss://*.stripe.com wss://*.nodes.modrinth.com wss://*.ts.net 'self' data: blob:",
+				"connect-src": "ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.nodes.modrinth.com https://*.posthog.com https://posthog.modrinth.com https://*.sentry.io https://api.mclo.gs http://textures.minecraft.net https://textures.minecraft.net https://js.stripe.com https://*.stripe.com wss://*.stripe.com wss://*.nodes.modrinth.com wss://*.ts.net https://fill.papermc.io https://api.purpurmc.org 'self' data: blob:",
 				"font-src": ["https://cdn-raw.modrinth.com/fonts/"],
 				"img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost http://textures.minecraft.net blob: data:",
 				"style-src": "'unsafe-inline' 'self'",
diff --git a/apps/frontend/src/server/routes/api/intercom/messenger-jwt.get.ts b/apps/frontend/src/server/routes/api/intercom/messenger-jwt.get.ts
index 6992d62a6..25bc71d63 100644
--- a/apps/frontend/src/server/routes/api/intercom/messenger-jwt.get.ts
+++ b/apps/frontend/src/server/routes/api/intercom/messenger-jwt.get.ts
@@ -57,7 +57,11 @@ export default defineEventHandler(async (event): Promise<IntercomTokenResponse>
 		})
 	}
 
-	const authToken = getCookie(event, 'auth-token')
+	const authHeader = getRequestHeader(event, 'authorization')
+	const bearerToken = authHeader?.toLowerCase().startsWith('bearer ')
+		? authHeader.slice(7).trim()
+		: undefined
+	const authToken = bearerToken || getCookie(event, 'auth-token')
 	if (!authToken) {
 		throw createError({
 			statusCode: 401,
diff --git a/packages/ui/src/components/base/BaseTerminal.vue b/packages/ui/src/components/base/BaseTerminal.vue
index ac4378ae9..12957a720 100644
--- a/packages/ui/src/components/base/BaseTerminal.vue
+++ b/packages/ui/src/components/base/BaseTerminal.vue
@@ -1,8 +1,6 @@
 <template>
 	<div
-		class="flex w-full flex-col bg-surface-2 overflow-hidden rounded-[20px] border border-solid border-surface-4"
-		:style="!fullscreen && componentHeight ? { minHeight: componentHeight + 'px' } : {}"
-		:class="{ 'h-full': fullscreen }"
+		class="flex h-full w-full flex-col bg-surface-2 overflow-hidden rounded-[20px] border border-solid border-surface-4"
 	>
 		<div ref="wrapperRef" class="relative min-h-0 flex-1 overflow-hidden pb-2 pt-1">
 			<div ref="containerRef" class="size-full" />
@@ -93,7 +91,6 @@ const containerRef = ref<HTMLElement | null>(null)
 const wrapperRef = ref<HTMLElement | null>(null)
 const inputRef = ref<HTMLElement | null>(null)
 const commandInput = ref('')
-const componentHeight = ref(0)
 
 const snappedHeight = ref<number | null>(null)
 
@@ -114,14 +111,10 @@ const {
 	scrollback: props.scrollback,
 	onReady: (term) => {
 		nextTick(() => {
-			updateComponentHeight()
 			snapToRows()
 		})
 		emit('ready', term)
 	},
-	onResize: () => {
-		updateComponentHeight()
-	},
 })
 
 function writeEmptyState() {
@@ -175,12 +168,21 @@ function handleWindowResize() {
 	}, 50)
 }
 
+function handleDocumentPointerDown(event: PointerEvent) {
+	if (!terminal.value?.hasSelection()) return
+	const target = event.target as Node | null
+	if (target && containerRef.value?.contains(target)) return
+	terminal.value.clearSelection()
+}
+
 onMounted(() => {
 	window.addEventListener('resize', handleWindowResize)
+	document.addEventListener('pointerdown', handleDocumentPointerDown)
 })
 
 onBeforeUnmount(() => {
 	window.removeEventListener('resize', handleWindowResize)
+	document.removeEventListener('pointerdown', handleDocumentPointerDown)
 	if (resizeDebounce) clearTimeout(resizeDebounce)
 })
 
@@ -199,20 +201,10 @@ watch(
 			})
 		} else {
 			snappedHeight.value = null
-			componentHeight.value = 0
 		}
 	},
 )
 
-function updateComponentHeight() {
-	const screen = containerRef.value?.querySelector('.xterm-screen') as HTMLElement | null
-	if (!screen) return
-	const screenH = screen.offsetHeight
-	const inputH = inputRef.value?.offsetHeight ?? 0
-	const borderW = 2
-	componentHeight.value = screenH + getWrapperMargins() + inputH + borderW
-}
-
 const submitCommand = () => {
 	const cmd = commandInput.value.trim()
 	if (!cmd) return
diff --git a/packages/ui/src/composables/server-manage-core-runtime.ts b/packages/ui/src/composables/server-manage-core-runtime.ts
index a2c70074e..877aa5313 100644
--- a/packages/ui/src/composables/server-manage-core-runtime.ts
+++ b/packages/ui/src/composables/server-manage-core-runtime.ts
@@ -63,6 +63,9 @@ const appendGraphData = (dataArray: number[], newValue: number): number[] => {
 	return updated
 }
 
+const STALE_STATS_THRESHOLD_MS = 5000
+const STALE_STATS_PUSH_INTERVAL_MS = 1000
+
 const mapPowerStateFromStateEvent = (
 	data: Archon.Websocket.v0.WSStateEvent,
 ): Archon.Websocket.v0.PowerState => {
@@ -101,6 +104,8 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 	const ramData = ref<number[]>([])
 
 	let uptimeIntervalId: ReturnType<typeof setInterval> | null = null
+	let staleStatsTimeoutId: ReturnType<typeof setTimeout> | null = null
+	let staleStatsIntervalId: ReturnType<typeof setInterval> | null = null
 
 	const markBackupCancelled =
 		options.markBackupCancelled ??
@@ -183,6 +188,43 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 		}
 	}
 
+	const clearStaleStatsTimers = () => {
+		if (staleStatsTimeoutId) {
+			clearTimeout(staleStatsTimeoutId)
+			staleStatsTimeoutId = null
+		}
+		if (staleStatsIntervalId) {
+			clearInterval(staleStatsIntervalId)
+			staleStatsIntervalId = null
+		}
+	}
+
+	const pushZeroStats = () => {
+		if (!shouldProcessEvent()) return
+		cpuData.value = appendGraphData(cpuData.value, 0)
+		ramData.value = appendGraphData(ramData.value, 0)
+		stats.value = {
+			current: {
+				...stats.value.current,
+				cpu_percent: 0,
+				ram_usage_bytes: 0,
+			},
+			past: { ...stats.value.current },
+			graph: {
+				cpu: cpuData.value,
+				ram: ramData.value,
+			},
+		}
+	}
+
+	const armStaleStatsWatchdog = () => {
+		clearStaleStatsTimers()
+		staleStatsTimeoutId = setTimeout(() => {
+			pushZeroStats()
+			staleStatsIntervalId = setInterval(pushZeroStats, STALE_STATS_PUSH_INTERVAL_MS)
+		}, STALE_STATS_THRESHOLD_MS)
+	}
+
 	const updatePowerState = (
 		state: Archon.Websocket.v0.PowerState,
 		details?: { oom_killed?: boolean; exit_code?: number },
@@ -209,6 +251,7 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 	}
 
 	const handleStats = (data: Archon.Websocket.v0.WSStatsEvent) => {
+		armStaleStatsWatchdog()
 		updateStats({
 			cpu_percent: data.cpu_percent,
 			ram_usage_bytes: data.ram_usage_bytes,
@@ -280,6 +323,7 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 		}
 
 		stopUptimeTicker()
+		clearStaleStatsTimers()
 		connectedSocketServerId.value = null
 		isConnected.value = false
 		isWsAuthIncorrect.value = false
diff --git a/packages/ui/src/composables/terminal.ts b/packages/ui/src/composables/terminal.ts
index 645f50856..52bfa9a30 100644
--- a/packages/ui/src/composables/terminal.ts
+++ b/packages/ui/src/composables/terminal.ts
@@ -193,6 +193,17 @@ export function useTerminal(options: UseTerminalOptions): UseTerminalReturn {
 		term.options.disableStdin = true
 		term.write('\x1b[?25l')
 
+		// term.attachCustomKeyEventHandler((e) => {
+		// 	if (e.type !== 'keydown') return true
+		// 	const mod = e.ctrlKey || e.metaKey
+		// 	if (!mod) return true
+		// 	const key = e.key.toLowerCase()
+		// 	if (key === 'c' || key === 'insert' || key === 'a') {
+		// 		return false
+		// 	}
+		// 	return true
+		// })
+
 		wheelHandler = (e: WheelEvent) => {
 			e.preventDefault()
 		}
diff --git a/packages/ui/src/composables/use-server-image.ts b/packages/ui/src/composables/use-server-image.ts
index fc4fccc67..c33018ff5 100644
--- a/packages/ui/src/composables/use-server-image.ts
+++ b/packages/ui/src/composables/use-server-image.ts
@@ -60,8 +60,8 @@ export function useServerImage(
 
 	const { data: remoteImage, refetch } = useQuery({
 		queryKey,
-		queryFn: async (): Promise<string | null | undefined> => {
-			if (!serverId) return undefined
+		queryFn: async (): Promise<string | null> => {
+			if (!serverId) return null
 
 			try {
 				const fsAuth = await client.archon.servers_v0.getFilesystemAuth(serverId)
@@ -84,21 +84,21 @@ export function useServerImage(
 				}
 			} catch (error) {
 				console.debug('Server image fetch failed:', error)
-				return undefined
+				return null
 			}
 
-			if (!includeProjectFallback || !upstream.value?.project_id) return undefined
+			if (!includeProjectFallback || !upstream.value?.project_id) return null
 
 			try {
 				const project = await client.labrinth.projects_v2.get(upstream.value.project_id)
-				if (!project.icon_url) return undefined
+				if (!project.icon_url) return null
 				const response = await fetch(project.icon_url)
-				if (!response.ok) return undefined
+				if (!response.ok) return null
 				const blob = await response.blob()
 				return await processImageBlob(blob, iconSize)
 			} catch (error) {
 				console.debug('Project icon fallback failed:', error)
-				return undefined
+				return null
 			}
 		},
 		enabled: isEnabled,
diff --git a/packages/ui/src/layouts/shared/console/composables/console-filtering.ts b/packages/ui/src/layouts/shared/console/composables/console-filtering.ts
index 5fd1bde6a..03e96e035 100644
--- a/packages/ui/src/layouts/shared/console/composables/console-filtering.ts
+++ b/packages/ui/src/layouts/shared/console/composables/console-filtering.ts
@@ -1,43 +1,162 @@
-import type { Terminal } from '@xterm/xterm'
+import type { IDecoration, Terminal } from '@xterm/xterm'
 import { ref } from 'vue'
 
 import type { LogLevel, LogLine } from '../types'
 
 export type FilterPredicate = (line: LogLine) => boolean
 
-function highlightMatches(text: string, query: string): string {
-	if (!query) return text
-	const lower = text.toLowerCase()
-	let result = ''
-	let pos = 0
-	while (pos < text.length) {
-		const idx = lower.indexOf(query, pos)
-		if (idx === -1) {
-			result += text.slice(pos)
-			break
-		}
-		result += text.slice(pos, idx)
-		result += `\x1b[1;7m${text.slice(idx, idx + query.length)}\x1b[27;22m`
-		pos = idx + query.length
-	}
-	return result
-}
-
-export function colorize(line: LogLine, searchQuery?: string): string {
-	const text = searchQuery ? highlightMatches(line.text, searchQuery) : line.text
+export function colorize(line: LogLine, _searchQuery?: string): string {
 	switch (line.level) {
 		case 'error':
-			return `\x1b[31;40m${text}\x1b[K\x1b[0m`
+			return `\x1b[31;40m${line.text}\x1b[K\x1b[0m`
 		case 'warn':
-			return `\x1b[33;40m${text}\x1b[K\x1b[0m`
+			return `\x1b[33;40m${line.text}\x1b[K\x1b[0m`
 		case 'debug':
 		case 'trace':
-			return `\x1b[90m${text}\x1b[0m`
+			return `\x1b[90m${line.text}\x1b[0m`
 		default:
-			return text
+			return line.text
 	}
 }
 
+const HIGHLIGHT_BG = '#ffd60a'
+const HIGHLIGHT_FG = '#000000'
+
+const terminalDecorations = new WeakMap<Terminal, IDecoration[]>()
+const activeQueries = new WeakMap<Terminal, string>()
+const highlightVersions = new WeakMap<Terminal, number>()
+
+function getDecorationList(terminal: Terminal): IDecoration[] {
+	let list = terminalDecorations.get(terminal)
+	if (!list) {
+		list = []
+		terminalDecorations.set(terminal, list)
+	}
+	return list
+}
+
+function bumpVersion(terminal: Terminal): number {
+	const next = (highlightVersions.get(terminal) ?? 0) + 1
+	highlightVersions.set(terminal, next)
+	return next
+}
+
+export function getHighlightVersion(terminal: Terminal): number {
+	return highlightVersions.get(terminal) ?? 0
+}
+
+export function clearSearchHighlights(terminal: Terminal) {
+	const existing = terminalDecorations.get(terminal)
+	if (existing) {
+		for (const d of existing) d.dispose()
+		existing.length = 0
+	}
+	activeQueries.delete(terminal)
+	bumpVersion(terminal)
+}
+
+function walkBackToLogicalStart(terminal: Terminal, row: number): number {
+	const buffer = terminal.buffer.active
+	let y = Math.max(0, row)
+	while (y > 0) {
+		const line = buffer.getLine(y)
+		if (!line?.isWrapped) break
+		y--
+	}
+	return y
+}
+
+function scanRange(
+	terminal: Terminal,
+	query: string,
+	startRow: number,
+	endRow: number,
+	out: IDecoration[],
+) {
+	const buffer = terminal.buffer.active
+	const cols = terminal.cols
+	const cursorAbsolute = buffer.baseY + buffer.cursorY
+	let y = startRow
+	while (y <= endRow) {
+		const head = buffer.getLine(y)
+		if (!head) break
+		const lineStart = y
+		let text = head.translateToString(false)
+		y++
+		while (y < buffer.length) {
+			const next = buffer.getLine(y)
+			if (!next?.isWrapped) break
+			text += next.translateToString(false)
+			y++
+		}
+		const lower = text.toLowerCase()
+		let pos = 0
+		while (true) {
+			const idx = lower.indexOf(query, pos)
+			if (idx === -1) break
+			let remaining = query.length
+			let rowAbs = lineStart + Math.floor(idx / cols)
+			let col = idx % cols
+			while (remaining > 0) {
+				const amount = Math.min(cols - col, remaining)
+				const marker = terminal.registerMarker(rowAbs - cursorAbsolute)
+				if (marker) {
+					const decoration = terminal.registerDecoration({
+						marker,
+						x: col,
+						width: amount,
+						layer: 'top',
+						backgroundColor: HIGHLIGHT_BG,
+						foregroundColor: HIGHLIGHT_FG,
+					})
+					if (decoration) out.push(decoration)
+				}
+				remaining -= amount
+				rowAbs++
+				col = 0
+			}
+			pos = idx + query.length
+		}
+	}
+}
+
+export function applySearchHighlights(terminal: Terminal, query: string): number {
+	const trimmed = query.trim().toLowerCase()
+	const list = getDecorationList(terminal)
+	for (const d of list) d.dispose()
+	list.length = 0
+	const version = bumpVersion(terminal)
+	if (!trimmed) {
+		activeQueries.delete(terminal)
+		return version
+	}
+	activeQueries.set(terminal, trimmed)
+	const endRow = terminal.buffer.active.length - 1
+	scanRange(terminal, trimmed, 0, endRow, list)
+	return version
+}
+
+export function highlightAppendedRange(terminal: Terminal, fromRow: number, version: number) {
+	if (getHighlightVersion(terminal) !== version) return
+	const query = activeQueries.get(terminal)
+	if (!query) return
+	const scanFrom = walkBackToLogicalStart(terminal, fromRow)
+	const list = getDecorationList(terminal)
+	const survivors: IDecoration[] = []
+	for (const d of list) {
+		if (d.marker.line >= scanFrom) {
+			d.dispose()
+		} else {
+			survivors.push(d)
+		}
+	}
+	list.length = 0
+	list.push(...survivors)
+	const endRow = terminal.buffer.active.length - 1
+	if (scanFrom > endRow) return
+	scanRange(terminal, query, scanFrom, endRow, list)
+}
+
 export type ConditionalLevel = 'debug' | 'trace'
 
 export function useConsoleFilters() {
@@ -80,18 +199,23 @@ export function rewriteTerminal(
 	searchQuery?: string,
 	callback?: () => void,
 ) {
+	clearSearchHighlights(terminal)
 	terminal.reset()
 	terminal.write('\x1b[?25l')
 
 	const filtered = predicate ? allLines.filter(predicate) : allLines
 	if (filtered.length === 0) {
+		if (searchQuery) applySearchHighlights(terminal, searchQuery)
 		callback?.()
 		return
 	}
 
 	terminal.write('\x1b[?2026h')
-	terminal.write(filtered.map((line) => colorize(line, searchQuery)).join('\r\n'), () => {
+	terminal.write(filtered.map((line) => colorize(line)).join('\r\n'), () => {
 		terminal.write('\x1b[?2026l')
+		if (searchQuery) {
+			applySearchHighlights(terminal, searchQuery)
+		}
 		callback?.()
 	})
 }
diff --git a/packages/ui/src/layouts/shared/console/composables/index.ts b/packages/ui/src/layouts/shared/console/composables/index.ts
index e0557821a..71931b7e7 100644
--- a/packages/ui/src/layouts/shared/console/composables/index.ts
+++ b/packages/ui/src/layouts/shared/console/composables/index.ts
@@ -1,7 +1,11 @@
 export {
+	applySearchHighlights,
+	clearSearchHighlights,
 	colorize,
 	type ConditionalLevel,
 	type FilterPredicate,
+	getHighlightVersion,
+	highlightAppendedRange,
 	rewriteTerminal,
 	useConsoleFilters,
 } from './console-filtering'
diff --git a/packages/ui/src/layouts/shared/console/layout.vue b/packages/ui/src/layouts/shared/console/layout.vue
index 2af042a23..c27dd6029 100644
--- a/packages/ui/src/layouts/shared/console/layout.vue
+++ b/packages/ui/src/layouts/shared/console/layout.vue
@@ -111,7 +111,14 @@ import { injectNotificationManager } from '#ui/providers/web-notifications.ts'
 
 import ConsoleActionButtons from './components/ConsoleActionButtons.vue'
 import ConsoleFilterPills from './components/ConsoleFilterPills.vue'
-import { colorize, rewriteTerminal, useConsoleFilters } from './composables'
+import {
+	clearSearchHighlights,
+	colorize,
+	getHighlightVersion,
+	highlightAppendedRange,
+	rewriteTerminal,
+	useConsoleFilters,
+} from './composables'
 import type { ConditionalLevel } from './composables/console-filtering'
 import { injectConsoleManager } from './providers'
 import type { LogLevel, LogLine } from './types'
@@ -279,18 +286,21 @@ watch(ctx.logLines, (lines, oldLines) => {
 	}
 
 	const predicate = buildCombinedPredicate()
-	const query = activeSearchQuery()
 	const newLines: string[] = []
 	for (let i = lastWrittenIndex; i < lines.length; i++) {
 		if (!predicate || predicate(lines[i])) {
-			newLines.push(colorize(lines[i], query))
+			newLines.push(colorize(lines[i]))
 		}
 	}
 	if (newLines.length > 0) {
 		const buffer = term.buffer.active
 		const onFreshLine = buffer.cursorX === 0
 		const data = onFreshLine ? newLines.join('\r\n') : '\r\n' + newLines.join('\r\n')
-		term.write(data)
+		const fromRow = buffer.baseY + buffer.cursorY
+		const version = getHighlightVersion(term)
+		term.write(data, () => {
+			highlightAppendedRange(term, fromRow, version)
+		})
 	}
 	lastWrittenIndex = lines.length
 })
@@ -307,6 +317,8 @@ function handleCommand(cmd: string) {
 }
 
 function handleClear() {
+	const term = terminalRef.value?.terminal
+	if (term) clearSearchHighlights(term)
 	terminalRef.value?.reset()
 	lastWrittenIndex = 0
 	ctx.onClear?.()
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue b/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
index d27f8aece..8cdecd6a3 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
@@ -31,7 +31,12 @@
 					</span>
 				</div>
 				<span class="stat-drop-shadow text-4xl font-bold text-contrast">
-					{{ metric.value }}
+					{{ metric.value
+					}}<span
+						v-if="metric.secondary"
+						class="ml-1 text-sm font-normal stat-drop-shadow text-secondary"
+						>{{ metric.secondary }}</span
+					>
 				</span>
 				<!-- <div
 					class="absolute -left-8 -top-4 -z-10 h-28 w-56 rounded-full bg-surface-3 opacity-50 blur-lg"
@@ -88,6 +93,13 @@ const isRamAsBytesForcedByFeatureFlag = computed(
 	() => featureFlags?.serverRamAsBytesAlwaysOn?.value ?? false,
 )
 
+const showRamAsBytes = computed(
+	() =>
+		props.showMemoryAsBytes ||
+		isRamAsBytesForcedByFeatureFlag.value ||
+		userPreferences.value.ramAsNumber,
+)
+
 const stats = shallowRef(
 	props.data?.current || {
 		cpu_percent: 0,
@@ -174,6 +186,7 @@ const metrics = computed(() => {
 	const storageMetric = {
 		title: 'Storage',
 		value: props.loading ? '0 B' : formatBytes(stats.value.storage_usage_bytes ?? 0),
+		secondary: null as string | null,
 		icon: FolderOpenIcon,
 		showGraph: false,
 		chartOptions: null as ReturnType<typeof buildChartOptions> | null,
@@ -186,6 +199,7 @@ const metrics = computed(() => {
 			{
 				title: 'CPU',
 				value: '0.00%',
+				secondary: null as string | null,
 				icon: CpuIcon,
 				showGraph: true,
 				chartOptions: cpuChartOptions.value,
@@ -195,6 +209,7 @@ const metrics = computed(() => {
 			{
 				title: 'Memory',
 				value: '0.00%',
+				secondary: null as string | null,
 				icon: DatabaseIcon,
 				showGraph: true,
 				chartOptions: ramChartOptions.value,
@@ -209,6 +224,7 @@ const metrics = computed(() => {
 		{
 			title: 'CPU',
 			value: `${cpuPercent.value.toFixed(2)}%`,
+			secondary: null as string | null,
 			icon: CpuIcon,
 			showGraph: true,
 			chartOptions: cpuChartOptions.value,
@@ -217,12 +233,12 @@ const metrics = computed(() => {
 		},
 		{
 			title: 'Memory',
-			value:
-				props.showMemoryAsBytes ||
-				isRamAsBytesForcedByFeatureFlag.value ||
-				userPreferences.value.ramAsNumber
-					? formatBytes(stats.value.ram_usage_bytes ?? 0)
-					: `${ramPercent.value.toFixed(2)}%`,
+			value: showRamAsBytes.value
+				? formatBytes(stats.value.ram_usage_bytes ?? 0)
+				: `${ramPercent.value.toFixed(2)}%`,
+			secondary: showRamAsBytes.value
+				? `/ ${formatBytes(stats.value.ram_total_bytes ?? 0)}`
+				: (null as string | null),
 			icon: DatabaseIcon,
 			showGraph: true,
 			chartOptions: ramChartOptions.value,
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
index 23ecfaedf..4bb18bdf8 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
@@ -107,7 +107,7 @@
 	<div
 		v-else-if="serverData"
 		data-pyro-server-manager-root
-		class="experimental-styles-within relative mx-auto pb-12 box-border flex min-h-[calc(100svh-100px)] w-full min-w-0 flex-col gap-4 px-6 transition-all duration-300"
+		class="experimental-styles-within relative mx-auto pb-6 box-border flex min-h-[calc(100svh-100px)] w-full min-w-0 flex-col gap-4 px-6 transition-all duration-300"
 		:style="{
 			'--server-bg-image': serverImage
 				? `url(${serverImage})`
@@ -1493,7 +1493,11 @@ onMounted(() => {
 		})
 	}
 
-	if (props.authUser && props.fetchIntercomToken) {
+	let intercomInitialized = false
+	const tryInitIntercom = () => {
+		if (intercomInitialized) return
+		if (!props.authUser || !props.fetchIntercomToken) return
+		intercomInitialized = true
 		props
 			.fetchIntercomToken()
 			.then(({ token }) => {
@@ -1504,9 +1508,20 @@ onMounted(() => {
 				})
 			})
 			.catch((error) => {
+				intercomInitialized = false
 				console.warn('[PYROSERVERS][INTERCOM] failed to initialize secure support chat', error)
 			})
 	}
+	tryInitIntercom()
+	const stopIntercomWatch = watch(
+		() => props.authUser,
+		(user) => {
+			if (user) {
+				tryInitIntercom()
+				stopIntercomWatch()
+			}
+		},
+	)
 
 	DOMPurify.addHook(
 		'afterSanitizeAttributes',