fixup! codespace: Handle HTTP request retry interruption

internal/codespaces/codespaces.go

@@ -35,14 +35,12 @@ type logger interface {
 	Printf(f string, v ...interface{})
 }
 
-type breakError struct{ err error }
-
-func (b *breakError) Error() string {
-	return b.err.Error()
+type TimeoutError struct {
+	message string
 }
 
-func (b *breakError) Unwrap() error {
-	return b.err
+func (e *TimeoutError) Error() string {
+	return e.message
 }
 
 // ConnectToLiveshare waits for a Codespace to become running,
@@ -66,22 +64,22 @@ func ConnectToLiveshare(ctx context.Context, progress progressIndicator, session
 			var err error
 			codespace, err = apiClient.GetCodespace(ctx, codespace.Name, true)
 			if err != nil {
-				return backoff.Permanent(&breakError{err: fmt.Errorf("error getting codespace: %w", err)})
+				return backoff.Permanent(fmt.Errorf("error getting codespace: %w", err))
 			}
 
 			if connectionReady(codespace) {
 				return nil
 			}
 
-			return errors.New("codespace not ready yet")
+			return &TimeoutError{message: "codespace not ready yet"}
 		}, backoff.WithContext(expBackoff, ctx))
 		if err != nil {
-			var breakErr *breakError
-			if errors.As(err, &breakErr) {
-				return nil, errors.Unwrap(err)
+			var timeoutErr *TimeoutError
+			if errors.As(err, &timeoutErr) {
+				return nil, errors.New("timed out while waiting for the codespace to start")
 			}
 
-			return nil, errors.New("timed out while waiting for the codespace to start")
+			return nil, err
 		}
 	}