diff --git a/package.json b/package.json
index b55c44c6..66550d6d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,9 @@
         "build": "pnpm -r build",
         "watch": "pnpm -r --parallel watch",
         "lint": "pnpm -r lint",
-        "test": "pnpm vitest"
+        "test": "pnpm vitest",
+        "publish-preview": "pnpm --filter \"./packages/**\" -r publish --force --registry https://preview.registry.zenstack.dev/",
+        "unpublish-preview": "pnpm --filter \"./packages/**\" -r --shell-mode exec -- npm unpublish -f --registry https://preview.registry.zenstack.dev/ \"\\$PNPM_PACKAGE_NAME\""
     },
     "keywords": [],
     "author": "",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f5091ab0..5790c73b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@zenstackhq/cli",
+    "name": "zenstack",
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 11336816..9894f74b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -232,15 +232,6 @@ importers:
         specifier: ^0.27.6
         version: 0.27.6
 
-  packages/tanstack-query:
-    dependencies:
-      '@tanstack/react-query':
-        specifier: ^5.0.0
-        version: 5.66.3(react@19.0.0)
-      '@zenstackhq/runtime':
-        specifier: workspace:*
-        version: link:../runtime
-
   packages/testtools:
     dependencies:
       '@types/node':
@@ -278,29 +269,17 @@ importers:
         specifier: ^0.2.6
         version: 0.2.6
 
-  packages/zod:
-    dependencies:
-      '@zenstackhq/runtime':
-        specifier: workspace:*
-        version: link:../runtime
-      ts-pattern:
-        specifier: ^5.6.0
-        version: 5.6.0
-      zod:
-        specifier: ^3.0.0
-        version: 3.24.1
-
   samples/blog:
     dependencies:
-      '@zenstackhq/cli':
-        specifier: workspace:*
-        version: link:../../packages/cli
       '@zenstackhq/runtime':
         specifier: workspace:*
         version: link:../../packages/runtime
       better-sqlite3:
         specifier: ^11.8.1
         version: 11.8.1
+      zenstack:
+        specifier: workspace:*
+        version: link:../../packages/cli
     devDependencies:
       '@types/better-sqlite3':
         specifier: ^7.6.12
@@ -1040,14 +1019,6 @@ packages:
   '@swc/types@0.1.17':
     resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==}
 
-  '@tanstack/query-core@5.66.3':
-    resolution: {integrity: sha512-+2iDxH7UFdtwcry766aJszGmbByQDIzTltJ3oQAZF9bhCxHCIN3yDwHa6qDCZxcpMGvUphCRx/RYJvLbM8mucQ==}
-
-  '@tanstack/react-query@5.66.3':
-    resolution: {integrity: sha512-sWMvxZ5VugPDgD1CzP7f0s9yFvjcXP3FXO5IVV2ndXlYqUCwykU8U69Kk05Qn5UvGRqB/gtj4J7vcTC6vtLHtQ==}
-    peerDependencies:
-      react: ^18 || ^19
-
   '@types/async-exit-hook@2.0.2':
     resolution: {integrity: sha512-RJbTNivnnn+JzNiQTtUgwo/1S6QUHwI5JfXCeUPsqZXB4LuvRwvHhbKFSS5jFDYpk8XoEAYVW2cumBOdGpXL2Q==}
 
@@ -2372,10 +2343,6 @@ packages:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
-  react@19.0.0:
-    resolution: {integrity: sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==}
-    engines: {node: '>=0.10.0'}
-
   read-pkg@3.0.0:
     resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
     engines: {node: '>=4'}
@@ -3460,13 +3427,6 @@ snapshots:
     dependencies:
       '@swc/counter': 0.1.3
 
-  '@tanstack/query-core@5.66.3': {}
-
-  '@tanstack/react-query@5.66.3(react@19.0.0)':
-    dependencies:
-      '@tanstack/query-core': 5.66.3
-      react: 19.0.0
-
   '@types/async-exit-hook@2.0.2': {}
 
   '@types/better-sqlite3@7.6.12':
@@ -4967,8 +4927,6 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  react@19.0.0: {}
-
   read-pkg@3.0.0:
     dependencies:
       load-json-file: 4.0.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 7489294a..aa51c22c 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,7 @@
 packages:
-    - packages/**
+    - packages/language
+    - packages/sdk
+    - packages/runtime
+    - packages/cli
+    - packages/testtools
     - samples/**
diff --git a/samples/blog/package.json b/samples/blog/package.json
index 8142ca41..44eab41e 100644
--- a/samples/blog/package.json
+++ b/samples/blog/package.json
@@ -13,7 +13,7 @@
     "author": "",
     "license": "MIT",
     "dependencies": {
-        "@zenstackhq/cli": "workspace:*",
+        "zenstack": "workspace:*",
         "@zenstackhq/runtime": "workspace:*",
         "better-sqlite3": "^11.8.1"
     },
diff --git a/turbo.json b/turbo.json
index 89ae4716..a2a6d223 100644
--- a/turbo.json
+++ b/turbo.json
@@ -5,12 +5,11 @@
             "dependsOn": ["^build"],
             "outputs": ["dist/**"]
         },
-        "check-types": {
-            "dependsOn": ["^check-types"]
+        "lint": {
+            "dependsOn": ["^lint"]
         },
-        "dev": {
-            "persistent": true,
-            "cache": false
+        "test": {
+            "dependsOn": ["^test"]
         }
     }
 }