diff --git a/package.json b/package.json
index 87b59eb6b..761e90497 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,9 @@
     "db:backfill-internal-free-plans": "pnpm pre && pnpm run --filter=@hexclave/backend db:backfill-internal-free-plans",
     "db:regen-internal-subscriptions-to-latest": "pnpm pre && pnpm run --filter=@hexclave/backend db:regen-internal-subscriptions-to-latest",
     "dev:full": "pnpm pre && concurrently -k \"pnpm run build-packages:watch\" \"pnpm run generate-sdks:watch\" \"pnpm run generate-setup-prompt-docs:watch\" \"turbo run dev --concurrency 99999\"",
-    "dev": "pnpm pre && concurrently -k \"pnpm run build-packages:watch\" \"pnpm run generate-sdks:watch\" \"pnpm run generate-openapi-docs:watch\" \"pnpm run generate-setup-prompt-docs:watch\" \"turbo run dev --concurrency 99999 --filter=./apps/* --filter=@hexclave/docs-mintlify --filter=./packages/* --filter=./examples/demo --filter=./examples/tanstack-start-demo \"",
-    "dev:tui": "pnpm pre && turbo run dev build-packages:watch generate-sdks:watch generate-openapi-docs:watch generate-setup-prompt-docs:watch --ui tui --concurrency 99999 --filter=// --filter=./apps/* --filter=@hexclave/docs-mintlify --filter=./packages/* --filter=./examples/demo --filter=./examples/tanstack-start-demo",
+    "dev": "pnpm pre && HEXCLAVE_DEV_UI=stream pnpm run dev:tasks",
+    "dev:tui": "pnpm pre && HEXCLAVE_DEV_UI=tui pnpm run dev:tasks",
+    "dev:tasks": "turbo run dev build-packages:watch generate-sdks:watch generate-openapi-docs:watch generate-setup-prompt-docs:watch --ui ${HEXCLAVE_DEV_UI:?HEXCLAVE_DEV_UI must be set} --concurrency 99999 --filter=// --filter=./apps/* --filter=@hexclave/docs-mintlify --filter=./packages/* --filter=./examples/demo --filter=./examples/tanstack-start-demo",
     "dev:inspect": "pnpm pre && STACK_BACKEND_DEV_EXTRA_ARGS=\"--inspect\" pnpm run dev",
     "dev:profile": "pnpm pre && STACK_BACKEND_DEV_EXTRA_ARGS=\"--experimental-cpu-prof\" pnpm run dev",
     "dev:basic": "pnpm pre && concurrently -k \"pnpm run build-packages:watch\" \"pnpm run generate-sdks:watch\" \"turbo run dev --concurrency 99999 --filter=@hexclave/backend --filter=@hexclave/bulldozer-js --filter=@hexclave/mcp --filter=@hexclave/dashboard --filter=@hexclave/mock-oauth-server\"",