refactor

Author: mufeez-amjad

app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"claude-squad/app/controller"
 	"claude-squad/config"
 	"claude-squad/keys"
 	"claude-squad/session"
@@ -47,7 +48,7 @@ type home struct {
 	// state is the current discrete state of the app
 	state tuiState
 	// controller manages instances and orchestrators
-	controller *controller
+	controller *controller.Controller
 	// program is the program to use for instances and orchestrators
 	program string
 	// autoYes is whether to automatically approve actions
@@ -97,11 +98,13 @@ func newHome(ctx context.Context, program string, autoYes bool) *home {
 		appState:  appState,
 	}
 
-	controller := newController(&h.spinner, h.autoYes)
-	if err := controller.LoadExistingInstances(h); err != nil {
+	// Initialize controller with spinner and autoYes setting
+	ctrl := controller.NewController(&h.spinner, h.autoYes)
+	// Pass home object which implements required interfaces
+	if err := ctrl.LoadExistingInstances(h); err != nil {
 		fmt.Printf("Warning: Failed to load existing instances: %v\n", err)
 	}
-	h.controller = controller
+	h.controller = ctrl
 
 	return h
 }
@@ -127,8 +130,9 @@ func (m *home) updateHandleWindowSizeEvent(msg tea.WindowSizeMsg) {
 	listWidth := int(float32(msg.Width) * 0.4)
 	previewWidth := msg.Width - listWidth
 
-	m.controller.list.SetSize(listWidth, contentHeight)
-	m.controller.tabbedWindow.SetSize(previewWidth, contentHeight)
+	// Access controller's UI components via exported fields or methods
+	m.controller.SetListSize(listWidth, contentHeight)
+	m.controller.SetTabbedWindowSize(previewWidth, contentHeight)
 }
 
 func (m *home) Init() tea.Cmd {
@@ -145,14 +149,63 @@ func (m *home) Init() tea.Cmd {
 }
 
 func (m *home) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	return m.controller.Update(m, msg)
+	_, cmd := m.controller.Update(m, msg)
+	return m, cmd
 }
 
 func (m *home) handleQuit() (tea.Model, tea.Cmd) {
-	m.controller.HandleQuit(m)
+	// We ignore the returned model since we're returning ourselves
+	_, _ = m.controller.HandleQuit(m)
 	return m, tea.Quit
 }
 
+// Helper methods to support controller functionality
+
+// GetStorage returns the storage instance
+func (m *home) GetStorage() *session.Storage {
+	return m.storage
+}
+
+// GetMenu returns the menu instance
+func (m *home) GetMenu() *ui.Menu {
+	return m.menu
+}
+
+// GetErrBox returns the error box instance
+func (m *home) GetErrBox() *ui.ErrBox {
+	return m.errBox
+}
+
+// GetState returns the current UI state
+func (m *home) GetState() tuiState {
+	return m.state
+}
+
+// SetState sets the UI state
+func (m *home) SetState(state tuiState) {
+	m.state = state
+}
+
+// GetProgram returns the program name
+func (m *home) GetProgram() string {
+	return m.program
+}
+
+// GetAutoYes returns the autoYes flag
+func (m *home) GetAutoYes() bool {
+	return m.autoYes
+}
+
+// GetSpinner returns the spinner instance
+func (m *home) GetSpinner() *spinner.Model {
+	return &m.spinner
+}
+
+// UpdateSpinner updates the spinner model
+func (m *home) UpdateSpinner(msg spinner.TickMsg) (spinner.Model, tea.Cmd) {
+	return m.spinner.Update(msg)
+}
+
 func (m *home) handleMenuHighlighting(msg tea.KeyMsg) (cmd tea.Cmd, returnEarly bool) {
 	// Handle menu highlighting when you press a button. We intercept it here and immediately return to
 	// update the ui while re-sending the keypress. Then, on the next call to this, we actually handle the keypress.