Log slow API requests with server spans and client timing

internal/agents/critical.go

@@ -54,7 +54,7 @@ func (m *Manager) recoverMergeTurns(ctx context.Context, running []api.AgentSess
 		if err != nil {
 			return err
 		}
-		merging, err := git.MergeInProgress(task.WorktreePath)
+		merging, err := git.MergeInProgress(ctx, task.WorktreePath)
 		if err != nil {
 			return err
 		}
@@ -74,7 +74,7 @@ func (m *Manager) endMergeTurn(sessionID string, abort bool) {
 		return
 	}
 	if abort {
-		err := git.AbortMerge(t.dir)
+		err := git.AbortMerge(context.Background(), t.dir)
 		if err != nil {
 			slog.Error("abort unfinished merge", "session", sessionID, "err", err)
 		}