Ah interesting, I'm seeing some new failures that weren't there before the rebase, I'll try to resolve them and then I'll push my changes.

Okay, should be good to go now. Interestingly, when I tried doing the same

if err != nil {
    return s.handleError(w, r, f, pid, nil, err)
}
return errors.WithStack(flow.ErrCompletedByStrategy)

as ID Token code path does, it caused both my and previous test to fail on "email in the form should match this value" check 🤔

Hmm, I now see that my change actually did change the behavior checked by oidc/settings/success tests. I think this is because a POST to registration flow after unlinking rather than redirecting to provider now returns a login flow with "An account for this identifier already exists" message and one of the clients (SPA/JSON-based browser one) seems to ignore this result and instead of presenting the form to the user, it redirects to the main/front UI page so Cypress can't find this message. Interestingly, the same test with Express app client shows this message and passes. I'm not yet sure if this is an issue on my side or the client's so I'll try to investigate this further, please bear with me 😅