refactor(db): port auth and security handlers to sqlc

- auth.sql: user lookups, counts, register/mirror inserts, profile update
- security.sql: access EXISTS, vulnerability list/metrics/status,
  framework list, latest scan/report, project-id guards
- NULL description/service_id rows stay filtered, matching the original
  scan-error-and-skip behavior
- auth_users probe and filtered audit-log queries stay raw: one is a
  Better Auth table outside the schema, the other is dynamically built
- TestSecurityLiveInvariants covers the access predicate, severity
  ordering, upsert conflict path, and latest-row lookups against live
  Postgres

Authored By: TDvorak <[email protected]>

.gitignore

@@ -124,6 +124,3 @@ ref/
 .playwright-mcp/
 canvas-*.png
 .vercel
-
-# Local design previews (not shipped)
-design/

ROADMAP2.md

@@ -1,6 +1,6 @@
 # Containr — Roadmap 2: The dflow Convergence
 
-Last verified: **2026-10-10** — deep pass over the full dflow codebase
+Last verified: **2026-10-08** — deep pass over the full dflow codebase
 (`~/Desktop/PROG+HTML/dflow`, community fork of dflow-sh/dflow, frozen for
 preservation) against Containr `main` (`15b5b0e`).
 
@@ -337,9 +337,8 @@ and wired refs, one click or one CLI call.
   and local + tags are rejected, empty array clears. Surfaces:
   `--placement-tags` on services create/update, `--tags` on
   `nodes update`, MCP args, OpenAPI, node-detail tag editor +
