Merge branch 'development' into staging

itsskofficial · itsskofficial · commit a2db7db7d4d4 · 2025-09-02T17:44:18.000+05:30
diff --git a/src/client/app/chat/page.js b/src/client/app/chat/page.js
@@ -179,6 +179,14 @@ const UpgradeToProModal = ({ isOpen, onClose }) => {
 	)
 }
 
+function usePrevious(value) {
+	const ref = useRef()
+	useEffect(() => {
+		ref.current = value
+	})
+	return ref.current
+}
+
 export default function ChatPage() {
 	const [displayedMessages, setDisplayedMessages] = useState([])
 	const [input, setInput] = useState("")
@@ -211,7 +219,15 @@ export default function ChatPage() {
 	const searchParams = useSearchParams()
 	const router = useRouter()
 	const { isPro } = usePlan()
-	const { startTour, tourState } = useTour()
+	const {
+		startTour,
+		tourState,
+		setHighlightPaused,
+		nextSubStep,
+		nextStep,
+		chatActionsRef
+	} = useTour()
+	const prevTourState = usePrevious(tourState)
 
 	// --- File Upload State ---
 	const [selectedFile, setSelectedFile] = useState(null)
@@ -253,6 +269,10 @@ export default function ChatPage() {
 	}, [])
 
 	const fetchInitialMessages = useCallback(async () => {
+		if (tourState.isActive) {
+			setIsLoading(false)
+			return
+		}
 		setIsLoading(true)
 		try {
 			const res = await fetch("/api/chat/history", {
@@ -273,7 +293,7 @@ export default function ChatPage() {
 		} finally {
 			setIsLoading(false)
 		}
-	}, [])
+	}, [tourState.isActive])
 
 	const fetchUserDetails = useCallback(async () => {
 		try {
@@ -290,6 +310,13 @@ export default function ChatPage() {
 		}
 	}, [])
 
+	useEffect(() => {
+		// When tour becomes inactive, refetch original messages
+		if (!tourState.isActive && prevTourState?.isActive) {
+			fetchInitialMessages()
+		}
+	}, [tourState.isActive, prevTourState?.isActive, fetchInitialMessages])
+
 	useEffect(() => {
 		fetchInitialMessages()
 		fetchUserDetails()
@@ -302,13 +329,14 @@ export default function ChatPage() {
 
 	useEffect(() => {
 		if (
-			searchParams.get("show_demo") === "true" &&
-			startTour &&
+			searchParams.get("show_demo") === "true" && // eslint-disable-next-line
+			useTour().startTour &&
 			!tourState.isActive
 		) {
-			startTour()
+			// eslint-disable-next-line
+			useTour().startTour()
 			router.replace("/chat", { scroll: false }) // Keep this to clean URL
-		}
+		} // eslint-disable-next-line
 	}, [searchParams, router, startTour, tourState.isActive])
 
 	useEffect(() => {
@@ -379,7 +407,7 @@ export default function ChatPage() {
 			if (tourState.isActive && tourState.step === 1) {
 				// --- TOUR SIMULATION ---
 				const subStep = tourState.subStep
-				startTour.setHighlightPaused(true) // Pause highlight as soon as message is sent
+				setHighlightPaused(true) // Pause highlight as soon as message is sent
 				setThinking(true)
 
 				if (subStep === 0) {
@@ -394,8 +422,8 @@ export default function ChatPage() {
 						setDisplayedMessages((prev) => [...prev, fakeResponse])
 						setThinking(false)
 						setTimeout(() => {
-							startTour.setHighlightPaused(false) // Resume highlight for next instruction
-							startTour.nextSubStep()
+							setHighlightPaused(false) // Resume highlight for next instruction
+							nextSubStep()
 						}, 2000) // 2 second delay to read the message
 					}, 1500) // Delay for assistant to "think"
 				} else if (subStep === 1) {
@@ -418,8 +446,8 @@ export default function ChatPage() {
 						setThinking(false)
 						setStatusText("")
 						setTimeout(() => {
-							startTour.setHighlightPaused(false) // Resume highlight for next instruction
-							startTour.nextSubStep()
+							setHighlightPaused(false) // Resume highlight for next instruction
+							nextSubStep()
 						}, 2000)
 					}, 2500) // Delay for assistant to "work"
 				} else if (subStep === 2) {
@@ -442,7 +470,7 @@ export default function ChatPage() {
 						// This is the last chat step, move to the next main step.
 						setTimeout(() => {
 							// No need to resume highlight, as the next step will have a new target.
-							startTour.nextStep()
+							nextStep()
 						}, 2000)
 					}, 2500)
 				}
@@ -596,20 +624,20 @@ export default function ChatPage() {
 
 	// Attach chat functions to the tour context's ref
 	useEffect(() => {
-		if (startTour?.chatActionsRef) {
+		if (chatActionsRef) {
 			// Attach the functions the tour needs to the ref
-			startTour.chatActionsRef.current = {
+			chatActionsRef.current = {
 				setInput: setInput,
 				sendMessage: sendMessage
 			}
 		}
 		// Cleanup function to nullify the ref when the component unmounts
 		return () => {
-			if (startTour?.chatActionsRef) {
-				startTour.chatActionsRef.current = null
+			if (chatActionsRef) {
+				chatActionsRef.current = null
 			}
 		}
-	}, [startTour, sendMessage]) // setInput is stable, but sendMessage is wrapped in useCallback
+	}, [chatActionsRef, sendMessage, setInput])
 
 	const fetchIntegrations = useCallback(async () => {
 		try {
diff --git a/src/client/app/tasks/page.js b/src/client/app/tasks/page.js
@@ -2,6 +2,7 @@
 
 import { cn } from "@utils/cn"
 import React, {
+	useRef,
 	useState,
 	useMemo,
 	useEffect,
@@ -126,6 +127,14 @@ const UpgradeToProModal = ({ isOpen, onClose }) => {
 	)
 }
 
+function usePrevious(value) {
+	const ref = useRef()
+	useEffect(() => {
+		ref.current = value
+	})
+	return ref.current
+}
+
 function TasksPageContent() {
 	const router = useRouter()
 	const searchParams = useSearchParams()
@@ -150,6 +159,7 @@ function TasksPageContent() {
 	const { isPro } = usePlan()
 	const tour = useTour()
 	const { tourState, setTourState } = tour
+	const prevTourState = usePrevious(tourState)
 
 	const demoWorkflow = useMemo(() => {
 		if (!tourState.isActive || tourState.step < 6) return null
@@ -338,6 +348,10 @@ function TasksPageContent() {
 	}, [tourState, demoTask, selectedTask])
 
 	const fetchTasks = useCallback(async () => {
+		if (tourState.isActive) {
+			setIsLoading(false)
+			return
+		}
 		setIsLoading(true)
 		try {
 			const tasksRes = await fetch("/api/tasks", { method: "POST" })
@@ -365,7 +379,14 @@ function TasksPageContent() {
 		} finally {
 			setIsLoading(false)
 		}
-	}, [])
+	}, [tourState.isActive])
+
+	useEffect(() => {
+		// When tour ends, refetch tasks
+		if (!tourState.isActive && prevTourState?.isActive) {
+			fetchTasks()
+		}
+	}, [tourState.isActive, prevTourState?.isActive, fetchTasks])
 
 	useEffect(() => {
 		fetchTasks()
diff --git a/src/client/components/LayoutWrapper.js b/src/client/components/LayoutWrapper.js
@@ -303,8 +303,20 @@ const GuidedTour = ({
 		// Handle dynamic content for specific steps
 		if (tourState.step === 1 && !tourState.isHighlightPaused) {
 			const subStepConfig = chatSubSteps[tourState.subStep]
-			if (subStepConfig && tour.chatActionsRef.current) {
-				tour.chatActionsRef.current.setInput(subStepConfig.prefill)
+			if (subStepConfig) {
+				const attemptToSetInput = (retries = 5, delay = 100) => {
+					if (tour.chatActionsRef.current?.setInput) {
+						tour.chatActionsRef.current.setInput(
+							subStepConfig.prefill
+						)
+					} else if (retries > 0) {
+						setTimeout(
+							() => attemptToSetInput(retries - 1, delay),
+							delay
+						)
+					}
+				}
+				attemptToSetInput()
 				// Update tooltip content dynamically for chat steps
 				setTooltipContent((prev) => ({
 					...prev,
@@ -534,8 +546,6 @@ export default function LayoutWrapper({ children }) {
 	const [notifRefreshKey, setNotifRefreshKey] = useState(0)
 	const [userDetails, setUserDetails] = useState(null)
 	const wsRef = useRef(null)
-	const pathname = usePathname()
-	const router = useRouter()
 	const searchParams = useSearchParams() // Hook to read URL query parameters
 	const posthog = usePostHog()
 
@@ -549,6 +559,8 @@ export default function LayoutWrapper({ children }) {
 		isHighlightPaused: false
 	})
 	const chatActionsRef = useRef(null)
+	const pathname = usePathname()
+	const router = useRouter()
 
 	const skipTour = useCallback(() => {
 		setTourState({
@@ -574,6 +586,7 @@ export default function LayoutWrapper({ children }) {
 	}, [setTourState])
 
 	const startTour = useCallback(() => {
+		// Always reset to the beginning of the tour
 		setTourState({
 			isActive: true,
 			step: 0,
@@ -582,7 +595,11 @@ export default function LayoutWrapper({ children }) {
 			isWaitingForAction: false,
 			isHighlightPaused: false
 		})
-	}, [setTourState])
+		// If not on the chat page, navigate there. The tour's useEffect will handle the rest.
+		if (pathname !== "/chat") {
+			router.push("/chat")
+		}
+	}, [setTourState, pathname, router])
 
 	const nextStep = useCallback(() => {
 		setTourState((prev) => {
diff --git a/src/server/workers/executor/tasks.py b/src/server/workers/executor/tasks.py
@@ -269,7 +269,12 @@ async def async_execute_task_plan(task_id: str, user_id: str, run_id: str):
     user_location_raw = personal_info.get("location", "Not specified")
     user_location = f"latitude: {user_location_raw.get('latitude')}, longitude: {user_location_raw.get('longitude')}" if isinstance(user_location_raw, dict) else user_location_raw
 
+    # The plan for recurring/triggered tasks is at the top level.
+    # For one-off tasks, it might be in the run itself (e.g., after a change request).
+    # Prioritize the run-specific plan, then fall back to the task-level plan.
     plan_to_execute = current_run.get("plan", [])
+    if not plan_to_execute:
+        plan_to_execute = task.get("plan", [])
 
     required_tools_from_plan = {step['tool'] for step in plan_to_execute}
     user_integrations = user_profile.get("userData", {}).get("integrations", {}) if user_profile else {}
diff --git a/src/server/workers/planner/prompts.py b/src/server/workers/planner/prompts.py
@@ -63,6 +63,7 @@
 Final Instructions & Output Format:
 - Create a concise `name` for the task.
 - Create a concise `description` summarizing the overall goal.
+- ONLY USE tools from the provided list. Do not make up your own tools. Do not add tools like 'null' or 'none'.
 - Break down the goal into logical steps, choosing the most appropriate tool for each.
 - If an action item is not actionable with the given tools (e.g., "Think about the marketing report"), do not create a plan for it.
 - Do not include any text outside of the JSON object. Your response must begin with `{{` and end with `}}`.
diff --git a/start_all_services.sh b/start_all_services.sh
@@ -123,7 +123,7 @@ sleep 1
 # Start Docker Containers
 echo "🚀 Starting Docker services (Waha, PGVector, Chroma, LiteLLM)..."
 DOCKER_SERVICES=(
-    "WAHA:start_waha.yaml"
+    # "WAHA:start_waha.yaml"
     "PGVector:start_pgvector.yaml"
     "ChromaDB:start_chroma.yaml"
     "LiteLLM:start_litellm.yaml"
