1 files changed, 41 insertions, 21 deletions

diff --git a/Omni/Task/Core.hs b/Omni/Task/Core.hs
index bab1912..b17c2aa 100644
--- a/Omni/Task/Core.hs
+++ b/Omni/Task/Core.hs
@@ -96,12 +96,28 @@ instance FromJSON Task
 
 -- | Case-insensitive ID comparison
 matchesId :: Text -> Text -> Bool
-matchesId id1 id2 = T.toLower id1 == T.toLower id2
+matchesId id1 id2 = normalizeId id1 == normalizeId id2
+
+-- | Normalize ID to lowercase
+normalizeId :: Text -> Text
+normalizeId = T.toLower
 
 -- | Find a task by ID (case-insensitive)
 findTask :: Text -> [Task] -> Maybe Task
 findTask tid = List.find (\t -> matchesId (taskId t) tid)
 
+-- | Normalize task IDs (self, parent, dependencies) to lowercase
+normalizeTask :: Task -> Task
+normalizeTask t =
+  t
+    { taskId = normalizeId (taskId t),
+      taskParent = fmap normalizeId (taskParent t),
+      taskDependencies = map normalizeDependency (taskDependencies t)
+    }
+
+normalizeDependency :: Dependency -> Dependency
+normalizeDependency d = d {depId = normalizeId (depId d)}
+
 instance ToJSON TaskProgress
 
 instance FromJSON TaskProgress
@@ -188,7 +204,7 @@ generateId = do
       -- Combine MJD and micros to ensure uniqueness across days.
       -- Multiplier 10^11 (100,000 seconds) is safe for any day length.
       totalMicros = (mjd * 100000000000) + micros
-      encoded = toBase62 totalMicros
+      encoded = toBase36 totalMicros
   pure <| "t-" <> T.pack encoded
 
 -- Generate a child ID based on parent ID (e.g. "t-abc.1", "t-abc.1.2")
@@ -197,7 +213,7 @@ generateChildId :: Text -> IO Text
 generateChildId parentId =
   withTaskReadLock <| do
     tasks <- loadTasksInternal
-    pure <| computeNextChildId tasks parentId
+    pure <| computeNextChildId tasks (normalizeId parentId)
 
 computeNextChildId :: [Task] -> Text -> Text
 computeNextChildId tasks parentId =
@@ -220,15 +236,15 @@ getSuffix parent childId =
             else Nothing
     else Nothing
 
--- Convert number to base62 (0-9, a-z, A-Z)
-toBase62 :: Integer -> String
-toBase62 0 = "0"
-toBase62 n = reverse <| go n
+-- Convert number to base36 (0-9, a-z)
+toBase36 :: Integer -> String
+toBase36 0 = "0"
+toBase36 n = reverse <| go n
   where
-    alphabet = ['0' .. '9'] ++ ['a' .. 'z'] ++ ['A' .. 'Z']
+    alphabet = ['0' .. '9'] ++ ['a' .. 'z']
     go 0 = []
     go x =
-      let (q, r) = x `divMod` 62
+      let (q, r) = x `divMod` 36
           idx = fromIntegral r
           char = case drop idx alphabet of
             (c : _) -> c
@@ -319,7 +335,10 @@ saveTaskInternal task = do
 createTask :: Text -> TaskType -> Maybe Text -> Maybe Text -> Priority -> [Dependency] -> Maybe Text -> IO Task
 createTask title taskType parent namespace priority deps description =
   withTaskWriteLock <| do
-    tid <- case parent of
+    let parent' = fmap normalizeId parent
+        deps' = map normalizeDependency deps
+
+    tid <- case parent' of
       Nothing -> generateId
       Just pid -> do
         tasks <- loadTasksInternal
@@ -327,14 +346,14 @@ createTask title taskType parent namespace priority deps description =
     now <- getCurrentTime
     let task =
           Task
-            { taskId = tid,
+            { taskId = normalizeId tid,
               taskTitle = title,
               taskType = taskType,
-              taskParent = parent,
+              taskParent = parent',
               taskNamespace = namespace,
               taskStatus = Open,
               taskPriority = priority,
-              taskDependencies = deps,
+              taskDependencies = deps',
               taskDescription = description,
               taskCreatedAt = now,
               taskUpdatedAt = now
@@ -343,15 +362,15 @@ createTask title taskType parent namespace priority deps description =
     pure task
 
 -- Update task status
-updateTaskStatus :: Text -> Status -> IO ()
-updateTaskStatus tid newStatus =
+updateTaskStatus :: Text -> Status -> [Dependency] -> IO ()
+updateTaskStatus tid newStatus newDeps =
   withTaskWriteLock <| do
     tasks <- loadTasksInternal
     now <- getCurrentTime
     let updatedTasks = map updateIfMatch tasks
         updateIfMatch t =
           if matchesId (taskId t) tid
-            then t {taskStatus = newStatus, taskUpdatedAt = now}
+            then t {taskStatus = newStatus, taskUpdatedAt = now, taskDependencies = if null newDeps then taskDependencies t else newDeps}
             else t
     -- Rewrite the entire file (simple approach for MVP)
     tasksFile <- getTasksFilePath
@@ -415,12 +434,13 @@ getDependencyTree tid = do
 
 -- Get task progress
 getTaskProgress :: Text -> IO TaskProgress
-getTaskProgress tid = do
+getTaskProgress tidRaw = do
+  let tid = normalizeId tidRaw
   tasks <- loadTasks
   -- Verify task exists (optional, but good for error handling)
-  case filter (\t -> taskId t == tid) tasks of
-    [] -> panic "Task not found"
-    _ -> do
+  case findTask tid tasks of
+    Nothing -> panic "Task not found"
+    Just _ -> do
       let children = filter (\child -> taskParent child == Just tid) tasks
           total = length children
           completed = length <| filter (\child -> taskStatus child == Done) children
@@ -815,7 +835,7 @@ importTasks filePath =
     -- Load tasks from import file
     content <- TIO.readFile filePath
     let importLines = T.lines content
-        importedTasks = mapMaybe decodeTask importLines
+        importedTasks = map normalizeTask (mapMaybe decodeTask importLines)
 
     -- Load existing tasks
     existingTasks <- loadTasksInternal