3 files changed, 108 insertions, 3 deletions
diff --git a/internal/cli/list.go b/internal/cli/list.go
index 3425388..ab80868 100644
--- a/internal/cli/list.go
+++ b/internal/cli/list.go
@@ -49,10 +49,10 @@ func listTasks(state string) error {
 	}
 
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintln(w, "ID\tNAME\tSTATE\tPRIORITY\tCREATED")
+	fmt.Fprintln(w, "ID\tNAME\tPROJECT\tSTATE\tPRIORITY\tCREATED")
 	for _, t := range tasks {
-		fmt.Fprintf(w, "%.8s\t%s\t%s\t%s\t%s\n",
-			t.ID, t.Name, t.State, t.Priority, t.CreatedAt.Format("2006-01-02 15:04"))
+		fmt.Fprintf(w, "%.8s\t%s\t%s\t%s\t%s\t%s\n",
+			t.ID, t.Name, t.Project, t.State, t.Priority, t.CreatedAt.Format("2006-01-02 15:04"))
 	}
 	w.Flush()
 	return nil
diff --git a/internal/cli/project_test.go b/internal/cli/project_test.go
new file mode 100644
index 0000000..c62e181
--- /dev/null
+++ b/internal/cli/project_test.go
@@ -0,0 +1,102 @@
+package cli
+
+import (
+	"bytes"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/thepeterstone/claudomator/internal/config"
+	"github.com/thepeterstone/claudomator/internal/storage"
+	"github.com/thepeterstone/claudomator/internal/task"
+)
+
+func makeProjectTask(t *testing.T, dir string) *task.Task {
+	t.Helper()
+	db, err := storage.Open(filepath.Join(dir, "test.db"))
+	if err != nil {
+		t.Fatalf("storage.Open: %v", err)
+	}
+	defer db.Close()
+
+	now := time.Now().UTC()
+	tk := &task.Task{
+		ID:        "proj-task-id",
+		Name:      "Project Task",
+		Project:   "test-project",
+		Agent:     task.AgentConfig{Type: "claude", Instructions: "do it", Model: "sonnet"},
+		Priority:  task.PriorityNormal,
+		Tags:      []string{},
+		DependsOn: []string{},
+		Retry:     task.RetryConfig{MaxAttempts: 1, Backoff: "exponential"},
+		State:     task.StatePending,
+		CreatedAt: now,
+		UpdatedAt: now,
+	}
+	if err := db.CreateTask(tk); err != nil {
+		t.Fatalf("CreateTask: %v", err)
+	}
+	return tk
+}
+
+func captureStdout(fn func()) string {
+	old := os.Stdout
+	r, w, _ := os.Pipe()
+	os.Stdout = w
+
+	fn()
+
+	w.Close()
+	os.Stdout = old
+	var buf bytes.Buffer
+	io.Copy(&buf, r)
+	return buf.String()
+}
+
+func withDB(t *testing.T, dbPath string, fn func()) {
+	t.Helper()
+	origCfg := cfg
+	if cfg == nil {
+		cfg = &config.Config{}
+	}
+	cfg.DBPath = dbPath
+	defer func() { cfg = origCfg }()
+	fn()
+}
+
+func TestListTasks_ShowsProject(t *testing.T) {
+	dir := t.TempDir()
+	dbPath := filepath.Join(dir, "test.db")
+	makeProjectTask(t, dir)
+
+	withDB(t, dbPath, func() {
+		out := captureStdout(func() {
+			if err := listTasks(""); err != nil {
+				t.Fatalf("listTasks: %v", err)
+			}
+		})
+		if !strings.Contains(out, "test-project") {
+			t.Errorf("list output missing project 'test-project':\n%s", out)
+		}
+	})
+}
+
+func TestStatusCmd_ShowsProject(t *testing.T) {
+	dir := t.TempDir()
+	dbPath := filepath.Join(dir, "test.db")
+	tk := makeProjectTask(t, dir)
+
+	withDB(t, dbPath, func() {
+		out := captureStdout(func() {
+			if err := showStatus(tk.ID); err != nil {
+				t.Fatalf("showStatus: %v", err)
+			}
+		})
+		if !strings.Contains(out, "test-project") {
+			t.Errorf("status output missing project 'test-project':\n%s", out)
+		}
+	})
+}
diff --git a/internal/cli/status.go b/internal/cli/status.go
index 16b88b0..77a30d5 100644
--- a/internal/cli/status.go
+++ b/internal/cli/status.go
@@ -39,6 +39,9 @@ func showStatus(id string) error {
 	fmt.Printf("State: %s\n", t.State)
 	fmt.Printf("Priority: %s\n", t.Priority)
 	fmt.Printf("Model: %s\n", t.Agent.Model)
+	if t.Project != "" {
+		fmt.Printf("Project: %s\n", t.Project)
+	}
 	if t.Description != "" {
 		fmt.Printf("Description: %s\n", t.Description)
 	}