From e896b3ca80ca3916a8b5d1fdf7447446d6fa3ad7 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 24 Nov 2025 21:59:53 -0500 Subject: agent: add note about legacy merge driver logic Adds a comment to the merge driver logic in Omni/Agent.hs acknowledging that it may be obsolete given the removal of git-tracked tasks.jsonl, but keeping it for now to avoid breaking potential legacy rebase scenarios. Amp-Thread-ID: https://ampcode.com/threads/T-ac41b9b6-d117-46de-9e4f-842887a22f1d Co-authored-by: Amp --- Omni/Agent.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Omni/Agent.hs') diff --git a/Omni/Agent.hs b/Omni/Agent.hs index 53ac5ec..280d034 100644 --- a/Omni/Agent.hs +++ b/Omni/Agent.hs @@ -88,6 +88,10 @@ mergeDriver args = do theirs <- getArgOrExit args (Cli.argument "theirs") -- Set TASK_DB_PATH to ours (the file git provided as the current version) + -- Since we are no longer using git-tracked tasks.jsonl, this merge driver logic needs rethinking. + -- If the merge driver is called, it means git found a conflict in .tasks/tasks.jsonl, but we deleted it. + -- So this code might be dead, or we might be dealing with legacy files during a rebase. + -- For now, we'll keep the logic but be aware it's likely unused. Env.setEnv "TASK_DB_PATH" ours TaskCore.importTasks theirs Exit.exitSuccess -- cgit v1.2.3