fix: correct two syntax errors causing CI failures on all PRs targeting main

Bug 1 — admin/admin_test.go:189
TestMergeInto_WithRealAdminConfig closed with `)` instead of `}` and used
2-space indented brace for the inner if, causing: expected statement, found ')'

Bug 2 — cmd/server/main.go:1557+
The `if *databaseDSN != ""` block in main() expanded with inline multi-workflow
logic but was never closed, leaving the runMultiWorkflow function and helpers
(bootstrapAdmin, slugify, ensureSystemProject, seedWorkflow) as dead code. This
caused: syntax error: unexpected name runMultiWorkflow, expected (

Fix: restore the original pattern — main() calls runMultiWorkflow(logger) and
returns, instead of duplicating the logic inline. Remove the now-unused
multiWorkflowAddr flag that was only used by the inlined block. Remove
duplicate "errors" import introduced by the bad merge.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: intel352

admin/admin_test.go

@@ -185,8 +185,8 @@ func TestMergeInto_WithRealAdminConfig(t *testing.T) {
 
 	if len(primary.Modules) <= initialModuleCount {
 		t.Error("expected admin modules to be appended")
-  }
-)
+	}
+}
 
 func TestLoadConfig_Parses(t *testing.T) {
 	cfg, err := LoadConfig()

cmd/server/main.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"flag"
-	"errors"
 	"fmt"
 	"log"
 	"log/slog"
@@ -86,9 +85,8 @@ var (
 	// Multi-workflow mode flags
 	databaseDSN       = flag.String("database-dsn", "", "PostgreSQL connection string for multi-workflow mode")
 	jwtSecret         = flag.String("jwt-secret", "", "JWT signing secret for API authentication")
-	adminEmail        = flag.String("admin-email", "", "Initial admin user email (first-run bootstrap)")
-	adminPassword     = flag.String("admin-password", "", "Initial admin user password (first-run bootstrap)")
-	multiWorkflowAddr = flag.String("multi-workflow-addr", ":8090", "HTTP listen address for multi-workflow REST API")
+	adminEmail    = flag.String("admin-email", "", "Initial admin user email (first-run bootstrap)")
+	adminPassword = flag.String("admin-password", "", "Initial admin user password (first-run bootstrap)")
 
 	// License flags
 	licenseKey = flag.String("license-key", "", "License key for the workflow engine (or set WORKFLOW_LICENSE_KEY env var)")
@@ -1402,114 +1400,14 @@ func main() {
 	}))
 
 	if *databaseDSN != "" {
-		// Multi-workflow mode: connect to PostgreSQL, run migrations, start the
-		// REST API router on a dedicated port. Single-config mode is skipped.
-		if *jwtSecret == "" {
-			log.Fatal("multi-workflow mode: --jwt-secret is required")
-		}
-		logger.Info("Starting in multi-workflow mode",
-			"database_dsn_set", true,
-			"admin_email_set", *adminEmail != "",
-			"api_addr", *multiWorkflowAddr,
-		)
-		dbCtx, dbCancel := context.WithTimeout(context.Background(), 30*time.Second)
-		defer dbCancel()
-		pgStore, pgErr := evstore.NewPGStore(dbCtx, evstore.PGConfig{URL: *databaseDSN})
-		if pgErr != nil {
-			log.Fatalf("multi-workflow mode: failed to connect to PostgreSQL: %v", pgErr) //nolint:gocritic // exitAfterDefer: intentional, cleanup is best-effort
-		}
-		migrator := evstore.NewMigrator(pgStore.Pool())
-		if mErr := migrator.Migrate(dbCtx); mErr != nil {
-			log.Fatalf("multi-workflow mode: database migration failed: %v", mErr)
-		}
-		logger.Info("multi-workflow mode: database migrations applied")
-
-		// Bootstrap admin user on first run.
-		if *adminEmail != "" && *adminPassword != "" {
-			_, lookupErr := pgStore.Users().GetByEmail(context.Background(), *adminEmail)
-			switch {
-			case errors.Is(lookupErr, evstore.ErrNotFound):
-				hash, hashErr := bcrypt.GenerateFromPassword([]byte(*adminPassword), bcrypt.DefaultCost)
-				if hashErr != nil {
-					log.Fatalf("multi-workflow mode: failed to hash admin password: %v", hashErr)
-				}
-				now := time.Now()
-				adminUser := &evstore.User{
-					ID:           uuid.New(),
-					Email:        *adminEmail,
-					PasswordHash: string(hash),
-					DisplayName:  "Admin",
-					Active:       true,
-					CreatedAt:    now,
-					UpdatedAt:    now,
-				}
-				if createErr := pgStore.Users().Create(context.Background(), adminUser); createErr != nil {
-					logger.Warn("multi-workflow mode: failed to create admin user (may already exist)", "error", createErr)
-				} else {
-					logger.Info("multi-workflow mode: created bootstrap admin user", "email", *adminEmail)
-				}
-			case lookupErr != nil:
-				log.Fatalf("multi-workflow mode: failed to check for admin user: %v", lookupErr)
-			default:
-				logger.Info("multi-workflow mode: admin user already exists, skipping bootstrap", "email", *adminEmail)
-			}
+		// Multi-workflow mode: delegates to runMultiWorkflow which connects to
+		// PostgreSQL, runs migrations, starts the REST API, and blocks until shutdown.
+		if err := runMultiWorkflow(logger); err != nil {
+			log.Fatalf("Multi-workflow error: %v", err)
 		}
-
-		engineBuilder := func(cfg *config.WorkflowConfig, lg *slog.Logger) (*workflow.StdEngine, modular.Application, error) {
-			eng, _, _, buildErr := buildEngine(cfg, lg)
-			if buildErr != nil {
-				return nil, nil, buildErr
-			}
-			app := eng.GetApp()
-			return eng, app, nil
-		}
-		engineMgr := workflow.NewWorkflowEngineManager(pgStore.Workflows(), pgStore.CrossWorkflowLinks(), logger, engineBuilder)
-
-		apiRouter := apihandler.NewRouter(apihandler.Stores{
-			Users:       pgStore.Users(),
-			Sessions:    pgStore.Sessions(),
-			Companies:   pgStore.Companies(),
-			Projects:    pgStore.Projects(),
-			Workflows:   pgStore.Workflows(),
-			Memberships: pgStore.Memberships(),
-			Links:       pgStore.CrossWorkflowLinks(),
-			Executions:  pgStore.Executions(),
-			Logs:        pgStore.Logs(),
-			Audit:       pgStore.Audit(),
-			IAM:         pgStore.IAM(),
-		}, apihandler.Config{JWTSecret: *jwtSecret, Engine: engineMgr})
-
-		// Bind the listener eagerly so port conflicts are detected before the
-		// deferred cleanup is registered (fail-fast instead of silent goroutine death).
-		listener, listenErr := net.Listen("tcp", *multiWorkflowAddr)
-		if listenErr != nil {
-			log.Fatalf("multi-workflow mode: failed to listen on %s: %v", *multiWorkflowAddr, listenErr)
-		}
-
-		apiServer := &http.Server{
-			Handler:           apiRouter,
-			ReadHeaderTimeout: 10 * time.Second,
-		}
-		go func() {
-			logger.Info("multi-workflow API listening", "addr", *multiWorkflowAddr)
-			if sErr := apiServer.Serve(listener); sErr != nil && sErr != http.ErrServerClosed {
-				logger.Error("multi-workflow API server error", "error", sErr)
-			}
-		}()
-		defer func() {
-			shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 30*time.Second)
-			defer shutdownCancel()
-			if sErr := apiServer.Shutdown(shutdownCtx); sErr != nil {
-				logger.Warn("multi-workflow API server shutdown error", "error", sErr)
-			}
-			if sErr := engineMgr.StopAll(shutdownCtx); sErr != nil {
-				logger.Warn("multi-workflow engine manager shutdown error", "error", sErr)
-			}
-			if shutdownCtx.Err() == context.DeadlineExceeded {
-				logger.Warn("multi-workflow shutdown timed out; some in-flight operations may be incomplete")
-			}
-			pgStore.Close()
-		}()
+		fmt.Println("Shutdown complete")
+		return
+	}
 
 	// Load configuration — supports both single-workflow and multi-workflow application configs.
 	cfg, appCfg, err := loadConfig(logger)
@@ -1643,7 +1541,7 @@ func runMultiWorkflow(logger *slog.Logger) error {
 	apiRouter := apihandler.NewRouter(stores, apiCfg)
 
 	// 7. Set up admin UI and management infrastructure for workflow management
-	singleCfg, err := loadConfig(logger)
+	singleCfg, _, err := loadConfig(logger)
 	if err != nil {
 		return fmt.Errorf("load config: %w", err)
 	}