From df46c1861ba7437348b442d4f7763913932e8b01 Mon Sep 17 00:00:00 2001
From: Vasist10 <155972527+Vasist10@users.noreply.github.com>
Date: Sun, 21 Dec 2025 23:33:12 +0530
Subject: [PATCH 1/4] feat: add task dependency support

---
 backend/controllers/add_task.go               |  10 +-
 backend/controllers/edit_task.go              |   7 +
 backend/controllers/modify_task.go            |  10 +-
 backend/models/request_body.go                |   2 +
 backend/utils/tw/add_task.go                  |   7 +-
 backend/utils/tw/modify_task.go               |  10 +-
 backend/utils/validation.go                   |  21 +++
 .../HomeComponents/Tasks/AddTaskDialog.tsx    | 126 ++++++++++++++++++
 .../components/HomeComponents/Tasks/Tasks.tsx |  35 +++++
 .../components/HomeComponents/Tasks/hooks.ts  |   6 +
 frontend/src/components/utils/types.ts        |   2 +
 11 files changed, 232 insertions(+), 4 deletions(-)
 create mode 100644 backend/utils/validation.go

diff --git a/backend/controllers/add_task.go b/backend/controllers/add_task.go
index 4dfa465e..191ca671 100644
--- a/backend/controllers/add_task.go
+++ b/backend/controllers/add_task.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"ccsync_backend/models"
+	"ccsync_backend/utils"
 	"ccsync_backend/utils/tw"
 	"encoding/json"
 	"fmt"
