From a49c2da4561b63ab3f8aebec1e95ff1022a8ef8d Mon Sep 17 00:00:00 2001
From: Yiming Cao <yiming@whimslab.io>
Date: Tue, 3 Mar 2026 09:43:45 -0800
Subject: [PATCH] fix(cli): add "@zenstackhq/schema" package installation for
 "zenstack create" and "zen init" (#2437)

---
 CLAUDE.md                             | 4 ++++
 packages/cli/src/actions/init.ts      | 1 +
 packages/create-zenstack/src/index.ts | 1 +
 packages/schema/package.json          | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/CLAUDE.md b/CLAUDE.md
index 04e18dee..151cb568 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -75,6 +75,10 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - Kysely query builder as escape hatch instead of raw SQL
 - Schema-first approach with ZModel DSL extension of Prisma schema language
 
+## Pull Requests
+
+- Always target the `dev` branch (not `main`) when creating PRs
+
 ## Development Notes
 
 - Always run `zenstack generate` after modifying ZModel schemas
diff --git a/packages/cli/src/actions/init.ts b/packages/cli/src/actions/init.ts
index 03635736..722d15fe 100644
--- a/packages/cli/src/actions/init.ts
+++ b/packages/cli/src/actions/init.ts
@@ -13,6 +13,7 @@ import { STARTER_ZMODEL } from './templates';
 export async function run(projectPath: string) {
     const packages = [
         { name: '@zenstackhq/cli@latest', dev: true },
+        { name: '@zenstackhq/schema@latest', dev: false },
         { name: '@zenstackhq/orm@latest', dev: false },
     ];
     let pm = await detect();
diff --git a/packages/create-zenstack/src/index.ts b/packages/create-zenstack/src/index.ts
index 6dc8073d..040b4608 100644
--- a/packages/create-zenstack/src/index.ts
+++ b/packages/create-zenstack/src/index.ts
@@ -67,6 +67,7 @@ function initProject(name: string) {
     // install packages
     const packages = [
         { name: '@zenstackhq/cli@latest', dev: true },
+        { name: '@zenstackhq/schema@latest', dev: false },
         { name: '@zenstackhq/orm@latest', dev: false },
         { name: 'better-sqlite3', dev: false },
         { name: '@types/better-sqlite3', dev: true },
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 72372af4..57a0ef2f 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -27,6 +27,10 @@
                 "types": "./dist/index.d.cts",
                 "default": "./dist/index.cjs"
             }
+        },
+        "./package.json": {
+            "import": "./package.json",
+            "require": "./package.json"
         }
     },
     "dependencies": {