6 files changed, 447 insertions, 0 deletions

diff --git a/internal/handlers/buckets_web.go b/internal/handlers/buckets_web.go
new file mode 100644
index 0000000..094e8dd
--- /dev/null
+++ b/internal/handlers/buckets_web.go
@@ -0,0 +1,131 @@
+package handlers
+
+import (
+	"errors"
+	"net/http"
+	"strconv"
+	"strings"
+
+	"github.com/go-chi/chi/v5"
+
+	"task-dashboard/internal/models"
+	"task-dashboard/internal/store"
+)
+
+// BuildBucketSummaries returns every maintenance bucket with its full pool
+// (dormant and active items both). Backs the Settings page's bucket
+// management section.
+func BuildBucketSummaries(s *store.Store) ([]models.BucketSummary, error) {
+	buckets, err := s.GetBuckets()
+	if err != nil {
+		return nil, err
+	}
+	summaries := make([]models.BucketSummary, 0, len(buckets))
+	for _, bucket := range buckets {
+		items, err := s.GetBucketItems(bucket.ID)
+		if err != nil {
+			return nil, err
+		}
+		summaries = append(summaries, models.BucketSummary{Bucket: bucket, Items: items})
+	}
+	return summaries, nil
+}
+
+// HandleBucketsCreate creates a new maintenance bucket from the Settings page's form.
+func (h *Handler) HandleBucketsCreate(w http.ResponseWriter, r *http.Request) {
+	if err := r.ParseForm(); err != nil {
+		JSONError(w, http.StatusBadRequest, "Failed to parse form", err)
+		return
+	}
+	name := strings.TrimSpace(r.FormValue("name"))
+	cycleDays, err1 := strconv.Atoi(r.FormValue("cycle_days"))
+	pickN, err2 := strconv.Atoi(r.FormValue("pick_n"))
+	if name == "" || err1 != nil || err2 != nil || cycleDays <= 0 || pickN <= 0 {
+		JSONError(w, http.StatusBadRequest, "Name, a positive cycle_days, and a positive pick_n are required", nil)
+		return
+	}
+	if _, err := h.store.CreateBucket(name, cycleDays, pickN); err != nil {
+		JSONError(w, http.StatusInternalServerError, "Failed to create bucket", err)
+		return
+	}
+	h.renderBucketsSection(w, r)
+}
+
+// HandleBucketItemAdd creates a new native task from the form's title and
+// assigns it to the bucket's pool in one step -- the Settings page's
+// "type a title to add to the pool" flow. To add a task that already
+// exists elsewhere, use the /api/widget/buckets/{id}/items endpoint with
+// its id directly (unchanged, still task_id-based).
+func (h *Handler) HandleBucketItemAdd(w http.ResponseWriter, r *http.Request) {
+	bucketID := chi.URLParam(r, "id")
+	if err := r.ParseForm(); err != nil {
+		JSONError(w, http.StatusBadRequest, "Failed to parse form", err)
+		return
+	}
+	title := strings.TrimSpace(r.FormValue("title"))
+	if title == "" {
+		JSONError(w, http.StatusBadRequest, "title is required", nil)
+		return
+	}
+	task := models.Task{ID: newID(), Content: title, Priority: 1}
+	if err := h.store.CreateNativeTask(task); err != nil {
+		JSONError(w, http.StatusInternalServerError, "Failed to create task", err)
+		return
+	}
+	if err := h.store.AddBucketItem(bucketID, task.ID); err != nil {
+		JSONError(w, http.StatusInternalServerError, "Failed to add task to bucket", err)
+		return
+	}
+	h.renderBucketsSection(w, r)
+}
+
+// HandleBucketItemRemove clears a task's bucket membership from the
+// Settings page (the task itself is left in place, just unbucketed).
+func (h *Handler) HandleBucketItemRemove(w http.ResponseWriter, r *http.Request) {
+	if err := r.ParseForm(); err != nil {
+		JSONError(w, http.StatusBadRequest, "Failed to parse form", err)
+		return
+	}
+	taskID := r.FormValue("task_id")
+	if err := h.store.RemoveBucketItem(taskID); err != nil {
+		if errors.Is(err, store.ErrNativeTaskNotFound) {
+			JSONError(w, http.StatusNotFound, "task not found", err)
+			return
+		}
+		JSONError(w, http.StatusInternalServerError, "Failed to remove bucket item", err)
+		return
+	}
+	h.renderBucketsSection(w, r)
+}
+
+// HandleBucketDelete removes a bucket, returning its member tasks to being
+// plain unbucketed tasks.
+func (h *Handler) HandleBucketDelete(w http.ResponseWriter, r *http.Request) {
+	id := chi.URLParam(r, "id")
+	if err := h.store.DeleteBucket(id); err != nil {
+		if errors.Is(err, store.ErrNativeTaskNotFound) {
+			JSONError(w, http.StatusNotFound, "bucket not found", err)
+			return
+		}
+		JSONError(w, http.StatusInternalServerError, "Failed to delete bucket", err)
+		return
+	}
+	h.renderBucketsSection(w, r)
+}
+
+// renderBucketsSection re-renders the "buckets-section" partial after any
+// bucket mutation, so the Settings page's htmx targets can swap in the
+// fresh pool contents without a full page reload.
+func (h *Handler) renderBucketsSection(w http.ResponseWriter, r *http.Request) {
+	summaries, err := BuildBucketSummaries(h.store)
+	if err != nil {
+		JSONError(w, http.StatusInternalServerError, "Failed to load buckets", err)
+		return
+	}
+	data := struct {
+		Buckets []models.BucketSummary
+	}{Buckets: summaries}
+	if err := h.renderer.Render(w, "buckets-section", data); err != nil {
+		JSONError(w, http.StatusInternalServerError, "Failed to render buckets", err)
+	}
+}
diff --git a/internal/handlers/buckets_web_test.go b/internal/handlers/buckets_web_test.go
new file mode 100644
index 0000000..9e09ca0
--- /dev/null
+++ b/internal/handlers/buckets_web_test.go
@@ -0,0 +1,193 @@
+package handlers
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"task-dashboard/internal/models"
+	"task-dashboard/internal/store"
+)
+
+func TestHandleBucketsCreate_Web_CreatesBucket(t *testing.T) {
+	h, cleanup := setupTestHandler(t)
+	defer cleanup()
+
+	req := httptest.NewRequest("POST", "/settings/buckets", strings.NewReader("name=Gutters&cycle_days=30&pick_n=2"))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	w := httptest.NewRecorder()
+	h.HandleBucketsCreate(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status = %d, want 200, body=%s", w.Code, w.Body.String())
+	}
+	buckets, err := h.store.GetBuckets()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(buckets) != 1 || buckets[0].Name != "Gutters" {
+		t.Errorf("buckets = %+v", buckets)
+	}
+}
+
+func TestHandleBucketsCreate_Web_InvalidPickN_Returns400(t *testing.T) {
+	h, cleanup := setupTestHandler(t)
+	defer cleanup()
+
+	req := httptest.NewRequest("POST", "/settings/buckets", strings.NewReader("name=Gutters&cycle_days=30&pick_n=0"))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	w := httptest.NewRecorder()
+	h.HandleBucketsCreate(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Fatalf("status = %d, want 400", w.Code)
+	}
+}
+
+func TestHandleBucketItemAdd_Web_CreatesAndAssignsTask(t *testing.T) {
+	h, cleanup := setupTestHandler(t)
+	defer cleanup()
+	bucket, err := h.store.CreateBucket("Gutters", 30, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	req := withURLParam(httptest.NewRequest("POST", "/settings/buckets/"+bucket.ID+"/items", strings.NewReader("title=Clean+gutters")), "id", bucket.ID)
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	w := httptest.NewRecorder()
+	h.HandleBucketItemAdd(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status = %d, want 200, body=%s", w.Code, w.Body.String())
+	}
+	items, err := h.store.GetBucketItems(bucket.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(items) != 1 || items[0].Content != "Clean gutters" || items[0].BucketState != "dormant" {
+		t.Errorf("items = %+v", items)
+	}
+}
+
+func TestHandleBucketItemAdd_Web_EmptyTitle_Returns400(t *testing.T) {
+	h, cleanup := setupTestHandler(t)
+	defer cleanup()
+	bucket, err := h.store.CreateBucket("Gutters", 30, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	req := withURLParam(httptest.NewRequest("POST", "/settings/buckets/"+bucket.ID+"/items", strings.NewReader("title=")), "id", bucket.ID)
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	w := httptest.NewRecorder()
+	h.HandleBucketItemAdd(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Fatalf("status = %d, want 400", w.Code)
+	}
+}
+
+func TestHandleBucketItemRemove_Web_RemovesMembership(t *testing.T) {
+	h, cleanup := setupTestHandler(t)
+	defer cleanup()
+	bucket, err := h.store.CreateBucket("Gutters", 30, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := h.store.CreateNativeTask(models.Task{ID: "task-1", Content: "Clean gutters", Priority: 1}); err != nil {
+		t.Fatal(err)
+	}
+	if err := h.store.AddBucketItem(bucket.ID, "task-1"); err != nil {
+		t.Fatal(err)
+	}
+
+	req := httptest.NewRequest("POST", "/settings/buckets/items/remove", strings.NewReader("task_id=task-1"))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	w := httptest.NewRecorder()
+	h.HandleBucketItemRemove(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status = %d, want 200, body=%s", w.Code, w.Body.String())
+	}
+	task, err := h.store.GetNativeTaskByID("task-1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if task.BucketID != "" {
+		t.Errorf("task.BucketID = %q, want empty", task.BucketID)
+	}
+}
+
+func TestHandleBucketDelete_Web_RemovesBucket(t *testing.T) {
+	h, cleanup := setupTestHandler(t)
+	defer cleanup()
+	bucket, err := h.store.CreateBucket("Gutters", 30, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	req := withURLParam(httptest.NewRequest("DELETE", "/settings/buckets/"+bucket.ID, nil), "id", bucket.ID)
+	w := httptest.NewRecorder()
+	h.HandleBucketDelete(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status = %d, want 200, body=%s", w.Code, w.Body.String())
+	}
+	buckets, err := h.store.GetBuckets()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(buckets) != 0 {
+		t.Errorf("buckets = %+v, want none", buckets)
+	}
+}
+
+func TestHandleSettingsPage_IncludesBucketsProjectsLabels(t *testing.T) {
+	h, cleanup := setupTestHandler(t)
+	defer cleanup()
+	if _, err := h.store.CreateBucket("Gutters", 30, 1); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := h.store.CreateProject("Home", "#3B82F6"); err != nil {
+		t.Fatal(err)
+	}
+	if err := h.store.SetLabelColor("chore", "#F59E0B"); err != nil {
+		t.Fatal(err)
+	}
+
+	req := httptest.NewRequest("GET", "/settings", nil)
+	w := httptest.NewRecorder()
+	h.HandleSettingsPage(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status = %d, want 200, body=%s", w.Code, w.Body.String())
+	}
+
+	mock := h.renderer.(*MockRenderer)
+	lastCall := mock.Calls[len(mock.Calls)-1]
+	data, ok := lastCall.Data.(struct {
+		Configs         map[string][]models.SourceConfig
+		Sources         []string
+		Toggles         []models.FeatureToggle
+		SyncLog         []store.SyncLogEntry
+		Agents          []models.Agent
+		Buckets         []models.BucketSummary
+		Projects        []models.Project
+		Labels          []models.LabelColor
+		CSRFToken       string
+		WebAuthnEnabled bool
+	})
+	if !ok {
+		t.Fatalf("unexpected data type %T", lastCall.Data)
+	}
+	if len(data.Buckets) != 1 || data.Buckets[0].Bucket.Name != "Gutters" {
+		t.Errorf("Buckets = %+v", data.Buckets)
+	}
+	if len(data.Projects) != 1 || data.Projects[0].Name != "Home" {
+		t.Errorf("Projects = %+v", data.Projects)
+	}
+	if len(data.Labels) != 1 || data.Labels[0].Name != "chore" {
+		t.Errorf("Labels = %+v", data.Labels)
+	}
+}
diff --git a/internal/handlers/settings.go b/internal/handlers/settings.go
index 28988b1..43fce20 100644
--- a/internal/handlers/settings.go
+++ b/internal/handlers/settings.go
@@ -17,6 +17,9 @@ func (h *Handler) HandleSettingsPage(w http.ResponseWriter, r *http.Request) {
 	toggles, _ := h.store.GetFeatureToggles()
 	syncLog, _ := h.store.GetRecentSyncLog(20)
 	agents, _ := h.store.GetAllAgents()
+	buckets, _ := BuildBucketSummaries(h.store)
+	projects, _ := h.store.GetProjects()
+	labels, _ := h.store.GetLabelColors()
 
 	// Group configs by source
 	bySource := make(map[string][]models.SourceConfig)
@@ -30,6 +33,9 @@ func (h *Handler) HandleSettingsPage(w http.ResponseWriter, r *http.Request) {
 		Toggles         []models.FeatureToggle
 		SyncLog         []store.SyncLogEntry
 		Agents          []models.Agent
+		Buckets         []models.BucketSummary
+		Projects        []models.Project
+		Labels          []models.LabelColor
 		CSRFToken       string
 		WebAuthnEnabled bool
 	}{
@@ -38,6 +44,9 @@ func (h *Handler) HandleSettingsPage(w http.ResponseWriter, r *http.Request) {
 		Toggles:         toggles,
 		SyncLog:         syncLog,
 		Agents:          agents,
+		Buckets:         buckets,
+		Projects:        projects,
+		Labels:          labels,
 		CSRFToken:       auth.GetCSRFTokenFromContext(r.Context()),
 		WebAuthnEnabled: h.WebAuthnEnabled,
 	}
diff --git a/internal/models/types.go b/internal/models/types.go
index 846ce50..151ef54 100644
--- a/internal/models/types.go
+++ b/internal/models/types.go
@@ -62,6 +62,13 @@ type ChainSummary struct {
 	Total       int
 }
 
+// BucketSummary is a maintenance bucket plus its full pool (dormant and
+// active tasks both), for the Settings page's bucket-management view.
+type BucketSummary struct {
+	Bucket MaintenanceBucket
+	Items  []Task
+}
+
 // ChainTaskInput seeds one position of a chain at creation time. Priority
 // of 0 (the zero value, JSON field omitted) defaults to 1, matching
 // CreateNativeTask's default.
diff --git a/internal/store/buckets.go b/internal/store/buckets.go
index 8bbcca9..1e3ce9a 100644
--- a/internal/store/buckets.go
+++ b/internal/store/buckets.go
@@ -89,6 +89,51 @@ func (s *Store) RemoveBucketItem(taskID string) error {
 	return checkRowsAffected(result)
 }
 
+// GetBucketItems returns every task in a bucket's pool (dormant and active
+// both), active first, then by priority -- backs the bucket-management view.
+func (s *Store) GetBucketItems(bucketID string) ([]models.Task, error) {
+	rows, err := s.db.Query(`
+		SELECT id, content, description, project_name, project_id, due_date, priority, completed, labels, created_at,
+		       recurrence_freq, recurrence_interval, recurrence_weekdays, recurrence_series_id, next_occurrence_override, estimated_minutes,
+		       chain_id, chain_position, chain_unlocked,
+		       bucket_id, bucket_state, bucket_last_active_at
+		FROM native_tasks
+		WHERE bucket_id = ?
+		ORDER BY (bucket_state = 'active') DESC, priority DESC
+	`, bucketID)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = rows.Close() }()
+	return scanNativeTasks(rows)
+}
+
+// DeleteBucket removes a bucket and returns every member task to being a
+// plain, unbucketed task (clearing bucket_id/bucket_state/
+// bucket_last_active_at) rather than deleting them. Returns
+// ErrNativeTaskNotFound if id doesn't match any row.
+func (s *Store) DeleteBucket(id string) error {
+	tx, err := s.db.Begin()
+	if err != nil {
+		return err
+	}
+	defer func() { _ = tx.Rollback() }()
+
+	if _, err := tx.Exec(`
+		UPDATE native_tasks SET bucket_id = '', bucket_state = '', bucket_last_active_at = NULL, updated_at = ? WHERE bucket_id = ?
+	`, config.Now(), id); err != nil {
+		return err
+	}
+	result, err := tx.Exec(`DELETE FROM maintenance_buckets WHERE id = ?`, id)
+	if err != nil {
+		return err
+	}
+	if err := checkRowsAffected(result); err != nil {
+		return err
+	}
+	return tx.Commit()
+}
+
 // selectBucketCycle activates the top pick_n dormant items in the bucket's
 // pool, scored by staleness (never-activated items first, then oldest
 // bucket_last_active_at) with task priority as a tiebreaker. Activated items
diff --git a/internal/store/buckets_web_test.go b/internal/store/buckets_web_test.go
new file mode 100644
index 0000000..564b09a
--- /dev/null
+++ b/internal/store/buckets_web_test.go
@@ -0,0 +1,62 @@
+package store
+
+import (
+	"testing"
+	"time"
+)
+
+func TestGetBucketItems_ReturnsActiveFirst(t *testing.T) {
+	s := newNativeTasksTestStore(t)
+	bucket, err := s.CreateBucket("Gutters", 30, 5)
+	if err != nil {
+		t.Fatal(err)
+	}
+	createDormantTask(t, s, "dormant-1", bucket.ID, 1, nil)
+	createDormantTask(t, s, "dormant-2", bucket.ID, 1, nil)
+	if _, err := s.selectBucketCycle(bucket.ID, time.Now()); err != nil {
+		t.Fatal(err)
+	}
+
+	items, err := s.GetBucketItems(bucket.ID)
+	if err != nil {
+		t.Fatalf("GetBucketItems: %v", err)
+	}
+	if len(items) != 2 {
+		t.Fatalf("len(items) = %d, want 2", len(items))
+	}
+	if items[0].BucketState != "active" {
+		t.Errorf("items[0].BucketState = %q, want active (active items sort first)", items[0].BucketState)
+	}
+}
+
+func TestDeleteBucket_UnbucketsItemsAndRemovesBucket(t *testing.T) {
+	s := newNativeTasksTestStore(t)
+	bucket, err := s.CreateBucket("Gutters", 30, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	createDormantTask(t, s, "item-1", bucket.ID, 1, nil)
+
+	if err := s.DeleteBucket(bucket.ID); err != nil {
+		t.Fatalf("DeleteBucket: %v", err)
+	}
+
+	if _, err := s.GetBucketByID(bucket.ID); err != ErrNativeTaskNotFound {
+		t.Errorf("bucket should be gone, err = %v", err)
+	}
+	task, err := s.GetNativeTaskByID("item-1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if task.BucketID != "" || task.BucketState != "" {
+		t.Errorf("task = %+v, want unbucketed (task itself kept, not deleted)", task)
+	}
+}
+
+func TestDeleteBucket_UnknownID_ReturnsErrNotFound(t *testing.T) {
+	s := newNativeTasksTestStore(t)
+
+	if err := s.DeleteBucket("does-not-exist"); err != ErrNativeTaskNotFound {
+		t.Errorf("err = %v, want ErrNativeTaskNotFound", err)
+	}
+}