Show the merge prompt before fetching so Merge has no blank pause

2026-10-17 07:34:43 -07:00
parent e28c313854
commit 4612aece55
3 changed files with 83 additions and 12 deletions
@@ -86,6 +86,7 @@ type live struct {
 	stage       string
 	stopping    bool
 	interrupted bool
+	fetching    bool
 	asked       bool
 	bounced     bool
 	compacting  bool
@@ -241,8 +242,13 @@ func (m *Manager) Interrupt(ctx context.Context, sessionID string) (api.AgentSes

 	m.mu.Lock()
 	l.interrupted = true
+	fetching := l.fetching
 	m.mu.Unlock()

+	if fetching {
+		return sess, nil
+	}
+
 	ictx, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()