buttons

internal/agents/manager.go

@@ -46,6 +46,7 @@ type Manager struct {
 	live       map[string]*live
 	closing    bool
 	rateLimits map[api.AgentSessionVendor]map[string]any
+	merges     map[string]string
 
 	deliverMu sync.Mutex
 	capMu     sync.Mutex
@@ -80,6 +81,7 @@ func New(st *store.Store, limits Limits, worktreeRoot string) *Manager {
 		worktreeRoot: worktreeRoot,
 		live:         map[string]*live{},
 		rateLimits:   map[api.AgentSessionVendor]map[string]any{},
+		merges:       map[string]string{},
 	}
 }
 
@@ -718,6 +720,11 @@ func (m *Manager) handle(ctx context.Context, l *live, ev claude.Event) error {
 			go m.continueFromHandoff(l.id, res.Result)
 			return nil
 		}
+		mergeBy, merging := m.takeMerge(l.taskID)
+		if merging && finished {
+			go m.finishMerge(l, mergeBy)
+			return nil
+		}
 		err = m.Deliver(ctx, l.id)
 		if err != nil {
 			slog.Error("deliver inbox responses", "session", l.id, "err", err)