ymc9 · Oct 27, 2026 · Oct 5, 2026 · Oct 10, 2026 · Oct 10, 2026 · Oct 13, 2026
diff --git a/BREAKINGCHANGES.md b/BREAKINGCHANGES.md
@@ -4,3 +4,4 @@
 1. `@omit` and `@password` attributes have been removed
 1. SWR plugin is removed
 1. `makeModelSchema()` no longer includes relation fields by default — use `include` or `select` options to opt in, mirroring ORM behaviour
+1. ORM entity mutation catch-all hooks should now be registered under `onEntityMutation.$all` (the previous shape still works but emits a deprecation warning); entities passed to per-model hooks are typed as raw database rows (same as `$qb` results)
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "zenstack-v3",
     "displayName": "ZenStack",
     "description": "ZenStack",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",
@@ -67,7 +67,7 @@
         "overrides": {
             "cookie@<0.7.0": ">=0.7.0",
             "lodash@>=4.0.0 <=4.17.23": ">=4.18.0",
-            "@better-auth/core": "1.4.19"
+            "@better-auth/core": "1.7.12"
         },
         "patchedDependencies": {
             "jsonschema@1.5.0": "patches/jsonschema@1.5.0.patch"

diff --git a/packages/auth-adapters/better-auth/README.md b/packages/auth-adapters/better-auth/README.md
@@ -26,8 +26,8 @@ const auth = new BetterAuth({
 
 ## Schema generation
 
-You can use the `@better-auth/cli` to populate better-auth's data models into your ZModel schema.
+You can use the `auth` CLI (formerly `@better-auth/cli`) to populate better-auth's data models into your ZModel schema.
 
 ```bash
-npx @better-auth/cli generate
+npx auth generate
 ```
diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json
@@ -2,7 +2,7 @@
     "name": "@zenstackhq/better-auth",
     "displayName": "ZenStack Better Auth Adapter",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",
@@ -65,15 +65,15 @@
         "better-auth": "^1.3.0"
     },
     "devDependencies": {
-        "@better-auth/cli": "1.4.19",
-        "@better-auth/core": "1.4.19",
+        "@better-auth/core": "1.7.12",
+        "auth": "1.7.12",
         "@types/tmp": "catalog:",
         "@zenstackhq/cli": "workspace:*",
         "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/tsdown-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
-        "better-auth": "1.4.19",
+        "better-auth": "1.7.12",
         "kysely": "catalog:",
         "tmp": "catalog:"
     },

diff --git a/packages/auth-adapters/better-auth/src/schema-generator.ts b/packages/auth-adapters/better-auth/src/schema-generator.ts
@@ -97,15 +97,7 @@ async function updateSchema(
 
     const supportsArrays = getSupportsArrays(config);
     for (const [name, table] of Object.entries(tables)) {
-        const c = addOrUpdateModel(
-            name,
-            table,
-            zmodel,
-            tables,
-            toManyRelations,
-            supportsArrays,
-            !!options.advanced?.database?.useNumberId,
-        );
+        const c = addOrUpdateModel(name, table, zmodel, tables, toManyRelations, supportsArrays, useNumberId(options));
         changed = changed || c;
     }
 
@@ -583,3 +575,9 @@ function createStringAttributeArg(value: string) {
     arg.value = expr;
     return arg;
 }
+
+function useNumberId(options: BetterAuthOptions) {
+    const dbOptions = options.advanced?.database as { useNumberId?: boolean; generateId?: unknown } | undefined;
+    // `useNumberId` was replaced by `generateId: 'serial'` in better-auth 1.7
+    return !!dbOptions?.useNumberId || dbOptions?.generateId === 'serial';
+}
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -2,7 +2,7 @@
     "name": "@zenstackhq/cli",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",
@@ -61,7 +61,7 @@
         "@zenstackhq/plugin-policy": "workspace:*",
         "@zenstackhq/server": "workspace:*",
         "@hono/node-server": "^1.13.8",
-        "hono": "^4.11.10",
+        "hono": "^4.13.7",
         "chokidar": "^5.0.0",
         "colors": "1.4.0",
         "commander": "^8.3.0",

diff --git a/packages/cli/test/prisma-schema-gen.test.ts b/packages/cli/test/prisma-schema-gen.test.ts
@@ -91,4 +91,47 @@ model User {
         expect(prismaSchemaText.includes('@ds.JsonB')).toBe(true);
         expect(prismaSchemaText.includes('@ds.ByteA')).toBe(true);
     });
+
+    it('renames primitive type defs to match the base type', async () => {
+        const model = await loadSchema(`
+model User {
+    id   String   @id
+    name UserName
+}
+
+type UserName with String {
+    this String
+}
+        `);
+
+        const generator = new PrismaSchemaGenerator(model);
+        const prismaSchemaText = await generator.generate();
+
+        expect(prismaSchemaText.includes('name UserName')).toBe(false);
+        expect(prismaSchemaText.includes('name String')).toBe(true);
+    });
+
+    it('renames primitive type defs to match the base type when used with lists', async () => {
+        const model = await loadSchema(`
+datasource db {
+    provider = 'postgresql'
+    url      = env('DATABASE_URL')
+}
+
+model User {
+    id   String   @id
+    name UserName[]
+}
+
+type UserName with String {
+    this String
+}
+        `);
+
+        const generator = new PrismaSchemaGenerator(model);
+        const prismaSchemaText = await generator.generate();
+
+        expect(prismaSchemaText.includes('name UserName[]')).toBe(false);
+        expect(prismaSchemaText.includes('name String[]')).toBe(true);
+    });
 });
