refactor: split models.Workspace into server and CLI types

Define store.LocalWorkspace for CLI-side workspace tracking, removing
the coupling between the server database model and the CLI's local
SQLite store. Each type now only contains fields relevant to its
database, eliminating phantom columns and the NOT NULL OwnerID
foreign key that referenced a non-existent users table in the CLI DB.

Author: Adam-D-Lewis

cmd/nebi/client.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/nebari-dev/nebi/internal/cliclient"
-	"github.com/nebari-dev/nebi/internal/models"
 	"github.com/nebari-dev/nebi/internal/store"
 )
 
@@ -76,7 +75,7 @@ func validateWorkspaceName(name string) error {
 
 // lookupOrigin returns the origin fields for the current working directory workspace.
 // Returns nil (no error) if no workspace is tracked or no origin is set.
-func lookupOrigin() (*models.Workspace, error) {
+func lookupOrigin() (*store.LocalWorkspace, error) {
 	cwd, err := os.Getwd()
 	if err != nil {
 		return nil, fmt.Errorf("getting working directory: %w", err)

cmd/nebi/init.go

@@ -6,7 +6,6 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/nebari-dev/nebi/internal/models"
 	"github.com/nebari-dev/nebi/internal/store"
 	"github.com/spf13/cobra"
 )
@@ -57,7 +56,7 @@ func runInit(cmd *cobra.Command, args []string) error {
 	}
 
 	name := filepath.Base(cwd)
-	ws := &models.Workspace{
+	ws := &store.LocalWorkspace{
 		Name: name,
 		Path: cwd,
 	}
@@ -95,7 +94,7 @@ func ensureInit(dir string) error {
 	}
 
 	name := filepath.Base(absDir)
-	ws := &models.Workspace{
+	ws := &store.LocalWorkspace{
 		Name: name,
 		Path: absDir,
 	}

cmd/nebi/pull.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/nebari-dev/nebi/internal/models"
 	"github.com/nebari-dev/nebi/internal/store"
 	"github.com/spf13/cobra"
 )
@@ -238,7 +237,7 @@ func setupGlobalWorkspace(name string, force bool) (string, error) {
 	}
 
 	wsDir := s.GlobalWorkspaceDir(name)
-	ws := &models.Workspace{
+	ws := &store.LocalWorkspace{
 		Name:     name,
 		Path:     wsDir,
 		IsGlobal: true,

cmd/nebi/status.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 
 	"github.com/nebari-dev/nebi/internal/cliclient"
-	"github.com/nebari-dev/nebi/internal/models"
 	"github.com/nebari-dev/nebi/internal/store"
 	"github.com/spf13/cobra"
 )
@@ -102,7 +101,7 @@ func runStatus(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func checkServerOrigin(s *store.Store, serverURL string, ws *models.Workspace) string {
+func checkServerOrigin(s *store.Store, serverURL string, ws *store.LocalWorkspace) string {
 	creds, err := s.LoadCredentials()
 	if err != nil || creds.Token == "" {
 		return "Not logged in"

cmd/nebi/workspace.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/nebari-dev/nebi/internal/models"
 	"github.com/nebari-dev/nebi/internal/store"
 	"github.com/spf13/cobra"
 )
@@ -290,7 +289,7 @@ func runWorkspacePromote(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	ws := &models.Workspace{
+	ws := &store.LocalWorkspace{
 		Name:     name,
 		Path:     wsDir,
 		IsGlobal: true,
@@ -338,7 +337,7 @@ func runWorkspaceRemoveLocal(arg string) error {
 	}
 	defer s.Close()
 
-	var ws *models.Workspace
+	var ws *store.LocalWorkspace
 	if strings.Contains(arg, "/") || strings.Contains(arg, string(filepath.Separator)) {
 		absPath, err := filepath.Abs(arg)
 		if err != nil {

internal/models/workspace.go

@@ -27,14 +27,6 @@ type Workspace struct {
 	Status         WorkspaceStatus `gorm:"not null;default:'pending'" json:"status"`
 	PackageManager string          `gorm:"not null" json:"package_manager"` // "pixi" or "uv"
 	SizeBytes      int64           `gorm:"default:0" json:"size_bytes"`
-	Path           string          `gorm:"" json:"path,omitempty"`
-	Source         string          `gorm:"default:'managed'" json:"source"`         // "local", "managed"
-	IsGlobal       bool            `gorm:"default:false" json:"is_global,omitempty"`
-	OriginName     string          `json:"origin_name,omitempty"`
-	OriginTag      string          `json:"origin_tag,omitempty"`
-	OriginAction   string          `json:"origin_action,omitempty"`
-	OriginTomlHash string          `json:"origin_toml_hash,omitempty"`
-	OriginLockHash string          `json:"origin_lock_hash,omitempty"`
 	CreatedAt      time.Time       `json:"created_at"`
 	UpdatedAt      time.Time       `json:"updated_at"`
 	DeletedAt      gorm.DeletedAt  `gorm:"index" json:"-"`

internal/store/local_workspace.go

@@ -0,0 +1,41 @@
+package store
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+// LocalWorkspace represents a workspace tracked by the CLI in its local SQLite database.
+// This is separate from models.Workspace which is used by the server.
+type LocalWorkspace struct {
+	ID             uuid.UUID      `gorm:"type:text;primary_key" json:"id"`
+	Name           string         `gorm:"not null" json:"name"`
+	Status         string         `gorm:"not null;default:'ready'" json:"status"`
+	PackageManager string         `gorm:"not null" json:"package_manager"`
+	Path           string         `gorm:"" json:"path,omitempty"`
+	Source         string         `gorm:"default:'managed'" json:"source"`
+	IsGlobal       bool           `gorm:"default:false" json:"is_global,omitempty"`
+	OriginName     string         `json:"origin_name,omitempty"`
+	OriginTag      string         `json:"origin_tag,omitempty"`
+	OriginAction   string         `json:"origin_action,omitempty"`
+	OriginTomlHash string         `json:"origin_toml_hash,omitempty"`
+	OriginLockHash string         `json:"origin_lock_hash,omitempty"`
+	CreatedAt      time.Time      `json:"created_at"`
+	UpdatedAt      time.Time      `json:"updated_at"`
+	DeletedAt      gorm.DeletedAt `gorm:"index" json:"-"`
+}
+
+// TableName ensures GORM uses the "workspaces" table.
+func (LocalWorkspace) TableName() string {
+	return "workspaces"
+}
+
+// BeforeCreate hook to generate UUID.
+func (w *LocalWorkspace) BeforeCreate(tx *gorm.DB) error {
+	if w.ID == uuid.Nil {
+		w.ID = uuid.New()
+	}
+	return nil
+}

internal/store/store.go

@@ -7,7 +7,6 @@ import (
 	"runtime"
 
 	"github.com/glebarez/sqlite"
-	"github.com/nebari-dev/nebi/internal/models"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 )
@@ -45,7 +44,7 @@ func Open(dataDir string) (*Store, error) {
 	db.Exec("PRAGMA journal_mode=WAL")
 
 	// AutoMigrate workspace + config/credentials tables
-	if err := db.AutoMigrate(&models.Workspace{}, &Config{}, &Credentials{}); err != nil {
+	if err := db.AutoMigrate(&LocalWorkspace{}, &Config{}, &Credentials{}); err != nil {
 		return nil, fmt.Errorf("migrating schema: %w", err)
 	}
 

internal/store/store_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
-	"github.com/nebari-dev/nebi/internal/models"
 )
 
 func testStore(t *testing.T) *Store {
@@ -31,7 +30,7 @@ func TestWorkspaceRoundTrip(t *testing.T) {
 	}
 
 	// Create
-	ws := &models.Workspace{
+	ws := &LocalWorkspace{
 		Name: "project",
 		Path: "/home/user/project",
 	}
@@ -92,7 +91,7 @@ func TestGlobalWorkspace(t *testing.T) {
 	s := testStore(t)
 
 	wsDir := s.GlobalWorkspaceDir("test-uuid-123")
-	ws := &models.Workspace{
+	ws := &LocalWorkspace{
 		Name:     "data-science",
 		Path:     wsDir,
 		IsGlobal: true,
@@ -116,7 +115,7 @@ func TestGlobalWorkspace(t *testing.T) {
 func TestOriginFields(t *testing.T) {
 	s := testStore(t)
 
-	ws := &models.Workspace{
+	ws := &LocalWorkspace{
 		Name:           "project",
 		Path:           "/home/user/project",
 		OriginName:     "my-env",
@@ -197,14 +196,14 @@ func TestGlobalWorkspaceDir(t *testing.T) {
 func TestDefaults(t *testing.T) {
 	s := testStore(t)
 
-	ws := &models.Workspace{
+	ws := &LocalWorkspace{
 		Name: "test",
 		Path: "/tmp/test",
 	}
 	s.CreateWorkspace(ws)
 
 	got, _ := s.GetWorkspace(ws.ID)
-	if got.Status != models.WsStatusReady {
+	if got.Status != "ready" {
 		t.Errorf("expected status 'ready', got %q", got.Status)
 	}
 	if got.Source != "local" {

internal/store/workspace.go

@@ -4,30 +4,29 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
-	"github.com/nebari-dev/nebi/internal/models"
 )
 
 // ListWorkspaces returns all workspaces.
-func (s *Store) ListWorkspaces() ([]models.Workspace, error) {
-	var wss []models.Workspace
+func (s *Store) ListWorkspaces() ([]LocalWorkspace, error) {
+	var wss []LocalWorkspace
 	if err := s.db.Find(&wss).Error; err != nil {
 		return nil, fmt.Errorf("listing workspaces: %w", err)
 	}
 	return wss, nil
 }
 
 // GetWorkspace returns a workspace by ID.
-func (s *Store) GetWorkspace(id uuid.UUID) (*models.Workspace, error) {
-	var ws models.Workspace
+func (s *Store) GetWorkspace(id uuid.UUID) (*LocalWorkspace, error) {
+	var ws LocalWorkspace
 	if err := s.db.Where("id = ?", id).First(&ws).Error; err != nil {
 		return nil, fmt.Errorf("getting workspace: %w", err)
 	}
 	return &ws, nil
 }
 
 // FindWorkspaceByPath returns the workspace at the given path, or nil if not found.
-func (s *Store) FindWorkspaceByPath(path string) (*models.Workspace, error) {
-	var ws models.Workspace
+func (s *Store) FindWorkspaceByPath(path string) (*LocalWorkspace, error) {
+	var ws LocalWorkspace
 	result := s.db.Where("path = ?", path).First(&ws)
 	if result.Error != nil {
 		if result.RowsAffected == 0 {
@@ -39,8 +38,8 @@ func (s *Store) FindWorkspaceByPath(path string) (*models.Workspace, error) {
 }
 
 // FindWorkspaceByName returns the first workspace with the given name, or nil if not found.
-func (s *Store) FindWorkspaceByName(name string) (*models.Workspace, error) {
-	var ws models.Workspace
+func (s *Store) FindWorkspaceByName(name string) (*LocalWorkspace, error) {
+	var ws LocalWorkspace
 	result := s.db.Where("name = ?", name).First(&ws)
 	if result.Error != nil {
 		if result.RowsAffected == 0 {
@@ -52,8 +51,8 @@ func (s *Store) FindWorkspaceByName(name string) (*models.Workspace, error) {
 }
 
 // FindGlobalWorkspaceByName returns the first global workspace with the given name.
-func (s *Store) FindGlobalWorkspaceByName(name string) (*models.Workspace, error) {
-	var ws models.Workspace
+func (s *Store) FindGlobalWorkspaceByName(name string) (*LocalWorkspace, error) {
+	var ws LocalWorkspace
 	result := s.db.Where("name = ? AND is_global = ?", name, true).First(&ws)
 	if result.Error != nil {
 		if result.RowsAffected == 0 {
@@ -65,12 +64,12 @@ func (s *Store) FindGlobalWorkspaceByName(name string) (*models.Workspace, error
 }
 
 // CreateWorkspace creates a new workspace record.
-func (s *Store) CreateWorkspace(ws *models.Workspace) error {
+func (s *Store) CreateWorkspace(ws *LocalWorkspace) error {
 	if ws.ID == uuid.Nil {
 		ws.ID = uuid.New()
 	}
 	if ws.Status == "" {
-		ws.Status = models.WsStatusReady
+		ws.Status = "ready"
 	}
 	if ws.Source == "" {
 		ws.Source = "local"
@@ -82,11 +81,11 @@ func (s *Store) CreateWorkspace(ws *models.Workspace) error {
 }
 
 // SaveWorkspace updates an existing workspace record.
-func (s *Store) SaveWorkspace(ws *models.Workspace) error {
+func (s *Store) SaveWorkspace(ws *LocalWorkspace) error {
 	return s.db.Save(ws).Error
 }
 
 // DeleteWorkspace removes a workspace by ID (hard delete).
 func (s *Store) DeleteWorkspace(id uuid.UUID) error {
-	return s.db.Unscoped().Where("id = ?", id).Delete(&models.Workspace{}).Error
+	return s.db.Unscoped().Where("id = ?", id).Delete(&LocalWorkspace{}).Error
 }