diff --git a/package.json b/package.json
index 13ed399736..4bd15826fe 100644
--- a/package.json
+++ b/package.json
@@ -85,9 +85,9 @@
         "css:mobile-watch": "cross-env TAILWIND_MODE=watch postcss tailwind.mobile.css -o static/mobile/css/style.css --verbose --watch",
         "cljs:mobile-watch": "clojure -M:cljs watch mobile db-worker db-worker-node --config-merge \"{:output-dir \\\"./static/mobile/js\\\" :asset-path \\\"/static/mobile/js\\\" :release {:asset-path \\\"http://localhost\\\"}}\"",
         "cljs:release-mobile": "clojure -M:cljs release mobile db-worker db-worker-node --config-merge \"{:output-dir \\\"./static/mobile/js\\\" :asset-path \\\"/static/mobile/js\\\" :release {:asset-path \\\"http://localhost\\\"}}\"",
-        "cljs:dev-watch": "clojure -M:cljs watch app db-worker db-worker-node electron mobile",
-        "cljs:app-watch": "clojure -M:cljs watch app db-worker db-worker-node",
-        "cljs:electron-watch": "clojure -M:cljs watch app db-worker db-worker-node electron test --config-merge \"{:asset-path \\\"./js\\\"}\"",
+        "cljs:dev-watch": "clojure -M:cljs watch app db-worker db-worker-node electron mobile logseq-cli",
+        "cljs:app-watch": "clojure -M:cljs watch app db-worker db-worker-node logseq-cli",
+        "cljs:electron-watch": "clojure -M:cljs watch app db-worker db-worker-node electron logseq-cli test --config-merge \"{:asset-path \\\"./js\\\"}\"",
         "cljs:release": "clojure -M:cljs release app db-worker db-worker-node publishing electron",
         "cljs:release-electron": "clojure -M:cljs release app db-worker db-worker-node electron --debug && clojure -M:cljs release publishing",
         "cljs:release-app": "clojure -M:cljs release app db-worker db-worker-node",
diff --git a/src/main/logseq/cli/server.cljs b/src/main/logseq/cli/server.cljs
index fc7f937634..a27f35b705 100644
--- a/src/main/logseq/cli/server.cljs
+++ b/src/main/logseq/cli/server.cljs
@@ -46,18 +46,20 @@
   [data-dir repo]
   (node-path/join (repo-dir data-dir repo) "db-worker.lock"))
 
+(defn db-worker-dev-script-path
+  []
+  (node-path/join js/__dirname "../static/db-worker-node.js"))
+
 (defn db-worker-script-path
   []
-  (node-path/join js/__dirname "../dist/db-worker-node.js"))
+  (if goog.DEBUG
+    (db-worker-dev-script-path)
+    (node-path/join js/__dirname "../dist/db-worker-node.js")))
 
 (defn db-worker-runtime-script-path
   []
   (db-worker-script-path))
 
-(defn db-worker-dev-script-path
-  []
-  (node-path/join js/__dirname "../static/db-worker-node.js"))
-
 (defn- base-url
   [{:keys [host port]}]
   (str "http://" host ":" port))