Queue for merging tasks

[yangwao]

I'm probably not first nor last, but probably some lightweight queue would be on spot to set some order as some merging can be blocking or override changes of previous agent?

[zippoxer]

@yangwao dope idea, how do you think it should work?

simply return error on merge until the previous task is merged or closed?

and should the Changes view in TUI show changes based on previous linked task, or still based on the base branch?

[yangwao]

@zippoxer Good Q!

Why can an error happen in the first place? Merge conflict? Different exit code than 0 ?

I would consider giving priority to those with lower conflict surface. But does that adds overhead to agent?
Something like

conflict_risk = |files_touched_by_task ∩ files_touched_by_pending_tasks|

We can think of FIFO too.
I'm thinking maybe inspiration from merge queue from GH?

Could be different bins like

1. Fast forward for no-conflicts - I think on brainer
2. Conflicting merges will wait for manual review or rebase by agent

I can technically do PR if you are good with that

EDIT
Technically user can do input like p1,p2,p3 which tasks should go which order to over-ride above, but don't want to complicate things and keep it simple

[yangwao]

Let me propose a solution with conflict-aware, simple weights like p1, p3, and p5, and auto-rebase to simplify the queue.

subtask queue list
subtask queue merge

It's baking baked >_>

• feat: add merge queue with conflict-aware ordering #9