-  service-detail placement-tags input. Build-on-node and remote
+  service-detail placement-tags input. Remaining: build-on-node,
-  sleep/wake both shipped (see below). Remaining: spread weighting
+  remote sleep/wake, spread weighting by real capacity.
-  by real capacity.
 - [x] **Agent self-upgrade** — `POST /agents/:id/upgrade` enqueues a
   `self_upgrade` command carrying platform + sha256 + server version;
   the agent downloads its replacement from `GET /agents/download/
@@ -538,18 +537,9 @@ and wired refs, one click or one CLI call.
   workspace, CLI `environments` + MCP parity. Per-env vars/domains ride the
   service's own scope (one env per service); promote ships via preview
   promote.
-- [x] **sqlc port** — all static `database/sql` call sites → `sqlc/queries/` + generated `sqlcdb`. Merged: metrics + domains (#75), service clone/move (#76), preview environments (#77), deployments + rollback (#78), runtime ops (#79), cron (#80), sleep/wake sweeper (#81), git providers/repos/webhooks (#82), auth + security (#83), operations/settings/audit/activity/builds/misc + apwhy gateway (#84). Raw SQL remains only for runtime-assembled statements (filtered lists, sparse updates) and Better Auth `auth_users` probes.
+- [ ] **sqlc port** — ~265 raw `database/sql` sites → `sqlc/queries/`. Done in tranches (dynamic queries stay raw). Tranches merged: metrics storage + service domains (#75), service clone/move ops (#76), preview environments (#77), deployments + rollback (#78). Remaining: runtime, compliance, cron, git, security, auth, sleeper, scanner, gateway, and smaller files.
 - [ ] **Tests** — canvas/wizard frontend coverage, deployment/template/
   webhook table tests, Playwright e2e golden path.
-- [x] **UI/UX audit** — browser-driven pass over the whole app (PR #85):
-  fixed the stuck connectivity banner (`pingServer` returned
-  `undefined`), stale persisted sessions, fabricated observability
-  metrics (now real `getServiceMetrics` aggregation), mobile overflow,
-  Security blank state, deep-linkable service tabs, and a dozen
-  polish items.
-- [x] **Design previews** — gitignored `/design` holds three on-brand
-  HTML concepts (console, service detail, landing) on the product's
-  token system with a live white-label accent switcher.
 - [x] **First-run wizard** — public `GET /setup/status` + authed
   `POST /setup/complete`; `/setup` page steps admin account → GitHub App
   manifest flow (callback returns to the wizard via a session marker) →

app/backend/internal/api/activity.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
@@ -181,13 +180,13 @@ func handleGetProjectActivity(c *gin.Context) {
 	}
 
 	// Access check: approved / owner / member / admin.
-	userUUID, _ := uuid.Parse(userID)
+	var visible bool
-	visible, err := sqlcdb.New(db.DB).CheckSecurityProjectAccess(context.Background(), sqlcdb.CheckSecurityProjectAccessParams{
+	if err := db.QueryRow(
-		ID:      uuid.MustParse(projectID),
+		`SELECT p.is_approved OR p.owner_id = $2::uuid OR $3::bool
-		OwnerID: userUUID,
+			OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $2::uuid)
-		Column3: contextIsAdmin(c),
+		 FROM projects p WHERE p.id = $1`,
-	})
+		projectID, userID, contextIsAdmin(c),
-	if err != nil || !visible {
+	).Scan(&visible); err != nil || !visible {
 		respondError(c, http.StatusNotFound, "NOT_FOUND", "project not found")
 		return
 	}
@@ -238,12 +237,12 @@ func StartAuditRetention(ctx context.Context, db *database.DB) {
 	}
 
 	prune := func() {
-		n, err := sqlcdb.New(db.DB).PruneAuditLogs(context.Background(), int32(days))
+		res, err := db.Exec(`DELETE FROM audit_logs WHERE created_at < NOW() - ($1::int * INTERVAL '1 day')`, days)
 		if err != nil {
 			log.Printf("audit retention prune failed: %v", err)
 			return
 		}
-		if n > 0 {
+		if n, _ := res.RowsAffected(); n > 0 {
 			log.Printf("audit retention: pruned %d rows older than %d days", n, days)
 		}
 	}
@@ -266,24 +265,34 @@ func StartAuditRetention(ctx context.Context, db *database.DB) {
 // backfillAuditMetadata classifies rows written before severity/category/label
 // existed so filters and the feed see uniform metadata.
 func backfillAuditMetadata(db *database.DB) {
-	q := sqlcdb.New(db.DB)
+	cursor := uuid.Nil.String()
-	cursor := uuid.Nil
 	for {
-		rows, err := q.ListAuditBackfillBatch(context.Background(), cursor)
+		rows, err := db.Query(
+			`SELECT id::text, resource, action FROM audit_logs
+			 WHERE label = '' AND id > $1::uuid ORDER BY id LIMIT 500`, cursor)
 		if err != nil {
 			log.Printf("audit backfill scan failed: %v", err)
 			return
 		}
-		if len(rows) == 0 {
+		type row struct{ id, resource, action string }
+		var batch []row
+		for rows.Next() {
+			var r row
+			if rows.Scan(&r.id, &r.resource, &r.action) == nil {
+				batch = append(batch, r)
+			}
+		}
+		rows.Close()
+		if len(batch) == 0 {
 			return
 		}
-		for _, r := range rows {
+		for _, r := range batch {
-			id, _ := uuid.Parse(r.ID)
+			cursor = r.id
-			cursor = id
+			sev, cat, label := classifyAuditEvent(r.resource, r.action)
-			sev, cat, label := classifyAuditEvent(r.Resource, r.Action)
+			if _, err := db.Exec(
-			if err := q.SetAuditLogMetadata(context.Background(), sqlcdb.SetAuditLogMetadataParams{
+				`UPDATE audit_logs SET severity = $1, category = $2, label = $3 WHERE id = $4::uuid`,
-				Severity: sev, Category: cat, Label: label, Column4: id,
+				sev, cat, label, r.id,
-			}); err != nil {
+			); err != nil {
 				log.Printf("audit backfill update failed: %v", err)
 			}
 		}

app/backend/internal/api/admin.go

@@ -52,11 +52,15 @@ func EnsureAdminAccount(ctx context.Context, db *database.DB, cfg *config.Config
 		return
 	}
 
-	if _, err := sqlcdb.New(db.DB).UpsertAdminUser(ctx, sqlcdb.UpsertAdminUserParams{
+	var userID string
-		Email:        email,
+	err = db.QueryRowContext(ctx, `
-		PasswordHash: string(hashed),
+		INSERT INTO users (email, password_hash, name, is_admin)
-		Name:         name,
+		VALUES ($1, $2, $3, true)
-	}); err != nil {
+		ON CONFLICT (email) DO UPDATE
+		SET is_admin = true, updated_at = NOW()
+		RETURNING id
+	`, email, string(hashed), name).Scan(&userID)
+	if err != nil {
 		log.Printf("Admin bootstrap failed to upsert user %s: %v", email, err)
 		return
 	}
@@ -181,18 +185,24 @@ func handleAdminOverview(c *gin.Context) {
 func handleAdminListUsers(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 
-	rows, err := sqlcdb.New(db.DB).ListAdminUsers(c.Request.Context())
+	rows, err := db.QueryContext(c.Request.Context(), `
+		SELECT id, email, name, COALESCE(avatar_url, ''), is_admin, COALESCE(to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"'), '')
+		FROM users
+		ORDER BY created_at ASC
+	`)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to list users"})
 		return
 	}
+	defer rows.Close()
 
-	users := make([]adminUserRow, 0, len(rows))
+	users := make([]adminUserRow, 0)
-	for _, r := range rows {
+	for rows.Next() {
-		users = append(users, adminUserRow{
+		var u adminUserRow
-			ID: r.ID.String(), Email: r.Email, Name: r.Name,
+		if err := rows.Scan(&u.ID, &u.Email, &u.Name, &u.AvatarURL, &u.IsAdmin, &u.CreatedAt); err != nil {
-			AvatarURL: r.AvatarUrl, IsAdmin: r.IsAdmin, CreatedAt: r.CreatedAt,
+			continue
-		})
+		}
+		users = append(users, u)
 	}
 	c.JSON(http.StatusOK, gin.H{"users": users})
 }
@@ -219,16 +229,15 @@ func handleAdminSetUserAdmin(c *gin.Context) {
 		return
 	}
 
-	targetUUID, _ := uuid.Parse(targetID)
+	result, err := db.ExecContext(c.Request.Context(),
-	n, err := sqlcdb.New(db.DB).SetUserAdmin(c.Request.Context(), sqlcdb.SetUserAdminParams{
+		`UPDATE users SET is_admin = $1, updated_at = NOW() WHERE id = $2`,
-		IsAdmin: req.IsAdmin,
+		req.IsAdmin, targetID,
-		ID:      targetUUID,
+	)
-	})
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update user"})
 		return
 	}
-	if n == 0 {
+	if n, _ := result.RowsAffected(); n == 0 {
 		c.JSON(http.StatusNotFound, gin.H{"error": "User not found"})
 		return
 	}
@@ -249,13 +258,15 @@ func handleAdminImpersonateUser(c *gin.Context) {
 		return
 	}
 
-	userUUID, _ := uuid.Parse(targetID)
+	var email, name string
-	info, err := sqlcdb.New(db.DB).GetAdminUserInfo(c.Request.Context(), userUUID)
+	var isAdmin bool
+	err := db.QueryRowContext(c.Request.Context(),
+		`SELECT email, COALESCE(name, ''), is_admin FROM users WHERE id = $1`, targetID).
+		Scan(&email, &name, &isAdmin)
 	if err != nil {
 		respondError(c, http.StatusNotFound, "NOT_FOUND", "user not found")
 		return
 	}
-	email, name, isAdmin := info.Email, info.Name, info.IsAdmin
 	if isAdmin {
 		respondError(c, http.StatusForbidden, "FORBIDDEN", "admin accounts cannot be impersonated")
 		return

app/backend/internal/api/apwhy_handlers.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"context"
 	"crypto/rand"
 	"database/sql"
@@ -15,7 +14,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
-	"github.com/google/uuid"
 	"github.com/lib/pq"
 	"golang.org/x/crypto/bcrypt"
 )
@@ -162,22 +160,21 @@ func handleAPwhyServiceValidate(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 	ctx := c.Request.Context()
 
-	svcUUID, parseErr := uuid.Parse(serviceID)
+	var upstreamURL, healthPath string
-	var svc sqlcdb.GetAPServiceForValidateRow
+	var authHeader, authValue sql.NullString
-	var err error
+	var timeoutMs sql.NullInt64
-	if parseErr == nil {
+	err := db.QueryRowContext(ctx, `
-		svc, err = sqlcdb.New(db.DB).GetAPServiceForValidate(ctx, svcUUID)
+		SELECT upstream_url, health_path, upstream_auth_header, upstream_auth_value, request_timeout_ms
-	}
+		FROM api_services WHERE id = $1
-	if parseErr != nil || err != nil {
+	`, serviceID).Scan(&upstreamURL, &healthPath, &authHeader, &authValue, &timeoutMs)
+	if err != nil {
 		sendErrorResponse(c, http.StatusNotFound, "SERVICE_NOT_FOUND", "Service not found", nil)
 		return
 	}
-	upstreamURL, healthPath := svc.UpstreamUrl, svc.HealthPath
-	authHeader, authValue := svc.UpstreamAuthHeader, svc.UpstreamAuthValue
 
 	timeout := 8000
-	if svc.RequestTimeoutMs.Valid && svc.RequestTimeoutMs.Int32 > 0 {
+	if timeoutMs.Valid && timeoutMs.Int64 > 0 {
-		timeout = int(svc.RequestTimeoutMs.Int32)
+		timeout = int(timeoutMs.Int64)
 	}
 	target := strings.TrimRight(upstreamURL, "/") + "/" + strings.TrimLeft(healthPath, "/")
 
@@ -206,19 +203,17 @@ func handleAPwhyServiceValidate(c *gin.Context) {
 		validationStatus = "healthy"
 	}
 
-	q := sqlcdb.New(db.DB)
+	_, _ = db.ExecContext(ctx, `
-	_ = q.SetAPServiceValidation(ctx, sqlcdb.SetAPServiceValidationParams{
+		UPDATE api_services
-		LastValidationStatus:  sql.NullString{String: validationStatus, Valid: true},
+		SET last_validation_at = NOW(), last_validation_status = $1, last_validation_message = $2, updated_at = NOW()
-		LastValidationMessage: sql.NullString{String: message, Valid: true},
+		WHERE id = $3
-		ID:                    svcUUID,
+	`, validationStatus, message, serviceID)
-	})
 
 	if !ok {
-		_ = q.InsertServiceIncident(ctx, sqlcdb.InsertServiceIncidentParams{
+		_, _ = db.ExecContext(ctx, `
-			ServiceID:  uuid.NullUUID{UUID: svcUUID, Valid: true},
+			INSERT INTO incident_events (service_id, code, message, severity, http_status, occurred_at)
-			Message:    message,
+			VALUES ($1, 'SERVICE_VALIDATION_FAILED', $2, 'medium', $3, NOW())
-			HttpStatus: sql.NullInt32{Int32: int32(status), Valid: true},
+		`, serviceID, message, status)
-		})
 	}
 
 	sendSuccessResponse(c, http.StatusOK, map[string]interface{}{
@@ -236,24 +231,36 @@ func handleAPwhyServicesList(c *gin.Context) {
 	ctx := context.Background()
 
 	// Query services from database
-	rows, err := sqlcdb.New(db.DB).ListAPServices(ctx)
+	rows, err := db.QueryContext(ctx, `
+		SELECT id, name, slug, upstream_url, route_prefix, enabled, created_at, updated_at
+		FROM api_services
+		ORDER BY created_at DESC
+	`)
 	if err != nil {
 		sendErrorResponse(c, http.StatusInternalServerError, "DATABASE_ERROR",
 			"Failed to query services", err.Error())
 		return
 	}
+	defer rows.Close()
+
+	services := make([]map[string]interface{}, 0)
+	for rows.Next() {
+		var id, name, slug, upstreamURL, routePrefix, createdAt, updatedAt string
+		var enabled int
+		err := rows.Scan(&id, &name, &slug, &upstreamURL, &routePrefix, &enabled, &createdAt, &updatedAt)
+		if err != nil {
+			continue // Skip malformed rows
+		}
 
-	services := make([]map[string]interface{}, 0, len(rows))
-	for _, r := range rows {
 		services = append(services, map[string]interface{}{
-			"id":          r.ID.String(),
+			"id":          id,
-			"name":        r.Name,
+			"name":        name,
-			"slug":        r.Slug,
+			"slug":        slug,
-			"upstreamUrl": r.UpstreamUrl,
+			"upstreamUrl": upstreamURL,
-			"routePrefix": r.RoutePrefix,
+			"routePrefix": routePrefix,
-			"enabled":     r.Enabled != 0,
+			"enabled":     enabled != 0,
-			"createdAt":   r.CreatedAt,
+			"createdAt":   createdAt,
-			"updatedAt":   r.UpdatedAt,
+			"updatedAt":   updatedAt,
 		})
 	}
 
@@ -292,14 +299,14 @@ func handleAPwhyServicesCreate(c *gin.Context) {
 	}
 
 	// id defaults to gen_random_uuid(); enabled defaults to 1.
-	svcID, err := sqlcdb.New(db.DB).InsertAPService(ctx, sqlcdb.InsertAPServiceParams{
+	var id string
-		Name:         req.Name,
+	err := db.QueryRowContext(ctx, `
-		Slug:         slug,
+		INSERT INTO api_services (
-		UpstreamUrl:  req.UpstreamURL,
+			name, slug, upstream_url, route_prefix, health_path,
-		RoutePrefix:  req.RoutePrefix,
+			rpm_limit, monthly_quota, created_at, updated_at
-		RpmLimit:     sql.NullInt32{Int32: int32(rpmLimit), Valid: true},
+		) VALUES ($1, $2, $3, $4, '/health', $5, $6, NOW(), NOW())
-		MonthlyQuota: sql.NullInt32{Int32: int32(monthlyQuota), Valid: true},
+		RETURNING id
-	})
+	`, req.Name, slug, req.UpstreamURL, req.RoutePrefix, rpmLimit, monthlyQuota).Scan(&id)
 
 	if err != nil {
 		if isUniqueViolation(err) {
@@ -313,7 +320,7 @@ func handleAPwhyServicesCreate(c *gin.Context) {
 	}
 
 	serviceData := map[string]interface{}{
-		"id":           svcID.String(),
+		"id":           id,
 		"name":         req.Name,
 		"slug":         slug,
 		"upstreamUrl":  req.UpstreamURL,
@@ -349,15 +356,13 @@ func handleAPwhyServicesPatch(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 
 	if input.Enabled != nil {
-		enabled := int32(0)
+		enabled := 0
 		if *input.Enabled {
 			enabled = 1
 		}
-		svcUUID, _ := uuid.Parse(serviceID)
+		_, err := db.ExecContext(context.Background(),
-		err := sqlcdb.New(db.DB).SetAPServiceEnabled(context.Background(), sqlcdb.SetAPServiceEnabledParams{
+			"UPDATE api_services SET enabled = $1, updated_at = NOW() WHERE id = $2",
-			Enabled: enabled,
+			enabled, serviceID)
-			ID:      svcUUID,
-		})
 
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{
@@ -378,7 +383,11 @@ func handleAPwhyServicesPatch(c *gin.Context) {
 func handleAPwhyKeysList(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 
-	rows, err := sqlcdb.New(db.DB).ListAPKeys(context.Background())
+	rows, err := db.QueryContext(context.Background(), `
+		SELECT id, name, key_prefix, plan, enabled, rpm_limit, monthly_quota, created_at, updated_at
+		FROM api_keys 
+		ORDER BY created_at DESC
+	`)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"ok":   true,
@@ -386,24 +395,34 @@ func handleAPwhyKeysList(c *gin.Context) {
 		})
 		return
 	}
+	defer rows.Close()
+
+	keys := make([]map[string]interface{}, 0)
+	for rows.Next() {
+		var id, name, keyPrefix, plan, createdAt, updatedAt string
+		var enabled int
+		var rpmLimit, monthlyQuota sql.NullInt64
+
+		err := rows.Scan(&id, &name, &keyPrefix, &plan, &enabled, &rpmLimit, &monthlyQuota, &createdAt, &updatedAt)
+		if err != nil {
+			continue
+		}
 
-	keys := make([]map[string]interface{}, 0, len(rows))
-	for _, r := range rows {
 		key := map[string]interface{}{
-			"id":        r.ID.String(),
+			"id":        id,
-			"name":      r.Name,
+			"name":      name,
-			"keyPrefix": r.KeyPrefix,
+			"keyPrefix": keyPrefix,
-			"plan":      r.Plan,
+			"plan":      plan,
-			"enabled":   r.Enabled != 0,
+			"enabled":   enabled != 0,
-			"createdAt": r.CreatedAt,
+			"createdAt": createdAt,
-			"updatedAt": r.UpdatedAt,
+			"updatedAt": updatedAt,
 		}
 
-		if r.RpmLimit.Valid {
+		if rpmLimit.Valid {
-			key["rpmLimit"] = int64(r.RpmLimit.Int32)
+			key["rpmLimit"] = rpmLimit.Int64
 		}
-		if r.MonthlyQuota.Valid {
+		if monthlyQuota.Valid {
-			key["monthlyQuota"] = int64(r.MonthlyQuota.Int32)
+			key["monthlyQuota"] = monthlyQuota.Int64
 		}
 
 		keys = append(keys, key)
@@ -462,14 +481,14 @@ func handleAPwhyKeysCreate(c *gin.Context) {
 	}
 
 	// id defaults to gen_random_uuid(); enabled defaults to 1.
-	keyID, err := sqlcdb.New(db.DB).InsertAPKey(context.Background(), sqlcdb.InsertAPKeyParams{
+	var id string
-		Name:         input.Name,
+	err = db.QueryRowContext(context.Background(), `
-		KeyHash:      keyHash,
+		INSERT INTO api_keys (
-		KeyPrefix:    keyPrefix,
+			name, key_hash, key_prefix, plan, allowed_service_ids,
-		Plan:         plan,
+			rpm_limit, monthly_quota, created_at, updated_at
-		RpmLimit:     sql.NullInt32{Int32: int32(rpmLimit), Valid: true},
+		) VALUES ($1, $2, $3, $4, '[]', $5, $6, NOW(), NOW())
-		MonthlyQuota: sql.NullInt32{Int32: int32(monthlyQuota), Valid: true},
+		RETURNING id
-	})
+	`, input.Name, keyHash, keyPrefix, plan, rpmLimit, monthlyQuota).Scan(&id)
 
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
@@ -482,7 +501,7 @@ func handleAPwhyKeysCreate(c *gin.Context) {
 	c.JSON(http.StatusCreated, gin.H{
 		"ok": true,
 		"data": gin.H{
-			"id":           keyID.String(),
+			"id":           id,
 			"name":         input.Name,
 			"plan":         plan,
 			"key":          apiKey, // Only return the actual key once
@@ -513,15 +532,13 @@ func handleAPwhyKeysPatch(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 
 	if input.Enabled != nil {
-		enabled := int32(0)
+		enabled := 0
 		if *input.Enabled {
 			enabled = 1
 		}
-		keyUUID, _ := uuid.Parse(keyID)
+		_, err := db.ExecContext(context.Background(),
-		err := sqlcdb.New(db.DB).SetAPKeyEnabled(context.Background(), sqlcdb.SetAPKeyEnabledParams{
+			"UPDATE api_keys SET enabled = $1, updated_at = NOW() WHERE id = $2",
-			Enabled: enabled,
+			enabled, keyID)
-			ID:      keyUUID,
-		})
 
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{
@@ -543,27 +560,23 @@ func handleAPwhyAnalyticsOps(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 
 	// Get counts from database
-	q := sqlcdb.New(db.DB)
+	var totalServices, totalKeys, totalUsers int
-	ctx := context.Background()
 
-	totalServices, err := q.CountAPServices(ctx)
+	if err := db.QueryRowContext(context.Background(), "SELECT COUNT(*) FROM api_services").Scan(&totalServices); err != nil {
-	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"ok":    false,
 			"error": "Failed to count services: " + err.Error(),
 		})
 		return
 	}
-	totalKeys, err := q.CountAPKeys(ctx)
+	if err := db.QueryRowContext(context.Background(), "SELECT COUNT(*) FROM api_keys").Scan(&totalKeys); err != nil {
-	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"ok":    false,
 			"error": "Failed to count api keys: " + err.Error(),
 		})
 		return
 	}
-	totalUsers, err := q.CountUsers(ctx)
+	if err := db.QueryRowContext(context.Background(), "SELECT COUNT(*) FROM users").Scan(&totalUsers); err != nil {
-	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"ok":    false,
 			"error": "Failed to count users: " + err.Error(),
@@ -571,8 +584,8 @@ func handleAPwhyAnalyticsOps(c *gin.Context) {
 		return
 	}
 
-	totalRequests, err := q.SumUsageCounters(ctx)
+	var totalRequests int
-	if err != nil {
+	if err := db.QueryRowContext(context.Background(), "SELECT COALESCE(SUM(request_count), 0) FROM usage_counters").Scan(&totalRequests); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"ok":    false,
 			"error": "Failed to aggregate request counters: " + err.Error(),
@@ -580,8 +593,12 @@ func handleAPwhyAnalyticsOps(c *gin.Context) {
 		return
 	}
 
-	requestsToday, err := q.SumRequestMetricSince(ctx, "day")
+	var requestsToday int
-	if err != nil {
+	if err := db.QueryRowContext(context.Background(), `
+		SELECT COALESCE(SUM(value), 0)::int
+		FROM metrics_timeseries
+		WHERE metric = 'request_total' AND occurred_at >= DATE_TRUNC('day', NOW())
+	`).Scan(&requestsToday); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"ok":    false,
 			"error": "Failed to aggregate today's requests: " + err.Error(),
@@ -589,8 +606,12 @@ func handleAPwhyAnalyticsOps(c *gin.Context) {
 		return
 	}
 
-	requestsThisMonth, err := q.SumRequestMetricSince(ctx, "month")
+	var requestsThisMonth int
-	if err != nil {
+	if err := db.QueryRowContext(context.Background(), `
+		SELECT COALESCE(SUM(value), 0)::int
+		FROM metrics_timeseries
+		WHERE metric = 'request_total' AND occurred_at >= DATE_TRUNC('month', NOW())
+	`).Scan(&requestsThisMonth); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"ok":    false,
 			"error": "Failed to aggregate monthly requests: " + err.Error(),
@@ -615,49 +636,96 @@ func handleAPwhyAnalyticsOps(c *gin.Context) {
 func handleAPwhyAnalyticsTraffic(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 
-	q := sqlcdb.New(db.DB)
-	ctx := context.Background()
-
 	topServices := make([]map[string]interface{}, 0)
-	if serviceRows, err := q.ListTopAPServices(ctx); err == nil {
+	serviceRows, err := db.QueryContext(context.Background(), `
-		for _, r := range serviceRows {
+		SELECT s.id, s.name, COALESCE(SUM(u.request_count), 0) AS total_requests
+		FROM api_services s
+		LEFT JOIN usage_counters u ON u.service_id = s.id
+		GROUP BY s.id, s.name
+		ORDER BY total_requests DESC, s.name ASC
+		LIMIT 10
+	`)
+	if err == nil {
+		defer serviceRows.Close()
+		for serviceRows.Next() {
+			var serviceID, serviceName string
+			var totalRequests int
+			if scanErr := serviceRows.Scan(&serviceID, &serviceName, &totalRequests); scanErr == nil {
 				topServices = append(topServices, map[string]interface{}{
-				"service_id": r.ID.String(),
+					"service_id": serviceID,
-				"name":       r.Name,
+					"name":       serviceName,
-				"requests":   r.TotalRequests,
+					"requests":   totalRequests,
 				})
 			}
 		}
+	}
 
 	requestsByDay := make([]map[string]interface{}, 0)
-	if trafficRows, err := q.ListRequestsByDay(ctx); err == nil {
+	trafficRows, err := db.QueryContext(context.Background(), `
-		for _, r := range trafficRows {
+		SELECT TO_CHAR(DATE_TRUNC('day', occurred_at), 'YYYY-MM-DD') AS day_bucket, COUNT(*) AS total
+		FROM metrics_timeseries
+		WHERE metric = 'request_total' AND occurred_at >= NOW() - INTERVAL '7 days'
+		GROUP BY DATE_TRUNC('day', occurred_at)
+		ORDER BY DATE_TRUNC('day', occurred_at) ASC
+	`)
+	if err == nil {
+		defer trafficRows.Close()
+		for trafficRows.Next() {
+			var day string
+			var count int
+			if scanErr := trafficRows.Scan(&day, &count); scanErr == nil {
 				requestsByDay = append(requestsByDay, map[string]interface{}{
-				"day":      r.DayBucket,
+					"day":      day,
-				"requests": r.Total,
+					"requests": count,
 				})
 			}
 		}
+	}
 
 	statusCodes := make([]map[string]interface{}, 0)
-	if statusRows, err := q.ListIncidentStatusCodes(ctx); err == nil {
+	statusRows, err := db.QueryContext(context.Background(), `
-		for _, r := range statusRows {
+		SELECT COALESCE(http_status, 0) AS status_code, COALESCE(SUM(count), 0) AS total
+		FROM incident_events
+		WHERE occurred_at >= NOW() - INTERVAL '7 days'
+		GROUP BY COALESCE(http_status, 0)
+		ORDER BY total DESC, status_code ASC
+	`)
+	if err == nil {
+		defer statusRows.Close()
+		for statusRows.Next() {
+			var code int
+			var total int
+			if scanErr := statusRows.Scan(&code, &total); scanErr == nil {
 				statusCodes = append(statusCodes, map[string]interface{}{
-				"status_code": r.StatusCode,
+					"status_code": code,
-				"count":       r.Total,
+					"count":       total,
 				})
 			}
 		}
+	}
 
 	clientEvents := make([]map[string]interface{}, 0)
-	if eventRows, err := q.ListClientEventPaths(ctx); err == nil {
+	eventRows, err := db.QueryContext(context.Background(), `
-		for _, r := range eventRows {
+		SELECT COALESCE((labels_json::jsonb ->> 'path'), 'unknown') AS path, COUNT(*) AS total
+		FROM metrics_timeseries
+		WHERE metric = 'client_event' AND occurred_at >= NOW() - INTERVAL '7 days'
+		GROUP BY COALESCE((labels_json::jsonb ->> 'path'), 'unknown')
+		ORDER BY total DESC, path ASC
+		LIMIT 20
+	`)
+	if err == nil {
+		defer eventRows.Close()
+		for eventRows.Next() {
+			var path string
+			var total int
+			if scanErr := eventRows.Scan(&path, &total); scanErr == nil {
 				clientEvents = append(clientEvents, map[string]interface{}{
-				"path":  r.Path,
+					"path":  path,
-				"count": r.Total,
+					"count": total,
 				})
 			}
 		}
+	}
 
 	c.JSON(http.StatusOK, gin.H{
 		"ok": true,

app/backend/internal/api/audit.go

@@ -2,9 +2,6 @@ package api
 
 import (
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
-	"context"
-	"database/sql"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -14,7 +11,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
-	"github.com/sqlc-dev/pqtype"
 )
 
 type AuditLog struct {
@@ -102,20 +98,16 @@ func LogAudit(userID, resource, resourceID, action string, details map[string]in
 	}
 
 	detailsJSON, _ := json.Marshal(details)
+	resourceUUID := parseUUIDOrNil(resourceID)
+	userUUID := parseUUIDOrNil(userID)
 	severity, category, label := classifyAuditEvent(resource, action)
 
-	err := sqlcdb.New(db.DB).InsertAuditLog(context.Background(), sqlcdb.InsertAuditLogParams{
+	auditID := uuid.New().String()
-		ID:         uuid.New(),
+	_, err := db.Exec(
-		UserID:     nullUUIDOrNil(userID),
+		`INSERT INTO audit_logs (id, user_id, resource, resource_id, action, details, severity, category, label, created_at)
-		Resource:   resource,
+		 VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
-		ResourceID: nullUUIDOrNil(resourceID),
+		auditID, userUUID, resource, resourceUUID, action, string(detailsJSON), severity, category, label, time.Now().UTC(),
-		Action:     action,
+	)
-		Details:    pqtype.NullRawMessage{RawMessage: detailsJSON, Valid: true},
-		Severity:   severity,
-		Category:   category,
-		Label:      label,
-		CreatedAt:  time.Now().UTC(),
-	})
 
 	if err != nil {
 	}
@@ -139,24 +131,16 @@ func LogAuditWithRequest(c *gin.Context, resource, resourceID, action string, de
 	if uid, ok := userID.(string); ok {
 		userIDStr = uid
 	}
+	userUUID := parseUUIDOrNil(userIDStr)
+	resourceUUID := parseUUIDOrNil(resourceID)
 	severity, category, label := classifyAuditEvent(resource, action)
 
-	var inet pqtype.Inet
+	auditID := uuid.New().String()
-	_ = inet.Scan(c.ClientIP())
+	_, err := db.Exec(
-	err := sqlcdb.New(db.DB).InsertAuditLogWithRequest(context.Background(), sqlcdb.InsertAuditLogWithRequestParams{
+		`INSERT INTO audit_logs (id, user_id, resource, resource_id, action, details, ip_address, user_agent, severity, category, label, created_at)
-		ID:         uuid.New(),
+		 VALUES ($1, $2, $3, $4, $5, $6::jsonb, $7, $8, $9, $10, $11, $12)`,
-		UserID:     nullUUIDOrNil(userIDStr),
+		auditID, userUUID, resource, resourceUUID, action, string(detailsJSON), c.ClientIP(), c.GetHeader("User-Agent"), severity, category, label, time.Now().UTC(),
-		Resource:   resource,
+	)
-		ResourceID: nullUUIDOrNil(resourceID),
-		Action:     action,
-		Column6:    json.RawMessage(detailsJSON),
-		Column7:    inet,
-		UserAgent:  sql.NullString{String: c.GetHeader("User-Agent"), Valid: true},
-		Severity:   severity,
-		Category:   category,
-		Label:      label,
-		CreatedAt:  time.Now().UTC(),
-	})
 
 	if err != nil {
 	}
@@ -271,29 +255,30 @@ func handleGetResourceAuditLogs(c *gin.Context) {
 	resource := c.Param("resource")
 	resourceID := c.Param("id")
 
-	rows, err := sqlcdb.New(db.DB).ListResourceAuditLogs(context.Background(), sqlcdb.ListResourceAuditLogsParams{
+	rows, err := db.Query(
-		UserID:     nullUUIDOrNil(userID),
+		`SELECT id, COALESCE(user_id::text, ''), resource, COALESCE(resource_id::text, ''), action, COALESCE(details::text, '{}'),
-		Resource:   resource,
+		        COALESCE(ip_address::text, ''), COALESCE(user_agent, ''), created_at 
-		ResourceID: nullUUIDOrNil(resourceID),
+		 FROM audit_logs 
-	})
+		 WHERE user_id::text = $1 AND resource = $2 AND resource_id::text = $3 
+		 ORDER BY created_at DESC 
+		 LIMIT 100`,
+		userID, resource, resourceID,
+	)
+
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch audit logs"})
 		return
 	}
+	defer rows.Close()
 
 	var logs []AuditLog
-	for _, row := range rows {
+	for rows.Next() {
-		logs = append(logs, AuditLog{
+		var log AuditLog
-			ID:         row.ID.String(),
+		err := rows.Scan(&log.ID, &log.UserID, &log.Resource, &log.ResourceID, &log.Action, &log.Details, &log.IPAddress, &log.UserAgent, &log.CreatedAt)
-			UserID:     row.UserID,
+		if err != nil {
-			Resource:   row.Resource,
+			continue
-			ResourceID: row.ResourceID,
+		}
-			Action:     row.Action,
+		logs = append(logs, log)
-			Details:    row.Details,
-			IPAddress:  row.IpAddress,
-			UserAgent:  row.UserAgent,
-			CreatedAt:  row.CreatedAt,
-		})
 	}
 
 	c.JSON(http.StatusOK, gin.H{"audit_logs": logs})
@@ -317,8 +302,3 @@ func parseUUIDOrNil(raw string) interface{} {
 	}
 	return trimmed
 }
-
-func nullUUIDOrNil(raw string) uuid.NullUUID {
-	parsed, err := uuid.Parse(strings.TrimSpace(raw))
-	return uuid.NullUUID{UUID: parsed, Valid: err == nil}
-}

app/backend/internal/api/build.go

@@ -16,7 +16,6 @@ import (
 
 	"containr/internal/build"
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/docker"
 	"containr/internal/types"
 
@@ -670,22 +669,39 @@ func (h *BuildHandler) upsertBuild(status *BuildStatusResponse) error {
 	}
 
 	now := time.Now().UTC()
-	err := sqlcdb.New(h.db.DB).UpsertBuild(context.Background(), sqlcdb.UpsertBuildParams{
+	_, err := h.db.Exec(
-		ID:          status.ID,
+		`INSERT INTO builds
-		ProjectID:   nsNullIfEmpty(status.ProjectID),
+		 (id, project_id, service_id, status, progress, started_at, completed_at, image_name, image_tag, size, error, log, metadata, created_at, updated_at)
-		ServiceID:   nsNullIfEmpty(status.ServiceID),
+		 VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13::jsonb, $14, $14)
-		Status:      status.Status,
+		 ON CONFLICT (id) DO UPDATE SET
-		Progress:    int32(status.Progress),
+		   project_id = EXCLUDED.project_id,
-		StartedAt:   status.StartedAt,
+		   service_id = EXCLUDED.service_id,
-		CompletedAt: ntPtr(status.CompletedAt),
+		   status = EXCLUDED.status,
-		ImageName:   status.ImageName,
+		   progress = EXCLUDED.progress,
-		ImageTag:    status.ImageTag,
+		   started_at = EXCLUDED.started_at,
-		Size:        status.Size,
+		   completed_at = EXCLUDED.completed_at,
-		Error:       nsNullIfEmpty(status.Error),
+		   image_name = EXCLUDED.image_name,
-		Log:         status.Log,
+		   image_tag = EXCLUDED.image_tag,
-		Column13:    json.RawMessage(jsonOrEmptyObject(metadataRaw)),
+		   size = EXCLUDED.size,
-		CreatedAt:   now,
+		   error = EXCLUDED.error,
-	})
+		   log = EXCLUDED.log,
+		   metadata = EXCLUDED.metadata,
+		   updated_at = EXCLUDED.updated_at`,
+		status.ID,
+		nullIfEmptyString(status.ProjectID),
+		nullIfEmptyString(status.ServiceID),
+		status.Status,
+		status.Progress,
+		status.StartedAt,
+		status.CompletedAt,
+		status.ImageName,
+		status.ImageTag,
+		status.Size,
+		nullIfEmptyString(status.Error),
+		status.Log,
+		jsonOrEmptyObject(metadataRaw),
+		now,
+	)
 	if err != nil && h.isMissingBuildsTable(err) {
 		return nil
 	}
@@ -697,37 +713,18 @@ func (h *BuildHandler) getBuildFromDB(buildID string) (BuildStatusResponse, bool
 		return BuildStatusResponse{}, false, nil
 	}
 
-	row, err := sqlcdb.New(h.db.DB).GetBuild(context.Background(), buildID)
+	row := h.db.QueryRow(
-	if err != nil {
+		`SELECT id, project_id, service_id, status, progress, started_at, completed_at, image_name, image_tag, size, error, log, metadata
-		if errors.Is(err, sql.ErrNoRows) || h.isMissingBuildsTable(err) {
+		 FROM builds
+		 WHERE id = $1`,
+		buildID,
+	)
+
+	build, found, err := scanBuildRow(row.Scan)
+	if err != nil && h.isMissingBuildsTable(err) {
 		return BuildStatusResponse{}, false, nil
 	}
-		return BuildStatusResponse{}, false, err
+	return build, found, err
-	}
-	build := BuildStatusResponse{
-		ID:        row.ID,
-		ProjectID: row.ProjectID.String,
-		ServiceID: row.ServiceID.String,
-		Status:    row.Status,
-		Progress:  int(row.Progress),
-		StartedAt: row.StartedAt.UTC(),
-		ImageName: row.ImageName,
-		ImageTag:  row.ImageTag,
-		Size:      row.Size,
-		Error:     row.Error.String,
-		Log:       row.Log,
-	}
-	if t := timePtrNT(row.CompletedAt); t != nil {
-		u := t.UTC()
-		build.CompletedAt = &u
-	}
-	if len(row.Metadata) > 0 {
-		metadata := map[string]string{}
-		if err := json.Unmarshal(row.Metadata, &metadata); err == nil {
-			build.Metadata = metadata
-		}
-	}
-	return build, true, nil
 }
 
 func (h *BuildHandler) listBuildsFromDB(projectID, serviceID, status string, page, limit int) ([]BuildStatusResponse, int, error) {
@@ -811,11 +808,19 @@ func (h *BuildHandler) cancelBuildInDB(buildID string) bool {
 		return false
 	}
 	now := time.Now().UTC()
-	affected, err := sqlcdb.New(h.db.DB).CancelBuild(context.Background(), sqlcdb.CancelBuildParams{
+	result, err := h.db.Exec(
-		CompletedAt: sql.NullTime{Time: now, Valid: true},
+		`UPDATE builds
-		Log:         h.formatLogLine("Cancellation requested") + "\n",
+		 SET status = 'cancelled',
-		ID:          buildID,
+		     progress = 100,
-	})
+		     completed_at = $1,
+		     log = COALESCE(log, '') || $2,
+		     updated_at = $1
+		 WHERE id = $3
+		   AND status NOT IN ('success', 'failed', 'cancelled')`,
+		now,
+		h.formatLogLine("Cancellation requested")+"\n",
+		buildID,
+	)
 	if err != nil {
 		if h.isMissingBuildsTable(err) {
 			return false
@@ -823,7 +828,9 @@ func (h *BuildHandler) cancelBuildInDB(buildID string) bool {
 		log.Printf("failed to cancel build %s in database: %v", buildID, err)
 		return false
 	}
-	if affected == 0 {
+
+	affected, err := result.RowsAffected()
+	if err != nil || affected == 0 {
 		return false
 	}
 
@@ -902,9 +909,12 @@ func scanBuildRow(scan func(dest ...interface{}) error) (BuildStatusResponse, bo
 	return parsed, true, nil
 }
 
-func nsNullIfEmpty(value string) sql.NullString {
+func nullIfEmptyString(value string) interface{} {
 	trimmed := strings.TrimSpace(value)
-	return sql.NullString{String: trimmed, Valid: trimmed != ""}
+	if trimmed == "" {
+		return nil
+	}
+	return trimmed
 }
 
 func jsonOrEmptyObject(raw []byte) string {

app/backend/internal/api/context_user.go

@@ -1,11 +1,9 @@
 package api
 
 import (
-	"context"
 	"net/http"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
@@ -59,12 +57,15 @@ func contextIsAdmin(c *gin.Context) bool {
 // public; unapproved ones are visible to the owner, project members, and
 // platform admins only.
 func projectReadAccess(c *gin.Context, db *database.DB, projectID uuid.UUID) (bool, bool) {
-	q := sqlcdb.New(db.DB)
+	var isApproved bool
-	row, err := q.GetProjectReadAccess(context.Background(), projectID)
+	var ownerID string
+	err := db.QueryRow(
+		`SELECT is_approved, owner_id::text FROM projects WHERE id = $1`,
+		projectID,
+	).Scan(&isApproved, &ownerID)
 	if err != nil {
 		return false, false
 	}
-	isApproved, ownerID := row.IsApproved, row.OwnerID
 	if isApproved || contextIsAdmin(c) {
 		return true, true
 	}
@@ -75,11 +76,11 @@ func projectReadAccess(c *gin.Context, db *database.DB, projectID uuid.UUID) (bo
 	if ownerID == userID {
 		return true, true
 	}
-	userUUID, _ := uuid.Parse(userID)
+	var member bool
-	if member, err := q.ProjectMemberExists(context.Background(), sqlcdb.ProjectMemberExistsParams{
+	if err := db.QueryRow(
-		ProjectID: projectID,
+		`SELECT EXISTS(SELECT 1 FROM project_members WHERE project_id = $1 AND user_id = $2)`,
-		UserID:    userUUID,
+		projectID, userID,
-	}); err == nil && member {
+	).Scan(&member); err == nil && member {
 		return true, true
 	}
 	return true, false
@@ -90,8 +91,11 @@ func projectReadAccess(c *gin.Context, db *database.DB, projectID uuid.UUID) (bo
 // project members, and platform admins may reach secret-adjacent data
 // such as variables and runtime logs.
 func projectManageAccess(c *gin.Context, db *database.DB, projectID uuid.UUID) (bool, bool) {
-	q := sqlcdb.New(db.DB)
+	var ownerID string
-	ownerID, err := q.GetProjectOwnerText(context.Background(), projectID)
+	err := db.QueryRow(
+		`SELECT owner_id::text FROM projects WHERE id = $1`,
+		projectID,
+	).Scan(&ownerID)
 	if err != nil {
 		return false, false
 	}
@@ -105,11 +109,11 @@ func projectManageAccess(c *gin.Context, db *database.DB, projectID uuid.UUID) (
 	if ownerID == userID {
 		return true, true
 	}
-	userUUID, _ := uuid.Parse(userID)
+	var member bool
-	if member, err := q.ProjectMemberExists(context.Background(), sqlcdb.ProjectMemberExistsParams{
+	if err := db.QueryRow(
-		ProjectID: projectID,
+		`SELECT EXISTS(SELECT 1 FROM project_members WHERE project_id = $1 AND user_id = $2)`,
-		UserID:    userUUID,
+		projectID, userID,
-	}); err == nil && member {
+	).Scan(&member); err == nil && member {
 		return true, true
 	}
 	return true, false
@@ -117,7 +121,8 @@ func projectManageAccess(c *gin.Context, db *database.DB, projectID uuid.UUID) (
 
 // serviceProjectID resolves the project that owns a service.
 func serviceProjectID(db *database.DB, serviceID uuid.UUID) (uuid.UUID, bool) {
-	projectID, err := sqlcdb.New(db.DB).GetServiceProjectID(context.Background(), serviceID)
+	var projectID uuid.UUID
+	err := db.QueryRow(`SELECT project_id FROM services WHERE id = $1`, serviceID).Scan(&projectID)
 	if err != nil {
 		return uuid.Nil, false
 	}

app/backend/internal/api/environments.go

@@ -116,7 +116,7 @@ func handleDeleteEnvironment(c *gin.Context) {
 		return
 	}
 	var projectID uuid.UUID
-	if projectID, err = sqlcdb.New(db.DB).GetEnvironmentProjectID(context.Background(), envID); err != nil {
+	if err := db.QueryRow(`SELECT project_id FROM environments WHERE id = $1`, envID).Scan(&projectID); err != nil {
 		respondError(c, http.StatusNotFound, "NOT_FOUND", "Environment not found")
 		return
 	}

app/backend/internal/api/gateway_proxy.go

@@ -17,11 +17,9 @@ import (
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/gateway"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -109,28 +107,23 @@ func extractGatewayKey(c *gin.Context) string {
 
 // lookupGatewayService resolves the slug to an enabled service row.
 func lookupGatewayService(ctx context.Context, db *database.DB, slug string) (*gatewayService, error) {
-	r, err := sqlcdb.New(db.DB).GetAPServiceBySlug(ctx, slug)
+	var s gatewayService
+	var enabled int
+	err := db.QueryRowContext(ctx, `
+		SELECT id, upstream_url, route_prefix, upstream_auth_header,
+		       upstream_auth_value, enabled, rpm_limit, monthly_quota,
+		       request_timeout_ms
+		FROM api_services WHERE slug = $1
+	`, slug).Scan(&s.ID, &s.UpstreamURL, &s.RoutePrefix,
+		&s.UpstreamAuthHeader, &s.UpstreamAuthValue, &enabled,
+		&s.RPMLimit, &s.MonthlyQuota, &s.RequestTimeoutMS)
 	if err != nil {
 		return nil, err
 	}
-	s := gatewayService{
+	s.Enabled = enabled != 0
-		ID:                 r.ID.String(),
-		UpstreamURL:        r.UpstreamUrl,
-		RoutePrefix:        r.RoutePrefix,
-		UpstreamAuthHeader: r.UpstreamAuthHeader,
-		UpstreamAuthValue:  r.UpstreamAuthValue,
-		Enabled:            r.Enabled != 0,
-		RPMLimit:           nullInt32To64(r.RpmLimit),
-		MonthlyQuota:       nullInt32To64(r.MonthlyQuota),
-		RequestTimeoutMS:   int(r.RequestTimeoutMs.Int32),
-	}
 	return &s, nil
 }
 
-func nullInt32To64(v sql.NullInt32) sql.NullInt64 {
-	return sql.NullInt64{Int64: int64(v.Int32), Valid: v.Valid}
-}
-
 // authenticateGatewayKey resolves a presented key by its indexed prefix and
 // bcrypt-verifies candidates. Returns nil when nothing matches.
 func authenticateGatewayKey(ctx context.Context, db *database.DB, presented string) (*gatewayKey, error) {
@@ -138,24 +131,26 @@ func authenticateGatewayKey(ctx context.Context, db *database.DB, presented stri
 	if len(prefix) > 8 {
 		prefix = prefix[:8]
 	}
-	rows, err := sqlcdb.New(db.DB).ListAPKeysByPrefix(ctx, prefix)
+	rows, err := db.QueryContext(ctx, `
+		SELECT id, key_hash, enabled, rpm_limit, monthly_quota, allowed_service_ids
+		FROM api_keys WHERE key_prefix = $1
+	`, prefix)
 	if err != nil {
 		return nil, err
 	}
-	for _, r := range rows {
+	defer rows.Close()
-		k := gatewayKey{
+	for rows.Next() {
-			ID:                r.ID.String(),
+		var k gatewayKey
-			Hash:              r.KeyHash,
+		var enabled int
-			Enabled:           r.Enabled != 0,
+		if err := rows.Scan(&k.ID, &k.Hash, &enabled, &k.RPMLimit, &k.MonthlyQuota, &k.AllowedServiceIDs); err != nil {
-			RPMLimit:          nullInt32To64(r.RpmLimit),
+			return nil, err
-			MonthlyQuota:      nullInt32To64(r.MonthlyQuota),
-			AllowedServiceIDs: r.AllowedServiceIds,
 		}
+		k.Enabled = enabled != 0
 		if bcrypt.CompareHashAndPassword([]byte(k.Hash), []byte(presented)) == nil {
 			return &k, nil
 		}
 	}
-	return nil, nil
+	return nil, rows.Err()
 }
 
 // keyAllowsService applies the allowed_service_ids JSON allowlist. An empty
@@ -173,56 +168,48 @@ func keyAllowsService(k *gatewayKey, serviceID string) bool {
 	return false
 }
 
-// monthlyKeyUsage / monthlyServiceUsage sum a counter dimension for the
+// monthlyUsage sums a counter dimension for the current calendar month.
-// current calendar month.
+func monthlyUsage(ctx context.Context, db *database.DB, column, id, period string) (int, error) {
-func monthlyKeyUsage(ctx context.Context, db *database.DB, id, period string) (int64, error) {
+	var total int
-	keyUUID, _ := uuid.Parse(id)
+	err := db.QueryRowContext(ctx, `
-	return sqlcdb.New(db.DB).SumUsageByKey(ctx, sqlcdb.SumUsageByKeyParams{
+		SELECT COALESCE(SUM(request_count), 0) FROM usage_counters
-		ApiKeyID: keyUUID, PeriodMonth: period,
+		WHERE `+column+` = $1 AND period_month = $2
-	})
+	`, id, period).Scan(&total)
-}
+	return total, err
-
-func monthlyServiceUsage(ctx context.Context, db *database.DB, id, period string) (int64, error) {
-	svcUUID, _ := uuid.Parse(id)
-	return sqlcdb.New(db.DB).SumUsageByService(ctx, sqlcdb.SumUsageByServiceParams{
-		ServiceID: svcUUID, PeriodMonth: period,
-	})
 }
 
 // recordGatewayRequest persists usage, metrics, and failure incidents for a
 // proxied call. Runs in the request path but is three small writes.
 func recordGatewayRequest(ctx context.Context, db *database.DB, svc *gatewayService, k *gatewayKey, status int, period string) {
-	q := sqlcdb.New(db.DB)
+	_, _ = db.ExecContext(ctx, `
-	keyUUID, _ := uuid.Parse(k.ID)
+		INSERT INTO usage_counters (api_key_id, service_id, period_month, request_count, updated_at)
-	svcUUID, _ := uuid.Parse(svc.ID)
+		VALUES ($1, $2, $3, 1, NOW())
-	_ = q.UpsertUsageCounter(ctx, sqlcdb.UpsertUsageCounterParams{
+		ON CONFLICT (api_key_id, service_id, period_month)
-		ApiKeyID: keyUUID, ServiceID: svcUUID, PeriodMonth: period,
+		DO UPDATE SET request_count = usage_counters.request_count + 1, updated_at = NOW()
-	})
+	`, k.ID, svc.ID, period)
-	_ = q.TouchAPKeyLastUsed(ctx, keyUUID)
+	_, _ = db.ExecContext(ctx, `
+		UPDATE api_keys SET last_used_at = NOW() WHERE id = $1
+	`, k.ID)
 	labels, _ := json.Marshal(map[string]interface{}{
 		"service_id": svc.ID,
 		"key_id":     k.ID,
 		"status":     status,
 	})
-	_ = q.InsertMetricPoint(ctx, sql.NullString{String: string(labels), Valid: true})
+	_, _ = db.ExecContext(ctx, `
+		INSERT INTO metrics_timeseries (metric, value, labels_json, occurred_at)
+		VALUES ('gateway_request', 1, $1, NOW())
+	`, string(labels))
 }
 
 func recordGatewayIncident(ctx context.Context, db *database.DB, svcID string, keyID *string, code, msg, severity string, status int) {
-	var kid uuid.NullUUID
+	var kid interface{}
 	if keyID != nil {
-		if u, err := uuid.Parse(*keyID); err == nil {
+		kid = *keyID
-			kid = uuid.NullUUID{UUID: u, Valid: true}
 	}
-	}
+	_, _ = db.ExecContext(ctx, `
-	svcUUID, _ := uuid.Parse(svcID)
+		INSERT INTO incident_events (service_id, api_key_id, code, message, severity, http_status, occurred_at)
-	_ = sqlcdb.New(db.DB).InsertGatewayIncident(ctx, sqlcdb.InsertGatewayIncidentParams{
+		VALUES ($1, $2, $3, $4, $5, $6, NOW())
-		ServiceID:  uuid.NullUUID{UUID: svcUUID, Valid: svcUUID != uuid.Nil},
+	`, svcID, kid, code, msg, severity, status)
-		ApiKeyID:   kid,
-		Code:       code,
-		Message:    msg,
-		Severity:   severity,
-		HttpStatus: sql.NullInt32{Int32: int32(status), Valid: true},
-	})
 }
 
 // handleGatewayProxy is mounted at /g/:slug and /g/:slug/*path on the root
@@ -280,13 +267,13 @@ func handleGatewayProxy(c *gin.Context) {
 
 	period := now.Format("2006-01")
 	if key.MonthlyQuota.Valid && key.MonthlyQuota.Int64 > 0 {
-		if used, err := monthlyKeyUsage(ctx, db, key.ID, period); err == nil && used >= key.MonthlyQuota.Int64 {
+		if used, err := monthlyUsage(ctx, db, "api_key_id", key.ID, period); err == nil && int64(used) >= key.MonthlyQuota.Int64 {
 			respondError(c, http.StatusTooManyRequests, "QUOTA_EXCEEDED", "Monthly request quota exceeded")
 			return
 		}
 	}
 	if svc.MonthlyQuota.Valid && svc.MonthlyQuota.Int64 > 0 {
-		if used, err := monthlyServiceUsage(ctx, db, svc.ID, period); err == nil && used >= svc.MonthlyQuota.Int64 {
+		if used, err := monthlyUsage(ctx, db, "service_id", svc.ID, period); err == nil && int64(used) >= svc.MonthlyQuota.Int64 {
 			respondError(c, http.StatusTooManyRequests, "QUOTA_EXCEEDED", "Service monthly quota exceeded")
 			return
 		}

app/backend/internal/api/gitcreds.go

@@ -1,16 +1,12 @@
 package api
 
 import (
-	"context"
 	"fmt"
 	"strconv"
 	"strings"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/source"
-
-	"github.com/google/uuid"
 )
 
 // resolveGitCloneSpec turns a service's git_repo (clone URL, ssh remote, or
@@ -26,31 +22,26 @@ func resolveGitCloneSpec(db *database.DB, ownerID, gitRepo, branch, commit, buil
 	}
 
 	spec := source.Spec{Branch: branch, Commit: commit, BuildPath: buildPath}
-	q := sqlcdb.New(db.DB)
-	ctx := context.Background()
 
-	ownerUUID, _ := uuid.Parse(ownerID)
+	var providerID string
-	var providerID uuid.UUID
 	if !strings.Contains(cloneURL, "://") {
 		// Bare owner/repo — the connected repository row knows the host.
-		row, err := q.GetGitRepoCloneByFullName(ctx, sqlcdb.GetGitRepoCloneByFullNameParams{
+		err = db.QueryRow(
-			FullName: cloneURL,
+			`SELECT clone_url, provider_id FROM git_repositories
-			UserID:   ownerUUID,
+			 WHERE full_name = $1 AND user_id = $2 LIMIT 1`,
-		})
+			cloneURL, ownerID,
+		).Scan(&cloneURL, &providerID)
 		if err != nil {
 			return source.Spec{}, fmt.Errorf("repository %s is not connected — connect it under Git settings or store a clone URL", raw)
 		}
-		cloneURL = row.CloneUrl
-		providerID = row.ProviderID
 	} else {
 		// URL form — match a connected repo for its provider when possible;
 		// an unmatched public URL still clones, just without credentials.
-		if pid, err := q.GetGitRepoProviderByCloneURL(ctx, sqlcdb.GetGitRepoProviderByCloneURLParams{
+		_ = db.QueryRow(
-			CloneUrl: cloneURL,
+			`SELECT provider_id FROM git_repositories
-			UserID:   ownerUUID,
+			 WHERE clone_url = $1 AND user_id = $2 LIMIT 1`,
-		}); err == nil {
+			cloneURL, ownerID,
-			providerID = pid
+		).Scan(&providerID)
-		}
 	}
 
 	if err := source.ValidateRemoteURL(cloneURL); err != nil {
@@ -58,17 +49,17 @@ func resolveGitCloneSpec(db *database.DB, ownerID, gitRepo, branch, commit, buil
 	}
 	spec.CloneURL = cloneURL
 
-	if providerID == uuid.Nil {
+	if providerID == "" {
 		return spec, nil
 	}
-	prov, err := q.GetGitProviderForFetch(ctx, sqlcdb.GetGitProviderForFetchParams{
+	var name, apiURL, token string
-		ID:     providerID,
+	if err := db.QueryRow(
-		UserID: ownerUUID,
+		`SELECT name, api_url, access_token FROM git_providers
-	})
+		 WHERE id = $1 AND user_id = $2`,
-	if err != nil {
+		providerID, ownerID,
+	).Scan(&name, &apiURL, &token); err != nil {
 		return spec, nil // provider row gone — anonymous clone still works for public repos
 	}
-	name, apiURL, token := prov.Name, prov.ApiUrl, prov.AccessToken
 
 	switch strings.ToLower(name) {
 	case "github_app":

app/backend/internal/api/github_app.go

@@ -15,7 +15,6 @@ import (
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/deployment"
 
 	"github.com/gin-gonic/gin"
@@ -207,8 +206,9 @@ func handleAdminGitHubAppConvert(c *gin.Context) {
 // GET /admin/git/github-app — provisioning status for the settings UI.
 func handleAdminGetGitHubApp(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
+	var stored string
 	source := "none"
-	if v, err := sqlcdb.New(db.DB).GetAppSetting(c.Request.Context(), settingGitHubAppID); err == nil && strings.TrimSpace(v) != "" {
+	if err := db.QueryRow(`SELECT value FROM app_settings WHERE key = $1`, settingGitHubAppID).Scan(&stored); err == nil && strings.TrimSpace(stored) != "" {
 		source = "settings"
 	} else if strings.TrimSpace(os.Getenv("GITHUB_APP_ID")) != "" {
 		source = "env"

app/backend/internal/api/invites.go

@@ -193,8 +193,8 @@ func handleAcceptInvite(c *gin.Context) {
 		return
 	}
 
-	existing, err := q.CountUsersByEmail(c.Request.Context(), req.Email)
+	var existing int
-	if err != nil {
+	if err := db.QueryRow(`SELECT COUNT(*) FROM users WHERE email = $1`, req.Email).Scan(&existing); err != nil {
 		respondError(c, http.StatusInternalServerError, "INTERNAL", "database error")
 		return
 	}
@@ -214,23 +214,17 @@ func handleAcceptInvite(c *gin.Context) {
 		return
 	}
 
-	row, err := q.InsertUser(c.Request.Context(), sqlcdb.InsertUserParams{
+	var user User
-		Email:        req.Email,
+	err = db.QueryRow(`
-		PasswordHash: string(hashedPassword),
+		INSERT INTO users (email, password_hash, name)
-		Name:         strings.TrimSpace(req.Name),
+		VALUES ($1, $2, $3)
-	})
+		RETURNING id, email, name, COALESCE(avatar_url, ''), is_admin, created_at
+	`, req.Email, string(hashedPassword), strings.TrimSpace(req.Name)).
+		Scan(&user.ID, &user.Email, &user.Name, &user.AvatarURL, &user.IsAdmin, &user.CreatedAt)
 	if err != nil {
 		respondError(c, http.StatusConflict, "CONFLICT", "user already exists")
 		return
 	}
-	user := User{
-		ID:        row.ID.String(),
-		Email:     row.Email,
-		Name:      row.Name,
-		AvatarURL: row.AvatarUrl,
-		IsAdmin:   row.IsAdmin,
-		CreatedAt: row.CreatedAt.Time.String(),
-	}
 
 	userUUID, _ := uuid.Parse(user.ID)
 	if err := q.MarkUserInviteUsed(c.Request.Context(), sqlcdb.MarkUserInviteUsedParams{

app/backend/internal/api/metrics.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/docker"
 
 	containertypes "github.com/docker/docker/api/types/container"
@@ -61,12 +60,17 @@ func handleGetServiceMetrics(c *gin.Context) {
 		return
 	}
 
-	svc, err := sqlcdb.New(db.DB).GetServiceProjectAndStatus(context.Background(), serviceID)
+	var projectID uuid.UUID
+	var status string
+	err = db.QueryRow(
+		`SELECT s.project_id, COALESCE(s.status, '')
+		 FROM services s WHERE s.id = $1`,
+		serviceID,
+	).Scan(&projectID, &status)
 	if err != nil {
 		c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
 		return
 	}
-	projectID := svc.ProjectID
 	if _, allowed := projectReadAccess(c, db, projectID); !allowed {
 		c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
 		return

app/backend/internal/api/noderunner.go

@@ -315,9 +315,10 @@ func (r *agentNodeRunner) replicaPayload(spec deployment.RuntimeSpec, agentID st
 // pullCredentials resolves the project owner's registry auth for the image
 // host so private images pull on remote nodes. Empty map → anonymous pull.
 func (r *agentNodeRunner) pullCredentials(projectID, imageRef string) map[string]interface{} {
-	pid, _ := uuid.Parse(projectID)
+	var ownerID string
-	ownerID, err := sqlcdb.New(r.db.DB).GetProjectOwnerText(context.Background(), pid)
+	if err := r.db.QueryRow(
-	if err != nil {
+		`SELECT owner_id FROM projects WHERE id = $1`, projectID,
+	).Scan(&ownerID); err != nil {
 		return map[string]interface{}{}
 	}
 	auth := registryAuthFor(r.db, ownerID, imageRef)

app/backend/internal/api/notification_producers.go

@@ -9,7 +9,6 @@ import (
 	"containr/internal/database"
 	"containr/internal/database/sqlcdb"
 	"context"
-	"database/sql"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -30,13 +29,15 @@ func notifyAdmins(db *database.DB, kind, title, body, resourceType, resourceID s
 	if db == nil {
 		return
 	}
-	adminIDs, err := sqlcdb.New(db.DB).ListAdminUserIDs(context.Background())
+	rows, err := db.Query(`SELECT id FROM users WHERE is_admin`)
 	if err != nil {
 		log.Printf("containr: notify admins lookup failed: %v", err)
 		return
 	}
-	for _, id := range adminIDs {
+	defer rows.Close()
-		{
+	for rows.Next() {
+		var id uuid.UUID
+		if err := rows.Scan(&id); err == nil {
 			insertUserNotification(db, id.String(), kind, title, body, resourceType, resourceID)
 		}
 	}
@@ -72,32 +73,34 @@ type agentHealthRow struct {
 func reconcileAgentHealth(db *database.DB, staleAfter time.Duration) {
 	cutoff := time.Now().Add(-staleAfter)
 	var agents []agentHealthRow
-	q := sqlcdb.New(db.DB)
+	rows, err := db.Query(
-	agentRows, err := q.ListAgentHealthRows(context.Background(), sql.NullTime{Time: cutoff, Valid: true})
+		`SELECT id, COALESCE(name, hostname, id::text), COALESCE(status, ''),
+		        COALESCE(last_heartbeat < $1, TRUE), auto_prune
+		 FROM node_agents`, cutoff)
 	if err != nil {
 		log.Printf("containr: agent health sweep: %v", err)
 		return
 	}
-	for _, r := range agentRows {
+	for rows.Next() {
-		agents = append(agents, agentHealthRow{
+		var a agentHealthRow
-			id: r.ID, name: r.Name, status: r.Status, stale: r.Stale, autoPrune: r.AutoPrune,
+		if err := rows.Scan(&a.id, &a.name, &a.status, &a.stale, &a.autoPrune); err == nil {
-		})
+			agents = append(agents, a)
 		}
+	}
+	rows.Close()
 
 	for _, a := range agents {
 		switch {
 		case a.stale && a.status != "offline":
-			if err := q.SetAgentStatus(context.Background(), sqlcdb.SetAgentStatusParams{
+			if _, err := db.Exec(
-				Status: sql.NullString{String: "offline", Valid: true}, ID: a.id,
+				`UPDATE node_agents SET status = 'offline', updated_at = NOW() WHERE id = $1`, a.id); err != nil {
-			}); err != nil {
 				continue
 			}
 			notifyAdmins(db, "agent", "Node agent offline",
 				fmt.Sprintf("Agent %s missed its heartbeat for over %s.", a.name, staleAfter), "agent", a.id)
 		case !a.stale && a.status == "offline":
-			if err := q.SetAgentStatus(context.Background(), sqlcdb.SetAgentStatusParams{
+			if _, err := db.Exec(
-				Status: sql.NullString{String: "online", Valid: true}, ID: a.id,
+				`UPDATE node_agents SET status = 'online', updated_at = NOW() WHERE id = $1`, a.id); err != nil {
-			}); err != nil {
 				continue
 			}
 			notifyAdmins(db, "agent", "Node agent back online",
@@ -183,17 +186,17 @@ func checkForUpgrade(db *database.DB, currentVersion string) {
 		return
 	}
 
-	lastNotified, _ := sqlcdb.New(db.DB).GetAppSetting(context.Background(), "upgrade_notified_tag")
+	var lastNotified string
+	_ = db.QueryRow(`SELECT value FROM app_settings WHERE key = 'upgrade_notified_tag'`).Scan(&lastNotified)
 	if lastNotified == release.TagName {
 		return
 	}
 	notifyAdmins(db, "upgrade", "Containr update available",
 		fmt.Sprintf("Release %s is available (running %s). %s", release.TagName, currentVersion, release.HTMLURL),
 		"release", release.TagName)
-	_ = sqlcdb.New(db.DB).UpsertAppSettingValue(context.Background(), sqlcdb.UpsertAppSettingValueParams{
+	_, _ = db.Exec(
-		Key:   "upgrade_notified_tag",
+		`INSERT INTO app_settings (key, value, updated_at) VALUES ('upgrade_notified_tag', $1, NOW())
-		Value: release.TagName,
+		 ON CONFLICT (key) DO UPDATE SET value = $1, updated_at = NOW()`, release.TagName)
-	})
 }
 
 // semverNewer reports whether candidate is a higher semver than current.

app/backend/internal/api/operations.go

@@ -1,16 +1,13 @@
 package api
 
 import (
-	"context"
 	"net/http"
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/deployqueue"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 // GET /operations — a single cross-cutting view of platform work: active
@@ -58,59 +55,91 @@ func handleGetOperations(c *gin.Context) {
 	db := c.MustGet("db").(*database.DB)
 	isAdmin := contextIsAdmin(c)
 
-	userUUID, _ := uuid.Parse(userID)
+	// Same visibility rule as the deployment list endpoint.
-	q := sqlcdb.New(db.DB)
+	visibility := `p.is_approved OR p.owner_id = $1 OR $2::bool
-	visibility := sqlcdb.ListActiveOperationDeploymentsParams{OwnerID: userUUID, Column2: isAdmin}
+	    OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $1)`
 
 	active := []operationDeployment{}
-	if rows, err := q.ListActiveOperationDeployments(context.Background(), visibility); err == nil {
+	rows, err := db.Query(
-		for _, r := range rows {
+		`SELECT d.id, d.service_id, s.name, p.name, d.status,
-			active = append(active, operationDeployment{
+		        COALESCE(d.image_name, ''), d.error, d.started_at, d.completed_at, d.created_at
-				ID: r.ID.String(), ServiceID: r.ServiceID.String(), ServiceName: r.ServiceName,
+		 FROM deployments d
-				ProjectName: r.ProjectName, Status: r.Status.String, Image: r.Image,
+		 JOIN services s ON s.id = d.service_id
-				Error: strPtrNS(r.Error), StartedAt: timePtrNT(r.StartedAt),
+		 JOIN projects p ON p.id = s.project_id
-				CompletedAt: timePtrNT(r.CompletedAt), CreatedAt: r.CreatedAt.Time,
+		 WHERE d.status IN ('queued','pending','building','deploying','rolling_back')
-			})
+		   AND (`+visibility+`)
+		 ORDER BY d.created_at ASC`, userID, isAdmin)
+	if err == nil {
+		defer rows.Close()
+		for rows.Next() {
+			var d operationDeployment
+			var sid string
+			_ = rows.Scan(&d.ID, &sid, &d.ServiceName, &d.ProjectName, &d.Status, &d.Image, &d.Error, &d.StartedAt, &d.CompletedAt, &d.CreatedAt)
+			d.ServiceID = sid
+			active = append(active, d)
 		}
 	}
 
 	recentFailed := []operationDeployment{}
-	if rows, err := q.ListRecentFailedDeployments(context.Background(), sqlcdb.ListRecentFailedDeploymentsParams{
+	rows2, err2 := db.Query(
-		OwnerID: userUUID, Column2: isAdmin,
+		`SELECT d.id, d.service_id, s.name, p.name, d.status,
-	}); err == nil {
+		        COALESCE(d.image_name, ''), d.error, d.started_at, d.completed_at, d.created_at
-		for _, r := range rows {
+		 FROM deployments d
-			recentFailed = append(recentFailed, operationDeployment{
+		 JOIN services s ON s.id = d.service_id
-				ID: r.ID.String(), ServiceID: r.ServiceID.String(), ServiceName: r.ServiceName,
+		 JOIN projects p ON p.id = s.project_id
-				ProjectName: r.ProjectName, Status: r.Status.String, Image: r.Image,
+		 WHERE d.status IN ('failed','cancelled','rolled_back')
-				Error: strPtrNS(r.Error), StartedAt: timePtrNT(r.StartedAt),
+		   AND d.updated_at > NOW() - INTERVAL '24 hours'
-				CompletedAt: timePtrNT(r.CompletedAt), CreatedAt: r.CreatedAt.Time,
+		   AND (`+visibility+`)
-			})
+		 ORDER BY d.updated_at DESC
+		 LIMIT 20`, userID, isAdmin)
+	if err2 == nil {
+		defer rows2.Close()
+		for rows2.Next() {
+			var d operationDeployment
+			var sid string
+			_ = rows2.Scan(&d.ID, &sid, &d.ServiceName, &d.ProjectName, &d.Status, &d.Image, &d.Error, &d.StartedAt, &d.CompletedAt, &d.CreatedAt)
+			d.ServiceID = sid
+			recentFailed = append(recentFailed, d)
 		}
 	}
 
 	cronRuns := []operationCronRun{}
-	if rows, err := q.ListRecentCronRuns(context.Background(), sqlcdb.ListRecentCronRunsParams{
+	rows3, err3 := db.Query(
-		OwnerID: userUUID, Column2: isAdmin,
+		`SELECT e.id, j.name, j.schedule, e.status, e.started_at, e.finished_at, e.error
-	}); err == nil {
+		 FROM cron_executions e
-		for _, r := range rows {
+		 JOIN cron_jobs j ON j.id = e.cron_job_id
-			cronRuns = append(cronRuns, operationCronRun{
+		 JOIN projects p ON p.id = j.project_id
-				ID: r.ID.String(), JobName: r.JobName, Schedule: r.Schedule, Status: r.Status.String,
+		 WHERE e.started_at > NOW() - INTERVAL '24 hours'
-				StartedAt: r.StartedAt, FinishedAt: timePtrNT(r.FinishedAt), Error: strPtrNS(r.Error),
+		   AND (`+visibility+`)
-			})
+		 ORDER BY e.started_at DESC
+		 LIMIT 30`, userID, isAdmin)
+	if err3 == nil {
+		defer rows3.Close()
+		for rows3.Next() {
+			var r operationCronRun
+			_ = rows3.Scan(&r.ID, &r.JobName, &r.Schedule, &r.Status, &r.StartedAt, &r.FinishedAt, &r.Error)
+			cronRuns = append(cronRuns, r)
 		}
 	}
 
 	backups := []operationBackup{}
-	if rows, err := q.ListRecentOperationBackups(context.Background(), sqlcdb.ListRecentOperationBackupsParams{
+	rows4, err4 := db.Query(
-		UserID: userID, Column2: isAdmin,
+		`SELECT b.id, b.database_id, ds.name, b.status, b.size, b.created_at, b.completed_at
-	}); err == nil {
+		 FROM database_backups b
-		for _, r := range rows {
+		 JOIN database_services ds ON ds.id = b.database_id
-			backups = append(backups, operationBackup{
+		 WHERE b.created_at > NOW() - INTERVAL '24 hours'
-				ID: r.ID, DatabaseID: r.DatabaseID, DBName: r.DbName, Status: r.Status,
+		   AND (ds.user_id = $1 OR $2::bool)
-				Size: r.Size, CreatedAt: r.CreatedAt.Time, Completed: timePtrNT(r.CompletedAt),
+		 ORDER BY b.created_at DESC
-			})
+		 LIMIT 20`, userID, isAdmin)
+	if err4 == nil {
+		defer rows4.Close()
+		for rows4.Next() {
+			var b operationBackup
+			_ = rows4.Scan(&b.ID, &b.DatabaseID, &b.DBName, &b.Status, &b.Size, &b.CreatedAt, &b.Completed)
+			backups = append(backups, b)
 		}
 	}
+
 	var queue []deployqueue.ServiceQueueState
 	if queueValue, exists := c.Get("deploy_queue"); exists && queueValue != nil {
 		queue = queueValue.(*deployqueue.Queue).Snapshot()

app/backend/internal/api/projectvars.go

@@ -1,12 +1,10 @@
 package api
 
 import (
-	"context"
 	"net/http"
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/secrets"
 
 	"github.com/gin-gonic/gin"
@@ -114,8 +112,7 @@ func handleUpdateProjectVariables(c *gin.Context) {
 	}
 	defer tx.Rollback()
 
-	txq := sqlcdb.New(tx)
+	if _, err = tx.Exec(`DELETE FROM project_variables WHERE project_id = $1`, projectID); err != nil {
-	if err = txq.DeleteProjectVariables(c.Request.Context(), projectID); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to clear existing variables"})
 		return
 	}
@@ -130,15 +127,11 @@ func handleUpdateProjectVariables(c *gin.Context) {
 		if v.IsSecret {
 			value = secrets.Encrypt(value)
 		}
-		if err = txq.InsertProjectVariable(c.Request.Context(), sqlcdb.InsertProjectVariableParams{
+		if _, err = tx.Exec(
-			ID:        uuid.New(),
+			`INSERT INTO project_variables (id, project_id, key, value, is_secret, created_at, updated_at)
-			ProjectID: projectID,
+			 VALUES ($1, $2, $3, $4, $5, $6, $7)`,
-			Key:       v.Key,
+			uuid.New(), projectID, v.Key, value, v.IsSecret, now, now,
-			Value:     value,
+		); err != nil {
-			IsSecret:  v.IsSecret,
-			CreatedAt: now,
-			UpdatedAt: now,
-		}); err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to insert variable: " + v.Key})
 			return
 		}
@@ -175,10 +168,11 @@ func handleUpdateProjectVariables(c *gin.Context) {
 
 // resolveSharedVar returns the decrypted value of a project variable.
 func resolveSharedVar(db *database.DB, projectID uuid.UUID, key string) (string, bool) {
-	value, err := sqlcdb.New(db.DB).GetProjectVariableValue(context.Background(), sqlcdb.GetProjectVariableValueParams{
+	var value string
-		ProjectID: projectID,
+	err := db.QueryRow(
-		Key:       key,
+		`SELECT value FROM project_variables WHERE project_id = $1 AND key = $2`,
-	})
+		projectID, key,
+	).Scan(&value)
 	if err != nil {
 		return "", false
 	}

app/backend/internal/api/registries.go

@@ -1,13 +1,11 @@
 package api
 
 import (
-	"context"
 	"net/http"
 	"strings"
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/secrets"
 
 	"github.com/docker/docker/api/types/registry"
@@ -179,17 +177,17 @@ func handleDeleteRegistry(c *gin.Context) {
 // bare image names (nginx:latest).
 func registryAuthFor(db *database.DB, ownerID, imageRef string) registry.AuthConfig {
 	host := registryHost(imageRef)
-	ownerUUID, _ := uuid.Parse(ownerID)
+	var username, password string
-	row, err := sqlcdb.New(db.DB).GetRegistryAuth(context.Background(), sqlcdb.GetRegistryAuthParams{
+	err := db.QueryRow(
-		OwnerID: ownerUUID,
+		`SELECT username, password FROM registries WHERE owner_id = $1 AND host = $2`,
-		Host:    host,
+		ownerID, host,
-	})
+	).Scan(&username, &password)
 	if err != nil {
 		return registry.AuthConfig{}
 	}
 	return registry.AuthConfig{
-		Username:      row.Username,
+		Username:      username,
-		Password:      secrets.Decrypt(row.Password),
+		Password:      secrets.Decrypt(password),
 		ServerAddress: host,
 	}
 }

app/backend/internal/api/routes.go

@@ -11,7 +11,6 @@ import (
 	"containr/internal/build"
 	"containr/internal/config"
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/deployment"
 	"containr/internal/deployqueue"
 	"containr/internal/docker"
@@ -22,7 +21,6 @@ import (
 	"containr/internal/secrets"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 func SetupRoutes(router *gin.Engine, db *database.DB, redis *database.Redis, cfg *config.Config) {
@@ -85,18 +83,19 @@ func SetupRoutes(router *gin.Engine, db *database.DB, redis *database.Redis, cfg
 		// 127.0.0.1 fallback stays for node-bound checks.
 		docker := dockerClient
 		haManager.WithServiceResolver(func(ctx context.Context, serviceID string) (string, int, error) {
-			sid, err := uuid.Parse(serviceID)
+			var name, projectID string
+			var port int
+			err := db.QueryRowContext(ctx,
+				`SELECT name, project_id::text, COALESCE(port, 0) FROM services WHERE id = $1`,
+				serviceID,
+			).Scan(&name, &projectID, &port)
 			if err != nil {
 				return "", 0, err
 			}
-			svc, err := sqlcdb.New(db.DB).GetServiceNameProjectPort(ctx, sid)
+			if err := docker.ConnectSelfToNetwork(ctx, deployment.ProjectNetworkName(projectID)); err != nil {
-			if err != nil {
 				return "", 0, err
 			}
-			if err := docker.ConnectSelfToNetwork(ctx, deployment.ProjectNetworkName(svc.ProjectID)); err != nil {
+			return name, port, nil
-				return "", 0, err
-			}
-			return svc.Name, int(svc.Port), nil
 		})
 	}
 	haAPIManager := NewHAManager(haManager)
@@ -138,25 +137,31 @@ func SetupRoutes(router *gin.Engine, db *database.DB, redis *database.Redis, cfg
 	// Boot sweep: in-memory engine state dies on restart, so anything that
 	// looked in-flight is actually orphaned — mark it failed rather than
 	// leaving phantom 'building'/'queued' rows.
-	bootQ := sqlcdb.New(db.DB)
+	_, _ = db.Exec(
-	_ = bootQ.FailInterruptedDeployments(context.Background())
+		`UPDATE deployments SET status = 'failed', error = 'Interrupted by server restart', completed_at = NOW(), updated_at = NOW()
+		 WHERE status IN ('queued', 'pending', 'building', 'deploying', 'rolling_back')`,
+	)
 
 	// Boot sweep: encrypt any plaintext secret values left over from before
 	// encryption-at-rest landed. Transparent and idempotent.
-	if encRows, err := bootQ.ListSecretEnvVars(context.Background()); err == nil {
+	if encRows, err := db.Query(`SELECT id, value FROM environment_variables WHERE is_secret = TRUE`); err == nil {
-		toEncrypt := 0
+		type encRow struct {
-		for _, r := range encRows {
+			id    string
-			if secrets.IsEncrypted(r.Value) {
+			value string
-				continue
 		}
-			if err := bootQ.UpdateEnvVarValue(context.Background(), sqlcdb.UpdateEnvVarValueParams{
+		var toEncrypt []encRow
-				Value: secrets.Encrypt(r.Value), ID: r.ID,
+		for encRows.Next() {
-			}); err == nil {
+			var r encRow
-				toEncrypt++
+			if err := encRows.Scan(&r.id, &r.value); err == nil && !secrets.IsEncrypted(r.value) {
+				toEncrypt = append(toEncrypt, r)
 			}
 		}
-		if toEncrypt > 0 {
+		encRows.Close()
-			log.Printf("secrets: encrypted %d plaintext secret variable(s)", toEncrypt)
+		for _, r := range toEncrypt {
+			_, _ = db.Exec(`UPDATE environment_variables SET value = $1, updated_at = NOW() WHERE id = $2`, secrets.Encrypt(r.value), r.id)
+		}
+		if len(toEncrypt) > 0 {
+			log.Printf("secrets: encrypted %d plaintext secret variable(s)", len(toEncrypt))
 		}
 	}
 

app/backend/internal/api/services.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/deployment"
 	"containr/internal/deployqueue"
 	"context"
@@ -71,18 +70,20 @@ type Service struct {
 // loadServiceSleep fills the sleep-mode columns, which live outside the
 // wide service SELECTs. Missing columns (pre-migration) degrade to off.
 func loadServiceSleep(db *database.DB, s *Service) {
-	row, err := sqlcdb.New(db.DB).GetServiceSleep(context.Background(), s.ID)
+	var idle int
-	if err == nil {
+	if err := db.QueryRow(
-		s.SleepEnabled = row.SleepEnabled
+		`SELECT COALESCE(sleep_enabled, false), COALESCE(sleep_idle_minutes, 15) FROM services WHERE id = $1`,
-		s.SleepIdleMinutes = int(row.SleepIdleMinutes)
+		s.ID,
+	).Scan(&s.SleepEnabled, &idle); err == nil {
+		s.SleepIdleMinutes = idle
 	}
 }
 
 // serviceNodeID reads the pin column directly — kept out of the wide service
 // SELECTs so pre-migration schemas keep working.
 func serviceNodeID(db *database.DB, serviceID uuid.UUID) string {
-	id, err := sqlcdb.New(db.DB).GetServiceNodeID(context.Background(), serviceID)
+	var id sql.NullString
-	if err == nil {
+	if err := db.QueryRow(`SELECT node_id FROM services WHERE id = $1`, serviceID).Scan(&id); err == nil {
 		return id.String
 	}
 	return ""
@@ -90,14 +91,17 @@ func serviceNodeID(db *database.DB, serviceID uuid.UUID) string {
 
 // serviceSpread reads the spread column with the same lazy pattern.
 func serviceSpread(db *database.DB, serviceID uuid.UUID) bool {
-	spread, err := sqlcdb.New(db.DB).GetServiceSpread(context.Background(), serviceID)
+	var spread bool
-	return err == nil && spread
+	if err := db.QueryRow(`SELECT COALESCE(spread, false) FROM services WHERE id = $1`, serviceID).Scan(&spread); err == nil {
+		return spread
+	}
+	return false
 }
 
 // servicePlacementTags reads the placement_tags column with the lazy pattern.
 func servicePlacementTags(db *database.DB, serviceID uuid.UUID) []string {
-	raw, err := sqlcdb.New(db.DB).GetServicePlacementTags(context.Background(), serviceID)
+	var raw []byte
-	if err != nil {
+	if err := db.QueryRow(`SELECT placement_tags FROM services WHERE id = $1`, serviceID).Scan(&raw); err != nil {
 		return nil
 	}
 	var tags []string
@@ -175,8 +179,8 @@ func normalizeTraefikLabels(raw map[string]string) (map[string]string, error) {
 
 // serviceTraefikLabels lazy-reads the traefik_labels column.
 func serviceTraefikLabels(db *database.DB, serviceID uuid.UUID) map[string]string {
-	raw, err := sqlcdb.New(db.DB).GetServiceTraefikLabels(context.Background(), serviceID)
+	var raw []byte
-	if err != nil {
+	if err := db.QueryRow(`SELECT traefik_labels FROM services WHERE id = $1`, serviceID).Scan(&raw); err != nil {
 		return nil
 	}
 	var labels map[string]string
@@ -207,6 +211,7 @@ func tagsJSON(tags []string) []byte {
 // loadServiceNode fills the pin + spread + placement tags + the agent's
 // display name for responses.
 func loadServiceNode(db *database.DB, s *Service) {
+	var name sql.NullString
 	s.NodeID = serviceNodeID(db, s.ID)
 	s.Spread = serviceSpread(db, s.ID)
 	s.PlacementTags = servicePlacementTags(db, s.ID)
@@ -214,8 +219,8 @@ func loadServiceNode(db *database.DB, s *Service) {
 	if s.NodeID == "" {
 		return
 	}
-	if name, err := sqlcdb.New(db.DB).GetNodeAgentName(context.Background(), s.NodeID); err == nil {
+	if err := db.QueryRow(`SELECT name FROM node_agents WHERE id = $1`, s.NodeID).Scan(&name); err == nil {
-		s.NodeName = name
+		s.NodeName = name.String
 	}
 }
 
@@ -230,8 +235,8 @@ type ServiceVolume struct {
 // loadServiceVolumes reads the JSONB column; absent/invalid data degrades
 // to no mounts rather than failing the request.
 func loadServiceVolumes(db *database.DB, serviceID uuid.UUID) []deployment.VolumeMount {
-	raw, err := sqlcdb.New(db.DB).GetServiceVolumes(context.Background(), serviceID)
+	var raw []byte
-	if err != nil {
+	if err := db.QueryRow(`SELECT volumes FROM services WHERE id = $1`, serviceID).Scan(&raw); err != nil {
 		return nil
 	}
 	var stored []ServiceVolume
@@ -698,11 +703,13 @@ func handleCreateService(c *gin.Context) {
 }
 
 func getProjectEnvironmentID(db *database.DB, projectID uuid.UUID, environment string) (uuid.UUID, error) {
-	row, err := sqlcdb.New(db.DB).GetProjectEnvironmentByName(context.Background(), sqlcdb.GetProjectEnvironmentByNameParams{
+	var environmentID uuid.UUID
-		ProjectID: projectID,
+	err := db.QueryRow(
-		Name:      environment,
+		"SELECT id FROM environments WHERE project_id = $1 AND name = $2",
-	})
+		projectID,
-	return row.ID, err
+		environment,
+	).Scan(&environmentID)
+	return environmentID, err
 }
 
 func inferServiceSourceType(service Service) string {

app/backend/internal/api/settings.go

@@ -10,13 +10,11 @@ import (
 	"time"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 	"containr/internal/docker"
 
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 // Platform setting keys. Values stored in app_settings take precedence over
@@ -72,7 +70,8 @@ func handleGetBranding(c *gin.Context) {
 // then the caller's default.
 func settingValue(db *database.DB, key, envKey, fallback string) string {
 	if db != nil && db.DB != nil {
-		value, err := sqlcdb.New(db.DB).GetAppSetting(context.Background(), key)
+		var value string
+		err := db.QueryRow(`SELECT value FROM app_settings WHERE key = $1`, key).Scan(&value)
 		if err == nil {
 			return value
 		}
@@ -89,15 +88,18 @@ func settingValue(db *database.DB, key, envKey, fallback string) string {
 }
 
 func setSetting(db *database.DB, key, value string, secret bool) error {
-	return sqlcdb.New(db.DB).UpsertAppSetting(context.Background(), sqlcdb.UpsertAppSettingParams{
+	_, err := db.Exec(`
-		Key:      key,
+		INSERT INTO app_settings (key, value, is_secret, updated_at)
-		Value:    value,
+		VALUES ($1, $2, $3, NOW())
-		IsSecret: secret,
+		ON CONFLICT (key) DO UPDATE
-	})
+		SET value = EXCLUDED.value, is_secret = EXCLUDED.is_secret, updated_at = NOW()
+	`, key, value, secret)
+	return err
 }
 
 func deleteSetting(db *database.DB, key string) error {
-	return sqlcdb.New(db.DB).DeleteAppSetting(context.Background(), key)
+	_, err := db.Exec(`DELETE FROM app_settings WHERE key = $1`, key)
+	return err
 }
 
 // signupEnabled controls whether public registration stays open after the
@@ -108,12 +110,11 @@ func signupEnabled(db *database.DB) bool {
 }
 
 func isAdminUser(db *database.DB, userID string) bool {
-	parsed, err := uuid.Parse(userID)
+	var isAdmin bool
-	if err != nil {
+	if err := db.QueryRow(`SELECT is_admin FROM users WHERE id = $1`, userID).Scan(&isAdmin); err != nil {
 		return false
 	}
-	isAdmin, err := sqlcdb.New(db.DB).GetUserIsAdmin(context.Background(), parsed)
+	return isAdmin
-	return err == nil && isAdmin
 }
 
 func requireAdmin(c *gin.Context) (*database.DB, bool) {
@@ -241,7 +242,8 @@ func handleUpdateSettings(c *gin.Context) {
 // resolvedTunnelToken prefers the in-app value and falls back to the env.
 func resolvedTunnelToken(db *database.DB) (string, string) {
 	if db != nil && db.DB != nil {
-		if value, err := sqlcdb.New(db.DB).GetAppSetting(context.Background(), settingCloudflareTunnelToken); err == nil && strings.TrimSpace(value) != "" {
+		var value string
+		if err := db.QueryRow(`SELECT value FROM app_settings WHERE key = $1`, settingCloudflareTunnelToken).Scan(&value); err == nil && strings.TrimSpace(value) != "" {
 			return strings.TrimSpace(value), "app"
 		}
 	}

app/backend/internal/api/setup.go

@@ -5,12 +5,10 @@ package api
 // lives in app_settings so it survives restarts.
 
 import (
-	"context"
 	"net/http"
 	"strings"
 
 	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
 
 	"github.com/gin-gonic/gin"
 )
@@ -27,7 +25,8 @@ func setupComplete(db *database.DB, hasUsers bool) bool {
 	if !hasUsers {
 		return false
 	}
-	if projects, err := sqlcdb.New(db.DB).CountProjects(context.Background()); err == nil && projects > 0 {
+	var projects int
+	if err := db.QueryRow(`SELECT COUNT(*) FROM projects`).Scan(&projects); err == nil && projects > 0 {
 		return true
 	}
 	return false

app/backend/internal/api/templategraph.go

@@ -640,20 +640,19 @@ func deployTemplateGraph(
 	createdServiceIDs := []uuid.UUID{}
 	createdDatabaseIDs := []string{}
 	cleanup := func() {
-		q := sqlcdb.New(db.DB)
 		for _, sid := range createdServiceIDs {
 			if engine != nil {
 				removeServiceRuntime(context.Background(), db, engine, sid)
 			}
-			_ = q.DeleteEnvVarsForService(context.Background(), sid)
+			_, _ = db.Exec(`DELETE FROM environment_variables WHERE service_id = $1`, sid)
-			_ = q.DeleteServiceByID(context.Background(), sid)
+			_, _ = db.Exec(`DELETE FROM services WHERE id = $1`, sid)
 		}
 		for _, did := range createdDatabaseIDs {
 			if dbHandler != nil && dbHandler.dockerClient != nil {
 				_ = dbHandler.dockerClient.RemoveContainer(context.Background(), managedDatabaseContainerName(did), true)
 				_ = dbHandler.dockerClient.RemoveVolume(context.Background(), managedDatabaseVolumeName(did), true)
 			}
-			_ = q.DeleteDatabaseServiceByID(context.Background(), did)
+			_, _ = db.Exec(`DELETE FROM database_services WHERE id = $1`, did)
 		}
 	}
 
@@ -773,19 +772,14 @@ func deployTemplateGraph(
 		if builder == "" {
 			builder = "auto"
 		}
-		var volumesRaw json.RawMessage
+		if _, err = tx.ExecContext(ctx,
-		if s, ok := volumesJSON.(string); ok {
+			`UPDATE services SET port = $1, healthcheck_path = $2, volumes = COALESCE($3::jsonb, '[]'::jsonb),
-			volumesRaw = json.RawMessage(s)
+			        git_repo = NULLIF($4, ''), git_branch = NULLIF($5, ''), builder = $6
-		}
+			 WHERE id = $7`,
-		if err = sqlcdb.New(tx).UpdateServiceDeployMeta(ctx, sqlcdb.UpdateServiceDeployMetaParams{
+			m.spec.Port, strings.TrimSpace(m.spec.HealthCheck), volumesJSON,
-			Port:            int32(m.spec.Port),
+			strings.TrimSpace(m.spec.Repo), strings.TrimSpace(m.spec.Branch), builder,
-			HealthcheckPath: strings.TrimSpace(m.spec.HealthCheck),
+			serviceID,
-			Column3:         volumesRaw,
+		); err != nil {
-			Column4:         strings.TrimSpace(m.spec.Repo),
-			Column5:         strings.TrimSpace(m.spec.Branch),
-			Builder:         builder,
-			ID:              serviceID,
-		}); err != nil {
 			tx.Rollback()
 			cleanup()
 			return nil, &gin.H{"error": "Failed to configure service"}
@@ -867,24 +861,15 @@ func queueTemplateDeployment(c *gin.Context, db *database.DB, engine *deployment
 		CreatedAt: now,
 		UpdatedAt: now,
 	}
-	q := sqlcdb.New(db.DB)
+	if _, err := db.Exec(
-	if err := q.InsertDeployment(context.Background(), sqlcdb.InsertDeploymentParams{
+		`INSERT INTO deployments
-		ID:        dep.ID,
+		 (id, service_id, version, commit_hash, status, image_name, image_tag, created_at, updated_at)
-		ServiceID: dep.ServiceID,
+		 VALUES ($1, $2, $3, NULL, $4, '', '', $5, $6)`,
-		Version:   fmt.Sprintf("v%d", now.Unix()),
+		dep.ID, dep.ServiceID, fmt.Sprintf("v%d", now.Unix()), dep.Status, dep.CreatedAt, dep.UpdatedAt,
-		Status:    sql.NullString{String: dep.Status, Valid: true},
+	); err != nil {
-		ImageName: sql.NullString{String: "", Valid: true},
-		ImageTag:  sql.NullString{String: "", Valid: true},
-		CreatedAt: sql.NullTime{Time: dep.CreatedAt, Valid: true},
-		UpdatedAt: sql.NullTime{Time: dep.UpdatedAt, Valid: true},
-	}); err != nil {
 		return uuid.Nil
 	}
-	_ = q.SetServiceStatus(context.Background(), sqlcdb.SetServiceStatusParams{
+	_, _ = db.Exec(`UPDATE services SET status = 'queued', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
-		Status:    sql.NullString{String: "queued", Valid: true},
-		UpdatedAt: sql.NullTime{Time: time.Now(), Valid: true},
-		ID:        service.ID,
-	})
 
 	getDeployQueue(c).Enqueue(service.ID, deployqueue.Job{
 		DeploymentID: dep.ID,

app/backend/internal/api/templates.go

@@ -411,11 +411,12 @@ func handleCreateFromTemplate(c *gin.Context) {
 		return
 	}
 
-	if err = sqlcdb.New(tx).UpdateServiceRuntimeMeta(ctx, sqlcdb.UpdateServiceRuntimeMetaParams{
+	// sqlc's schema predates the runtime columns; port and healthcheck_path are
-		Port:            int32(config.Port),
+	// written via raw SQL like every other service mutation path.
-		HealthcheckPath: strings.TrimSpace(config.HealthCheck),
+	if _, err = tx.ExecContext(ctx,
-		ID:              serviceID,
+		`UPDATE services SET port = $1, healthcheck_path = $2 WHERE id = $3`,
-	}); err != nil {
+		config.Port, strings.TrimSpace(config.HealthCheck), serviceID,
+	); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create service from template"})
 		return
 	}

app/backend/internal/api/variables.go

@@ -1,14 +1,11 @@
 package api
 
 import (
-	"database/sql"
+	"containr/internal/database"
+	"containr/internal/secrets"
 	"net/http"
 	"time"
 
-	"containr/internal/database"
-	"containr/internal/database/sqlcdb"
-	"containr/internal/secrets"
-
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 )
@@ -150,8 +147,7 @@ func handleUpdateVariables(c *gin.Context) {
 	}
 	defer tx.Rollback()
 
-	txq := sqlcdb.New(tx)
+	_, err = tx.Exec("DELETE FROM environment_variables WHERE service_id = $1", serviceID)
-	err = txq.DeleteEnvVarsForService(c.Request.Context(), serviceID)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to clear existing variables"})
 		return
@@ -168,15 +164,12 @@ func handleUpdateVariables(c *gin.Context) {
 		if v.IsSecret {
 			value = secrets.Encrypt(value)
 		}
-		err = txq.InsertEnvVar(c.Request.Context(), sqlcdb.InsertEnvVarParams{
+		varID := uuid.New()
-			ID:        uuid.New(),
+		_, err = tx.Exec(
-			ServiceID: serviceID,
+			`INSERT INTO environment_variables (id, service_id, key, value, is_secret, created_at, updated_at)
-			Key:       v.Key,
+			 VALUES ($1, $2, $3, $4, $5, $6, $7)`,
-			Value:     value,
+			varID, serviceID, v.Key, value, v.IsSecret, now, now,
-			IsSecret:  sql.NullBool{Bool: v.IsSecret, Valid: true},
+		)
-			CreatedAt: sql.NullTime{Time: now, Valid: true},
-			UpdatedAt: sql.NullTime{Time: now, Valid: true},
-		})
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to insert variable: " + v.Key})
 			return

app/backend/internal/database/sqlcdb/apwhy.sql.go

@@ -1,636 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: apwhy.sql
-
-package sqlcdb
-
-import (
-	"context"
-	"database/sql"
-
-	"github.com/google/uuid"
-)
-
-const countAPKeys = `-- name: CountAPKeys :one
-SELECT COUNT(*) FROM api_keys
-`
-
-func (q *Queries) CountAPKeys(ctx context.Context) (int64, error) {
-	row := q.db.QueryRowContext(ctx, countAPKeys)
-	var count int64
-	err := row.Scan(&count)
-	return count, err
-}
-
-const countAPServices = `-- name: CountAPServices :one
-SELECT COUNT(*) FROM api_services
-`
-
-func (q *Queries) CountAPServices(ctx context.Context) (int64, error) {
-	row := q.db.QueryRowContext(ctx, countAPServices)
-	var count int64
-	err := row.Scan(&count)
-	return count, err
-}
-
-const getAPServiceBySlug = `-- name: GetAPServiceBySlug :one
-SELECT id, upstream_url, route_prefix, upstream_auth_header,
-       upstream_auth_value, enabled, rpm_limit, monthly_quota,
-       request_timeout_ms
-FROM api_services WHERE slug = $1
-`
-
-type GetAPServiceBySlugRow struct {
-	ID                 uuid.UUID      `json:"id"`
-	UpstreamUrl        string         `json:"upstream_url"`
-	RoutePrefix        string         `json:"route_prefix"`
-	UpstreamAuthHeader sql.NullString `json:"upstream_auth_header"`
-	UpstreamAuthValue  sql.NullString `json:"upstream_auth_value"`
-	Enabled            int32          `json:"enabled"`
-	RpmLimit           sql.NullInt32  `json:"rpm_limit"`
-	MonthlyQuota       sql.NullInt32  `json:"monthly_quota"`
-	RequestTimeoutMs   sql.NullInt32  `json:"request_timeout_ms"`
-}
-
-func (q *Queries) GetAPServiceBySlug(ctx context.Context, slug string) (GetAPServiceBySlugRow, error) {
-	row := q.db.QueryRowContext(ctx, getAPServiceBySlug, slug)
-	var i GetAPServiceBySlugRow
-	err := row.Scan(
-		&i.ID,
-		&i.UpstreamUrl,
-		&i.RoutePrefix,
-		&i.UpstreamAuthHeader,
-		&i.UpstreamAuthValue,
-		&i.Enabled,
-		&i.RpmLimit,
-		&i.MonthlyQuota,
-		&i.RequestTimeoutMs,
-	)
-	return i, err
-}
-
-const getAPServiceForValidate = `-- name: GetAPServiceForValidate :one
-SELECT upstream_url, health_path, upstream_auth_header, upstream_auth_value, request_timeout_ms
-FROM api_services WHERE id = $1
-`
-
-type GetAPServiceForValidateRow struct {
-	UpstreamUrl        string         `json:"upstream_url"`
-	HealthPath         string         `json:"health_path"`
-	UpstreamAuthHeader sql.NullString `json:"upstream_auth_header"`
-	UpstreamAuthValue  sql.NullString `json:"upstream_auth_value"`
-	RequestTimeoutMs   sql.NullInt32  `json:"request_timeout_ms"`
-}
-
-func (q *Queries) GetAPServiceForValidate(ctx context.Context, id uuid.UUID) (GetAPServiceForValidateRow, error) {
-	row := q.db.QueryRowContext(ctx, getAPServiceForValidate, id)
-	var i GetAPServiceForValidateRow
-	err := row.Scan(
-		&i.UpstreamUrl,
-		&i.HealthPath,
-		&i.UpstreamAuthHeader,
-		&i.UpstreamAuthValue,
-		&i.RequestTimeoutMs,
-	)
-	return i, err
-}
-
-const insertAPKey = `-- name: InsertAPKey :one
-INSERT INTO api_keys (
-    name, key_hash, key_prefix, plan, allowed_service_ids,
-    rpm_limit, monthly_quota, created_at, updated_at
-) VALUES ($1, $2, $3, $4, '[]', $5, $6, NOW(), NOW())
-RETURNING id
-`
-
-type InsertAPKeyParams struct {
-	Name         string        `json:"name"`
-	KeyHash      string        `json:"key_hash"`
-	KeyPrefix    string        `json:"key_prefix"`
-	Plan         string        `json:"plan"`
-	RpmLimit     sql.NullInt32 `json:"rpm_limit"`
-	MonthlyQuota sql.NullInt32 `json:"monthly_quota"`
-}
-
-func (q *Queries) InsertAPKey(ctx context.Context, arg InsertAPKeyParams) (uuid.UUID, error) {
-	row := q.db.QueryRowContext(ctx, insertAPKey,
-		arg.Name,
-		arg.KeyHash,
-		arg.KeyPrefix,
-		arg.Plan,
-		arg.RpmLimit,
-		arg.MonthlyQuota,
-	)
-	var id uuid.UUID
-	err := row.Scan(&id)
-	return id, err
-}
-
-const insertAPService = `-- name: InsertAPService :one
-INSERT INTO api_services (
-    name, slug, upstream_url, route_prefix, health_path,
-    rpm_limit, monthly_quota, created_at, updated_at
-) VALUES ($1, $2, $3, $4, '/health', $5, $6, NOW(), NOW())
-RETURNING id
-`
-
-type InsertAPServiceParams struct {
-	Name         string        `json:"name"`
-	Slug         string        `json:"slug"`
-	UpstreamUrl  string        `json:"upstream_url"`
-	RoutePrefix  string        `json:"route_prefix"`
-	RpmLimit     sql.NullInt32 `json:"rpm_limit"`
-	MonthlyQuota sql.NullInt32 `json:"monthly_quota"`
-}
-
-func (q *Queries) InsertAPService(ctx context.Context, arg InsertAPServiceParams) (uuid.UUID, error) {
-	row := q.db.QueryRowContext(ctx, insertAPService,
-		arg.Name,
-		arg.Slug,
-		arg.UpstreamUrl,
-		arg.RoutePrefix,
-		arg.RpmLimit,
-		arg.MonthlyQuota,
-	)
-	var id uuid.UUID
-	err := row.Scan(&id)
-	return id, err
-}
-
-const insertGatewayIncident = `-- name: InsertGatewayIncident :exec
-INSERT INTO incident_events (service_id, api_key_id, code, message, severity, http_status, occurred_at)
-VALUES ($1, $2, $3, $4, $5, $6, NOW())
-`
-
-type InsertGatewayIncidentParams struct {
-	ServiceID  uuid.NullUUID `json:"service_id"`
-	ApiKeyID   uuid.NullUUID `json:"api_key_id"`
-	Code       string        `json:"code"`
-	Message    string        `json:"message"`
-	Severity   string        `json:"severity"`
-	HttpStatus sql.NullInt32 `json:"http_status"`
-}
-
-func (q *Queries) InsertGatewayIncident(ctx context.Context, arg InsertGatewayIncidentParams) error {
-	_, err := q.db.ExecContext(ctx, insertGatewayIncident,
-		arg.ServiceID,
-		arg.ApiKeyID,
-		arg.Code,
-		arg.Message,
-		arg.Severity,
-		arg.HttpStatus,
-	)
-	return err
-}
-
-const insertMetricPoint = `-- name: InsertMetricPoint :exec
-INSERT INTO metrics_timeseries (metric, value, labels_json, occurred_at)
-VALUES ('gateway_request', 1, $1, NOW())
-`
-
-func (q *Queries) InsertMetricPoint(ctx context.Context, labelsJson sql.NullString) error {
-	_, err := q.db.ExecContext(ctx, insertMetricPoint, labelsJson)
-	return err
-}
-
-const insertServiceIncident = `-- name: InsertServiceIncident :exec
-INSERT INTO incident_events (service_id, code, message, severity, http_status, occurred_at)
-VALUES ($1, 'SERVICE_VALIDATION_FAILED', $2, 'medium', $3, NOW())
-`
-
-type InsertServiceIncidentParams struct {
-	ServiceID  uuid.NullUUID `json:"service_id"`
-	Message    string        `json:"message"`
-	HttpStatus sql.NullInt32 `json:"http_status"`
-}
-
-func (q *Queries) InsertServiceIncident(ctx context.Context, arg InsertServiceIncidentParams) error {
-	_, err := q.db.ExecContext(ctx, insertServiceIncident, arg.ServiceID, arg.Message, arg.HttpStatus)
-	return err
-}
-
-const listAPKeys = `-- name: ListAPKeys :many
-SELECT id, name, key_prefix, plan, enabled, rpm_limit, monthly_quota,
-       to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS created_at,
-       to_char(updated_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS updated_at
-FROM api_keys
-ORDER BY created_at DESC
-`
-
-type ListAPKeysRow struct {
-	ID           uuid.UUID     `json:"id"`
-	Name         string        `json:"name"`
-	KeyPrefix    string        `json:"key_prefix"`
-	Plan         string        `json:"plan"`
-	Enabled      int32         `json:"enabled"`
-	RpmLimit     sql.NullInt32 `json:"rpm_limit"`
-	MonthlyQuota sql.NullInt32 `json:"monthly_quota"`
-	CreatedAt    string        `json:"created_at"`
-	UpdatedAt    string        `json:"updated_at"`
-}
-
-func (q *Queries) ListAPKeys(ctx context.Context) ([]ListAPKeysRow, error) {
-	rows, err := q.db.QueryContext(ctx, listAPKeys)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListAPKeysRow{}
-	for rows.Next() {
-		var i ListAPKeysRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.Name,
-			&i.KeyPrefix,
-			&i.Plan,
-			&i.Enabled,
-			&i.RpmLimit,
-			&i.MonthlyQuota,
-			&i.CreatedAt,
-			&i.UpdatedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listAPKeysByPrefix = `-- name: ListAPKeysByPrefix :many
-SELECT id, key_hash, enabled, rpm_limit, monthly_quota, allowed_service_ids
-FROM api_keys WHERE key_prefix = $1
-`
-
-type ListAPKeysByPrefixRow struct {
-	ID                uuid.UUID     `json:"id"`
-	KeyHash           string        `json:"key_hash"`
-	Enabled           int32         `json:"enabled"`
-	RpmLimit          sql.NullInt32 `json:"rpm_limit"`
-	MonthlyQuota      sql.NullInt32 `json:"monthly_quota"`
-	AllowedServiceIds string        `json:"allowed_service_ids"`
-}
-
-func (q *Queries) ListAPKeysByPrefix(ctx context.Context, keyPrefix string) ([]ListAPKeysByPrefixRow, error) {
-	rows, err := q.db.QueryContext(ctx, listAPKeysByPrefix, keyPrefix)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListAPKeysByPrefixRow{}
-	for rows.Next() {
-		var i ListAPKeysByPrefixRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.KeyHash,
-			&i.Enabled,
-			&i.RpmLimit,
-			&i.MonthlyQuota,
-			&i.AllowedServiceIds,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listAPServices = `-- name: ListAPServices :many
-SELECT id, name, slug, upstream_url, route_prefix, enabled,
-       to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS created_at,
-       to_char(updated_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS updated_at
-FROM api_services
-ORDER BY created_at DESC
-`
-
-type ListAPServicesRow struct {
-	ID          uuid.UUID `json:"id"`
-	Name        string    `json:"name"`
-	Slug        string    `json:"slug"`
-	UpstreamUrl string    `json:"upstream_url"`
-	RoutePrefix string    `json:"route_prefix"`
-	Enabled     int32     `json:"enabled"`
-	CreatedAt   string    `json:"created_at"`
-	UpdatedAt   string    `json:"updated_at"`
-}
-
-func (q *Queries) ListAPServices(ctx context.Context) ([]ListAPServicesRow, error) {
-	rows, err := q.db.QueryContext(ctx, listAPServices)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListAPServicesRow{}
-	for rows.Next() {
-		var i ListAPServicesRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.Name,
-			&i.Slug,
-			&i.UpstreamUrl,
-			&i.RoutePrefix,
-			&i.Enabled,
-			&i.CreatedAt,
-			&i.UpdatedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listClientEventPaths = `-- name: ListClientEventPaths :many
-SELECT COALESCE((labels_json::jsonb ->> 'path'), 'unknown') AS path, COUNT(*) AS total
-FROM metrics_timeseries
-WHERE metric = 'client_event' AND occurred_at >= NOW() - INTERVAL '7 days'
-GROUP BY COALESCE((labels_json::jsonb ->> 'path'), 'unknown')
-ORDER BY total DESC, path ASC
-LIMIT 20
-`
-
-type ListClientEventPathsRow struct {
-	Path  interface{} `json:"path"`
-	Total int64       `json:"total"`
-}
-
-func (q *Queries) ListClientEventPaths(ctx context.Context) ([]ListClientEventPathsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listClientEventPaths)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListClientEventPathsRow{}
-	for rows.Next() {
-		var i ListClientEventPathsRow
-		if err := rows.Scan(&i.Path, &i.Total); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listIncidentStatusCodes = `-- name: ListIncidentStatusCodes :many
-SELECT COALESCE(http_status, 0) AS status_code, COALESCE(SUM(count), 0) AS total
-FROM incident_events
-WHERE occurred_at >= NOW() - INTERVAL '7 days'
-GROUP BY COALESCE(http_status, 0)
-ORDER BY total DESC, status_code ASC
-`
-
-type ListIncidentStatusCodesRow struct {
-	StatusCode int32       `json:"status_code"`
-	Total      interface{} `json:"total"`
-}
-
-func (q *Queries) ListIncidentStatusCodes(ctx context.Context) ([]ListIncidentStatusCodesRow, error) {
-	rows, err := q.db.QueryContext(ctx, listIncidentStatusCodes)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListIncidentStatusCodesRow{}
-	for rows.Next() {
-		var i ListIncidentStatusCodesRow
-		if err := rows.Scan(&i.StatusCode, &i.Total); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listRequestsByDay = `-- name: ListRequestsByDay :many
-SELECT TO_CHAR(DATE_TRUNC('day', occurred_at), 'YYYY-MM-DD') AS day_bucket, COUNT(*) AS total
-FROM metrics_timeseries
-WHERE metric = 'request_total' AND occurred_at >= NOW() - INTERVAL '7 days'
-GROUP BY DATE_TRUNC('day', occurred_at)
-ORDER BY DATE_TRUNC('day', occurred_at) ASC
-`
-
-type ListRequestsByDayRow struct {
-	DayBucket string `json:"day_bucket"`
-	Total     int64  `json:"total"`
-}
-
-func (q *Queries) ListRequestsByDay(ctx context.Context) ([]ListRequestsByDayRow, error) {
-	rows, err := q.db.QueryContext(ctx, listRequestsByDay)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListRequestsByDayRow{}
-	for rows.Next() {
-		var i ListRequestsByDayRow
-		if err := rows.Scan(&i.DayBucket, &i.Total); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listTopAPServices = `-- name: ListTopAPServices :many
-SELECT s.id, s.name, COALESCE(SUM(u.request_count), 0) AS total_requests
-FROM api_services s
-LEFT JOIN usage_counters u ON u.service_id = s.id
-GROUP BY s.id, s.name
-ORDER BY total_requests DESC, s.name ASC
-LIMIT 10
-`
-
-type ListTopAPServicesRow struct {
-	ID            uuid.UUID   `json:"id"`
-	Name          string      `json:"name"`
-	TotalRequests interface{} `json:"total_requests"`
-}
-
-func (q *Queries) ListTopAPServices(ctx context.Context) ([]ListTopAPServicesRow, error) {
-	rows, err := q.db.QueryContext(ctx, listTopAPServices)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListTopAPServicesRow{}
-	for rows.Next() {
-		var i ListTopAPServicesRow
-		if err := rows.Scan(&i.ID, &i.Name, &i.TotalRequests); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const setAPKeyEnabled = `-- name: SetAPKeyEnabled :exec
-UPDATE api_keys SET enabled = $1, updated_at = NOW() WHERE id = $2
-`
-
-type SetAPKeyEnabledParams struct {
-	Enabled int32     `json:"enabled"`
-	ID      uuid.UUID `json:"id"`
-}
-
-func (q *Queries) SetAPKeyEnabled(ctx context.Context, arg SetAPKeyEnabledParams) error {
-	_, err := q.db.ExecContext(ctx, setAPKeyEnabled, arg.Enabled, arg.ID)
-	return err
-}
-
-const setAPServiceEnabled = `-- name: SetAPServiceEnabled :exec
-UPDATE api_services SET enabled = $1, updated_at = NOW() WHERE id = $2
-`
-
-type SetAPServiceEnabledParams struct {
-	Enabled int32     `json:"enabled"`
-	ID      uuid.UUID `json:"id"`
-}
-
-func (q *Queries) SetAPServiceEnabled(ctx context.Context, arg SetAPServiceEnabledParams) error {
-	_, err := q.db.ExecContext(ctx, setAPServiceEnabled, arg.Enabled, arg.ID)
-	return err
-}
-
-const setAPServiceValidation = `-- name: SetAPServiceValidation :exec
-UPDATE api_services
-SET last_validation_at = NOW(), last_validation_status = $1, last_validation_message = $2, updated_at = NOW()
-WHERE id = $3
-`
-
-type SetAPServiceValidationParams struct {
-	LastValidationStatus  sql.NullString `json:"last_validation_status"`
-	LastValidationMessage sql.NullString `json:"last_validation_message"`
-	ID                    uuid.UUID      `json:"id"`
-}
-
-func (q *Queries) SetAPServiceValidation(ctx context.Context, arg SetAPServiceValidationParams) error {
-	_, err := q.db.ExecContext(ctx, setAPServiceValidation, arg.LastValidationStatus, arg.LastValidationMessage, arg.ID)
-	return err
-}
-
-const sumRequestMetricSince = `-- name: SumRequestMetricSince :one
-SELECT COALESCE(SUM(value), 0)::int
-FROM metrics_timeseries
-WHERE metric = 'request_total' AND occurred_at >= DATE_TRUNC($1::text, NOW())
-`
-
-func (q *Queries) SumRequestMetricSince(ctx context.Context, dollar_1 string) (int32, error) {
-	row := q.db.QueryRowContext(ctx, sumRequestMetricSince, dollar_1)
-	var column_1 int32
-	err := row.Scan(&column_1)
-	return column_1, err
-}
-
-const sumUsageByKey = `-- name: SumUsageByKey :one
-SELECT COALESCE(SUM(request_count), 0)::bigint FROM usage_counters
-WHERE api_key_id = $1 AND period_month = $2
-`
-
-type SumUsageByKeyParams struct {
-	ApiKeyID    uuid.UUID `json:"api_key_id"`
-	PeriodMonth string    `json:"period_month"`
-}
-
-func (q *Queries) SumUsageByKey(ctx context.Context, arg SumUsageByKeyParams) (int64, error) {
-	row := q.db.QueryRowContext(ctx, sumUsageByKey, arg.ApiKeyID, arg.PeriodMonth)
-	var column_1 int64
-	err := row.Scan(&column_1)
-	return column_1, err
-}
-
-const sumUsageByService = `-- name: SumUsageByService :one
-SELECT COALESCE(SUM(request_count), 0)::bigint FROM usage_counters
-WHERE service_id = $1 AND period_month = $2
-`
-
-type SumUsageByServiceParams struct {
-	ServiceID   uuid.UUID `json:"service_id"`
-	PeriodMonth string    `json:"period_month"`
-}
-
-func (q *Queries) SumUsageByService(ctx context.Context, arg SumUsageByServiceParams) (int64, error) {
-	row := q.db.QueryRowContext(ctx, sumUsageByService, arg.ServiceID, arg.PeriodMonth)
-	var column_1 int64
-	err := row.Scan(&column_1)
-	return column_1, err
-}
-
-const sumUsageCounters = `-- name: SumUsageCounters :one
-SELECT COALESCE(SUM(request_count), 0) FROM usage_counters
-`
-
-func (q *Queries) SumUsageCounters(ctx context.Context) (interface{}, error) {
-	row := q.db.QueryRowContext(ctx, sumUsageCounters)
-	var coalesce interface{}
-	err := row.Scan(&coalesce)
-	return coalesce, err
-}
-
-const touchAPKeyLastUsed = `-- name: TouchAPKeyLastUsed :exec
-UPDATE api_keys SET last_used_at = NOW() WHERE id = $1
-`
-
-func (q *Queries) TouchAPKeyLastUsed(ctx context.Context, id uuid.UUID) error {
-	_, err := q.db.ExecContext(ctx, touchAPKeyLastUsed, id)
-	return err
-}
-
-const upsertUsageCounter = `-- name: UpsertUsageCounter :exec
-INSERT INTO usage_counters (api_key_id, service_id, period_month, request_count, updated_at)
-VALUES ($1, $2, $3, 1, NOW())
-ON CONFLICT (api_key_id, service_id, period_month)
-DO UPDATE SET request_count = usage_counters.request_count + 1, updated_at = NOW()
-`
-
-type UpsertUsageCounterParams struct {
-	ApiKeyID    uuid.UUID `json:"api_key_id"`
-	ServiceID   uuid.UUID `json:"service_id"`
-	PeriodMonth string    `json:"period_month"`
-}
-
-func (q *Queries) UpsertUsageCounter(ctx context.Context, arg UpsertUsageCounterParams) error {
-	_, err := q.db.ExecContext(ctx, upsertUsageCounter, arg.ApiKeyID, arg.ServiceID, arg.PeriodMonth)
-	return err
-}

app/backend/internal/database/sqlcdb/audit.sql.go

@@ -1,218 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: audit.sql
-
-package sqlcdb
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/sqlc-dev/pqtype"
-)
-
-const insertAuditLog = `-- name: InsertAuditLog :exec
-INSERT INTO audit_logs (id, user_id, resource, resource_id, action, details, severity, category, label, created_at)
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
-`
-
-type InsertAuditLogParams struct {
-	ID         uuid.UUID             `json:"id"`
-	UserID     uuid.NullUUID         `json:"user_id"`
-	Resource   string                `json:"resource"`
-	ResourceID uuid.NullUUID         `json:"resource_id"`
-	Action     string                `json:"action"`
-	Details    pqtype.NullRawMessage `json:"details"`
-	Severity   string                `json:"severity"`
-	Category   string                `json:"category"`
-	Label      string                `json:"label"`
-	CreatedAt  time.Time             `json:"created_at"`
-}
-
-func (q *Queries) InsertAuditLog(ctx context.Context, arg InsertAuditLogParams) error {
-	_, err := q.db.ExecContext(ctx, insertAuditLog,
-		arg.ID,
-		arg.UserID,
-		arg.Resource,
-		arg.ResourceID,
-		arg.Action,
-		arg.Details,
-		arg.Severity,
-		arg.Category,
-		arg.Label,
-		arg.CreatedAt,
-	)
-	return err
-}
-
-const insertAuditLogWithRequest = `-- name: InsertAuditLogWithRequest :exec
-INSERT INTO audit_logs (id, user_id, resource, resource_id, action, details, ip_address, user_agent, severity, category, label, created_at)
-VALUES ($1, $2, $3, $4, $5, $6::jsonb, $7::inet, $8, $9, $10, $11, $12)
-`
-
-type InsertAuditLogWithRequestParams struct {
-	ID         uuid.UUID       `json:"id"`
-	UserID     uuid.NullUUID   `json:"user_id"`
-	Resource   string          `json:"resource"`
-	ResourceID uuid.NullUUID   `json:"resource_id"`
-	Action     string          `json:"action"`
-	Column6    json.RawMessage `json:"column_6"`
-	Column7    pqtype.Inet     `json:"column_7"`
-	UserAgent  sql.NullString  `json:"user_agent"`
-	Severity   string          `json:"severity"`
-	Category   string          `json:"category"`
-	Label      string          `json:"label"`
-	CreatedAt  time.Time       `json:"created_at"`
-}
-
-func (q *Queries) InsertAuditLogWithRequest(ctx context.Context, arg InsertAuditLogWithRequestParams) error {
-	_, err := q.db.ExecContext(ctx, insertAuditLogWithRequest,
-		arg.ID,
-		arg.UserID,
-		arg.Resource,
-		arg.ResourceID,
-		arg.Action,
-		arg.Column6,
-		arg.Column7,
-		arg.UserAgent,
-		arg.Severity,
-		arg.Category,
-		arg.Label,
-		arg.CreatedAt,
-	)
-	return err
-}
-
-const listAuditBackfillBatch = `-- name: ListAuditBackfillBatch :many
-SELECT id::text, resource, action FROM audit_logs
-WHERE label = '' AND id > $1::uuid ORDER BY id LIMIT 500
-`
-
-type ListAuditBackfillBatchRow struct {
-	ID       string `json:"id"`
-	Resource string `json:"resource"`
-	Action   string `json:"action"`
-}
-
-func (q *Queries) ListAuditBackfillBatch(ctx context.Context, dollar_1 uuid.UUID) ([]ListAuditBackfillBatchRow, error) {
-	rows, err := q.db.QueryContext(ctx, listAuditBackfillBatch, dollar_1)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListAuditBackfillBatchRow{}
-	for rows.Next() {
-		var i ListAuditBackfillBatchRow
-		if err := rows.Scan(&i.ID, &i.Resource, &i.Action); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listResourceAuditLogs = `-- name: ListResourceAuditLogs :many
-SELECT id, COALESCE(user_id::text, '')::text AS user_id, resource,
-       COALESCE(resource_id::text, '')::text AS resource_id, action,
-       COALESCE(details::text, '{}')::text AS details,
-       COALESCE(ip_address::text, '')::text AS ip_address,
-       COALESCE(user_agent, '') AS user_agent, created_at
-FROM audit_logs
-WHERE user_id::text = $1 AND resource = $2 AND resource_id::text = $3
-ORDER BY created_at DESC
-LIMIT 100
-`
-
-type ListResourceAuditLogsParams struct {
-	UserID     uuid.NullUUID `json:"user_id"`
-	Resource   string        `json:"resource"`
-	ResourceID uuid.NullUUID `json:"resource_id"`
-}
-
-type ListResourceAuditLogsRow struct {
-	ID         uuid.UUID `json:"id"`
-	UserID     string    `json:"user_id"`
-	Resource   string    `json:"resource"`
-	ResourceID string    `json:"resource_id"`
-	Action     string    `json:"action"`
-	Details    string    `json:"details"`
-	IpAddress  string    `json:"ip_address"`
-	UserAgent  string    `json:"user_agent"`
-	CreatedAt  time.Time `json:"created_at"`
-}
-
-func (q *Queries) ListResourceAuditLogs(ctx context.Context, arg ListResourceAuditLogsParams) ([]ListResourceAuditLogsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listResourceAuditLogs, arg.UserID, arg.Resource, arg.ResourceID)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListResourceAuditLogsRow{}
-	for rows.Next() {
-		var i ListResourceAuditLogsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.UserID,
-			&i.Resource,
-			&i.ResourceID,
-			&i.Action,
-			&i.Details,
-			&i.IpAddress,
-			&i.UserAgent,
-			&i.CreatedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const pruneAuditLogs = `-- name: PruneAuditLogs :execrows
-DELETE FROM audit_logs WHERE created_at < NOW() - ($1::int * INTERVAL '1 day')
-`
-
-func (q *Queries) PruneAuditLogs(ctx context.Context, dollar_1 int32) (int64, error) {
-	result, err := q.db.ExecContext(ctx, pruneAuditLogs, dollar_1)
-	if err != nil {
-		return 0, err
-	}
-	return result.RowsAffected()
-}
-
-const setAuditLogMetadata = `-- name: SetAuditLogMetadata :exec
-UPDATE audit_logs SET severity = $1, category = $2, label = $3 WHERE id = $4::uuid
-`
-
-type SetAuditLogMetadataParams struct {
-	Severity string    `json:"severity"`
-	Category string    `json:"category"`
-	Label    string    `json:"label"`
-	Column4  uuid.UUID `json:"column_4"`
-}
-
-func (q *Queries) SetAuditLogMetadata(ctx context.Context, arg SetAuditLogMetadataParams) error {
-	_, err := q.db.ExecContext(ctx, setAuditLogMetadata,
-		arg.Severity,
-		arg.Category,
-		arg.Label,
-		arg.Column4,
-	)
-	return err
-}

app/backend/internal/database/sqlcdb/auth.sql.go

@@ -34,24 +34,6 @@ func (q *Queries) CountUsersByEmail(ctx context.Context, email string) (int64, e
 	return count, err
 }
 
-const getAdminUserInfo = `-- name: GetAdminUserInfo :one
-SELECT email, COALESCE(name, '') AS name, is_admin
-FROM users WHERE id = $1
-`
-
-type GetAdminUserInfoRow struct {
-	Email   string `json:"email"`
-	Name    string `json:"name"`
-	IsAdmin bool   `json:"is_admin"`
-}
-
-func (q *Queries) GetAdminUserInfo(ctx context.Context, id uuid.UUID) (GetAdminUserInfoRow, error) {
-	row := q.db.QueryRowContext(ctx, getAdminUserInfo, id)
-	var i GetAdminUserInfoRow
-	err := row.Scan(&i.Email, &i.Name, &i.IsAdmin)
-	return i, err
-}
-
 const getUserByEmailForAuth = `-- name: GetUserByEmailForAuth :one
 SELECT id, email, password_hash, name, COALESCE(avatar_url, '') AS avatar_url, is_admin, created_at
 FROM users WHERE email = $1
@@ -186,69 +168,6 @@ func (q *Queries) InsertUserAdmin(ctx context.Context, arg InsertUserAdminParams
 	return i, err
 }
 
-const listAdminUsers = `-- name: ListAdminUsers :many
-SELECT id, email, name, COALESCE(avatar_url, '') AS avatar_url, is_admin,
-       COALESCE(to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"'), '')::text AS created_at
-FROM users
-ORDER BY created_at ASC
-`
-
-type ListAdminUsersRow struct {
-	ID        uuid.UUID `json:"id"`
-	Email     string    `json:"email"`
-	Name      string    `json:"name"`
-	AvatarUrl string    `json:"avatar_url"`
-	IsAdmin   bool      `json:"is_admin"`
-	CreatedAt string    `json:"created_at"`
-}
-
-func (q *Queries) ListAdminUsers(ctx context.Context) ([]ListAdminUsersRow, error) {
-	rows, err := q.db.QueryContext(ctx, listAdminUsers)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListAdminUsersRow{}
-	for rows.Next() {
-		var i ListAdminUsersRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.Email,
-			&i.Name,
-			&i.AvatarUrl,
-			&i.IsAdmin,
-			&i.CreatedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const setUserAdmin = `-- name: SetUserAdmin :execrows
-UPDATE users SET is_admin = $1, updated_at = NOW() WHERE id = $2
-`
-
-type SetUserAdminParams struct {
-	IsAdmin bool      `json:"is_admin"`
-	ID      uuid.UUID `json:"id"`
-}
-
-func (q *Queries) SetUserAdmin(ctx context.Context, arg SetUserAdminParams) (int64, error) {
-	result, err := q.db.ExecContext(ctx, setUserAdmin, arg.IsAdmin, arg.ID)
-	if err != nil {
-		return 0, err
-	}
-	return result.RowsAffected()
-}
-
 const updateUserProfile = `-- name: UpdateUserProfile :exec
 UPDATE users
 SET name = COALESCE($1::varchar, name), avatar_url = COALESCE($2::varchar, avatar_url)
@@ -266,27 +185,6 @@ func (q *Queries) UpdateUserProfile(ctx context.Context, arg UpdateUserProfilePa
 	return err
 }
 
-const upsertAdminUser = `-- name: UpsertAdminUser :one
-INSERT INTO users (email, password_hash, name, is_admin)
-VALUES ($1, $2, $3, true)
-ON CONFLICT (email) DO UPDATE
-SET is_admin = true, updated_at = NOW()
-RETURNING id
-`
-
-type UpsertAdminUserParams struct {
-	Email        string `json:"email"`
-	PasswordHash string `json:"password_hash"`
-	Name         string `json:"name"`
-}
-
-func (q *Queries) UpsertAdminUser(ctx context.Context, arg UpsertAdminUserParams) (uuid.UUID, error) {
-	row := q.db.QueryRowContext(ctx, upsertAdminUser, arg.Email, arg.PasswordHash, arg.Name)
-	var id uuid.UUID
-	err := row.Scan(&id)
-	return id, err
-}
-
 const upsertLocalUser = `-- name: UpsertLocalUser :one
 INSERT INTO users (email, password_hash, name, avatar_url, is_admin)
 VALUES ($1, $2, $3, NULLIF($4::varchar, ''), $5)

app/backend/internal/database/sqlcdb/builds.sql.go

@@ -1,138 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: builds.sql
-
-package sqlcdb
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"time"
-)
-
-const cancelBuild = `-- name: CancelBuild :execrows
-UPDATE builds
-SET status = 'cancelled',
-    progress = 100,
-    completed_at = $1,
-    log = COALESCE(log, '') || $2,
-    updated_at = $1
-WHERE id = $3
-  AND status NOT IN ('success', 'failed', 'cancelled')
-`
-
-type CancelBuildParams struct {
-	CompletedAt sql.NullTime `json:"completed_at"`
-	Log         string       `json:"log"`
-	ID          string       `json:"id"`
-}
-
-func (q *Queries) CancelBuild(ctx context.Context, arg CancelBuildParams) (int64, error) {
-	result, err := q.db.ExecContext(ctx, cancelBuild, arg.CompletedAt, arg.Log, arg.ID)
-	if err != nil {
-		return 0, err
-	}
-	return result.RowsAffected()
-}
-
-const getBuild = `-- name: GetBuild :one
-SELECT id, project_id, service_id, status, progress, started_at, completed_at, image_name, image_tag, size, error, log, metadata
-FROM builds
-WHERE id = $1
-`
-
-type GetBuildRow struct {
-	ID          string          `json:"id"`
-	ProjectID   sql.NullString  `json:"project_id"`
-	ServiceID   sql.NullString  `json:"service_id"`
-	Status      string          `json:"status"`
-	Progress    int32           `json:"progress"`
-	StartedAt   time.Time       `json:"started_at"`
-	CompletedAt sql.NullTime    `json:"completed_at"`
-	ImageName   string          `json:"image_name"`
-	ImageTag    string          `json:"image_tag"`
-	Size        int64           `json:"size"`
-	Error       sql.NullString  `json:"error"`
-	Log         string          `json:"log"`
-	Metadata    json.RawMessage `json:"metadata"`
-}
-
-func (q *Queries) GetBuild(ctx context.Context, id string) (GetBuildRow, error) {
-	row := q.db.QueryRowContext(ctx, getBuild, id)
-	var i GetBuildRow
-	err := row.Scan(
-		&i.ID,
-		&i.ProjectID,
-		&i.ServiceID,
-		&i.Status,
-		&i.Progress,
-		&i.StartedAt,
-		&i.CompletedAt,
-		&i.ImageName,
-		&i.ImageTag,
-		&i.Size,
-		&i.Error,
-		&i.Log,
-		&i.Metadata,
-	)
-	return i, err
-}
-
-const upsertBuild = `-- name: UpsertBuild :exec
-INSERT INTO builds
- (id, project_id, service_id, status, progress, started_at, completed_at, image_name, image_tag, size, error, log, metadata, created_at, updated_at)
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13::jsonb, $14, $14)
- ON CONFLICT (id) DO UPDATE SET
-   project_id = EXCLUDED.project_id,
-   service_id = EXCLUDED.service_id,
-   status = EXCLUDED.status,
-   progress = EXCLUDED.progress,
-   started_at = EXCLUDED.started_at,
-   completed_at = EXCLUDED.completed_at,
-   image_name = EXCLUDED.image_name,
-   image_tag = EXCLUDED.image_tag,
-   size = EXCLUDED.size,
-   error = EXCLUDED.error,
-   log = EXCLUDED.log,
-   metadata = EXCLUDED.metadata,
-   updated_at = EXCLUDED.updated_at
-`
-
-type UpsertBuildParams struct {
-	ID          string          `json:"id"`
-	ProjectID   sql.NullString  `json:"project_id"`
-	ServiceID   sql.NullString  `json:"service_id"`
-	Status      string          `json:"status"`
-	Progress    int32           `json:"progress"`
-	StartedAt   time.Time       `json:"started_at"`
-	CompletedAt sql.NullTime    `json:"completed_at"`
-	ImageName   string          `json:"image_name"`
-	ImageTag    string          `json:"image_tag"`
-	Size        int64           `json:"size"`
-	Error       sql.NullString  `json:"error"`
-	Log         string          `json:"log"`
-	Column13    json.RawMessage `json:"column_13"`
-	CreatedAt   time.Time       `json:"created_at"`
-}
-
-func (q *Queries) UpsertBuild(ctx context.Context, arg UpsertBuildParams) error {
-	_, err := q.db.ExecContext(ctx, upsertBuild,
-		arg.ID,
-		arg.ProjectID,
-		arg.ServiceID,
-		arg.Status,
-		arg.Progress,
-		arg.StartedAt,
-		arg.CompletedAt,
-		arg.ImageName,
-		arg.ImageTag,
-		arg.Size,
-		arg.Error,
-		arg.Log,
-		arg.Column13,
-		arg.CreatedAt,
-	)
-	return err
-}

app/backend/internal/database/sqlcdb/git.sql.go

@@ -157,28 +157,6 @@ func (q *Queries) GetGitProviderTimestamps(ctx context.Context, id uuid.UUID) (G
 	return i, err
 }
 
-const getGitRepoCloneByFullName = `-- name: GetGitRepoCloneByFullName :one
-SELECT clone_url, provider_id FROM git_repositories
-WHERE full_name = $1 AND user_id = $2 LIMIT 1
-`
-
-type GetGitRepoCloneByFullNameParams struct {
-	FullName string    `json:"full_name"`
-	UserID   uuid.UUID `json:"user_id"`
-}
-
-type GetGitRepoCloneByFullNameRow struct {
-	CloneUrl   string    `json:"clone_url"`
-	ProviderID uuid.UUID `json:"provider_id"`
-}
-
-func (q *Queries) GetGitRepoCloneByFullName(ctx context.Context, arg GetGitRepoCloneByFullNameParams) (GetGitRepoCloneByFullNameRow, error) {
-	row := q.db.QueryRowContext(ctx, getGitRepoCloneByFullName, arg.FullName, arg.UserID)
-	var i GetGitRepoCloneByFullNameRow
-	err := row.Scan(&i.CloneUrl, &i.ProviderID)
-	return i, err
-}
-
 const getGitRepoForPush = `-- name: GetGitRepoForPush :one
 SELECT clone_url, full_name, user_id FROM git_repositories WHERE id = $1
 `
@@ -196,23 +174,6 @@ func (q *Queries) GetGitRepoForPush(ctx context.Context, id uuid.UUID) (GetGitRe
 	return i, err
 }
 
-const getGitRepoProviderByCloneURL = `-- name: GetGitRepoProviderByCloneURL :one
-SELECT provider_id FROM git_repositories
-WHERE clone_url = $1 AND user_id = $2 LIMIT 1
-`
-
-type GetGitRepoProviderByCloneURLParams struct {
-	CloneUrl string    `json:"clone_url"`
-	UserID   uuid.UUID `json:"user_id"`
-}
-
-func (q *Queries) GetGitRepoProviderByCloneURL(ctx context.Context, arg GetGitRepoProviderByCloneURLParams) (uuid.UUID, error) {
-	row := q.db.QueryRowContext(ctx, getGitRepoProviderByCloneURL, arg.CloneUrl, arg.UserID)
-	var provider_id uuid.UUID
-	err := row.Scan(&provider_id)
-	return provider_id, err
-}
-
 const getGitRepositoryByFullName = `-- name: GetGitRepositoryByFullName :one
 SELECT id, provider_id, name, full_name, COALESCE(description, '') AS description,
        clone_url, COALESCE(webhook_url, '') AS webhook_url,

app/backend/internal/database/sqlcdb/misc.sql.go

@@ -1,174 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: misc.sql
-
-package sqlcdb
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"time"
-
-	"github.com/google/uuid"
-)
-
-const countProjects = `-- name: CountProjects :one
-SELECT COUNT(*) FROM projects
-`
-
-func (q *Queries) CountProjects(ctx context.Context) (int64, error) {
-	row := q.db.QueryRowContext(ctx, countProjects)
-	var count int64
-	err := row.Scan(&count)
-	return count, err
-}
-
-const deleteProjectVariables = `-- name: DeleteProjectVariables :exec
-DELETE FROM project_variables WHERE project_id = $1
-`
-
-func (q *Queries) DeleteProjectVariables(ctx context.Context, projectID uuid.UUID) error {
-	_, err := q.db.ExecContext(ctx, deleteProjectVariables, projectID)
-	return err
-}
-
-const getProjectVariableValue = `-- name: GetProjectVariableValue :one
-SELECT value FROM project_variables WHERE project_id = $1 AND key = $2
-`
-
-type GetProjectVariableValueParams struct {
-	ProjectID uuid.UUID `json:"project_id"`
-	Key       string    `json:"key"`
-}
-
-func (q *Queries) GetProjectVariableValue(ctx context.Context, arg GetProjectVariableValueParams) (string, error) {
-	row := q.db.QueryRowContext(ctx, getProjectVariableValue, arg.ProjectID, arg.Key)
-	var value string
-	err := row.Scan(&value)
-	return value, err
-}
-
-const getRegistryAuth = `-- name: GetRegistryAuth :one
-SELECT username, password FROM registries
-WHERE owner_id::text = $1 AND host = $2
-`
-
-type GetRegistryAuthParams struct {
-	OwnerID uuid.UUID `json:"owner_id"`
-	Host    string    `json:"host"`
-}
-
-type GetRegistryAuthRow struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
-func (q *Queries) GetRegistryAuth(ctx context.Context, arg GetRegistryAuthParams) (GetRegistryAuthRow, error) {
-	row := q.db.QueryRowContext(ctx, getRegistryAuth, arg.OwnerID, arg.Host)
-	var i GetRegistryAuthRow
-	err := row.Scan(&i.Username, &i.Password)
-	return i, err
-}
-
-const insertEnvVar = `-- name: InsertEnvVar :exec
-INSERT INTO environment_variables (id, service_id, key, value, is_secret, created_at, updated_at)
-VALUES ($1, $2, $3, $4, $5, $6, $7)
-`
-
-type InsertEnvVarParams struct {
-	ID        uuid.UUID    `json:"id"`
-	ServiceID uuid.UUID    `json:"service_id"`
-	Key       string       `json:"key"`
-	Value     string       `json:"value"`
-	IsSecret  sql.NullBool `json:"is_secret"`
-	CreatedAt sql.NullTime `json:"created_at"`
-	UpdatedAt sql.NullTime `json:"updated_at"`
-}
-
-func (q *Queries) InsertEnvVar(ctx context.Context, arg InsertEnvVarParams) error {
-	_, err := q.db.ExecContext(ctx, insertEnvVar,
-		arg.ID,
-		arg.ServiceID,
-		arg.Key,
-		arg.Value,
-		arg.IsSecret,
-		arg.CreatedAt,
-		arg.UpdatedAt,
-	)
-	return err
-}
-
-const insertProjectVariable = `-- name: InsertProjectVariable :exec
-INSERT INTO project_variables (id, project_id, key, value, is_secret, created_at, updated_at)
-VALUES ($1, $2, $3, $4, $5, $6, $7)
-`
-
-type InsertProjectVariableParams struct {
-	ID        uuid.UUID `json:"id"`
-	ProjectID uuid.UUID `json:"project_id"`
-	Key       string    `json:"key"`
-	Value     string    `json:"value"`
-	IsSecret  bool      `json:"is_secret"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
-}
-
-func (q *Queries) InsertProjectVariable(ctx context.Context, arg InsertProjectVariableParams) error {
-	_, err := q.db.ExecContext(ctx, insertProjectVariable,
-		arg.ID,
-		arg.ProjectID,
-		arg.Key,
-		arg.Value,
-		arg.IsSecret,
-		arg.CreatedAt,
-		arg.UpdatedAt,
-	)
-	return err
-}
-
-const updateServiceDeployMeta = `-- name: UpdateServiceDeployMeta :exec
-UPDATE services SET port = $1, healthcheck_path = $2,
-       volumes = COALESCE($3::jsonb, '[]'::jsonb),
-       git_repo = NULLIF($4::text, ''), git_branch = NULLIF($5::text, ''), builder = $6
-WHERE id = $7
-`
-
-type UpdateServiceDeployMetaParams struct {
-	Port            int32           `json:"port"`
-	HealthcheckPath string          `json:"healthcheck_path"`
-	Column3         json.RawMessage `json:"column_3"`
-	Column4         string          `json:"column_4"`
-	Column5         string          `json:"column_5"`
-	Builder         string          `json:"builder"`
-	ID              uuid.UUID       `json:"id"`
-}
-
-func (q *Queries) UpdateServiceDeployMeta(ctx context.Context, arg UpdateServiceDeployMetaParams) error {
-	_, err := q.db.ExecContext(ctx, updateServiceDeployMeta,
-		arg.Port,
-		arg.HealthcheckPath,
-		arg.Column3,
-		arg.Column4,
-		arg.Column5,
-		arg.Builder,
-		arg.ID,
-	)
-	return err
-}
-
-const updateServiceRuntimeMeta = `-- name: UpdateServiceRuntimeMeta :exec
-UPDATE services SET port = $1, healthcheck_path = $2 WHERE id = $3
-`
-
-type UpdateServiceRuntimeMetaParams struct {
-	Port            int32     `json:"port"`
-	HealthcheckPath string    `json:"healthcheck_path"`
-	ID              uuid.UUID `json:"id"`
-}
-
-func (q *Queries) UpdateServiceRuntimeMeta(ctx context.Context, arg UpdateServiceRuntimeMetaParams) error {
-	_, err := q.db.ExecContext(ctx, updateServiceRuntimeMeta, arg.Port, arg.HealthcheckPath, arg.ID)
-	return err
-}

app/backend/internal/database/sqlcdb/models.go

@@ -49,66 +49,6 @@ type AgentHeartbeat struct {
 	CreatedAt      time.Time       `json:"created_at"`
 }
 
-type ApiKey struct {
-	ID                uuid.UUID     `json:"id"`
-	Name              string        `json:"name"`
-	KeyHash           string        `json:"key_hash"`
-	KeyPrefix         string        `json:"key_prefix"`
-	Plan              string        `json:"plan"`
-	AllowedServiceIds string        `json:"allowed_service_ids"`
-	Enabled           int32         `json:"enabled"`
-	RpmLimit          sql.NullInt32 `json:"rpm_limit"`
-	MonthlyQuota      sql.NullInt32 `json:"monthly_quota"`
-	CreatedAt         time.Time     `json:"created_at"`
-	UpdatedAt         time.Time     `json:"updated_at"`
-	LastUsedAt        sql.NullTime  `json:"last_used_at"`
-}
-
-type ApiService struct {
-	ID                    uuid.UUID      `json:"id"`
-	Name                  string         `json:"name"`
-	Slug                  string         `json:"slug"`
-	UpstreamUrl           string         `json:"upstream_url"`
-	RoutePrefix           string         `json:"route_prefix"`
-	HealthPath            string         `json:"health_path"`
-	UpstreamAuthHeader    sql.NullString `json:"upstream_auth_header"`
-	UpstreamAuthValue     sql.NullString `json:"upstream_auth_value"`
-	InternalToken         sql.NullString `json:"internal_token"`
-	Enabled               int32          `json:"enabled"`
-	RpmLimit              sql.NullInt32  `json:"rpm_limit"`
-	MonthlyQuota          sql.NullInt32  `json:"monthly_quota"`
-	RequestTimeoutMs      sql.NullInt32  `json:"request_timeout_ms"`
-	LastValidationAt      sql.NullTime   `json:"last_validation_at"`
-	LastValidationStatus  sql.NullString `json:"last_validation_status"`
-	LastValidationMessage sql.NullString `json:"last_validation_message"`
-	CreatedAt             time.Time      `json:"created_at"`
-	UpdatedAt             time.Time      `json:"updated_at"`
-}
-
-type AppSetting struct {
-	Key       string    `json:"key"`
-	Value     string    `json:"value"`
-	IsSecret  bool      `json:"is_secret"`
-	UpdatedAt time.Time `json:"updated_at"`
-}
-
-type AuditLog struct {
-	ID         uuid.UUID             `json:"id"`
-	Timestamp  time.Time             `json:"timestamp"`
-	UserID     uuid.NullUUID         `json:"user_id"`
-	Action     string                `json:"action"`
-	Resource   string                `json:"resource"`
-	ResourceID uuid.NullUUID         `json:"resource_id"`
-	Details    pqtype.NullRawMessage `json:"details"`
-	IpAddress  pqtype.Inet           `json:"ip_address"`
-	UserAgent  sql.NullString        `json:"user_agent"`
-	Success    bool                  `json:"success"`
-	CreatedAt  time.Time             `json:"created_at"`
-	Severity   string                `json:"severity"`
-	Category   string                `json:"category"`
-	Label      string                `json:"label"`
-}
-
 type BackupTarget struct {
 	ID        string       `json:"id"`
 	UserID    string       `json:"user_id"`
@@ -138,24 +78,6 @@ type Banner struct {
 	UpdatedAt   sql.NullTime  `json:"updated_at"`
 }
 
-type Build struct {
-	ID          string          `json:"id"`
-	ProjectID   sql.NullString  `json:"project_id"`
-	ServiceID   sql.NullString  `json:"service_id"`
-	Status      string          `json:"status"`
-	Progress    int32           `json:"progress"`
-	StartedAt   time.Time       `json:"started_at"`
-	CompletedAt sql.NullTime    `json:"completed_at"`
-	ImageName   string          `json:"image_name"`
-	ImageTag    string          `json:"image_tag"`
-	Size        int64           `json:"size"`
-	Error       sql.NullString  `json:"error"`
-	Log         string          `json:"log"`
-	Metadata    json.RawMessage `json:"metadata"`
-	CreatedAt   time.Time       `json:"created_at"`
-	UpdatedAt   time.Time       `json:"updated_at"`
-}
-
 type ComplianceFramework struct {
 	ID          uuid.UUID      `json:"id"`
 	Name        string         `json:"name"`
@@ -340,18 +262,6 @@ type GitWebhook struct {
 	UpdatedAt       sql.NullTime   `json:"updated_at"`
 }
 
-type IncidentEvent struct {
-	ID         int32         `json:"id"`
-	ServiceID  uuid.NullUUID `json:"service_id"`
-	ApiKeyID   uuid.NullUUID `json:"api_key_id"`
-	Code       string        `json:"code"`
-	Message    string        `json:"message"`
-	Severity   string        `json:"severity"`
-	HttpStatus sql.NullInt32 `json:"http_status"`
-	Count      int32         `json:"count"`
-	OccurredAt time.Time     `json:"occurred_at"`
-}
-
 type InstanceMetric struct {
 	ServiceID             string         `json:"service_id"`
 	Timestamp             time.Time      `json:"timestamp"`
@@ -377,14 +287,6 @@ type InstanceMetric struct {
 	CreatedAt             sql.NullTime   `json:"created_at"`
 }
 
-type MetricsTimeseries struct {
-	ID         int32          `json:"id"`
-	Metric     string         `json:"metric"`
-	Value      float32        `json:"value"`
-	LabelsJson sql.NullString `json:"labels_json"`
-	OccurredAt time.Time      `json:"occurred_at"`
-}
-
 type NodeAgent struct {
 	ID            string                `json:"id"`
 	Name          string                `json:"name"`
@@ -506,16 +408,6 @@ type ProjectMember struct {
 	CreatedAt sql.NullTime `json:"created_at"`
 }
 
-type ProjectVariable struct {
-	ID        uuid.UUID `json:"id"`
-	ProjectID uuid.UUID `json:"project_id"`
-	Key       string    `json:"key"`
-	Value     string    `json:"value"`
-	IsSecret  bool      `json:"is_secret"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
-}
-
 type Registry struct {
 	ID        uuid.UUID `json:"id"`
 	OwnerID   uuid.UUID `json:"owner_id"`
@@ -643,15 +535,6 @@ type ServiceTemplate struct {
 	UpdatedAt   sql.NullTime          `json:"updated_at"`
 }
 
-type UsageCounter struct {
-	ID           int32     `json:"id"`
-	ApiKeyID     uuid.UUID `json:"api_key_id"`
-	ServiceID    uuid.UUID `json:"service_id"`
-	PeriodMonth  string    `json:"period_month"`
-	RequestCount int32     `json:"request_count"`
-	UpdatedAt    time.Time `json:"updated_at"`
-}
-
 type User struct {
 	ID           uuid.UUID      `json:"id"`
 	Email        string         `json:"email"`

app/backend/internal/database/sqlcdb/operations.sql.go

@@ -1,258 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: operations.sql
-
-package sqlcdb
-
-import (
-	"context"
-	"database/sql"
-	"time"
-
-	"github.com/google/uuid"
-)
-
-const listActiveOperationDeployments = `-- name: ListActiveOperationDeployments :many
-SELECT d.id, d.service_id, s.name AS service_name, p.name AS project_name, d.status,
-       COALESCE(d.image_name, '') AS image, d.error, d.started_at, d.completed_at, d.created_at
-FROM deployments d
-JOIN services s ON s.id = d.service_id
-JOIN projects p ON p.id = s.project_id
-WHERE d.status IN ('queued','pending','building','deploying','rolling_back')
-  AND (p.is_approved OR p.owner_id = $1 OR $2::bool
-    OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $1))
-ORDER BY d.created_at ASC
-`
-
-type ListActiveOperationDeploymentsParams struct {
-	OwnerID uuid.UUID `json:"owner_id"`
-	Column2 bool      `json:"column_2"`
-}
-
-type ListActiveOperationDeploymentsRow struct {
-	ID          uuid.UUID      `json:"id"`
-	ServiceID   uuid.UUID      `json:"service_id"`
-	ServiceName string         `json:"service_name"`
-	ProjectName string         `json:"project_name"`
-	Status      sql.NullString `json:"status"`
-	Image       string         `json:"image"`
-	Error       sql.NullString `json:"error"`
-	StartedAt   sql.NullTime   `json:"started_at"`
-	CompletedAt sql.NullTime   `json:"completed_at"`
-	CreatedAt   sql.NullTime   `json:"created_at"`
-}
-
-func (q *Queries) ListActiveOperationDeployments(ctx context.Context, arg ListActiveOperationDeploymentsParams) ([]ListActiveOperationDeploymentsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listActiveOperationDeployments, arg.OwnerID, arg.Column2)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListActiveOperationDeploymentsRow{}
-	for rows.Next() {
-		var i ListActiveOperationDeploymentsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.ServiceID,
-			&i.ServiceName,
-			&i.ProjectName,
-			&i.Status,
-			&i.Image,
-			&i.Error,
-			&i.StartedAt,
-			&i.CompletedAt,
-			&i.CreatedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listRecentCronRuns = `-- name: ListRecentCronRuns :many
-SELECT e.id, j.name AS job_name, j.schedule, e.status, e.started_at, e.finished_at, e.error
-FROM cron_executions e
-JOIN cron_jobs j ON j.id = e.cron_job_id
-JOIN projects p ON p.id = j.project_id
-WHERE e.started_at > NOW() - INTERVAL '24 hours'
-  AND (p.is_approved OR p.owner_id = $1 OR $2::bool
-    OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $1))
-ORDER BY e.started_at DESC
-LIMIT 30
-`
-
-type ListRecentCronRunsParams struct {
-	OwnerID uuid.UUID `json:"owner_id"`
-	Column2 bool      `json:"column_2"`
-}
-
-type ListRecentCronRunsRow struct {
-	ID         uuid.UUID      `json:"id"`
-	JobName    string         `json:"job_name"`
-	Schedule   string         `json:"schedule"`
-	Status     sql.NullString `json:"status"`
-	StartedAt  time.Time      `json:"started_at"`
-	FinishedAt sql.NullTime   `json:"finished_at"`
-	Error      sql.NullString `json:"error"`
-}
-
-func (q *Queries) ListRecentCronRuns(ctx context.Context, arg ListRecentCronRunsParams) ([]ListRecentCronRunsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listRecentCronRuns, arg.OwnerID, arg.Column2)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListRecentCronRunsRow{}
-	for rows.Next() {
-		var i ListRecentCronRunsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.JobName,
-			&i.Schedule,
-			&i.Status,
-			&i.StartedAt,
-			&i.FinishedAt,
-			&i.Error,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listRecentFailedDeployments = `-- name: ListRecentFailedDeployments :many
-SELECT d.id, d.service_id, s.name AS service_name, p.name AS project_name, d.status,
-       COALESCE(d.image_name, '') AS image, d.error, d.started_at, d.completed_at, d.created_at
-FROM deployments d
-JOIN services s ON s.id = d.service_id
-JOIN projects p ON p.id = s.project_id
-WHERE d.status IN ('failed','cancelled','rolled_back')
-  AND d.updated_at > NOW() - INTERVAL '24 hours'
-  AND (p.is_approved OR p.owner_id = $1 OR $2::bool
-    OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $1))
-ORDER BY d.updated_at DESC
-LIMIT 20
-`
-
-type ListRecentFailedDeploymentsParams struct {
-	OwnerID uuid.UUID `json:"owner_id"`
-	Column2 bool      `json:"column_2"`
-}
-
-type ListRecentFailedDeploymentsRow struct {
-	ID          uuid.UUID      `json:"id"`
-	ServiceID   uuid.UUID      `json:"service_id"`
-	ServiceName string         `json:"service_name"`
-	ProjectName string         `json:"project_name"`
-	Status      sql.NullString `json:"status"`
-	Image       string         `json:"image"`
-	Error       sql.NullString `json:"error"`
-	StartedAt   sql.NullTime   `json:"started_at"`
-	CompletedAt sql.NullTime   `json:"completed_at"`
-	CreatedAt   sql.NullTime   `json:"created_at"`
-}
-
-func (q *Queries) ListRecentFailedDeployments(ctx context.Context, arg ListRecentFailedDeploymentsParams) ([]ListRecentFailedDeploymentsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listRecentFailedDeployments, arg.OwnerID, arg.Column2)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListRecentFailedDeploymentsRow{}
-	for rows.Next() {
-		var i ListRecentFailedDeploymentsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.ServiceID,
-			&i.ServiceName,
-			&i.ProjectName,
-			&i.Status,
-			&i.Image,
-			&i.Error,
-			&i.StartedAt,
-			&i.CompletedAt,
-			&i.CreatedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listRecentOperationBackups = `-- name: ListRecentOperationBackups :many
-SELECT b.id, b.database_id, ds.name AS db_name, b.status, b.size, b.created_at, b.completed_at
-FROM database_backups b
-JOIN database_services ds ON ds.id = b.database_id
-WHERE b.created_at > NOW() - INTERVAL '24 hours'
-  AND (ds.user_id = $1 OR $2::bool)
-ORDER BY b.created_at DESC
-LIMIT 20
-`
-
-type ListRecentOperationBackupsParams struct {
-	UserID  string `json:"user_id"`
-	Column2 bool   `json:"column_2"`
-}
-
-type ListRecentOperationBackupsRow struct {
-	ID          string       `json:"id"`
-	DatabaseID  string       `json:"database_id"`
-	DbName      string       `json:"db_name"`
-	Status      string       `json:"status"`
-	Size        string       `json:"size"`
-	CreatedAt   sql.NullTime `json:"created_at"`
-	CompletedAt sql.NullTime `json:"completed_at"`
-}
-
-func (q *Queries) ListRecentOperationBackups(ctx context.Context, arg ListRecentOperationBackupsParams) ([]ListRecentOperationBackupsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listRecentOperationBackups, arg.UserID, arg.Column2)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListRecentOperationBackupsRow{}
-	for rows.Next() {
-		var i ListRecentOperationBackupsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.DatabaseID,
-			&i.DbName,
-			&i.Status,
-			&i.Size,
-			&i.CreatedAt,
-			&i.CompletedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}

app/backend/internal/database/sqlcdb/querier.go

@@ -16,7 +16,6 @@ type Querier interface {
 	// Portable bucket bucketing (no TimescaleDB): floor epoch seconds into
 	// bucket-sized buckets, then back to timestamptz.
 	AggregateNodeMetrics(ctx context.Context, arg AggregateNodeMetricsParams) ([]AggregateNodeMetricsRow, error)
-	CancelBuild(ctx context.Context, arg CancelBuildParams) (int64, error)
 	CheckSecurityProjectAccess(ctx context.Context, arg CheckSecurityProjectAccessParams) (bool, error)
 	ClearServiceDomainDefault(ctx context.Context, serviceID uuid.UUID) error
 	ClearServiceNodePins(ctx context.Context, nodeID sql.NullString) (int64, error)
@@ -26,8 +25,6 @@ type Querier interface {
 	CompleteCommand(ctx context.Context, arg CompleteCommandParams) (AgentCommand, error)
 	CompleteDeployment(ctx context.Context, arg CompleteDeploymentParams) error
 	ComplianceFrameworkExists(ctx context.Context, id uuid.UUID) (bool, error)
-	CountAPKeys(ctx context.Context) (int64, error)
-	CountAPServices(ctx context.Context) (int64, error)
 	CountAccessibleDeployments(ctx context.Context, arg CountAccessibleDeploymentsParams) (int64, error)
 	CountActivePreviewsForBranch(ctx context.Context, arg CountActivePreviewsForBranchParams) (int64, error)
 	CountDatabaseServicesByUserAndName(ctx context.Context, arg CountDatabaseServicesByUserAndNameParams) (int64, error)
@@ -35,7 +32,6 @@ type Querier interface {
 	CountDeploymentsForService(ctx context.Context, serviceID uuid.UUID) (int64, error)
 	CountEnvironmentServices(ctx context.Context, environmentID uuid.UUID) (int64, error)
 	CountGitRepositories(ctx context.Context, arg CountGitRepositoriesParams) (int64, error)
-	CountProjects(ctx context.Context) (int64, error)
 	CountProjectsByUser(ctx context.Context, arg CountProjectsByUserParams) (int64, error)
 	CountServiceDomains(ctx context.Context, serviceID uuid.UUID) (int64, error)
 	CountServicesByName(ctx context.Context, arg CountServicesByNameParams) (int64, error)
@@ -67,39 +63,30 @@ type Querier interface {
 	DatabaseServiceExistsByIDAndUser(ctx context.Context, arg DatabaseServiceExistsByIDAndUserParams) (bool, error)
 	DeleteAgent(ctx context.Context, id string) error
 	DeleteAllServiceDomains(ctx context.Context, serviceID uuid.UUID) error
-	DeleteAppSetting(ctx context.Context, key string) error
 	DeleteBackupTargetByIDAndUser(ctx context.Context, arg DeleteBackupTargetByIDAndUserParams) error
 	DeleteBanner(ctx context.Context, id uuid.UUID) error
 	DeleteCronJob(ctx context.Context, id uuid.UUID) error
 	DeleteDatabaseServiceByID(ctx context.Context, id string) error
 	DeleteDatabaseServiceByIDAndUser(ctx context.Context, arg DeleteDatabaseServiceByIDAndUserParams) error
-	DeleteEnvVarsForService(ctx context.Context, serviceID uuid.UUID) error
 	DeleteGitProvider(ctx context.Context, arg DeleteGitProviderParams) (int64, error)
 	DeleteNotificationChannel(ctx context.Context, arg DeleteNotificationChannelParams) (int64, error)
 	DeleteOutboundWebhookByIDAndUser(ctx context.Context, arg DeleteOutboundWebhookByIDAndUserParams) error
 	DeletePreviewEnvironment(ctx context.Context, id uuid.UUID) error
 	DeleteProjectByID(ctx context.Context, projectID uuid.UUID) (int64, error)
 	DeleteProjectEnvironment(ctx context.Context, arg DeleteProjectEnvironmentParams) error
-	DeleteProjectVariables(ctx context.Context, projectID uuid.UUID) error
 	DeleteServiceByID(ctx context.Context, id uuid.UUID) error
 	DeleteServiceContainersOnAgent(ctx context.Context, arg DeleteServiceContainersOnAgentParams) error
 	DeleteServiceDomain(ctx context.Context, arg DeleteServiceDomainParams) (int64, error)
 	DeleteUserInvite(ctx context.Context, id uuid.UUID) error
 	DeleteUserTemplate(ctx context.Context, arg DeleteUserTemplateParams) (int64, error)
 	FailDeployment(ctx context.Context, arg FailDeploymentParams) error
-	FailInterruptedDeployments(ctx context.Context) error
 	FinishCronExecution(ctx context.Context, arg FinishCronExecutionParams) error
-	GetAPServiceBySlug(ctx context.Context, slug string) (GetAPServiceBySlugRow, error)
-	GetAPServiceForValidate(ctx context.Context, id uuid.UUID) (GetAPServiceForValidateRow, error)
 	GetActiveAgentAuthTokenByHash(ctx context.Context, tokenHash string) (AgentAuthToken, error)
-	GetAdminUserInfo(ctx context.Context, id uuid.UUID) (GetAdminUserInfoRow, error)
 	GetAgent(ctx context.Context, id string) (NodeAgent, error)
 	GetAgentByHostAndIP(ctx context.Context, arg GetAgentByHostAndIPParams) (NodeAgent, error)
-	GetAppSetting(ctx context.Context, key string) (string, error)
 	GetBackupTargetByID(ctx context.Context, id string) (BackupTarget, error)
 	GetBackupTargetByIDAndUser(ctx context.Context, arg GetBackupTargetByIDAndUserParams) (BackupTarget, error)
 	GetBannerByID(ctx context.Context, id uuid.UUID) (Banner, error)
-	GetBuild(ctx context.Context, id string) (GetBuildRow, error)
 	GetCommandForAgent(ctx context.Context, arg GetCommandForAgentParams) (AgentCommand, error)
 	GetComplianceReportProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
 	GetContainer(ctx context.Context, id string) (ContainerInstance, error)
@@ -116,15 +103,12 @@ type Querier interface {
 	GetDeploymentAccess(ctx context.Context, id uuid.UUID) (GetDeploymentAccessRow, error)
 	GetDeploymentForRollback(ctx context.Context, id uuid.UUID) (GetDeploymentForRollbackRow, error)
 	GetDeploymentWithProject(ctx context.Context, id uuid.UUID) (GetDeploymentWithProjectRow, error)
-	GetEnvironmentProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
 	GetGitProviderForFetch(ctx context.Context, arg GetGitProviderForFetchParams) (GetGitProviderForFetchRow, error)
 	GetGitProviderForRepos(ctx context.Context, arg GetGitProviderForReposParams) (GetGitProviderForReposRow, error)
 	GetGitProviderName(ctx context.Context, arg GetGitProviderNameParams) (string, error)
 	GetGitProviderNameByID(ctx context.Context, id uuid.UUID) (string, error)
 	GetGitProviderTimestamps(ctx context.Context, id uuid.UUID) (GetGitProviderTimestampsRow, error)
-	GetGitRepoCloneByFullName(ctx context.Context, arg GetGitRepoCloneByFullNameParams) (GetGitRepoCloneByFullNameRow, error)
 	GetGitRepoForPush(ctx context.Context, id uuid.UUID) (GetGitRepoForPushRow, error)
-	GetGitRepoProviderByCloneURL(ctx context.Context, arg GetGitRepoProviderByCloneURLParams) (uuid.UUID, error)
 	GetGitRepositoryByFullName(ctx context.Context, arg GetGitRepositoryByFullNameParams) (GetGitRepositoryByFullNameRow, error)
 	GetGitRepositoryProviderID(ctx context.Context, arg GetGitRepositoryProviderIDParams) (uuid.UUID, error)
 	GetGitWebhookForPush(ctx context.Context, id uuid.UUID) (GetGitWebhookForPushRow, error)
@@ -132,7 +116,6 @@ type Querier interface {
 	GetLastDeployedImage(ctx context.Context, serviceID uuid.UUID) (string, error)
 	GetLatestComplianceReport(ctx context.Context, projectID uuid.UUID) (GetLatestComplianceReportRow, error)
 	GetLatestSecurityScan(ctx context.Context, projectID uuid.UUID) (GetLatestSecurityScanRow, error)
-	GetNodeAgentName(ctx context.Context, id string) (string, error)
 	GetOutboundWebhookByID(ctx context.Context, id uuid.UUID) (OutboundWebhook, error)
 	GetOutboundWebhookByIDAndUser(ctx context.Context, arg GetOutboundWebhookByIDAndUserParams) (OutboundWebhook, error)
 	GetPreviewEnvironment(ctx context.Context, arg GetPreviewEnvironmentParams) (GetPreviewEnvironmentRow, error)
@@ -147,10 +130,7 @@ type Querier interface {
 	GetProjectOwnerByID(ctx context.Context, projectID uuid.UUID) (uuid.UUID, error)
 	GetProjectOwnerID(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
 	GetProjectOwnerText(ctx context.Context, id uuid.UUID) (string, error)
-	GetProjectReadAccess(ctx context.Context, id uuid.UUID) (GetProjectReadAccessRow, error)
 	GetProjectRoleForUser(ctx context.Context, arg GetProjectRoleForUserParams) (string, error)
-	GetProjectVariableValue(ctx context.Context, arg GetProjectVariableValueParams) (string, error)
-	GetRegistryAuth(ctx context.Context, arg GetRegistryAuthParams) (GetRegistryAuthRow, error)
 	GetSecurityScanProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
 	GetServiceAccess(ctx context.Context, id uuid.UUID) (GetServiceAccessRow, error)
 	GetServiceDomainDefault(ctx context.Context, serviceID uuid.UUID) (string, error)
@@ -159,67 +139,39 @@ type Querier interface {
 	GetServiceEnvironment(ctx context.Context, id uuid.UUID) (string, error)
 	GetServiceForDeploy(ctx context.Context, id uuid.UUID) (GetServiceForDeployRow, error)
 	GetServiceForDeployWithOwner(ctx context.Context, id uuid.UUID) (GetServiceForDeployWithOwnerRow, error)
-	GetServiceNameProjectPort(ctx context.Context, id uuid.UUID) (GetServiceNameProjectPortRow, error)
-	GetServiceNodeID(ctx context.Context, id uuid.UUID) (sql.NullString, error)
 	GetServicePlacementBrief(ctx context.Context, id uuid.UUID) (GetServicePlacementBriefRow, error)
-	GetServicePlacementTags(ctx context.Context, id uuid.UUID) (json.RawMessage, error)
 	GetServicePort(ctx context.Context, id uuid.UUID) (int32, error)
-	GetServiceProjectAndStatus(ctx context.Context, id uuid.UUID) (GetServiceProjectAndStatusRow, error)
-	GetServiceProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
 	GetServicePublishedPort(ctx context.Context, id uuid.UUID) (int32, error)
 	GetServiceRuntimeWithOwner(ctx context.Context, id uuid.UUID) (GetServiceRuntimeWithOwnerRow, error)
-	GetServiceSleep(ctx context.Context, id uuid.UUID) (GetServiceSleepRow, error)
-	GetServiceSpread(ctx context.Context, id uuid.UUID) (bool, error)
 	GetServiceStatusText(ctx context.Context, id uuid.UUID) (string, error)
 	GetServiceTemplateByID(ctx context.Context, id string) (ServiceTemplate, error)
-	GetServiceTraefikLabels(ctx context.Context, id uuid.UUID) (json.RawMessage, error)
 	GetServiceTypeBrief(ctx context.Context, arg GetServiceTypeBriefParams) (GetServiceTypeBriefRow, error)
 	GetServiceVariableValue(ctx context.Context, arg GetServiceVariableValueParams) (string, error)
-	GetServiceVolumes(ctx context.Context, id uuid.UUID) (json.RawMessage, error)
 	GetUserByEmailForAuth(ctx context.Context, email string) (GetUserByEmailForAuthRow, error)
 	GetUserByID(ctx context.Context, id uuid.UUID) (GetUserByIDRow, error)
 	GetUserInviteByTokenHash(ctx context.Context, tokenHash string) (UserInvite, error)
-	GetUserIsAdmin(ctx context.Context, id uuid.UUID) (bool, error)
 	GetUserTokenByHash(ctx context.Context, tokenHash string) (UserToken, error)
 	GetVulnerabilityMetrics(ctx context.Context, projectID uuid.UUID) (GetVulnerabilityMetricsRow, error)
 	GetVulnerabilityProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
-	InsertAPKey(ctx context.Context, arg InsertAPKeyParams) (uuid.UUID, error)
-	InsertAPService(ctx context.Context, arg InsertAPServiceParams) (uuid.UUID, error)
 	InsertAgentHeartbeat(ctx context.Context, arg InsertAgentHeartbeatParams) error
-	InsertAuditLog(ctx context.Context, arg InsertAuditLogParams) error
-	InsertAuditLogWithRequest(ctx context.Context, arg InsertAuditLogWithRequestParams) error
 	InsertCronExecution(ctx context.Context, arg InsertCronExecutionParams) error
 	InsertCronJob(ctx context.Context, arg InsertCronJobParams) error
 	InsertDeployment(ctx context.Context, arg InsertDeploymentParams) error
-	InsertEnvVar(ctx context.Context, arg InsertEnvVarParams) error
-	InsertGatewayIncident(ctx context.Context, arg InsertGatewayIncidentParams) error
 	InsertGitProvider(ctx context.Context, arg InsertGitProviderParams) error
 	InsertGitRepository(ctx context.Context, arg InsertGitRepositoryParams) (InsertGitRepositoryRow, error)
-	InsertMetricPoint(ctx context.Context, labelsJson sql.NullString) error
 	InsertNotificationChannel(ctx context.Context, arg InsertNotificationChannelParams) (NotificationChannel, error)
 	InsertPendingDeployment(ctx context.Context, arg InsertPendingDeploymentParams) error
 	InsertProjectEnvironment(ctx context.Context, arg InsertProjectEnvironmentParams) error
-	InsertProjectVariable(ctx context.Context, arg InsertProjectVariableParams) error
-	InsertServiceIncident(ctx context.Context, arg InsertServiceIncidentParams) error
 	InsertUser(ctx context.Context, arg InsertUserParams) (InsertUserRow, error)
 	InsertUserAdmin(ctx context.Context, arg InsertUserAdminParams) (InsertUserAdminRow, error)
-	ListAPKeys(ctx context.Context) ([]ListAPKeysRow, error)
-	ListAPKeysByPrefix(ctx context.Context, keyPrefix string) ([]ListAPKeysByPrefixRow, error)
-	ListAPServices(ctx context.Context) ([]ListAPServicesRow, error)
 	ListActiveBanners(ctx context.Context) ([]Banner, error)
-	ListActiveOperationDeployments(ctx context.Context, arg ListActiveOperationDeploymentsParams) ([]ListActiveOperationDeploymentsRow, error)
-	ListAdminUserIDs(ctx context.Context) ([]uuid.UUID, error)
-	ListAdminUsers(ctx context.Context) ([]ListAdminUsersRow, error)
 	ListAgentAuthTokens(ctx context.Context) ([]AgentAuthToken, error)
-	ListAgentHealthRows(ctx context.Context, lastHeartbeat sql.NullTime) ([]ListAgentHealthRowsRow, error)
 	ListAgentHeartbeatsSince(ctx context.Context, arg ListAgentHeartbeatsSinceParams) ([]AgentHeartbeat, error)
 	ListAgents(ctx context.Context) ([]NodeAgent, error)
 	ListAllDatabaseServices(ctx context.Context) ([]DatabaseService, error)
 	ListAllNotificationChannelsByUser(ctx context.Context, userID uuid.UUID) ([]NotificationChannel, error)
-	ListAuditBackfillBatch(ctx context.Context, dollar_1 uuid.UUID) ([]ListAuditBackfillBatchRow, error)
 	ListBackupTargetsByUser(ctx context.Context, userID string) ([]BackupTarget, error)
 	ListBanners(ctx context.Context) ([]Banner, error)
-	ListClientEventPaths(ctx context.Context) ([]ListClientEventPathsRow, error)
 	ListCommandsForAgent(ctx context.Context, nodeAgentID string) ([]AgentCommand, error)
 	ListComplianceFrameworks(ctx context.Context) ([]ListComplianceFrameworksRow, error)
 	ListConnectedRepositories(ctx context.Context, arg ListConnectedRepositoriesParams) ([]ListConnectedRepositoriesRow, error)
@@ -235,7 +187,6 @@ type Querier interface {
 	ListExpiredPreviewsForUser(ctx context.Context, arg ListExpiredPreviewsForUserParams) ([]ListExpiredPreviewsForUserRow, error)
 	ListGitProviders(ctx context.Context, userID uuid.UUID) ([]ListGitProvidersRow, error)
 	ListGitRepositories(ctx context.Context, arg ListGitRepositoriesParams) ([]ListGitRepositoriesRow, error)
-	ListIncidentStatusCodes(ctx context.Context) ([]ListIncidentStatusCodesRow, error)
 	ListInstanceMetrics(ctx context.Context, arg ListInstanceMetricsParams) ([]ListInstanceMetricsRow, error)
 	ListNodeAgentsForService(ctx context.Context, serviceID string) ([]string, error)
 	ListNodeMetrics(ctx context.Context, arg ListNodeMetricsParams) ([]ListNodeMetricsRow, error)
@@ -252,18 +203,12 @@ type Querier interface {
 	// platform admin. Anonymous callers pass user_id = uuid.Nil, is_admin = false.
 	ListProjectsWithStatsByUser(ctx context.Context, arg ListProjectsWithStatsByUserParams) ([]ListProjectsWithStatsByUserRow, error)
 	ListRecentAccessibleDeployments(ctx context.Context, arg ListRecentAccessibleDeploymentsParams) ([]ListRecentAccessibleDeploymentsRow, error)
-	ListRecentCronRuns(ctx context.Context, arg ListRecentCronRunsParams) ([]ListRecentCronRunsRow, error)
-	ListRecentFailedDeployments(ctx context.Context, arg ListRecentFailedDeploymentsParams) ([]ListRecentFailedDeploymentsRow, error)
-	ListRecentOperationBackups(ctx context.Context, arg ListRecentOperationBackupsParams) ([]ListRecentOperationBackupsRow, error)
-	ListRequestsByDay(ctx context.Context) ([]ListRequestsByDayRow, error)
-	ListResourceAuditLogs(ctx context.Context, arg ListResourceAuditLogsParams) ([]ListResourceAuditLogsRow, error)
 	// Base domains of every online, schedulable agent carrying the required
 	// placement tags — auto-domain candidates for spread services.
 	ListSchedulableAgentDomains(ctx context.Context, dollar_1 json.RawMessage) ([]string, error)
 	ListSchedulableAgents(ctx context.Context) ([]ListSchedulableAgentsRow, error)
 	// Only agents carrying every required placement tag (jsonb array containment).
 	ListSchedulableAgentsMatching(ctx context.Context, dollar_1 json.RawMessage) ([]ListSchedulableAgentsMatchingRow, error)
-	ListSecretEnvVars(ctx context.Context) ([]ListSecretEnvVarsRow, error)
 	// Distinct agents holding inventory rows for a service.
 	ListServiceAgents(ctx context.Context, serviceID string) ([]string, error)
 	ListServiceContainers(ctx context.Context, serviceID string) ([]ListServiceContainersRow, error)
@@ -276,7 +221,6 @@ type Querier interface {
 	ListServicesForPush(ctx context.Context, arg ListServicesForPushParams) ([]ListServicesForPushRow, error)
 	ListSleepCandidates(ctx context.Context) ([]ListSleepCandidatesRow, error)
 	ListSweepablePreviews(ctx context.Context) ([]ListSweepablePreviewsRow, error)
-	ListTopAPServices(ctx context.Context) ([]ListTopAPServicesRow, error)
 	ListUserInvites(ctx context.Context) ([]UserInvite, error)
 	ListUserTokens(ctx context.Context, userID uuid.UUID) ([]UserToken, error)
 	ListVulnerabilities(ctx context.Context, projectID uuid.UUID) ([]ListVulnerabilitiesRow, error)
@@ -292,21 +236,14 @@ type Querier interface {
 	// Same resource-aware ordering as PickLeastLoadedAgent, restricted to agents
 	// carrying every required placement tag.
 	PickLeastLoadedAgentMatching(ctx context.Context, dollar_1 json.RawMessage) (string, error)
-	ProjectMemberExists(ctx context.Context, arg ProjectMemberExistsParams) (bool, error)
-	PruneAuditLogs(ctx context.Context, dollar_1 int32) (int64, error)
 	RevokeAgentAuthToken(ctx context.Context, id uuid.UUID) (AgentAuthToken, error)
 	RevokeUserToken(ctx context.Context, arg RevokeUserTokenParams) (int64, error)
 	ScrubCommandPayload(ctx context.Context, arg ScrubCommandPayloadParams) error
 	ServiceExistsInProject(ctx context.Context, arg ServiceExistsInProjectParams) (bool, error)
 	ServiceWriteAccess(ctx context.Context, arg ServiceWriteAccessParams) (bool, error)
-	SetAPKeyEnabled(ctx context.Context, arg SetAPKeyEnabledParams) error
-	SetAPServiceEnabled(ctx context.Context, arg SetAPServiceEnabledParams) error
-	SetAPServiceValidation(ctx context.Context, arg SetAPServiceValidationParams) error
 	SetAgentDefaultDomain(ctx context.Context, arg SetAgentDefaultDomainParams) error
 	SetAgentSchedulable(ctx context.Context, arg SetAgentSchedulableParams) error
-	SetAgentStatus(ctx context.Context, arg SetAgentStatusParams) error
 	SetAgentTags(ctx context.Context, arg SetAgentTagsParams) error
-	SetAuditLogMetadata(ctx context.Context, arg SetAuditLogMetadataParams) error
 	SetDatabaseBackupRemoteKeyByID(ctx context.Context, arg SetDatabaseBackupRemoteKeyByIDParams) error
 	SetDatabaseBackupScheduleByIDAndUser(ctx context.Context, arg SetDatabaseBackupScheduleByIDAndUserParams) error
 	SetDatabaseBackupStatusByID(ctx context.Context, arg SetDatabaseBackupStatusByIDParams) error
@@ -323,14 +260,8 @@ type Querier interface {
 	SetServicePublishedPort(ctx context.Context, arg SetServicePublishedPortParams) error
 	SetServiceReplicas(ctx context.Context, arg SetServiceReplicasParams) error
 	SetServiceStatus(ctx context.Context, arg SetServiceStatusParams) error
-	SetUserAdmin(ctx context.Context, arg SetUserAdminParams) (int64, error)
-	SumRequestMetricSince(ctx context.Context, dollar_1 string) (int32, error)
-	SumUsageByKey(ctx context.Context, arg SumUsageByKeyParams) (int64, error)
-	SumUsageByService(ctx context.Context, arg SumUsageByServiceParams) (int64, error)
-	SumUsageCounters(ctx context.Context) (interface{}, error)
 	SyncDeploymentProgress(ctx context.Context, arg SyncDeploymentProgressParams) error
 	SyncPreviewStatuses(ctx context.Context) error
-	TouchAPKeyLastUsed(ctx context.Context, id uuid.UUID) error
 	TouchAgentAuthToken(ctx context.Context, tokenHash string) error
 	TouchServiceDomainChecked(ctx context.Context, id uuid.UUID) error
 	TouchUserToken(ctx context.Context, id uuid.UUID) error
@@ -351,21 +282,14 @@ type Querier interface {
 	UpdateDatabaseServiceNameAndPlanByIDAndUser(ctx context.Context, arg UpdateDatabaseServiceNameAndPlanByIDAndUserParams) error
 	UpdateDatabaseServiceNameByIDAndUser(ctx context.Context, arg UpdateDatabaseServiceNameByIDAndUserParams) error
 	UpdateDatabaseServicePlanByIDAndUser(ctx context.Context, arg UpdateDatabaseServicePlanByIDAndUserParams) error
-	UpdateEnvVarValue(ctx context.Context, arg UpdateEnvVarValueParams) error
 	UpdateOutboundWebhook(ctx context.Context, arg UpdateOutboundWebhookParams) error
 	UpdatePreviewEnvironment(ctx context.Context, arg UpdatePreviewEnvironmentParams) error
 	UpdateProjectByID(ctx context.Context, arg UpdateProjectByIDParams) (int64, error)
-	UpdateServiceDeployMeta(ctx context.Context, arg UpdateServiceDeployMetaParams) error
 	UpdateServicePreviewBranch(ctx context.Context, arg UpdateServicePreviewBranchParams) error
-	UpdateServiceRuntimeMeta(ctx context.Context, arg UpdateServiceRuntimeMetaParams) error
 	UpdateUserProfile(ctx context.Context, arg UpdateUserProfileParams) error
 	UpdateUserTemplate(ctx context.Context, arg UpdateUserTemplateParams) (int64, error)
 	UpdateVulnerabilityStatus(ctx context.Context, arg UpdateVulnerabilityStatusParams) error
 	UpdateWebhookDeliveryResult(ctx context.Context, arg UpdateWebhookDeliveryResultParams) error
-	UpsertAdminUser(ctx context.Context, arg UpsertAdminUserParams) (uuid.UUID, error)
-	UpsertAppSetting(ctx context.Context, arg UpsertAppSettingParams) error
-	UpsertAppSettingValue(ctx context.Context, arg UpsertAppSettingValueParams) error
-	UpsertBuild(ctx context.Context, arg UpsertBuildParams) error
 	UpsertEnvironmentVariable(ctx context.Context, arg UpsertEnvironmentVariableParams) error
 	UpsertGitHubAppProvider(ctx context.Context, arg UpsertGitHubAppProviderParams) (UpsertGitHubAppProviderRow, error)
 	UpsertGitRepository(ctx context.Context, arg UpsertGitRepositoryParams) error
@@ -376,7 +300,6 @@ type Querier interface {
 	UpsertServiceContainer(ctx context.Context, arg UpsertServiceContainerParams) error
 	UpsertServiceMetrics(ctx context.Context, arg UpsertServiceMetricsParams) error
 	UpsertServiceTemplate(ctx context.Context, arg UpsertServiceTemplateParams) error
-	UpsertUsageCounter(ctx context.Context, arg UpsertUsageCounterParams) error
 }
 
 var _ Querier = (*Queries)(nil)

app/backend/internal/database/sqlcdb/services_meta.sql.go

@@ -1,308 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: services_meta.sql
-
-package sqlcdb
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-
-	"github.com/google/uuid"
-)
-
-const deleteEnvVarsForService = `-- name: DeleteEnvVarsForService :exec
-DELETE FROM environment_variables WHERE service_id = $1
-`
-
-func (q *Queries) DeleteEnvVarsForService(ctx context.Context, serviceID uuid.UUID) error {
-	_, err := q.db.ExecContext(ctx, deleteEnvVarsForService, serviceID)
-	return err
-}
-
-const failInterruptedDeployments = `-- name: FailInterruptedDeployments :exec
-UPDATE deployments SET status = 'failed', error = 'Interrupted by server restart', completed_at = NOW(), updated_at = NOW()
-WHERE status IN ('queued', 'pending', 'building', 'deploying', 'rolling_back')
-`
-
-func (q *Queries) FailInterruptedDeployments(ctx context.Context) error {
-	_, err := q.db.ExecContext(ctx, failInterruptedDeployments)
-	return err
-}
-
-const getEnvironmentProjectID = `-- name: GetEnvironmentProjectID :one
-SELECT project_id FROM environments WHERE id = $1
-`
-
-func (q *Queries) GetEnvironmentProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error) {
-	row := q.db.QueryRowContext(ctx, getEnvironmentProjectID, id)
-	var project_id uuid.UUID
-	err := row.Scan(&project_id)
-	return project_id, err
-}
-
-const getNodeAgentName = `-- name: GetNodeAgentName :one
-SELECT name FROM node_agents WHERE id = $1
-`
-
-func (q *Queries) GetNodeAgentName(ctx context.Context, id string) (string, error) {
-	row := q.db.QueryRowContext(ctx, getNodeAgentName, id)
-	var name string
-	err := row.Scan(&name)
-	return name, err
-}
-
-const getProjectReadAccess = `-- name: GetProjectReadAccess :one
-SELECT is_approved, owner_id::text FROM projects WHERE id = $1
-`
-
-type GetProjectReadAccessRow struct {
-	IsApproved bool   `json:"is_approved"`
-	OwnerID    string `json:"owner_id"`
-}
-
-func (q *Queries) GetProjectReadAccess(ctx context.Context, id uuid.UUID) (GetProjectReadAccessRow, error) {
-	row := q.db.QueryRowContext(ctx, getProjectReadAccess, id)
-	var i GetProjectReadAccessRow
-	err := row.Scan(&i.IsApproved, &i.OwnerID)
-	return i, err
-}
-
-const getServiceNameProjectPort = `-- name: GetServiceNameProjectPort :one
-SELECT name, project_id::text, COALESCE(port, 0)::int AS port
-FROM services WHERE id::text = $1
-`
-
-type GetServiceNameProjectPortRow struct {
-	Name      string `json:"name"`
-	ProjectID string `json:"project_id"`
-	Port      int32  `json:"port"`
-}
-
-func (q *Queries) GetServiceNameProjectPort(ctx context.Context, id uuid.UUID) (GetServiceNameProjectPortRow, error) {
-	row := q.db.QueryRowContext(ctx, getServiceNameProjectPort, id)
-	var i GetServiceNameProjectPortRow
-	err := row.Scan(&i.Name, &i.ProjectID, &i.Port)
-	return i, err
-}
-
-const getServiceNodeID = `-- name: GetServiceNodeID :one
-SELECT node_id FROM services WHERE id = $1
-`
-
-func (q *Queries) GetServiceNodeID(ctx context.Context, id uuid.UUID) (sql.NullString, error) {
-	row := q.db.QueryRowContext(ctx, getServiceNodeID, id)
-	var node_id sql.NullString
-	err := row.Scan(&node_id)
-	return node_id, err
-}
-
-const getServicePlacementTags = `-- name: GetServicePlacementTags :one
-SELECT placement_tags FROM services WHERE id = $1
-`
-
-func (q *Queries) GetServicePlacementTags(ctx context.Context, id uuid.UUID) (json.RawMessage, error) {
-	row := q.db.QueryRowContext(ctx, getServicePlacementTags, id)
-	var placement_tags json.RawMessage
-	err := row.Scan(&placement_tags)
-	return placement_tags, err
-}
-
-const getServiceProjectAndStatus = `-- name: GetServiceProjectAndStatus :one
-SELECT s.project_id, COALESCE(s.status, '') AS status
-FROM services s WHERE s.id = $1
-`
-
-type GetServiceProjectAndStatusRow struct {
-	ProjectID uuid.UUID `json:"project_id"`
-	Status    string    `json:"status"`
-}
-
-func (q *Queries) GetServiceProjectAndStatus(ctx context.Context, id uuid.UUID) (GetServiceProjectAndStatusRow, error) {
-	row := q.db.QueryRowContext(ctx, getServiceProjectAndStatus, id)
-	var i GetServiceProjectAndStatusRow
-	err := row.Scan(&i.ProjectID, &i.Status)
-	return i, err
-}
-
-const getServiceProjectID = `-- name: GetServiceProjectID :one
-SELECT project_id FROM services WHERE id = $1
-`
-
-func (q *Queries) GetServiceProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error) {
-	row := q.db.QueryRowContext(ctx, getServiceProjectID, id)
-	var project_id uuid.UUID
-	err := row.Scan(&project_id)
-	return project_id, err
-}
-
-const getServiceSleep = `-- name: GetServiceSleep :one
-SELECT COALESCE(sleep_enabled, false) AS sleep_enabled, COALESCE(sleep_idle_minutes, 15) AS sleep_idle_minutes
-FROM services WHERE id = $1
-`
-
-type GetServiceSleepRow struct {
-	SleepEnabled     bool  `json:"sleep_enabled"`
-	SleepIdleMinutes int32 `json:"sleep_idle_minutes"`
-}
-
-func (q *Queries) GetServiceSleep(ctx context.Context, id uuid.UUID) (GetServiceSleepRow, error) {
-	row := q.db.QueryRowContext(ctx, getServiceSleep, id)
-	var i GetServiceSleepRow
-	err := row.Scan(&i.SleepEnabled, &i.SleepIdleMinutes)
-	return i, err
-}
-
-const getServiceSpread = `-- name: GetServiceSpread :one
-SELECT COALESCE(spread, false) FROM services WHERE id = $1
-`
-
-func (q *Queries) GetServiceSpread(ctx context.Context, id uuid.UUID) (bool, error) {
-	row := q.db.QueryRowContext(ctx, getServiceSpread, id)
-	var spread bool
-	err := row.Scan(&spread)
-	return spread, err
-}
-
-const getServiceTraefikLabels = `-- name: GetServiceTraefikLabels :one
-SELECT traefik_labels FROM services WHERE id = $1
-`
-
-func (q *Queries) GetServiceTraefikLabels(ctx context.Context, id uuid.UUID) (json.RawMessage, error) {
-	row := q.db.QueryRowContext(ctx, getServiceTraefikLabels, id)
-	var traefik_labels json.RawMessage
-	err := row.Scan(&traefik_labels)
-	return traefik_labels, err
-}
-
-const getServiceVolumes = `-- name: GetServiceVolumes :one
-SELECT volumes FROM services WHERE id = $1
-`
-
-func (q *Queries) GetServiceVolumes(ctx context.Context, id uuid.UUID) (json.RawMessage, error) {
-	row := q.db.QueryRowContext(ctx, getServiceVolumes, id)
-	var volumes json.RawMessage
-	err := row.Scan(&volumes)
-	return volumes, err
-}
-
-const listAgentHealthRows = `-- name: ListAgentHealthRows :many
-SELECT id, COALESCE(name, hostname, id::text) AS name, COALESCE(status, '') AS status,
-       COALESCE(last_heartbeat < $1, TRUE)::bool AS stale, auto_prune
-FROM node_agents
-`
-
-type ListAgentHealthRowsRow struct {
-	ID        string `json:"id"`
-	Name      string `json:"name"`
-	Status    string `json:"status"`
-	Stale     bool   `json:"stale"`
-	AutoPrune bool   `json:"auto_prune"`
-}
-
-func (q *Queries) ListAgentHealthRows(ctx context.Context, lastHeartbeat sql.NullTime) ([]ListAgentHealthRowsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listAgentHealthRows, lastHeartbeat)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListAgentHealthRowsRow{}
-	for rows.Next() {
-		var i ListAgentHealthRowsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.Name,
-			&i.Status,
-			&i.Stale,
-			&i.AutoPrune,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listSecretEnvVars = `-- name: ListSecretEnvVars :many
-SELECT id, value FROM environment_variables WHERE is_secret = TRUE
-`
-
-type ListSecretEnvVarsRow struct {
-	ID    uuid.UUID `json:"id"`
-	Value string    `json:"value"`
-}
-
-func (q *Queries) ListSecretEnvVars(ctx context.Context) ([]ListSecretEnvVarsRow, error) {
-	rows, err := q.db.QueryContext(ctx, listSecretEnvVars)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListSecretEnvVarsRow{}
-	for rows.Next() {
-		var i ListSecretEnvVarsRow
-		if err := rows.Scan(&i.ID, &i.Value); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const projectMemberExists = `-- name: ProjectMemberExists :one
-SELECT EXISTS(SELECT 1 FROM project_members WHERE project_id = $1 AND user_id = $2)
-`
-
-type ProjectMemberExistsParams struct {
-	ProjectID uuid.UUID `json:"project_id"`
-	UserID    uuid.UUID `json:"user_id"`
-}
-
-func (q *Queries) ProjectMemberExists(ctx context.Context, arg ProjectMemberExistsParams) (bool, error) {
-	row := q.db.QueryRowContext(ctx, projectMemberExists, arg.ProjectID, arg.UserID)
-	var exists bool
-	err := row.Scan(&exists)
-	return exists, err
-}
-
-const setAgentStatus = `-- name: SetAgentStatus :exec
-UPDATE node_agents SET status = $1, updated_at = NOW() WHERE id = $2
-`
-
-type SetAgentStatusParams struct {
-	Status sql.NullString `json:"status"`
-	ID     string         `json:"id"`
-}
-
-func (q *Queries) SetAgentStatus(ctx context.Context, arg SetAgentStatusParams) error {
-	_, err := q.db.ExecContext(ctx, setAgentStatus, arg.Status, arg.ID)
-	return err
-}
-
-const updateEnvVarValue = `-- name: UpdateEnvVarValue :exec
-UPDATE environment_variables SET value = $1, updated_at = NOW() WHERE id = $2
-`
-
-type UpdateEnvVarValueParams struct {
-	Value string    `json:"value"`
-	ID    uuid.UUID `json:"id"`
-}
-
-func (q *Queries) UpdateEnvVarValue(ctx context.Context, arg UpdateEnvVarValueParams) error {
-	_, err := q.db.ExecContext(ctx, updateEnvVarValue, arg.Value, arg.ID)
-	return err
-}

app/backend/internal/database/sqlcdb/settings.sql.go

@@ -1,103 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: settings.sql
-
-package sqlcdb
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-)
-
-const deleteAppSetting = `-- name: DeleteAppSetting :exec
-DELETE FROM app_settings WHERE key = $1
-`
-
-func (q *Queries) DeleteAppSetting(ctx context.Context, key string) error {
-	_, err := q.db.ExecContext(ctx, deleteAppSetting, key)
-	return err
-}
-
-const getAppSetting = `-- name: GetAppSetting :one
-SELECT value FROM app_settings WHERE key = $1
-`
-
-func (q *Queries) GetAppSetting(ctx context.Context, key string) (string, error) {
-	row := q.db.QueryRowContext(ctx, getAppSetting, key)
-	var value string
-	err := row.Scan(&value)
-	return value, err
-}
-
-const getUserIsAdmin = `-- name: GetUserIsAdmin :one
-SELECT is_admin FROM users WHERE id = $1
-`
-
-func (q *Queries) GetUserIsAdmin(ctx context.Context, id uuid.UUID) (bool, error) {
-	row := q.db.QueryRowContext(ctx, getUserIsAdmin, id)
-	var is_admin bool
-	err := row.Scan(&is_admin)
-	return is_admin, err
-}
-
-const listAdminUserIDs = `-- name: ListAdminUserIDs :many
-SELECT id FROM users WHERE is_admin
-`
-
-func (q *Queries) ListAdminUserIDs(ctx context.Context) ([]uuid.UUID, error) {
-	rows, err := q.db.QueryContext(ctx, listAdminUserIDs)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []uuid.UUID{}
-	for rows.Next() {
-		var id uuid.UUID
-		if err := rows.Scan(&id); err != nil {
-			return nil, err
-		}
-		items = append(items, id)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const upsertAppSetting = `-- name: UpsertAppSetting :exec
-INSERT INTO app_settings (key, value, is_secret, updated_at)
-VALUES ($1, $2, $3, NOW())
-ON CONFLICT (key) DO UPDATE
-SET value = EXCLUDED.value, is_secret = EXCLUDED.is_secret, updated_at = NOW()
-`
-
-type UpsertAppSettingParams struct {
-	Key      string `json:"key"`
-	Value    string `json:"value"`
-	IsSecret bool   `json:"is_secret"`
-}
-
-func (q *Queries) UpsertAppSetting(ctx context.Context, arg UpsertAppSettingParams) error {
-	_, err := q.db.ExecContext(ctx, upsertAppSetting, arg.Key, arg.Value, arg.IsSecret)
-	return err
-}
-
-const upsertAppSettingValue = `-- name: UpsertAppSettingValue :exec
-INSERT INTO app_settings (key, value, updated_at) VALUES ($1, $2, NOW())
-ON CONFLICT (key) DO UPDATE SET value = $2, updated_at = NOW()
-`
-
-type UpsertAppSettingValueParams struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
-}
-
-func (q *Queries) UpsertAppSettingValue(ctx context.Context, arg UpsertAppSettingValueParams) error {
-	_, err := q.db.ExecContext(ctx, upsertAppSettingValue, arg.Key, arg.Value)
-	return err
-}

app/backend/sqlc/queries/apwhy.sql

@@ -1,125 +0,0 @@
--- name: GetAPServiceForValidate :one
-SELECT upstream_url, health_path, upstream_auth_header, upstream_auth_value, request_timeout_ms
-FROM api_services WHERE id = $1;
-
--- name: SetAPServiceValidation :exec
-UPDATE api_services
-SET last_validation_at = NOW(), last_validation_status = $1, last_validation_message = $2, updated_at = NOW()
-WHERE id = $3;
-
--- name: InsertServiceIncident :exec
-INSERT INTO incident_events (service_id, code, message, severity, http_status, occurred_at)
-VALUES ($1, 'SERVICE_VALIDATION_FAILED', $2, 'medium', $3, NOW());
-
--- name: InsertGatewayIncident :exec
-INSERT INTO incident_events (service_id, api_key_id, code, message, severity, http_status, occurred_at)
-VALUES ($1, $2, $3, $4, $5, $6, NOW());
-
--- name: ListAPServices :many
-SELECT id, name, slug, upstream_url, route_prefix, enabled,
-       to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS created_at,
-       to_char(updated_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS updated_at
-FROM api_services
-ORDER BY created_at DESC;
-
--- name: InsertAPService :one
-INSERT INTO api_services (
-    name, slug, upstream_url, route_prefix, health_path,
-    rpm_limit, monthly_quota, created_at, updated_at
-) VALUES ($1, $2, $3, $4, '/health', $5, $6, NOW(), NOW())
-RETURNING id;
-
--- name: SetAPServiceEnabled :exec
-UPDATE api_services SET enabled = $1, updated_at = NOW() WHERE id = $2;
-
--- name: ListAPKeys :many
-SELECT id, name, key_prefix, plan, enabled, rpm_limit, monthly_quota,
-       to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS created_at,
-       to_char(updated_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS updated_at
-FROM api_keys
-ORDER BY created_at DESC;
-
--- name: InsertAPKey :one
-INSERT INTO api_keys (
-    name, key_hash, key_prefix, plan, allowed_service_ids,
-    rpm_limit, monthly_quota, created_at, updated_at
-) VALUES ($1, $2, $3, $4, '[]', $5, $6, NOW(), NOW())
-RETURNING id;
-
--- name: SetAPKeyEnabled :exec
-UPDATE api_keys SET enabled = $1, updated_at = NOW() WHERE id = $2;
-
--- name: CountAPServices :one
-SELECT COUNT(*) FROM api_services;
-
--- name: CountAPKeys :one
-SELECT COUNT(*) FROM api_keys;
-
--- name: SumUsageCounters :one
-SELECT COALESCE(SUM(request_count), 0) FROM usage_counters;
-
--- name: SumRequestMetricSince :one
-SELECT COALESCE(SUM(value), 0)::int
-FROM metrics_timeseries
-WHERE metric = 'request_total' AND occurred_at >= DATE_TRUNC($1::text, NOW());
-
--- name: ListTopAPServices :many
-SELECT s.id, s.name, COALESCE(SUM(u.request_count), 0) AS total_requests
-FROM api_services s
-LEFT JOIN usage_counters u ON u.service_id = s.id
-GROUP BY s.id, s.name
-ORDER BY total_requests DESC, s.name ASC
-LIMIT 10;
-
--- name: ListRequestsByDay :many
-SELECT TO_CHAR(DATE_TRUNC('day', occurred_at), 'YYYY-MM-DD') AS day_bucket, COUNT(*) AS total
-FROM metrics_timeseries
-WHERE metric = 'request_total' AND occurred_at >= NOW() - INTERVAL '7 days'
-GROUP BY DATE_TRUNC('day', occurred_at)
-ORDER BY DATE_TRUNC('day', occurred_at) ASC;
-
--- name: ListIncidentStatusCodes :many
-SELECT COALESCE(http_status, 0) AS status_code, COALESCE(SUM(count), 0) AS total
-FROM incident_events
-WHERE occurred_at >= NOW() - INTERVAL '7 days'
-GROUP BY COALESCE(http_status, 0)
-ORDER BY total DESC, status_code ASC;
-
--- name: ListClientEventPaths :many
-SELECT COALESCE((labels_json::jsonb ->> 'path'), 'unknown') AS path, COUNT(*) AS total
-FROM metrics_timeseries
-WHERE metric = 'client_event' AND occurred_at >= NOW() - INTERVAL '7 days'
-GROUP BY COALESCE((labels_json::jsonb ->> 'path'), 'unknown')
-ORDER BY total DESC, path ASC
-LIMIT 20;
-
--- name: GetAPServiceBySlug :one
-SELECT id, upstream_url, route_prefix, upstream_auth_header,
-       upstream_auth_value, enabled, rpm_limit, monthly_quota,
-       request_timeout_ms
-FROM api_services WHERE slug = $1;
-
--- name: ListAPKeysByPrefix :many
-SELECT id, key_hash, enabled, rpm_limit, monthly_quota, allowed_service_ids
-FROM api_keys WHERE key_prefix = $1;
-
--- name: SumUsageByKey :one
-SELECT COALESCE(SUM(request_count), 0)::bigint FROM usage_counters
-WHERE api_key_id = $1 AND period_month = $2;
-
--- name: SumUsageByService :one
-SELECT COALESCE(SUM(request_count), 0)::bigint FROM usage_counters
-WHERE service_id = $1 AND period_month = $2;
-
--- name: UpsertUsageCounter :exec
-INSERT INTO usage_counters (api_key_id, service_id, period_month, request_count, updated_at)
-VALUES ($1, $2, $3, 1, NOW())
-ON CONFLICT (api_key_id, service_id, period_month)
-DO UPDATE SET request_count = usage_counters.request_count + 1, updated_at = NOW();
-
--- name: TouchAPKeyLastUsed :exec
-UPDATE api_keys SET last_used_at = NOW() WHERE id = $1;
-
--- name: InsertMetricPoint :exec
-INSERT INTO metrics_timeseries (metric, value, labels_json, occurred_at)
-VALUES ('gateway_request', 1, $1, NOW());

app/backend/sqlc/queries/audit.sql

@@ -1,28 +0,0 @@
--- name: InsertAuditLog :exec
-INSERT INTO audit_logs (id, user_id, resource, resource_id, action, details, severity, category, label, created_at)
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);
-
--- name: InsertAuditLogWithRequest :exec
-INSERT INTO audit_logs (id, user_id, resource, resource_id, action, details, ip_address, user_agent, severity, category, label, created_at)
-VALUES ($1, $2, $3, $4, $5, $6::jsonb, $7::inet, $8, $9, $10, $11, $12);
-
--- name: PruneAuditLogs :execrows
-DELETE FROM audit_logs WHERE created_at < NOW() - ($1::int * INTERVAL '1 day');
-
--- name: ListAuditBackfillBatch :many
-SELECT id::text, resource, action FROM audit_logs
-WHERE label = '' AND id > $1::uuid ORDER BY id LIMIT 500;
-
--- name: SetAuditLogMetadata :exec
-UPDATE audit_logs SET severity = $1, category = $2, label = $3 WHERE id = $4::uuid;
-
--- name: ListResourceAuditLogs :many
-SELECT id, COALESCE(user_id::text, '')::text AS user_id, resource,
-       COALESCE(resource_id::text, '')::text AS resource_id, action,
-       COALESCE(details::text, '{}')::text AS details,
-       COALESCE(ip_address::text, '')::text AS ip_address,
-       COALESCE(user_agent, '') AS user_agent, created_at
-FROM audit_logs
-WHERE user_id::text = $1 AND resource = $2 AND resource_id::text = $3
-ORDER BY created_at DESC
-LIMIT 100;

app/backend/sqlc/queries/auth.sql

@@ -35,23 +35,3 @@ FROM users WHERE id = $1;
 UPDATE users
 SET name = COALESCE($1::varchar, name), avatar_url = COALESCE($2::varchar, avatar_url)
 WHERE id = $3;
-
--- name: UpsertAdminUser :one
-INSERT INTO users (email, password_hash, name, is_admin)
-VALUES ($1, $2, $3, true)
-ON CONFLICT (email) DO UPDATE
-SET is_admin = true, updated_at = NOW()
-RETURNING id;
-
--- name: ListAdminUsers :many
-SELECT id, email, name, COALESCE(avatar_url, '') AS avatar_url, is_admin,
-       COALESCE(to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"'), '')::text AS created_at
-FROM users
-ORDER BY created_at ASC;
-
--- name: SetUserAdmin :execrows
-UPDATE users SET is_admin = $1, updated_at = NOW() WHERE id = $2;
-
--- name: GetAdminUserInfo :one
-SELECT email, COALESCE(name, '') AS name, is_admin
-FROM users WHERE id = $1;

app/backend/sqlc/queries/builds.sql

@@ -1,33 +0,0 @@
--- name: UpsertBuild :exec
-INSERT INTO builds
- (id, project_id, service_id, status, progress, started_at, completed_at, image_name, image_tag, size, error, log, metadata, created_at, updated_at)
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13::jsonb, $14, $14)
- ON CONFLICT (id) DO UPDATE SET
-   project_id = EXCLUDED.project_id,
-   service_id = EXCLUDED.service_id,
-   status = EXCLUDED.status,
-   progress = EXCLUDED.progress,
-   started_at = EXCLUDED.started_at,
-   completed_at = EXCLUDED.completed_at,
-   image_name = EXCLUDED.image_name,
-   image_tag = EXCLUDED.image_tag,
-   size = EXCLUDED.size,
-   error = EXCLUDED.error,
-   log = EXCLUDED.log,
-   metadata = EXCLUDED.metadata,
-   updated_at = EXCLUDED.updated_at;
-
--- name: GetBuild :one
-SELECT id, project_id, service_id, status, progress, started_at, completed_at, image_name, image_tag, size, error, log, metadata
-FROM builds
-WHERE id = $1;
-
--- name: CancelBuild :execrows
-UPDATE builds
-SET status = 'cancelled',
-    progress = 100,
-    completed_at = $1,
-    log = COALESCE(log, '') || $2,
-    updated_at = $1
-WHERE id = $3
-  AND status NOT IN ('success', 'failed', 'cancelled');

app/backend/sqlc/queries/git.sql

@@ -127,11 +127,3 @@ SELECT s.id, s.project_id, s.name,
        s.created_at, s.updated_at
 FROM services s
 WHERE (s.git_branch = $1 OR $1 = '') AND (s.git_repo = $2 OR s.git_repo = $3);
-
--- name: GetGitRepoCloneByFullName :one
-SELECT clone_url, provider_id FROM git_repositories
-WHERE full_name = $1 AND user_id = $2 LIMIT 1;
-
--- name: GetGitRepoProviderByCloneURL :one
-SELECT provider_id FROM git_repositories
-WHERE clone_url = $1 AND user_id = $2 LIMIT 1;

app/backend/sqlc/queries/misc.sql

@@ -1,29 +0,0 @@
--- name: CountProjects :one
-SELECT COUNT(*) FROM projects;
-
--- name: GetRegistryAuth :one
-SELECT username, password FROM registries
-WHERE owner_id::text = $1 AND host = $2;
-
--- name: UpdateServiceRuntimeMeta :exec
-UPDATE services SET port = $1, healthcheck_path = $2 WHERE id = $3;
-
--- name: UpdateServiceDeployMeta :exec
-UPDATE services SET port = $1, healthcheck_path = $2,
-       volumes = COALESCE($3::jsonb, '[]'::jsonb),
-       git_repo = NULLIF($4::text, ''), git_branch = NULLIF($5::text, ''), builder = $6
-WHERE id = $7;
-
--- name: InsertEnvVar :exec
-INSERT INTO environment_variables (id, service_id, key, value, is_secret, created_at, updated_at)
-VALUES ($1, $2, $3, $4, $5, $6, $7);
-
--- name: DeleteProjectVariables :exec
-DELETE FROM project_variables WHERE project_id = $1;
-
--- name: InsertProjectVariable :exec
-INSERT INTO project_variables (id, project_id, key, value, is_secret, created_at, updated_at)
-VALUES ($1, $2, $3, $4, $5, $6, $7);
-
--- name: GetProjectVariableValue :one
-SELECT value FROM project_variables WHERE project_id = $1 AND key = $2;

app/backend/sqlc/queries/operations.sql

@@ -1,43 +0,0 @@
--- name: ListActiveOperationDeployments :many
-SELECT d.id, d.service_id, s.name AS service_name, p.name AS project_name, d.status,
-       COALESCE(d.image_name, '') AS image, d.error, d.started_at, d.completed_at, d.created_at
-FROM deployments d
-JOIN services s ON s.id = d.service_id
-JOIN projects p ON p.id = s.project_id
-WHERE d.status IN ('queued','pending','building','deploying','rolling_back')
-  AND (p.is_approved OR p.owner_id = $1 OR $2::bool
-    OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $1))
-ORDER BY d.created_at ASC;
-
--- name: ListRecentFailedDeployments :many
-SELECT d.id, d.service_id, s.name AS service_name, p.name AS project_name, d.status,
-       COALESCE(d.image_name, '') AS image, d.error, d.started_at, d.completed_at, d.created_at
-FROM deployments d
-JOIN services s ON s.id = d.service_id
-JOIN projects p ON p.id = s.project_id
-WHERE d.status IN ('failed','cancelled','rolled_back')
-  AND d.updated_at > NOW() - INTERVAL '24 hours'
-  AND (p.is_approved OR p.owner_id = $1 OR $2::bool
-    OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $1))
-ORDER BY d.updated_at DESC
-LIMIT 20;
-
--- name: ListRecentCronRuns :many
-SELECT e.id, j.name AS job_name, j.schedule, e.status, e.started_at, e.finished_at, e.error
-FROM cron_executions e
-JOIN cron_jobs j ON j.id = e.cron_job_id
-JOIN projects p ON p.id = j.project_id
-WHERE e.started_at > NOW() - INTERVAL '24 hours'
-  AND (p.is_approved OR p.owner_id = $1 OR $2::bool
-    OR EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = $1))
-ORDER BY e.started_at DESC
-LIMIT 30;
-
--- name: ListRecentOperationBackups :many
-SELECT b.id, b.database_id, ds.name AS db_name, b.status, b.size, b.created_at, b.completed_at
-FROM database_backups b
-JOIN database_services ds ON ds.id = b.database_id
-WHERE b.created_at > NOW() - INTERVAL '24 hours'
-  AND (ds.user_id = $1 OR $2::bool)
-ORDER BY b.created_at DESC
-LIMIT 20;

app/backend/sqlc/queries/services_meta.sql

@@ -1,62 +0,0 @@
--- name: GetServiceSleep :one
-SELECT COALESCE(sleep_enabled, false) AS sleep_enabled, COALESCE(sleep_idle_minutes, 15) AS sleep_idle_minutes
-FROM services WHERE id = $1;
-
--- name: GetServiceNodeID :one
-SELECT node_id FROM services WHERE id = $1;
-
--- name: GetServiceSpread :one
-SELECT COALESCE(spread, false) FROM services WHERE id = $1;
-
--- name: GetServicePlacementTags :one
-SELECT placement_tags FROM services WHERE id = $1;
-
--- name: GetServiceTraefikLabels :one
-SELECT traefik_labels FROM services WHERE id = $1;
-
--- name: GetServiceVolumes :one
-SELECT volumes FROM services WHERE id = $1;
-
--- name: GetNodeAgentName :one
-SELECT name FROM node_agents WHERE id = $1;
-
--- name: GetServiceProjectID :one
-SELECT project_id FROM services WHERE id = $1;
-
--- name: GetServiceProjectAndStatus :one
-SELECT s.project_id, COALESCE(s.status, '') AS status
-FROM services s WHERE s.id = $1;
-
--- name: GetEnvironmentProjectID :one
-SELECT project_id FROM environments WHERE id = $1;
-
--- name: GetProjectReadAccess :one
-SELECT is_approved, owner_id::text FROM projects WHERE id = $1;
-
--- name: ProjectMemberExists :one
-SELECT EXISTS(SELECT 1 FROM project_members WHERE project_id = $1 AND user_id = $2);
-
--- name: DeleteEnvVarsForService :exec
-DELETE FROM environment_variables WHERE service_id = $1;
-
--- name: FailInterruptedDeployments :exec
-UPDATE deployments SET status = 'failed', error = 'Interrupted by server restart', completed_at = NOW(), updated_at = NOW()
-WHERE status IN ('queued', 'pending', 'building', 'deploying', 'rolling_back');
-
--- name: ListSecretEnvVars :many
-SELECT id, value FROM environment_variables WHERE is_secret = TRUE;
-
--- name: UpdateEnvVarValue :exec
-UPDATE environment_variables SET value = $1, updated_at = NOW() WHERE id = $2;
-
--- name: ListAgentHealthRows :many
-SELECT id, COALESCE(name, hostname, id::text) AS name, COALESCE(status, '') AS status,
-       COALESCE(last_heartbeat < $1, TRUE)::bool AS stale, auto_prune
-FROM node_agents;
-
--- name: SetAgentStatus :exec
-UPDATE node_agents SET status = $1, updated_at = NOW() WHERE id = $2;
-
--- name: GetServiceNameProjectPort :one
-SELECT name, project_id::text, COALESCE(port, 0)::int AS port
-FROM services WHERE id::text = $1;

app/backend/sqlc/queries/settings.sql

@@ -1,21 +0,0 @@
--- name: GetAppSetting :one
-SELECT value FROM app_settings WHERE key = $1;
-
--- name: UpsertAppSetting :exec
-INSERT INTO app_settings (key, value, is_secret, updated_at)
-VALUES ($1, $2, $3, NOW())
-ON CONFLICT (key) DO UPDATE
-SET value = EXCLUDED.value, is_secret = EXCLUDED.is_secret, updated_at = NOW();
-
--- name: UpsertAppSettingValue :exec
-INSERT INTO app_settings (key, value, updated_at) VALUES ($1, $2, NOW())
-ON CONFLICT (key) DO UPDATE SET value = $2, updated_at = NOW();
-
--- name: DeleteAppSetting :exec
-DELETE FROM app_settings WHERE key = $1;
-
--- name: GetUserIsAdmin :one
-SELECT is_admin FROM users WHERE id = $1;
-
--- name: ListAdminUserIDs :many
-SELECT id FROM users WHERE is_admin;

app/backend/sqlc/schema.sql

@@ -144,17 +144,6 @@ CREATE TABLE environment_variables (
     UNIQUE(service_id, key)
 );
 
-CREATE TABLE project_variables (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
-    key VARCHAR(255) NOT NULL,
-    value TEXT NOT NULL DEFAULT '',
-    is_secret BOOLEAN NOT NULL DEFAULT false,
-    created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
-    updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
-    UNIQUE(project_id, key)
-);
-
 CREATE TABLE service_templates (
     id VARCHAR(50) PRIMARY KEY,
     name VARCHAR(255) NOT NULL,
@@ -601,112 +590,3 @@ CREATE TABLE vulnerabilities (
     created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
     updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
-
-CREATE TABLE app_settings (
-    key VARCHAR(255) PRIMARY KEY,
-    value TEXT NOT NULL DEFAULT '',
-    is_secret BOOLEAN NOT NULL DEFAULT false,
-    updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
-);
-
-CREATE TABLE audit_logs (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    timestamp TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-    user_id UUID,
-    action VARCHAR(100) NOT NULL,
-    resource VARCHAR(100) NOT NULL,
-    resource_id UUID,
-    details JSONB DEFAULT '{}',
-    ip_address INET,
-    user_agent TEXT,
-    success BOOLEAN NOT NULL DEFAULT true,
-    created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-    severity TEXT NOT NULL DEFAULT 'info',
-    category TEXT NOT NULL DEFAULT '',
-    label TEXT NOT NULL DEFAULT ''
-);
-
-CREATE TABLE builds (
-    id VARCHAR(255) PRIMARY KEY,
-    project_id VARCHAR(255),
-    service_id VARCHAR(255),
-    status VARCHAR(50) NOT NULL DEFAULT 'pending',
-    progress INTEGER NOT NULL DEFAULT 0,
-    started_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-    completed_at TIMESTAMP WITH TIME ZONE,
-    image_name VARCHAR(500) NOT NULL DEFAULT '',
-    image_tag VARCHAR(200) NOT NULL DEFAULT '',
-    size BIGINT NOT NULL DEFAULT 0,
-    error TEXT,
-    log TEXT NOT NULL DEFAULT '',
-    metadata JSONB NOT NULL DEFAULT '{}',
-    created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-    updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
-);
-
--- APwhy API gateway (api_services/api_keys + usage/metrics/incident planes)
-CREATE TABLE api_services (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    name TEXT NOT NULL,
-    slug TEXT NOT NULL UNIQUE,
-    upstream_url TEXT NOT NULL,
-    route_prefix TEXT NOT NULL UNIQUE,
-    health_path TEXT NOT NULL DEFAULT '/health',
-    upstream_auth_header TEXT,
-    upstream_auth_value TEXT,
-    internal_token TEXT,
-    enabled INTEGER NOT NULL DEFAULT 1,
-    rpm_limit INTEGER,
-    monthly_quota INTEGER,
-    request_timeout_ms INTEGER DEFAULT 8000,
-    last_validation_at TIMESTAMP WITHOUT TIME ZONE,
-    last_validation_status TEXT,
-    last_validation_message TEXT,
-    created_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT now(),
-    updated_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT now()
-);
-
-CREATE TABLE api_keys (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    name TEXT NOT NULL,
-    key_hash TEXT NOT NULL,
-    key_prefix TEXT NOT NULL,
-    plan TEXT NOT NULL DEFAULT 'free',
-    allowed_service_ids TEXT NOT NULL DEFAULT '[]',
-    enabled INTEGER NOT NULL DEFAULT 1,
-    rpm_limit INTEGER DEFAULT 60,
-    monthly_quota INTEGER DEFAULT 1000,
-    created_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT now(),
-    updated_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT now(),
-    last_used_at TIMESTAMP WITHOUT TIME ZONE
-);
-
-CREATE TABLE usage_counters (
-    id INTEGER PRIMARY KEY,
-    api_key_id UUID NOT NULL REFERENCES api_keys(id) ON DELETE CASCADE,
-    service_id UUID NOT NULL REFERENCES api_services(id) ON DELETE CASCADE,
-    period_month TEXT NOT NULL,
-    request_count INTEGER NOT NULL DEFAULT 0,
-    updated_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT now(),
-    UNIQUE (api_key_id, service_id, period_month)
-);
-
-CREATE TABLE metrics_timeseries (
-    id INTEGER PRIMARY KEY,
-    metric TEXT NOT NULL,
-    value REAL NOT NULL,
-    labels_json TEXT,
-    occurred_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT now()
-);
-
-CREATE TABLE incident_events (
-    id INTEGER PRIMARY KEY,
-    service_id UUID REFERENCES api_services(id) ON DELETE SET NULL,
-    api_key_id UUID,
-    code TEXT NOT NULL,
-    message TEXT NOT NULL,
-    severity TEXT NOT NULL DEFAULT 'medium',
-    http_status INTEGER,
-    count INTEGER NOT NULL DEFAULT 1,
-    occurred_at TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT now()
-);

app/frontend/src/features/activity/pages/ActivityPage.tsx

@@ -25,7 +25,7 @@ const SEVERITY_STYLE: Record<string, { icon: typeof Info; cls: string; dot: stri
 };
 
 const SCHEMA: FilterConfig<ActivityEntry>[] = [
-  { key: 'q', label: 'events', type: 'search', searchFields: ['label', 'action', 'user_email'] },
+  { key: 'q', label: 'Search', type: 'search', searchFields: ['label', 'action', 'user_email'] },
   {
     key: 'severity', label: 'Severity', type: 'select',
     options: [
@@ -67,7 +67,7 @@ export function ActivityPage() {
         </div>
       </div>
 
-      <div className="px-4 py-6 sm:px-8 space-y-4">
+      <div className="px-8 py-6 space-y-4">
         <div className="flex items-start gap-3">
           <div className="flex-1">
             <FilterBar {...filter} />

app/frontend/src/features/audit/pages/AuditLogsPage.tsx

@@ -85,7 +85,7 @@ export function AuditLogsPage() {
         </div>
       </div>
 
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <section className="panel p-6">
           <FilterBar {...filter} />
 
@@ -140,7 +140,7 @@ export function AuditLogsPage() {
                       <td className="px-3 py-2.5 mono text-xs text-[var(--text-tertiary)] max-w-[140px] truncate" title={log.resourceId}>
                         {log.resourceId || '—'}
                       </td>
-                      <td className="px-3 py-2.5 mono text-xs text-[var(--text-tertiary)]">{log.ipAddress?.replace(/\/\d+$/, '') || '—'}</td>
+                      <td className="px-3 py-2.5 mono text-xs text-[var(--text-tertiary)]">{log.ipAddress || '—'}</td>
                       <td className="px-3 py-2.5 mono text-xs text-[var(--text-tertiary)] max-w-[220px] truncate" title={log.details}>
                         {log.details && log.details !== '{}' ? log.details : '—'}
                       </td>

app/frontend/src/features/builds/pages/BuildsPage.tsx

@@ -192,7 +192,7 @@ export function BuildsPage() {
       )}
 
       {/* Stats Overview */}
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
           <div className="panel p-4">
             <div className="flex items-center justify-between mb-3">
@@ -263,7 +263,7 @@ export function BuildsPage() {
       </div>
 
       {/* Build Table */}
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <div className="panel overflow-hidden">
           {!isDemoMode && buildsQuery.isLoading ? (
             <div className="p-12 text-center">

app/frontend/src/features/docs/DocsBrowser.tsx

@@ -15,7 +15,6 @@ function renderMarkdown(markdown: string): string {
 
 function excerpt(markdown: string, length = 140): string {
   const text = markdown
-    .replace(/^#[^\n]*\n/, ' ')
     .replace(/```[\s\S]*?```/g, ' ')
     .replace(/[#>*`\-[\]()]/g, ' ')
     .replace(/\s+/g, ' ')
@@ -120,7 +119,7 @@ export function DocsBrowser() {
 
       <div className="min-w-0 flex-1 overflow-y-auto max-md:hidden">
         {selected ? (
-          <article className="docs-article px-4 py-6 sm:px-8">
+          <article className="docs-article px-8 py-6">
             <p className="mb-1 text-[11px] font-medium uppercase tracking-wider text-[var(--text-tertiary)]">
               {selected.section} / {selected.path}
             </p>

app/frontend/src/features/nodes/NodeDetailPage.tsx

@@ -330,7 +330,7 @@ export function NodeDetailPage() {
         </div>
       </div>
 
-      <div className="px-4 py-6 sm:px-8 space-y-6">
+      <div className="px-8 py-6 space-y-6">
         <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-4">
           <Stat label="cpu" value={latest ? `${latest.cpu.usage_percent.toFixed(0)}%` : '—'} sub={latest ? `${latest.cpu.cores} cores` : ''} />
           <Stat label="memory" value={latest ? `${latest.memory.usage_percent.toFixed(0)}%` : '—'} sub={latest ? `${formatBytes(latest.memory.available)} free of ${formatBytes(latest.memory.limit)}` : ''} />

app/frontend/src/features/operations/pages/OperationsPage.tsx

@@ -88,7 +88,7 @@ export function OperationsPage() {
           <Loader2 size={20} className="animate-spin text-[var(--text-muted)]" />
         </div>
       ) : (
-        <div className="w-full px-4 py-6 sm:px-8 space-y-6">
+        <div className="w-full px-8 py-6 space-y-6">
           <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
             <div className="panel-soft p-4">
               <p className="text-xs uppercase tracking-wider text-[var(--text-muted)]">In flight</p>

app/frontend/src/features/projects/pages/ProjectsPage.tsx

@@ -211,9 +211,9 @@ export function ProjectsPage() {
 
   return (
     <div className="min-h-screen">
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         {/* Page head */}
-        <div className="mb-6 flex flex-wrap items-center justify-between gap-x-5 gap-y-3">
+        <div className="mb-6 flex items-center justify-between gap-5">
           <div>
             <h1 className="v-title">Projects<span className="v-cursor">_</span></h1>
             <p className="v-mono mt-1.5 text-[11px] text-[var(--text-tertiary)]">

app/frontend/src/features/secondary/pages.tsx

@@ -436,7 +436,7 @@ export function UsagePage() {
         title="Usage"
         description="Platform usage metrics and operational summaries"
       />
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <div className="flex items-center gap-2 mb-6">
           <div className={`w-2 h-2 rounded-full ${liveStatus === 'live' ? 'bg-[var(--success)] animate-pulse' : 'bg-[var(--text-muted)]'}`} />
           <span className={`text-sm ${liveStatus === 'live' ? 'text-[var(--success)]' : 'text-[var(--text-muted)]'}`}>
@@ -844,7 +844,7 @@ export function PeoplePage() {
         title="People"
         description="Team management and access control"
       />
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         {profileQuery.isLoading ? (
           <div className="py-16 text-center">
             <Loader2 size={24} className="animate-spin mx-auto text-[var(--text-tertiary)]" />
@@ -888,7 +888,7 @@ export function PeoplePage() {
               </div>
 
               <form
-                className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_auto]"
+                className="grid gap-3 lg:grid-cols-[1fr_1fr_1fr_auto]"
                 onSubmit={(event) => {
                   event.preventDefault();
                   createUserMutation.mutate();
@@ -2145,7 +2145,7 @@ export function SettingsPage() {
         title="Settings"
         description="Manage account profile and local configuration"
       />
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <div className="grid grid-cols-1 xl:grid-cols-2 gap-6">
           {/* Profile Section */}
           <section className="panel p-6">
@@ -2376,7 +2376,7 @@ export function DocsPage() {
         title="Docs"
         description="Guides and references — synced from GitHub, cached offline"
       />
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <DocsBrowser />
       </div>
     </div>
@@ -2513,7 +2513,7 @@ export function DatabasesPage() {
         title="Databases"
         description="Managed database services — connection info, runtime actions and backups"
       />
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <div className="mb-5 flex items-center justify-between">
           <p className="text-xs text-[var(--text-tertiary)]">
             {databases.length} {databases.length === 1 ? 'database' : 'databases'}
@@ -3251,7 +3251,7 @@ export function HighAvailabilityPage() {
         title="High availability"
         description="Failover manager, policies, and active alerts"
       />
-      <div className="p-4 space-y-8 sm:p-8">
+      <div className="p-8 space-y-8">
         <div className="flex items-center gap-2 text-xs text-[var(--text-tertiary)]">
           <ShieldCheck size={13} className="text-[var(--accent-primary)]" />
           <span>HA state feeds the platform security posture.</span>
@@ -3615,43 +3615,39 @@ export function SecurityPage() {
 
   const projectsQuery = useQuery({ queryKey: ['projects'], queryFn: () => listProjects(), enabled: !isDemoMode });
   const projects = isDemoMode ? demoProjects : projectsQuery.data ?? [];
-
-  // Auto-select the first project so the page never renders empty — derived, not
-  // stored, so clearing the select still shows the empty state explicitly.
-  const effectiveProjectId = projectId || projects[0]?.id || '';
   const servicesQuery = useQuery({
-    queryKey: ['services', effectiveProjectId],
+    queryKey: ['services', projectId],
-    queryFn: () => listServicesByProject(effectiveProjectId),
+    queryFn: () => listServicesByProject(projectId),
-    enabled: !isDemoMode && Boolean(effectiveProjectId),
+    enabled: !isDemoMode && Boolean(projectId),
   });
-  const services = isDemoMode ? getDemoServicesByProject(effectiveProjectId) : servicesQuery.data ?? [];
+  const services = isDemoMode ? getDemoServicesByProject(projectId) : servicesQuery.data ?? [];
   const metricsQuery = useQuery({
-    queryKey: ['security-metrics', effectiveProjectId],
+    queryKey: ['security-metrics', projectId],
-    queryFn: () => getSecurityMetrics(effectiveProjectId),
+    queryFn: () => getSecurityMetrics(projectId),
-    enabled: !isDemoMode && Boolean(effectiveProjectId),
+    enabled: !isDemoMode && Boolean(projectId),
     refetchInterval: 15_000,
   });
   const historyQuery = useQuery({
-    queryKey: ['security-history', effectiveProjectId],
+    queryKey: ['security-history', projectId],
-    queryFn: () => getSecurityHistory(effectiveProjectId),
+    queryFn: () => getSecurityHistory(projectId),
-    enabled: !isDemoMode && Boolean(effectiveProjectId),
+    enabled: !isDemoMode && Boolean(projectId),
     refetchInterval: 15_000,
   });
   const vulnsQuery = useQuery({
-    queryKey: ['security-vulns', effectiveProjectId],
+    queryKey: ['security-vulns', projectId],
-    queryFn: () => listVulnerabilities(effectiveProjectId),
+    queryFn: () => listVulnerabilities(projectId),
-    enabled: !isDemoMode && Boolean(effectiveProjectId),
+    enabled: !isDemoMode && Boolean(projectId),
   });
 
   const invalidate = () => {
-    queryClient.invalidateQueries({ queryKey: ['security-metrics', effectiveProjectId] });
+    queryClient.invalidateQueries({ queryKey: ['security-metrics', projectId] });
-    queryClient.invalidateQueries({ queryKey: ['security-history', effectiveProjectId] });
+    queryClient.invalidateQueries({ queryKey: ['security-history', projectId] });
-    queryClient.invalidateQueries({ queryKey: ['security-vulns', effectiveProjectId] });
+    queryClient.invalidateQueries({ queryKey: ['security-vulns', projectId] });
   };
 
   const scanMutation = useMutation({
     mutationFn: () => startSecurityScan({
-      project_id: effectiveProjectId,
+      project_id: projectId,
       service_id: scanServiceId || undefined,
       scan_type: scanType as 'dependency' | 'configuration' | 'comprehensive',
     }),
@@ -3665,10 +3661,10 @@ export function SecurityPage() {
 
   const metrics = isDemoMode ? demoSecurityMetrics : metricsQuery.data;
   const scanHistory = isDemoMode
-    ? demoSecurityScans.filter((s) => s.project_id === effectiveProjectId)
+    ? demoSecurityScans.filter((s) => s.project_id === projectId)
     : historyQuery.data ?? [];
   const vulns = (isDemoMode
-    ? demoVulnerabilities.filter((v) => v.project_id === effectiveProjectId)
+    ? demoVulnerabilities.filter((v) => v.project_id === projectId)
     : vulnsQuery.data ?? []
   ).filter((v) => v.status !== 'resolved');
   const pageError =
@@ -3681,7 +3677,7 @@ export function SecurityPage() {
         title="Security"
         description="Scan findings, security posture, and compliance status"
       />
-      <div className="p-4 space-y-8 sm:p-8">
+      <div className="p-8 space-y-8">
         <div className="flex items-center gap-2 text-xs text-[var(--text-tertiary)]">
           <HeartPulse size={13} className="text-[var(--accent-primary)]" />
           <span>Platform availability and failover live under High availability.</span>
@@ -3699,7 +3695,7 @@ export function SecurityPage() {
           <div>
             <label className="block text-xs text-[var(--text-tertiary)] mb-1">Project</label>
             <select
-              value={effectiveProjectId}
+              value={projectId}
               onChange={(e) => { setProjectId(e.target.value); setScanServiceId(''); }}
               className="px-3 py-2 rounded-[var(--radius-md)] bg-[var(--surface-muted)] border border-[var(--border-subtle)] text-sm text-[var(--text-primary)] w-56"
             >
@@ -3709,7 +3705,7 @@ export function SecurityPage() {
               ))}
             </select>
           </div>
-          {effectiveProjectId && (
+          {projectId && (
             <>
               <div>
                 <label className="block text-xs text-[var(--text-tertiary)] mb-1">Scan type</label>
@@ -3752,7 +3748,7 @@ export function SecurityPage() {
           )}
         </div>
 
-        {effectiveProjectId && metrics && (
+        {projectId && metrics && (
           <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
             <StatCard
               title="Security score"
@@ -3783,7 +3779,7 @@ export function SecurityPage() {
           </div>
         )}
 
-        {effectiveProjectId && (
+        {projectId && (
           <div className="panel p-6">
             <div className="flex items-center gap-3 mb-4">
               <Shield size={18} className="text-[var(--accent-primary)]" />
@@ -3839,7 +3835,7 @@ export function SecurityPage() {
           </div>
         )}
 
-        {effectiveProjectId && (
+        {projectId && (
           <div className="panel p-6">
             <div className="flex items-center gap-3 mb-4">
               <Clock size={18} className="text-[var(--accent-primary)]" />

app/frontend/src/features/service/pages/ServiceDetailPage.tsx

@@ -143,7 +143,7 @@ function StatusBadge({ status }: { status: string }) {
 export function ServiceDetailPage() {
   const { projectId = '', serviceId = '' } = useParams<{ projectId: string; serviceId: string }>();
   const navigate = useNavigate();
-  const [searchParams, setSearchParams] = useSearchParams();
+  const [searchParams] = useSearchParams();
   const queryClient = useQueryClient();
   const isDemoMode = useDemoMode();
   const sessionQuery = useAuthSession({ enabled: !isDemoMode });
@@ -791,7 +791,7 @@ export function ServiceDetailPage() {
       )}
 
       {/* Metrics Overview */}
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
           <EnhancedMetricCard
             title="CPU Usage"
@@ -904,18 +904,7 @@ export function ServiceDetailPage() {
           return (
             <button
               key={item.key}
-              onClick={() => {
+              onClick={() => setActiveSection(item.key)}
-                setActiveSection(item.key);
-                setSearchParams(
-                  (prev) => {
-                    const next = new URLSearchParams(prev);
-                    if (item.key === 'metrics') next.delete('section');
-                    else next.set('section', item.key);
-                    return next;
-                  },
-                  { replace: true },
-                );
-              }}
               className={`tab ${active ? 'active' : ''}`}
             >
               <Icon size={14} />
@@ -1200,7 +1189,7 @@ export function ServiceDetailPage() {
                       {' '}
                       <span className="text-[var(--accent-primary)]">{entry.stream}</span>
                       {' '}
-                      {entry.message.replace(/^\d{4}-\d{2}-\d{2}T[\d:.]+Z?\s+/, '')}
+                      {entry.message}
                     </p>
                   ))}
                 </div>
@@ -1373,7 +1362,7 @@ export function ServiceDetailPage() {
               </div>
             ) : (
               <div className="space-y-2">
-                <div className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_auto_auto] gap-2 px-1">
+                <div className="grid grid-cols-[1fr_1fr_auto_auto] gap-2 px-1">
                   <span className="text-xs font-medium uppercase tracking-wider text-[var(--text-muted)]">Key</span>
                   <span className="text-xs font-medium uppercase tracking-wider text-[var(--text-muted)]">Value</span>
                   <span className="text-xs font-medium uppercase tracking-wider text-[var(--text-muted)]">Secret</span>
@@ -1381,7 +1370,7 @@ export function ServiceDetailPage() {
                 </div>
                 {varRows.map((row, i) => (
                   <div key={i}>
-                    <div className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_auto_auto] gap-2 items-center">
+                    <div className="grid grid-cols-[1fr_1fr_auto_auto] gap-2 items-center">
                       <input
                         value={row.key}
                         onChange={(e) => updateVarRow(i, { key: e.target.value })}

app/frontend/src/features/templates/pages/TemplatesPage.tsx

@@ -541,7 +541,7 @@ export function TemplatesPage() {
       )}
 
       {/* Main Content */}
-      <div className="w-full px-4 py-6 sm:px-8">
+      <div className="w-full px-8 py-6">
         <div className="grid grid-cols-1 xl:grid-cols-[380px_1fr] gap-6">
           {/* Template List */}
           <section className="panel overflow-hidden">
@@ -857,11 +857,7 @@ export function TemplatesPage() {
                     </div>
                   </div>
 
-                  {sessionQuery.isPending && !isDemoMode ? (
+                  {!signedIn ? (
-                    <div className="rounded-[var(--radius-md)] border border-[var(--border-subtle)] bg-[var(--surface-muted)] px-4 py-5 text-center">
-                      <Loader2 size={16} className="mx-auto animate-spin text-[var(--text-muted)]" />
-                    </div>
-                  ) : !signedIn ? (
                     <div className="rounded-[var(--radius-md)] border border-[var(--border-subtle)] bg-[var(--surface-muted)] px-4 py-5 text-center">
                       <p className="text-sm text-[var(--text-secondary)]">
                         Sign in to deploy this template into one of your projects.

app/frontend/src/features/webhooks/pages/WebhooksPage.tsx

@@ -226,7 +226,7 @@ export function WebhooksPage() {
         </div>
       </div>
 
-      <div className="w-full px-4 py-6 sm:px-8 space-y-4 max-w-4xl">
+      <div className="w-full px-8 py-6 space-y-4 max-w-4xl">
         {secret && (
           <div className="panel-soft p-4 flex items-center gap-3">
             <div className="flex-1 min-w-0">

app/frontend/src/features/workspace/components/MetricsDashboard.tsx

@@ -1,205 +1,306 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
-import { useQueries } from '@tanstack/react-query';
+import {
-import { Cpu, HardDrive, ArrowDownUp, Boxes } from 'lucide-react';
+  LineMetricChart,
-import { LineMetricChart, DonutChart } from '@/shared/components';
+  DualLineChart,
-import { getServiceMetrics, type ServiceMetrics } from '@/lib/api-client';
+  DonutChart,
-import { formatBytes } from '@/lib/time';
+} from '@/shared/components';
+
+interface MetricData {
+  cpu: number[];
+  ram: number;
+  ramUsed: string;
+  cache: number;
+  cacheBreakdown: { cache: number; nonCache: number; total: number };
+  users: number[];
+  performance: number[];
+  performanceAlt: number[];
+  upSpeed: number;
+  downSpeed: number;
+}
 
 interface MetricsDashboardProps {
-  services: { id: string; name: string; status: string }[];
+  projectId?: string;
-  isDemoMode?: boolean;
+  isRunning?: boolean;
+  onStop?: () => void;
+  onRestart?: () => void;
 }
 
-const cardStyle: React.CSSProperties = {
+function getRandom(min: number, max: number) {
-  background: 'var(--surface-card, rgba(255,255,255,0.03))',
+  return Math.floor(Math.random() * (max - min + 1)) + min;
-  border: '1px solid var(--border-subtle, rgba(255,255,255,0.09))',
+}
-  borderRadius: '14px',
+
-  padding: '18px 20px',
+function generateInitialData(): MetricData {
+  return {
+    cpu: Array.from({ length: 24 }, () => getRandom(10, 45)),
+    ram: getRandom(50, 85),
+    ramUsed: '5.4 GB',
+    cache: 352,
+    cacheBreakdown: { cache: 212, nonCache: 85.5, total: 1750 },
+    users: Array.from({ length: 15 }, () => getRandom(40, 110)),
+    performance: Array.from({ length: 12 }, () => getRandom(70, 95)),
+    performanceAlt: Array.from({ length: 12 }, () => getRandom(60, 85)),
+    upSpeed: 10.4,
+    downSpeed: 5.2,
   };
-
-function healthLabel(pct: number): { text: string; color: string } {
-  if (pct < 50) return { text: 'Good', color: 'var(--success, #5ee6a0)' };
-  if (pct < 80) return { text: 'Average', color: 'var(--warning, #f2c94c)' };
-  return { text: 'High', color: 'var(--error, #ff6b6b)' };
 }
 
-export function MetricsDashboard({ services, isDemoMode = false }: MetricsDashboardProps) {
+export function MetricsDashboard({
-  const liveServices = services.filter((s) => s.status === 'running');
+  isRunning = true,
+}: MetricsDashboardProps) {
+  const [data, setData] = useState<MetricData>(generateInitialData);
+  const [timeRange, setTimeRange] = useState<'day' | 'month' | 'year'>('day');
 
-  const metricsQueries = useQueries({
-    queries: liveServices.map((service) => ({
-      queryKey: ['service-metrics', service.id],
-      queryFn: () => getServiceMetrics(service.id),
-      enabled: !isDemoMode,
-      refetchInterval: 5000,
-      retry: false,
-    })),
-  });
-
-  const samples = metricsQueries
-    .map((q) => q.data)
-    .filter((m): m is ServiceMetrics => Boolean(m) && m!.status === 'ok');
-
-  const totalCpu = samples.reduce((sum, m) => sum + m.cpu_percent, 0);
-  const avgCpu = samples.length > 0 ? totalCpu / samples.length : 0;
-  const memUsed = samples.reduce((sum, m) => sum + m.memory_usage_bytes, 0);
-  const memLimit = samples.reduce((sum, m) => sum + m.memory_limit_bytes, 0);
-  const memPct = memLimit > 0 ? (memUsed / memLimit) * 100 : 0;
-  const netRx = samples.reduce((sum, m) => sum + m.network_rx_bytes, 0);
-  const netTx = samples.reduce((sum, m) => sum + m.network_tx_bytes, 0);
-  const instanceCount = samples.reduce((sum, m) => sum + m.instances.length, 0);
-
-  // Rolling history for the sparklines — accumulated from real samples.
-  const [cpuHistory, setCpuHistory] = useState<number[]>([]);
-  const [netHistory, setNetHistory] = useState<{ rx: number[]; tx: number[] }>({ rx: [], tx: [] });
-  const lastNetRef = useRef<{ rx: number; tx: number; at: number } | null>(null);
-
-  const samplesKey = samples.map((s) => `${s.service_id}:${s.collected_at}`).join('|');
-  const avgCpuRef = avgCpu;
-  const netRxRef = netRx;
-  const netTxRef = netTx;
   useEffect(() => {
-    if (!samplesKey) return;
+    if (!isRunning) return;
-    const now = Date.now();
-    const prev = lastNetRef.current;
-    const elapsed = prev ? Math.max(1, (now - prev.at) / 1000) : 0;
-    const rxRate = prev && elapsed > 0 ? Math.max(0, (netRxRef - prev.rx) / elapsed) : 0;
-    const txRate = prev && elapsed > 0 ? Math.max(0, (netTxRef - prev.tx) / elapsed) : 0;
-    lastNetRef.current = { rx: netRxRef, tx: netTxRef, at: now };
-    setCpuHistory((h) => [...h, Math.min(100, avgCpuRef)].slice(-24));
-    setNetHistory((h) => ({ rx: [...h.rx, rxRate].slice(-24), tx: [...h.tx, txRate].slice(-24) }));
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- keyed on the samples' collected_at signature
-  }, [samplesKey]);
 
-  const cpuHealth = healthLabel(avgCpu);
+    const interval = setInterval(() => {
-  const memHealth = healthLabel(memPct);
+      setData((prev) => {
-  const reporting = samples.length;
+        const newCpu = [...prev.cpu.slice(1), getRandom(10, 45)];
-  const noData = !isDemoMode && liveServices.length > 0 && reporting === 0;
+        const newUsers = [...prev.users.slice(1), getRandom(60, 110)];
+        const newPerf = [...prev.performance.slice(1), getRandom(82, 99)];
+        const newPerfAlt = [...prev.performanceAlt.slice(1), getRandom(60, 85)];
+
+        return {
+          ...prev,
+          cpu: newCpu,
+          ram: getRandom(50, 85),
+          ramUsed: `${(8 * (prev.ram / 100)).toFixed(1)} GB`,
+          users: newUsers,
+          performance: newPerf,
+          performanceAlt: newPerfAlt,
+          upSpeed: parseFloat((Math.random() * 5 + 8).toFixed(1)),
+          downSpeed: parseFloat((Math.random() * 3 + 4).toFixed(1)),
+        };
+      });
+    }, 2000);
+
+    return () => clearInterval(interval);
+  }, [isRunning]);
+
+  const currentCpu = data.cpu[data.cpu.length - 1];
+  const currentUsers = data.users[data.users.length - 1];
+  const currentPerf = data.performance[data.performance.length - 1];
 
   return (
     <div>
-      <div className="flex items-center justify-between mb-4">
+      {/* Metrics Header - self.html exact match */}
-        <span className="text-[15px] font-bold text-[var(--text-primary)]">Metrics</span>
+      <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: '16px' }}>
-        <span className="text-xs text-[var(--text-muted)]">
+        <span style={{ fontSize: '15px', fontWeight: 700, color: '#e8e9f0' }}>Metrics</span>
-          {isDemoMode
+        <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
-            ? 'sample data'
+          <button style={{
-            : reporting > 0
+            height: '32px',
-              ? `${reporting} service${reporting === 1 ? '' : 's'} reporting · every 5s`
+            padding: '0 12px',
-              : 'no running services'}
+            borderRadius: '9px',
-        </span>
+            border: '1px solid rgba(255,255,255,0.09)',
+            background: 'rgba(255,255,255,0.04)',
+            color: '#9295a4',
+            fontSize: '12.5px',
+            fontWeight: 500,
+            fontFamily: 'inherit',
+            cursor: 'pointer',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '6px',
+          }}>
+            <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
+              <polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3" />
+            </svg>
+            Filter
+          </button>
+          <div className="pill-group">
+            {(['day', 'month', 'year'] as const).map((range) => (
+              <div
+                key={range}
+                className={`pill ${timeRange === range ? 'active' : ''}`}
+                onClick={() => setTimeRange(range)}
+              >
+                {range.charAt(0).toUpperCase() + range.slice(1)}
               </div>
-
+            ))}
-      <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4">
-        {/* CPU */}
-        <div style={cardStyle}>
-          <div className="flex items-center gap-2.5 mb-3">
-            <span className="card-icon"><Cpu size={16} /></span>
-            <span className="text-sm font-semibold text-[var(--text-primary)]">CPU Usage</span>
           </div>
-          <div className="text-4xl font-black tracking-tight text-[var(--text-primary)]">
-            {avgCpu.toFixed(1)}%
-          </div>
-          <div className="mt-1 text-xs text-[var(--text-tertiary)]">
-            <span style={{ color: cpuHealth.color, fontWeight: 700 }}>{cpuHealth.text}</span>
-            {' '}avg across running services
-          </div>
-          <div style={{ height: 64, marginTop: 12 }}>
-            {cpuHistory.length > 1 ? (
-              <LineMetricChart data={cpuHistory} color="var(--accent-primary)" fillOpacity={0.15} showArea height={64} />
-            ) : (
-              <div className="h-full rounded bg-[var(--surface-muted)] opacity-40" />
-            )}
         </div>
       </div>
 
-        {/* Memory */}
+      {/* Row 1: CPU, RAM, Cache - self.html exact: 13px gap */}
-        <div style={cardStyle}>
+      <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr 1.95fr', gap: '13px', marginBottom: '13px' }}>
-          <div className="flex items-center gap-2.5 mb-3">
+        {/* CPU Card */}
-            <span className="card-icon"><HardDrive size={16} /></span>
+        <div className="card">
-            <span className="text-sm font-semibold text-[var(--text-primary)]">Memory</span>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '10px', marginBottom: '12px' }}>
+            <div className="card-icon"><svg viewBox="0 0 24 24"><rect x="4" y="4" width="16" height="16" rx="2"/><rect x="9" y="9" width="6" height="6"/><line x1="9" y1="1" x2="9" y2="4"/><line x1="15" y1="1" x2="15" y2="4"/><line x1="9" y1="20" x2="9" y2="23"/><line x1="15" y1="20" x2="15" y2="23"/><line x1="20" y1="9" x2="23" y2="9"/><line x1="20" y1="14" x2="23" y2="14"/><line x1="1" y1="9" x2="4" y2="9"/><line x1="1" y1="14" x2="4" y2="14"/></svg></div>
+            <span style={{ fontSize: '14px', fontWeight: 600, color: '#e8e9f0' }}>CPU Usage</span>
           </div>
-          <div className="text-4xl font-black tracking-tight text-[var(--text-primary)]">
+          <div style={{ fontSize: '38px', fontWeight: 900, letterSpacing: '-1.5px', lineHeight: 1, color: '#e8e9f0' }}>{currentCpu}%</div>
-            {memPct.toFixed(0)}%
+          <div style={{ fontSize: '12px', color: '#6b6e7d', marginTop: '4px' }}>
+            <span style={{ color: currentCpu < 50 ? '#5ee6a0' : currentCpu < 75 ? '#f2c94c' : '#b4e34a', fontWeight: 700 }}>
+              {currentCpu < 50 ? 'Good' : currentCpu < 75 ? 'Average' : 'High'}
+            </span>{' '}
+            Daily usage
           </div>
-          <div className="mt-1 text-xs text-[var(--text-tertiary)]">
+          <div style={{ height: 76, margin: '12px 0 6px' }}>
-            <span style={{ color: memHealth.color, fontWeight: 700 }}>{memHealth.text}</span>
+            <LineMetricChart data={data.cpu} color="#b4e34a" height={76} />
-            {' '}{formatBytes(memUsed)} used
           </div>
-          <div className="mt-2 flex justify-center">
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', paddingTop: '4px' }}>
-            <DonutChart percentage={memPct} size={110} thickness={12} />
+            <span style={{ fontSize: '13px', color: '#6b6e7d', fontWeight: 500, cursor: 'pointer' }}>Details</span>
+            <div className="arrow-btn">
+              <svg viewBox="0 0 24 24"><polyline points="9 18 15 12 9 6"/></svg>
             </div>
-          <div className="mt-1 text-center text-xs text-[var(--text-tertiary)] mono">
-            {formatBytes(memUsed)} / {memLimit > 0 ? formatBytes(memLimit) : '∞'}
           </div>
         </div>
 
-        {/* Network */}
+        {/* RAM Card */}
-        <div style={cardStyle}>
+        <div className="card">
-          <div className="flex items-center gap-2.5 mb-3">
+          <div style={{ display: 'flex', alignItems: 'center', gap: '10px', marginBottom: '12px' }}>
-            <span className="card-icon"><ArrowDownUp size={16} /></span>
+            <div className="card-icon"><svg viewBox="0 0 24 24"><rect x="2" y="8" width="20" height="8" rx="2"/><path d="M6 8V6M10 8V6M14 8V6M18 8V6M6 16v2M18 16v2"/></svg></div>
-            <span className="text-sm font-semibold text-[var(--text-primary)]">Network</span>
+            <span style={{ fontSize: '14px', fontWeight: 600, color: '#e8e9f0' }}>RAM Usage</span>
           </div>
-          <div className="text-4xl font-black tracking-tight text-[var(--text-primary)]">
+          <div style={{ fontSize: '38px', fontWeight: 900, letterSpacing: '-1.5px', lineHeight: 1, color: '#e8e9f0' }}>{data.ram}%</div>
-            {formatBytes(netRx)}
+          <div style={{ fontSize: '12px', color: '#6b6e7d', marginTop: '4px' }}>
+            <span style={{ color: data.ram < 60 ? '#5ee6a0' : '#f2c94c', fontWeight: 700 }}>
+              {data.ram < 60 ? 'Good' : 'Average'}
+            </span>{' '}
+            Daily usage
           </div>
-          <div className="mt-1 text-xs text-[var(--text-tertiary)]">
+          <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', margin: '10px 0 4px', position: 'relative' }}>
-            <span style={{ color: 'var(--accent-primary)', fontWeight: 700 }}>RX</span>
+            <DonutChart percent={data.ram} color="#f2c94c" size={160} thickness={16} />
-            {' '}total · TX {formatBytes(netTx)}
+            <div style={{ position: 'absolute', bottom: 14, textAlign: 'center' }}>
+              <div style={{ fontSize: '10.5px', color: '#6b6e7d', marginBottom: 1 }}>Used</div>
+              <div style={{ fontSize: '12.5px', fontWeight: 700, color: '#e8e9f0' }}>{data.ramUsed} / 8GB</div>
             </div>
-          <div style={{ height: 64, marginTop: 12 }}>
-            {netHistory.rx.length > 1 ? (
-              <LineMetricChart data={netHistory.rx} color="#7ab8ff" fillOpacity={0.12} showArea height={64} />
-            ) : (
-              <div className="h-full rounded bg-[var(--surface-muted)] opacity-40" />
-            )}
           </div>
-          <div className="mt-2 text-[11px] text-[var(--text-muted)] mono">
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', paddingTop: '4px' }}>
-            {netHistory.rx.length > 0
+            <span style={{ fontSize: '13px', color: '#6b6e7d', fontWeight: 500, cursor: 'pointer' }}>Details</span>
-              ? `↓ ${formatBytes(netHistory.rx[netHistory.rx.length - 1])}/s · ↑ ${formatBytes(netHistory.tx[netHistory.tx.length - 1])}/s`
+            <div className="arrow-btn">
-              : 'rate accumulating…'}
+              <svg viewBox="0 0 24 24"><polyline points="9 18 15 12 9 6"/></svg>
+            </div>
           </div>
         </div>
 
-        {/* Instances */}
+        {/* Cache Card */}
-        <div style={cardStyle}>
+        <div className="card">
-          <div className="flex items-center gap-2.5 mb-3">
+          <div style={{ display: 'flex', alignItems: 'center', gap: '10px', marginBottom: '12px' }}>
-            <span className="card-icon"><Boxes size={16} /></span>
+            <div className="card-icon"><svg viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg></div>
-            <span className="text-sm font-semibold text-[var(--text-primary)]">Instances</span>
+            <span style={{ fontSize: '14px', fontWeight: 600, color: '#e8e9f0' }}>Cache</span>
           </div>
-          <div className="text-4xl font-black tracking-tight text-[var(--text-primary)]">
+          <div style={{ fontSize: '38px', fontWeight: 900, letterSpacing: '-1.5px', lineHeight: 1, color: '#e8e9f0' }}>{data.cache} MB</div>
-            {isDemoMode ? liveServices.length : instanceCount}
+          <div style={{ fontSize: '12px', color: '#6b6e7d', marginTop: '4px' }}>
+            <span style={{ color: '#f2c94c', fontWeight: 700 }}>220MB Average</span>{' '}
+            cached images and files
           </div>
-          <div className="mt-1 text-xs text-[var(--text-tertiary)]">
+
-            <span style={{ color: 'var(--success, #5ee6a0)', fontWeight: 700 }}>Running</span>
+          {/* Segmented Bar */}
-            {' '}containers across {liveServices.length} service{liveServices.length === 1 ? '' : 's'}
+          <div style={{ display: 'flex', alignItems: 'center', gap: '5px', margin: '16px 0 15px', height: '32px' }}>
+            <div className="cache-seg" style={{ width: '43%', background: '#ff6b5b', borderRadius: '10px 4px 4px 10px' }} />
+            <div className="cache-seg" style={{ width: '13%', background: '#8c6ef0', borderRadius: '5px' }} />
+            <div className="cache-seg" style={{ flex: 1, background: 'rgba(255,255,255,0.07)', borderRadius: '4px 10px 10px 4px' }} />
           </div>
-          <ul className="mt-3 space-y-1.5">
+
-            {liveServices.slice(0, 4).map((service, i) => {
+          {/* Stats row */}
-              const m = samples.find((s) => s.service_id === service.id);
+          <div style={{ display: 'grid', gridTemplateColumns: '1fr auto 1fr auto 1fr', gap: 0, alignItems: 'stretch' }}>
-              return (
+            <div>
-                <li key={service.id} className="flex items-center justify-between text-xs">
+              <div style={{ display: 'flex', alignItems: 'center', gap: '5px', fontSize: '11px', color: '#6b6e7d', marginBottom: '5px' }}>
-                  <span className="truncate text-[var(--text-secondary)]">
+                <div className="stat-dot" style={{ background: '#ff6b5b' }} />
-                    <span className="mr-1.5 inline-block h-1.5 w-1.5 rounded-full bg-[var(--success,#5ee6a0)] align-middle" />
+                Cache
-                    {service.name}
+              </div>
-                  </span>
+              <div style={{ display: 'flex', alignItems: 'baseline', gap: '4px' }}>
-                  <span className="mono text-[var(--text-muted)]">
+                <span style={{ fontSize: '15px', fontWeight: 800, color: '#e8e9f0' }}>212 MB</span>
-                    {m ? `${m.cpu_percent.toFixed(1)}%` : i < 3 ? '—' : ''}
+                <span style={{ fontSize: '11px', color: '#6b6e7d' }}>12%</span>
-                  </span>
+              </div>
-                </li>
+            </div>
-              );
+            <div style={{ width: '1px', background: 'rgba(255,255,255,0.08)', margin: '0 16px' }} />
-            })}
+            <div>
-            {liveServices.length > 4 && (
+              <div style={{ display: 'flex', alignItems: 'center', gap: '5px', fontSize: '11px', color: '#6b6e7d', marginBottom: '5px' }}>
-              <li className="text-[11px] text-[var(--text-muted)]">+{liveServices.length - 4} more</li>
+                <div className="stat-dot" style={{ background: '#8c6ef0' }} />
-            )}
+                Non-Cache
-          </ul>
+              </div>
+              <div style={{ display: 'flex', alignItems: 'baseline', gap: '4px' }}>
+                <span style={{ fontSize: '15px', fontWeight: 800, color: '#e8e9f0' }}>85.5 MB</span>
+                <span style={{ fontSize: '11px', color: '#6b6e7d' }}>4%</span>
+              </div>
+            </div>
+            <div style={{ width: '1px', background: 'rgba(255,255,255,0.08)', margin: '0 16px' }} />
+            <div>
+              <div style={{ fontSize: '11px', color: '#6b6e7d', marginBottom: '5px' }}>Total</div>
+              <div style={{ fontSize: '15px', fontWeight: 800, color: '#e8e9f0' }}>1.75 GB</div>
             </div>
           </div>
 
-      {noData && (
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', paddingTop: '16px' }}>
-        <p className="mt-3 text-xs text-[var(--text-muted)]">
+            <span style={{ fontSize: '13px', color: '#6b6e7d', fontWeight: 500, cursor: 'pointer' }}>Details</span>
-          Metrics collector is not reporting yet — check that the node agent is online.
+            <div className="arrow-btn">
-        </p>
+              <svg viewBox="0 0 24 24"><polyline points="9 18 15 12 9 6"/></svg>
-      )}
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* Row 2: Active Users, Performance - self.html exact: 13px gap */}
+      <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '13px' }}>
+        {/* Active Users - horizontal layout */}
+        <div className="card" style={{ flexDirection: 'row', padding: 0, overflow: 'hidden' }}>
+          <div style={{ flex: 1, padding: '20px 18px 18px 20px', display: 'flex', flexDirection: 'column' }}>
+            <div style={{ display: 'flex', alignItems: 'center', gap: '10px', marginBottom: '12px' }}>
+              <div className="card-icon"><svg viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75"/></svg></div>
+              <span style={{ fontSize: '14px', fontWeight: 600, color: '#e8e9f0' }}>Active User</span>
+            </div>
+            <div style={{ fontSize: '36px', fontWeight: 900, letterSpacing: '-1.5px', lineHeight: 1, color: '#e8e9f0' }}>{currentUsers} K</div>
+            <div style={{ fontSize: '12px', color: '#6b6e7d', marginTop: '4px' }}>User active right now</div>
+            <div style={{ display: 'flex', alignItems: 'center', gap: '5px', marginTop: '12px', flexWrap: 'wrap' }}>
+              {['🇨🇳', '🇮🇩', '🇲🇲', '🇲🇾', '🇯🇵', '🇮🇳', '🇰🇷', '🇵🇭'].map((flag, i) => (
+                <span key={i} className="flag">{flag}</span>
+              ))}
+            </div>
+            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginTop: 'auto', paddingTop: '14px' }}>
+              <span style={{ fontSize: '13px', color: '#6b6e7d', fontWeight: 500, cursor: 'pointer' }}>Details</span>
+              <div className="arrow-btn">
+                <svg viewBox="0 0 24 24"><polyline points="9 18 15 12 9 6"/></svg>
+              </div>
+            </div>
+          </div>
+          <div style={{ width: '50%', padding: '16px 14px 46px 0', display: 'flex', alignItems: 'flex-end' }}>
+            <LineMetricChart data={data.users} color="var(--accent-primary)" fillOpacity={0.15} showArea height={130} />
+          </div>
+        </div>
+
+        {/* Performance Card */}
+        <div className="card">
+          <div style={{ display: 'flex', alignItems: 'center', gap: '10px', marginBottom: '12px' }}>
+            <div className="card-icon"><svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg></div>
+            <span style={{ fontSize: '14px', fontWeight: 600, color: '#e8e9f0' }}>Performance</span>
+          </div>
+          <div style={{ display: 'flex', alignItems: 'flex-start', gap: '16px', flex: 1 }}>
+            <div style={{ flex: 1 }}>
+              <div style={{ fontSize: '36px', fontWeight: 900, letterSpacing: '-1.5px', lineHeight: 1, color: '#e8e9f0' }}>{currentPerf}%</div>
+              <div style={{ fontSize: '12px', color: '#6b6e7d', marginTop: '4px' }}>
+                <span style={{ color: currentPerf > 85 ? '#5ee6a0' : '#f2c94c', fontWeight: 700 }}>
+                  {currentPerf > 85 ? 'Good' : 'Average'}
+                </span>{' '}
+                Last scan
+              </div>
+            </div>
+            <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-end', gap: '8px' }}>
+              <div style={{ width: 134, height: 58 }}>
+                <DualLineChart data1={data.performance} data2={data.performanceAlt} height={58} />
+              </div>
+              <div style={{ display: 'flex', flexDirection: 'column', gap: '4px', alignItems: 'flex-end' }}>
+                <div className="speed-row" style={{ color: '#7ab8ff' }}>
+                  <svg viewBox="0 0 24 24"><line x1="12" y1="19" x2="12" y2="5"/><polyline points="5 12 12 19 19 12"/></svg>
+                  <span>{data.upSpeed}</span> Mbps
+                </div>
+                <div className="speed-row" style={{ color: 'var(--accent-primary)' }}>
+                  <svg viewBox="0 0 24 24"><line x1="12" y1="5" x2="12" y2="19"/><polyline points="19 12 12 5 5 12"/></svg>
+                  <span>{data.downSpeed}</span> Mbps
+                </div>
+              </div>
+            </div>
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', paddingTop: '14px' }}>
+            <span style={{ fontSize: '13px', color: '#6b6e7d', fontWeight: 500, cursor: 'pointer' }}>Check Speed</span>
+            <div className="arrow-btn">
+              <svg viewBox="0 0 24 24"><polyline points="9 18 15 12 9 6"/></svg>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   );
 }

app/frontend/src/features/workspace/components/SharedVariablesSection.tsx

@@ -78,7 +78,7 @@ export function SharedVariablesSection({ projectId }: { projectId: string }) {
       ) : (
         <div className="space-y-2">
           {rows.map((row, i) => (
-            <div key={i} className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_auto_auto] gap-2 items-center">
+            <div key={i} className="grid grid-cols-[1fr_1fr_auto_auto] gap-2 items-center">
               <input
                 value={row.key}
                 onChange={(e) => updateRow(i, { key: e.target.value })}

app/frontend/src/features/workspace/pages/ProjectWorkspacePage.tsx

@@ -765,7 +765,7 @@ export function ProjectWorkspacePage() {
           </span>
           <button
             onClick={() => setCommandPaletteOpen(true)}
-            className="hidden lg:flex items-center gap-2 h-8 px-2.5 rounded-[var(--radius-md)] border border-[var(--border-subtle)] bg-[var(--surface-muted)] text-[var(--text-muted)] text-xs hover:border-[var(--border-default)] hover:text-[var(--text-secondary)] transition-colors"
+            className="hidden md:flex items-center gap-2 h-8 px-2.5 rounded-[var(--radius-md)] border border-[var(--border-subtle)] bg-[var(--surface-muted)] text-[var(--text-muted)] text-xs hover:border-[var(--border-default)] hover:text-[var(--text-secondary)] transition-colors"
           >
             <Search size={12} />
             <kbd className="px-1 py-0.5 rounded bg-[var(--surface-card)] text-[10px] font-mono">⌘K</kbd>
@@ -826,7 +826,7 @@ export function ProjectWorkspacePage() {
             </div>
           </div>
         )}
-        <div className="w-full px-4 py-6 sm:px-8">
+        <div className="w-full px-8 py-6">
           <section className="min-w-0">
             {activeView === 'observability' && (
               <div className="space-y-6">
@@ -860,7 +860,11 @@ export function ProjectWorkspacePage() {
                 </div>
 
                 {/* Metrics Dashboard */}
-                <MetricsDashboard services={visibleServices} isDemoMode={isDemoMode} />
+                <MetricsDashboard
+                  isRunning={runningServices > 0}
+                  onStop={() => toast.showToast('Services stopped', 'warning')}
+                  onRestart={() => toast.showToast('Services restarted', 'success')}
+                />
 
                 {/* Service List */}
                 <div className="panel p-6">

app/frontend/src/lib/api-client.ts

@@ -492,12 +492,11 @@ export function getApiBaseUrl(): string {
 
 // pingServer hits the public /health route — any HTTP response proves
 // reachability, and no auth means no 401 noise in the connectivity probe.
-export async function pingServer(): Promise<boolean> {
+export async function pingServer(): Promise<void> {
   const res = await fetch(`${API_ROOT}/health`);
   if (!res.ok) {
     throw new Error(`Server returned ${res.status}`);
   }
-  return true;
 }
 
 export type SetupStatus = {

app/frontend/src/main.tsx

@@ -23,7 +23,6 @@ const queryClient = new QueryClient({
 // High-churn or bulky keys never hit localStorage — a stale log tail is
 // worse than none.
 const NEVER_PERSIST = new Set([
-  'auth-session',
   'shell-notifications',
   'notifications',
   'service-logs',

app/frontend/vite.config.ts

@@ -59,12 +59,8 @@ export default defineConfig({
     },
     proxy: {
       // Same-origin API path for dev - matches the nginx proxy in the shipped image
-      '/health': {
-        target: process.env.VITE_API_PROXY ?? 'http://localhost:8082',
-        changeOrigin: true,
-      },
       '/api': {
-        target: process.env.VITE_API_PROXY ?? 'http://localhost:8082',
+        target: 'http://localhost:8082',
         changeOrigin: true,
         ws: true,
       },