diff --git a/package.json b/package.json
index dad6b22a1..827061e07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack",
     "packageManager": "pnpm@10.23.0",
     "type": "module",
diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json
index b95ba687c..1d451a64c 100644
--- a/packages/auth-adapters/better-auth/package.json
+++ b/packages/auth-adapters/better-auth/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/better-auth",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
     "type": "module",
     "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 02ebb3c6c..f6af74b6a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
@@ -92,4 +92,4 @@
     "engines": {
         "node": ">=20"
     }
-}
\ No newline at end of file
+}
diff --git a/packages/cli/src/actions/action-utils.ts b/packages/cli/src/actions/action-utils.ts
index 5f18f9be4..d1f3d7948 100644
--- a/packages/cli/src/actions/action-utils.ts
+++ b/packages/cli/src/actions/action-utils.ts
@@ -244,7 +244,7 @@ export async function loadPluginModule(provider: string, basePath: string) {
     const importAsEsm = async (spec: string) => {
         try {
             const result = (await import(spec)).default as CliPlugin;
-            return result;
+            return typeof result?.generate === 'function' ? result : undefined;
         } catch (err) {
             throw new CliError(`Failed to load plugin module from ${spec}: ${(err as Error).message}`);
         }
@@ -254,7 +254,7 @@ export async function loadPluginModule(provider: string, basePath: string) {
     const importAsTs = async (spec: string) => {
         try {
             const result = (await jiti.import(spec, { default: true })) as CliPlugin;
-            return result;
+            return typeof result?.generate === 'function' ? result : undefined;
         } catch (err) {
             throw new CliError(`Failed to load plugin module from ${spec}: ${(err as Error).message}`);
         }
@@ -294,7 +294,7 @@ export async function loadPluginModule(provider: string, basePath: string) {
     // try jiti import for bare package specifiers (handles workspace packages)
     try {
         const result = (await jiti.import(moduleSpec, { default: true })) as CliPlugin;
-        return result;
+        return typeof result.generate === 'function' ? result : undefined;
     } catch {
         // fall through to last resort
     }
@@ -303,7 +303,7 @@ export async function loadPluginModule(provider: string, basePath: string) {
     try {
         const mod = await import(moduleSpec);
         // plugin may not export a generator, return undefined in that case
-        return mod.default as CliPlugin | undefined;
+        return typeof mod.default?.generate === 'function' ? (mod.default as CliPlugin) : undefined;
     } catch (err) {
         const errorCode = (err as NodeJS.ErrnoException)?.code;
         if (errorCode === 'ERR_MODULE_NOT_FOUND' || errorCode === 'MODULE_NOT_FOUND') {
diff --git a/packages/clients/client-helpers/package.json b/packages/clients/client-helpers/package.json
index 0b35d8bab..9c962f5a5 100644
--- a/packages/clients/client-helpers/package.json
+++ b/packages/clients/client-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/client-helpers",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "Helpers for implementing clients that consume ZenStack's CRUD service",
     "type": "module",
     "scripts": {
diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json
index 21533de8e..ef34a244c 100644
--- a/packages/clients/tanstack-query/package.json
+++ b/packages/clients/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
     "type": "module",
     "scripts": {
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
index 4eafe47e0..535a6cde1 100644
--- a/packages/common-helpers/package.json
+++ b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json
index 4db182c02..0b773197a 100644
--- a/packages/config/eslint-config/package.json
+++ b/packages/config/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/config/typescript-config/package.json b/packages/config/typescript-config/package.json
index e4cce0cce..39ba75aba 100644
--- a/packages/config/typescript-config/package.json
+++ b/packages/config/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/config/vitest-config/package.json b/packages/config/vitest-config/package.json
index f6ed411d1..21d2f75ef 100644
--- a/packages/config/vitest-config/package.json
+++ b/packages/config/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
index 30475634b..d47751667 100644
--- a/packages/create-zenstack/package.json
+++ b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
index c053b796a..d21615362 100644
--- a/packages/ide/vscode/package.json
+++ b/packages/ide/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zenstack-v3",
     "publisher": "zenstack",
-    "version": "3.5.0",
+    "version": "3.5.2",
     "displayName": "ZenStack V3 Language Tools",
     "description": "VSCode extension for ZenStack (v3) ZModel language",
     "private": true,
diff --git a/packages/language/package.json b/packages/language/package.json
index e61dd5d8c..4fc370d39 100644
--- a/packages/language/package.json
+++ b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/orm/package.json b/packages/orm/package.json
index 3b26d02cf..070b090df 100644
--- a/packages/orm/package.json
+++ b/packages/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {
diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json
index 22a953a22..dce88a827 100644
--- a/packages/plugins/policy/package.json
+++ b/packages/plugins/policy/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/plugin-policy",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack Policy Plugin",
     "type": "module",
     "scripts": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 6f0607cbe..29dece752 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/schema",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack Runtime Schema",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index dd1a18c32..36f036753 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index db0a14b3c..5491cdd89 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack automatic CRUD API handlers and server adapters",
     "type": "module",
     "scripts": {
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
index 665644014..4a516ea8a 100644
--- a/packages/testtools/package.json
+++ b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
index 40ce2e9d3..7379b41fa 100644
--- a/packages/zod/package.json
+++ b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "ZenStack Zod integration",
     "type": "module",
     "scripts": {
diff --git a/samples/orm/package.json b/samples/orm/package.json
index dbf735ab6..b2fdf0136 100644
--- a/samples/orm/package.json
+++ b/samples/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-orm",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "",
     "main": "index.js",
     "private": true,
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
index bf05272cc..1d2cc07c9 100644
--- a/tests/e2e/package.json
+++ b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/package.json b/tests/regression/package.json
index 63027401d..ac60d1418 100644
--- a/tests/regression/package.json
+++ b/tests/regression/package.json
@@ -1,6 +1,6 @@
 {
     "name": "regression",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/runtimes/bun/package.json b/tests/runtimes/bun/package.json
index aa57c67ad..b073c4103 100644
--- a/tests/runtimes/bun/package.json
+++ b/tests/runtimes/bun/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bun-e2e",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/runtimes/edge-runtime/package.json b/tests/runtimes/edge-runtime/package.json
index a35a624ac..1b069dff2 100644
--- a/tests/runtimes/edge-runtime/package.json
+++ b/tests/runtimes/edge-runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "edge-runtime-e2e",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "private": true,
     "type": "module",
     "scripts": {