@@ -49,11 +50,18 @@ func AddTaskHandler(w http.ResponseWriter, r *http.Request) {
 		start := requestBody.Start
 		tags := requestBody.Tags
 		annotations := requestBody.Annotations
+		depends := requestBody.Depends
 
 		if description == "" {
 			http.Error(w, "Description is required, and cannot be empty!", http.StatusBadRequest)
 			return
 		}
+
+		// Validate dependencies
+		if err := utils.ValidateDependencies(depends, ""); err != nil {
+			http.Error(w, fmt.Sprintf("Invalid dependencies: %v", err), http.StatusBadRequest)
+			return
+		}
 		var dueDateStr string
 		if dueDate != nil && *dueDate != "" {
 			dueDateStr = *dueDate
@@ -64,7 +72,7 @@ func AddTaskHandler(w http.ResponseWriter, r *http.Request) {
 			Name: "Add Task",
 			Execute: func() error {
 				logStore.AddLog("INFO", fmt.Sprintf("Adding task: %s", description), uuid, "Add Task")
-				err := tw.AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDateStr, start, tags, annotations)
+				err := tw.AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDateStr, start, tags, annotations, depends)
 				if err != nil {
 					logStore.AddLog("ERROR", fmt.Sprintf("Failed to add task: %v", err), uuid, "Add Task")
 					return err
diff --git a/backend/controllers/edit_task.go b/backend/controllers/edit_task.go
index 8ef0e5b6..cbbdc346 100644
--- a/backend/controllers/edit_task.go
+++ b/backend/controllers/edit_task.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"ccsync_backend/models"
+	"ccsync_backend/utils"
 	"ccsync_backend/utils/tw"
 	"encoding/json"
 	"fmt"
@@ -59,6 +60,12 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		// Validate dependencies
+		if err := utils.ValidateDependencies(depends, uuid); err != nil {
+			http.Error(w, fmt.Sprintf("Invalid dependencies: %v", err), http.StatusBadRequest)
+			return
+		}
+
 		logStore := models.GetLogStore()
 		job := Job{
 			Name: "Edit Task",
diff --git a/backend/controllers/modify_task.go b/backend/controllers/modify_task.go
index 573d97a4..e4eb2acd 100644
--- a/backend/controllers/modify_task.go
+++ b/backend/controllers/modify_task.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"ccsync_backend/models"
+	"ccsync_backend/utils"
 	"ccsync_backend/utils/tw"
 	"encoding/json"
 	"fmt"
@@ -48,6 +49,7 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
 		status := requestBody.Status
 		due := requestBody.Due
 		tags := requestBody.Tags
+		depends := requestBody.Depends
 
 		if description == "" {
 			http.Error(w, "Description is required, and cannot be empty!", http.StatusBadRequest)
@@ -58,6 +60,12 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		// Validate dependencies
+		if err := utils.ValidateDependencies(depends, uuid); err != nil {
+			http.Error(w, fmt.Sprintf("Invalid dependencies: %v", err), http.StatusBadRequest)
+			return
+		}
+
 		// if err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID); err != nil {
 		// 	http.Error(w, err.Error(), http.StatusInternalServerError)
 		// 	return
@@ -68,7 +76,7 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
 			Name: "Modify Task",
 			Execute: func() error {
 				logStore.AddLog("INFO", fmt.Sprintf("Modifying task ID: %s", taskID), uuid, "Modify Task")
-				err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID, tags)
+				err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID, tags, depends)
 				if err != nil {
 					logStore.AddLog("ERROR", fmt.Sprintf("Failed to modify task ID %s: %v", taskID, err), uuid, "Modify Task")
 					return err
diff --git a/backend/models/request_body.go b/backend/models/request_body.go
index 30f7dddb..4c28e55a 100644
--- a/backend/models/request_body.go
+++ b/backend/models/request_body.go
@@ -12,6 +12,7 @@ type AddTaskRequestBody struct {
 	Start            string       `json:"start"`
 	Tags             []string     `json:"tags"`
 	Annotations      []Annotation `json:"annotations"`
+	Depends          []string     `json:"depends"`
 }
 type ModifyTaskRequestBody struct {
 	Email            string   `json:"email"`
@@ -24,6 +25,7 @@ type ModifyTaskRequestBody struct {
 	Status           string   `json:"status"`
 	Due              string   `json:"due"`
 	Tags             []string `json:"tags"`
+	Depends          []string `json:"depends"`
 }
 type EditTaskRequestBody struct {
 	Email            string   `json:"email"`
diff --git a/backend/utils/tw/add_task.go b/backend/utils/tw/add_task.go
index 56178fb9..618b6027 100644
--- a/backend/utils/tw/add_task.go
+++ b/backend/utils/tw/add_task.go
@@ -10,7 +10,7 @@ import (
 )
 
 // add task to the user's tw client
-func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDate, start string, tags []string, annotations []models.Annotation) error {
+func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDate, start string, tags []string, annotations []models.Annotation, depends []string) error {
 	if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
 		return fmt.Errorf("error deleting Taskwarrior data: %v", err)
 	}
@@ -43,6 +43,11 @@ func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, p
 	if start != "" {
 		cmdArgs = append(cmdArgs, "start:"+start)
 	}
+	// Add dependencies to the task
+	if len(depends) > 0 {
+		dependsStr := strings.Join(depends, ",")
+		cmdArgs = append(cmdArgs, "depends:"+dependsStr)
+	}
 	// Add tags to the task
 	if len(tags) > 0 {
 		for _, tag := range tags {
diff --git a/backend/utils/tw/modify_task.go b/backend/utils/tw/modify_task.go
index 286a435e..ba23b4bb 100644
--- a/backend/utils/tw/modify_task.go
+++ b/backend/utils/tw/modify_task.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-func ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID string, tags []string) error {
+func ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID string, tags []string, depends []string) error {
 	if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
 		fmt.Println("1")
 		return fmt.Errorf("error deleting Taskwarrior data: %v", err)
@@ -55,6 +55,14 @@ func ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due,
 		return fmt.Errorf("failed to edit task due: %v", err)
 	}
 
+	// Handle dependencies
+	if len(depends) > 0 {
+		dependsStr := strings.Join(depends, ",")
+		if err := utils.ExecCommand("task", taskID, "modify", "depends:"+dependsStr); err != nil {
+			return fmt.Errorf("failed to set dependencies %s: %v", dependsStr, err)
+		}
+	}
+
 	// escapedStatus := fmt.Sprintf(`status:%s`, strings.ReplaceAll(status, `"`, `\"`))
 	if status == "completed" {
 		utils.ExecCommand("task", taskID, "done", "rc.confirmation=off")
diff --git a/backend/utils/validation.go b/backend/utils/validation.go
new file mode 100644
index 00000000..a439e055
--- /dev/null
+++ b/backend/utils/validation.go
@@ -0,0 +1,21 @@
+package utils
+
+import (
+	"fmt"
+)
+
+// ValidateDependencies validates dependencies
+func ValidateDependencies(depends []string, currentTaskUUID string) error {
+	if len(depends) == 0 {
+		return nil
+	}
+
+	// check for self-dependency
+	for _, dep := range depends {
+		if dep == currentTaskUUID {
+			return fmt.Errorf("task cannot depend on itself: %s", dep)
+		}
+	}
+
+	return nil
+}
diff --git a/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx b/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
index 7ea37277..094ecafb 100644
--- a/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
@@ -35,6 +35,7 @@ export const AddTaskdialog = ({
   isCreatingNewProject,
   setIsCreatingNewProject,
   uniqueProjects = [],
+  allTasks = [], // Add this prop
 }: AddTaskDialogProps) => {
   const [annotationInput, setAnnotationInput] = useState('');
 
@@ -322,6 +323,131 @@ export const AddTaskdialog = ({
               </div>
             )}
           </div>
+          <div className="grid grid-cols-4 items-center gap-4">
+            <Label htmlFor="depends" className="text-right">
+              Depends On
+            </Label>
+            <div className="col-span-3 space-y-2">
+              <Select
+                value=""
+                onValueChange={(taskUuid) => {
+                  if (taskUuid && !newTask.depends.includes(taskUuid)) {
+                    setNewTask({
+                      ...newTask,
+                      depends: [...newTask.depends, taskUuid],
+                    });
+                  }
+                }}
+              >
+                <SelectTrigger>
+                  <SelectValue placeholder="Select a task this depends on" />
+                </SelectTrigger>
+                <SelectContent
+                  className="max-h-60 overflow-y-auto"
+                  onWheel={(e) => e.stopPropagation()}
+                >
+                  {(() => {
+                    const availableTasks = allTasks.filter(
+                      (task) =>
+                        task.status === 'pending' &&
+                        !newTask.depends.includes(task.uuid)
+                    );
+
+                    if (availableTasks.length === 0) {
+                      return (
+                        <SelectItem value="" disabled>
+                          No available tasks to depend on
+                        </SelectItem>
+                      );
+                    }
+
+                    // Limit to first 50 tasks for better performance
+                    const limitedTasks = availableTasks.slice(0, 50);
+
+                    return (
+                      <>
+                        {limitedTasks.map((task) => (
+                          <SelectItem key={task.uuid} value={task.uuid}>
+                            <div className="flex items-center gap-2 w-full min-w-0">
+                              <span className="font-medium text-xs shrink-0">
+                                #{task.id}
+                              </span>
+                              <span className="truncate flex-1 text-sm">
+                                {task.description.length > 35
+                                  ? `${task.description.substring(0, 35)}...`
+                                  : task.description}
+                              </span>
+                              {task.project && (
+                                <Badge
+                                  variant="secondary"
+                                  className="text-xs px-1 py-0 shrink-0"
+                                >
+                                  {task.project.length > 8
+                                    ? `${task.project.substring(0, 8)}...`
+                                    : task.project}
+                                </Badge>
+                              )}
+                            </div>
+                          </SelectItem>
+                        ))}
+                        {availableTasks.length > 50 && (
+                          <SelectItem
+                            value=""
+                            disabled
+                            className="text-xs text-muted-foreground"
+                          >
+                            ... and {availableTasks.length - 50} more tasks (use
+                            search to find more)
+                          </SelectItem>
+                        )}
+                      </>
+                    );
+                  })()}
+                </SelectContent>
+              </Select>
+
+              {/* Display selected dependencies */}
+              {newTask.depends.length > 0 && (
+                <div className="flex flex-wrap gap-2">
+                  {newTask.depends.map((taskUuid) => {
+                    const dependentTask = allTasks.find(
+                      (t) => t.uuid === taskUuid
+                    );
+                    return (
+                      <Badge
+                        key={taskUuid}
+                        variant="secondary"
+                        className="flex items-center gap-1"
+                      >
+                        <span>
+                          #{dependentTask?.id || '?'}{' '}
+                          {dependentTask?.description?.substring(0, 20) ||
+                            taskUuid.substring(0, 8)}
+                          {dependentTask?.description &&
+                            dependentTask.description.length > 20 &&
+                            '...'}
+                        </span>
+                        <button
+                          type="button"
+                          className="ml-1 text-red-500 hover:text-red-700"
+                          onClick={() => {
+                            setNewTask({
+                              ...newTask,
+                              depends: newTask.depends.filter(
+                                (d) => d !== taskUuid
+                              ),
+                            });
+                          }}
+                        >
+                          ✖
+                        </button>
+                      </Badge>
+                    );
+                  })}
+                </div>
+              )}
+            </div>
+          </div>
         </div>
         <DialogFooter>
           <Button
diff --git a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
index 022a44d8..6db608ba 100644
--- a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
@@ -75,6 +75,7 @@ export const Tasks = (
     start: '',
     tags: [],
     annotations: [],
+    depends: [],
   });
   const [isCreatingNewProject, setIsCreatingNewProject] = useState(false);
   const [isAddTaskOpen, setIsAddTaskOpen] = useState(false);
@@ -310,6 +311,7 @@ export const Tasks = (
         start: task.start || '',
         tags: task.tags,
         annotations: task.annotations,
+        depends: task.depends,
         backendURL: url.backendURL,
       });
 
@@ -322,6 +324,7 @@ export const Tasks = (
         start: '',
         tags: [],
         annotations: [],
+        depends: [],
       });
       setIsAddTaskOpen(false);
     } catch (error) {
@@ -390,6 +393,36 @@ export const Tasks = (
   };
 
   const handleMarkComplete = async (taskuuid: string) => {
+    // Find the task being completed
+    const taskToComplete = tasks.find((t) => t.uuid === taskuuid);
+    if (!taskToComplete) {
+      toast.error('Task not found');
+      return;
+    }
+
+    if (taskToComplete.depends && taskToComplete.depends.length > 0) {
+      const incompleteDependencies = taskToComplete.depends.filter(
+        (depUuid) => {
+          const depTask = tasks.find((t) => t.uuid === depUuid);
+          return depTask && depTask.status !== 'completed';
+        }
+      );
+
+      if (incompleteDependencies.length > 0) {
+        const incompleteDepNames = incompleteDependencies
+          .map((depUuid) => {
+            const depTask = tasks.find((t) => t.uuid === depUuid);
+            return depTask?.description || depUuid.substring(0, 8);
+          })
+          .join(', ');
+        toast.error(
+          `Cannot complete this task. Please complete these dependencies first: ${incompleteDepNames}`
+        );
+        return;
+      }
+    }
+
+    // If all dependencies are completed, allow completion
     await markTaskAsCompleted(
       props.email,
       props.encryptionSecret,
@@ -933,6 +966,7 @@ export const Tasks = (
                         isCreatingNewProject={isCreatingNewProject}
                         setIsCreatingNewProject={setIsCreatingNewProject}
                         uniqueProjects={uniqueProjects}
+                        allTasks={tasks}
                       />
                     </div>
                     <div className="hidden sm:flex flex-col items-end gap-2">
@@ -1098,6 +1132,7 @@ export const Tasks = (
                         isCreatingNewProject={isCreatingNewProject}
                         setIsCreatingNewProject={setIsCreatingNewProject}
                         uniqueProjects={uniqueProjects}
+                        allTasks={tasks}
                       />
                     </div>
                     <div className="flex flex-col items-end gap-2">
diff --git a/frontend/src/components/HomeComponents/Tasks/hooks.ts b/frontend/src/components/HomeComponents/Tasks/hooks.ts
index a4fbc5fe..b5bca6da 100644
--- a/frontend/src/components/HomeComponents/Tasks/hooks.ts
+++ b/frontend/src/components/HomeComponents/Tasks/hooks.ts
@@ -45,6 +45,7 @@ export const addTaskToBackend = async ({
   start,
   tags,
   annotations,
+  depends,
   backendURL,
 }: {
   email: string;
@@ -57,6 +58,7 @@ export const addTaskToBackend = async ({
   start: string;
   tags: string[];
   annotations: { entry: string; description: string }[];
+  depends?: string[];
   backendURL: string;
 }) => {
   const requestBody: any = {
@@ -78,6 +80,10 @@ export const addTaskToBackend = async ({
   if (start !== undefined && start !== '') {
     requestBody.start = start;
   }
+  // Add dependencies if provided
+  if (depends && depends.length > 0) {
+    requestBody.depends = depends;
+  }
 
   // Add annotations to request body, filtering out empty descriptions
   requestBody.annotations = annotations.filter(
diff --git a/frontend/src/components/utils/types.ts b/frontend/src/components/utils/types.ts
index 6647504f..32cc2b75 100644
--- a/frontend/src/components/utils/types.ts
+++ b/frontend/src/components/utils/types.ts
@@ -102,6 +102,7 @@ export interface TaskFormData {
   start: string;
   tags: string[];
   annotations: Annotation[];
+  depends: string[];
 }
 
 export interface AddTaskDialogProps {
@@ -115,6 +116,7 @@ export interface AddTaskDialogProps {
   isCreatingNewProject: boolean;
   setIsCreatingNewProject: (value: boolean) => void;
   uniqueProjects: string[];
+  allTasks?: Task[];
 }
 
 export interface EditTaskDialogProps {

From 4eec5747f18c2a3dbecd8f671db70f92d1aa166c Mon Sep 17 00:00:00 2001
From: Vasist10 <155972527+Vasist10@users.noreply.github.com>
Date: Wed, 24 Dec 2025 23:32:58 +0530
Subject: [PATCH 2/4] fix:add search support and tests for depends on

---
 backend/controllers/controllers_test.go       |  76 +++++++++
 backend/utils/tw/edit_task.go                 |  10 +-
 backend/utils/tw/modify_task.go               |  10 +-
 backend/utils/tw/taskwarrior_test.go          |   6 +-
 backend/utils/utils_test.go                   |  14 ++
 .../HomeComponents/Tasks/AddTaskDialog.tsx    | 157 ++++++++++--------
 .../Tasks/__tests__/AddTaskDialog.test.tsx    | 143 +++++++++++++++-
 .../Tasks/__tests__/Tasks.test.tsx            |  62 +++++--
 8 files changed, 373 insertions(+), 105 deletions(-)

diff --git a/backend/controllers/controllers_test.go b/backend/controllers/controllers_test.go
index 88368f05..16127919 100644
--- a/backend/controllers/controllers_test.go
+++ b/backend/controllers/controllers_test.go
@@ -196,3 +196,79 @@ func Test_AddTaskHandler_MissingDescription(t *testing.T) {
 	assert.Equal(t, http.StatusBadRequest, rr.Code)
 	assert.Contains(t, rr.Body.String(), "Description is required")
 }
+
+// Task Dependencies Tests
+func Test_AddTaskHandler_WithDependencies(t *testing.T) {
+	GlobalJobQueue = NewJobQueue()
+
+	requestBody := map[string]interface{}{
+		"email":            "test@example.com",
+		"encryptionSecret": "secret",
+		"UUID":             "test-uuid",
+		"description":      "Task with dependencies",
+		"project":          "TestProject",
+		"priority":         "H",
+		"depends":          []string{"task-uuid-1", "task-uuid-2"},
+		"tags":             []string{"dependent"},
+	}
+
+	body, _ := json.Marshal(requestBody)
+	req, err := http.NewRequest("POST", "/add-task", bytes.NewBuffer(body))
+	assert.NoError(t, err)
+	req.Header.Set("Content-Type", "application/json")
+
+	rr := httptest.NewRecorder()
+	AddTaskHandler(rr, req)
+
+	assert.Equal(t, http.StatusAccepted, rr.Code)
+}
+
+func Test_AddTaskHandler_WithEmptyDependencies(t *testing.T) {
+	GlobalJobQueue = NewJobQueue()
+
+	requestBody := map[string]interface{}{
+		"email":            "test@example.com",
+		"encryptionSecret": "secret",
+		"UUID":             "test-uuid",
+		"description":      "Task with empty dependencies",
+		"project":          "TestProject",
+		"priority":         "M",
+		"depends":          []string{},
+		"tags":             []string{"test"},
+	}
+
+	body, _ := json.Marshal(requestBody)
+	req, err := http.NewRequest("POST", "/add-task", bytes.NewBuffer(body))
+	assert.NoError(t, err)
+	req.Header.Set("Content-Type", "application/json")
+
+	rr := httptest.NewRecorder()
+	AddTaskHandler(rr, req)
+
+	assert.Equal(t, http.StatusAccepted, rr.Code)
+}
+
+func Test_EditTaskHandler_WithDependencies(t *testing.T) {
+	GlobalJobQueue = NewJobQueue()
+
+	requestBody := map[string]interface{}{
+		"email":            "test@example.com",
+		"encryptionSecret": "secret",
+		"UUID":             "test-uuid",
+		"taskID":           "1",
+		"description":      "Edited task with dependencies",
+		"project":          "EditedProject",
+		"depends":          []string{"task-uuid-3"},
+		"tags":             []string{"edited", "dependent"},
+	}
+
+	body, _ := json.Marshal(requestBody)
+	req, err := http.NewRequest("POST", "/edit-task", bytes.NewBuffer(body))
+	assert.NoError(t, err)
+	req.Header.Set("Content-Type", "application/json")
+
+	rr := httptest.NewRecorder()
+	EditTaskHandler(rr, req)
+
+	assert.Equal(t, http.StatusAccepted, rr.Code)
+}
diff --git a/backend/utils/tw/edit_task.go b/backend/utils/tw/edit_task.go
index bc287aec..9d1557e3 100644
--- a/backend/utils/tw/edit_task.go
+++ b/backend/utils/tw/edit_task.go
@@ -94,12 +94,10 @@ func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID st
 		}
 	}
 
-	// Handle depends
-	if len(depends) > 0 {
-		dependsStr := strings.Join(depends, ",")
-		if err := utils.ExecCommand("task", taskID, "modify", "depends:"+dependsStr); err != nil {
-			return fmt.Errorf("failed to set depends %s: %v", dependsStr, err)
-		}
+	// Handle depends - always set to ensure clearing works
+	dependsStr := strings.Join(depends, ",")
+	if err := utils.ExecCommand("task", taskID, "modify", "depends:"+dependsStr); err != nil {
+		return fmt.Errorf("failed to set depends %s: %v", dependsStr, err)
 	}
 
 	// Handle due date
diff --git a/backend/utils/tw/modify_task.go b/backend/utils/tw/modify_task.go
index ba23b4bb..fa2c3774 100644
--- a/backend/utils/tw/modify_task.go
+++ b/backend/utils/tw/modify_task.go
@@ -55,12 +55,10 @@ func ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due,
 		return fmt.Errorf("failed to edit task due: %v", err)
 	}
 
-	// Handle dependencies
-	if len(depends) > 0 {
-		dependsStr := strings.Join(depends, ",")
-		if err := utils.ExecCommand("task", taskID, "modify", "depends:"+dependsStr); err != nil {
-			return fmt.Errorf("failed to set dependencies %s: %v", dependsStr, err)
-		}
+	// Handle dependencies - always set to ensure clearing works
+	dependsStr := strings.Join(depends, ",")
+	if err := utils.ExecCommand("task", taskID, "modify", "depends:"+dependsStr); err != nil {
+		return fmt.Errorf("failed to set dependencies %s: %v", dependsStr, err)
 	}
 
 	// escapedStatus := fmt.Sprintf(`status:%s`, strings.ReplaceAll(status, `"`, `\"`))
diff --git a/backend/utils/tw/taskwarrior_test.go b/backend/utils/tw/taskwarrior_test.go
index 98a004f4..6887fe88 100644
--- a/backend/utils/tw/taskwarrior_test.go
+++ b/backend/utils/tw/taskwarrior_test.go
@@ -42,7 +42,7 @@ func TestExportTasks(t *testing.T) {
 }
 
 func TestAddTaskToTaskwarrior(t *testing.T) {
-	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", nil, []models.Annotation{{Description: "note"}})
+	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", nil, []models.Annotation{{Description: "note"}}, []string{})
 	if err != nil {
 		t.Errorf("AddTaskToTaskwarrior failed: %v", err)
 	} else {
@@ -60,7 +60,7 @@ func TestCompleteTaskInTaskwarrior(t *testing.T) {
 }
 
 func TestAddTaskWithTags(t *testing.T) {
-	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", []string{"work", "important"}, []models.Annotation{{Description: "note"}})
+	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", []string{"work", "important"}, []models.Annotation{{Description: "note"}}, []string{})
 	if err != nil {
 		t.Errorf("AddTaskToTaskwarrior with tags failed: %v", err)
 	} else {
@@ -96,7 +96,7 @@ func TestEditTaskWithMixedTagOperations(t *testing.T) {
 }
 
 func TestModifyTaskWithTags(t *testing.T) {
-	err := ModifyTaskInTaskwarrior("uuid", "description", "project", "H", "pending", "2025-03-03", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"})
+	err := ModifyTaskInTaskwarrior("uuid", "description", "project", "H", "pending", "2025-03-03", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"}, []string{})
 	if err != nil {
 		t.Errorf("ModifyTaskInTaskwarrior with tags failed: %v", err)
 	} else {
diff --git a/backend/utils/utils_test.go b/backend/utils/utils_test.go
index ab2c2e56..b8fe26f3 100644
--- a/backend/utils/utils_test.go
+++ b/backend/utils/utils_test.go
@@ -84,3 +84,17 @@ func Test_ExecCommandForOutputInDir(t *testing.T) {
 		t.Errorf("Expected output but got empty result")
 	}
 }
+
+func Test_ValidateDependencies_ValidDependencies(t *testing.T) {
+	depends := []string{"task-uuid-1", "task-uuid-2"}
+	currentTaskUUID := "current-task-uuid"
+	err := ValidateDependencies(depends, currentTaskUUID)
+	assert.NoError(t, err)
+}
+
+func Test_ValidateDependencies_EmptyList(t *testing.T) {
+	depends := []string{}
+	currentTaskUUID := "current-task-uuid"
+	err := ValidateDependencies(depends, currentTaskUUID)
+	assert.NoError(t, err)
+}
diff --git a/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx b/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
index 094ecafb..5a54e4ae 100644
--- a/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
@@ -38,6 +38,36 @@ export const AddTaskdialog = ({
   allTasks = [], // Add this prop
 }: AddTaskDialogProps) => {
   const [annotationInput, setAnnotationInput] = useState('');
+  const [dependencySearch, setDependencySearch] = useState('');
+  const [showDependencyResults, setShowDependencyResults] = useState(false);
+
+  const getFilteredTasks = () => {
+    const availableTasks = allTasks.filter(
+      (task) =>
+        task.status === 'pending' && !newTask.depends.includes(task.uuid)
+    );
+
+    if (dependencySearch.trim() === '') {
+      return [];
+    }
+
+    return availableTasks
+      .filter(
+        (task) =>
+          task.description
+            .toLowerCase()
+            .includes(dependencySearch.toLowerCase()) ||
+          (task.project &&
+            task.project
+              .toLowerCase()
+              .includes(dependencySearch.toLowerCase())) ||
+          (task.tags &&
+            task.tags.some((tag) =>
+              tag.toLowerCase().includes(dependencySearch.toLowerCase())
+            ))
+      )
+      .slice(0, 5);
+  };
 
   useEffect(() => {
     if (!isOpen) {
@@ -327,84 +357,71 @@ export const AddTaskdialog = ({
             <Label htmlFor="depends" className="text-right">
               Depends On
             </Label>
-            <div className="col-span-3 space-y-2">
-              <Select
-                value=""
-                onValueChange={(taskUuid) => {
-                  if (taskUuid && !newTask.depends.includes(taskUuid)) {
-                    setNewTask({
-                      ...newTask,
-                      depends: [...newTask.depends, taskUuid],
-                    });
-                  }
+            <div className="col-span-3 space-y-2 relative">
+              {/* Search input */}
+              <Input
+                placeholder="Search and select tasks this depends on..."
+                value={dependencySearch}
+                onChange={(e) => {
+                  setDependencySearch(e.target.value);
+                  setShowDependencyResults(e.target.value.trim() !== '');
                 }}
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Select a task this depends on" />
-                </SelectTrigger>
-                <SelectContent
-                  className="max-h-60 overflow-y-auto"
-                  onWheel={(e) => e.stopPropagation()}
-                >
+                onFocus={() =>
+                  setShowDependencyResults(dependencySearch.trim() !== '')
+                }
+                onBlur={() =>
+                  setTimeout(() => setShowDependencyResults(false), 200)
+                }
+              />
+
+              {/* Search results dropdown */}
+              {showDependencyResults && (
+                <div className="absolute z-50 w-full mt-1 bg-background border border-border rounded-md shadow-lg max-h-60 overflow-y-auto">
                   {(() => {
-                    const availableTasks = allTasks.filter(
-                      (task) =>
-                        task.status === 'pending' &&
-                        !newTask.depends.includes(task.uuid)
-                    );
+                    const filteredTasks = getFilteredTasks();
 
-                    if (availableTasks.length === 0) {
+                    if (filteredTasks.length === 0) {
                       return (
-                        <SelectItem value="" disabled>
-                          No available tasks to depend on
-                        </SelectItem>
+                        <div className="p-3 text-sm text-muted-foreground text-center">
+                          No tasks found matching your search
+                        </div>
                       );
                     }
 
-                    // Limit to first 50 tasks for better performance
-                    const limitedTasks = availableTasks.slice(0, 50);
-
-                    return (
-                      <>
-                        {limitedTasks.map((task) => (
-                          <SelectItem key={task.uuid} value={task.uuid}>
-                            <div className="flex items-center gap-2 w-full min-w-0">
-                              <span className="font-medium text-xs shrink-0">
-                                #{task.id}
-                              </span>
-                              <span className="truncate flex-1 text-sm">
-                                {task.description.length > 35
-                                  ? `${task.description.substring(0, 35)}...`
-                                  : task.description}
-                              </span>
-                              {task.project && (
-                                <Badge
-                                  variant="secondary"
-                                  className="text-xs px-1 py-0 shrink-0"
-                                >
-                                  {task.project.length > 8
-                                    ? `${task.project.substring(0, 8)}...`
-                                    : task.project}
-                                </Badge>
-                              )}
-                            </div>
-                          </SelectItem>
-                        ))}
-                        {availableTasks.length > 50 && (
-                          <SelectItem
-                            value=""
-                            disabled
-                            className="text-xs text-muted-foreground"
-                          >
-                            ... and {availableTasks.length - 50} more tasks (use
-                            search to find more)
-                          </SelectItem>
-                        )}
-                      </>
-                    );
+                    return filteredTasks.map((task) => (
+                      <div
+                        key={task.uuid}
+                        className="p-3 cursor-pointer hover:bg-accent transition-colors"
+                        onClick={() => {
+                          setNewTask({
+                            ...newTask,
+                            depends: [...newTask.depends, task.uuid],
+                          });
+                          setDependencySearch('');
+                          setShowDependencyResults(false);
+                        }}
+                      >
+                        <div className="flex items-center gap-2 w-full min-w-0">
+                          <span className="font-medium text-xs shrink-0 text-muted-foreground">
+                            #{task.id}
+                          </span>
+                          <span className="truncate flex-1 text-sm">
+                            {task.description}
+                          </span>
+                          {task.project && (
+                            <Badge
+                              variant="secondary"
+                              className="text-xs px-1 py-0 shrink-0"
+                            >
+                              {task.project}
+                            </Badge>
+                          )}
+                        </div>
+                      </div>
+                    ));
                   })()}
-                </SelectContent>
-              </Select>
+                </div>
+              )}
 
               {/* Display selected dependencies */}
               {newTask.depends.length > 0 && (
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
index 1638a385..778a5eb0 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
@@ -22,18 +22,24 @@ jest.mock('@/components/ui/date-picker', () => ({
 
 jest.mock('@/components/ui/select', () => {
   return {
-    Select: ({ children, onValueChange, value }: any) => (
-      <select
-        data-testid="project-select"
-        value={value}
-        onChange={(e) => onValueChange?.(e.target.value)}
-      >
+    Select: ({ children, onValueChange, value }: any) => {
+      // Create a simple select element that calls onValueChange when changed
+      return (
+        <select
+          value={value || ''}
+          onChange={(e) => onValueChange?.(e.target.value)}
+        >
+          {children}
+        </select>
+      );
+    },
+    SelectTrigger: ({ children, 'data-testid': dataTestId, ...props }: any) => (
+      <div data-testid={dataTestId} {...props}>
         {children}
-      </select>
+      </div>
     ),
-    SelectTrigger: ({ children }: any) => <>{children}</>,
     SelectValue: ({ placeholder }: any) => (
-      <option value="" disabled hidden>
+      <option value="" disabled>
         {placeholder}
       </option>
     ),
@@ -61,12 +67,14 @@ describe('AddTaskDialog Component', () => {
         start: '',
         tags: [],
         annotations: [],
+        depends: [],
       },
       setNewTask: jest.fn(),
       tagInput: '',
       setTagInput: jest.fn(),
       onSubmit: jest.fn(),
       uniqueProjects: [],
+      allTasks: [],
       isCreatingNewProject: false,
       setIsCreatingNewProject: jest.fn(),
     };
@@ -223,6 +231,7 @@ describe('AddTaskDialog Component', () => {
       start: '',
       tags: ['urgent'],
       annotations: [],
+      depends: [],
     };
     render(<AddTaskdialog {...mockProps} />);
 
@@ -289,4 +298,120 @@ describe('AddTaskDialog Component', () => {
       project: 'New Project',
     });
   });
+
+  describe('Task Dependencies', () => {
+    beforeEach(() => {
+      mockProps.isOpen = true;
+      mockProps.allTasks = [
+        {
+          id: 1,
+          uuid: 'task-1',
+          description: 'First task',
+          status: 'pending',
+          project: 'Project A',
+          tags: [],
+          priority: 'M',
+          due: '',
+          start: '',
+          end: '',
+          entry: '',
+          wait: '',
+          modified: '',
+          depends: [],
+          rtype: '',
+          recur: '',
+          annotations: [],
+          email: 'test@example.com',
+          urgency: 0,
+        },
+        {
+          id: 2,
+          uuid: 'task-2',
+          description: 'Second task',
+          status: 'pending',
+          project: 'Project B',
+          tags: [],
+          priority: 'H',
+          due: '',
+          start: '',
+          end: '',
+          entry: '',
+          wait: '',
+          modified: '',
+          depends: [],
+          rtype: '',
+          recur: '',
+          annotations: [],
+          email: 'test@example.com',
+          urgency: 0,
+        },
+      ];
+    });
+
+    test('renders dependency search field', () => {
+      render(<AddTaskdialog {...mockProps} />);
+
+      expect(screen.getByText('Depends On')).toBeInTheDocument();
+      expect(
+        screen.getByPlaceholderText(
+          'Search and select tasks this depends on...'
+        )
+      ).toBeInTheDocument();
+    });
+
+    test('displays selected dependencies as badges', () => {
+      mockProps.newTask.depends = ['task-1'];
+      render(<AddTaskdialog {...mockProps} />);
+
+      expect(screen.getByText('#1 First task')).toBeInTheDocument();
+    });
+
+    test('removes dependency when remove button is clicked', () => {
+      mockProps.newTask.depends = ['task-1'];
+      render(<AddTaskdialog {...mockProps} />);
+
+      const removeButton = screen.getByText('✖');
+      fireEvent.click(removeButton);
+
+      expect(mockProps.setNewTask).toHaveBeenCalledWith({
+        ...mockProps.newTask,
+        depends: [],
+      });
+    });
+
+    test('shows message when no tasks found', () => {
+      mockProps.allTasks = [];
+      render(<AddTaskdialog {...mockProps} />);
+
+      const searchInput = screen.getByPlaceholderText(
+        'Search and select tasks this depends on...'
+      );
+      fireEvent.change(searchInput, { target: { value: 'test' } });
+
+      expect(
+        screen.getByText('No tasks found matching your search')
+      ).toBeInTheDocument();
+    });
+
+    test('includes dependencies in task submission', () => {
+      mockProps.newTask = {
+        description: 'Test task with dependency',
+        priority: 'H',
+        project: 'Work',
+        due: '2024-12-25',
+        start: '',
+        tags: [],
+        annotations: [],
+        depends: ['task-1'],
+      };
+      render(<AddTaskdialog {...mockProps} />);
+
+      const submitButton = screen.getByRole('button', {
+        name: /add task/i,
+      });
+      fireEvent.click(submitButton);
+
+      expect(mockProps.onSubmit).toHaveBeenCalledWith(mockProps.newTask);
+    });
+  });
 });
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
index a5f510dc..d7c98320 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
@@ -47,22 +47,24 @@ jest.mock('@/components/ui/multi-select', () => ({
 
 jest.mock('@/components/ui/select', () => {
   return {
-    Select: ({ children, onValueChange, value }: any) => (
-      <select
-        data-testid="project-select"
-        value={value}
-        onChange={(e) => onValueChange?.(e.target.value)}
-      >
-        {children}
-      </select>
-    ),
-    SelectTrigger: ({ children }: any) => <>{children}</>,
+    Select: ({ children, onValueChange, value }: any) => {
+      return (
+        <select
+          data-testid="project-select"
+          value={value}
+          onChange={(e) => onValueChange?.(e.target.value)}
+        >
+          {children}
+        </select>
+      );
+    },
+    SelectTrigger: ({ children }: any) => children,
     SelectValue: ({ placeholder }: any) => (
       <option value="" disabled hidden>
         {placeholder}
       </option>
     ),
-    SelectContent: ({ children }: any) => <>{children}</>,
+    SelectContent: ({ children }: any) => children,
     SelectItem: ({ value, children, ...props }: any) => (
       <option value={value} {...props}>
         {children}
@@ -493,4 +495,42 @@ describe('Tasks Component', () => {
 
     expect(newProjectInput).toHaveValue('My Fresh Project');
   });
+
+  // Task Dependencies Tests
+  describe('Task Dependencies', () => {
+    test('passes allTasks prop to AddTaskDialog for dependency selection', async () => {
+      render(<Tasks {...mockProps} />);
+
+      await waitFor(() => {
+        expect(screen.getByText('Task 1')).toBeInTheDocument();
+      });
+
+      const addTaskButton = screen.getByRole('button', { name: /add task/i });
+      fireEvent.click(addTaskButton);
+
+      expect(
+        screen.getByText(/fill in the details below/i)
+      ).toBeInTheDocument();
+
+      expect(screen.getByText('Depends On')).toBeInTheDocument();
+    });
+
+    test('dependency dropdown is available in add task dialog', async () => {
+      render(<Tasks {...mockProps} />);
+
+      await waitFor(() => {
+        expect(screen.getByText('Task 1')).toBeInTheDocument();
+      });
+
+      const addTaskButton = screen.getByRole('button', { name: /add task/i });
+      fireEvent.click(addTaskButton);
+
+      expect(screen.getByText('Depends On')).toBeInTheDocument();
+      expect(
+        screen.getByPlaceholderText(
+          'Search and select tasks this depends on...'
+        )
+      ).toBeInTheDocument();
+    });
+  });
 });

From 81b28a2b56c063a74b4f4b4da2bded73ef368463 Mon Sep 17 00:00:00 2001
From: Vasist10 <155972527+Vasist10@users.noreply.github.com>
Date: Wed, 24 Dec 2025 23:45:57 +0530
Subject: [PATCH 3/4] fix: resolve conflicts

---
 backend/controllers/add_task.go               |   2 +-
 backend/utils/tw/add_task.go                  |  16 ++-
 backend/utils/tw/taskwarrior_test.go          |   4 +-
 .../Tasks/__tests__/AddTaskDialog.test.tsx    | 108 ++++++++++++++++++
 4 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/backend/controllers/add_task.go b/backend/controllers/add_task.go
index 191ca671..16569e65 100644
--- a/backend/controllers/add_task.go
+++ b/backend/controllers/add_task.go
@@ -72,7 +72,7 @@ func AddTaskHandler(w http.ResponseWriter, r *http.Request) {
 			Name: "Add Task",
 			Execute: func() error {
 				logStore.AddLog("INFO", fmt.Sprintf("Adding task: %s", description), uuid, "Add Task")
-				err := tw.AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDateStr, start, tags, annotations, depends)
+				err := tw.AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDateStr, start, entryDate, waitDate, end, recur, tags, annotations, depends)
 				if err != nil {
 					logStore.AddLog("ERROR", fmt.Sprintf("Failed to add task: %v", err), uuid, "Add Task")
 					return err
diff --git a/backend/utils/tw/add_task.go b/backend/utils/tw/add_task.go
index 618b6027..fc3c2df4 100644
--- a/backend/utils/tw/add_task.go
+++ b/backend/utils/tw/add_task.go
@@ -10,7 +10,7 @@ import (
 )
 
 // add task to the user's tw client
-func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDate, start string, tags []string, annotations []models.Annotation, depends []string) error {
+func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, priority, dueDate, start, entryDate string, waitDate string, end, recur string, tags []string, annotations []models.Annotation, depends []string) error {
 	if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
 		return fmt.Errorf("error deleting Taskwarrior data: %v", err)
 	}
@@ -48,6 +48,20 @@ func AddTaskToTaskwarrior(email, encryptionSecret, uuid, description, project, p
 		dependsStr := strings.Join(depends, ",")
 		cmdArgs = append(cmdArgs, "depends:"+dependsStr)
 	}
+	if entryDate != "" {
+		cmdArgs = append(cmdArgs, "entry:"+entryDate)
+	}
+	if waitDate != "" {
+		cmdArgs = append(cmdArgs, "wait:"+waitDate)
+	}
+	if end != "" {
+		cmdArgs = append(cmdArgs, "end:"+end)
+	}
+	// Note: Taskwarrior requires a due date to be set before recur can be set
+	// Only add recur if dueDate is also provided
+	if recur != "" && dueDate != "" {
+		cmdArgs = append(cmdArgs, "recur:"+recur)
+	}
 	// Add tags to the task
 	if len(tags) > 0 {
 		for _, tag := range tags {
diff --git a/backend/utils/tw/taskwarrior_test.go b/backend/utils/tw/taskwarrior_test.go
index 6887fe88..28be37d5 100644
--- a/backend/utils/tw/taskwarrior_test.go
+++ b/backend/utils/tw/taskwarrior_test.go
@@ -42,7 +42,7 @@ func TestExportTasks(t *testing.T) {
 }
 
 func TestAddTaskToTaskwarrior(t *testing.T) {
-	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", nil, []models.Annotation{{Description: "note"}}, []string{})
+	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", "2025-03-01", "2025-03-01", "2025-03-03", "daily", nil, []models.Annotation{{Description: "note"}}, []string{})
 	if err != nil {
 		t.Errorf("AddTaskToTaskwarrior failed: %v", err)
 	} else {
@@ -60,7 +60,7 @@ func TestCompleteTaskInTaskwarrior(t *testing.T) {
 }
 
 func TestAddTaskWithTags(t *testing.T) {
-	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", []string{"work", "important"}, []models.Annotation{{Description: "note"}}, []string{})
+	err := AddTaskToTaskwarrior("email", "encryption_secret", "clientId", "description", "", "H", "2025-03-03", "2025-03-01", "2025-03-01", "2025-03-01", "2025-03-03", "daily", []string{"work", "important"}, []models.Annotation{{Description: "note"}}, []string{})
 	if err != nil {
 		t.Errorf("AddTaskToTaskwarrior with tags failed: %v", err)
 	} else {
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
index 778a5eb0..eb1d9334 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
@@ -414,4 +414,112 @@ describe('AddTaskDialog Component', () => {
       expect(mockProps.onSubmit).toHaveBeenCalledWith(mockProps.newTask);
     });
   });
+
+  test('renders wait date picker with correct placeholder', () => {
+    mockProps.isOpen = true;
+    render(<AddTaskdialog {...mockProps} />);
+
+    const waitDatePicker = screen.getByPlaceholderText(/select a wait date/i);
+    expect(waitDatePicker).toBeInTheDocument();
+  });
+
+  test('updates wait when user selects a date', () => {
+    mockProps.isOpen = true;
+    render(<AddTaskdialog {...mockProps} />);
+
+    const waitDatePicker = screen.getByPlaceholderText(/select a wait date/i);
+    fireEvent.change(waitDatePicker, { target: { value: '2025-12-20' } });
+
+    expect(mockProps.setNewTask).toHaveBeenCalledWith({
+      ...mockProps.newTask,
+      wait: '2025-12-20',
+    });
+  });
+
+  test('submits task with wait date when provided', () => {
+    mockProps.isOpen = true;
+    mockProps.newTask.wait = '2025-12-20';
+    render(<AddTaskdialog {...mockProps} />);
+
+    const submitButton = screen.getByRole('button', {
+      name: /add task/i,
+    });
+    fireEvent.click(submitButton);
+
+    expect(mockProps.onSubmit).toHaveBeenCalledWith(mockProps.newTask);
+  });
+
+  test('allows empty wait date (optional field)', () => {
+    mockProps.isOpen = true;
+    mockProps.newTask.wait = '';
+    render(<AddTaskdialog {...mockProps} />);
+
+    const submitButton = screen.getByRole('button', {
+      name: /add task/i,
+    });
+    fireEvent.click(submitButton);
+
+    expect(mockProps.onSubmit).toHaveBeenCalledWith(mockProps.newTask);
+  });
+
+  test('renders entry date picker with correct placeholder', () => {
+    mockProps.isOpen = true;
+    render(<AddTaskdialog {...mockProps} />);
+
+    const entryDatePicker =
+      screen.getByPlaceholderText(/select an entry date/i);
+    expect(entryDatePicker).toBeInTheDocument();
+  });
+
+  test('updates entry when user selects a date', () => {
+    mockProps.isOpen = true;
+    render(<AddTaskdialog {...mockProps} />);
+
+    const entryDatePicker =
+      screen.getByPlaceholderText(/select an entry date/i);
+    fireEvent.change(entryDatePicker, { target: { value: '2025-12-20' } });
+
+    expect(mockProps.setNewTask).toHaveBeenCalledWith({
+      ...mockProps.newTask,
+      entry: '2025-12-20',
+    });
+  });
+
+  test('submits task with entry date when provided', () => {
+    mockProps.isOpen = true;
+    mockProps.newTask = {
+      description: 'Test task',
+      priority: 'H',
+      project: 'Work',
+      due: '2024-12-25',
+      entry: '2025-12-20',
+      tags: ['urgent'],
+      annotations: [],
+    };
+    render(<AddTaskdialog {...mockProps} />);
+
+    const submitButton = screen.getByRole('button', { name: /add task/i });
+    fireEvent.click(submitButton);
+
+    expect(mockProps.onSubmit).toHaveBeenCalledWith(mockProps.newTask);
+  });
+
+  test('allows empty entry date (optional field)', () => {
+    mockProps.isOpen = true;
+    mockProps.newTask = {
+      description: 'Test task',
+      priority: 'M',
+      project: '',
+      due: '',
+      entry: '',
+      tags: [],
+      annotations: [],
+    };
+    render(<AddTaskdialog {...mockProps} />);
+
+    const submitButton = screen.getByRole('button', { name: /add task/i });
+    fireEvent.click(submitButton);
+
+    expect(mockProps.onSubmit).toHaveBeenCalledWith(mockProps.newTask);
+  });
 });

From 535adaeab32ccac2f5a2ce25cb4f8f8f4e24752c Mon Sep 17 00:00:00 2001
From: Vasist10 <155972527+Vasist10@users.noreply.github.com>
Date: Thu, 25 Dec 2025 00:24:05 +0530
Subject: [PATCH 4/4] "fix: correct AddTaskDialog tests after merge"

---
 .../HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
index f90f5a55..9510365e 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/AddTaskDialog.test.tsx
@@ -506,9 +506,11 @@ describe('AddTaskDialog Component', () => {
       priority: 'H',
       project: 'Work',
       due: '2024-12-25',
+      start: '',
       entry: '2025-12-20',
       tags: ['urgent'],
       annotations: [],
+      depends: [],
     };
     render(<AddTaskdialog {...mockProps} />);
 
@@ -525,9 +527,11 @@ describe('AddTaskDialog Component', () => {
       priority: 'M',
       project: '',
       due: '',
+      start: '',
       entry: '',
       tags: [],
       annotations: [],
+      depends: [],
     };
     render(<AddTaskdialog {...mockProps} />);