refactor: remove onboarding state wrapper around bootstrap state

Author: binarylogic

internal/app/onboarding/core_state_bridge.go

@@ -12,7 +12,7 @@ func (m *Model) rewindGateFor(target Gate) Gate {
 	rewind := bootstrap.RewindGate(
 		target,
 		def.requirement,
-		m.toCoreState(),
+		m.state,
 	)
 	return rewind
 }

internal/app/onboarding/gate_requirements.go

@@ -1,24 +1,28 @@
 package onboarding
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/usetero/cli/internal/core/bootstrap"
+)
 
 func TestRewindGateFor(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
 		name   string
 		target Gate
-		state  onboardingState
+		state  bootstrap.State
 		want   Gate
 	}{
-		{name: "no requirements gate unchanged", target: GateOrgSelect, state: onboardingState{}, want: GateOrgSelect},
-		{name: "account gate rewinds to org", target: GateAccountSelect, state: onboardingState{}, want: GateOrgSelect},
-		{name: "datadog check rewinds to account", target: GateDatadogCheck, state: onboardingState{Org: ptrOrg("org-1")}, want: GateAccountSelect},
-		{name: "datadog api rewinds to region when site missing", target: GateDatadogAPIKey, state: onboardingState{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1")}, want: GateDatadogRegion},
-		{name: "datadog app rewinds to api key when api key missing", target: GateDatadogAppKey, state: onboardingState{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1"), DDSite: "US1"}, want: GateDatadogAPIKey},
-		{name: "discovery rewinds to datadog check without dd account", target: GateDatadogDiscovery, state: onboardingState{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1")}, want: GateDatadogCheck},
-		{name: "sync rewinds to workspace", target: GateSync, state: onboardingState{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1")}, want: GateWorkspaceSelect},
-		{name: "sync stays when requirements met", target: GateSync, state: onboardingState{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1"), Workspace: ptrWorkspace("ws-1")}, want: GateSync},
+		{name: "no requirements gate unchanged", target: GateOrgSelect, state: bootstrap.State{}, want: GateOrgSelect},
+		{name: "account gate rewinds to org", target: GateAccountSelect, state: bootstrap.State{}, want: GateOrgSelect},
+		{name: "datadog check rewinds to account", target: GateDatadogCheck, state: bootstrap.State{Org: ptrOrg("org-1")}, want: GateAccountSelect},
+		{name: "datadog api rewinds to region when site missing", target: GateDatadogAPIKey, state: bootstrap.State{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1")}, want: GateDatadogRegion},
+		{name: "datadog app rewinds to api key when api key missing", target: GateDatadogAppKey, state: bootstrap.State{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1"), DDSite: "US1"}, want: GateDatadogAPIKey},
+		{name: "discovery rewinds to datadog check without dd account", target: GateDatadogDiscovery, state: bootstrap.State{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1")}, want: GateDatadogCheck},
+		{name: "sync rewinds to workspace", target: GateSync, state: bootstrap.State{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1")}, want: GateWorkspaceSelect},
+		{name: "sync stays when requirements met", target: GateSync, state: bootstrap.State{Org: ptrOrg("org-1"), Account: ptrAccount("acc-1"), Workspace: ptrWorkspace("ws-1")}, want: GateSync},
 	}
 
 	for _, tc := range tests {

internal/app/onboarding/gate_requirements_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/usetero/cli/internal/api"
 	iauth "github.com/usetero/cli/internal/auth"
+	"github.com/usetero/cli/internal/core/bootstrap"
 	"github.com/usetero/cli/internal/log"
 	"github.com/usetero/cli/internal/powersync"
 	"github.com/usetero/cli/internal/preferences"
@@ -27,7 +28,7 @@ type Model struct {
 	scope     log.Scope
 
 	// Accumulated state from step completions
-	state onboardingState
+	state bootstrap.State
 
 	// Current step
 	gate        Gate

internal/app/onboarding/onboarding.go

@@ -0,0 +1,11 @@
+package onboarding
+
+import "github.com/usetero/cli/internal/domain"
+
+func (m *Model) syncServicesToState() {
+	accountID := domain.AccountID("")
+	if m.state.Account != nil {
+		accountID = m.state.Account.ID
+	}
+	m.services = m.services.WithAccountID(accountID)
+}

internal/app/onboarding/service_scope.go

@@ -30,8 +30,9 @@ func (m *Model) transitionOutcomeFor(msg tea.Msg) (TransitionOutcome, bool) {
 			slog.String("error", preflight.State.Error))
 	}
 
-	transition := bootstrap.ApplyEvent(m.toCoreState(), event)
-	m.applyCoreState(transition.State)
+	transition := bootstrap.ApplyEvent(m.state, event)
+	m.state = transition.State
+	m.syncServicesToState()
 
 	switch transition.Kind {
 	case bootstrap.TransitionAdvance: