From c1e29824cd7a6809448e45b6b7fe8f7be71ecb0f Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Mon, 6 Apr 2026 23:07:44 +0400
Subject: [PATCH 01/19] feat: add apply command

---
 .changeset/common-pears-accept.md             |   5 +
 apps/v4/content/docs/(root)/cli.mdx           |  78 ++++-
 packages/shadcn/README.md                     |  10 +
 packages/shadcn/src/commands/apply.test.ts    |  47 +++
 packages/shadcn/src/commands/apply.ts         | 325 ++++++++++++++++++
 packages/shadcn/src/commands/init.ts          | 104 +++---
 packages/shadcn/src/index.ts                  |   2 +
 .../shadcn/src/preflights/preflight-apply.ts  |  74 ++++
 packages/shadcn/src/preset/presets.ts         |  49 ++-
 packages/shadcn/src/utils/file-helper.test.ts |  49 +++
 packages/shadcn/src/utils/file-helper.ts      |  37 ++
 .../shadcn/src/utils/get-monorepo-info.ts     |  11 +-
 packages/tests/src/tests/apply.test.ts        | 263 ++++++++++++++
 packages/tests/src/utils/helpers.ts           |   3 +
 skills/shadcn/SKILL.md                        |  16 +-
 skills/shadcn/cli.md                          |  31 +-
 skills/shadcn/customization.md                |  23 +-
 17 files changed, 1010 insertions(+), 117 deletions(-)
 create mode 100644 .changeset/common-pears-accept.md
 create mode 100644 packages/shadcn/src/commands/apply.test.ts
 create mode 100644 packages/shadcn/src/commands/apply.ts
 create mode 100644 packages/shadcn/src/preflights/preflight-apply.ts
 create mode 100644 packages/shadcn/src/utils/file-helper.test.ts
 create mode 100644 packages/tests/src/tests/apply.test.ts

diff --git a/.changeset/common-pears-accept.md b/.changeset/common-pears-accept.md
new file mode 100644
index 000000000..c5662c64b
--- /dev/null
+++ b/.changeset/common-pears-accept.md
@@ -0,0 +1,5 @@
+---
+"shadcn": minor
+---
+
+add shadcn apply command
diff --git a/apps/v4/content/docs/(root)/cli.mdx b/apps/v4/content/docs/(root)/cli.mdx
index 43374f872..95ac99eda 100644
--- a/apps/v4/content/docs/(root)/cli.mdx
+++ b/apps/v4/content/docs/(root)/cli.mdx
@@ -5,10 +5,12 @@ description: Use the shadcn CLI to add components to your project.
 
 ## init
 
-Use the `init` command to initialize configuration and dependencies for a new project.
+Use the `init` command to initialize configuration and dependencies for an existing project, or create a new project with `--name`.
 
 The `init` command installs dependencies, adds the `cn` util and configures CSS variables for the project.
 
+For preset reapplication in an existing project, use [`apply`](#apply) when you want to overwrite preset-driven files and reinstall detected UI components. Use `init --force --no-reinstall` when you want to update config and CSS without reinstalling existing components.
+
 ```bash
 npx shadcn@latest init
 ```
@@ -16,31 +18,31 @@ npx shadcn@latest init
 **Options**
 
 ```bash
-Usage: shadcn init [options] [components...]
+Usage: shadcn init|create [options] [components...]
 
 initialize your project and install dependencies
 
 Arguments:
-  components              name, url or local path to component
+  components                 names, url or local path to component
 
 Options:
   -t, --template <template>  the template to use. (next, vite, start, react-router, laravel, astro)
   -b, --base <base>          the component library to use. (radix, base)
-  -p, --preset [name]        use a preset configuration. (name, URL, or preset code)
-  -n, --name <name>          the name for the new project.
-  -d, --defaults             use default configuration. (default: false)
-  -y, --yes                  skip confirmation prompt. (default: true)
-  -f, --force                force overwrite of existing configuration. (default: false)
-  -c, --cwd <cwd>            the working directory. defaults to the current directory.
-  -s, --silent               mute output. (default: false)
   --monorepo                 scaffold a monorepo project.
   --no-monorepo              skip the monorepo prompt.
-  --reinstall                re-install existing UI components.
-  --no-reinstall             do not re-install existing UI components.
-  --rtl                      enable RTL support.
-  --no-rtl                   disable RTL support.
+  -p, --preset [name]        use a preset configuration
+  -y, --yes                  skip confirmation prompt. (default: true)
+  -d, --defaults             use default configuration: --template=next --preset=base-nova (default: false)
+  -f, --force                force overwrite of existing configuration. (default: false)
+  -c, --cwd <cwd>            the working directory. defaults to the current directory.
+  -n, --name <name>          the name for the new project.
+  -s, --silent               mute output. (default: false)
   --css-variables            use css variables for theming. (default: true)
   --no-css-variables         do not use css variables for theming.
+  --rtl                      enable RTL support.
+  --no-rtl                   disable RTL support.
+  --reinstall                re-install existing UI components.
+  --no-reinstall             do not re-install existing UI components.
   -h, --help                 display help for command
 ```
 
@@ -52,6 +54,54 @@ npx shadcn@latest create
 
 ---
 
+## apply
+
+Use the `apply` command to apply a preset to an existing project.
+
+`apply` overwrites preset-driven config, fonts, CSS variables, and detected installed UI components. Commit or stash your changes before continuing so you can easily go back.
+
+`apply` requires an existing `components.json`. If your project is not initialized yet, run `shadcn init --preset <preset>` first.
+
+```bash
+npx shadcn@latest apply --preset a2r6bw
+```
+
+You can also pass the preset as a positional argument:
+
+```bash
+npx shadcn@latest apply a2r6bw
+```
+
+Named presets work the same way:
+
+```bash
+npx shadcn@latest apply lyra
+```
+
+If no preset is provided, the CLI offers to open the custom preset builder on `ui.shadcn.com/create`.
+
+Use `apply` for overwrite/reinstall flows. If you want to refresh config and CSS without reinstalling existing components, use `init --force --no-reinstall` instead.
+
+**Options**
+
+```bash
+Usage: shadcn apply [options] [preset]
+
+apply a preset to an existing project
+
+Arguments:
+  preset             the preset to apply
+
+Options:
+  --preset <preset>  preset configuration to apply
+  -y, --yes          skip confirmation prompt. (default: false)
+  -c, --cwd <cwd>    the working directory. defaults to the current directory.
+  --silent           mute output. (default: false)
+  -h, --help         display help for command
+```
+
+---
+
 ## add
 
 Use the `add` command to add components and dependencies to your project.
diff --git a/packages/shadcn/README.md b/packages/shadcn/README.md
index 3f5cb1d5f..5c8724cfc 100644
--- a/packages/shadcn/README.md
+++ b/packages/shadcn/README.md
@@ -20,6 +20,16 @@ The `init` command installs dependencies, adds the `cn` util, configures Tailwin
 npx shadcn init
 ```
 
+## apply
+
+Use the `apply` command to apply a preset to an existing project.
+
+The `apply` command overwrites the current preset configuration, reinstalls detected UI components, and updates fonts and CSS variables to match the new preset.
+
+```bash
+npx shadcn apply --preset a2r6bw
+```
+
 ## add
 
 Use the `add` command to add components to your project.
diff --git a/packages/shadcn/src/commands/apply.test.ts b/packages/shadcn/src/commands/apply.test.ts
new file mode 100644
index 000000000..67c588033
--- /dev/null
+++ b/packages/shadcn/src/commands/apply.test.ts
@@ -0,0 +1,47 @@
+import { REGISTRY_URL } from "@/src/registry/constants"
+import { describe, expect, it } from "vitest"
+
+import { resolveApplyInitUrl } from "./apply"
+
+const SHADCN_URL = REGISTRY_URL.replace(/\/r\/?$/, "")
+
+describe("resolveApplyInitUrl", () => {
+  it("should include the inferred template for preset codes", () => {
+    const { initUrl, presetBase } = resolveApplyInitUrl("a0", "base", {
+      template: "next",
+      rtl: true,
+    })
+    const parsed = new URL(initUrl)
+
+    expect(parsed.origin + parsed.pathname).toBe(`${SHADCN_URL}/init`)
+    expect(parsed.searchParams.get("template")).toBe("next")
+    expect(parsed.searchParams.get("preset")).toBe("a0")
+    expect(parsed.searchParams.get("rtl")).toBe("true")
+    expect(presetBase).toBeUndefined()
+  })
+
+  it("should include the inferred template for named presets", () => {
+    const { initUrl, presetBase } = resolveApplyInitUrl("lyra", "base", {
+      template: "next",
+      rtl: true,
+    })
+    const parsed = new URL(initUrl)
+
+    expect(parsed.origin + parsed.pathname).toBe(`${SHADCN_URL}/init`)
+    expect(parsed.searchParams.get("template")).toBe("next")
+    expect(parsed.searchParams.get("base")).toBe("base")
+    expect(parsed.searchParams.get("rtl")).toBe("true")
+    expect(presetBase).toBeUndefined()
+  })
+
+  it("should preserve raw preset URLs without injecting a template", () => {
+    const presetUrl = `${SHADCN_URL}/init?base=radix&style=nova&baseColor=neutral&theme=neutral&iconLibrary=lucide&font=inter&rtl=false&menuAccent=subtle&menuColor=default&radius=default`
+    const { initUrl } = resolveApplyInitUrl(presetUrl, "base", {
+      template: "next",
+    })
+    const parsed = new URL(initUrl)
+
+    expect(parsed.searchParams.get("template")).toBeNull()
+    expect(parsed.searchParams.get("track")).toBe("1")
+  })
+})
diff --git a/packages/shadcn/src/commands/apply.ts b/packages/shadcn/src/commands/apply.ts
new file mode 100644
index 000000000..1817fc851
--- /dev/null
+++ b/packages/shadcn/src/commands/apply.ts
@@ -0,0 +1,325 @@
+import path from "path"
+import { confirmBaseSwitch, runInit } from "@/src/commands/init"
+import { preFlightApply } from "@/src/preflights/preflight-apply"
+import { decodePreset, isPresetCode } from "@/src/preset/preset"
+import {
+  DEFAULT_PRESETS,
+  promptToOpenPresetBuilder,
+  resolveCreateUrl,
+  resolveInitUrl,
+  resolveRegistryBaseConfig,
+} from "@/src/preset/presets"
+import { SHADCN_URL } from "@/src/registry/constants"
+import { clearRegistryContext } from "@/src/registry/context"
+import { registryConfigSchema } from "@/src/registry/schema"
+import { isUrl } from "@/src/registry/utils"
+import { getTemplateForFramework } from "@/src/templates/index"
+import { loadEnvFiles } from "@/src/utils/env-loader"
+import * as ERRORS from "@/src/utils/errors"
+import { withFileBackup } from "@/src/utils/file-helper"
+import { getBase } from "@/src/utils/get-config"
+import {
+  getProjectComponents,
+  getProjectInfo,
+} from "@/src/utils/get-project-info"
+import { handleError } from "@/src/utils/handle-error"
+import { highlighter } from "@/src/utils/highlighter"
+import { logger } from "@/src/utils/logger"
+import { Command } from "commander"
+import prompts from "prompts"
+import { z } from "zod"
+
+export const applyOptionsSchema = z.object({
+  cwd: z.string(),
+  positionalPreset: z.string().optional(),
+  preset: z.string().optional(),
+  yes: z.boolean(),
+  silent: z.boolean(),
+})
+
+export const apply = new Command()
+  .name("apply")
+  .description("apply a preset to an existing project")
+  .argument("[preset]", "the preset to apply")
+  .option("--preset <preset>", "preset configuration to apply")
+  .option("-y, --yes", "skip confirmation prompt.", false)
+  .option(
+    "-c, --cwd <cwd>",
+    "the working directory. defaults to the current directory.",
+    process.cwd()
+  )
+  .option("--silent", "mute output.", false)
+  .action(async (positionalPreset, opts) => {
+    try {
+      const options = applyOptionsSchema.parse({
+        ...opts,
+        cwd: path.resolve(opts.cwd),
+        positionalPreset,
+      })
+
+      const preset = resolveApplyPreset(options)
+
+      const preflight = await preFlightApply(options)
+
+      if (preflight.errors[ERRORS.MISSING_DIR_OR_EMPTY_PROJECT]) {
+        logger.break()
+        logger.error(
+          `The ${highlighter.info(
+            "apply"
+          )} command only works in an existing project.`
+        )
+        logger.error(`Run ${highlighter.info(getInitCommand(preset))} first.`)
+        logger.break()
+        process.exit(1)
+      }
+
+      if (preflight.errors[ERRORS.MISSING_CONFIG]) {
+        logger.break()
+        logger.error(
+          `No ${highlighter.info("components.json")} found at ${highlighter.info(
+            options.cwd
+          )}.`
+        )
+        logger.error(`Run ${highlighter.info(getInitCommand(preset))} first.`)
+        logger.break()
+        process.exit(1)
+      }
+
+      const existingConfig = preflight.config
+      if (!existingConfig) {
+        process.exit(1)
+      }
+
+      const rtl = existingConfig.rtl ?? false
+      const template = await resolveApplyTemplate(options.cwd)
+
+      if (!preset) {
+        const createUrl = resolveCreateUrl({
+          command: "init",
+          template,
+          base: getBase(existingConfig.style),
+          rtl,
+        })
+
+        await promptToOpenPresetBuilder({
+          createUrl,
+          followUp: `Then run ${highlighter.info(
+            "shadcn apply --preset <preset>"
+          )} with the preset code or preset URL from ui.shadcn.com.`,
+          prompt: !options.yes,
+        })
+
+        process.exit(0)
+      }
+
+      validatePreset(preset)
+
+      const reinstallComponents = await getProjectComponents(options.cwd)
+
+      if (!options.yes) {
+        logger.break()
+        logger.warn(
+          highlighter.warn(
+            `Applying a new preset will overwrite existing UI components, fonts, and CSS variables.`
+          )
+        )
+        logger.warn(
+          `Commit or stash your changes before continuing so you can easily go back.`
+        )
+        logger.break()
+        logger.log("  The following components will be re-installed:")
+        if (reinstallComponents.length) {
+          for (let i = 0; i < reinstallComponents.length; i += 8) {
+            logger.log(`  - ${reinstallComponents.slice(i, i + 8).join(", ")}`)
+          }
+        } else {
+          logger.log("  - No installed UI components were detected.")
+        }
+        logger.break()
+
+        const { proceed } = await prompts({
+          type: "confirm",
+          name: "proceed",
+          message: "Would you like to continue?",
+          initial: false,
+        })
+
+        if (!proceed) {
+          logger.break()
+          process.exit(1)
+        }
+      }
+
+      await loadEnvFiles(options.cwd)
+
+      const currentBase = getBase(existingConfig.style)
+      const { initUrl, presetBase } = resolveApplyInitUrl(preset, currentBase, {
+        template,
+        rtl,
+      })
+
+      let resolvedBase = presetBase ?? currentBase
+      resolvedBase = await confirmBaseSwitch(existingConfig.style, resolvedBase)
+
+      const nextInitUrl = setApplyInitUrlBase(initUrl, resolvedBase)
+
+      await withFileBackup(
+        path.resolve(options.cwd, "components.json"),
+        async () => {
+          const {
+            registryBaseConfig,
+            installStyleIndex,
+            url: cleanUrl,
+          } = await resolveRegistryBaseConfig(nextInitUrl, options.cwd, {
+            registries: existingConfig.registries as
+              | z.infer<typeof registryConfigSchema>
+              | undefined,
+          })
+
+          await runInit({
+            cwd: options.cwd,
+            yes: true,
+            force: true,
+            reinstall: true,
+            defaults: false,
+            silent: options.silent,
+            isNewProject: false,
+            cssVariables: true,
+            installStyleIndex,
+            registryBaseConfig,
+            existingConfig,
+            components: [cleanUrl, ...reinstallComponents],
+          })
+        },
+        {
+          onBackupFailure: () => {
+            logger.warn(
+              `Could not back up ${highlighter.info("components.json")}.`
+            )
+          },
+        }
+      )
+
+      logger.break()
+      logger.log(`Preset applied successfully.`)
+      logger.break()
+    } catch (error) {
+      logger.break()
+      handleError(error)
+    } finally {
+      clearRegistryContext()
+    }
+  })
+
+function resolveApplyPreset(options: z.infer<typeof applyOptionsSchema>) {
+  const positionalPreset = options.positionalPreset?.trim()
+  const flagPreset = options.preset?.trim()
+
+  if (positionalPreset && flagPreset && positionalPreset !== flagPreset) {
+    logger.error(
+      `Received two different preset values. Use either the positional preset or ${highlighter.info(
+        "--preset"
+      )}, or pass the same value to both.`
+    )
+    logger.break()
+    process.exit(1)
+  }
+
+  return flagPreset ?? positionalPreset
+}
+
+function validatePreset(preset: string) {
+  if (isUrl(preset) || isPresetCode(preset)) {
+    return
+  }
+
+  const knownPresetNames = Object.keys(DEFAULT_PRESETS)
+
+  if (!knownPresetNames.includes(preset)) {
+    logger.error(
+      `Invalid preset: ${highlighter.info(
+        preset
+      )}.\nUse one of the available presets: ${knownPresetNames.join(", ")} \nor build your own at ${highlighter.info(`${SHADCN_URL}/create`)}`
+    )
+    logger.break()
+    process.exit(1)
+  }
+}
+
+async function resolveApplyTemplate(cwd: string) {
+  const projectInfo = await getProjectInfo(cwd)
+  return getTemplateForFramework(projectInfo?.framework.name)
+}
+
+export function resolveApplyInitUrl(
+  preset: string,
+  currentBase: "radix" | "base",
+  options: { template?: string; rtl?: boolean } = {}
+) {
+  if (isUrl(preset)) {
+    const url = new URL(preset)
+
+    if (url.pathname === "/init" && preset.startsWith(SHADCN_URL)) {
+      url.searchParams.set("track", "1")
+    }
+
+    return {
+      initUrl: url.toString(),
+      presetBase:
+        (url.searchParams.get("base") as "radix" | "base" | null) ?? undefined,
+    }
+  }
+
+  if (isPresetCode(preset)) {
+    const decoded = decodePreset(preset)
+    if (!decoded) {
+      logger.error(`Invalid preset code: ${highlighter.info(preset)}`)
+      logger.break()
+      process.exit(1)
+    }
+
+    return {
+      initUrl: resolveInitUrl(
+        {
+          ...decoded,
+          base: "radix",
+          rtl: options.rtl ?? false,
+        },
+        { preset, template: options.template }
+      ),
+      presetBase: undefined,
+    }
+  }
+
+  const resolvedPreset = DEFAULT_PRESETS[preset as keyof typeof DEFAULT_PRESETS]
+
+  return {
+    initUrl: resolveInitUrl(
+      {
+        ...resolvedPreset,
+        base: currentBase,
+        rtl: options.rtl ?? resolvedPreset.rtl,
+      },
+      { template: options.template }
+    ),
+    presetBase: undefined,
+  }
+}
+
+function setApplyInitUrlBase(initUrl: string, base: "radix" | "base") {
+  const url = new URL(initUrl)
+  url.searchParams.set("base", base)
+  return url.toString()
+}
+
+function quoteShellArg(value: string) {
+  return /[^A-Za-z0-9_./:-]/.test(value) ? JSON.stringify(value) : value
+}
+
+function getInitCommand(preset?: string) {
+  if (!preset) {
+    return "shadcn init"
+  }
+
+  return `shadcn init --preset ${quoteShellArg(preset)}`
+}
diff --git a/packages/shadcn/src/commands/init.ts b/packages/shadcn/src/commands/init.ts
index 650840d3d..c553d4afa 100644
--- a/packages/shadcn/src/commands/init.ts
+++ b/packages/shadcn/src/commands/init.ts
@@ -24,12 +24,7 @@ import { addComponents } from "@/src/utils/add-components"
 import { createProject } from "@/src/utils/create-project"
 import { loadEnvFiles } from "@/src/utils/env-loader"
 import * as ERRORS from "@/src/utils/errors"
-import {
-  createFileBackup,
-  deleteFileBackup,
-  FILE_BACKUP_SUFFIX,
-  restoreFileBackup,
-} from "@/src/utils/file-helper"
+import { FILE_BACKUP_SUFFIX, withFileBackup } from "@/src/utils/file-helper"
 import {
   DEFAULT_COMPONENTS,
   DEFAULT_TAILWIND_CONFIG,
@@ -128,19 +123,8 @@ export const init = new Command()
   .option("--reinstall", "re-install existing UI components.")
   .option("--no-reinstall", "do not re-install existing UI components.")
   .action(async (components, opts) => {
-    let componentsJsonBackupPath: string | undefined
     let reinstallComponents: string[] = []
 
-    // Restore components.json backup on unexpected exit (e.g. process.exit in preflight).
-    const restoreBackupOnExit = () => {
-      if (componentsJsonBackupPath) {
-        restoreFileBackup(
-          componentsJsonBackupPath.replace(FILE_BACKUP_SUFFIX, "")
-        )
-      }
-    }
-    process.on("exit", restoreBackupOnExit)
-
     try {
       const options = initOptionsSchema.parse({
         ...opts,
@@ -180,7 +164,7 @@ export const init = new Command()
           logger.error(
             `Invalid preset: ${highlighter.info(
               options.preset
-            )}. Available presets: ${knownPresetNames.join(", ")}`
+            )}.\nUse one of the available presets: ${knownPresetNames.join(", ")} \nor build your own at ${highlighter.info(`${SHADCN_URL}/create`)}`
           )
           logger.break()
           process.exit(1)