diff --git a/packages/cli/test/ts-schema-gen.test.ts b/packages/cli/test/ts-schema-gen.test.ts
@@ -852,6 +852,126 @@ model Post {
         });
     });
 
+    it('supports implicit conversions from enums to arrays', async () => {
+        const { schema } = await generateTsSchema(`
+enum PostStatus {
+    DRAFT
+    ACTIVE
+    CANCELLED
+}
+
+model User {
+    id Int @id @default(autoincrement())
+}
+
+model Post {
+    id     String @id
+    status String
+
+    @@validate(status in PostStatus)
+}
+            `);
+
+        expect(schema.models['Post']?.attributes).toMatchObject([
+            {
+                name: '@@validate',
+                args: [
+                    {
+                        name: 'value',
+                        value: {
+                            kind: 'binary',
+                            op: 'in',
+                            left: {
+                                kind: 'field',
+                                field: 'status',
+                            },
+                            right: {
+                                kind: 'array',
+                                type: 'PostStatus',
+                                items: [
+                                    {
+                                        kind: 'literal',
+                                        value: 'DRAFT',
+                                    },
+                                    {
+                                        kind: 'literal',
+                                        value: 'ACTIVE',
+                                    },
+                                    {
+                                        kind: 'literal',
+                                        value: 'CANCELLED',
+                                    },
+                                ],
+                            },
+                            binding: undefined,
+                        },
+                    },
+                ],
+            },
+        ]);
+    });
+
+    it('emits enum names (not @map values) when converting enums to arrays', async () => {
+        // enum values are represented by their names at runtime (TS values, auth(), Zod);
+        // the ORM's name mapper translates them to `@map`-ed values at SQL execution time
+        const { schema } = await generateTsSchema(`
+enum PostStatus {
+    DRAFT @map('draft')
+    ACTIVE @map('active')
+    CANCELLED @map('cancelled')
+}
+
+model User {
+    id Int @id @default(autoincrement())
+}
+
+model Post {
+    id     String @id
+    status String
+
+    @@validate(status in PostStatus)
+}
+            `);
+
+        expect(schema.models['Post']?.attributes).toMatchObject([
+            {
+                name: '@@validate',
+                args: [
+                    {
+                        name: 'value',
+                        value: {
+                            kind: 'binary',
+                            op: 'in',
+                            left: {
+                                kind: 'field',
+                                field: 'status',
+                            },
+                            right: {
+                                kind: 'array',
+                                type: 'PostStatus',
+                                items: [
+                                    {
+                                        kind: 'literal',
+                                        value: 'DRAFT',
+                                    },
+                                    {
+                                        kind: 'literal',
+                                        value: 'ACTIVE',
+                                    },
+                                    {
+                                        kind: 'literal',
+                                        value: 'CANCELLED',
+                                    },
+                                ],
+                            },
+                            binding: undefined,
+                        },
+                    },
+                ],
+            },
+        ]);
+    });
+
     it('supports @@strict for type defs', async () => {
         const { schema } = await generateTsSchema(`
 model User {
@@ -895,4 +1015,61 @@ type Profile with Strict {
             },
         });
     });
+
+    it('supports primitive type defs', async () => {
+        const { schema } = await generateTsSchema(`
+            model User {
+                id   Int      @id
+                name UserName
+            }
+
+            type UserName with String {
+                this String
+            }
+            `);
+
+        expect(schema).toMatchObject({
+            models: {
+                User: {
+                    name: 'User',
+                    fields: {
+                        id: {
+                            name: 'id',
+                            type: 'Int',
+                            id: true,
+                            attributes: [
+                                {
+                                    name: '@id',
+                                },
+                            ],
+                        },
+                        name: {
+                            name: 'name',
+                            type: 'UserName',
+                        },
+                    },
+                    idFields: ['id'],
+                    uniqueFields: {
+                        id: {
+                            type: 'Int',
+                        },
+                    },
+                },
+            },
+            typeDefs: {
+                UserName: {
+                    name: 'UserName',
+                    base: 'String',
+                    fields: {
+                        this: {
+                            name: 'this',
+                            type: 'String',
+                        },
+                    },
+                },
+            },
+            authType: 'User',
+            plugins: {},
+        });
+    });
 });
diff --git a/packages/clients/client-helpers/package.json b/packages/clients/client-helpers/package.json
@@ -2,7 +2,7 @@
     "name": "@zenstackhq/client-helpers",
     "displayName": "ZenStack Client Helpers",
     "description": "Helpers for implementing clients that consume ZenStack's CRUD service",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

diff --git a/packages/clients/fetch-client/package.json b/packages/clients/fetch-client/package.json
@@ -2,7 +2,7 @@
     "name": "@zenstackhq/fetch-client",
     "displayName": "ZenStack Fetch Client",
     "description": "Simple fetch-based client for consuming ZenStack's RPC-style CRUD API",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json
@@ -2,7 +2,7 @@
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack TanStack Query Integration",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -2,7 +2,7 @@
     "name": "@zenstackhq/common-helpers",
     "displayName": "ZenStack Common Helpers",
     "description": "ZenStack Common Helpers",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "type": "module",
     "private": true,
     "license": "MIT"

diff --git a/packages/config/tsdown-config/package.json b/packages/config/tsdown-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tsdown-config",
-    "version": "3.9.8",
+    "version": "3.10.0",
     "private": true,
     "type": "module",
     "license": "MIT",