feat (development): fixing dynamic env loading based on environment (dev, dev-cloud, staging, SELFHOST)

Kabeer2004 · Kabeer2004 · commit c7ebd1a46d19 · 2025-07-09T03:53:13.000+05:30
SELFHOST - loads using dotenv in docker container
dev - loads using dotenv outside docker container (run via powershell terminals)
dev-cloud, staging - load using start.sh script in docker container
diff --git a/src/client/app/api/chat/message/route.js b/src/client/app/api/chat/message/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/integrations/connected/route.js b/src/client/app/api/integrations/connected/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const GET = withAuth(async function GET(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/journal/route.js b/src/client/app/api/journal/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const APP_SERVER_URL =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 // GET: Fetch blocks for a specific date or date range
 export const GET = withAuth(async function GET(request, { authHeader }) {
diff --git a/src/client/app/api/notifications/delete/route.js b/src/client/app/api/notifications/delete/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/notifications/route.js b/src/client/app/api/notifications/route.js
@@ -2,9 +2,9 @@
 import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
-const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+const appServerUrl = process.env.NEXT_PUBLIC_ENVIRONMENT === 'SELFHOST'
+    ? process.env.INTERNAL_APP_SERVER_URL
+    : process.env.NEXT_PUBLIC_APP_SERVER_URL;
 
 export const GET = withAuth(async function GET(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/onboarding/route.js b/src/client/app/api/onboarding/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/settings/google-auth/route.js b/src/client/app/api/settings/google-auth/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const GET = withAuth(async function GET(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/settings/integrations/connect/manual/route.js b/src/client/app/api/settings/integrations/connect/manual/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/settings/integrations/connect/oauth/route.js b/src/client/app/api/settings/integrations/connect/oauth/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/settings/integrations/disconnect/route.js b/src/client/app/api/settings/integrations/disconnect/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/settings/integrations/route.js b/src/client/app/api/settings/integrations/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const GET = withAuth(async function GET(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/settings/mcp/route.js b/src/client/app/api/settings/mcp/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 // GET handler to fetch the current Supermemory MCP URL
 export const GET = withAuth(async function GET(request, { authHeader }) {
diff --git a/src/client/app/api/settings/privacy-filters/route.js b/src/client/app/api/settings/privacy-filters/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 // GET handler to fetch current privacy filters
 export const GET = withAuth(async function GET(request, { authHeader }) {
diff --git a/src/client/app/api/settings/whatsapp/route.js b/src/client/app/api/settings/whatsapp/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 // Handler for updating or setting the WhatsApp number
 export const POST = withAuth(async function POST(request, { authHeader }) {
diff --git a/src/client/app/api/tasks/[taskId]/route.js b/src/client/app/api/tasks/[taskId]/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const APP_SERVER_URL =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 // GET: Fetch a single task by its ID
 export const GET = withAuth(async function GET(
diff --git a/src/client/app/api/tasks/add/route.js b/src/client/app/api/tasks/add/route.js
@@ -2,9 +2,9 @@
 import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
-const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+const appServerUrl = process.env.NEXT_PUBLIC_ENVIRONMENT === 'SELFHOST'
+    ? process.env.INTERNAL_APP_SERVER_URL
+    : process.env.NEXT_PUBLIC_APP_SERVER_URL;
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/tasks/approval-data/route.js b/src/client/app/api/tasks/approval-data/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const GET = withAuth(async function GET(request, { authHeader }) {
 	const { searchParams } = new URL(request.url)
diff --git a/src/client/app/api/tasks/approve/route.js b/src/client/app/api/tasks/approve/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/tasks/delete/route.js b/src/client/app/api/tasks/delete/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/tasks/generate-plan/route.js b/src/client/app/api/tasks/generate-plan/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/tasks/rerun/route.js b/src/client/app/api/tasks/rerun/route.js
@@ -2,8 +2,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/tasks/route.js b/src/client/app/api/tasks/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const GET = withAuth(async function GET(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/tasks/update/route.js b/src/client/app/api/tasks/update/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const POST = withAuth(async function POST(request, { authHeader }) {
 	try {
diff --git a/src/client/app/api/user/data/route.js b/src/client/app/api/user/data/route.js
@@ -3,8 +3,9 @@ import { NextResponse } from "next/server"
 import { withAuth } from "@lib/api-utils"
 
 const appServerUrl =
-	process.env.INTERNAL_APP_SERVER_URL ||
-	process.env.NEXT_PUBLIC_APP_SERVER_URL
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "SELFHOST"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
 
 export const GET = withAuth(async function GET(request, { authHeader }) {
 	try {
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
@@ -68,7 +68,7 @@ services:
   redis:
     image: redis:7-alpine
     container_name: sentient-redis-selfhost
-    command: redis-server --requirepass ${REDIS_PASSWORD}
+    command: redis-server --requirepass "${REDIS_PASSWORD}"
     volumes:
       - redis_data:/data
     networks:
diff --git a/src/server/.env.template b/src/server/.env.template
@@ -9,15 +9,20 @@ AUTH0_CLIENT_ID=<your-dev-client-id>
 AUTH0_CLIENT_SECRET=<your-dev-client-secret>
 AUTH0_MANAGEMENT_CLIENT_ID=<your-dev-m2m-client-id>
 AUTH0_MANAGEMENT_CLIENT_SECRET=<your-dev-m2m-secret>
-AUTH0_SCOPE="openid profile email offline_access read:chat write:chat read:profile write:profile manage:google_auth read:memory write:memory read:tasks write:tasks read:notifications read:config write:config admin:user_metadata read:journal write:journal"
+AUTH0_SCOPE="openid profile email offline_access read:chat write:chat read:profile write:profile manage:google_auth read:tasks write:tasks read:notifications read:config write:config admin:user_metadata read:journal write:journal"
 
 # --- Database ---
-MONGO_URI="mongodb+srv://<user>:<password>@<cluster>.mongodb.net/"
+# IMPORTANT: If your password contains special characters like '@', ':', '/', or '+', you MUST URL-encode them.
+# Example: 'my@password' should become 'my%40password'.
+MONGO_URI="mongodb+srv://<user>:<url_encoded_password>@<cluster>.mongodb.net/"
 MONGO_DB_NAME=sentient_dev_db
 
 # --- Task Queue (Celery) ---
-CELERY_BROKER_URL="redis://<your-upstash-url>"
-CELERY_RESULT_BACKEND="redis://<your-upstash-url>"
+# IMPORTANT: If your Redis password contains special characters, it must be URL-encoded.
+# Example: 'my#pass' should become 'my%23pass'
+REDIS_PASSWORD=<your_redis_password>
+CELERY_BROKER_URL="redis://:<url_encoded_password>@<host>:<port>/0"
+CELERY_RESULT_BACKEND="redis://:<url_encoded_password>@<host>:<port>/0"
 
 # --- 3rd Party APIs ---
 NOVITA_API_KEY=<your-novita-api-key>
@@ -38,7 +43,10 @@ AES_IV=<generate_a_32_char_hex_string_for_dev>
 
 # --- WhatsApp API (WAHA) ---
 WAHA_URL="http://localhost:3000"
+WHATSAPP_DEFAULT_ENGINE=GOWS
 WAHA_API_KEY="admin"
+WAHA_DASHBOARD_USERNAME=admin
+WAHA_DASHBOARD_PASSWORD=admin
 
 # --- MCP Hub Internal URLs (Render service names) ---
 MEMORY_MCP_SERVER_URL=http://mcp-memory-dev:8001/sse
diff --git a/src/server/docker-compose.yaml b/src/server/docker-compose.yaml
@@ -3,6 +3,8 @@
 # This file defines how to run your application using Docker Compose.
 # It now orchestrates the main application, Redis, and the WAHA service.
 
+version: "3.8"
+
 services:
   # 1. The Main Sentient Application (FastAPI, Nginx, Celery, MCPs)
   sentient-app:
@@ -28,13 +30,15 @@ services:
     image: redis:7-alpine
     container_name: redis-db
     restart: unless-stopped
-    # Use the password from the .env file
-    command: redis-server --requirepass ${REDIS_PASSWORD}
+    # Use the password from the .env file, ensuring it's quoted
+    command: redis-server --requirepass "${REDIS_PASSWORD}"
     volumes:
       # Use a named volume for persistent Redis data
       - redis-data:/data
     networks:
       - sentient_network
+    env_file:
+      - ./.env
     # No ports are exposed to the host. Communication is internal and secure.
 
   # 3. WAHA (WhatsApp HTTP API) Service
@@ -45,14 +49,10 @@ services:
     volumes:
       # Use a named volume for persistent WhatsApp session data
       - waha-sessions:/app/.sessions
-    environment:
-      - WHATSAPP_DEFAULT_ENGINE=GOWS
-      # Use variables from the .env file
-      - WAHA_API_KEY=${WAHA_API_KEY}
-      - WAHA_DASHBOARD_USERNAME=admin
-      - WAHA_DASHBOARD_PASSWORD=${WAHA_DASHBOARD_PASSWORD}
     networks:
       - sentient_network
+    env_file:
+      - ./.env
     # No ports are exposed to the host. The sentient-app communicates with it internally.
 
 # Defines the shared network for all services
@@ -63,4 +63,4 @@ networks:
 # Defines the named volumes for data persistence
 volumes:
   redis-data:
-  waha-sessions:
+  waha-sessions:
diff --git a/src/server/main/config.py b/src/server/main/config.py
diff --git a/src/server/start.sh b/src/server/start.sh
diff --git a/src/server/workers/celery_app.py b/src/server/workers/celery_app.py
diff --git a/src/server/workers/planner/config.py b/src/server/workers/planner/config.py