@@ -496,62 +480,53 @@ export const init = new Command()
 
       await loadEnvFiles(options.cwd)
 
-      // We need to check if we're initializing with a new style.
-      // This will allow us to determine if we need to install the base style.
-      if (components.length > 0) {
-        // Back up existing components.json if it exists.
-        // Since components.json might not be valid at this point,
-        // temporarily rename it to allow preflight to run.
-        const componentsJsonPath = path.resolve(cwd, "components.json")
+      await withFileBackup(
+        path.resolve(cwd, "components.json"),
+        async () => {
+          // We need to check if we're initializing with a new style.
+          // This will allow us to determine if we need to install the base style.
+          if (components.length > 0) {
+            // Resolve registry:base config from the first component.
+            const {
+              registryBaseConfig,
+              installStyleIndex,
+              url: cleanUrl,
+            } = await resolveRegistryBaseConfig(components[0], cwd, {
+              registries: existingConfig?.registries as
+                | z.infer<typeof registryConfigSchema>
+                | undefined,
+            })
 
-        if (hasExistingConfig) {
-          componentsJsonBackupPath =
-            createFileBackup(componentsJsonPath) ?? undefined
-          if (!componentsJsonBackupPath) {
+            // Use the clean URL (track param stripped) for subsequent fetches.
+            components[0] = cleanUrl
+
+            if (!installStyleIndex) {
+              options.installStyleIndex = false
+            }
+
+            if (registryBaseConfig) {
+              options.registryBaseConfig = registryBaseConfig
+            }
+          }
+
+          await runInit(options)
+        },
+        {
+          enabled: hasExistingConfig && components.length > 0,
+          onBackupFailure: () => {
             logger.warn(
               `Could not back up ${highlighter.info("components.json")}.`
             )
-          }
+          },
         }
-
-        // Resolve registry:base config from the first component.
-        const {
-          registryBaseConfig,
-          installStyleIndex,
-          url: cleanUrl,
-        } = await resolveRegistryBaseConfig(components[0], cwd, {
-          registries: existingConfig?.registries as
-            | z.infer<typeof registryConfigSchema>
-            | undefined,
-        })
-
-        // Use the clean URL (track param stripped) for subsequent fetches.
-        components[0] = cleanUrl
-
-        if (!installStyleIndex) {
-          options.installStyleIndex = false
-        }
-
-        if (registryBaseConfig) {
-          options.registryBaseConfig = registryBaseConfig
-        }
-      }
-
-      await runInit(options)
+      )
 
       logger.break()
       logger.log(
         `Project initialization completed.\nYou may now add components.`
       )
-
-      // Success — remove the backup and exit listener.
-      process.removeListener("exit", restoreBackupOnExit)
-      deleteFileBackup(path.resolve(cwd, "components.json"))
       logger.break()
     } catch (error) {
-      // Restore handled by exit listener, but also do it here for non-exit errors.
-      process.removeListener("exit", restoreBackupOnExit)
-      restoreBackupOnExit()
       logger.break()
       handleError(error)
     } finally {
@@ -950,7 +925,10 @@ async function promptForMinimalConfig(
   })
 }
 
