diff --git a/apps/desktop/src/lib/trpc/routers/device.ts b/apps/desktop/src/lib/trpc/routers/device.ts
new file mode 100644
index 00000000000..d44be13f707
--- /dev/null
+++ b/apps/desktop/src/lib/trpc/routers/device.ts
@@ -0,0 +1,10 @@
+import { getHostId } from "@superset/shared/host-info";
+import { publicProcedure, router } from "..";
+
+export const createDeviceRouter = () => {
+	return router({
+		getMachineId: publicProcedure.query((): { machineId: string } => {
+			return { machineId: getHostId() };
+		}),
+	});
+};
diff --git a/apps/desktop/src/lib/trpc/routers/index.ts b/apps/desktop/src/lib/trpc/routers/index.ts
index d66c6b82385..485db2acd35 100644
--- a/apps/desktop/src/lib/trpc/routers/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/index.ts
@@ -18,6 +18,7 @@ import { createChatRuntimeServiceRouter } from "./chat-runtime-service";
 import { createChatServiceRouter } from "./chat-service";
 import { createConfigRouter } from "./config";
 import { createDatabasesRouter } from "./databases";
+import { createDeviceRouter } from "./device";
 import { createDiagnosticsRouter } from "./diagnostics";
 import { createDockerRouter } from "./docker";
 import { createExtensionsRouter } from "./extensions";
