diff --git a/packages/cli/src/commands/play.ts b/packages/cli/src/commands/play.ts
index af177cc6a..61241547b 100644
--- a/packages/cli/src/commands/play.ts
+++ b/packages/cli/src/commands/play.ts
@@ -25,7 +25,7 @@ export default defineCommand({
     // Resolve runtime path — same logic as studioServer.ts
     const runtimePath = resolveRuntimePath();
     if (!runtimePath) {
-      clack.log.error("HyperFrames runtime not found. Run `pnpm build` first.");
+      clack.log.error("HyperFrames runtime not found. Run `bun run build` first.");
       process.exitCode = 1;
       return;
     }
@@ -33,7 +33,9 @@ export default defineCommand({
     // Resolve player path
     const playerPath = resolvePlayerPath();
     if (!playerPath) {
-      clack.log.error("@hyperframes/player not found. Run `pnpm build` in packages/player first.");
+      clack.log.error(
+        "@hyperframes/player not found. Run `bun run --cwd packages/player build` first.",
+      );
       process.exitCode = 1;
       return;
     }
diff --git a/packages/cli/src/commands/preview.ts b/packages/cli/src/commands/preview.ts
index 4fe17a9c1..5df30c26a 100644
--- a/packages/cli/src/commands/preview.ts
+++ b/packages/cli/src/commands/preview.ts
@@ -115,7 +115,7 @@ export default defineCommand({
 });
 
 /**
- * Dev mode: spawn pnpm studio from the monorepo (existing behavior).
+ * Dev mode: spawn the studio dev server from the monorepo.
  */
 async function runDevMode(dir: string, projectName?: string): Promise<void> {
   // Find monorepo root by navigating from packages/cli/src/commands/
@@ -159,7 +159,7 @@ async function runDevMode(dir: string, projectName?: string): Promise<void> {
 
   // Run the new consolidated studio (single Vite dev server with API plugin)
   const studioPkgDir = join(repoRoot, "packages", "studio");
-  const child = spawn("pnpm", ["exec", "vite"], {
+  const child = spawn("bun", ["run", "dev"], {
     cwd: studioPkgDir,
     stdio: ["ignore", "pipe", "pipe"],
   });
@@ -335,7 +335,7 @@ async function runEmbeddedMode(
       console.error(`  ${c.dim("-")} ${checkedPath}`);
     }
     console.error();
-    console.error(`  ${c.dim("Rebuild the CLI package with")} ${c.accent("pnpm run build")}`);
+    console.error(`  ${c.dim("Rebuild the CLI package with")} ${c.accent("bun run build")}`);
     console.error();
     process.exitCode = 1;
     return;
diff --git a/packages/cli/src/server/studioServer.ts b/packages/cli/src/server/studioServer.ts
index ccceccffb..c70103584 100644
--- a/packages/cli/src/server/studioServer.ts
+++ b/packages/cli/src/server/studioServer.ts
@@ -409,7 +409,7 @@ export function createStudioServer(options: StudioServerOptions): StudioServer {
     <main>
       <h1>Studio bundle missing</h1>
       <p>The preview server started, but this CLI build does not contain the Studio assets.</p>
-      <code>pnpm run build</code>
+      <code>bun run build</code>
     </main>
   </body>
 </html>`,