-async function confirmBaseSwitch(existingStyle: string, resolvedBase: string) {
+export async function confirmBaseSwitch(
+  existingStyle: string,
+  resolvedBase: string
+) {
   // Styles prefixed with "base-" use Base UI. Everything else is Radix.
   const oldBase = existingStyle.startsWith("base-") ? "base" : "radix"
   if (resolvedBase === oldBase) return resolvedBase
diff --git a/packages/shadcn/src/index.ts b/packages/shadcn/src/index.ts
index 9ab1fb9c8..31b45b46b 100644
--- a/packages/shadcn/src/index.ts
+++ b/packages/shadcn/src/index.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { add } from "@/src/commands/add"
+import { apply } from "@/src/commands/apply"
 import { build } from "@/src/commands/build"
 import { diff } from "@/src/commands/diff"
 import { docs } from "@/src/commands/docs"
@@ -29,6 +30,7 @@ async function main() {
 
   program
     .addCommand(init)
+    .addCommand(apply)
     .addCommand(add)
     .addCommand(diff)
     .addCommand(docs)
diff --git a/packages/shadcn/src/preflights/preflight-apply.ts b/packages/shadcn/src/preflights/preflight-apply.ts
new file mode 100644
index 000000000..2c8926b35
--- /dev/null
+++ b/packages/shadcn/src/preflights/preflight-apply.ts
@@ -0,0 +1,74 @@
+import path from "path"
+import { applyOptionsSchema } from "@/src/commands/apply"
+import { SHADCN_URL } from "@/src/registry/constants"
+import * as ERRORS from "@/src/utils/errors"
+import { getConfig } from "@/src/utils/get-config"
+import {
+  formatMonorepoMessage,
+  getMonorepoTargets,
+  isMonorepoRoot,
+} from "@/src/utils/get-monorepo-info"
+import { highlighter } from "@/src/utils/highlighter"
+import { logger } from "@/src/utils/logger"
+import fs from "fs-extra"
+import { z } from "zod"
+
+export async function preFlightApply(
+  options: z.infer<typeof applyOptionsSchema>
+) {
+  const errors: Record<string, boolean> = {}
+
+  if (
+    !fs.existsSync(options.cwd) ||
+    !fs.existsSync(path.resolve(options.cwd, "package.json"))
+  ) {
+    errors[ERRORS.MISSING_DIR_OR_EMPTY_PROJECT] = true
+    return {
+      errors,
+      config: null,
+    }
+  }
+
+  if (!fs.existsSync(path.resolve(options.cwd, "components.json"))) {
+    if (await isMonorepoRoot(options.cwd)) {
+      const targets = await getMonorepoTargets(options.cwd)
+      if (targets.length > 0) {
+        formatMonorepoMessage("apply --preset <preset>", targets, {
+          cwdFlag: "-c",
+        })
+        process.exit(1)
+      }
+    }
+
+    errors[ERRORS.MISSING_CONFIG] = true
+    return {
+      errors,
+      config: null,
+    }
+  }
+
+  try {
+    const config = await getConfig(options.cwd)
+
+    return {
+      errors,
+      config: config!,
+    }
+  } catch {
+    logger.break()
+    logger.error(
+      `An invalid ${highlighter.info(
+        "components.json"
+      )} file was found at ${highlighter.info(
+        options.cwd
+      )}.\nBefore you can apply a preset, you must create a valid ${highlighter.info(
+        "components.json"
+      )} file by running the ${highlighter.info("init")} command.`
+    )
+    logger.error(
+      `Learn more at ${highlighter.info(`${SHADCN_URL}/docs/components-json`)}.`
+    )
+    logger.break()
+    process.exit(1)
+  }
+}
diff --git a/packages/shadcn/src/preset/presets.ts b/packages/shadcn/src/preset/presets.ts
index b54832b79..2dfacf6b7 100644
--- a/packages/shadcn/src/preset/presets.ts
+++ b/packages/shadcn/src/preset/presets.ts
@@ -130,6 +130,34 @@ export function resolveCreateUrl(
   return url.toString()
 }
 
+export async function promptToOpenPresetBuilder(options: {
+  createUrl: string
+  followUp: string
+  prompt?: boolean
+}) {
+  logger.break()
+  logger.log(
+    `  Build your custom preset on ${highlighter.info(options.createUrl)}`
+  )
+  logger.log(`  ${options.followUp}`)
+  logger.break()
+
+  if (options.prompt === false) {
+    return
+  }
+
+  const { proceed } = await prompts({
+    type: "confirm",
+    name: "proceed",
+    message: "Open in browser?",
+    initial: true,
+  })
+
+  if (proceed) {
+    await open(options.createUrl)
+  }
+}
+
 export function resolveInitUrl(
   preset: {
     base: string
@@ -234,26 +262,13 @@ export async function promptForPreset(options: {
       base: options.base,
       ...(options.template && { template: options.template }),
     })
-    logger.break()
-    logger.log(`  Build your custom preset on ${highlighter.info(createUrl)}`)
-    logger.log(
-      `  Then ${highlighter.info(
+    await promptToOpenPresetBuilder({
+      createUrl,
+      followUp: `Then ${highlighter.info(
         "copy and run the command"
-      )} from ui.shadcn.com.`
-    )
-    logger.break()
-
-    const { proceed } = await prompts({
-      type: "confirm",
-      name: "proceed",
-      message: "Open in browser?",
-      initial: true,
+      )} from ui.shadcn.com.`,
     })
 
-    if (proceed) {
-      await open(createUrl)
-    }
-
     process.exit(0)
   }
 
diff --git a/packages/shadcn/src/utils/file-helper.test.ts b/packages/shadcn/src/utils/file-helper.test.ts
new file mode 100644
index 000000000..e1416fe86
--- /dev/null
+++ b/packages/shadcn/src/utils/file-helper.test.ts
@@ -0,0 +1,49 @@
+import os from "os"
+import path from "path"
+import fs from "fs-extra"
+import { afterEach, describe, expect, it } from "vitest"
+
+import { FILE_BACKUP_SUFFIX, withFileBackup } from "./file-helper"
+
+const tempDirs: string[] = []
+
+async function createTempFile() {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "shadcn-file-helper-"))
+  tempDirs.push(dir)
+
+  const filePath = path.join(dir, "components.json")
+  await fs.writeFile(filePath, '{"style":"before"}\n', "utf8")
+
+  return filePath
+}
+
+afterEach(async () => {
+  await Promise.all(tempDirs.splice(0).map((dir) => fs.remove(dir)))
+})
+
+describe("withFileBackup", () => {
+  it("should restore the original file when the task throws", async () => {
+    const filePath = await createTempFile()
+
+    await expect(
+      withFileBackup(filePath, async () => {
+        await fs.writeFile(filePath, '{"style":"after"}\n', "utf8")
+        throw new Error("boom")
+      })
+    ).rejects.toThrow("boom")
+
+    expect(await fs.readFile(filePath, "utf8")).toBe('{"style":"before"}\n')
+    expect(await fs.pathExists(`${filePath}${FILE_BACKUP_SUFFIX}`)).toBe(false)
+  })
+
+  it("should remove the backup after a successful task", async () => {
+    const filePath = await createTempFile()
+
+    await withFileBackup(filePath, async () => {
+      await fs.writeFile(filePath, '{"style":"after"}\n', "utf8")
+    })
+
+    expect(await fs.readFile(filePath, "utf8")).toBe('{"style":"after"}\n')
+    expect(await fs.pathExists(`${filePath}${FILE_BACKUP_SUFFIX}`)).toBe(false)
+  })
+})
diff --git a/packages/shadcn/src/utils/file-helper.ts b/packages/shadcn/src/utils/file-helper.ts
index cebd807f7..55b04c17f 100644
--- a/packages/shadcn/src/utils/file-helper.ts
+++ b/packages/shadcn/src/utils/file-helper.ts
@@ -2,6 +2,11 @@ import fsExtra from "fs-extra"
 
 export const FILE_BACKUP_SUFFIX = ".bak"
 
+type WithFileBackupOptions = {
+  enabled?: boolean
+  onBackupFailure?: (filePath: string) => void
+}
+
 export function createFileBackup(filePath: string): string | null {
   if (!fsExtra.existsSync(filePath)) {
     return null
@@ -50,3 +55,35 @@ export function deleteFileBackup(filePath: string): boolean {
     return false
   }
 }
+
+export async function withFileBackup<T>(
+  filePath: string,
+  task: () => Promise<T>,
+  options: WithFileBackupOptions = {}
+) {
+  if (options.enabled === false || !fsExtra.existsSync(filePath)) {
+    return task()
+  }
+
+  const backupPath = createFileBackup(filePath)
+
+  if (!backupPath) {
+    options.onBackupFailure?.(filePath)
+    return task()
+  }
+
+  const restoreBackupOnExit = () => restoreFileBackup(filePath)
+
+  process.on("exit", restoreBackupOnExit)
+
+  try {
+    const result = await task()
+    process.removeListener("exit", restoreBackupOnExit)
+    deleteFileBackup(filePath)
+    return result
+  } catch (error) {
+    process.removeListener("exit", restoreBackupOnExit)
+    restoreFileBackup(filePath)
+    throw error
+  }
+}
diff --git a/packages/shadcn/src/utils/get-monorepo-info.ts b/packages/shadcn/src/utils/get-monorepo-info.ts
index 7a6c969d8..08fea2757 100644
--- a/packages/shadcn/src/utils/get-monorepo-info.ts
+++ b/packages/shadcn/src/utils/get-monorepo-info.ts
@@ -100,8 +100,13 @@ export async function getMonorepoTargets(cwd: string) {
 // Formats and logs the monorepo detection message.
 export function formatMonorepoMessage(
   command: string,
-  targets: { name: string; hasConfig: boolean }[]
+  targets: { name: string; hasConfig: boolean }[],
+  options?: {
+    cwdFlag?: string
+  }
 ) {
+  const cwdFlag = options?.cwdFlag ?? "-c"
+
   logger.break()
   logger.log(
     `It looks like you are running ${highlighter.info(
@@ -110,13 +115,13 @@ export function formatMonorepoMessage(
   )
   logger.log(
     `To use shadcn in a specific workspace, use the ${highlighter.info(
-      "-c"
+      cwdFlag
     )} flag:`
   )
   logger.break()
 
   for (const target of targets) {
-    logger.log(`  shadcn ${command} -c ${target.name}`)
+    logger.log(`  shadcn ${command} ${cwdFlag} ${target.name}`)
   }
 
   logger.break()
diff --git a/packages/tests/src/tests/apply.test.ts b/packages/tests/src/tests/apply.test.ts
new file mode 100644
index 000000000..3658b8884
--- /dev/null
+++ b/packages/tests/src/tests/apply.test.ts
@@ -0,0 +1,263 @@
+import os from "os"
+import path from "path"
+import fs from "fs-extra"
+import { describe, expect, it } from "vitest"
+
+import {
+  createFixtureTestDirectory,
+  getRegistryUrl,
+  npxShadcn,
+} from "../utils/helpers"
+
+async function createInitializedProject() {
+  const fixturePath = await createFixtureTestDirectory("next-app")
+  await npxShadcn(fixturePath, ["init", "--defaults"])
+  await npxShadcn(fixturePath, ["add", "button"])
+  return fixturePath
+}
+
+async function createInitializedRtlProject() {
+  const fixturePath = await createFixtureTestDirectory("next-app")
+  await npxShadcn(fixturePath, ["init", "--defaults", "--rtl"])
+  await npxShadcn(fixturePath, ["add", "button"])
+  return fixturePath
+}
+
+describe("shadcn apply", () => {
+  it("should apply a preset with --preset <code>", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      "a0",
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain("Preset applied successfully")
+    expect(
+      await fs.pathExists(path.join(fixturePath, "components/ui/button.tsx"))
+    ).toBe(true)
+  })
+
+  it("should apply a preset with positional <code>", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, ["apply", "a0", "-y"])
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain("Preset applied successfully")
+  })
+
+  it("should allow the same positional and flag preset values", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "a0",
+      "--preset",
+      "a0",
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+  })
+
+  it("should reject different positional and flag preset values", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "a0",
+      "--preset",
+      "b0",
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stdout).toContain("Received two different preset values")
+  })
+
+  it("should offer the preset builder when no preset is provided", async () => {
+    const fixturePath = await createInitializedProject()
+    const componentsJson = await fs.readJson(
+      path.join(fixturePath, "components.json")
+    )
+    const createUrl = new URL(
+      `${getRegistryUrl().replace(/\/r\/?$/, "")}/create`
+    )
+    createUrl.searchParams.set("command", "init")
+    createUrl.searchParams.set("template", "next")
+    createUrl.searchParams.set(
+      "base",
+      componentsJson.style.startsWith("base-") ? "base" : "radix"
+    )
+    const result = await npxShadcn(fixturePath, ["apply"], {
+      input: "n\n",
+    })
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain("Build your custom preset on")
+    expect(result.stdout).toContain(createUrl.toString())
+    expect(result.stdout).toContain("shadcn apply --preset <preset>")
+  })
+
+  it("should print the preset builder url without prompting when no preset is provided with -y", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, ["apply", "-y"])
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain("Build your custom preset on")
+    expect(result.stdout).not.toContain("Open in browser?")
+  })
+
+  it("should warn before applying and list detected components", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, ["apply", "--preset", "a0"], {
+      input: "y\n",
+    })
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain(
+      "Applying a new preset will overwrite existing UI components, fonts, and CSS variables."
+    )
+    expect(result.stdout).toContain(
+      "Commit or stash your changes before continuing so you can easily go back."
+    )
+    expect(result.stdout).toContain(
+      "The following components will be re-installed:"
+    )
+    expect(result.stdout).toContain("button")
+  })
+
+  it("should skip confirmation with -y", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      "a0",
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).not.toContain("Would you like to continue?")
+  })
+
+  it("should suggest init when components.json is missing", async () => {
+    const fixturePath = await createFixtureTestDirectory("next-app")
+    const result = await npxShadcn(fixturePath, ["apply", "--preset", "a0"])
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stdout).toContain("components.json")
+    expect(result.stdout).toContain("shadcn init --preset a0")
+  })
+
+  it("should not show undefined in init guidance when components.json is missing and no preset is provided", async () => {
+    const fixturePath = await createFixtureTestDirectory("next-app")
+    const result = await npxShadcn(fixturePath, ["apply"])
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stdout).toContain("components.json")
+    expect(result.stdout).toContain("shadcn init")
+    expect(result.stdout).not.toContain("undefined")
+  })
+
+  it("should fail on invalid components.json", async () => {
+    const fixturePath = await createFixtureTestDirectory("next-app")
+    await fs.writeFile(path.join(fixturePath, "components.json"), "{", "utf8")
+
+    const result = await npxShadcn(fixturePath, ["apply", "--preset", "a0"])
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stdout).toContain("An invalid components.json file was found")
+  })
+
+  it("should restore components.json when applying a preset fails", async () => {
+    const fixturePath = await createInitializedProject()
+    const componentsJsonPath = path.join(fixturePath, "components.json")
+    const original = await fs.readFile(componentsJsonPath, "utf8")
+
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      `${getRegistryUrl()}/does-not-exist.json`,
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(1)
+    expect(await fs.readFile(componentsJsonPath, "utf8")).toBe(original)
+    expect(await fs.pathExists(`${componentsJsonPath}.bak`)).toBe(false)
+  })
+
+  it("should guide the user to a workspace when run from a monorepo root", async () => {
+    const rootDir = path.join(
+      os.tmpdir(),
+      `shadcn-apply-monorepo-${process.pid}-${Date.now()}`
+    )
+
+    await fs.ensureDir(path.join(rootDir, "apps/web"))
+    await fs.writeJson(path.join(rootDir, "package.json"), {
+      private: true,
+      workspaces: ["apps/*"],
+    })
+    await fs.writeFile(
+      path.join(rootDir, "pnpm-workspace.yaml"),
+      'packages:\n  - "apps/*"\n',
+      "utf8"
+    )
+    await fs.writeJson(path.join(rootDir, "apps/web/package.json"), {
+      name: "web",
+      version: "0.0.0",
+    })
+    await fs.writeFile(
+      path.join(rootDir, "apps/web/next.config.ts"),
+      "",
+      "utf8"
+    )
+
+    const result = await npxShadcn(rootDir, ["apply", "--preset", "a0"])
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stdout).toContain("monorepo root")
+    expect(result.stdout).toContain(
+      "shadcn apply --preset <preset> -c apps/web"
+    )
+
+    await fs.remove(rootDir)
+  })
+
+  it("should update the project config and reinstall detected components", async () => {
+    const fixturePath = await createInitializedProject()
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      "lyra",
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+
+    const componentsJson = await fs.readJson(
+      path.join(fixturePath, "components.json")
+    )
+    expect(componentsJson.style).toBe("base-lyra")
+    expect(componentsJson.iconLibrary).toBe("phosphor")
+    expect(
+      await fs.pathExists(path.join(fixturePath, "components/ui/button.tsx"))
+    ).toBe(true)
+  })
+
+  it("should preserve rtl when applying a named preset", async () => {
+    const fixturePath = await createInitializedRtlProject()
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      "lyra",
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+
+    const componentsJson = await fs.readJson(
+      path.join(fixturePath, "components.json")
+    )
+    expect(componentsJson.rtl).toBe(true)
+  })
+})
diff --git a/packages/tests/src/utils/helpers.ts b/packages/tests/src/utils/helpers.ts
index b6437e2dc..bafe033e7 100644
--- a/packages/tests/src/utils/helpers.ts
+++ b/packages/tests/src/utils/helpers.ts
@@ -71,9 +71,11 @@ export async function npxShadcn(
   args: string[],
   {
     debug = false,
+    input,
     timeout,
   }: {
     debug?: boolean
+    input?: string
     timeout?: number
   } = {}
 ) {
@@ -82,6 +84,7 @@ export async function npxShadcn(
       REGISTRY_URL: getRegistryUrl(),
       SHADCN_TEMPLATE_DIR: TEMPLATES_DIR,
     },
+    input,
     timeout,
   })
 
diff --git a/skills/shadcn/SKILL.md b/skills/shadcn/SKILL.md
index 39d1e4817..0feb2cb5a 100644
--- a/skills/shadcn/SKILL.md
+++ b/skills/shadcn/SKILL.md
@@ -77,7 +77,7 @@ These rules are **always enforced**. Each links to a file with Incorrect/Correct
 
 ### CLI
 
-- **Never decode or fetch preset codes manually.** Pass them directly to `npx shadcn@latest init --preset <code>`.
+- **Never decode or fetch preset codes manually.** Pass them directly to `npx shadcn@latest apply --preset <code>` for existing projects, or `npx shadcn@latest init --preset <code>` when initializing.
 
 ## Key Patterns
 
@@ -173,11 +173,11 @@ npx shadcn@latest docs button dialog select
 6. **Fix imports in third-party components** — After adding components from community registries (e.g. `@bundui`, `@magicui`), check the added non-UI files for hardcoded import paths like `@/components/ui/...`. These won't match the project's actual aliases. Use `npx shadcn@latest info` to get the correct `ui` alias (e.g. `@workspace/ui/components`) and rewrite the imports accordingly. The CLI rewrites imports for its own UI files, but third-party registry components may use default paths that don't match the project.
 7. **Review added components** — After adding a component or block from any registry, **always read the added files and verify they are correct**. Check for missing sub-components (e.g. `SelectItem` without `SelectGroup`), missing imports, incorrect composition, or violations of the [Critical Rules](#critical-rules). Also replace any icon imports with the project's `iconLibrary` from the project context (e.g. if the registry item uses `lucide-react` but the project uses `hugeicons`, swap the imports and icon names accordingly). Fix all issues before moving on.
 8. **Registry must be explicit** — When the user asks to add a block or component, **do not guess the registry**. If no registry is specified (e.g. user says "add a login block" without specifying `@shadcn`, `@tailark`, etc.), ask which registry to use. Never default to a registry on behalf of the user.
-9. **Switching presets** — Ask the user first: **reinstall**, **merge**, or **skip**?
-   - **Reinstall**: `npx shadcn@latest init --preset <code> --force --reinstall`. Overwrites all components.
+9. **Switching presets** — Ask the user first: **overwrite**, **merge**, or **skip**?
+   - **Overwrite**: `npx shadcn@latest apply --preset <code>`. Overwrites detected components, fonts, and CSS variables.
    - **Merge**: `npx shadcn@latest init --preset <code> --force --no-reinstall`, then run `npx shadcn@latest info` to list installed components, then for each installed component use `--dry-run` and `--diff` to [smart merge](#updating-components) it individually.
    - **Skip**: `npx shadcn@latest init --preset <code> --force --no-reinstall`. Only updates config and CSS, leaves components as-is.
-   - **Important**: Always run preset commands inside the user's project directory. The CLI automatically preserves the current base (`base` vs `radix`) from `components.json`. If you must use a scratch/temp directory (e.g. for `--dry-run` comparisons), pass `--base <current-base>` explicitly — preset codes do not encode the base.
+   - **Important**: Always run preset commands inside the user's project directory. `apply` only works in an existing project with a `components.json` file. The CLI automatically preserves the current base (`base` vs `radix`) from `components.json`. If you must use a scratch/temp directory (e.g. for `--dry-run` comparisons), pass `--base <current-base>` explicitly — preset codes do not encode the base.
 
 ## Updating Components
 
@@ -206,6 +206,10 @@ npx shadcn@latest init --name my-app --preset base-nova --template next --monore
 npx shadcn@latest init --preset base-nova
 npx shadcn@latest init --defaults  # shortcut: --template=next --preset=base-nova
 
+# Apply a preset to an existing project.
+npx shadcn@latest apply --preset a2r6bw
+npx shadcn@latest apply a2r6bw
+
 # Add components.
 npx shadcn@latest add button card dialog
 npx shadcn@latest add @magicui/shimmer-button
@@ -227,9 +231,9 @@ npx shadcn@latest docs button dialog select
 npx shadcn@latest view @shadcn/button
 ```
 
-**Named presets:** `base-nova`, `radix-nova`
+**Named presets:** `nova`, `vega`, `maia`, `lyra`, `mira`, `luma`
 **Templates:** `next`, `vite`, `start`, `react-router`, `astro` (all support `--monorepo`) and `laravel` (not supported for monorepo)
-**Preset codes:** Base62 strings starting with `a` (e.g. `a2r6bw`), from [ui.shadcn.com](https://ui.shadcn.com).
+**Preset codes:** Version-prefixed base62 strings (e.g. `a2r6bw` or `b0`), from [ui.shadcn.com](https://ui.shadcn.com).
 
 ## Detailed References
 
diff --git a/skills/shadcn/cli.md b/skills/shadcn/cli.md
index bdbfe401c..291ac7af1 100644
--- a/skills/shadcn/cli.md
+++ b/skills/shadcn/cli.md
@@ -8,7 +8,7 @@ Configuration is read from `components.json`.
 
 ## Contents
 
-- Commands: init, add (dry-run, smart merge), search, view, docs, info, build
+- Commands: init, apply, add (dry-run, smart merge), search, view, docs, info, build
 - Templates: next, vite, start, react-router, astro
 - Presets: named, code, URL formats and fields
 - Switching presets
@@ -42,6 +42,24 @@ Initializes shadcn/ui in an existing project or creates a new project (when `--n
 
 `npx shadcn@latest create` is an alias for `npx shadcn@latest init`.
 
+### `apply` — Apply a preset to an existing project
+
+```bash
+npx shadcn@latest apply [preset] [options]
+```
+
+Applies a preset to an existing project, overwriting preset-driven config, fonts, CSS variables, and detected UI components.
+
+| Flag                | Short | Description                                | Default |
+| ------------------- | ----- | ------------------------------------------ | ------- |
+| `--preset <preset>` | —     | Preset configuration (named, code, or URL) | —       |
+| `--yes`             | `-y`  | Skip confirmation prompt                   | `false` |
+| `--cwd <cwd>`       | `-c`  | Working directory                          | current |
+| `--silent`          | —     | Mute output                                | `false` |
+
+`[preset]` is a shorthand for `--preset <preset>`. If both are provided, they must match.
+If no preset is provided, the CLI offers to open the custom preset builder on `ui.shadcn.com/create`.
+
 ### `add` — Add components
 
 > **IMPORTANT:** To compare local components against upstream or to preview changes, ALWAYS use `npx shadcn@latest add <component> --dry-run`, `--diff`, or `--view`. NEVER fetch raw files from GitHub or other sources manually. The CLI handles registry resolution, file paths, and CSS diffing automatically.
@@ -240,18 +258,19 @@ All templates support monorepo scaffolding via the `--monorepo` flag. When passe
 
 Three ways to specify a preset via `--preset`:
 
-1. **Named:** `--preset base-nova` or `--preset radix-nova`
-2. **Code:** `--preset a2r6bw` (base62 string, starts with lowercase `a`)
+1. **Named:** `--preset nova` or `--preset lyra`
+2. **Code:** `--preset a2r6bw` (version-prefixed base62 string, e.g. `a2r6bw` or `b0`)
 3. **URL:** `--preset "https://ui.shadcn.com/init?base=radix&style=nova&..."`
 
 > **IMPORTANT:** Never try to decode, fetch, or resolve preset codes manually. Preset codes are opaque — pass them directly to `npx shadcn@latest init --preset <code>` and let the CLI handle resolution.
+> Use `npx shadcn@latest apply --preset <code>` when overwriting an existing project's preset.
 
 ## Switching Presets
 
-Ask the user first: **reinstall**, **merge**, or **skip** existing components?
+Ask the user first: **overwrite**, **merge**, or **skip** existing components?
 
-- **Re-install** → `npx shadcn@latest init --preset <code> --force --reinstall`. Overwrites all component files with the new preset styles. Use when the user hasn't customized components.
+- **Overwrite / Re-install** → `npx shadcn@latest apply --preset <code>`. Overwrites all detected component files with the new preset styles. Use when the user hasn't customized components.
 - **Merge** → `npx shadcn@latest init --preset <code> --force --no-reinstall`, then run `npx shadcn@latest info` to get the list of installed components and use the [smart merge workflow](./SKILL.md#updating-components) to update them one by one, preserving local changes. Use when the user has customized components.
 - **Skip** → `npx shadcn@latest init --preset <code> --force --no-reinstall`. Only updates config and CSS variables, leaves existing components as-is.
 
-Always run preset commands inside the user's project directory. The CLI automatically preserves the current base (`base` vs `radix`) from `components.json`. If you must use a scratch/temp directory (e.g. for `--dry-run` comparisons), pass `--base <current-base>` explicitly — preset codes do not encode the base.
+Always run preset commands inside the user's project directory. `apply` only works in an existing project with a `components.json` file. The CLI automatically preserves the current base (`base` vs `radix`) from `components.json`. If you must use a scratch/temp directory (e.g. for `--dry-run` comparisons), pass `--base <current-base>` explicitly — preset codes do not encode the base.
diff --git a/skills/shadcn/customization.md b/skills/shadcn/customization.md
index 6e686ab0b..4cdb37641 100644
--- a/skills/shadcn/customization.md
+++ b/skills/shadcn/customization.md
@@ -54,7 +54,7 @@ Class-based toggle via `.dark` on the root element. In Next.js, use `next-themes
 ```tsx
 import { ThemeProvider } from "next-themes"
 
-<ThemeProvider attribute="class" defaultTheme="system" enableSystem>
+;<ThemeProvider attribute="class" defaultTheme="system" enableSystem>
   {children}
 </ThemeProvider>
 ```
@@ -65,14 +65,19 @@ import { ThemeProvider } from "next-themes"
 
 ```bash
 # Apply a preset code from ui.shadcn.com.
-npx shadcn@latest init --preset a2r6bw --force
+npx shadcn@latest apply --preset a2r6bw
 
-# Switch to a named preset.
-npx shadcn@latest init --preset radix-nova --force
-npx shadcn@latest init --reinstall  # update existing components to match
+# Positional shorthand also works.
+npx shadcn@latest apply a2r6bw
+
+# Switch to a named preset and overwrite existing components.
+npx shadcn@latest apply --preset nova
+
+# Preserve existing components instead.
+npx shadcn@latest init --preset nova --force --no-reinstall
 
 # Use a custom theme URL.
-npx shadcn@latest init --preset "https://ui.shadcn.com/init?base=radix&style=nova&theme=blue&..." --force
+npx shadcn@latest apply --preset "https://ui.shadcn.com/init?base=radix&style=nova&theme=blue&..."
 ```
 
 Or edit CSS variables directly in `globals.css`.
@@ -142,13 +147,15 @@ Prefer these approaches in order:
 ### 1. Built-in variants
 
 ```tsx
-<Button variant="outline" size="sm">Click</Button>
+<Button variant="outline" size="sm">
+  Click
+</Button>
 ```
 
 ### 2. Tailwind classes via `className`
 
 ```tsx
-<Card className="max-w-md mx-auto">...</Card>
+<Card className="mx-auto max-w-md">...</Card>
 ```
 
 ### 3. Add a new variant

From 3bdf60340de984d75f8c63d7940e59bfd081c655 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Mon, 6 Apr 2026 23:19:37 +0400
Subject: [PATCH 02/19] fix

---
 apps/v4/content/docs/(root)/cli.mdx | 76 +++++++++++------------------
 1 file changed, 28 insertions(+), 48 deletions(-)

diff --git a/apps/v4/content/docs/(root)/cli.mdx b/apps/v4/content/docs/(root)/cli.mdx
index 95ac99eda..61212d74c 100644
--- a/apps/v4/content/docs/(root)/cli.mdx
+++ b/apps/v4/content/docs/(root)/cli.mdx
@@ -54,54 +54,6 @@ npx shadcn@latest create
 
 ---
 
-## apply
-
-Use the `apply` command to apply a preset to an existing project.
-
-`apply` overwrites preset-driven config, fonts, CSS variables, and detected installed UI components. Commit or stash your changes before continuing so you can easily go back.
-
-`apply` requires an existing `components.json`. If your project is not initialized yet, run `shadcn init --preset <preset>` first.
-
-```bash
-npx shadcn@latest apply --preset a2r6bw
-```
-
-You can also pass the preset as a positional argument:
-
-```bash
-npx shadcn@latest apply a2r6bw
-```
-
-Named presets work the same way:
-
-```bash
-npx shadcn@latest apply lyra
-```
-
-If no preset is provided, the CLI offers to open the custom preset builder on `ui.shadcn.com/create`.
-
-Use `apply` for overwrite/reinstall flows. If you want to refresh config and CSS without reinstalling existing components, use `init --force --no-reinstall` instead.
-
-**Options**
-
-```bash
-Usage: shadcn apply [options] [preset]
-
-apply a preset to an existing project
-
-Arguments:
-  preset             the preset to apply
-
-Options:
-  --preset <preset>  preset configuration to apply
-  -y, --yes          skip confirmation prompt. (default: false)
-  -c, --cwd <cwd>    the working directory. defaults to the current directory.
-  --silent           mute output. (default: false)
-  -h, --help         display help for command
-```
-
----
-
 ## add
 
 Use the `add` command to add components and dependencies to your project.
@@ -135,6 +87,34 @@ Options:
 
 ---
 
+## apply
+
+Use the `apply` command to apply a preset to an existing project.
+
+```bash
+npx shadcn@latest apply --preset a2r6bw
+```
+
+**Options**
+
+```bash
+Usage: shadcn apply [options] [preset]
+
+apply a preset to an existing project
+
+Arguments:
+  preset             the preset to apply
+
+Options:
+  --preset <preset>  preset configuration to apply
+  -y, --yes          skip confirmation prompt. (default: false)
+  -c, --cwd <cwd>    the working directory. defaults to the current directory.
+  --silent           mute output. (default: false)
+  -h, --help         display help for command
+```
+
+---
+
 ## view
 
 Use the `view` command to view items from the registry before installing them.

From 58c9dc2a7ed1dd8762a9cdb83069962038a258a3 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Mon, 6 Apr 2026 23:27:09 +0400
Subject: [PATCH 03/19] fix

---
 packages/shadcn/src/commands/init.ts | 95 ++++++++++++++++------------
 1 file changed, 54 insertions(+), 41 deletions(-)

diff --git a/packages/shadcn/src/commands/init.ts b/packages/shadcn/src/commands/init.ts
index c553d4afa..8f66c645d 100644
--- a/packages/shadcn/src/commands/init.ts
+++ b/packages/shadcn/src/commands/init.ts
@@ -24,7 +24,12 @@ import { addComponents } from "@/src/utils/add-components"
 import { createProject } from "@/src/utils/create-project"
 import { loadEnvFiles } from "@/src/utils/env-loader"
 import * as ERRORS from "@/src/utils/errors"
-import { FILE_BACKUP_SUFFIX, withFileBackup } from "@/src/utils/file-helper"
+import {
+  createFileBackup,
+  deleteFileBackup,
+  FILE_BACKUP_SUFFIX,
+  restoreFileBackup,
+} from "@/src/utils/file-helper"
 import {
   DEFAULT_COMPONENTS,
   DEFAULT_TAILWIND_CONFIG,
@@ -123,8 +128,18 @@ export const init = new Command()
   .option("--reinstall", "re-install existing UI components.")
   .option("--no-reinstall", "do not re-install existing UI components.")
   .action(async (components, opts) => {
+    let componentsJsonBackupPath: string | undefined
     let reinstallComponents: string[] = []
 
+    const restoreBackupOnExit = () => {
+      if (componentsJsonBackupPath) {
+        restoreFileBackup(
+          componentsJsonBackupPath.replace(FILE_BACKUP_SUFFIX, "")
+        )
+      }
+    }
+    process.on("exit", restoreBackupOnExit)
+
     try {
       const options = initOptionsSchema.parse({
         ...opts,
@@ -164,7 +179,7 @@ export const init = new Command()
           logger.error(
             `Invalid preset: ${highlighter.info(
               options.preset
-            )}.\nUse one of the available presets: ${knownPresetNames.join(", ")} \nor build your own at ${highlighter.info(`${SHADCN_URL}/create`)}`
+            )}. Available presets: ${knownPresetNames.join(", ")}`
           )
           logger.break()
           process.exit(1)
@@ -480,53 +495,54 @@ export const init = new Command()
 
       await loadEnvFiles(options.cwd)
 
-      await withFileBackup(
-        path.resolve(cwd, "components.json"),
-        async () => {
-          // We need to check if we're initializing with a new style.
-          // This will allow us to determine if we need to install the base style.
-          if (components.length > 0) {
-            // Resolve registry:base config from the first component.
-            const {
-              registryBaseConfig,
-              installStyleIndex,
-              url: cleanUrl,
-            } = await resolveRegistryBaseConfig(components[0], cwd, {
-              registries: existingConfig?.registries as
-                | z.infer<typeof registryConfigSchema>
-                | undefined,
-            })
+      // We need to check if we're initializing with a new style.
+      // This will allow us to determine if we need to install the base style.
+      if (components.length > 0) {
+        const componentsJsonPath = path.resolve(cwd, "components.json")
 
-            // Use the clean URL (track param stripped) for subsequent fetches.
-            components[0] = cleanUrl
-
-            if (!installStyleIndex) {
-              options.installStyleIndex = false
-            }
-
-            if (registryBaseConfig) {
-              options.registryBaseConfig = registryBaseConfig
-            }
-          }
-
-          await runInit(options)
-        },
-        {
-          enabled: hasExistingConfig && components.length > 0,
-          onBackupFailure: () => {
+        if (hasExistingConfig) {
+          componentsJsonBackupPath =
+            createFileBackup(componentsJsonPath) ?? undefined
+          if (!componentsJsonBackupPath) {
             logger.warn(
               `Could not back up ${highlighter.info("components.json")}.`
             )
-          },
+          }
         }
-      )
+
+        const {
+          registryBaseConfig,
+          installStyleIndex,
+          url: cleanUrl,
+        } = await resolveRegistryBaseConfig(components[0], cwd, {
+          registries: existingConfig?.registries as
+            | z.infer<typeof registryConfigSchema>
+            | undefined,
+        })
+
+        components[0] = cleanUrl
+
+        if (!installStyleIndex) {
+          options.installStyleIndex = false
+        }
+
+        if (registryBaseConfig) {
+          options.registryBaseConfig = registryBaseConfig
+        }
+      }
+
+      await runInit(options)
 
       logger.break()
       logger.log(
         `Project initialization completed.\nYou may now add components.`
       )
+      process.removeListener("exit", restoreBackupOnExit)
+      deleteFileBackup(path.resolve(cwd, "components.json"))
       logger.break()
     } catch (error) {
+      process.removeListener("exit", restoreBackupOnExit)
+      restoreBackupOnExit()
       logger.break()
       handleError(error)
     } finally {
@@ -925,10 +941,7 @@ async function promptForMinimalConfig(
   })
 }
 
-export async function confirmBaseSwitch(
-  existingStyle: string,
-  resolvedBase: string
-) {
+async function confirmBaseSwitch(existingStyle: string, resolvedBase: string) {
   // Styles prefixed with "base-" use Base UI. Everything else is Radix.
   const oldBase = existingStyle.startsWith("base-") ? "base" : "radix"
   if (resolvedBase === oldBase) return resolvedBase

From e3d2b14911076d3d3afa87f662f871933bee5eb3 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Mon, 6 Apr 2026 23:27:15 +0400
Subject: [PATCH 04/19] fix

---
 apps/v4/content/docs/(root)/cli.mdx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/v4/content/docs/(root)/cli.mdx b/apps/v4/content/docs/(root)/cli.mdx
index 61212d74c..6e6e86ca0 100644
--- a/apps/v4/content/docs/(root)/cli.mdx
+++ b/apps/v4/content/docs/(root)/cli.mdx
@@ -9,8 +9,6 @@ Use the `init` command to initialize configuration and dependencies for an exist
 
 The `init` command installs dependencies, adds the `cn` util and configures CSS variables for the project.
 
-For preset reapplication in an existing project, use [`apply`](#apply) when you want to overwrite preset-driven files and reinstall detected UI components. Use `init --force --no-reinstall` when you want to update config and CSS without reinstalling existing components.
-
 ```bash
 npx shadcn@latest init
 ```
@@ -18,7 +16,7 @@ npx shadcn@latest init
 **Options**
 
 ```bash
-Usage: shadcn init|create [options] [components...]
+Usage: shadcn init [options] [components...]
 
 initialize your project and install dependencies
 
@@ -28,8 +26,6 @@ Arguments:
 Options:
   -t, --template <template>  the template to use. (next, vite, start, react-router, laravel, astro)
   -b, --base <base>          the component library to use. (radix, base)
-  --monorepo                 scaffold a monorepo project.
-  --no-monorepo              skip the monorepo prompt.
   -p, --preset [name]        use a preset configuration
   -y, --yes                  skip confirmation prompt. (default: true)
   -d, --defaults             use default configuration: --template=next --preset=base-nova (default: false)
@@ -39,6 +35,8 @@ Options:
   -s, --silent               mute output. (default: false)
   --css-variables            use css variables for theming. (default: true)
   --no-css-variables         do not use css variables for theming.
+  --monorepo                 scaffold a monorepo project.
+  --no-monorepo              skip the monorepo prompt.
   --rtl                      enable RTL support.
   --no-rtl                   disable RTL support.
   --reinstall                re-install existing UI components.

From 7cb3b13a33c5bf3b3cd6bc51d75720fe1828261d Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Mon, 6 Apr 2026 23:32:48 +0400
Subject: [PATCH 05/19] fix

---
 packages/shadcn/src/commands/apply.ts | 37 ++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/packages/shadcn/src/commands/apply.ts b/packages/shadcn/src/commands/apply.ts
index 1817fc851..32820343f 100644
--- a/packages/shadcn/src/commands/apply.ts
+++ b/packages/shadcn/src/commands/apply.ts
@@ -1,5 +1,5 @@
 import path from "path"
-import { confirmBaseSwitch, runInit } from "@/src/commands/init"
+import { runInit } from "@/src/commands/init"
 import { preFlightApply } from "@/src/preflights/preflight-apply"
 import { decodePreset, isPresetCode } from "@/src/preset/preset"
 import {
@@ -323,3 +323,38 @@ function getInitCommand(preset?: string) {
 
   return `shadcn init --preset ${quoteShellArg(preset)}`
 }
+
+async function confirmBaseSwitch(
+  existingStyle: string,
+  resolvedBase: "radix" | "base"
+) {
+  const oldBase = existingStyle.startsWith("base-") ? "base" : "radix"
+  if (resolvedBase === oldBase) return resolvedBase
+
+  logger.warn(
+    `  You are switching from ${highlighter.info(
+      oldBase
+    )} to ${highlighter.info(resolvedBase)}.`
+  )
+  logger.warn(
+    `  Components outside the ${highlighter.info(
+      "ui"
+    )} directory that depend on ${highlighter.info(
+      oldBase
+    )} primitives may need manual updates.`
+  )
+  logger.break()
+
+  const { proceed } = await prompts({
+    type: "confirm",
+    name: "proceed",
+    message: "Would you like to continue?",
+    initial: true,
+  })
+
+  if (!proceed) {
+    process.exit(1)
+  }
+
+  return resolvedBase
+}

From e3d654fd265565226bef2448a4a305bdfcf5b33f Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 14:01:23 +0400
Subject: [PATCH 06/19] fix

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 skills/shadcn/customization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skills/shadcn/customization.md b/skills/shadcn/customization.md
index 4cdb37641..16954f56b 100644
--- a/skills/shadcn/customization.md
+++ b/skills/shadcn/customization.md
@@ -54,7 +54,7 @@ Class-based toggle via `.dark` on the root element. In Next.js, use `next-themes
 ```tsx
 import { ThemeProvider } from "next-themes"
 
-;<ThemeProvider attribute="class" defaultTheme="system" enableSystem>
+<ThemeProvider attribute="class" defaultTheme="system" enableSystem>
   {children}
 </ThemeProvider>
 ```

From 7ff9778ff0962dc2f9d4817857d1a7f6ab7f4f14 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 15:27:33 +0400
Subject: [PATCH 07/19] fix

---
 apps/v4/content/docs/(root)/cli.mdx           |   2 +-
 packages/shadcn/src/commands/apply.test.ts    |  14 ++-
 packages/shadcn/src/commands/apply.ts         | 109 +++++-------------
 packages/shadcn/src/utils/file-helper.test.ts |  25 +++-
 packages/shadcn/src/utils/file-helper.ts      |   7 +-
 packages/tests/src/tests/apply.test.ts        |  69 +++++++++++
 skills/shadcn/cli.md                          |   2 +-
 7 files changed, 135 insertions(+), 93 deletions(-)

diff --git a/apps/v4/content/docs/(root)/cli.mdx b/apps/v4/content/docs/(root)/cli.mdx
index 6e6e86ca0..67c14d309 100644
--- a/apps/v4/content/docs/(root)/cli.mdx
+++ b/apps/v4/content/docs/(root)/cli.mdx
@@ -107,7 +107,7 @@ Options:
   --preset <preset>  preset configuration to apply
   -y, --yes          skip confirmation prompt. (default: false)
   -c, --cwd <cwd>    the working directory. defaults to the current directory.
-  --silent           mute output. (default: false)
+  -s, --silent       mute output. (default: false)
   -h, --help         display help for command
 ```
 
diff --git a/packages/shadcn/src/commands/apply.test.ts b/packages/shadcn/src/commands/apply.test.ts
index 67c588033..58bc8c419 100644
--- a/packages/shadcn/src/commands/apply.test.ts
+++ b/packages/shadcn/src/commands/apply.test.ts
@@ -7,7 +7,7 @@ const SHADCN_URL = REGISTRY_URL.replace(/\/r\/?$/, "")
 
 describe("resolveApplyInitUrl", () => {
   it("should include the inferred template for preset codes", () => {
-    const { initUrl, presetBase } = resolveApplyInitUrl("a0", "base", {
+    const initUrl = resolveApplyInitUrl("a0", "base", {
       template: "next",
       rtl: true,
     })
@@ -16,12 +16,12 @@ describe("resolveApplyInitUrl", () => {
     expect(parsed.origin + parsed.pathname).toBe(`${SHADCN_URL}/init`)
     expect(parsed.searchParams.get("template")).toBe("next")
     expect(parsed.searchParams.get("preset")).toBe("a0")
+    expect(parsed.searchParams.get("base")).toBe("base")
     expect(parsed.searchParams.get("rtl")).toBe("true")
-    expect(presetBase).toBeUndefined()
   })
 
   it("should include the inferred template for named presets", () => {
-    const { initUrl, presetBase } = resolveApplyInitUrl("lyra", "base", {
+    const initUrl = resolveApplyInitUrl("lyra", "base", {
       template: "next",
       rtl: true,
     })
@@ -31,17 +31,19 @@ describe("resolveApplyInitUrl", () => {
     expect(parsed.searchParams.get("template")).toBe("next")
     expect(parsed.searchParams.get("base")).toBe("base")
     expect(parsed.searchParams.get("rtl")).toBe("true")
-    expect(presetBase).toBeUndefined()
   })
 
-  it("should preserve raw preset URLs without injecting a template", () => {
+  it("should keep the current base for raw preset URLs without injecting a template", () => {
     const presetUrl = `${SHADCN_URL}/init?base=radix&style=nova&baseColor=neutral&theme=neutral&iconLibrary=lucide&font=inter&rtl=false&menuAccent=subtle&menuColor=default&radius=default`
-    const { initUrl } = resolveApplyInitUrl(presetUrl, "base", {
+    const initUrl = resolveApplyInitUrl(presetUrl, "base", {
       template: "next",
+      rtl: true,
     })
     const parsed = new URL(initUrl)
 
     expect(parsed.searchParams.get("template")).toBeNull()
     expect(parsed.searchParams.get("track")).toBe("1")
+    expect(parsed.searchParams.get("base")).toBe("base")
+    expect(parsed.searchParams.get("rtl")).toBe("true")
   })
 })
diff --git a/packages/shadcn/src/commands/apply.ts b/packages/shadcn/src/commands/apply.ts
index 32820343f..a6e88073b 100644
--- a/packages/shadcn/src/commands/apply.ts
+++ b/packages/shadcn/src/commands/apply.ts
@@ -48,7 +48,7 @@ export const apply = new Command()
     "the working directory. defaults to the current directory.",
     process.cwd()
   )
-  .option("--silent", "mute output.", false)
+  .option("-s, --silent", "mute output.", false)
   .action(async (positionalPreset, opts) => {
     try {
       const options = applyOptionsSchema.parse({
@@ -153,16 +153,11 @@ export const apply = new Command()
       await loadEnvFiles(options.cwd)
 
       const currentBase = getBase(existingConfig.style)
-      const { initUrl, presetBase } = resolveApplyInitUrl(preset, currentBase, {
+      const initUrl = resolveApplyInitUrl(preset, currentBase, {
         template,
         rtl,
       })
 
-      let resolvedBase = presetBase ?? currentBase
-      resolvedBase = await confirmBaseSwitch(existingConfig.style, resolvedBase)
-
-      const nextInitUrl = setApplyInitUrlBase(initUrl, resolvedBase)
-
       await withFileBackup(
         path.resolve(options.cwd, "components.json"),
         async () => {
@@ -170,7 +165,7 @@ export const apply = new Command()
             registryBaseConfig,
             installStyleIndex,
             url: cleanUrl,
-          } = await resolveRegistryBaseConfig(nextInitUrl, options.cwd, {
+          } = await resolveRegistryBaseConfig(initUrl, options.cwd, {
             registries: existingConfig.registries as
               | z.infer<typeof registryConfigSchema>
               | undefined,
@@ -179,7 +174,7 @@ export const apply = new Command()
           await runInit({
             cwd: options.cwd,
             yes: true,
-            force: true,
+            force: false,
             reinstall: true,
             defaults: false,
             silent: options.silent,
@@ -193,15 +188,17 @@ export const apply = new Command()
         },
         {
           onBackupFailure: () => {
-            logger.warn(
-              `Could not back up ${highlighter.info("components.json")}.`
+            logger.error(
+              `Could not back up ${highlighter.info(
+                "components.json"
+              )}. Aborting.`
             )
           },
         }
       )
 
       logger.break()
-      logger.log(`Preset applied successfully.`)
+      logger.log("Preset applied successfully.")
       logger.break()
     } catch (error) {
       logger.break()
@@ -263,11 +260,10 @@ export function resolveApplyInitUrl(
       url.searchParams.set("track", "1")
     }
 
-    return {
-      initUrl: url.toString(),
-      presetBase:
-        (url.searchParams.get("base") as "radix" | "base" | null) ?? undefined,
-    }
+    url.searchParams.set("base", currentBase)
+    url.searchParams.set("rtl", String(options.rtl ?? false))
+
+    return url.toString()
   }
 
   if (isPresetCode(preset)) {
@@ -278,38 +274,26 @@ export function resolveApplyInitUrl(
       process.exit(1)
     }
 
-    return {
-      initUrl: resolveInitUrl(
-        {
-          ...decoded,
-          base: "radix",
-          rtl: options.rtl ?? false,
-        },
-        { preset, template: options.template }
-      ),
-      presetBase: undefined,
-    }
+    return resolveInitUrl(
+      {
+        ...decoded,
+        base: currentBase,
+        rtl: options.rtl ?? false,
+      },
+      { preset, template: options.template }
+    )
   }
 
   const resolvedPreset = DEFAULT_PRESETS[preset as keyof typeof DEFAULT_PRESETS]
 
-  return {
-    initUrl: resolveInitUrl(
-      {
-        ...resolvedPreset,
-        base: currentBase,
-        rtl: options.rtl ?? resolvedPreset.rtl,
-      },
-      { template: options.template }
-    ),
-    presetBase: undefined,
-  }
-}
-
-function setApplyInitUrlBase(initUrl: string, base: "radix" | "base") {
-  const url = new URL(initUrl)
-  url.searchParams.set("base", base)
-  return url.toString()
+  return resolveInitUrl(
+    {
+      ...resolvedPreset,
+      base: currentBase,
+      rtl: options.rtl ?? resolvedPreset.rtl,
+    },
+    { template: options.template }
+  )
 }
 
 function quoteShellArg(value: string) {
@@ -323,38 +307,3 @@ function getInitCommand(preset?: string) {
 
   return `shadcn init --preset ${quoteShellArg(preset)}`
 }
-
-async function confirmBaseSwitch(
-  existingStyle: string,
-  resolvedBase: "radix" | "base"
-) {
-  const oldBase = existingStyle.startsWith("base-") ? "base" : "radix"
-  if (resolvedBase === oldBase) return resolvedBase
-
-  logger.warn(
-    `  You are switching from ${highlighter.info(
-      oldBase
-    )} to ${highlighter.info(resolvedBase)}.`
-  )
-  logger.warn(
-    `  Components outside the ${highlighter.info(
-      "ui"
-    )} directory that depend on ${highlighter.info(
-      oldBase
-    )} primitives may need manual updates.`
-  )
-  logger.break()
-
-  const { proceed } = await prompts({
-    type: "confirm",
-    name: "proceed",
-    message: "Would you like to continue?",
-    initial: true,
-  })
-
-  if (!proceed) {
-    process.exit(1)
-  }
-
-  return resolvedBase
-}
diff --git a/packages/shadcn/src/utils/file-helper.test.ts b/packages/shadcn/src/utils/file-helper.test.ts
index e1416fe86..52f43f83f 100644
--- a/packages/shadcn/src/utils/file-helper.test.ts
+++ b/packages/shadcn/src/utils/file-helper.test.ts
@@ -1,7 +1,7 @@
 import os from "os"
 import path from "path"
 import fs from "fs-extra"
-import { afterEach, describe, expect, it } from "vitest"
+import { afterEach, describe, expect, it, vi } from "vitest"
 
 import { FILE_BACKUP_SUFFIX, withFileBackup } from "./file-helper"
 
@@ -46,4 +46,27 @@ describe("withFileBackup", () => {
     expect(await fs.readFile(filePath, "utf8")).toBe('{"style":"after"}\n')
     expect(await fs.pathExists(`${filePath}${FILE_BACKUP_SUFFIX}`)).toBe(false)
   })
+
+  it("should abort when backup creation fails", async () => {
+    const filePath = await createTempFile()
+    const consoleErrorSpy = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {})
+    const renameSyncSpy = vi
+      .spyOn(fs, "renameSync")
+      .mockImplementation(() => {
+        throw new Error("boom")
+      })
+
+    await expect(
+      withFileBackup(filePath, async () => {
+        await fs.writeFile(filePath, '{"style":"after"}\n', "utf8")
+      })
+    ).rejects.toThrow(`Could not back up ${filePath}.`)
+
+    expect(await fs.readFile(filePath, "utf8")).toBe('{"style":"before"}\n')
+
+    renameSyncSpy.mockRestore()
+    consoleErrorSpy.mockRestore()
+  })
 })
diff --git a/packages/shadcn/src/utils/file-helper.ts b/packages/shadcn/src/utils/file-helper.ts
index 55b04c17f..dceccba12 100644
--- a/packages/shadcn/src/utils/file-helper.ts
+++ b/packages/shadcn/src/utils/file-helper.ts
@@ -3,7 +3,6 @@ import fsExtra from "fs-extra"
 export const FILE_BACKUP_SUFFIX = ".bak"
 
 type WithFileBackupOptions = {
-  enabled?: boolean
   onBackupFailure?: (filePath: string) => void
 }
 
@@ -50,7 +49,7 @@ export function deleteFileBackup(filePath: string): boolean {
   try {
     fsExtra.unlinkSync(backupPath)
     return true
-  } catch (error) {
+  } catch {
     // Best effort - don't log as this is just cleanup
     return false
   }
@@ -61,7 +60,7 @@ export async function withFileBackup<T>(
   task: () => Promise<T>,
   options: WithFileBackupOptions = {}
 ) {
-  if (options.enabled === false || !fsExtra.existsSync(filePath)) {
+  if (!fsExtra.existsSync(filePath)) {
     return task()
   }
 
@@ -69,7 +68,7 @@ export async function withFileBackup<T>(
 
   if (!backupPath) {
     options.onBackupFailure?.(filePath)
-    return task()
+    throw new Error(`Could not back up ${filePath}.`)
   }
 
   const restoreBackupOnExit = () => restoreFileBackup(filePath)
diff --git a/packages/tests/src/tests/apply.test.ts b/packages/tests/src/tests/apply.test.ts
index 3658b8884..63c38d9c0 100644
--- a/packages/tests/src/tests/apply.test.ts
+++ b/packages/tests/src/tests/apply.test.ts
@@ -23,6 +23,13 @@ async function createInitializedRtlProject() {
   return fixturePath
 }
 
+async function createInitializedRadixProject() {
+  const fixturePath = await createFixtureTestDirectory("next-app")
+  await npxShadcn(fixturePath, ["init", "--preset", "a0", "--base", "radix"])
+  await npxShadcn(fixturePath, ["add", "button"])
+  return fixturePath
+}
+
 describe("shadcn apply", () => {
   it("should apply a preset with --preset <code>", async () => {
     const fixturePath = await createInitializedProject()
@@ -260,4 +267,66 @@ describe("shadcn apply", () => {
     )
     expect(componentsJson.rtl).toBe(true)
   })
+
+  it("should preserve the current base for raw preset urls", async () => {
+    const fixturePath = await createInitializedRadixProject()
+    const presetUrl = `${getRegistryUrl().replace(/\/r\/?$/, "")}/init?base=base&style=lyra&baseColor=neutral&theme=neutral&iconLibrary=phosphor&font=manrope&rtl=false&menuAccent=subtle&menuColor=default&radius=default`
+
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      presetUrl,
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+
+    const componentsJson = await fs.readJson(
+      path.join(fixturePath, "components.json")
+    )
+    expect(componentsJson.style).toBe("radix-lyra")
+  })
+
+  it("should preserve rtl for raw preset urls", async () => {
+    const fixturePath = await createInitializedRtlProject()
+    const presetUrl = `${getRegistryUrl().replace(/\/r\/?$/, "")}/init?base=base&style=lyra&baseColor=neutral&theme=neutral&iconLibrary=phosphor&font=manrope&rtl=false&menuAccent=subtle&menuColor=default&radius=default`
+
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      presetUrl,
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+
+    const componentsJson = await fs.readJson(
+      path.join(fixturePath, "components.json")
+    )
+    expect(componentsJson.rtl).toBe(true)
+    expect(componentsJson.style).toBe("base-lyra")
+  })
+
+  it("should preserve non-preset config when applying a preset", async () => {
+    const fixturePath = await createInitializedProject()
+    const componentsJsonPath = path.join(fixturePath, "components.json")
+    const componentsJson = await fs.readJson(componentsJsonPath)
+
+    componentsJson.tailwind.prefix = "tw-"
+    await fs.writeJson(componentsJsonPath, componentsJson, { spaces: 2 })
+
+    const result = await npxShadcn(fixturePath, [
+      "apply",
+      "--preset",
+      "lyra",
+      "-y",
+    ])
+
+    expect(result.exitCode).toBe(0)
+
+    const updatedConfig = await fs.readJson(componentsJsonPath)
+    expect(updatedConfig.tailwind.prefix).toBe("tw-")
+    expect(updatedConfig.style).toBe("base-lyra")
+    expect(updatedConfig.iconLibrary).toBe("phosphor")
+  })
 })
diff --git a/skills/shadcn/cli.md b/skills/shadcn/cli.md
index 291ac7af1..c3a0f0aa7 100644
--- a/skills/shadcn/cli.md
+++ b/skills/shadcn/cli.md
@@ -55,7 +55,7 @@ Applies a preset to an existing project, overwriting preset-driven config, fonts
 | `--preset <preset>` | —     | Preset configuration (named, code, or URL) | —       |
 | `--yes`             | `-y`  | Skip confirmation prompt                   | `false` |
 | `--cwd <cwd>`       | `-c`  | Working directory                          | current |
-| `--silent`          | —     | Mute output                                | `false` |
+| `--silent`          | `-s`  | Mute output                                | `false` |
 
 `[preset]` is a shorthand for `--preset <preset>`. If both are provided, they must match.
 If no preset is provided, the CLI offers to open the custom preset builder on `ui.shadcn.com/create`.

From 13b4593f3795d0f15d1ba10689249c82e9f2621c Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 15:49:26 +0400
Subject: [PATCH 08/19] fix

---
 packages/shadcn/src/utils/file-helper.test.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/shadcn/src/utils/file-helper.test.ts b/packages/shadcn/src/utils/file-helper.test.ts
index 52f43f83f..5b8c34db3 100644
--- a/packages/shadcn/src/utils/file-helper.test.ts
+++ b/packages/shadcn/src/utils/file-helper.test.ts
@@ -52,11 +52,9 @@ describe("withFileBackup", () => {
     const consoleErrorSpy = vi
       .spyOn(console, "error")
       .mockImplementation(() => {})
-    const renameSyncSpy = vi
-      .spyOn(fs, "renameSync")
-      .mockImplementation(() => {
-        throw new Error("boom")
-      })
+    const renameSyncSpy = vi.spyOn(fs, "renameSync").mockImplementation(() => {
+      throw new Error("boom")
+    })
 
     await expect(
       withFileBackup(filePath, async () => {

From 42284f4e6466cce9e65d94ecf54294972f673514 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 18:02:05 +0400
Subject: [PATCH 09/19] test: update rtl

---
 packages/tests/src/tests/apply.test.ts | 76 ++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/packages/tests/src/tests/apply.test.ts b/packages/tests/src/tests/apply.test.ts
index 63c38d9c0..fb22fc47b 100644
--- a/packages/tests/src/tests/apply.test.ts
+++ b/packages/tests/src/tests/apply.test.ts
@@ -23,6 +23,19 @@ async function createInitializedRtlProject() {
   return fixturePath
 }
 
+async function createInitializedViteRtlProject() {
+  const fixturePath = await createFixtureTestDirectory("vite-app")
+  await npxShadcn(fixturePath, ["init", "--defaults", "--rtl"])
+  await npxShadcn(
+    fixturePath,
+    ["add", "breadcrumb", "pagination", "sidebar", "-y"],
+    {
+      timeout: 120000,
+    }
+  )
+  return fixturePath
+}
+
 async function createInitializedRadixProject() {
   const fixturePath = await createFixtureTestDirectory("next-app")
   await npxShadcn(fixturePath, ["init", "--preset", "a0", "--base", "radix"])
@@ -329,4 +342,67 @@ describe("shadcn apply", () => {
     expect(updatedConfig.style).toBe("base-lyra")
     expect(updatedConfig.iconLibrary).toBe("phosphor")
   })
+
+  it("should keep vite component output rtl-aware when applying a new preset", async () => {
+    const fixturePath = await createInitializedViteRtlProject()
+    const componentsJsonPath = path.join(fixturePath, "components.json")
+    const breadcrumbPath = path.join(
+      fixturePath,
+      "src/components/ui/breadcrumb.tsx"
+    )
+    const paginationPath = path.join(
+      fixturePath,
+      "src/components/ui/pagination.tsx"
+    )
+    const sidebarPath = path.join(fixturePath, "src/components/ui/sidebar.tsx")
+
+    const initialConfig = await fs.readJson(componentsJsonPath)
+    const initialBreadcrumb = await fs.readFile(breadcrumbPath, "utf8")
+    const initialPagination = await fs.readFile(paginationPath, "utf8")
+    const initialSidebar = await fs.readFile(sidebarPath, "utf8")
+
+    expect(initialConfig.style).toBe("base-nova")
+    expect(initialConfig.iconLibrary).toBe("lucide")
+    expect(initialConfig.rtl).toBe(true)
+    expect(initialBreadcrumb).toContain("rtl:rotate-180")
+    expect(initialPagination).toContain("ps-1.5!")
+    expect(initialPagination).toContain("pe-1.5!")
+    expect(initialPagination).toContain("rtl:rotate-180")
+    expect(initialSidebar).toContain("start-")
+    expect(initialSidebar).toContain("end-")
+    expect(initialSidebar).toContain("ms-")
+    expect(initialSidebar).toContain("pe-")
+    expect(initialSidebar).toContain("rtl:")
+
+    const result = await npxShadcn(
+      fixturePath,
+      ["apply", "--preset", "lyra", "-y"],
+      {
+        timeout: 120000,
+      }
+    )
+
+    expect(result.exitCode).toBe(0)
+
+    const updatedConfig = await fs.readJson(componentsJsonPath)
+    const updatedBreadcrumb = await fs.readFile(breadcrumbPath, "utf8")
+    const updatedPagination = await fs.readFile(paginationPath, "utf8")
+    const updatedSidebar = await fs.readFile(sidebarPath, "utf8")
+
+    expect(updatedConfig.style).toBe("base-lyra")
+    expect(updatedConfig.iconLibrary).toBe("phosphor")
+    expect(updatedConfig.rtl).toBe(true)
+    expect(updatedBreadcrumb).toContain("rtl:rotate-180")
+    expect(updatedPagination).toContain("ps-1.5!")
+    expect(updatedPagination).toContain("pe-1.5!")
+    expect(updatedPagination).toContain("rtl:rotate-180")
+    expect(updatedSidebar).toContain("start-")
+    expect(updatedSidebar).toContain("end-")
+    expect(updatedSidebar).toContain("ms-")
+    expect(updatedSidebar).toContain("pe-")
+    expect(updatedSidebar).toContain("rtl:")
+    expect(updatedBreadcrumb).not.toBe(initialBreadcrumb)
+    expect(updatedPagination).not.toBe(initialPagination)
+    expect(updatedSidebar).not.toBe(initialSidebar)
+  })
 })

From 575f1602a1a8e56ec6a96cd4c94ebc741bdf0089 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 21:05:08 +0400
Subject: [PATCH 10/19] fix

---
 packages/shadcn/src/commands/init.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/shadcn/src/commands/init.ts b/packages/shadcn/src/commands/init.ts
index 8f66c645d..650840d3d 100644
--- a/packages/shadcn/src/commands/init.ts
+++ b/packages/shadcn/src/commands/init.ts
@@ -131,6 +131,7 @@ export const init = new Command()
     let componentsJsonBackupPath: string | undefined
     let reinstallComponents: string[] = []
 
+    // Restore components.json backup on unexpected exit (e.g. process.exit in preflight).
     const restoreBackupOnExit = () => {
       if (componentsJsonBackupPath) {
         restoreFileBackup(
@@ -498,6 +499,9 @@ export const init = new Command()
       // We need to check if we're initializing with a new style.
       // This will allow us to determine if we need to install the base style.
       if (components.length > 0) {
+        // Back up existing components.json if it exists.
+        // Since components.json might not be valid at this point,
+        // temporarily rename it to allow preflight to run.
         const componentsJsonPath = path.resolve(cwd, "components.json")
 
         if (hasExistingConfig) {
@@ -510,6 +514,7 @@ export const init = new Command()
           }
         }
 
+        // Resolve registry:base config from the first component.
         const {
           registryBaseConfig,
           installStyleIndex,
@@ -520,6 +525,7 @@ export const init = new Command()
             | undefined,
         })
 
+        // Use the clean URL (track param stripped) for subsequent fetches.
         components[0] = cleanUrl
 
         if (!installStyleIndex) {
@@ -537,10 +543,13 @@ export const init = new Command()
       logger.log(
         `Project initialization completed.\nYou may now add components.`
       )
+
+      // Success — remove the backup and exit listener.
       process.removeListener("exit", restoreBackupOnExit)
       deleteFileBackup(path.resolve(cwd, "components.json"))
       logger.break()
     } catch (error) {
+      // Restore handled by exit listener, but also do it here for non-exit errors.
       process.removeListener("exit", restoreBackupOnExit)
       restoreBackupOnExit()
       logger.break()

From 7811557088b8df3cb83e9f5f85e596e224cc2271 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 21:23:59 +0400
Subject: [PATCH 11/19] fix

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 apps/v4/content/docs/(root)/cli.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/v4/content/docs/(root)/cli.mdx b/apps/v4/content/docs/(root)/cli.mdx
index 67c14d309..b8e8760d8 100644
--- a/apps/v4/content/docs/(root)/cli.mdx
+++ b/apps/v4/content/docs/(root)/cli.mdx
@@ -28,7 +28,7 @@ Options:
   -b, --base <base>          the component library to use. (radix, base)
   -p, --preset [name]        use a preset configuration
   -y, --yes                  skip confirmation prompt. (default: true)
-  -d, --defaults             use default configuration: --template=next --preset=base-nova (default: false)
+  -d, --defaults             use default configuration: --template=next --preset=nova (default: false)
   -f, --force                force overwrite of existing configuration. (default: false)
   -c, --cwd <cwd>            the working directory. defaults to the current directory.
   -n, --name <name>          the name for the new project.

From 3a2d812510eaa54558c4e6273da521a42db9290b Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 21:24:14 +0400
Subject: [PATCH 12/19] fix

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 skills/shadcn/SKILL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skills/shadcn/SKILL.md b/skills/shadcn/SKILL.md
index 0feb2cb5a..1351394fb 100644
--- a/skills/shadcn/SKILL.md
+++ b/skills/shadcn/SKILL.md
@@ -204,7 +204,7 @@ npx shadcn@latest init --name my-app --preset base-nova --template next --monore
 
 # Initialize existing project.
 npx shadcn@latest init --preset base-nova
-npx shadcn@latest init --defaults  # shortcut: --template=next --preset=base-nova
+npx shadcn@latest init --defaults  # shortcut: --template=next --preset=nova (base style implied)
 
 # Apply a preset to an existing project.
 npx shadcn@latest apply --preset a2r6bw

From 5ebd54198d8f318b74a26a361127d8d4bdf83be8 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Tue, 7 Apr 2026 21:36:09 +0400
Subject: [PATCH 13/19] fix

---
 packages/shadcn/src/preflights/preflight-apply.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/shadcn/src/preflights/preflight-apply.ts b/packages/shadcn/src/preflights/preflight-apply.ts
index 2c8926b35..233f9c607 100644
--- a/packages/shadcn/src/preflights/preflight-apply.ts
+++ b/packages/shadcn/src/preflights/preflight-apply.ts
@@ -1,5 +1,4 @@
 import path from "path"
-import { applyOptionsSchema } from "@/src/commands/apply"
 import { SHADCN_URL } from "@/src/registry/constants"
 import * as ERRORS from "@/src/utils/errors"
 import { getConfig } from "@/src/utils/get-config"
@@ -11,11 +10,8 @@ import {
 import { highlighter } from "@/src/utils/highlighter"
 import { logger } from "@/src/utils/logger"
 import fs from "fs-extra"
-import { z } from "zod"
 
-export async function preFlightApply(
-  options: z.infer<typeof applyOptionsSchema>
-) {
+export async function preFlightApply(options: { cwd: string }) {
   const errors: Record<string, boolean> = {}
 
   if (

From 2c4678c8c8a5f197acb576a30a1b8cf5a4fdd535 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Apr 2026 17:48:58 +0000
Subject: [PATCH 14/19] chore(release): version packages

---
 .changeset/common-pears-accept.md | 5 -----
 apps/v4/package.json              | 2 +-
 packages/shadcn/CHANGELOG.md      | 6 ++++++
 packages/shadcn/package.json      | 2 +-
 pnpm-lock.yaml                    | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 .changeset/common-pears-accept.md

diff --git a/.changeset/common-pears-accept.md b/.changeset/common-pears-accept.md
deleted file mode 100644
index c5662c64b..000000000
--- a/.changeset/common-pears-accept.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"shadcn": minor
----
-
-add shadcn apply command
diff --git a/apps/v4/package.json b/apps/v4/package.json
index 3d81cb17a..67ca568de 100644
--- a/apps/v4/package.json
+++ b/apps/v4/package.json
@@ -76,7 +76,7 @@
     "rehype-pretty-code": "^0.14.1",
     "rimraf": "^6.0.1",
     "server-only": "^0.0.1",
-    "shadcn": "4.1.2",
+    "shadcn": "4.2.0",
     "shiki": "^1.10.1",
     "sonner": "^2.0.0",
     "swr": "^2.3.6",
diff --git a/packages/shadcn/CHANGELOG.md b/packages/shadcn/CHANGELOG.md
index 033913367..3433b3d11 100644
--- a/packages/shadcn/CHANGELOG.md
+++ b/packages/shadcn/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @shadcn/ui
 
+## 4.2.0
+
+### Minor Changes
+
+- [#10313](https://github.com/shadcn-ui/ui/pull/10313) [`c1e29824cd7a6809448e45b6b7fe8f7be71ecb0f`](https://github.com/shadcn-ui/ui/commit/c1e29824cd7a6809448e45b6b7fe8f7be71ecb0f) Thanks [@shadcn](https://github.com/shadcn)! - add shadcn apply command
+
 ## 4.1.2
 
 ### Patch Changes
diff --git a/packages/shadcn/package.json b/packages/shadcn/package.json
index b5a68ada5..5d5fde188 100644
--- a/packages/shadcn/package.json
+++ b/packages/shadcn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shadcn",
-  "version": "4.1.2",
+  "version": "4.2.0",
   "description": "Add components to your apps.",
   "publishConfig": {
     "access": "public"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02e0946b3..f70327034 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -284,7 +284,7 @@ importers:
         specifier: ^0.0.1
         version: 0.0.1
       shadcn:
-        specifier: 4.1.2
+        specifier: 4.2.0
         version: link:../../packages/shadcn
       shiki:
         specifier: ^1.10.1

From 08212a478dc78a889dc3b6316ef834a8c154c75c Mon Sep 17 00:00:00 2001
From: Aniket Pawar <pawaraniket508@gmail.com>
Date: Wed, 8 Apr 2026 02:47:14 +0000
Subject: [PATCH 15/19] feat(registry): add @termcn

---
 apps/v4/public/r/registries.json | 6 ++++++
 apps/v4/registry/directory.json  | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/apps/v4/public/r/registries.json b/apps/v4/public/r/registries.json
index b5c4607af..67c7c4df5 100644
--- a/apps/v4/public/r/registries.json
+++ b/apps/v4/public/r/registries.json
@@ -1024,5 +1024,11 @@
     "homepage": "https://flowkit-ui.vzkiss.com",
     "url": "https://flowkit-ui.vzkiss.com/r/{name}.json",
     "description": "Opinionated, accessible components on Base UI and shadcn-style primitives — starting with a Creatable Combobox."
+  },
+  {
+    "name": "@termcn",
+    "homepage": "https://termcn.vercel.app",
+    "url": "https://termcn.vercel.app/r/{name}.json",
+    "description": "Beautiful terminal UIs, made simple. Ready to use, customizable terminal UI components for React.",
   }
 ]
diff --git a/apps/v4/registry/directory.json b/apps/v4/registry/directory.json
index 5f78c62ea..de18be700 100644
--- a/apps/v4/registry/directory.json
+++ b/apps/v4/registry/directory.json
@@ -1196,5 +1196,12 @@
     "url": "https://flowkit-ui.vzkiss.com/r/{name}.json",
     "description": "Opinionated, accessible components on Base UI and shadcn-style primitives — starting with a Creatable Combobox.",
     "logo": "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 446 539' width='446' height='539'><g transform='translate(-557, -212)'><path fill='#000000' d='M0 0 C0.11683596 15.03806088 0.20498934 30.07608657 0.25906086 45.11450481 C0.28483539 52.0972429 0.31997088 59.07969886 0.37719727 66.06225586 C0.43238307 72.79904376 0.46141034 79.53547783 0.47438622 86.27250099 C0.48363498 88.84458852 0.50169539 91.41665975 0.52865028 93.98862267 C0.56487149 97.58741494 0.56994795 101.18499075 0.56762695 104.78393555 C0.58560333 105.85064484 0.60357971 106.91735413 0.62210083 108.01638794 C0.57162982 115.23396362 0.57162982 115.23396362 -2.2999115 119.08209229 C-4.46659006 120.62111204 -6.32256315 121.90825814 -8.76904297 122.90258789 C-9.4797142 123.1988205 -10.19038544 123.4950531 -10.92259216 123.80026245 C-11.68805862 124.1046524 -12.45352509 124.40904236 -13.2421875 124.72265625 C-14.06135147 125.06056183 -14.88051544 125.39846741 -15.72450256 125.74661255 C-17.5026413 126.47850231 -19.28312334 127.20471919 -21.06564331 127.9258728 C-24.91915596 129.48495118 -28.76134873 131.07109256 -32.60453796 132.65541077 C-34.63334148 133.49141619 -36.66274103 134.32597648 -38.69270325 135.15916443 C-48.82313505 139.32095588 -58.89734164 143.6109948 -68.96697998 147.9173584 C-84.58816674 154.59670041 -100.23516617 161.20820199 -115.92858887 167.71591187 C-128.62708413 172.98363116 -141.2732612 178.3678628 -153.89550781 183.81567383 C-160.85020235 186.81403618 -167.82098723 189.76055207 -174.83203125 192.625 C-179.45349142 194.51321879 -184.041462 196.4362144 -188.57421875 198.53125 C-194.84727132 201.42995501 -201.24631286 204.01246667 -207.64508057 206.61706543 C-219.69801533 211.52703007 -231.69701791 216.54380384 -243.625 221.75 C-255.39604142 226.88571111 -267.21520909 231.88750264 -279.08349609 236.79394531 C-284.12084265 238.87702684 -289.15437409 240.9692459 -294.1875 243.0625 C-295.06390137 243.42561279 -295.94030273 243.78872559 -296.84326172 244.1628418 C-303.22290171 246.81496741 -309.57430447 249.53011635 -315.921875 252.2578125 C-327.53288864 257.24513357 -339.19101341 262.11676606 -350.85598755 266.97622681 C-360.22025238 270.87868548 -369.57918481 274.78588957 -378.8671875 278.8671875 C-379.52788742 279.15625473 -380.18858734 279.44532196 -380.86930847 279.7431488 C-383.87841083 281.06012691 -386.88187936 282.38750068 -389.87719727 283.7355957 C-390.90643311 284.18765381 -391.93566895 284.63971191 -392.99609375 285.10546875 C-393.87450928 285.49887451 -394.7529248 285.89228027 -395.65795898 286.29760742 C-398.29108781 287.08729903 -399.42266056 286.75625634 -402 286 C-402.07004451 270.79694568 -402.12296579 255.59389879 -402.15543652 240.39071941 C-402.1709132 233.33179522 -402.19201788 226.27297122 -402.22631836 219.21411133 C-402.25938446 212.40604003 -402.27683734 205.59807305 -402.28463173 198.78992653 C-402.29018864 196.18830537 -402.30103941 193.58669011 -402.31719017 190.98511314 C-402.33886492 187.35021871 -402.34197105 183.71575886 -402.34057617 180.08081055 C-402.351362 178.99755997 -402.36214783 177.91430939 -402.3732605 176.79823303 C-402.36913651 175.80965302 -402.36501251 174.821073 -402.36076355 173.80253601 C-402.36352893 172.94250316 -402.36629431 172.0824703 -402.36914349 171.19637585 C-401.91599517 168.50017763 -401.12273664 167.66775742 -399 166 C-396.69213867 164.81176758 -396.69213867 164.81176758 -393.91796875 163.64453125 C-392.86109863 163.19561523 -391.80422852 162.74669922 -390.71533203 162.28417969 C-388.96905518 161.55569824 -388.96905518 161.55569824 -387.1875 160.8125 C-385.94357956 160.28741851 -384.69993455 159.76168416 -383.45654297 159.23535156 C-380.75034399 158.09151654 -378.04220539 156.95244429 -375.33251953 155.81689453 C-370.89433537 153.95693164 -366.46065283 152.08639066 -362.02734375 150.21484375 C-354.83565828 147.18030989 -347.64074417 144.15351321 -340.44456482 141.12965393 C-334.61787028 138.68095245 -328.79284299 136.22831973 -322.96875 133.7734375 C-295.38525836 122.14791762 -295.38525836 122.14791762 -283 117 C-260.34603787 107.58137998 -237.73587029 98.05748046 -215.19750977 88.36547852 C-202.82373319 83.05164738 -190.40025064 77.85763999 -177.97607422 72.66308594 C-171.88461431 70.11584725 -165.79594376 67.56195441 -159.70718384 65.00827026 C-157.84353817 64.22672644 -155.97975608 63.44550794 -154.1159668 62.66430664 C-144.85973478 58.78364134 -135.60912977 54.88969469 -126.359375 50.99362183 C-122.711245 49.45725665 -119.06264108 47.92201823 -115.4140625 46.38671875 C-112.48434116 45.15372623 -109.55466601 43.92062399 -106.625 42.6875 C-105.83329407 42.35428741 -105.04158813 42.02107483 -104.22589111 41.67776489 C-93.46337204 37.1476642 -82.70440139 32.60926231 -71.9493103 28.06155396 C-64.38888538 24.86497266 -56.82582124 21.67468122 -49.2616272 18.48703003 C-43.81309304 16.18994208 -38.36874065 13.8832936 -32.92764282 11.56864929 C-29.57522539 10.14439081 -26.21979925 8.72733052 -22.86358643 7.31204224 C-21.30327691 6.65219953 -19.74428334 5.98923527 -18.18670654 5.32296753 C-16.054925 4.41151236 -13.91878853 3.51113433 -11.78125 2.61328125 C-10.58564453 2.10579346 -9.39003906 1.59830566 -8.15820312 1.07543945 C-5.13507038 0.04599451 -3.13933925 -0.09163965 0 0 Z ' transform='translate(1002,213)'/><path fill='#000000' d='M0 0 C0.09343248 14.92498601 0.16397381 29.84994936 0.20724869 44.77516556 C0.2278759 51.70519028 0.2559992 58.6350333 0.30175781 65.56494141 C0.34587758 72.24983984 0.36912265 78.9345103 0.37950897 85.61956024 C0.38691284 88.17291998 0.40137041 90.72626911 0.42292023 93.27954865 C0.45186017 96.84968093 0.4559598 100.41902755 0.45410156 103.98925781 C0.46848267 105.05021164 0.48286377 106.11116547 0.49768066 107.20426941 C0.45728316 114.35362955 0.45728316 114.35362955 -1.8299408 117.58662415 C-4.73999038 119.48196129 -7.75729259 120.89741866 -10.95703125 122.21484375 C-11.64365341 122.50667038 -12.33027557 122.79849701 -13.03770447 123.09916687 C-15.29215228 124.0546204 -17.55215433 124.99609443 -19.8125 125.9375 C-21.39716265 126.60577221 -22.98146818 127.27489183 -24.56542969 127.94482422 C-28.60418859 129.650272 -32.64764376 131.34425199 -36.69268799 133.034729 C-40.17126963 134.49000421 -43.64607933 135.95420155 -47.12109375 137.41796875 C-54.11598547 140.36173435 -61.11740613 143.28976197 -68.12017822 146.21472168 C-73.72713959 148.55697841 -79.33277684 150.90239296 -84.9375 153.25 C-85.56207092 153.51152863 -86.18664185 153.77305725 -86.83013916 154.04251099 C-99.14668188 159.20194149 -111.43208291 164.4338367 -123.7175293 169.66677856 C-135.58233052 174.71868928 -147.47154346 179.70239669 -159.39624023 184.61132812 C-171.9773342 189.79809143 -184.49693003 195.12796338 -197.01817322 200.45710754 C-201.52624097 202.37520294 -206.03731154 204.28605896 -210.55078125 206.19140625 C-212.31578979 206.93668579 -212.31578979 206.93668579 -214.11645508 207.69702148 C-216.29181954 208.61510409 -218.46741874 209.53263081 -220.64331055 210.44946289 C-221.61695557 210.86059326 -222.59060059 211.27172363 -223.59375 211.6953125 C-224.51285156 212.08106445 -225.43195313 212.46681641 -226.37890625 212.86425781 C-228.08944702 213.60544966 -229.78615236 214.37968293 -231.46484375 215.19042969 C-232.22925781 215.55813477 -232.99367188 215.92583984 -233.78125 216.3046875 C-234.43158203 216.63194824 -235.08191406 216.95920898 -235.75195312 217.29638672 C-240.16093006 218.6763467 -243.79820449 218.51854318 -248.02832031 216.69335938 C-249.03475586 216.08298828 -250.04119141 215.47261719 -251.078125 214.84375 C-251.91839989 214.34316826 -251.91839989 214.34316826 -252.77565002 213.83247375 C-254.60930503 212.73569182 -256.42924351 211.6180396 -258.25 210.5 C-259.54034508 209.72333183 -260.83162113 208.94820848 -262.1237793 208.17456055 C-264.78483884 206.57871432 -267.4409377 204.97506759 -270.09326172 203.36474609 C-275.97144402 199.79967777 -281.89427068 196.31055698 -287.8125 192.8125 C-290.04431119 191.48834927 -292.27608241 190.16413116 -294.5078125 188.83984375 C-306.83533497 181.5377054 -319.22989972 174.34961946 -331.62109375 167.15625 C-332.70946533 166.52348145 -333.79783691 165.89071289 -334.91918945 165.23876953 C-336.99878889 164.02974797 -339.07930165 162.8222955 -341.16088867 161.61669922 C-343.78258952 160.09192646 -346.39271945 158.54925366 -349 157 C-349.66225586 156.62262695 -350.32451172 156.24525391 -351.00683594 155.85644531 C-352.6796875 154.8515625 -352.6796875 154.8515625 -355 153 C-355 151.68 -355 150.36 -355 149 C-341.76802039 143.1033927 -328.49466771 137.3272477 -315.125 131.75 C-303.93230499 127.08038747 -292.76766369 122.35031509 -281.625 117.5625 C-269.26665355 112.2530973 -256.89552597 106.97529003 -244.51016235 101.72921753 C-236.60285551 98.37977481 -228.7002384 95.02034096 -220.8125 91.625 C-210.37147418 87.13317923 -199.88831099 82.74184237 -189.40951538 78.33911133 C-177.45997805 73.31690821 -165.5332631 68.24425813 -153.625 63.125 C-144.24975594 59.09471204 -134.86819126 55.08686569 -125.4375 51.1875 C-114.39452128 46.62066296 -103.41691968 41.90445373 -92.4375 37.1875 C-79.95756937 31.82638169 -67.47012449 26.48688489 -54.9375 21.25 C-43.84129657 16.61327711 -32.7588105 11.94581518 -21.6875 7.25 C-20.95788055 6.94082642 -20.22826111 6.63165283 -19.47653198 6.31311035 C-17.42545094 5.44384364 -15.374761 4.5736618 -13.32421875 3.703125 C-12.14947998 3.20458008 -10.97474121 2.70603516 -9.7644043 2.19238281 C-6.07185971 0.59966112 -4.05501851 -0.10671101 0 0 Z ' transform='translate(912,434)'/><path fill='#000000' d='M0 0 C0 37.29 0 74.58 0 113 C-5.73256379 114.14651276 -6.3568562 113.68284594 -11.12890625 110.80078125 C-11.71128555 110.4545723 -12.29366486 110.10836334 -12.89369202 109.75166321 C-14.79181653 108.61884171 -16.67686071 107.46596191 -18.5625 106.3125 C-19.87663606 105.52323436 -21.19158445 104.73531975 -22.50732422 103.94873047 C-25.75948646 102.00043882 -29.00192224 100.03662386 -32.24139404 98.06732178 C-35.55866049 96.05402783 -38.88911053 94.0627264 -42.21777344 92.06835938 C-43.81722924 91.10933476 -45.41554657 90.14840874 -47.01269531 89.18554688 C-53.37138564 85.35501054 -59.78803095 81.63055827 -66.22045898 77.92553711 C-70.90418889 75.22430233 -75.56031154 72.48438698 -80.1875 69.6875 C-87.02289039 65.55714207 -93.91421882 61.52429387 -100.8125 57.5 C-101.88201904 56.87569092 -102.95153809 56.25138184 -104.0534668 55.6081543 C-108.9684481 52.69735048 -108.9684481 52.69735048 -114 50 C-113.72729492 48.11889648 -113.72729492 48.11889648 -113 46 C-111.43481445 44.92602539 -111.43481445 44.92602539 -109.36328125 44.09765625 C-108.57445557 43.7718457 -107.78562988 43.44603516 -106.97290039 43.11035156 C-106.09496826 42.76456055 -105.21703613 42.41876953 -104.3125 42.0625 C-102.37964046 41.26830774 -100.44738298 40.47264916 -98.515625 39.67578125 C-97.46568359 39.2473291 -96.41574219 38.81887695 -95.33398438 38.37744141 C-90.01013068 36.17788205 -84.7322805 33.87379567 -79.45169067 31.57269287 C-76.89443706 30.45907616 -74.33528356 29.34986174 -71.77613831 28.24060059 C-67.24286614 26.275631 -62.71055527 24.30844414 -58.17822266 22.34130859 C-57.55289139 22.06992065 -56.92756012 21.79853271 -56.28327942 21.5189209 C-55.02421669 20.97249738 -53.76517331 20.42602929 -52.50614929 19.8795166 C-49.39475005 18.52930053 -46.28256316 17.18095345 -43.16870117 15.83642578 C-41.93536736 15.30374973 -40.70205029 14.77103491 -39.46875 14.23828125 C-38.859814 13.97527222 -38.25087799 13.71226318 -37.62348938 13.44128418 C-33.74939473 11.76513824 -29.8844287 10.06940067 -26.02438354 8.36116028 C-23.43148693 7.21545577 -20.83475501 6.07862218 -18.23736572 4.94314575 C-16.41495717 4.14255337 -14.59778679 3.33007071 -12.78076172 2.51733398 C-11.68521973 2.03981689 -10.58967773 1.5622998 -9.4609375 1.0703125 C-8.49978027 0.64508301 -7.53862305 0.21985352 -6.54833984 -0.21826172 C-4 -1 -4 -1 0 0 Z ' transform='translate(838,637)'/></g></svg>"
+  },
+  {
+    "name": "@termcn",
+    "homepage": "https://termcn.vercel.app",
+    "url": "https://termcn.vercel.app/r/{name}.json",
+    "description": "Beautiful terminal UIs, made simple. Ready to use, customizable terminal UI components for React.",
+    "logo": "<svg xmlns='http://www.w3.org/2000/svg' width='256' height='256' viewBox='0 0 256 256'><script/><rect x='16' y='16' width='224' height='224' rx='28' stroke='#000' stroke-width='7'/><path d='m42 56 32 24-32 24' stroke='#fff' stroke-width='10' stroke-linecap='round' stroke-linejoin='round' fill='none'/><path d='m208.8 156.8-48 48M199.2 104 108 195.2' stroke='#fff' stroke-width='19.2' stroke-linecap='round' fill='none'/></svg>"
   }
 ]

From 398e6c3406c782b828c04dc9aa5e0e6ee0455857 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Wed, 8 Apr 2026 11:52:03 +0400
Subject: [PATCH 16/19] fix: formatting in registries.json

---
 apps/v4/public/r/registries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/v4/public/r/registries.json b/apps/v4/public/r/registries.json
index 67c7c4df5..89f54e550 100644
--- a/apps/v4/public/r/registries.json
+++ b/apps/v4/public/r/registries.json
@@ -1029,6 +1029,6 @@
     "name": "@termcn",
     "homepage": "https://termcn.vercel.app",
     "url": "https://termcn.vercel.app/r/{name}.json",
-    "description": "Beautiful terminal UIs, made simple. Ready to use, customizable terminal UI components for React.",
+    "description": "Beautiful terminal UIs, made simple. Ready to use, customizable terminal UI components for React."
   }
 ]

From 6823bad998b651a3d396358232c24c8c57e17922 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Wed, 8 Apr 2026 12:23:34 +0400
Subject: [PATCH 17/19] refactor: directory

---
 apps/v4/components/directory-add-button.tsx   | 190 ++++++----
 apps/v4/components/directory-list.tsx         | 354 +++++++++++++++---
 ...rch-directory.tsx => directory-search.tsx} |  32 +-
 apps/v4/content/docs/(root)/directory.mdx     |   7 +-
 apps/v4/hooks/use-search-registry.ts          |  42 ++-
 5 files changed, 478 insertions(+), 147 deletions(-)
 rename apps/v4/components/{search-directory.tsx => directory-search.tsx} (62%)

diff --git a/apps/v4/components/directory-add-button.tsx b/apps/v4/components/directory-add-button.tsx
index d5ffce5df..e3497bf9e 100644
--- a/apps/v4/components/directory-add-button.tsx
+++ b/apps/v4/components/directory-add-button.tsx
@@ -6,7 +6,7 @@ import { IconCheck, IconCopy, IconPlus } from "@tabler/icons-react"
 import { useConfig } from "@/hooks/use-config"
 import { useIsMobile } from "@/hooks/use-mobile"
 import { copyToClipboardWithMeta } from "@/components/copy-button"
-import { Button } from "@/registry/new-york-v4/ui/button"
+import { Button } from "@/styles/base-nova/ui/button"
 import {
   Dialog,
   DialogClose,
@@ -15,8 +15,7 @@ import {
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogTrigger,
-} from "@/registry/new-york-v4/ui/dialog"
+} from "@/styles/base-nova/ui/dialog"
 import {
   Drawer,
   DrawerClose,
@@ -25,42 +24,74 @@ import {
   DrawerFooter,
   DrawerHeader,
   DrawerTitle,
-  DrawerTrigger,
-} from "@/registry/new-york-v4/ui/drawer"
+} from "@/styles/base-nova/ui/drawer"
 import {
   Tabs,
   TabsContent,
   TabsList,
   TabsTrigger,
-} from "@/registry/new-york-v4/ui/tabs"
+} from "@/styles/base-nova/ui/tabs"
 import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-} from "@/registry/new-york-v4/ui/tooltip"
+} from "@/styles/base-nova/ui/tooltip"
+
+const DirectoryAddContext = React.createContext<{
+  open: (registry: { name: string }) => void
+}>({
+  open: () => {},
+})
+
+export function useDirectoryAdd() {
+  return React.useContext(DirectoryAddContext)
+}
 
 export function DirectoryAddButton({
   registry,
 }: {
   registry: { name: string }
+}) {
+  const { open } = useDirectoryAdd()
+
+  return (
+    <Button
+      size="sm"
+      variant="outline"
+      className="relative z-10"
+      onClick={() => open(registry)}
+    >
+      Add <IconPlus />
+    </Button>
+  )
+}
+
+export function DirectoryAddProvider({
+  children,
+}: {
+  children: React.ReactNode
 }) {
   const [config, setConfig] = useConfig()
   const [hasCopied, setHasCopied] = React.useState(false)
-  const [open, setOpen] = React.useState(false)
+  const [isOpen, setIsOpen] = React.useState(false)
+  const [selectedRegistry, setSelectedRegistry] = React.useState<{
+    name: string
+  } | null>(null)
   const isMobile = useIsMobile()
 
   const packageManager = config.packageManager || "pnpm"
 
   const commands = React.useMemo(() => {
+    if (!selectedRegistry) return null
     return {
-      pnpm: `pnpm dlx shadcn@latest registry add ${registry.name}`,
-      npm: `npx shadcn@latest registry add ${registry.name}`,
-      yarn: `yarn dlx shadcn@latest registry add ${registry.name}`,
-      bun: `bunx --bun shadcn@latest registry add ${registry.name}`,
+      pnpm: `pnpm dlx shadcn@latest registry add ${selectedRegistry.name}`,
+      npm: `npx shadcn@latest registry add ${selectedRegistry.name}`,
+      yarn: `yarn dlx shadcn@latest registry add ${selectedRegistry.name}`,
+      bun: `bunx --bun shadcn@latest registry add ${selectedRegistry.name}`,
     }
-  }, [registry.name])
+  }, [selectedRegistry])
 
-  const command = commands[packageManager]
+  const command = commands?.[packageManager] ?? ""
 
   React.useEffect(() => {
     if (hasCopied) {
@@ -74,19 +105,23 @@ export function DirectoryAddButton({
       name: "copy_registry_add_command",
       properties: {
         command,
-        registry: registry.name,
+        registry: selectedRegistry?.name ?? "",
       },
     })
     setHasCopied(true)
-  }, [command, registry.name])
+  }, [command, selectedRegistry?.name])
 
-  const Trigger = (
-    <Button size="sm" variant="outline" className="relative z-10">
-      Add <IconPlus />
-    </Button>
+  const contextValue = React.useMemo(
+    () => ({
+      open: (registry: { name: string }) => {
+        setSelectedRegistry(registry)
+        setIsOpen(true)
+      },
+    }),
+    []
   )
 
-  const Content = (
+  const Content = commands ? (
     <Tabs
       value={packageManager}
       onValueChange={(value) => {
@@ -95,30 +130,28 @@ export function DirectoryAddButton({
           packageManager: value as "pnpm" | "npm" | "yarn" | "bun",
         })
       }}
-      className="gap-0 overflow-hidden rounded-lg border"
+      className="gap-0 overflow-hidden rounded-xl border"
     >
-      <div className="flex items-center gap-2 border-b p-2">
-        <TabsList className="h-auto rounded-none bg-transparent p-0 font-mono *:data-[slot=tabs-trigger]:border *:data-[slot=tabs-trigger]:border-transparent *:data-[slot=tabs-trigger]:pt-0.5 *:data-[slot=tabs-trigger]:shadow-none! *:data-[slot=tabs-trigger]:data-[state=active]:border-input">
+      <div className="flex items-center gap-2 border-b p-1.5">
+        <TabsList className="h-auto *:data-[slot=tabs-trigger]:pt-0">
           <TabsTrigger value="pnpm">pnpm</TabsTrigger>
           <TabsTrigger value="npm">npm</TabsTrigger>
           <TabsTrigger value="yarn">yarn</TabsTrigger>
           <TabsTrigger value="bun">bun</TabsTrigger>
         </TabsList>
         <Tooltip>
-          <TooltipTrigger asChild>
-            <Button
-              size="icon-sm"
-              variant="ghost"
-              className="ml-auto size-7 rounded-lg"
-              onClick={handleCopy}
-            >
-              {hasCopied ? (
-                <IconCheck className="size-4" />
-              ) : (
-                <IconCopy className="size-4" />
-              )}
-              <span className="sr-only">Copy command</span>
-            </Button>
+          <TooltipTrigger
+            render={
+              <Button
+                size="icon-sm"
+                variant="ghost"
+                className="ml-auto"
+                onClick={handleCopy}
+              />
+            }
+          >
+            {hasCopied ? <IconCheck /> : <IconCopy />}
+            <span className="sr-only">Copy command</span>
           </TooltipTrigger>
           <TooltipContent>
             {hasCopied ? "Copied!" : "Copy command"}
@@ -135,47 +168,48 @@ export function DirectoryAddButton({
         </TabsContent>
       ))}
     </Tabs>
-  )
-
-  if (isMobile) {
-    return (
-      <Drawer open={open} onOpenChange={setOpen}>
-        <DrawerTrigger asChild>{Trigger}</DrawerTrigger>
-        <DrawerContent>
-          <DrawerHeader>
-            <DrawerTitle>Add Registry</DrawerTitle>
-            <DrawerDescription>
-              Run this command to add {registry.name} to your project.
-            </DrawerDescription>
-          </DrawerHeader>
-          <div className="px-4">{Content}</div>
-          <DrawerFooter>
-            <DrawerClose asChild>
-              <Button size="sm">Done</Button>
-            </DrawerClose>
-          </DrawerFooter>
-        </DrawerContent>
-      </Drawer>
-    )
-  }
+  ) : null
 
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>{Trigger}</DialogTrigger>
-      <DialogContent className="dialog-ring animate-none! rounded-xl sm:max-w-md">
-        <DialogHeader>
-          <DialogTitle>Add Registry</DialogTitle>
-          <DialogDescription>
-            Run this command to add {registry.name} to your project.
-          </DialogDescription>
-        </DialogHeader>
-        {Content}
-        <DialogFooter>
-          <DialogClose asChild>
-            <Button size="sm">Done</Button>
-          </DialogClose>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
+    <DirectoryAddContext value={contextValue}>
+      {children}
+      {isMobile ? (
+        <Drawer open={isOpen} onOpenChange={setIsOpen}>
+          <DrawerContent>
+            <DrawerHeader>
+              <DrawerTitle>Add Registry</DrawerTitle>
+              <DrawerDescription>
+                Run this command to add {selectedRegistry?.name} to your
+                project.
+              </DrawerDescription>
+            </DrawerHeader>
+            <div className="px-4">{Content}</div>
+            <DrawerFooter>
+              <DrawerClose asChild>
+                <Button size="sm">Done</Button>
+              </DrawerClose>
+            </DrawerFooter>
+          </DrawerContent>
+        </Drawer>
+      ) : (
+        <Dialog open={isOpen} onOpenChange={setIsOpen}>
+          <DialogContent className="animate-none! sm:max-w-md">
+            <DialogHeader>
+              <DialogTitle>Add Registry</DialogTitle>
+              <DialogDescription>
+                Run this command to add {selectedRegistry?.name} to your
+                project.
+              </DialogDescription>
+            </DialogHeader>
+            {Content}
+            <DialogFooter>
+              <DialogClose render={<Button size="sm" variant="outline" />}>
+                Done
+              </DialogClose>
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
+      )}
+    </DirectoryAddContext>
   )
 }
diff --git a/apps/v4/components/directory-list.tsx b/apps/v4/components/directory-list.tsx
index e84ba6113..012a6f458 100644
--- a/apps/v4/components/directory-list.tsx
+++ b/apps/v4/components/directory-list.tsx
@@ -1,12 +1,20 @@
 "use client"
 
 import * as React from "react"
-import { IconArrowUpRight } from "@tabler/icons-react"
+import { usePathname } from "next/navigation"
+import {
+  IconArrowUpRight,
+  IconChevronLeft,
+  IconChevronRight,
+} from "@tabler/icons-react"
 
+import { cn } from "@/lib/utils"
 import { useSearchRegistry } from "@/hooks/use-search-registry"
-import { DirectoryAddButton } from "@/components/directory-add-button"
-import globalRegistries from "@/registry/directory.json"
-import { Button } from "@/registry/new-york-v4/ui/button"
+import {
+  DirectoryAddButton,
+  DirectoryAddProvider,
+} from "@/components/directory-add-button"
+import { Button, buttonVariants } from "@/styles/base-nova/ui/button"
 import {
   Item,
   ItemActions,
@@ -17,9 +25,16 @@ import {
   ItemMedia,
   ItemSeparator,
   ItemTitle,
-} from "@/registry/new-york-v4/ui/item"
+} from "@/styles/base-nova/ui/item"
+import {
+  Pagination,
+  PaginationContent,
+  PaginationEllipsis,
+  PaginationItem,
+} from "@/styles/base-nova/ui/pagination"
+import { Skeleton } from "@/styles/base-nova/ui/skeleton"
 
-import { SearchDirectory } from "./search-directory"
+import { SearchDirectory } from "./directory-search"
 
 function getHomepageUrl(homepage: string) {
   const url = new URL(homepage)
@@ -29,55 +44,308 @@ function getHomepageUrl(homepage: string) {
   return url.toString()
 }
 
+function getPageHref(pathname: string, query: string, page: number) {
+  const searchParams = new URLSearchParams()
+
+  if (query) {
+    searchParams.set("q", query)
+  }
+
+  if (page > 1) {
+    searchParams.set("page", page.toString())
+  }
+
+  const search = searchParams.toString()
+
+  return search ? `${pathname}?${search}` : pathname
+}
+
+function getPageNumbers(current: number, total: number) {
+  if (total <= 7) {
+    return Array.from({ length: total }, (_, i) => i + 1) as (
+      | number
+      | "ellipsis"
+    )[]
+  }
+
+  const pages: (number | "ellipsis")[] = [1]
+
+  // Show ellipsis or page 2 directly if only one number would be hidden.
+  if (current > 4) {
+    pages.push("ellipsis")
+  } else if (current >= 4) {
+    pages.push(2)
+  }
+
+  const start = Math.max(2, current - 1)
+  const end = Math.min(total - 1, current + 1)
+  for (let i = start; i <= end; i++) {
+    pages.push(i)
+  }
+
+  // Show ellipsis or second-to-last page directly if only one number would be hidden.
+  if (current < total - 3) {
+    pages.push("ellipsis")
+  } else if (current <= total - 3) {
+    pages.push(total - 1)
+  }
+
+  pages.push(total)
+
+  return pages
+}
+
+type DirectoryPaginationLinkProps = React.ComponentProps<"a"> & {
+  isActive?: boolean
+  size?: React.ComponentProps<typeof Button>["size"]
+}
+
+function DirectoryPaginationLink({
+  className,
+  isActive,
+  size = "icon",
+  ...props
+}: DirectoryPaginationLinkProps) {
+  return (
+    <a
+      aria-current={isActive ? "page" : undefined}
+      data-slot="pagination-link"
+      data-active={isActive}
+      className={cn(
+        buttonVariants({
+          variant: isActive ? "outline" : "ghost",
+          size,
+        }),
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function DirectoryPaginationPrevious({
+  className,
+  text = "Previous",
+  ...props
+}: DirectoryPaginationLinkProps & { text?: string }) {
+  return (
+    <DirectoryPaginationLink
+      aria-label="Go to previous page"
+      size="default"
+      className={cn("pl-1.5!", className)}
+      {...props}
+    >
+      <IconChevronLeft className="cn-rtl-flip size-4" />
+      <span className="hidden sm:block">{text}</span>
+    </DirectoryPaginationLink>
+  )
+}
+
+function DirectoryPaginationNext({
+  className,
+  text = "Next",
+  ...props
+}: DirectoryPaginationLinkProps & { text?: string }) {
+  return (
+    <DirectoryPaginationLink
+      aria-label="Go to next page"
+      size="default"
+      className={cn("pr-1.5!", className)}
+      {...props}
+    >
+      <span className="hidden sm:block">{text}</span>
+      <IconChevronRight className="cn-rtl-flip size-4" />
+    </DirectoryPaginationLink>
+  )
+}
+
 export function DirectoryList() {
-  const { registries } = useSearchRegistry()
+  const pathname = usePathname()
+  const {
+    isLoading,
+    paginatedRegistries,
+    page,
+    query,
+    registries,
+    totalPages,
+    setPage,
+    setQuery,
+  } = useSearchRegistry()
+  const previousHref =
+    page > 1 ? getPageHref(pathname, query, page - 1) : undefined
+  const nextHref =
+    page < totalPages ? getPageHref(pathname, query, page + 1) : undefined
+
+  const handlePageChange = React.useCallback(
+    (
+      event: React.MouseEvent<HTMLAnchorElement>,
+      targetPage: number,
+      disabled = false
+    ) => {
+      if (
+        event.defaultPrevented ||
+        event.button !== 0 ||
+        event.metaKey ||
+        event.ctrlKey ||
+        event.shiftKey ||
+        event.altKey
+      ) {
+        return
+      }
+
+      if (disabled || targetPage === page) {
+        event.preventDefault()
+        return
+      }
+
+      event.preventDefault()
+      void setPage(targetPage)
+    },
+    [page, setPage]
+  )
 
   return (
-    <div className="mt-6">
-      <SearchDirectory />
+    <DirectoryAddProvider>
+      <div className="mt-6">
+        {isLoading ? (
+          <DirectoryListSkeleton />
+        ) : (
+          <>
+            <SearchDirectory
+              query={query}
+              registriesCount={registries.length}
+              setQuery={setQuery}
+            />
+            <ItemGroup className="my-8">
+              {paginatedRegistries.map((registry, index) => (
+                <React.Fragment key={registry.name}>
+                  <Item className="group/item relative gap-6 px-0">
+                    <ItemMedia
+                      variant="image"
+                      dangerouslySetInnerHTML={{ __html: registry.logo }}
+                      className="grayscale *:[svg]:size-8 *:[svg]:fill-foreground"
+                    />
+                    <ItemContent>
+                      <ItemTitle>
+                        <a
+                          href={getHomepageUrl(registry.homepage)}
+                          target="_blank"
+                          rel="noopener noreferrer external"
+                          className="group flex items-center gap-1"
+                        >
+                          {registry.name}{" "}
+                          <IconArrowUpRight className="size-4 opacity-0 group-hover:opacity-100" />
+                        </a>
+                      </ItemTitle>
+                      {registry.description && (
+                        <ItemDescription className="text-pretty">
+                          {registry.description}
+                        </ItemDescription>
+                      )}
+                    </ItemContent>
+                    <ItemActions className="relative z-10 hidden self-start sm:flex">
+                      <DirectoryAddButton registry={registry} />
+                    </ItemActions>
+                    <ItemFooter className="justify-start pl-16 sm:hidden">
+                      <Button size="sm" variant="outline">
+                        View <IconArrowUpRight />
+                      </Button>
+                      <DirectoryAddButton registry={registry} />
+                    </ItemFooter>
+                  </Item>
+                  {index < paginatedRegistries.length - 1 && (
+                    <ItemSeparator className="my-1" />
+                  )}
+                </React.Fragment>
+              ))}
+            </ItemGroup>
+            {totalPages > 1 && (
+              <Pagination>
+                <PaginationContent>
+                  <PaginationItem>
+                    <DirectoryPaginationPrevious
+                      href={previousHref}
+                      aria-disabled={page <= 1 || undefined}
+                      tabIndex={page <= 1 ? -1 : undefined}
+                      onClick={(event) =>
+                        handlePageChange(event, page - 1, page <= 1)
+                      }
+                      className={cn(
+                        page <= 1
+                          ? "pointer-events-none opacity-50"
+                          : "cursor-pointer"
+                      )}
+                    />
+                  </PaginationItem>
+                  {getPageNumbers(page, totalPages).map((p, i) =>
+                    p === "ellipsis" ? (
+                      <PaginationItem key={`ellipsis-${i}`}>
+                        <PaginationEllipsis />
+                      </PaginationItem>
+                    ) : (
+                      <PaginationItem key={p}>
+                        <DirectoryPaginationLink
+                          href={getPageHref(pathname, query, p)}
+                          isActive={p === page}
+                          onClick={(event) => handlePageChange(event, p)}
+                          className="cursor-pointer"
+                        >
+                          {p}
+                        </DirectoryPaginationLink>
+                      </PaginationItem>
+                    )
+                  )}
+                  <PaginationItem>
+                    <DirectoryPaginationNext
+                      href={nextHref}
+                      aria-disabled={page >= totalPages || undefined}
+                      tabIndex={page >= totalPages ? -1 : undefined}
+                      onClick={(event) =>
+                        handlePageChange(event, page + 1, page >= totalPages)
+                      }
+                      className={cn(
+                        page >= totalPages
+                          ? "pointer-events-none opacity-50"
+                          : "cursor-pointer"
+                      )}
+                    />
+                  </PaginationItem>
+                </PaginationContent>
+              </Pagination>
+            )}
+          </>
+        )}
+      </div>
+    </DirectoryAddProvider>
+  )
+}
+
+function DirectoryListSkeleton() {
+  return (
+    <>
+      <Skeleton className="h-8 w-full rounded-lg" />
       <ItemGroup className="my-8">
-        {registries.map((registry, index) => (
+        {Array.from({ length: 5 }, (_, index) => (
           <React.Fragment key={index}>
-            <Item className="group/item relative gap-6 px-0">
-              <ItemMedia
-                variant="image"
-                dangerouslySetInnerHTML={{ __html: registry.logo }}
-                className="grayscale *:[svg]:size-8 *:[svg]:fill-foreground"
-              />
+            <Item className="relative items-start gap-6 px-0">
+              <Skeleton className="size-8 rounded-lg" />
               <ItemContent>
-                <ItemTitle>
-                  <a
-                    href={getHomepageUrl(registry.homepage)}
-                    target="_blank"
-                    rel="noopener noreferrer external"
-                    className="group flex items-center gap-1"
-                  >
-                    {registry.name}{" "}
-                    <IconArrowUpRight className="size-4 opacity-0 group-hover:opacity-100" />
-                  </a>
-                </ItemTitle>
-                {registry.description && (
-                  <ItemDescription className="text-pretty">
-                    {registry.description}
-                  </ItemDescription>
-                )}
+                <Skeleton className="h-4 w-32 sm:w-40" />
+                <Skeleton className="mt-1.5 h-4 w-full max-w-md" />
+                <Skeleton className="mt-1 h-4 w-3/4 max-w-sm" />
               </ItemContent>
-              <ItemActions className="relative z-10 hidden self-start sm:flex">
-                <DirectoryAddButton registry={registry} />
+              <ItemActions className="hidden self-start sm:flex">
+                <Skeleton className="h-7 w-16 rounded-lg" />
               </ItemActions>
-              <ItemFooter className="justify-start pl-16 sm:hidden">
-                <Button size="sm" variant="outline">
-                  View <IconArrowUpRight />
-                </Button>
-                <DirectoryAddButton registry={registry} />
+              <ItemFooter className="justify-start gap-2 pl-16 sm:hidden">
+                <Skeleton className="h-9 w-20 rounded-lg" />
+                <Skeleton className="h-9 w-24 rounded-lg" />
               </ItemFooter>
             </Item>
-            {index < globalRegistries.length - 1 && (
-              <ItemSeparator className="my-1" />
-            )}
+            {index < 4 && <ItemSeparator className="my-1" />}
           </React.Fragment>
         ))}
       </ItemGroup>
-    </div>
+    </>
   )
 }
diff --git a/apps/v4/components/search-directory.tsx b/apps/v4/components/directory-search.tsx
similarity index 62%
rename from apps/v4/components/search-directory.tsx
rename to apps/v4/components/directory-search.tsx
index 73b88b934..77d51edd7 100644
--- a/apps/v4/components/search-directory.tsx
+++ b/apps/v4/components/directory-search.tsx
@@ -1,23 +1,24 @@
-import * as React from "react"
+"use client"
+
 import { Search, X } from "lucide-react"
 
-import { useSearchRegistry } from "@/hooks/use-search-registry"
-import { Field } from "@/registry/new-york-v4/ui/field"
+import { Field } from "@/styles/base-nova/ui/field"
 import {
   InputGroup,
   InputGroupAddon,
   InputGroupButton,
   InputGroupInput,
-} from "@/registry/new-york-v4/ui/input-group"
-
-export const SearchDirectory = () => {
-  const { query, registries, setQuery } = useSearchRegistry()
-
-  const onQueryChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value
-    setQuery(value)
-  }
+} from "@/styles/base-nova/ui/input-group"
 
+export function SearchDirectory({
+  query,
+  registriesCount,
+  setQuery,
+}: {
+  query: string
+  registriesCount: number
+  setQuery: (value: string | null) => void
+}) {
   return (
     <Field>
       <InputGroup>
@@ -25,14 +26,15 @@ export const SearchDirectory = () => {
           <Search />
         </InputGroupAddon>
         <InputGroupInput
+          className="h-full"
           placeholder="Search"
           value={query}
-          onChange={onQueryChange}
+          onChange={(e) => setQuery(e.target.value)}
         />
         <InputGroupAddon align="inline-end">
           <span className="text-muted-foreground tabular-nums sm:text-xs">
-            {registries.length}{" "}
-            {registries.length === 1 ? "registry" : "registries"}
+            {registriesCount}{" "}
+            {registriesCount === 1 ? "registry" : "registries"}
           </span>
         </InputGroupAddon>
         <InputGroupAddon
diff --git a/apps/v4/content/docs/(root)/directory.mdx b/apps/v4/content/docs/(root)/directory.mdx
index 7c94fc8eb..5563ba06a 100644
--- a/apps/v4/content/docs/(root)/directory.mdx
+++ b/apps/v4/content/docs/(root)/directory.mdx
@@ -3,14 +3,9 @@ title: Registry Directory
 description: Discover community registries for shadcn/ui components and blocks.
 ---
 
-import { TriangleAlertIcon } from "lucide-react"
-
 These registries are built into the CLI with no additional configuration required. To add a component, run: `npx shadcn add @<registry>/<component>`.
 
-<Callout
-  type="warning"
-  className="border-amber-200 bg-amber-50 font-semibold dark:border-amber-900 dark:bg-amber-950"
->
+<Callout className="bg-muted font-semibold">
   Community registries are maintained by third-party developers. Always review
   code on installation to ensure it meets your security and quality standards.
 </Callout>
diff --git a/apps/v4/hooks/use-search-registry.ts b/apps/v4/hooks/use-search-registry.ts
index a008e0f0d..13c6732fd 100644
--- a/apps/v4/hooks/use-search-registry.ts
+++ b/apps/v4/hooks/use-search-registry.ts
@@ -1,7 +1,10 @@
-import { debounce, useQueryState } from "nuqs"
+import { debounce, parseAsInteger, useQueryState } from "nuqs"
 
+import { useMounted } from "@/hooks/use-mounted"
 import globalRegistries from "@/registry/directory.json"
 
+const PAGE_SIZE = 10
+
 const normalizeQuery = (query: string) =>
   query.toLowerCase().replaceAll(" ", "").replaceAll("@", "")
 
@@ -25,15 +28,44 @@ const searchDirectory = (query: string | null) => {
   return globalRegistries.filter((registry) => finderFn(registry, query))
 }
 
-export const useSearchRegistry = () => {
+export function useSearchRegistry() {
+  const mounted = useMounted()
   const [query, setQuery] = useQueryState("q", {
     defaultValue: "",
     limitUrlUpdates: debounce(250),
   })
 
+  const [page, setPage] = useQueryState("page", {
+    ...parseAsInteger,
+    defaultValue: 1,
+    history: "push",
+  })
+
+  const currentQuery = mounted ? query : ""
+  const currentPageValue = mounted ? page : 1
+
+  const registries = searchDirectory(currentQuery)
+  const totalPages = Math.ceil(registries.length / PAGE_SIZE)
+
+  // Clamp page to valid range.
+  const currentPage = Math.max(1, Math.min(currentPageValue, totalPages))
+
+  const paginatedRegistries = registries.slice(
+    (currentPage - 1) * PAGE_SIZE,
+    currentPage * PAGE_SIZE
+  )
+
   return {
-    query,
-    registries: searchDirectory(query),
-    setQuery,
+    isLoading: !mounted,
+    query: currentQuery,
+    setQuery: (value: string | null) => {
+      setQuery(value)
+      setPage(null)
+    },
+    registries,
+    paginatedRegistries,
+    page: currentPage,
+    totalPages,
+    setPage,
   }
 }

From e9443ccd4aeb8a2ee4d04bf68a0039de823b18b2 Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Wed, 8 Apr 2026 14:42:52 +0400
Subject: [PATCH 18/19] docs: add apply changelog

---
 .../docs/changelog/2026-04-shadcn-apply.mdx   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 apps/v4/content/docs/changelog/2026-04-shadcn-apply.mdx

diff --git a/apps/v4/content/docs/changelog/2026-04-shadcn-apply.mdx b/apps/v4/content/docs/changelog/2026-04-shadcn-apply.mdx
new file mode 100644
index 000000000..911cb6759
--- /dev/null
+++ b/apps/v4/content/docs/changelog/2026-04-shadcn-apply.mdx
@@ -0,0 +1,21 @@
+---
+title: April 2026 - shadcn apply
+description: Switch presets in existing projects without starting over.
+date: 2026-04-08
+---
+
+We added `shadcn apply` so you can switch presets in an existing project without starting over.
+
+When you run `npx shadcn@latest apply` in an existing project, we apply a new preset, reinstall your existing components, and update your theme, colors, CSS variables, fonts, and icons.
+
+```bash
+npx shadcn@latest apply --preset b2D0vQ7G4
+```
+
+The CLI keeps the current base and RTL settings from your existing project, even when the preset URL was generated with different values.
+
+<Button asChild size="sm">
+  <Link href="/create" className="mt-6 no-underline!">
+    Try a Preset
+  </Link>
+</Button>

From 0b34d581f9acbb60e030bb1645e82a7f1bed9ade Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Wed, 8 Apr 2026 16:33:32 +0400
Subject: [PATCH 19/19] feat: add open preset

---
 .../(app)/create/components/copy-preset.tsx   |   4 +-
 .../(app)/create/components/customizer.tsx    |  10 +-
 .../app/(app)/create/components/main-menu.tsx |   5 +
 .../(app)/create/components/open-preset.tsx   | 200 ++++++++++++++++++
 .../app/(app)/create/components/preview.tsx   | 156 +++++++-------
 .../(app)/create/components/random-button.tsx |   2 +-
 .../(app)/create/hooks/use-open-preset.tsx    |  81 +++++++
 .../create/lib/parse-preset-input.test.ts     |  17 ++
 .../(app)/create/lib/parse-preset-input.ts    |  15 ++
 .../(create)/preview/[base]/[name]/page.tsx   |   2 +
 10 files changed, 415 insertions(+), 77 deletions(-)
 create mode 100644 apps/v4/app/(app)/create/components/open-preset.tsx
 create mode 100644 apps/v4/app/(app)/create/hooks/use-open-preset.tsx
 create mode 100644 apps/v4/app/(app)/create/lib/parse-preset-input.test.ts
 create mode 100644 apps/v4/app/(app)/create/lib/parse-preset-input.ts

diff --git a/apps/v4/app/(app)/create/components/copy-preset.tsx b/apps/v4/app/(app)/create/components/copy-preset.tsx
index 55024fbe4..32aea91d8 100644
--- a/apps/v4/app/(app)/create/components/copy-preset.tsx
+++ b/apps/v4/app/(app)/create/components/copy-preset.tsx
@@ -10,6 +10,7 @@ import { usePresetCode } from "@/app/(app)/create/hooks/use-design-system"
 export function CopyPreset({ className }: React.ComponentProps<typeof Button>) {
   const presetCode = usePresetCode()
   const [hasCopied, setHasCopied] = React.useState(false)
+  const label = hasCopied ? "Copied" : `--preset ${presetCode}`
 
   React.useEffect(() => {
     if (hasCopied) {
@@ -32,12 +33,13 @@ export function CopyPreset({ className }: React.ComponentProps<typeof Button>) {
     <Button
       variant="outline"
       onClick={handleCopy}
+      title={label}
       className={cn(
         "touch-manipulation bg-transparent! px-2! py-0! text-sm! transition-none select-none hover:bg-muted! pointer-coarse:h-10!",
         className
       )}
     >
-      <span>{hasCopied ? "Copied" : `--preset ${presetCode}`}</span>
+      <span className="block min-w-0 truncate">{label}</span>
     </Button>
   )
 }
diff --git a/apps/v4/app/(app)/create/components/customizer.tsx b/apps/v4/app/(app)/create/components/customizer.tsx
index 91ba9db7b..934ccf803 100644
--- a/apps/v4/app/(app)/create/components/customizer.tsx
+++ b/apps/v4/app/(app)/create/components/customizer.tsx
@@ -23,12 +23,12 @@ import { FontPicker } from "@/app/(app)/create/components/font-picker"
 import { IconLibraryPicker } from "@/app/(app)/create/components/icon-library-picker"
 import { MainMenu } from "@/app/(app)/create/components/main-menu"
 import { MenuColorPicker } from "@/app/(app)/create/components/menu-picker"
+import { OpenPreset } from "@/app/(app)/create/components/open-preset"
 import { RadiusPicker } from "@/app/(app)/create/components/radius-picker"
 import { RandomButton } from "@/app/(app)/create/components/random-button"
 import { ResetDialog } from "@/app/(app)/create/components/reset-button"
 import { StylePicker } from "@/app/(app)/create/components/style-picker"
 import { ThemePicker } from "@/app/(app)/create/components/theme-picker"
-import { V0Button } from "@/app/(app)/create/components/v0-button"
 import { FONT_HEADING_OPTIONS, FONTS } from "@/app/(app)/create/lib/fonts"
 import { useDesignSystemSearchParams } from "@/app/(app)/create/lib/search-params"
 
@@ -102,8 +102,12 @@ export function Customizer({
         </FieldGroup>
       </CardContent>
       <CardFooter className="flex min-w-0 gap-2 md:flex-col md:rounded-b-none md:**:[button,a]:w-full">
-        <CopyPreset className="flex-1 md:flex-none" />
-        <RandomButton className="flex-1 md:flex-none" />
+        <CopyPreset className="min-w-0 flex-1 md:flex-none" />
+        <OpenPreset
+          className="max-w-20 min-w-0 flex-1 sm:max-w-none md:flex-none"
+          label={isMobile ? "Open" : "Open Preset"}
+        />
+        <RandomButton className="max-w-20 min-w-0 flex-1 sm:max-w-none md:flex-none" />
         <ActionMenu itemsByBase={itemsByBase} />
         <ResetDialog />
       </CardFooter>
diff --git a/apps/v4/app/(app)/create/components/main-menu.tsx b/apps/v4/app/(app)/create/components/main-menu.tsx
index 75c383935..b16b6a913 100644
--- a/apps/v4/app/(app)/create/components/main-menu.tsx
+++ b/apps/v4/app/(app)/create/components/main-menu.tsx
@@ -17,6 +17,7 @@ import {
 } from "@/app/(app)/create/components/picker"
 import { useActionMenuTrigger } from "@/app/(app)/create/hooks/use-action-menu"
 import { useHistory } from "@/app/(app)/create/hooks/use-history"
+import { useOpenPresetTrigger } from "@/app/(app)/create/hooks/use-open-preset"
 import { useRandom } from "@/app/(app)/create/hooks/use-random"
 import { useReset } from "@/app/(app)/create/hooks/use-reset"
 import { useThemeToggle } from "@/app/(app)/create/hooks/use-theme-toggle"
@@ -27,6 +28,7 @@ export function MainMenu({ className }: React.ComponentProps<typeof Button>) {
   const [isMac, setIsMac] = React.useState(false)
   const { canGoBack, canGoForward, goBack, goForward } = useHistory()
   const { openActionMenu } = useActionMenuTrigger()
+  const { openPreset } = useOpenPresetTrigger()
   const { randomize } = useRandom()
   const { toggleTheme } = useThemeToggle()
   const { setShowResetDialog } = useReset()
@@ -55,6 +57,9 @@ export function MainMenu({ className }: React.ComponentProps<typeof Button>) {
               Navigate...
               <PickerShortcut>{isMac ? "⌘P" : "Ctrl+P"}</PickerShortcut>
             </PickerItem>
+            <PickerItem onClick={openPreset}>
+              Open Preset... <PickerShortcut>O</PickerShortcut>
+            </PickerItem>
             <PickerItem onClick={randomize}>
               Shuffle <PickerShortcut>R</PickerShortcut>
             </PickerItem>
diff --git a/apps/v4/app/(app)/create/components/open-preset.tsx b/apps/v4/app/(app)/create/components/open-preset.tsx
new file mode 100644
index 000000000..11767a516
--- /dev/null
+++ b/apps/v4/app/(app)/create/components/open-preset.tsx
@@ -0,0 +1,200 @@
+"use client"
+
+import * as React from "react"
+import Script from "next/script"
+
+import { cn } from "@/lib/utils"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Button } from "@/styles/base-nova/ui/button"
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/styles/base-nova/ui/dialog"
+import {
+  Drawer,
+  DrawerClose,
+  DrawerContent,
+  DrawerDescription,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from "@/styles/base-nova/ui/drawer"
+import { Field, FieldContent, FieldLabel } from "@/styles/base-nova/ui/field"
+import { Input } from "@/styles/base-nova/ui/input"
+import {
+  OPEN_PRESET_FORWARD_TYPE,
+  useOpenPreset,
+} from "@/app/(app)/create/hooks/use-open-preset"
+import { parsePresetInput } from "@/app/(app)/create/lib/parse-preset-input"
+import { useDesignSystemSearchParams } from "@/app/(app)/create/lib/search-params"
+
+const PRESET_EXAMPLE = "b2D0wqNxT"
+const PRESET_TITLE = "Open Preset"
+const PRESET_DESCRIPTION = "Paste a preset code to load a saved configuration."
+
+export function OpenPreset({
+  className,
+  label = "Open Preset",
+}: React.ComponentProps<typeof Button> & {
+  label?: string
+}) {
+  const [input, setInput] = React.useState("")
+  const [, setParams] = useDesignSystemSearchParams()
+  const isMobile = useIsMobile()
+  const { open, setOpen } = useOpenPreset()
+
+  const nextPreset = React.useMemo(() => parsePresetInput(input), [input])
+  const isInvalid = input.trim().length > 0 && nextPreset === null
+
+  const handleOpenChange = React.useCallback(
+    (nextOpen: boolean) => {
+      setOpen(nextOpen)
+
+      if (!nextOpen) {
+        setInput("")
+      }
+    },
+    [setOpen]
+  )
+
+  const handleSubmit = React.useCallback(
+    (event: React.FormEvent<HTMLFormElement>) => {
+      event.preventDefault()
+
+      if (!nextPreset) {
+        return
+      }
+
+      setParams({ preset: nextPreset })
+      handleOpenChange(false)
+    },
+    [handleOpenChange, nextPreset, setParams]
+  )
+
+  const triggerClassName = cn(
+    "touch-manipulation bg-transparent! px-2! py-0! text-sm! transition-none select-none hover:bg-muted! pointer-coarse:h-10!",
+    className
+  )
+
+  const desktopTrigger = (
+    <Button variant="outline" className={triggerClassName} />
+  )
+
+  const fields = (
+    <Field data-invalid={isInvalid || undefined}>
+      <FieldLabel htmlFor="preset-code" className="sr-only">
+        Preset code
+      </FieldLabel>
+      <FieldContent>
+        <Input
+          id="preset-code"
+          value={input}
+          onChange={(event) => setInput(event.target.value)}
+          placeholder={`${PRESET_EXAMPLE} or --preset ${PRESET_EXAMPLE}`}
+          autoCapitalize="none"
+          autoCorrect="off"
+          spellCheck={false}
+          aria-invalid={isInvalid}
+          className="h-10 md:h-8"
+        />
+      </FieldContent>
+    </Field>
+  )
+
+  if (isMobile) {
+    return (
+      <Drawer open={open} onOpenChange={handleOpenChange}>
+        <DrawerTrigger asChild>
+          <Button variant="outline" className={triggerClassName}>
+            {label}
+          </Button>
+        </DrawerTrigger>
+        <DrawerContent className="dark rounded-t-2xl!">
+          <DrawerHeader>
+            <DrawerTitle className="text-xl">{PRESET_TITLE}</DrawerTitle>
+            <DrawerDescription>{PRESET_DESCRIPTION}</DrawerDescription>
+          </DrawerHeader>
+          <form onSubmit={handleSubmit}>
+            <div className="px-4 py-2">{fields}</div>
+            <DrawerFooter>
+              <Button type="submit" className="h-10" disabled={!nextPreset}>
+                Open
+              </Button>
+              <DrawerClose asChild>
+                <Button variant="outline" type="button" className="h-10">
+                  Cancel
+                </Button>
+              </DrawerClose>
+            </DrawerFooter>
+          </form>
+        </DrawerContent>
+      </Drawer>
+    )
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogTrigger render={desktopTrigger}>{label}</DialogTrigger>
+      <DialogContent className="dark">
+        <form onSubmit={handleSubmit}>
+          <DialogHeader>
+            <DialogTitle>{PRESET_TITLE}</DialogTitle>
+            <DialogDescription>{PRESET_DESCRIPTION}</DialogDescription>
+          </DialogHeader>
+          <div className="py-4">{fields}</div>
+          <DialogFooter>
+            <DialogClose render={<Button variant="outline" type="button" />}>
+              Cancel
+            </DialogClose>
+            <Button type="submit" disabled={!nextPreset}>
+              Open
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+export function OpenPresetScript() {
+  return (
+    <Script
+      id="open-preset-listener"
+      strategy="beforeInteractive"
+      dangerouslySetInnerHTML={{
+        __html: `
+            (function() {
+              // Forward O key.
+              document.addEventListener('keydown', function(e) {
+                if (e.key === 'o' && !e.shiftKey && !e.metaKey && !e.ctrlKey && !e.altKey) {
+                  if (
+                    (e.target instanceof HTMLElement && e.target.isContentEditable) ||
+                    e.target instanceof HTMLInputElement ||
+                    e.target instanceof HTMLTextAreaElement ||
+                    e.target instanceof HTMLSelectElement
+                  ) {
+                    return;
+                  }
+                  e.preventDefault();
+                  if (window.parent && window.parent !== window) {
+                    window.parent.postMessage({
+                      type: '${OPEN_PRESET_FORWARD_TYPE}',
+                      key: e.key
+                    }, '*');
+                  }
+                }
+              });
+
+            })();
+          `,
+      }}
+    />
+  )
+}
diff --git a/apps/v4/app/(app)/create/components/preview.tsx b/apps/v4/app/(app)/create/components/preview.tsx
index 56ab4e6c5..f2ad78c61 100644
--- a/apps/v4/app/(app)/create/components/preview.tsx
+++ b/apps/v4/app/(app)/create/components/preview.tsx
@@ -11,6 +11,7 @@ import { DARK_MODE_FORWARD_TYPE } from "@/app/(app)/create/components/mode-switc
 import { PreviewSwitcher } from "@/app/(app)/create/components/preview-switcher"
 import { RANDOMIZE_FORWARD_TYPE } from "@/app/(app)/create/components/random-button"
 import { sendToIframe } from "@/app/(app)/create/hooks/use-iframe-sync"
+import { OPEN_PRESET_FORWARD_TYPE } from "@/app/(app)/create/hooks/use-open-preset"
 import { RESET_FORWARD_TYPE } from "@/app/(app)/create/hooks/use-reset"
 import {
   serializeDesignSystemSearchParams,
@@ -20,78 +21,6 @@ import {
 // Hoisted — avoids recreating on every message event. (js-hoist-regexp)
 const MAC_REGEX = /Mac|iPhone|iPad|iPod/
 
-// Hoisted — only uses module-level constants, no component state. (rendering-hoist-jsx)
-function handleMessage(event: MessageEvent) {
-  if (
-    typeof window === "undefined" ||
-    event.origin !== window.location.origin
-  ) {
-    return
-  }
-
-  const type = event.data.type
-  if (type === CMD_K_FORWARD_TYPE) {
-    const isMac = MAC_REGEX.test(navigator.userAgent)
-    document.dispatchEvent(
-      new KeyboardEvent("keydown", {
-        key: event.data.key || "k",
-        metaKey: isMac,
-        ctrlKey: !isMac,
-        bubbles: true,
-        cancelable: true,
-      })
-    )
-  } else if (type === RANDOMIZE_FORWARD_TYPE) {
-    document.dispatchEvent(
-      new KeyboardEvent("keydown", {
-        key: event.data.key || "r",
-        bubbles: true,
-        cancelable: true,
-      })
-    )
-  } else if (type === UNDO_FORWARD_TYPE) {
-    const isMac = MAC_REGEX.test(navigator.userAgent)
-    document.dispatchEvent(
-      new KeyboardEvent("keydown", {
-        key: "z",
-        metaKey: isMac,
-        ctrlKey: !isMac,
-        bubbles: true,
-        cancelable: true,
-      })
-    )
-  } else if (type === REDO_FORWARD_TYPE) {
-    const isMac = MAC_REGEX.test(navigator.userAgent)
-    document.dispatchEvent(
-      new KeyboardEvent("keydown", {
-        key: "z",
-        shiftKey: true,
-        metaKey: isMac,
-        ctrlKey: !isMac,
-        bubbles: true,
-        cancelable: true,
-      })
-    )
-  } else if (type === RESET_FORWARD_TYPE) {
-    document.dispatchEvent(
-      new KeyboardEvent("keydown", {
-        key: "R",
-        shiftKey: true,
-        bubbles: true,
-        cancelable: true,
-      })
-    )
-  } else if (type === DARK_MODE_FORWARD_TYPE) {
-    document.dispatchEvent(
-      new KeyboardEvent("keydown", {
-        key: event.data.key || "d",
-        bubbles: true,
-        cancelable: true,
-      })
-    )
-  }
-}
-
 export function Preview() {
   const [params] = useDesignSystemSearchParams()
   const iframeRef = React.useRef<HTMLIFrameElement>(null)
@@ -117,6 +46,89 @@ export function Preview() {
   }, [params])
 
   React.useEffect(() => {
+    const handleMessage = (event: MessageEvent) => {
+      const iframeWindow = iframeRef.current?.contentWindow
+      if (
+        !iframeWindow ||
+        event.origin !== window.location.origin ||
+        event.source !== iframeWindow ||
+        !event.data ||
+        typeof event.data !== "object"
+      ) {
+        return
+      }
+
+      const type = event.data.type
+      if (type === CMD_K_FORWARD_TYPE) {
+        const isMac = MAC_REGEX.test(navigator.userAgent)
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: event.data.key || "k",
+            metaKey: isMac,
+            ctrlKey: !isMac,
+            bubbles: true,
+            cancelable: true,
+          })
+        )
+      } else if (type === RANDOMIZE_FORWARD_TYPE) {
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: event.data.key || "r",
+            bubbles: true,
+            cancelable: true,
+          })
+        )
+      } else if (type === OPEN_PRESET_FORWARD_TYPE) {
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: event.data.key || "o",
+            bubbles: true,
+            cancelable: true,
+          })
+        )
+      } else if (type === UNDO_FORWARD_TYPE) {
+        const isMac = MAC_REGEX.test(navigator.userAgent)
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: "z",
+            metaKey: isMac,
+            ctrlKey: !isMac,
+            bubbles: true,
+            cancelable: true,
+          })
+        )
+      } else if (type === REDO_FORWARD_TYPE) {
+        const isMac = MAC_REGEX.test(navigator.userAgent)
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: "z",
+            shiftKey: true,
+            metaKey: isMac,
+            ctrlKey: !isMac,
+            bubbles: true,
+            cancelable: true,
+          })
+        )
+      } else if (type === RESET_FORWARD_TYPE) {
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: "R",
+            shiftKey: true,
+            bubbles: true,
+            cancelable: true,
+          })
+        )
+      } else if (type === DARK_MODE_FORWARD_TYPE) {
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: event.data.key || "d",
+            bubbles: true,
+            cancelable: true,
+          })
+        )
+      }
+    }
+
     window.addEventListener("message", handleMessage)
     return () => {
       window.removeEventListener("message", handleMessage)
diff --git a/apps/v4/app/(app)/create/components/random-button.tsx b/apps/v4/app/(app)/create/components/random-button.tsx
index 543fc88f0..43bd32234 100644
--- a/apps/v4/app/(app)/create/components/random-button.tsx
+++ b/apps/v4/app/(app)/create/components/random-button.tsx
@@ -28,7 +28,7 @@ export function RandomButton({
       )}
       {...props}
     >
-      <span className="w-full text-center font-medium">Shuffle</span>
+      <span className="w-full truncate text-center font-medium">Shuffle</span>
     </Button>
   )
 }
diff --git a/apps/v4/app/(app)/create/hooks/use-open-preset.tsx b/apps/v4/app/(app)/create/hooks/use-open-preset.tsx
new file mode 100644
index 000000000..e7812ba3d
--- /dev/null
+++ b/apps/v4/app/(app)/create/hooks/use-open-preset.tsx
@@ -0,0 +1,81 @@
+"use client"
+
+import * as React from "react"
+import useSWR from "swr"
+
+const OPEN_PRESET_KEY = "create:open-preset-open"
+export const OPEN_PRESET_FORWARD_TYPE = "open-preset-forward"
+
+function isEditableTarget(target: EventTarget | null) {
+  return (
+    (target instanceof HTMLElement && target.isContentEditable) ||
+    target instanceof HTMLInputElement ||
+    target instanceof HTMLTextAreaElement ||
+    target instanceof HTMLSelectElement
+  )
+}
+
+export function useOpenPreset() {
+  const { data: open = false, mutate: setOpenData } = useSWR<boolean>(
+    OPEN_PRESET_KEY,
+    {
+      fallbackData: false,
+      revalidateOnFocus: false,
+      revalidateIfStale: false,
+      revalidateOnReconnect: false,
+    }
+  )
+
+  const handleOpenChange = React.useCallback(
+    (nextOpen: boolean) => {
+      void setOpenData(nextOpen, { revalidate: false })
+    },
+    [setOpenData]
+  )
+
+  React.useEffect(() => {
+    const down = (e: KeyboardEvent) => {
+      if (
+        e.key === "o" &&
+        !e.shiftKey &&
+        !e.metaKey &&
+        !e.ctrlKey &&
+        !e.altKey
+      ) {
+        if (isEditableTarget(e.target)) {
+          return
+        }
+
+        e.preventDefault()
+        void setOpenData(true, { revalidate: false })
+      }
+    }
+
+    document.addEventListener("keydown", down)
+    return () => {
+      document.removeEventListener("keydown", down)
+    }
+  }, [setOpenData])
+
+  return {
+    open,
+    setOpen: handleOpenChange,
+  }
+}
+
+export function useOpenPresetTrigger() {
+  const { mutate: setOpenData } = useSWR<boolean>(OPEN_PRESET_KEY, {
+    fallbackData: false,
+    revalidateOnFocus: false,
+    revalidateIfStale: false,
+    revalidateOnReconnect: false,
+  })
+
+  const openPreset = React.useCallback(() => {
+    void setOpenData(true, { revalidate: false })
+  }, [setOpenData])
+
+  return {
+    openPreset,
+  }
+}
diff --git a/apps/v4/app/(app)/create/lib/parse-preset-input.test.ts b/apps/v4/app/(app)/create/lib/parse-preset-input.test.ts
new file mode 100644
index 000000000..a2a1abd68
--- /dev/null
+++ b/apps/v4/app/(app)/create/lib/parse-preset-input.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest"
+
+import { parsePresetInput } from "./parse-preset-input"
+
+describe("parsePresetInput", () => {
+  it("accepts a raw preset code", () => {
+    expect(parsePresetInput("b0")).toBe("b0")
+  })
+
+  it("accepts a --preset flag", () => {
+    expect(parsePresetInput(" --preset b0 ")).toBe("b0")
+  })
+
+  it("rejects invalid preset input", () => {
+    expect(parsePresetInput("open sesame")).toBeNull()
+  })
+})
diff --git a/apps/v4/app/(app)/create/lib/parse-preset-input.ts b/apps/v4/app/(app)/create/lib/parse-preset-input.ts
new file mode 100644
index 000000000..30b40f3b3
--- /dev/null
+++ b/apps/v4/app/(app)/create/lib/parse-preset-input.ts
@@ -0,0 +1,15 @@
+import { isPresetCode } from "shadcn/preset"
+
+const PRESET_FLAG_PATTERN = /^--preset\b\s+(.+)$/i
+
+export function parsePresetInput(value: string) {
+  const input = value.trim()
+
+  if (!input) {
+    return null
+  }
+
+  const preset = input.match(PRESET_FLAG_PATTERN)?.[1]?.trim() ?? input
+
+  return isPresetCode(preset) ? preset : null
+}
diff --git a/apps/v4/app/(create)/preview/[base]/[name]/page.tsx b/apps/v4/app/(create)/preview/[base]/[name]/page.tsx
index 81de3e8ec..fdbf64992 100644
--- a/apps/v4/app/(create)/preview/[base]/[name]/page.tsx
+++ b/apps/v4/app/(create)/preview/[base]/[name]/page.tsx
@@ -10,6 +10,7 @@ import { ActionMenuScript } from "@/app/(app)/create/components/action-menu"
 import { DesignSystemProvider } from "@/app/(app)/create/components/design-system-provider"
 import { HistoryScript } from "@/app/(app)/create/components/history-buttons"
 import { DarkModeScript } from "@/app/(app)/create/components/mode-switcher"
+import { OpenPresetScript } from "@/app/(app)/create/components/open-preset"
 import { PreviewStyle } from "@/app/(app)/create/components/preview-style"
 import { RandomizeScript } from "@/app/(app)/create/components/random-button"
 import {
@@ -139,6 +140,7 @@ export default async function BlockPage({
       <PreventScrollOnFocusScript />
       <PreviewStyle />
       <ActionMenuScript />
+      <OpenPresetScript />
       <RandomizeScript />
       <HistoryScript />
       <DarkModeScript />