@vvedantb/ui 0.23.0 → 0.25.0

package/README.md

@@ -188,7 +188,7 @@ import { SidebarUpgradeCard } from "@vvedantb/ui";
 {!isPro && <SidebarUpgradeCard collapsed onUpgrade={() => setPricingOpen(true)} />}
 ```
 
-Shows the Project V mark, "Upgrade to Pro" and an "Upgrade" pill. `collapsed` renders an icon-only round button labelled "Upgrade to Pro" for narrow rails. The card does not check the plan, so the app hides it for Pro users.
+Shows the title "Upgrade to Pro" and an "Upgrade" pill, with no mark. The title fits in full at 254px. `collapsed` renders a round button with the short text "Pro", labelled "Upgrade to Pro" for narrow rails. The card does not check the plan, so the app hides it for Pro users.
 
 ## Sessions hover card
 
@@ -876,18 +876,39 @@ links under a separator.
 | `legalLinks` | `{ href, label }[]`, open in a new tab. |
 | `variant` | `"muted"` (default, `text-muted`), `"muted-foreground"`, or `"touch"` (`text-muted-foreground`, `max-sm:hit-target` links, safe-area bottom padding). |
 
-### `AppMark`
+### `Icon*` app icons
 
+Tabler-style plain app glyphs: `IconVibot`, `IconVhub`, `IconVmem`, `IconVerve`,
+`IconVelth` and `IconProjectV`. No background. Each sits on an equalised square viewBox, so all apps look the same size. `APP_ICONS[app]`
+looks one up by `AppName`.
+
+```tsx
+import { IconVerve } from "@vvedantb/ui"
+
+<IconVerve size={24} color="currentColor" />
+```
+
+`size` sets both width and height (default 24; a string is any CSS length). `color`
+defaults to `currentColor`. `stroke` sets the stroke width in pixels for stroke
+glyphs (fill glyphs ignore it). `title` gives an accessible name. The ref goes
+to the `<svg>`.
+
+### `AppMark` (deprecated)
+
+Deprecated in favour of the `Icon*` components for plain marks. Tiles stay here.
 Family app icons: `app` (`projectv`, `vibot`, `vhub`, `vmem`, `verve`, `velth`),
 `variant`, `size`, `title`.
 
-- `variant="mark"` (default) is the plain logo in `currentColor`. It is cropped
-  tight to the glyph (stroke marks include half the stroke width) with no
-  padding. `size` is the rendered height; the width follows the glyph's aspect
-  ratio, so it sits level with a wordmark. A string `size` (for example `"2rem"`)
-  sets both width and height to that value. `APP_MARK_VIEWBOX` holds the tight
-  viewBox per app; `appMarkSvg()` and `APP_MARK_SVG` use it.
-- `variant="tile"` and `"tile-light"` keep the equalised, padded 1024 grid on a
+- `variant="mark"` (default) is the plain logo in `currentColor`. It sits
+  on a square viewBox. The five apps (`vibot`, `vhub`, `vmem`, `verve`, `velth`) share one
+  crop (`APP_MARK_CROP_VIEWBOX`, `173 197 629 629`): the union of their glyph boxes on the
+  1024 tile grid, centred, with about 4% padding, so relative glyph sizes match the tiles and
+  the widest glyph fills about 92% of the icon box. `projectv` is a brand mark, so it has its
+  own tight square (`PROJECTV_MARK_VIEWBOX`, `172 181 687 687`). `size` sets both width and
+  height; a string `size` (for example `"2rem"`) is any CSS length. `APP_MARK_VIEWBOX` holds the
+  viewBox for each app; `appMarkSvg()` and `APP_MARK_SVG` use it. `markAspect` returns
+  1 and is kept for API stability only.
+- `variant="tile"` and `"tile-light"` use the same 1024 grid on a
   rounded tile, always square. `appTileSvg`, `appAdaptiveSvg`, `appExtension128Svg`,
   `APP_TILE_SVG`, `APP_TILE_LIGHT_SVG` and favicons are unchanged.
 
@@ -906,7 +927,7 @@ default) and `renderCheckout`.
 
 #### Multi-plan (0.22.0)
 
-Header: `apps` (an `AppName[]`, shown as plain `AppMark` logos, no tile, at the top left),
+Header: `apps` (an `AppName[]`, shown as plain `Icon*` logos at the top left; each links to the app's site in a new tab and shows its display name in a tooltip, from `FAMILY_APPS`),
 `headline` (centre), a Monthly / Annual switch and a close button (top right).
 Then one card per entry of `plans` (2 to 4 fit) and one `finePrint` line. Cards
 stack on narrow screens.
@@ -919,6 +940,10 @@ price is the per-month price). `ctaLabel` defaults to "Get started". `featured`
 (or `highlighted`) adds a subtle ring. A `current` plan shows a disabled,
 outlined "Current plan" button and does not call `renderCheckout`.
 
+`appBenefits` (`{ app, items }[]`, type `PricingPlanAppBenefit`) groups benefits per app, each under a small heading with that app's icon and display name. It renders after `benefits` and scrolls inside the card when long. Set `currentApp` on the modal to put that app's group first; the other groups keep the array order. The `featured` / `highlighted` plan uses `V_PRO_APP_BENEFITS` (the approved V Pro copy, in the order vibot, vmem, vhub, velth, verve) when it omits `appBenefits`, so apps usually pass only `currentApp`. Other plans show app benefits only when set.
+
+`FAMILY_APPS` (and `familyApp(app)`), exported from the root and `@vvedantb/ui/brand`, is the single list of app display names and sites (`vibot`, `Verve`, `Velth`, `vmem`, `vhub`, `Project V`; URLs without a trailing slash). App names live only under `src/brand/`.
+
 The `featured` plan's button is a solid primary button (`Button` `variant="default"`). Other plans use `secondary`.
 
 `renderCheckout(button, plan, period)` wraps each plan's button.
@@ -941,14 +966,6 @@ Each app passes its own plan names, prices and copy. The example and the screens
       price: { month: "$15", year: "$10" },
       featured: true,
       intro: "Everything in Free, and:",
-      highlight: { title: "Shared", description: "usage across every V app" },
-      benefits: [
-        { label: "Higher limits", icon: "vibot" },
-        { label: "Pro features", icon: "verve" },
-        { label: "Pro features", icon: "velth" },
-        { label: "More memory", icon: "vmem" },
-        { label: "More storage", icon: "vhub" },
-      ],
     },
   ]}
   renderCheckout={(button, plan, period) => (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vvedantb/ui",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "license": "MIT",
   "description": "Shared React 19 UI for web apps: one JavaScript entry (primitives, shell pieces, app helpers including the Convex and Clerk provider, VITE env parsing and ensure-user, artifact viewers over the @vvedantb/server artifacts core, native tokens), design-token CSS, shared Tailwind v4 CSS and a Tailwind preset.",
   "type": "module",

package/shell/src/SidebarUpgradeCard.tsx

@@ -1,11 +1,10 @@
-import { AppMark } from "../../src/brand/AppMark";
 import { Button } from "../../src/ui/button";
 import { cn } from "../../src/utils/cn";
 
 export type SidebarUpgradeCardProps = {
   /** Opens the app's `PricingModal`. */
   onUpgrade: () => void;
-  /** Narrow rail: an icon-only "Upgrade to Pro" button instead of the full card. Default `false`. */
+  /** Narrow rail: a round "Pro" button (labelled "Upgrade to Pro") instead of the full card. Default `false`. */
   collapsed?: boolean;
   className?: string;
 };
@@ -13,22 +12,21 @@ export type SidebarUpgradeCardProps = {
 const pillClass = "bg-foreground text-background hover:bg-foreground/85";
 
 /**
- * Upgrade prompt for the sidebar: Project V mark, "Upgrade to Pro" and an "Upgrade" pill. It does not check
- * the plan; the app hides it when the user is already on Pro. The mark uses a numeric `size` (its height) so
- * the width follows the aspect ratio.
+ * Upgrade prompt for the sidebar: the title "Upgrade to Pro" and an "Upgrade" pill, with no mark. It does
+ * not check the plan; the app hides it when the user is already on Pro.
  */
 export function SidebarUpgradeCard({ onUpgrade, collapsed = false, className }: SidebarUpgradeCardProps) {
   if (collapsed) {
     return (
       <Button
         type="button"
-        size="icon"
+        size="sm"
         aria-label="Upgrade to Pro"
         title="Upgrade to Pro"
         onClick={onUpgrade}
-        className={cn("rounded-full", pillClass, className)}
+        className={cn("rounded-full px-3", pillClass, className)}
       >
-        <AppMark app="projectv" size={16} />
+        Pro
       </Button>
     );
   }
@@ -40,10 +38,7 @@ export function SidebarUpgradeCard({ onUpgrade, collapsed = false, className }:
         className,
       )}
     >
-      <div className="flex min-w-0 items-center gap-2 text-sm font-semibold">
-        <AppMark app="projectv" size={14} className="shrink-0" />
-        <span className="truncate">Upgrade to Pro</span>
-      </div>
+      <span className="min-w-0 truncate text-sm font-semibold">Upgrade to Pro</span>
       <Button type="button" size="sm" onClick={onUpgrade} className={cn("shrink-0 rounded-full", pillClass)}>
         Upgrade
       </Button>

package/src/brand/AppIcons.tsx

@@ -0,0 +1,71 @@
+import { forwardRef, useId, type ForwardRefExoticComponent, type RefAttributes, type SVGProps } from "react";
+import { APP_MARKS, APP_MARK_VIEWBOX, APP_NAMES, markLinecap, markStrokeWidth, type AppName } from "./svg";
+
+export type AppIconProps = Omit<SVGProps<SVGSVGElement>, "children" | "height" | "width" | "viewBox" | "stroke" | "color"> & {
+  /** Rendered width and height (the glyph is square). Default 24. A number is in pixels; a string is any CSS length. */
+  size?: number | string;
+  /** Glyph colour, for fill and stroke glyphs. Default `"currentColor"`. */
+  color?: string;
+  /** Stroke width in rendered pixels, for stroke glyphs (Tabler style, for example `1.5`). Default: the glyph's own weight. Fill glyphs ignore it. */
+  stroke?: number | string;
+  /** Accessible name. Without it the icon is `aria-hidden`. */
+  title?: string;
+};
+
+export type AppIconComponent = ForwardRefExoticComponent<AppIconProps & RefAttributes<SVGSVGElement>>;
+
+function viewBoxSide(app: AppName): number {
+  return Number(APP_MARK_VIEWBOX[app].split(" ")[3]);
+}
+
+function createAppIcon(app: AppName, displayName: string): AppIconComponent {
+  const Icon = forwardRef<SVGSVGElement, AppIconProps>(function Icon(
+    { size = 24, color = "currentColor", stroke, title, ...rest },
+    ref,
+  ) {
+    const titleId = useId();
+    const { kind, paths } = APP_MARKS[app];
+    const renderedSize = typeof size === "number" ? size : 24;
+    const strokeWidth = stroke === undefined ? markStrokeWidth(app) : Number(stroke) * (viewBoxSide(app) / renderedSize);
+    const glyphProps =
+      kind === "fill"
+        ? { fill: color }
+        : { fill: "none", stroke: color, strokeWidth, strokeLinecap: markLinecap(app), strokeLinejoin: "round" };
+    return (
+      <svg
+        {...rest}
+        ref={ref}
+        xmlns="http://www.w3.org/2000/svg"
+        width={size}
+        height={size}
+        viewBox={APP_MARK_VIEWBOX[app]}
+        preserveAspectRatio="xMidYMid meet"
+        data-app={app}
+        role={title ? "img" : undefined}
+        aria-hidden={title ? undefined : true}
+        aria-labelledby={title ? titleId : undefined}
+      >
+        {title ? <title id={titleId}>{title}</title> : null}
+        <g {...(glyphProps as SVGProps<SVGGElement>)} data-glyph={app}>
+          {paths.map((d) => (
+            <path key={d} d={d} />
+          ))}
+        </g>
+      </svg>
+    );
+  });
+  Icon.displayName = displayName;
+  return Icon;
+}
+
+const iconName = (app: AppName) => `Icon${app === "projectv" ? "ProjectV" : app[0]!.toUpperCase() + app.slice(1)}`;
+
+/** Plain app glyph components by app name, for dynamic lookup. */
+export const APP_ICONS = Object.fromEntries(APP_NAMES.map((app) => [app, createAppIcon(app, iconName(app))])) as Record<AppName, AppIconComponent>;
+
+export const IconVibot = APP_ICONS.vibot;
+export const IconVhub = APP_ICONS.vhub;
+export const IconVmem = APP_ICONS.vmem;
+export const IconVerve = APP_ICONS.verve;
+export const IconVelth = APP_ICONS.velth;
+export const IconProjectV = APP_ICONS.projectv;

package/src/brand/AppMark.tsx

@@ -1,15 +1,14 @@
 import { useId, type SVGProps } from "react";
-import { APP_MARKS, APP_MARK_VIEWBOX, MARK_VIEWBOX, TILE_RADIUS, markAspect, markLinecap, markStrokeWidth, type AppMarkVariant, type AppName } from "./svg";
+import { APP_ICONS } from "./AppIcons";
+import { APP_MARKS, MARK_VIEWBOX, TILE_RADIUS, markLinecap, markStrokeWidth, type AppMarkVariant, type AppName } from "./svg";
 
 export type AppMarkProps = Omit<SVGProps<SVGSVGElement>, "children" | "height" | "width" | "viewBox"> & {
   /** Which family app's mark to draw. */
   app: AppName;
-  /** `"mark"` (default): plain logo in `currentColor`, cropped tight to the glyph with no padding. `"tile"`: white glyph on a black rounded tile. `"tile-light"`: black glyph on a white tile. */
+  /** `"mark"` (default): plain logo in `currentColor` on an equalised square viewBox, so every app looks the same size. `"tile"`: white glyph on a black rounded tile. `"tile-light"`: black glyph on a white tile. */
   variant?: AppMarkVariant;
   /**
-   * Default 24. For `"mark"` it sets the rendered height and the width follows the glyph's aspect ratio
-   * (a number gives an exact width; a string sets both to the same value and the glyph is centred).
-   * Tiles are always square, `size` by `size`.
+   * Default 24. Sets both width and height, for marks and tiles alike (always square). A string is any CSS length.
    */
   size?: number | string;
   /** Accessible name. Without it the mark is `aria-hidden`. */
@@ -21,14 +20,19 @@ const TILE_TONES = {
   "tile-light": { bg: "#fff", fg: "#000" },
 } as const;
 
-/** One of the six family app marks. The plain mark is cropped tight; tiles use the padded 1024 grid. */
+/**
+ * One of the six family app marks. The plain mark and the tiles share the same square 1024 viewBox, so a bare glyph matches the tile glyph optically.
+ * @deprecated Use the per-app `Icon*` components (or `APP_ICONS[app]`) for plain marks. Tiles are for app and store icons only.
+ */
 export function AppMark({ app, variant = "mark", size = 24, title, ...rest }: AppMarkProps) {
   const titleId = useId();
+  if (variant === "mark") {
+    const Icon = APP_ICONS[app];
+    return <Icon {...rest} size={size} title={title} data-variant="mark" />;
+  }
   const { kind, paths } = APP_MARKS[app];
-  const isMark = variant === "mark";
-  const width = isMark && typeof size === "number" ? Math.round(size * markAspect(app) * 100) / 100 : size;
-  const tone = variant === "mark" ? undefined : TILE_TONES[variant];
-  const color = tone?.fg ?? "currentColor";
+  const tone = TILE_TONES[variant];
+  const color = tone.fg;
   const glyphProps =
     kind === "fill"
       ? { fill: color }
@@ -44,9 +48,9 @@ export function AppMark({ app, variant = "mark", size = 24, title, ...rest }: Ap
     <svg
       {...rest}
       xmlns="http://www.w3.org/2000/svg"
-      width={width}
+      width={size}
       height={size}
-      viewBox={isMark ? APP_MARK_VIEWBOX[app] : MARK_VIEWBOX}
+      viewBox={MARK_VIEWBOX}
       preserveAspectRatio="xMidYMid meet"
       data-app={app}
       data-variant={variant}
@@ -55,7 +59,7 @@ export function AppMark({ app, variant = "mark", size = 24, title, ...rest }: Ap
       aria-labelledby={title ? titleId : undefined}
     >
       {title ? <title id={titleId}>{title}</title> : null}
-      {tone ? <rect width={1024} height={1024} rx={TILE_RADIUS} fill={tone.bg} /> : null}
+      <rect width={1024} height={1024} rx={TILE_RADIUS} fill={tone.bg} />
       {glyph}
     </svg>
   );

package/src/brand/familyApps.ts

@@ -0,0 +1,24 @@
+import type { AppName } from "./svg";
+
+export type FamilyApp = {
+  app: AppName;
+  /** Display name. */
+  name: string;
+  /** Home page of the app. */
+  url: string;
+};
+
+/** Single source for family app display names and sites, in display order. */
+export const FAMILY_APPS: readonly FamilyApp[] = [
+  { app: "vibot", name: "vibot", url: "https://vibot.projectv.uk" },
+  { app: "verve", name: "Verve", url: "https://verve.projectv.uk" },
+  { app: "velth", name: "Velth", url: "https://velth.projectv.uk" },
+  { app: "vmem", name: "vmem", url: "https://vmem.projectv.uk" },
+  { app: "vhub", name: "vhub", url: "https://vhub.projectv.uk" },
+  { app: "projectv", name: "Project V", url: "https://projectv.uk" },
+];
+
+/** Entry of `FAMILY_APPS` for an app. */
+export function familyApp(app: AppName): FamilyApp {
+  return FAMILY_APPS.find((entry) => entry.app === app)!;
+}

package/src/brand/index.ts

@@ -1,8 +1,11 @@
+export * from "./AppIcons";
 export { AppMark } from "./AppMark";
 export type { AppMarkProps } from "./AppMark";
 export {
   APP_MARKS,
+  APP_MARK_CROP_VIEWBOX,
   APP_MARK_VIEWBOX,
+  PROJECTV_MARK_VIEWBOX,
   APP_MARK_SVG,
   APP_NAMES,
   APP_TILE_LIGHT_SVG,
@@ -18,3 +21,7 @@ export {
   pathBBox,
 } from "./svg";
 export type { AppMarkVariant, AppName, MarkShape } from "./svg";
+export { FAMILY_APPS, familyApp } from "./familyApps";
+export type { FamilyApp } from "./familyApps";
+export { V_PRO_APP_BENEFITS } from "./vProAppBenefits";
+export type { PricingPlanAppBenefit } from "./vProAppBenefits";

package/src/brand/svg.ts

@@ -5,7 +5,7 @@ export const APP_NAMES = ["projectv", "vibot", "vhub", "vmem", "verve", "velth"]
 
 export type AppName = (typeof APP_NAMES)[number];
 
-/** `mark`: glyph only, cropped tight, follows `currentColor`. `tile`: white glyph on a black tile. `tile-light`: black glyph on a white tile. */
+/** `mark`: glyph only on an equalised square viewBox, follows `currentColor`. `tile`: white glyph on a black tile. `tile-light`: black glyph on a white tile. */
 export type AppMarkVariant = "mark" | "tile" | "tile-light";
 
 export const MARK_VIEWBOX = "0 0 1024 1024";
@@ -175,20 +175,30 @@ export function markBBox(app: AppName): Box {
 
 
 /**
- * Tight viewBox per app (`minX minY width height` on the 1024 grid): the glyph box grown by half the
- * stroke width for stroke marks, rounded outward to whole units. Checked against `markBBox` in tests.
- * Used by the plain logo (`variant="mark"`, `appMarkSvg`). Tiles keep `MARK_VIEWBOX`.
+ * Shared crop for the five app glyphs (`vibot`, `vhub`, `vmem`, `verve`, `velth`) in the plain logo (`variant="mark"`,
+ * `appMarkSvg`, `Icon*`): the union of their `markBBox` results on the 1024 tile grid (x 186 to 789, y 259.96 to 761.7),
+ * centred in a square of side max(width, height) x 1.04 (about 4% padding), then rounded outward to whole units.
+ * `projectv` is left out so its wide brand mark does not shrink the app glyphs. Not the full tile. Checked in tests.
  */
+export const APP_MARK_CROP_VIEWBOX = "173 197 629 629";
+
+/**
+ * Own tight square for `projectv` (a brand mark, not an app): `markBBox("projectv")` (x 172 to 858, y 377 to 672),
+ * centred on the shorter axis and rounded outward to whole units, with no extra padding.
+ */
+export const PROJECTV_MARK_VIEWBOX = "172 181 687 687";
+
+/** Plain-mark viewBox per app: the shared crop for the five apps, a tight square for `projectv`. Always square. */
 export const APP_MARK_VIEWBOX: Record<AppName, string> = {
-  projectv: "172 377 686 295",
-  vibot: "295 314 494 398",
-  vhub: "186 338 582 348",
-  vmem: "255 259 513 503",
-  verve: "260 319 504 413",
-  velth: "273 276 478 482",
+  projectv: PROJECTV_MARK_VIEWBOX,
+  vibot: APP_MARK_CROP_VIEWBOX,
+  vhub: APP_MARK_CROP_VIEWBOX,
+  vmem: APP_MARK_CROP_VIEWBOX,
+  verve: APP_MARK_CROP_VIEWBOX,
+  velth: APP_MARK_CROP_VIEWBOX,
 };
 
-/** Width over height of a mark's tight viewBox. */
+/** Width over height of a mark's viewBox. Always about 1, because the viewBoxes are square. Kept for API stability; do not use it for sizing. */
 export function markAspect(app: AppName): number {
   const [, , w = 1, h = 1] = APP_MARK_VIEWBOX[app].split(" ").map(Number);
   return w / h;
@@ -205,7 +215,7 @@ function pathElements(app: AppName): string {
   return APP_MARKS[app].paths.map((d) => `<path d="${d}"/>`).join("");
 }
 
-/** Glyph only, cropped tight with no padding, painted with `color` (default `currentColor`). */
+/** Glyph only on its equalised square viewBox, painted with `color` (default `currentColor`). */
 export function appMarkSvg(app: AppName, color = "currentColor"): string {
   return `<svg ${NS} viewBox="${APP_MARK_VIEWBOX[app]}" ${markPaintAttrs(app, color)}>${pathElements(app)}</svg>\n`;
 }

package/src/brand/vProAppBenefits.ts

@@ -0,0 +1,24 @@
+import type { AppName } from "./svg";
+
+/** Benefits for one app, shown under that app's icon and name. */
+export type PricingPlanAppBenefit = {
+  app: Exclude<AppName, "projectv">;
+  items: readonly string[];
+};
+
+/** Approved per-app copy for V Pro, in display order. */
+export const V_PRO_APP_BENEFITS: readonly PricingPlanAppBenefit[] = [
+  {
+    app: "vibot",
+    items: [
+      "1000 messages / day",
+      "100 image gens / day",
+      "100 deep & 20 extreme searches / day",
+      "Smarter AI for chats, documents & sub-agents",
+    ],
+  },
+  { app: "vmem", items: ["Unlimited memories", "Higher AI search & connected-tool limits"] },
+  { app: "vhub", items: ["Unlimited scripts", "More connections, secrets & API keys"] },
+  { app: "velth", items: ["Unlimited camera scans", "Smarter AI health insights"] },
+  { app: "verve", items: ["Page version history", "Higher AI rewrite & summary limits"] },
+];

package/src/index.ts

@@ -290,20 +290,21 @@ export {
 export type { PricingModalTone, SiteFooterVariant } from "./marketing/marketing-classes";
 export { SiteFooter } from "./marketing/SiteFooter";
 export type { SiteFooterLink, SiteFooterProps, SiteFooterSocial } from "./marketing/SiteFooter";
-export { PricingModal } from "./marketing/PricingModal";
+export { PricingModal, V_PRO_APP_BENEFITS } from "./marketing/PricingModal";
 export type {
   PricingModalLegacyProps,
   PricingModalMultiProps,
   PricingModalPeriod,
   PricingModalProps,
   PricingPlan,
+  PricingPlanAppBenefit,
   PricingPlanBenefit,
 } from "./marketing/PricingModal";
 
 // App helpers: confirm skip, update watcher, settings chrome, stable auth, Convex provider, VITE env and ensure-user.
 export * from "../app/src/index";
 
-// Family app marks (AppMark and raw SVG strings for favicons).
+// Family app marks (Icon* components, deprecated AppMark and raw SVG strings for favicons).
 export * from "./brand";
 
 // Native tokens (JS values that match tokens.css).

package/src/marketing/PricingModal.tsx

@@ -1,9 +1,12 @@
 import { useRef, useState, type ReactElement, type ReactNode } from "react";
 import { IconCheck, IconX } from "@tabler/icons-react";
-import { AppMark } from "../brand/AppMark";
-import type { AppName } from "../brand/svg";
+import { APP_ICONS, IconProjectV, V_PRO_APP_BENEFITS, familyApp, type AppIconProps, type AppName, type PricingPlanAppBenefit } from "../brand";
 import { Button } from "../ui/button";
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from "../ui/dialog";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip";
+
+export { V_PRO_APP_BENEFITS };
+export type { PricingPlanAppBenefit };
 import { VisuallyHidden } from "../ui/visually-hidden";
 import { pricingModalClasses, pricingMultiClasses, type PricingModalTone } from "./marketing-classes";
 
@@ -75,6 +78,11 @@ export type PricingPlan = {
   /** Large title with small text under it. */
   highlight?: { title: string; description: string };
   benefits?: readonly PricingPlanBenefit[];
+  /**
+   * Grouped per app, shown after `benefits`. The `currentApp` group comes first, the rest keep the array order.
+   * The `featured` / `highlighted` plan defaults to `V_PRO_APP_BENEFITS` when this is omitted, so apps usually pass only `currentApp`. Other plans show none unless set.
+   */
+  appBenefits?: readonly PricingPlanAppBenefit[];
   /** The plan the user is on: the button reads "Current plan" and is disabled. */
   current?: boolean;
   /** Subtle ring on the card. `highlighted` is an alias. */
@@ -95,6 +103,8 @@ export type PricingModalMultiProps = {
   plans: readonly PricingPlan[];
   /** App marks at the top left. */
   apps?: readonly AppName[];
+  /** App the dialog is shown in. Its `appBenefits` group comes first. */
+  currentApp?: Exclude<AppName, "projectv">;
   /** Centred headline, for example "One plan. Every V app." */
   headline?: ReactNode;
   /** Small print under the cards. */
@@ -111,6 +121,16 @@ export type PricingModalMultiProps = {
 export type PricingModalProps = PricingModalLegacyProps | PricingModalMultiProps;
 
 /** Upgrade dialog. With `plans`: wide multi-plan layout. Without: the single-plan layout. */
+function AppIcon({ app, ...props }: AppIconProps & { app: AppName }) {
+  const Icon = APP_ICONS[app];
+  return <Icon {...props} />;
+}
+
+function sortAppBenefits(groups: readonly PricingPlanAppBenefit[], currentApp?: AppName) {
+  // Stable sort: the current app moves to the front, the rest keep their order.
+  return [...groups].sort((a, b) => Number(b.app === currentApp) - Number(a.app === currentApp));
+}
+
 export function PricingModal(props: PricingModalProps) {
   return props.plans ? <PricingModalMulti {...props} /> : <PricingModalSingle {...props} />;
 }
@@ -259,6 +279,7 @@ function PricingModalMulti({
   description,
   plans,
   apps,
+  currentApp,
   headline,
   finePrint,
   billingPeriod,
@@ -293,7 +314,27 @@ function PricingModalMulti({
 
         <div className="grid grid-cols-[1fr_auto] items-center gap-x-4 gap-y-3 px-4 pb-4 pt-5 sm:grid-cols-[1fr_auto_1fr] sm:px-6">
           <div className="flex items-center gap-2 text-foreground" data-testid="pricing-apps">
-            {apps?.map((app) => <AppMark key={app} app={app} size={20} />)}
+            <TooltipProvider delayDuration={200}>
+              {apps?.map((app) => {
+                const { name, url } = familyApp(app);
+                return (
+                  <Tooltip key={app}>
+                    <TooltipTrigger asChild>
+                      <a
+                        href={url}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        aria-label={name}
+                        className="rounded-sm outline-none focus-visible:ring-2 focus-visible:ring-foreground/50"
+                      >
+                        <AppIcon app={app} size={20} />
+                      </a>
+                    </TooltipTrigger>
+                    <TooltipContent portal>{name}</TooltipContent>
+                  </Tooltip>
+                );
+              })}
+            </TooltipProvider>
           </div>
           <div className="flex items-center justify-end gap-2 sm:order-last">
             <div role="group" aria-label="Billing period" className="inline-flex rounded-full bg-surface-tertiary p-0.5">
@@ -332,6 +373,7 @@ function PricingModalMulti({
         <div className={`grid grid-cols-1 gap-3 px-4 sm:px-6 ${multiColumns[count]}`}>
           {plans.map((plan) => {
             const emphasised = plan.featured ?? plan.highlighted;
+            const appBenefits = plan.appBenefits ?? (emphasised ? V_PRO_APP_BENEFITS : undefined);
             const button = (
               <Button
                 size="lg"
@@ -353,7 +395,7 @@ function PricingModalMulti({
               >
                 {emphasised ? (
                   <div className="flex items-center gap-2 text-base text-foreground">
-                    <AppMark app="projectv" size={16} className="shrink-0" />
+                    <IconProjectV size={16} className="shrink-0" />
                     <h3>{plan.name}</h3>
                   </div>
                 ) : (
@@ -384,7 +426,7 @@ function PricingModalMulti({
                       >
                         <span className="mt-0.5 flex h-4 w-5 shrink-0 items-center justify-center">
                           {benefit.icon && benefit.icon !== "check" ? (
-                            <AppMark app={benefit.icon} size={12} className="max-w-full" />
+                            <AppIcon app={benefit.icon} size={12} className="max-w-full" />
                           ) : (
                             <IconCheck className="size-4" strokeWidth={2} />
                           )}
@@ -394,6 +436,25 @@ function PricingModalMulti({
                     ))}
                   </ul>
                 ) : null}
+                {appBenefits?.length ? (
+                  <div className="mt-4 grid gap-x-6 gap-y-2.5 border-t border-separator pt-3 sm:grid-cols-2">
+                    {sortAppBenefits(appBenefits, currentApp).map((group) => (
+                      <div key={group.app} data-app-benefits={group.app}>
+                        <p className="flex items-center gap-2 text-xs font-medium text-foreground">
+                          <AppIcon app={group.app} size={12} className="shrink-0" />
+                          {familyApp(group.app).name}
+                        </p>
+                        <ul className="mt-1 space-y-0.5 pl-5">
+                          {group.items.map((item, index) => (
+                            <li key={index} className="text-sm leading-snug text-foreground">
+                              {item}
+                            </li>
+                          ))}
+                        </ul>
+                      </div>
+                    ))}
+                  </div>
+                ) : null}
               </section>
             );
           })}