Method RestartAndWait

pkg/tools/lifecycle/supervisor.go:458–491

RestartAndWait closes the current session (if any) so the watcher reconnects, then blocks until the next successful reconnect, ctx cancellation, supervisor shutdown (Stop or Failed), or timeout. RestartAndWait does NOT recover from a terminal state (Stopped/Failed): callers that want "restart even

(ctx context.Context, timeout time.Duration)

// call Start when terminal. The Toolset.Restart wrappers in pkg/tools/mcp
// and pkg/tools/builtin do exactly that.
func (s *Supervisor) RestartAndWait(ctx context.Context, timeout time.Duration) error {
	s.mu.Lock()
	if s.stopping {
		s.mu.Unlock()
		return ErrNotStarted
	}
	restartCh := s.restarted
	doneCh := s.done
	state := s.tracker.State()
	sess := s.session
	s.forceRestart = true
	s.mu.Unlock()

	// Only force-close if currently usable. If the watcher already detected
	// the disconnect, closing now would race with tryRestart.
	if state.IsUsable() && sess != nil {
		_ = sess.Close(context.WithoutCancel(ctx))
	}

	select {
	case <-restartCh:
		return nil
	case <-doneCh:
		// Stop or terminal Failed; surface the supervisor's last error.
		if err := s.tracker.LastError(); err != nil {
			return err
		}
		return ErrNotStarted
	case <-ctx.Done():
		return ctx.Err()
	case <-time.After(timeout):
		return errors.New("timed out waiting for supervisor reconnect")
	}
}

// signalDone closes the done channel if it is not already closed. Idempotent.
// Takes mu so concurrent Start can replace `done` without racing.