@@ -82,6 +83,7 @@ export const createAppRouter = (
 		settings: createSettingsRouter(),
 		config: createConfigRouter(),
 		databases: createDatabasesRouter(),
+		device: createDeviceRouter(),
 		diagnostics: createDiagnosticsRouter(),
 		docker: createDockerRouter(),
 		uiState: createUiStateRouter(),
diff --git a/apps/desktop/src/renderer/hooks/useIsV2CloudEnabled.ts b/apps/desktop/src/renderer/hooks/useIsV2CloudEnabled.ts
index a951d5d7e5e..19742f6c014 100644
--- a/apps/desktop/src/renderer/hooks/useIsV2CloudEnabled.ts
+++ b/apps/desktop/src/renderer/hooks/useIsV2CloudEnabled.ts
@@ -2,6 +2,8 @@ import { FEATURE_FLAGS } from "@superset/shared/constants";
 import { useFeatureFlagEnabled } from "posthog-js/react";
 import { useV2LocalOverrideStore } from "renderer/stores/v2-local-override";
 
+const IS_DEV = process.env.NODE_ENV === "development";
+
 /**
  * Returns effective v2 state: remote PostHog flag AND local opt-in.
  * Also returns the raw remote flag so the toggle can be shown conditionally.
@@ -11,6 +13,13 @@ export function useIsV2CloudEnabled() {
 		useFeatureFlagEnabled(FEATURE_FLAGS.V2_CLOUD) ?? false;
 	const optInV2 = useV2LocalOverrideStore((s) => s.optInV2);
 
+	if (IS_DEV) {
+		return {
+			isV2CloudEnabled: true,
+			isRemoteV2Enabled: true,
+		};
+	}
+
 	return {
 		/** The effective value — use this wherever you previously checked the flag directly. */
 		isV2CloudEnabled: remoteV2Enabled && optInV2,
diff --git a/apps/desktop/src/renderer/lib/host-service-client.ts b/apps/desktop/src/renderer/lib/host-service-client.ts
index f4e12cb57cd..737b79c4032 100644
--- a/apps/desktop/src/renderer/lib/host-service-client.ts
+++ b/apps/desktop/src/renderer/lib/host-service-client.ts
@@ -1,5 +1,5 @@
 import type { AppRouter } from "@superset/host-service";
-import { createTRPCClient, httpBatchLink } from "@trpc/client";
+import { createTRPCClient, httpLink } from "@trpc/client";
 import superjson from "superjson";
 import { getHostServiceHeaders } from "./host-service-auth";
 
@@ -20,7 +20,7 @@ export function getHostServiceClientByUrl(hostUrl: string): HostServiceClient {
 
 	const client = createTRPCClient<AppRouter>({
 		links: [
-			httpBatchLink({
+			httpLink({
 				url: `${hostUrl}/trpc`,
 				transformer: superjson,
 				headers: () => getHostServiceHeaders(hostUrl),
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx
index d918461f319..df88826a400 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx
@@ -1,5 +1,6 @@
 import { COMPANY } from "@superset/shared/constants";
 import { Avatar } from "@superset/ui/atoms/Avatar";
+import { Badge } from "@superset/ui/badge";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -27,6 +28,7 @@ import {
 } from "react-icons/hi2";
 import { IoBugOutline } from "react-icons/io5";
 import { LuKeyboard } from "react-icons/lu";
+import { useCurrentPlan } from "renderer/hooks/useCurrentPlan";
 import { useHotkeyDisplay } from "renderer/hotkeys";
 import { authClient } from "renderer/lib/auth-client";
 import { electronTrpc } from "renderer/lib/electron-trpc";
@@ -69,6 +71,18 @@ export function OrganizationDropdown({
 	const userName = session?.user?.name;
 	const displayName = activeOrganization?.name ?? userName ?? "Organization";
 
+	const currentPlan = useCurrentPlan();
+	const isPaid = currentPlan !== "free";
+	const planLabel = currentPlan.charAt(0).toUpperCase() + currentPlan.slice(1);
+	const planBadge = isPaid ? (
+		<Badge
+			variant="default"
+			className="px-1 py-0 text-[9px] leading-none uppercase tracking-wide h-3.5"
+		>
+			{planLabel}
+		</Badge>
+	) : null;
+
 	const triggerButton =
 		variant === "collapsed" ? (
 			<button
@@ -96,6 +110,7 @@ export function OrganizationDropdown({
 					className="rounded size-4 shrink-0"
 				/>
 				<span className="truncate">{displayName}</span>
+				{planBadge}
 				<HiChevronUpDown className="h-3.5 w-3.5 text-muted-foreground shrink-0" />
 			</button>
 		) : (
@@ -113,6 +128,7 @@ export function OrganizationDropdown({
 				<span className="text-xs font-medium truncate max-w-32">
 					{displayName}
 				</span>
+				{planBadge}
 				<HiChevronUpDown className="h-3.5 w-3.5 text-muted-foreground shrink-0" />
 			</button>
 		);
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/SessionSelector.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/SessionSelector.tsx
index eeccd16f790..cbccee3a151 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/SessionSelector.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/SessionSelector.tsx
@@ -116,7 +116,7 @@ export function SessionSelector({
 				<button
 					type="button"
 					title={currentTitle}
-					className="flex min-w-0 flex-1 items-center gap-1 rounded px-1.5 py-0.5 text-xs font-medium text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+					className="flex w-full min-w-0 flex-1 items-center gap-1 rounded px-1.5 py-0.5 text-xs font-medium text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
 				>
 					<HiMiniChevronDown className="size-3 shrink-0" />
 					<span className="min-w-0 flex-1 truncate text-left">
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/ChatPaneInterface.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/ChatPaneInterface.tsx
index e3d3ee846e0..e068cdd226b 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/ChatPaneInterface.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/ChatPaneInterface.tsx
@@ -981,7 +981,7 @@ export function ChatPaneInterface({
 
 	return (
 		<PromptInputProvider initialInput={initialLaunchConfig?.draftInput}>
-			<div className="flex h-full flex-col bg-background">
+			<div className="flex h-full w-full flex-col bg-background">
 				<ChatMessageList
 					messages={visibleMessages}
 					isFocused={isFocused}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx
index 7f1fa455d74..dd5cc3c497c 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx
@@ -44,7 +44,7 @@ export function DiffFileHeader({
 	const viewedId = useId();
 
 	return (
-		<div className="@container/diff-file-header flex min-w-0 flex-wrap items-center justify-between gap-1 px-2 py-1.5">
+		<div className="@container/diff-file-header flex min-w-0 flex-wrap items-center gap-1 px-2 py-1.5">
 			<button
 				type="button"
 				onClick={onToggleCollapsed}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilePane/registry/views/MarkdownPreviewView/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilePane/registry/views/MarkdownPreviewView/index.ts
index a9d4bf9f087..b5c4d105412 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilePane/registry/views/MarkdownPreviewView/index.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilePane/registry/views/MarkdownPreviewView/index.ts
@@ -6,7 +6,7 @@ export const markdownPreviewView: FileView = {
 	id: "markdown-preview",
 	label: "Preview",
 	match: (filePath) => isMarkdownFile(filePath),
-	priority: "option",
+	priority: "default",
 	documentKind: "text",
 	Renderer: MarkdownPreviewView,
 };
diff --git a/apps/desktop/src/renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider.tsx b/apps/desktop/src/renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider.tsx
index 56a9f45dcc7..5ef6fdfd5cc 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider.tsx
@@ -14,7 +14,7 @@ import { MOCK_ORG_ID } from "shared/constants";
 import { useCollections } from "../CollectionsProvider";
 
 interface LocalHostServiceContextValue {
-	machineId: string | null;
+	machineId: string;
 	activeHostUrl: string | null;
 }
 
@@ -51,15 +51,23 @@ export function LocalHostServiceProvider({
 		}
 	}, [organizationIds, startHostService]);
 
+	const { data: machineIdData } = electronTrpc.device.getMachineId.useQuery(
+		undefined,
+		{ staleTime: Number.POSITIVE_INFINITY },
+	);
+
 	const { data: activeConnection } =
 		electronTrpc.hostServiceCoordinator.getConnection.useQuery(
 			{ organizationId: activeOrganizationId as string },
 			{ enabled: !!activeOrganizationId, refetchInterval: 5_000 },
 		);
 
-	const value = useMemo(() => {
+	const value = useMemo<LocalHostServiceContextValue | null>(() => {
+		if (!machineIdData) return null;
+		const machineId = machineIdData.machineId;
+
 		if (!activeConnection?.port) {
-			return { machineId: null, activeHostUrl: null };
+			return { machineId, activeHostUrl: null };
 		}
 
 		const activeHostUrl = `http://127.0.0.1:${activeConnection.port}`;
@@ -67,11 +75,10 @@ export function LocalHostServiceProvider({
 			setHostServiceSecret(activeHostUrl, activeConnection.secret);
 		}
 
-		return {
-			machineId: activeConnection.machineId ?? null,
-			activeHostUrl,
-		};
-	}, [activeConnection]);
+		return { machineId, activeHostUrl };
+	}, [machineIdData, activeConnection]);
+
+	if (!value) return null;
 
 	return (
 		<LocalHostServiceContext.Provider value={value}>
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/billing/plans/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/billing/plans/page.tsx
index 0cd76ee3dad..7ed724627f0 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/billing/plans/page.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/billing/plans/page.tsx
@@ -1,3 +1,4 @@
+import { Badge } from "@superset/ui/badge";
 import { Button } from "@superset/ui/button";
 import { toast } from "@superset/ui/sonner";
 import { Switch } from "@superset/ui/switch";
@@ -49,7 +50,7 @@ type ComparisonValue = string | boolean | null;
 type ComparisonRow = {
 	label: string;
 	values: ComparisonValue[];
-	comingSoon?: boolean;
+	badge?: { label: string; variant: "default" | "secondary" };
 };
 
 type ComparisonSection = {
@@ -135,18 +136,22 @@ const COMPARISON_SECTIONS: ComparisonSection[] = [
 				values: [true, true, true],
 			},
 			{
-				label: "GitHub integration",
-				values: [true, true, true],
+				label: "Remote workspaces",
+				values: [null, true, true],
+				badge: { label: "Beta", variant: "default" },
 			},
 			{
-				label: "Cloud workspaces",
+				label: "Automations",
 				values: [null, true, true],
-				comingSoon: true,
 			},
 			{
 				label: "Mobile app",
 				values: [null, true, true],
-				comingSoon: true,
+				badge: { label: "Coming soon", variant: "secondary" },
+			},
+			{
+				label: "GitHub integration",
+				values: [true, true, true],
 			},
 			{
 				label: "Linear integration",
@@ -583,10 +588,13 @@ function PlansPage() {
 										<Fragment key={row.label}>
 											<div className="flex items-center gap-1.5 px-2 py-2.5 text-xs text-muted-foreground">
 												{row.label}
-												{row.comingSoon && (
-													<span className="text-[10px] text-muted-foreground/60">
-														(Coming Soon)
-													</span>
+												{row.badge && (
+													<Badge
+														variant={row.badge.variant}
+														className="px-1.5 py-0 text-[10px] font-medium"
+													>
+														{row.badge.label}
+													</Badge>
 												)}
 											</div>
 											{row.values.map((value, valueIndex) => (
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/v2-project/$projectId/components/V2ProjectSettings/components/ProjectLocationSection/ProjectLocationSection.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/v2-project/$projectId/components/V2ProjectSettings/components/ProjectLocationSection/ProjectLocationSection.tsx
index 8f0f38e2c83..8611d4ef73d 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/v2-project/$projectId/components/V2ProjectSettings/components/ProjectLocationSection/ProjectLocationSection.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/v2-project/$projectId/components/V2ProjectSettings/components/ProjectLocationSection/ProjectLocationSection.tsx
@@ -50,7 +50,7 @@ export function ProjectLocationSection({
 		(q) =>
 			q
 				.from({ hosts: collections.v2Hosts })
-				.where(({ hosts }) => eq(hosts.machineId, machineId ?? ""))
+				.where(({ hosts }) => eq(hosts.machineId, machineId))
 				.select(({ hosts }) => ({
 					name: hosts.name,
 					isOnline: hosts.isOnline,
diff --git a/apps/marketing/public/logos/runway-wordmark.svg b/apps/marketing/public/logos/runway-wordmark.svg
new file mode 100644
index 00000000000..b34f5185611
--- /dev/null
+++ b/apps/marketing/public/logos/runway-wordmark.svg
@@ -0,0 +1,8 @@
+<svg width="334" height="75" viewBox="0 0 334 75" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.8298 18.0923C20.6417 18.0923 17.3605 21.7538 17.3605 28.2583V56.3685H0.361328V1.27002H9.90621L15.8713 7.62677C18.7065 3.51405 22.9553 1.27002 28.6973 1.27002H33.8421V18.0923H26.8337H26.8298Z" fill="white"/>
+<path d="M37.9355 1.27002H54.9348V32.2232C54.9348 37.9811 58.6619 41.942 64.181 41.942C69.7001 41.942 73.3516 37.9811 73.3516 32.2232V1.27002H90.3508V56.3725H80.8059L74.9922 50.1675C71.042 54.8792 65.4473 57.6423 58.8889 57.6423C46.5128 57.6423 37.9395 48.5943 37.9395 35.3617V1.27002H37.9355Z" fill="white"/>
+<path d="M148.21 56.3722H131.211V25.6426C131.211 19.7371 127.408 15.7002 121.742 15.7002C116.075 15.7002 112.273 19.7371 112.273 25.6426V56.3722H95.2734V1.26975H104.818L110.708 7.55064C114.658 2.7671 120.324 0 127.038 0C139.565 0 148.214 9.19573 148.214 22.58V56.3722H148.21Z" fill="white"/>
+<path d="M146.349 1.27002H164.092L172.443 32.5227L182.509 1.27002H194.885L204.952 32.6705L213.302 1.27002H229.632L212.335 56.3725H197.498L187.73 26.0941L177.886 56.3725H163.945L146.349 1.27002Z" fill="white"/>
+<path d="M252.82 0C267.283 0 276.008 8.00184 276.008 21.3063V56.3722H266.391L261.398 50.9898C257.67 55.3261 252.303 57.642 245.816 57.642C234.26 57.642 226.133 50.4667 226.133 40.2967C226.133 29.4559 234.037 23.175 247.755 23.175H259.462V21.3822C259.462 16.6705 256.854 14.131 251.932 14.131C247.532 14.131 244.701 16.375 244.402 20.1124H227.777C228.745 7.92597 238.589 0 252.828 0L252.82 0ZM259.454 36.3357V33.9439H249.539C245.29 33.9439 242.829 35.8885 242.829 39.2505C242.829 42.8402 245.736 45.0084 250.582 45.0084C256.324 45.0084 259.454 42.0177 259.454 36.3357Z" fill="white"/>
+<path d="M303.894 74.6881H285.927L295.543 51.585L273.248 1.27002H293.082L304.638 31.249L315.525 1.27002H333.492L303.894 74.6881Z" fill="white"/>
+</svg>
diff --git a/apps/marketing/src/app/components/TrustedBySection/TrustedBySection.tsx b/apps/marketing/src/app/components/TrustedBySection/TrustedBySection.tsx
index c4042a94ede..1334568f7ee 100644
--- a/apps/marketing/src/app/components/TrustedBySection/TrustedBySection.tsx
+++ b/apps/marketing/src/app/components/TrustedBySection/TrustedBySection.tsx
@@ -22,10 +22,11 @@ const CLIENT_LOGOS = [
 		height: 20,
 	},
 	{
-		name: "perplexity",
-		label: "Perplexity",
-		logo: "/logos/perplexity-wordmark.svg",
-		height: 28,
+		name: "runway",
+		label: "Runway",
+		logo: "/logos/runway-wordmark.svg",
+		height: 18,
+		invert: false,
 	},
 	{
 		name: "salesforce",
diff --git a/apps/marketing/src/app/pricing/components/ComparisonTable/ComparisonTable.tsx b/apps/marketing/src/app/pricing/components/ComparisonTable/ComparisonTable.tsx
index d1583e79c29..74bc5e99675 100644
--- a/apps/marketing/src/app/pricing/components/ComparisonTable/ComparisonTable.tsx
+++ b/apps/marketing/src/app/pricing/components/ComparisonTable/ComparisonTable.tsx
@@ -88,7 +88,7 @@ function DesktopRow({ row }: { row: ComparisonRow }) {
 			<td className="py-4 pr-4 text-sm text-foreground">
 				<div className="flex items-center gap-2">
 					<span>{row.label}</span>
-					{row.comingSoon && <ComingSoonBadge />}
+					{row.badge && <RowBadge badge={row.badge} />}
 				</div>
 			</td>
 			{row.values.map((value, index) => (
@@ -143,7 +143,7 @@ function MobileTable() {
 								>
 									<div className="flex items-center gap-2 text-sm text-foreground">
 										<span>{row.label}</span>
-										{row.comingSoon && <ComingSoonBadge />}
+										{row.badge && <RowBadge badge={row.badge} />}
 									</div>
 									<div className="shrink-0 text-sm text-foreground">
 										<Cell value={row.values[selectedIndex] ?? null} />
@@ -173,14 +173,18 @@ function Cell({ value }: { value: ComparisonRow["values"][number] }) {
 	return <span>{value}</span>;
 }
 
-function ComingSoonBadge() {
+function RowBadge({ badge }: { badge: NonNullable<ComparisonRow["badge"]> }) {
+	const isPrimary = badge.variant === "default";
 	return (
 		<span
 			className={cn(
-				"rounded-sm bg-accent/40 px-2 py-0.5 text-[10px] font-medium uppercase tracking-wide text-muted-foreground",
+				"rounded-sm px-2 py-0.5 text-[10px] font-medium uppercase tracking-wide",
+				isPrimary
+					? "bg-foreground text-background"
+					: "bg-accent/40 text-muted-foreground",
 			)}
 		>
-			Coming soon
+			{badge.label}
 		</span>
 	);
 }
diff --git a/apps/marketing/src/app/pricing/constants.ts b/apps/marketing/src/app/pricing/constants.ts
index 8c49a84abfb..4c0a4f9cbf6 100644
--- a/apps/marketing/src/app/pricing/constants.ts
+++ b/apps/marketing/src/app/pricing/constants.ts
@@ -109,7 +109,7 @@ export interface ComparisonRow {
 		string | boolean | null,
 		string | boolean | null,
 	];
-	comingSoon?: boolean;
+	badge?: { label: string; variant: "default" | "secondary" };
 }
 
 export interface ComparisonSection {
@@ -134,22 +134,18 @@ export const COMPARISON_SECTIONS: ComparisonSection[] = [
 		rows: [
 			{ label: "Desktop app", values: [true, true, true] },
 			{ label: "Local workspaces", values: [true, true, true] },
-			{ label: "GitHub integration", values: [true, true, true] },
-			{
-				label: "CLI",
-				values: [true, true, true],
-				comingSoon: true,
-			},
 			{
 				label: "Remote workspaces",
 				values: [null, true, true],
-				comingSoon: true,
+				badge: { label: "Beta", variant: "default" },
 			},
+			{ label: "Automations", values: [null, true, true] },
 			{
-				label: "Mobile",
+				label: "Mobile app",
 				values: [null, true, true],
-				comingSoon: true,
+				badge: { label: "Coming soon", variant: "secondary" },
 			},
+			{ label: "GitHub integration", values: [true, true, true] },
 			{ label: "Linear integration", values: [null, true, true] },
 			{ label: "Slack integration", values: [null, true, true] },
 			{ label: "Team collaboration", values: [null, true, true] },
diff --git a/apps/web/src/app/(agents)/components/AgentsHeader/AgentsHeader.tsx b/apps/web/src/app/(agents)/components/AgentsHeader/AgentsHeader.tsx
index 62f852b53c2..243db056bb1 100644
--- a/apps/web/src/app/(agents)/components/AgentsHeader/AgentsHeader.tsx
+++ b/apps/web/src/app/(agents)/components/AgentsHeader/AgentsHeader.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { authClient } from "@superset/auth/client";
+import { isPaidPlan } from "@superset/shared/billing";
 import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { Badge } from "@superset/ui/badge";
 import { Drawer, DrawerContent, DrawerTitle } from "@superset/ui/drawer";
 import {
 	DropdownMenu,
@@ -44,6 +46,14 @@ export function AgentsHeader() {
 		trpc.user.myOrganizations.queryOptions(),
 	);
 
+	const { data: activePlan } = useQuery(trpc.billing.activePlan.queryOptions());
+
+	const isPro = isPaidPlan(activePlan?.plan);
+	const planLabel =
+		isPro && activePlan?.plan
+			? activePlan.plan.charAt(0).toUpperCase() + activePlan.plan.slice(1)
+			: null;
+
 	const user = session?.user;
 	const activeOrganizationId = session?.session?.activeOrganizationId;
 	const activeOrganization = organizations?.find(
@@ -191,7 +201,14 @@ export function AgentsHeader() {
 					<DrawerTitle className="sr-only">Account menu</DrawerTitle>
 					<div className="flex flex-col gap-1 p-3 pb-[max(1rem,env(safe-area-inset-bottom))]">
 						<div className="flex flex-col space-y-1 px-2 py-1.5">
-							<p className="text-sm font-medium">{user?.name}</p>
+							<div className="flex items-center gap-2">
+								<p className="text-sm font-medium">{user?.name}</p>
+								{isPro && (
+									<Badge variant="default" className="px-1.5 py-0 text-[10px]">
+										{planLabel}
+									</Badge>
+								)}
+							</div>
 							<p className="text-xs text-muted-foreground">{user?.email}</p>
 						</div>
 						<div className="my-1 h-px bg-border" />
@@ -251,7 +268,14 @@ export function AgentsHeader() {
 			<DropdownMenuContent align="end" className="min-w-56">
 				<DropdownMenuLabel>
 					<div className="flex flex-col space-y-1">
-						<p className="text-sm font-medium">{user?.name}</p>
+						<div className="flex items-center gap-2">
+							<p className="text-sm font-medium">{user?.name}</p>
+							{isPro && (
+								<Badge variant="default" className="px-1.5 py-0 text-[10px]">
+									{planLabel}
+								</Badge>
+							)}
+						</div>
 						<p className="text-xs text-muted-foreground">{user?.email}</p>
 					</div>
 				</DropdownMenuLabel>
diff --git a/packages/host-service/src/terminal/terminal.ts b/packages/host-service/src/terminal/terminal.ts
index cf44c550440..61681ddb408 100644
--- a/packages/host-service/src/terminal/terminal.ts
+++ b/packages/host-service/src/terminal/terminal.ts
@@ -12,7 +12,7 @@ import {
 	scanForTerminalTitle,
 	type TerminalTitleScanState,
 } from "@superset/shared/terminal-title-scanner";
-import { and, eq } from "drizzle-orm";
+import { and, eq, ne } from "drizzle-orm";
 import type { Hono } from "hono";
 import { type IPty, spawn } from "node-pty";
 import type { HostDb } from "../db";
@@ -307,7 +307,7 @@ export function disposeSessionsByWorkspaceId(
 		.where(
 			and(
 				eq(terminalSessions.originWorkspaceId, workspaceId),
-				eq(terminalSessions.status, "active"),
+				ne(terminalSessions.status, "disposed"),
 			),
 		)
 		.all();
diff --git a/packages/host-service/src/tunnel/tunnel-client.ts b/packages/host-service/src/tunnel/tunnel-client.ts
index 87c3d313609..42d0e46771e 100644
--- a/packages/host-service/src/tunnel/tunnel-client.ts
+++ b/packages/host-service/src/tunnel/tunnel-client.ts
@@ -41,43 +41,52 @@ export class TunnelClient {
 	async connect(): Promise<void> {
 		if (this.closed) return;
 
-		const token = await this.getAuthToken();
-		if (!token) {
-			console.warn("[host-service:tunnel] no auth token available, retrying");
-			this.scheduleReconnect();
-			return;
-		}
-
-		const url = new URL("/tunnel", this.relayUrl);
-		url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
-		url.searchParams.set("hostId", this.hostId);
-		url.searchParams.set("token", token);
-
-		const socket = new WebSocket(url.toString());
-		this.socket = socket;
-
-		socket.onopen = () => {
-			this.reconnectAttempts = 0;
-			console.log(
-				`[host-service:tunnel] connected to relay for host ${this.hostId}`,
-			);
-		};
-
-		socket.onmessage = (event) => {
-			void this.handleMessage(event.data);
-		};
-
-		socket.onclose = () => {
-			this.socket = null;
-			this.cleanupChannels();
-			if (!this.closed) {
+		// An unhandled rejection here (e.g. DNS failure inside getAuthToken on
+		// wake from sleep) crashes host-service and orphans every PTY.
+		try {
+			const token = await this.getAuthToken();
+			if (!token) {
+				console.warn("[host-service:tunnel] no auth token available, retrying");
 				this.scheduleReconnect();
+				return;
 			}
-		};
 
-		socket.onerror = (event) => {
-			console.error("[host-service:tunnel] socket error:", event);
-		};
+			const url = new URL("/tunnel", this.relayUrl);
+			url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+			url.searchParams.set("hostId", this.hostId);
+			url.searchParams.set("token", token);
+
+			const socket = new WebSocket(url.toString());
+			this.socket = socket;
+
+			socket.onopen = () => {
+				this.reconnectAttempts = 0;
+				console.log(
+					`[host-service:tunnel] connected to relay for host ${this.hostId}`,
+				);
+			};
+
+			socket.onmessage = (event) => {
+				void this.handleMessage(event.data);
+			};
+
+			socket.onclose = () => {
+				this.socket = null;
+				this.cleanupChannels();
+				if (!this.closed) {
+					this.scheduleReconnect();
+				}
+			};
+
+			socket.onerror = (event) => {
+				console.error("[host-service:tunnel] socket error:", event);
+			};
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			console.error(`[host-service:tunnel] connect failed: ${message}`);
+			this.socket = null;
+			this.scheduleReconnect();
+		}
 	}
 
 	close(): void {
diff --git a/packages/shared/src/agent-permissions-migration.ts b/packages/shared/src/agent-permissions-migration.ts
index cda447361c9..2066603cba8 100644
--- a/packages/shared/src/agent-permissions-migration.ts
+++ b/packages/shared/src/agent-permissions-migration.ts
@@ -41,7 +41,7 @@ export const LEGACY_BUILTIN_TERMINAL_AGENT_OVERRIDES: Readonly<
 	},
 	copilot: {
 		command: "copilot --allow-all",
-		promptCommand: "copilot -i --allow-all",
+		promptCommand: "copilot --allow-all -i",
 		promptCommandSuffix: "--yolo",
 	},
 	"cursor-agent": {
diff --git a/packages/shared/src/builtin-terminal-agents.ts b/packages/shared/src/builtin-terminal-agents.ts
index b634fe09179..a06d9ede7d8 100644
--- a/packages/shared/src/builtin-terminal-agents.ts
+++ b/packages/shared/src/builtin-terminal-agents.ts
@@ -100,6 +100,8 @@ export const BUILTIN_TERMINAL_AGENTS = [
 		description:
 			"Mastra's coding agent for building, debugging, and shipping code from the terminal.",
 		command: "mastracode",
+		promptCommand: "mastracode --prompt",
+		promptCommandSuffix: "; mastracode",
 	}),
 	createBuiltinTerminalAgent({
 		id: "opencode",
@@ -131,7 +133,7 @@ export const BUILTIN_TERMINAL_AGENTS = [
 		description:
 			"GitHub's coding agent for planning, editing, and building in your repo.",
 		command: "copilot --allow-tool=write",
-		promptCommand: "copilot -i --allow-tool=write",
+		promptCommand: "copilot --allow-tool=write -i",
 		includeInDefaultTerminalPresets: true,
 	}),
 	createBuiltinTerminalAgent({
diff --git a/packages/trpc/src/router/billing/billing.ts b/packages/trpc/src/router/billing/billing.ts
index 3616f241006..664f17daf29 100644
--- a/packages/trpc/src/router/billing/billing.ts
+++ b/packages/trpc/src/router/billing/billing.ts
@@ -1,8 +1,9 @@
 import { stripeClient } from "@superset/auth/stripe";
 import { db } from "@superset/db/client";
 import { members, subscriptions } from "@superset/db/schema";
+import { ACTIVE_SUBSCRIPTION_STATUSES } from "@superset/shared/billing";
 import { TRPCError, type TRPCRouterRecord } from "@trpc/server";
-import { and, eq } from "drizzle-orm";
+import { and, desc, eq, inArray } from "drizzle-orm";
 import type Stripe from "stripe";
 import { z } from "zod";
 import { env } from "../../env";
@@ -65,6 +66,25 @@ async function requireOwnerWithCustomer(ctx: {
 }
 
 export const billingRouter = {
+	activePlan: protectedProcedure.query(async ({ ctx }) => {
+		const activeOrgId = ctx.activeOrganizationId;
+		if (!activeOrgId) return { plan: "free" as const, status: null };
+
+		const subscription = await db.query.subscriptions.findFirst({
+			where: and(
+				eq(subscriptions.referenceId, activeOrgId),
+				inArray(subscriptions.status, ACTIVE_SUBSCRIPTION_STATUSES),
+			),
+			orderBy: desc(subscriptions.createdAt),
+		});
+
+		if (!subscription) {
+			return { plan: "free" as const, status: null };
+		}
+
+		return { plan: subscription.plan, status: subscription.status };
+	}),
+
 	invoices: protectedProcedure.query(async ({ ctx }) => {
 		const activeOrgId = ctx.activeOrganizationId;
 		if (!activeOrgId) {