feat: add title and description fields to capture grammar

Implement | prefix for titles and // separator for descriptions across the full stack: parser, schema, API, CLI, and web frontend. - Parser: line-aware extraction for |title, |title // desc, // leading desc, body // inline desc. URL-safe (skips :// lines). Modifiers (#tag, @time, ^card) extracted from all segments. - Schema: ALTER TABLE migration adds title, description columns - DB: Entity/EntityUpdate structs, all CRUD queries updated - API: title/description on create/update/response, body validation relaxed (title-only entries valid) - CLI: shows title as scan label when present - Web: parseInput mirrors Go parser, list shows title, detail pane renders title + description with double-click inline editing - Tests: 10 new cases (grammar, entity, API) — 71 total, all pass
Merge pull request 'fix: code principles audit — correctness, security, test-ability' (#5 ) from fix/code-principles-audit into develop
2026-05-15 21:19:33 -04:00 · 2026-05-14 21:55:27 +00:00 · 2026-05-14 17:41:30 -04:00
17 changed files with 1172 additions and 258 deletions
@@ -32,9 +32,11 @@ func runAdd(_ *cobra.Command, args []string) error {
 	defer store.Close()

 	e := &db.Entity{
-		Body:  parsed.Body,
-		Glyph: db.Glyph(parsed.Glyph),
-		Tags:  parsed.Tags,
+		Body:        parsed.Body,
+		Title:       parsed.Title,
+		Description: parsed.Description,
+		Glyph:       db.Glyph(parsed.Glyph),
+		Tags:        parsed.Tags,
 	}
 	if parsed.TimeAnchor != nil {
 		e.TimeAnchor = parsed.TimeAnchor
@@ -53,12 +55,16 @@ func runAdd(_ *cobra.Command, args []string) error {

 	var parts []string
 	parts = append(parts, glyph)
-	parts = append(parts, " "+e.Body)
+	if e.Title != nil {
+		parts = append(parts, "  "+*e.Title)
+	} else {
+		parts = append(parts, "  "+e.Body)
+	}
 	if e.TimeAnchor != nil {
-		parts = append(parts, " @"+*e.TimeAnchor)
+		parts = append(parts, "  @"+*e.TimeAnchor)
 	}
 	for _, tag := range e.Tags {
-		parts = append(parts, " #"+tag)
+		parts = append(parts, "  #"+tag)
 	}
 	parts = append(parts, "  ["+shortID+"]")
 	if e.CardType != nil {
@@ -0,0 +1,151 @@
+package cmd
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/lerko/nib/internal/db"
+)
+
+func TestGenerateCardData_Snippet(t *testing.T) {
+	data := generateCardData(db.CardSnippet, "some snippet")
+	if data == nil || *data != "{}" {
+		t.Errorf("snippet should produce {}, got %v", data)
+	}
+}
+
+func TestGenerateCardData_Template(t *testing.T) {
+	data := generateCardData(db.CardTemplate, "deploy ${host} to ${env}")
+	if data == nil {
+		t.Fatal("expected non-nil data")
+	}
+
+	var parsed struct {
+		Slots []struct {
+			Name    string `json:"name"`
+			Default string `json:"default"`
+		} `json:"slots"`
+	}
+	if err := json.Unmarshal([]byte(*data), &parsed); err != nil {
+		t.Fatal(err)
+	}
+	if len(parsed.Slots) != 2 {
+		t.Fatalf("expected 2 slots, got %d", len(parsed.Slots))
+	}
+	if parsed.Slots[0].Name != "host" {
+		t.Errorf("first slot: %q", parsed.Slots[0].Name)
+	}
+	if parsed.Slots[1].Name != "env" {
+		t.Errorf("second slot: %q", parsed.Slots[1].Name)
+	}
+}
+
+func TestGenerateCardData_TemplateDedupe(t *testing.T) {
+	data := generateCardData(db.CardTemplate, "${x} and ${x}")
+	var parsed struct {
+		Slots []struct {
+			Name string `json:"name"`
+		} `json:"slots"`
+	}
+	json.Unmarshal([]byte(*data), &parsed)
+	if len(parsed.Slots) != 1 {
+		t.Errorf("duplicate slots should be deduped, got %d", len(parsed.Slots))
+	}
+}
+
+func TestGenerateCardData_TemplateNoSlots(t *testing.T) {
+	data := generateCardData(db.CardTemplate, "no placeholders here")
+	var parsed struct {
+		Slots []struct {
+			Name string `json:"name"`
+		} `json:"slots"`
+	}
+	json.Unmarshal([]byte(*data), &parsed)
+	if len(parsed.Slots) != 0 {
+		t.Errorf("expected empty slots, got %d", len(parsed.Slots))
+	}
+}
+
+func TestGenerateCardData_Checklist(t *testing.T) {
+	body := "[ ] step one\n[x] step two\n[ ] step three"
+	data := generateCardData(db.CardChecklist, body)
+	if data == nil {
+		t.Fatal("expected non-nil data")
+	}
+
+	var parsed struct {
+		Steps []struct {
+			Text string `json:"text"`
+			Done bool   `json:"done"`
+		} `json:"steps"`
+	}
+	if err := json.Unmarshal([]byte(*data), &parsed); err != nil {
+		t.Fatal(err)
+	}
+	if len(parsed.Steps) != 3 {
+		t.Fatalf("expected 3 steps, got %d", len(parsed.Steps))
+	}
+	if parsed.Steps[0].Text != "step one" || parsed.Steps[0].Done {
+		t.Errorf("step 0: %+v", parsed.Steps[0])
+	}
+	if parsed.Steps[1].Text != "step two" || !parsed.Steps[1].Done {
+		t.Errorf("step 1: %+v", parsed.Steps[1])
+	}
+}
+
+func TestGenerateCardData_ChecklistFallback(t *testing.T) {
+	data := generateCardData(db.CardChecklist, "no checkbox syntax")
+	var parsed struct {
+		Steps []struct {
+			Text string `json:"text"`
+			Done bool   `json:"done"`
+		} `json:"steps"`
+	}
+	json.Unmarshal([]byte(*data), &parsed)
+	if len(parsed.Steps) != 1 {
+		t.Fatalf("fallback should produce 1 step, got %d", len(parsed.Steps))
+	}
+	if parsed.Steps[0].Text != "no checkbox syntax" {
+		t.Errorf("fallback step text: %q", parsed.Steps[0].Text)
+	}
+}
+
+func TestGenerateCardData_Decision(t *testing.T) {
+	data := generateCardData(db.CardDecision, "which db?")
+	var parsed struct {
+		Chose    string   `json:"chose"`
+		Why      string   `json:"why"`
+		Rejected []string `json:"rejected"`
+	}
+	if err := json.Unmarshal([]byte(*data), &parsed); err != nil {
+		t.Fatal(err)
+	}
+	if parsed.Chose != "" || parsed.Why != "" {
+		t.Error("decision fields should start empty")
+	}
+	if len(parsed.Rejected) != 0 {
+		t.Error("rejected should start empty")
+	}
+}
+
+func TestGenerateCardData_Link(t *testing.T) {
+	data := generateCardData(db.CardLink, "check https://example.com/path for details")
+	var parsed struct {
+		URL string `json:"url"`
+	}
+	json.Unmarshal([]byte(*data), &parsed)
+	if parsed.URL != "https://example.com/path" {
+		t.Errorf("url: %q", parsed.URL)
+	}
+}
+
+func TestGenerateCardData_LinkNoURL(t *testing.T) {
+	data := generateCardData(db.CardLink, "no url here")
+	var parsed struct {
+		URL string `json:"url"`
+	}
+	json.Unmarshal([]byte(*data), &parsed)
+	if parsed.URL != "" {
+		t.Errorf("expected empty url, got %q", parsed.URL)
+	}
+}
@@ -3,21 +3,24 @@ module github.com/lerko/nib
 go 1.24.4

 require (
-	github.com/atotto/clipboard v0.1.4 // indirect
+	github.com/atotto/clipboard v0.1.4
+	github.com/go-chi/chi/v5 v5.2.5
+	github.com/oklog/ulid/v2 v2.1.1
+	github.com/spf13/cobra v1.10.2
+	modernc.org/sqlite v1.37.1
+)
+
+require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/go-chi/chi/v5 v5.2.5 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/oklog/ulid/v2 v2.1.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/spf13/cobra v1.10.2 // indirect
 	github.com/spf13/pflag v1.0.9 // indirect
 	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	modernc.org/libc v1.65.7 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.37.1 // indirect
 )
@@ -5,6 +5,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
 github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -26,15 +28,37 @@ github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s=
+modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU=
+modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE=
+modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
+modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
+modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
+modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
 modernc.org/libc v1.65.7 h1:Ia9Z4yzZtWNtUIuiPuQ7Qf7kxYrxP1/jeHZzG8bFu00=
 modernc.org/libc v1.65.7/go.mod h1:011EQibzzio/VX3ygj1qGFt5kMjP0lHb0qCW5/D/pQU=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
 modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
+modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
+modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
+modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
+modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
 modernc.org/sqlite v1.37.1 h1:EgHJK/FPoqC+q2YBXg7fUmES37pCHFc97sI7zSayBEs=
 modernc.org/sqlite v1.37.1/go.mod h1:XwdRtsE1MpiBcL54+MbKcaDvcuej+IYSMfLN6gSKV8g=
+modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
+modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
+modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
+modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
@@ -25,15 +25,22 @@ func testServer(t *testing.T) (*httptest.Server, *db.Store) {
 	return srv, store
 }

-func postJSON(srv *httptest.Server, path string, body any) *http.Response {
-	b, _ := json.Marshal(body)
-	resp, _ := http.Post(srv.URL+path, "application/json", bytes.NewReader(b))
+func postJSON(t *testing.T, srv *httptest.Server, path string, body any) *http.Response {
+	t.Helper()
+	b, err := json.Marshal(body)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := http.Post(srv.URL+path, "application/json", bytes.NewReader(b))
+	if err != nil {
+		t.Fatal(err)
+	}
 	return resp
 }

 func createTestEntity(t *testing.T, srv *httptest.Server, body string, tags []string) EntityResponse {
 	t.Helper()
-	resp := postJSON(srv, "/api/entities", map[string]any{
+	resp := postJSON(t, srv, "/api/entities", map[string]any{
 		"body": body,
 		"tags": tags,
 	})
@@ -49,7 +56,7 @@ func createTestEntity(t *testing.T, srv *httptest.Server, body string, tags []st
 func TestCreateEntity_Note(t *testing.T) {
 	srv, _ := testServer(t)

-	resp := postJSON(srv, "/api/entities", map[string]any{
+	resp := postJSON(t, srv, "/api/entities", map[string]any{
 		"body": "test note",
 		"tags": []string{"demo"},
 	})
@@ -76,7 +83,7 @@ func TestCreateEntity_Note(t *testing.T) {
 func TestCreateEntity_MissingBody(t *testing.T) {
 	srv, _ := testServer(t)

-	resp := postJSON(srv, "/api/entities", map[string]any{})
+	resp := postJSON(t, srv, "/api/entities", map[string]any{})
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusBadRequest {
@@ -93,7 +100,7 @@ func TestCreateEntity_MissingBody(t *testing.T) {
 func TestCreateEntity_InvalidGlyph(t *testing.T) {
 	srv, _ := testServer(t)

-	resp := postJSON(srv, "/api/entities", map[string]any{
+	resp := postJSON(t, srv, "/api/entities", map[string]any{
 		"body":  "test",
 		"glyph": "invalid",
 	})
@@ -108,7 +115,10 @@ func TestGetEntity_Success(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "test", nil)

-	resp, _ := http.Get(srv.URL + "/api/entities/" + created.ID)
+	resp, err := http.Get(srv.URL + "/api/entities/" + created.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusOK {
@@ -125,7 +135,10 @@ func TestGetEntity_Success(t *testing.T) {
 func TestGetEntity_NotFound(t *testing.T) {
 	srv, _ := testServer(t)

-	resp, _ := http.Get(srv.URL + "/api/entities/NONEXISTENT")
+	resp, err := http.Get(srv.URL + "/api/entities/NONEXISTENT")
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusNotFound {
@@ -138,7 +151,10 @@ func TestListEntities_Default(t *testing.T) {
 	createTestEntity(t, srv, "one", nil)
 	createTestEntity(t, srv, "two", nil)

-	resp, _ := http.Get(srv.URL + "/api/entities")
+	resp, err := http.Get(srv.URL + "/api/entities")
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	var entities []EntityResponse
@@ -153,7 +169,10 @@ func TestListEntities_FilterTag(t *testing.T) {
 	createTestEntity(t, srv, "a", []string{"ops"})
 	createTestEntity(t, srv, "b", []string{"home"})

-	resp, _ := http.Get(srv.URL + "/api/entities?tag=ops")
+	resp, err := http.Get(srv.URL + "/api/entities?tag=ops")
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	var entities []EntityResponse
@@ -167,13 +186,16 @@ func TestListEntities_CardsOnly(t *testing.T) {
 	srv, _ := testServer(t)
 	createTestEntity(t, srv, "fluid", nil)

-	resp := postJSON(srv, "/api/entities", map[string]any{
+	resp := postJSON(t, srv, "/api/entities", map[string]any{
 		"body":      "card",
 		"card_type": "snippet",
 	})
 	resp.Body.Close()

-	resp, _ = http.Get(srv.URL + "/api/entities?cards_only=true")
+	resp, err := http.Get(srv.URL + "/api/entities?cards_only=true")
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	var entities []EntityResponse
@@ -189,12 +211,18 @@ func TestListEntities_Pagination(t *testing.T) {
 		createTestEntity(t, srv, "note", nil)
 	}

-	resp, _ := http.Get(srv.URL + "/api/entities?limit=2&offset=0")
+	resp, err := http.Get(srv.URL + "/api/entities?limit=2&offset=0")
+	if err != nil {
+		t.Fatal(err)
+	}
 	var page1 []EntityResponse
 	json.NewDecoder(resp.Body).Decode(&page1)
 	resp.Body.Close()

-	resp, _ = http.Get(srv.URL + "/api/entities?limit=2&offset=2")
+	resp, err = http.Get(srv.URL + "/api/entities?limit=2&offset=2")
+	if err != nil {
+		t.Fatal(err)
+	}
 	var page2 []EntityResponse
 	json.NewDecoder(resp.Body).Decode(&page2)
 	resp.Body.Close()
@@ -211,10 +239,16 @@ func TestUpdateEntity_Body(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "old", nil)

-	req, _ := http.NewRequest("PUT", srv.URL+"/api/entities/"+created.ID, bytes.NewReader(
+	req, err := http.NewRequest("PUT", srv.URL+"/api/entities/"+created.ID, bytes.NewReader(
 		mustJSON(map[string]any{"body": "new"})))
+	if err != nil {
+		t.Fatal(err)
+	}
 	req.Header.Set("Content-Type", "application/json")
-	resp, _ := http.DefaultClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusOK {
@@ -233,8 +267,14 @@ func TestDeleteEntity_SoftThenHard(t *testing.T) {
 	created := createTestEntity(t, srv, "doomed", nil)

 	// Soft delete
-	req, _ := http.NewRequest("DELETE", srv.URL+"/api/entities/"+created.ID, nil)
-	resp, _ := http.DefaultClient.Do(req)
+	req, err := http.NewRequest("DELETE", srv.URL+"/api/entities/"+created.ID, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
 	var delResp DeleteResponse
 	json.NewDecoder(resp.Body).Decode(&delResp)
 	resp.Body.Close()
@@ -246,7 +286,14 @@ func TestDeleteEntity_SoftThenHard(t *testing.T) {
 	}

 	// Hard delete
-	resp, _ = http.DefaultClient.Do(req)
+	req, err = http.NewRequest("DELETE", srv.URL+"/api/entities/"+created.ID, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
 	json.NewDecoder(resp.Body).Decode(&delResp)
 	resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
@@ -257,7 +304,10 @@ func TestDeleteEntity_SoftThenHard(t *testing.T) {
 	}

 	// Gone
-	resp, _ = http.Get(srv.URL + "/api/entities/" + created.ID)
+	resp, err = http.Get(srv.URL + "/api/entities/" + created.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	resp.Body.Close()
 	if resp.StatusCode != http.StatusNotFound {
 		t.Fatalf("expected 404 after hard delete, got %d", resp.StatusCode)
@@ -268,7 +318,7 @@ func TestPromoteEntity_Success(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "trick", nil)

-	resp := postJSON(srv, "/api/entities/"+created.ID+"/promote", map[string]any{
+	resp := postJSON(t, srv, "/api/entities/"+created.ID+"/promote", map[string]any{
 		"card_type": "snippet",
 	})
 	defer resp.Body.Close()
@@ -288,11 +338,11 @@ func TestPromoteEntity_AlreadyPromoted(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "trick", nil)

-	postJSON(srv, "/api/entities/"+created.ID+"/promote", map[string]any{
+	postJSON(t, srv, "/api/entities/"+created.ID+"/promote", map[string]any{
 		"card_type": "snippet",
 	}).Body.Close()

-	resp := postJSON(srv, "/api/entities/"+created.ID+"/promote", map[string]any{
+	resp := postJSON(t, srv, "/api/entities/"+created.ID+"/promote", map[string]any{
 		"card_type": "template",
 	})
 	defer resp.Body.Close()
@@ -312,7 +362,7 @@ func TestPromoteEntity_InvalidType(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "trick", nil)

-	resp := postJSON(srv, "/api/entities/"+created.ID+"/promote", map[string]any{
+	resp := postJSON(t, srv, "/api/entities/"+created.ID+"/promote", map[string]any{
 		"card_type": "bogus",
 	})
 	defer resp.Body.Close()
@@ -326,11 +376,11 @@ func TestDemoteEntity_Success(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "trick", nil)

-	postJSON(srv, "/api/entities/"+created.ID+"/promote", map[string]any{
+	postJSON(t, srv, "/api/entities/"+created.ID+"/promote", map[string]any{
 		"card_type": "snippet",
 	}).Body.Close()

-	resp := postJSON(srv, "/api/entities/"+created.ID+"/demote", nil)
+	resp := postJSON(t, srv, "/api/entities/"+created.ID+"/demote", nil)
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusOK {
@@ -348,7 +398,7 @@ func TestDemoteEntity_AlreadyFluid(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "trick", nil)

-	resp := postJSON(srv, "/api/entities/"+created.ID+"/demote", nil)
+	resp := postJSON(t, srv, "/api/entities/"+created.ID+"/demote", nil)
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusBadRequest {
@@ -360,7 +410,7 @@ func TestUseEntity_Success(t *testing.T) {
 	srv, _ := testServer(t)
 	created := createTestEntity(t, srv, "trick", nil)

-	resp := postJSON(srv, "/api/entities/"+created.ID+"/use", nil)
+	resp := postJSON(t, srv, "/api/entities/"+created.ID+"/use", nil)
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusOK {
@@ -379,7 +429,10 @@ func TestListTags_WithCounts(t *testing.T) {
 	createTestEntity(t, srv, "a", []string{"ops"})
 	createTestEntity(t, srv, "b", []string{"ops", "nginx"})

-	resp, _ := http.Get(srv.URL + "/api/tags")
+	resp, err := http.Get(srv.URL + "/api/tags")
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	var tags []TagResponse
@@ -391,14 +444,23 @@ func TestListTags_WithCounts(t *testing.T) {

 func TestCORS_DevMode(t *testing.T) {
 	path := filepath.Join(t.TempDir(), "test.db")
-	store, _ := db.Open(path)
+	store, err := db.Open(path)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer store.Close()
 	router := NewRouter(store, true)
 	srv := httptest.NewServer(router)
 	defer srv.Close()

-	req, _ := http.NewRequest("OPTIONS", srv.URL+"/api/entities", nil)
-	resp, _ := http.DefaultClient.Do(req)
+	req, err := http.NewRequest("OPTIONS", srv.URL+"/api/entities", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	if resp.Header.Get("Access-Control-Allow-Origin") != "*" {
@@ -412,8 +474,14 @@ func TestCORS_DevMode(t *testing.T) {
 func TestCORS_ProdMode(t *testing.T) {
 	srv, _ := testServer(t) // devMode=false

-	req, _ := http.NewRequest("OPTIONS", srv.URL+"/api/entities", nil)
-	resp, _ := http.DefaultClient.Do(req)
+	req, err := http.NewRequest("OPTIONS", srv.URL+"/api/entities", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer resp.Body.Close()

 	if resp.Header.Get("Access-Control-Allow-Origin") != "" {
@@ -426,7 +494,7 @@ func TestAbsorbEntity_Success(t *testing.T) {
 	target := createTestEntity(t, srv, "target body", []string{"ops"})
 	source := createTestEntity(t, srv, "source body", []string{"ops", "infra"})

-	resp := postJSON(srv, "/api/entities/"+target.ID+"/absorb", map[string]any{
+	resp := postJSON(t, srv, "/api/entities/"+target.ID+"/absorb", map[string]any{
 		"source_id": source.ID,
 	})
 	defer resp.Body.Close()
@@ -445,7 +513,10 @@ func TestAbsorbEntity_Success(t *testing.T) {
 	}

 	// Source should be soft-deleted (not in default list)
-	listResp, _ := http.Get(srv.URL + "/api/entities")
+	listResp, err := http.Get(srv.URL + "/api/entities")
+	if err != nil {
+		t.Fatal(err)
+	}
 	var entities []EntityResponse
 	json.NewDecoder(listResp.Body).Decode(&entities)
 	listResp.Body.Close()
@@ -461,11 +532,11 @@ func TestAbsorbEntity_TargetCrystallized(t *testing.T) {
 	target := createTestEntity(t, srv, "target", nil)
 	source := createTestEntity(t, srv, "source", nil)

-	postJSON(srv, "/api/entities/"+target.ID+"/promote", map[string]any{
+	postJSON(t, srv, "/api/entities/"+target.ID+"/promote", map[string]any{
 		"card_type": "snippet",
 	}).Body.Close()

-	resp := postJSON(srv, "/api/entities/"+target.ID+"/absorb", map[string]any{
+	resp := postJSON(t, srv, "/api/entities/"+target.ID+"/absorb", map[string]any{
 		"source_id": source.ID,
 	})
 	defer resp.Body.Close()
@@ -485,7 +556,7 @@ func TestAbsorbEntity_SameEntity(t *testing.T) {
 	srv, _ := testServer(t)
 	e := createTestEntity(t, srv, "self", nil)

-	resp := postJSON(srv, "/api/entities/"+e.ID+"/absorb", map[string]any{
+	resp := postJSON(t, srv, "/api/entities/"+e.ID+"/absorb", map[string]any{
 		"source_id": e.ID,
 	})
 	defer resp.Body.Close()
@@ -499,7 +570,7 @@ func TestAbsorbEntity_MissingSourceID(t *testing.T) {
 	srv, _ := testServer(t)
 	e := createTestEntity(t, srv, "target", nil)

-	resp := postJSON(srv, "/api/entities/"+e.ID+"/absorb", map[string]any{})
+	resp := postJSON(t, srv, "/api/entities/"+e.ID+"/absorb", map[string]any{})
 	defer resp.Body.Close()

 	if resp.StatusCode != http.StatusBadRequest {
@@ -507,6 +578,115 @@ func TestAbsorbEntity_MissingSourceID(t *testing.T) {
 	}
 }

+func TestCreateEntity_WithTitle(t *testing.T) {
+	srv, _ := testServer(t)
+
+	resp := postJSON(t, srv, "/api/entities", map[string]any{
+		"body":        "body text",
+		"title":       "nginx trick",
+		"description": "always forget this",
+		"tags":        []string{"ops"},
+	})
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusCreated {
+		t.Fatalf("expected 201, got %d", resp.StatusCode)
+	}
+
+	var e EntityResponse
+	json.NewDecoder(resp.Body).Decode(&e)
+	if e.Title == nil || *e.Title != "nginx trick" {
+		t.Errorf("title: %v", e.Title)
+	}
+	if e.Description == nil || *e.Description != "always forget this" {
+		t.Errorf("description: %v", e.Description)
+	}
+}
+
+func TestCreateEntity_TitleOnly(t *testing.T) {
+	srv, _ := testServer(t)
+
+	title := "title only"
+	resp := postJSON(t, srv, "/api/entities", map[string]any{
+		"title": title,
+	})
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusCreated {
+		t.Fatalf("expected 201, got %d", resp.StatusCode)
+	}
+
+	var e EntityResponse
+	json.NewDecoder(resp.Body).Decode(&e)
+	if e.Title == nil || *e.Title != "title only" {
+		t.Errorf("title: %v", e.Title)
+	}
+}
+
+func TestUpdateEntity_Title(t *testing.T) {
+	srv, _ := testServer(t)
+	created := createTestEntity(t, srv, "body", nil)
+
+	req, _ := http.NewRequest("PUT", srv.URL+"/api/entities/"+created.ID, bytes.NewReader(
+		mustJSON(map[string]any{"title": "new title"})))
+	req.Header.Set("Content-Type", "application/json")
+	resp, _ := http.DefaultClient.Do(req)
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf("expected 200, got %d", resp.StatusCode)
+	}
+
+	var e EntityResponse
+	json.NewDecoder(resp.Body).Decode(&e)
+	if e.Title == nil || *e.Title != "new title" {
+		t.Errorf("title: %v", e.Title)
+	}
+}
+
+func TestUpdateEntity_Description(t *testing.T) {
+	srv, _ := testServer(t)
+	created := createTestEntity(t, srv, "body", nil)
+
+	req, _ := http.NewRequest("PUT", srv.URL+"/api/entities/"+created.ID, bytes.NewReader(
+		mustJSON(map[string]any{"description": "new desc"})))
+	req.Header.Set("Content-Type", "application/json")
+	resp, _ := http.DefaultClient.Do(req)
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf("expected 200, got %d", resp.StatusCode)
+	}
+
+	var e EntityResponse
+	json.NewDecoder(resp.Body).Decode(&e)
+	if e.Description == nil || *e.Description != "new desc" {
+		t.Errorf("description: %v", e.Description)
+	}
+}
+
+func TestListEntities_TitleInResponse(t *testing.T) {
+	srv, _ := testServer(t)
+
+	title := "list title"
+	postJSON(t, srv, "/api/entities", map[string]any{
+		"body":  "body",
+		"title": title,
+	}).Body.Close()
+
+	resp, _ := http.Get(srv.URL + "/api/entities")
+	defer resp.Body.Close()
+
+	var entities []EntityResponse
+	json.NewDecoder(resp.Body).Decode(&entities)
+	if len(entities) != 1 {
+		t.Fatalf("expected 1, got %d", len(entities))
+	}
+	if entities[0].Title == nil || *entities[0].Title != "list title" {
+		t.Errorf("title: %v", entities[0].Title)
+	}
+}
+
 func mustJSON(v any) []byte {
 	b, _ := json.Marshal(v)
 	return b
@@ -10,22 +10,26 @@ import (
 )

 type CreateEntityRequest struct {
-	Body       string   `json:"body"`
-	Glyph      *string  `json:"glyph"`
-	TimeAnchor *string  `json:"time_anchor"`
-	Tags       []string `json:"tags"`
-	CardType   *string  `json:"card_type"`
-	CardData   *string  `json:"card_data"`
+	Body        string   `json:"body"`
+	Title       *string  `json:"title"`
+	Description *string  `json:"description"`
+	Glyph       *string  `json:"glyph"`
+	TimeAnchor  *string  `json:"time_anchor"`
+	Tags        []string `json:"tags"`
+	CardType    *string  `json:"card_type"`
+	CardData    *string  `json:"card_data"`
 }

 type UpdateEntityRequest struct {
-	Body       *string   `json:"body"`
-	Glyph      *string   `json:"glyph"`
-	TimeAnchor *string   `json:"time_anchor"`
-	Tags       *[]string `json:"tags"`
-	Pinned     *bool     `json:"pinned"`
-	CardType   *string   `json:"card_type"`
-	CardData   *string   `json:"card_data"`
+	Body        *string   `json:"body"`
+	Title       *string   `json:"title"`
+	Description *string   `json:"description"`
+	Glyph       *string   `json:"glyph"`
+	TimeAnchor  *string   `json:"time_anchor"`
+	Tags        *[]string `json:"tags"`
+	Pinned      *bool     `json:"pinned"`
+	CardType    *string   `json:"card_type"`
+	CardData    *string   `json:"card_data"`
 }

 type PromoteRequest struct {
@@ -100,7 +104,7 @@ func listEntities(store *db.Store) http.HandlerFunc {

 		entities, err := store.List(p)
 		if err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

@@ -119,8 +123,8 @@ func createEntity(store *db.Store) http.HandlerFunc {
 			return
 		}

-		if req.Body == "" {
-			writeError(w, http.StatusBadRequest, "invalid_input", "body is required")
+		if req.Body == "" && req.Title == nil {
+			writeError(w, http.StatusBadRequest, "invalid_input", "body or title is required")
 			return
 		}

@@ -134,10 +138,12 @@ func createEntity(store *db.Store) http.HandlerFunc {
 		}

 		e := &db.Entity{
-			Body:       req.Body,
-			Glyph:      glyph,
-			TimeAnchor: req.TimeAnchor,
-			Tags:       req.Tags,
+			Body:        req.Body,
+			Title:       req.Title,
+			Description: req.Description,
+			Glyph:       glyph,
+			TimeAnchor:  req.TimeAnchor,
+			Tags:        req.Tags,
 		}

 		if req.CardType != nil {
@@ -151,7 +157,7 @@ func createEntity(store *db.Store) http.HandlerFunc {
 		}

 		if err := store.Create(e); err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

@@ -168,7 +174,7 @@ func getEntity(store *db.Store) http.HandlerFunc {
 				writeError(w, http.StatusNotFound, "not_found", "no entity with id "+id)
 				return
 			}
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}
 		writeJSON(w, http.StatusOK, entityToResponse(e))
@@ -186,6 +192,8 @@ func updateEntity(store *db.Store) http.HandlerFunc {

 		u := &db.EntityUpdate{}
 		u.Body = req.Body
+		u.Title = req.Title
+		u.Description = req.Description
 		u.Tags = req.Tags
 		u.Pinned = req.Pinned
 		u.CardData = req.CardData
@@ -215,13 +223,13 @@ func updateEntity(store *db.Store) http.HandlerFunc {
 				writeError(w, http.StatusNotFound, "not_found", "no entity with id "+id)
 				return
 			}
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

 		e, err := store.Get(id)
 		if err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}
 		writeJSON(w, http.StatusOK, entityToResponse(e))
@@ -241,7 +249,7 @@ func deleteEntity(store *db.Store) http.HandlerFunc {
 				writeError(w, http.StatusNotFound, "not_found", "no entity with id "+id)
 				return
 			}
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}
 		label := "soft"
@@ -279,13 +287,13 @@ func promoteEntity(store *db.Store) http.HandlerFunc {
 				writeError(w, http.StatusBadRequest, "invalid_promote", "entity is already crystallized")
 				return
 			}
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

 		e, err := store.Get(id)
 		if err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}
 		writeJSON(w, http.StatusOK, entityToResponse(e))
@@ -305,13 +313,13 @@ func demoteEntity(store *db.Store) http.HandlerFunc {
 				writeError(w, http.StatusBadRequest, "invalid_demote", "entity is already fluid")
 				return
 			}
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

 		e, err := store.Get(id)
 		if err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}
 		writeJSON(w, http.StatusOK, entityToResponse(e))
@@ -349,13 +357,13 @@ func absorbEntity(store *db.Store) http.HandlerFunc {
 				writeError(w, http.StatusBadRequest, "invalid_absorb", "target is crystallized — demote first")
 				return
 			}
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

 		e, err := store.Get(id)
 		if err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}
 		writeJSON(w, http.StatusOK, entityToResponse(e))
@@ -371,13 +379,13 @@ func useEntity(store *db.Store) http.HandlerFunc {
 				writeError(w, http.StatusNotFound, "not_found", "no entity with id "+id)
 				return
 			}
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

 		e, err := store.Get(id)
 		if err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}
 		writeJSON(w, http.StatusOK, entityToResponse(e))
@@ -2,12 +2,15 @@ package api

 import (
 	"encoding/json"
+	"log"
 	"net/http"
 	"time"

 	"github.com/lerko/nib/internal/db"
 )

+const maxBodySize = 1 << 20 // 1 MB
+
 type ErrorResponse struct {
 	Error   string `json:"error"`
 	Message string `json:"message"`
@@ -18,6 +21,8 @@ type EntityResponse struct {
 	CreatedAt   string   `json:"created_at"`
 	ModifiedAt  string   `json:"modified_at"`
 	Body        string   `json:"body"`
+	Title       *string  `json:"title"`
+	Description *string  `json:"description"`
 	Glyph       string   `json:"glyph"`
 	TimeAnchor  *string  `json:"time_anchor"`
 	CompletedAt *string  `json:"completed_at"`
@@ -41,6 +46,7 @@ func writeError(w http.ResponseWriter, status int, code, message string) {
 }

 func decodeJSON(w http.ResponseWriter, r *http.Request, dst any) bool {
+	r.Body = http.MaxBytesReader(w, r.Body, maxBodySize)
 	if err := json.NewDecoder(r.Body).Decode(dst); err != nil {
 		writeError(w, http.StatusBadRequest, "invalid_input", "malformed JSON: "+err.Error())
 		return false
@@ -48,16 +54,23 @@ func decodeJSON(w http.ResponseWriter, r *http.Request, dst any) bool {
 	return true
 }

+func writeInternalError(w http.ResponseWriter, err error) {
+	log.Printf("internal error: %v", err)
+	writeError(w, http.StatusInternalServerError, "internal", "internal server error")
+}
+
 func entityToResponse(e *db.Entity) EntityResponse {
 	resp := EntityResponse{
-		ID:         e.ID,
-		CreatedAt:  e.CreatedAt.Format(time.RFC3339),
-		ModifiedAt: e.ModifiedAt.Format(time.RFC3339),
-		Body:       e.Body,
-		Glyph:      string(e.Glyph),
-		Pinned:     e.Pinned,
-		Tags:       e.Tags,
-		UseCount:   e.UseCount,
+		ID:          e.ID,
+		CreatedAt:   e.CreatedAt.Format(time.RFC3339),
+		ModifiedAt:  e.ModifiedAt.Format(time.RFC3339),
+		Body:        e.Body,
+		Title:       e.Title,
+		Description: e.Description,
+		Glyph:       string(e.Glyph),
+		Pinned:      e.Pinned,
+		Tags:        e.Tags,
+		UseCount:    e.UseCount,
 	}
 	if resp.Tags == nil {
 		resp.Tags = []string{}
@@ -15,7 +15,7 @@ func listTags(store *db.Store) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		tags, err := store.ListTags()
 		if err != nil {
-			writeError(w, http.StatusInternalServerError, "internal", err.Error())
+			writeInternalError(w, err)
 			return
 		}

@@ -84,7 +84,14 @@ func (s *Store) migrate() error {
 		CREATE INDEX IF NOT EXISTS idx_entity_tags_tag
 			ON entity_tags(tag);
 	`)
-	return err
+	if err != nil {
+		return err
+	}
+
+	s.db.Exec(`ALTER TABLE entities ADD COLUMN title TEXT`)
+	s.db.Exec(`ALTER TABLE entities ADD COLUMN description TEXT`)
+
+	return nil
 }

 func DefaultPath() (string, error) {
@@ -49,6 +49,8 @@ type Entity struct {
 	CreatedAt   time.Time
 	ModifiedAt  time.Time
 	Body        string
+	Title       *string
+	Description *string
 	Glyph       Glyph
 	TimeAnchor  *string
 	CompletedAt *time.Time
@@ -85,14 +87,16 @@ func DefaultListParams() ListParams {
 }

 type EntityUpdate struct {
-	Body       *string
-	Glyph      *Glyph
-	TimeAnchor *string
-	ClearTime  bool
-	Pinned     *bool
-	CardType   *CardType
-	CardData   *string
-	Tags       *[]string
+	Body        *string
+	Title       *string
+	Description *string
+	Glyph       *Glyph
+	TimeAnchor  *string
+	ClearTime   bool
+	Pinned      *bool
+	CardType    *CardType
+	CardData    *string
+	Tags        *[]string
 }

 func (s *Store) Create(e *Entity) error {
@@ -111,13 +115,16 @@ func (s *Store) Create(e *Entity) error {
 	defer tx.Rollback()

 	_, err = tx.Exec(`
-		INSERT INTO entities (id, created_at, modified_at, body, glyph, time_anchor,
-			completed_at, pinned, deleted_at, card_type, card_data, use_count, last_used_at)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+		INSERT INTO entities (id, created_at, modified_at, body, title, description,
+			glyph, time_anchor, completed_at, pinned, deleted_at,
+			card_type, card_data, use_count, last_used_at)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
 		e.ID,
 		e.CreatedAt.Format(time.RFC3339),
 		e.ModifiedAt.Format(time.RFC3339),
 		e.Body,
+		e.Title,
+		e.Description,
 		string(e.Glyph),
 		e.TimeAnchor,
 		formatTimePtr(e.CompletedAt),
@@ -141,18 +148,13 @@ func (s *Store) Create(e *Entity) error {

 func (s *Store) Get(id string) (*Entity, error) {
 	e := &Entity{}
-	var createdAt, modifiedAt string
-	var completedAt, deletedAt, lastUsedAt sql.NullString
-	var timeAnchor, cardType, cardData sql.NullString
-	var pinned int
+	row := newEntityRow()

 	err := s.db.QueryRow(`
-		SELECT id, created_at, modified_at, body, glyph, time_anchor,
-			completed_at, pinned, deleted_at, card_type, card_data, use_count, last_used_at
-		FROM entities WHERE id = ?`, id).Scan(
-		&e.ID, &createdAt, &modifiedAt, &e.Body, &e.Glyph, &timeAnchor,
-		&completedAt, &pinned, &deletedAt, &cardType, &cardData, &e.UseCount, &lastUsedAt,
-	)
+		SELECT id, created_at, modified_at, body, title, description,
+			glyph, time_anchor, completed_at, pinned, deleted_at,
+			card_type, card_data, use_count, last_used_at
+		FROM entities WHERE id = ?`, id).Scan(row.ptrs(e)...)
 	if err == sql.ErrNoRows {
 		return nil, ErrNotFound
 	}
@@ -160,15 +162,9 @@ func (s *Store) Get(id string) (*Entity, error) {
 		return nil, err
 	}

-	e.CreatedAt, _ = time.Parse(time.RFC3339, createdAt)
-	e.ModifiedAt, _ = time.Parse(time.RFC3339, modifiedAt)
-	e.TimeAnchor = nullToPtr(timeAnchor)
-	e.CompletedAt = parseTimePtr(completedAt)
-	e.Pinned = pinned != 0
-	e.DeletedAt = parseTimePtr(deletedAt)
-	e.CardType = nullToCardType(cardType)
-	e.CardData = nullToPtr(cardData)
-	e.LastUsedAt = parseTimePtr(lastUsedAt)
+	if err := row.apply(e); err != nil {
+		return nil, fmt.Errorf("scan entity %s: %w", id, err)
+	}

 	tags, err := s.loadTags(id)
 	if err != nil {
@@ -234,9 +230,9 @@ func (s *Store) List(params ListParams) ([]*Entity, error) {
 	}

 	query := fmt.Sprintf(`
-		SELECT e.id, e.created_at, e.modified_at, e.body, e.glyph, e.time_anchor,
-			e.completed_at, e.pinned, e.deleted_at, e.card_type, e.card_data,
-			e.use_count, e.last_used_at
+		SELECT e.id, e.created_at, e.modified_at, e.body, e.title, e.description,
+			e.glyph, e.time_anchor, e.completed_at, e.pinned, e.deleted_at,
+			e.card_type, e.card_data, e.use_count, e.last_used_at
 		FROM entities e
 		%s
 		ORDER BY %s %s
@@ -253,31 +249,18 @@ func (s *Store) List(params ListParams) ([]*Entity, error) {
 	var entities []*Entity
 	for rows.Next() {
 		e := &Entity{}
-		var createdAt, modifiedAt string
-		var completedAt, deletedAt, lastUsedAt sql.NullString
-		var timeAnchor, cardType, cardData sql.NullString
-		var pinned int
-
-		if err := rows.Scan(
-			&e.ID, &createdAt, &modifiedAt, &e.Body, &e.Glyph, &timeAnchor,
-			&completedAt, &pinned, &deletedAt, &cardType, &cardData,
-			&e.UseCount, &lastUsedAt,
-		); err != nil {
+		row := newEntityRow()
+		if err := rows.Scan(row.ptrs(e)...); err != nil {
+			return nil, err
+		}
+		if err := row.apply(e); err != nil {
 			return nil, err
 		}
-
-		e.CreatedAt, _ = time.Parse(time.RFC3339, createdAt)
-		e.ModifiedAt, _ = time.Parse(time.RFC3339, modifiedAt)
-		e.TimeAnchor = nullToPtr(timeAnchor)
-		e.CompletedAt = parseTimePtr(completedAt)
-		e.Pinned = pinned != 0
-		e.DeletedAt = parseTimePtr(deletedAt)
-		e.CardType = nullToCardType(cardType)
-		e.CardData = nullToPtr(cardData)
-		e.LastUsedAt = parseTimePtr(lastUsedAt)
-
 		entities = append(entities, e)
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}

 	if err := s.batchLoadTags(entities); err != nil {
 		return nil, err
@@ -308,6 +291,14 @@ func (s *Store) Update(id string, u *EntityUpdate) error {
 		sets = append(sets, "body = ?")
 		args = append(args, *u.Body)
 	}
+	if u.Title != nil {
+		sets = append(sets, "title = ?")
+		args = append(args, *u.Title)
+	}
+	if u.Description != nil {
+		sets = append(sets, "description = ?")
+		args = append(args, *u.Description)
+	}
 	if u.Glyph != nil {
 		sets = append(sets, "glyph = ?")
 		args = append(args, string(*u.Glyph))
@@ -502,6 +493,9 @@ func (s *Store) Resolve(prefix string) (string, error) {
 		}
 		ids = append(ids, id)
 	}
+	if err := rows.Err(); err != nil {
+		return "", err
+	}

 	switch len(ids) {
 	case 0:
@@ -513,6 +507,44 @@ func (s *Store) Resolve(prefix string) (string, error) {
 	}
 }

+type entityRow struct {
+	createdAt, modifiedAt              string
+	completedAt, deletedAt, lastUsedAt sql.NullString
+	timeAnchor, cardType, cardData     sql.NullString
+	title, description                 sql.NullString
+	pinned                             int
+}
+
+func newEntityRow() *entityRow { return &entityRow{} }
+
+func (r *entityRow) ptrs(e *Entity) []any {
+	return []any{
+		&e.ID, &r.createdAt, &r.modifiedAt, &e.Body, &r.title, &r.description,
+		&e.Glyph, &r.timeAnchor, &r.completedAt, &r.pinned, &r.deletedAt,
+		&r.cardType, &r.cardData, &e.UseCount, &r.lastUsedAt,
+	}
+}
+
+func (r *entityRow) apply(e *Entity) error {
+	var err error
+	if e.CreatedAt, err = time.Parse(time.RFC3339, r.createdAt); err != nil {
+		return fmt.Errorf("created_at: %w", err)
+	}
+	if e.ModifiedAt, err = time.Parse(time.RFC3339, r.modifiedAt); err != nil {
+		return fmt.Errorf("modified_at: %w", err)
+	}
+	e.Title = nullToPtr(r.title)
+	e.Description = nullToPtr(r.description)
+	e.TimeAnchor = nullToPtr(r.timeAnchor)
+	e.CompletedAt = parseTimePtr(r.completedAt)
+	e.Pinned = r.pinned != 0
+	e.DeletedAt = parseTimePtr(r.deletedAt)
+	e.CardType = nullToCardType(r.cardType)
+	e.CardData = nullToPtr(r.cardData)
+	e.LastUsedAt = parseTimePtr(r.lastUsedAt)
+	return nil
+}
+
 // helpers

 func (s *Store) batchLoadTags(entities []*Entity) error {
@@ -568,6 +600,9 @@ func (s *Store) loadTags(entityID string) ([]string, error) {
 		}
 		tags = append(tags, tag)
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
 	if tags == nil {
 		tags = []string{}
 	}
@@ -631,11 +666,13 @@ func boolToInt(b bool) int {
 	return 0
 }

-func (e *Entity) CardDataJSON() map[string]interface{} {
+func (e *Entity) CardDataJSON() (map[string]interface{}, error) {
 	if e.CardData == nil {
-		return nil
+		return nil, nil
 	}
 	var m map[string]interface{}
-	json.Unmarshal([]byte(*e.CardData), &m)
-	return m
+	if err := json.Unmarshal([]byte(*e.CardData), &m); err != nil {
+		return nil, fmt.Errorf("card_data: %w", err)
+	}
+	return m, nil
 }
@@ -441,3 +441,130 @@ func TestResolve_NotFound(t *testing.T) {
 		t.Errorf("expected ErrNotFound, got %v", err)
 	}
 }
+
+func TestAbsorb_SourceIsCard(t *testing.T) {
+	s := testStore(t)
+	target := &Entity{Body: "target", Glyph: GlyphNote, Tags: []string{"a"}}
+	s.Create(target)
+
+	source := &Entity{Body: "source", Glyph: GlyphNote}
+	s.Create(source)
+	s.Promote(source.ID, CardSnippet, nil)
+	s.IncrementUse(source.ID)
+
+	if err := s.Absorb(target.ID, source.ID); err != nil {
+		t.Fatal(err)
+	}
+
+	got, _ := s.Get(target.ID)
+	if got.Body != "target\nsource" {
+		t.Errorf("merged body: %q", got.Body)
+	}
+
+	src, _ := s.Get(source.ID)
+	if src.CardType != nil {
+		t.Error("source card_type should be cleared after absorb")
+	}
+	if src.UseCount != 0 {
+		t.Errorf("source use_count should be reset, got %d", src.UseCount)
+	}
+	if src.DeletedAt == nil {
+		t.Error("source should be soft-deleted")
+	}
+}
+
+func TestCreate_WithTitleAndDescription(t *testing.T) {
+	s := testStore(t)
+	e := &Entity{
+		Body:        "body text",
+		Title:       ptr("nginx trick"),
+		Description: ptr("always forget this"),
+		Glyph:       GlyphNote,
+		Tags:        []string{"ops"},
+	}
+	if err := s.Create(e); err != nil {
+		t.Fatal(err)
+	}
+
+	got, err := s.Get(e.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got.Title == nil || *got.Title != "nginx trick" {
+		t.Errorf("title: got %v", got.Title)
+	}
+	if got.Description == nil || *got.Description != "always forget this" {
+		t.Errorf("description: got %v", got.Description)
+	}
+	if got.Body != "body text" {
+		t.Errorf("body: got %q", got.Body)
+	}
+}
+
+func TestCreate_WithoutTitle(t *testing.T) {
+	s := testStore(t)
+	e := &Entity{Body: "just body", Glyph: GlyphNote}
+	if err := s.Create(e); err != nil {
+		t.Fatal(err)
+	}
+
+	got, _ := s.Get(e.ID)
+	if got.Title != nil {
+		t.Errorf("expected nil title, got %v", got.Title)
+	}
+	if got.Description != nil {
+		t.Errorf("expected nil description, got %v", got.Description)
+	}
+}
+
+func TestUpdate_Title(t *testing.T) {
+	s := testStore(t)
+	e := &Entity{Body: "body", Glyph: GlyphNote}
+	s.Create(e)
+
+	newTitle := "new title"
+	if err := s.Update(e.ID, &EntityUpdate{Title: &newTitle}); err != nil {
+		t.Fatal(err)
+	}
+
+	got, _ := s.Get(e.ID)
+	if got.Title == nil || *got.Title != "new title" {
+		t.Errorf("title: got %v", got.Title)
+	}
+}
+
+func TestUpdate_Description(t *testing.T) {
+	s := testStore(t)
+	e := &Entity{Body: "body", Glyph: GlyphNote}
+	s.Create(e)
+
+	newDesc := "new desc"
+	if err := s.Update(e.ID, &EntityUpdate{Description: &newDesc}); err != nil {
+		t.Fatal(err)
+	}
+
+	got, _ := s.Get(e.ID)
+	if got.Description == nil || *got.Description != "new desc" {
+		t.Errorf("description: got %v", got.Description)
+	}
+}
+
+func TestAbsorb_PreservesTargetTitle(t *testing.T) {
+	s := testStore(t)
+	target := &Entity{Body: "target body", Title: ptr("target title"), Glyph: GlyphNote}
+	source := &Entity{Body: "source body", Title: ptr("source title"), Glyph: GlyphNote}
+	s.Create(target)
+	s.Create(source)
+
+	if err := s.Absorb(target.ID, source.ID); err != nil {
+		t.Fatal(err)
+	}
+
+	got, _ := s.Get(target.ID)
+	if got.Title == nil || *got.Title != "target title" {
+		t.Errorf("target title should be preserved, got %v", got.Title)
+	}
+	if got.Body != "target body\nsource body" {
+		t.Errorf("body: got %q", got.Body)
+	}
+}
@@ -26,6 +26,9 @@ func (s *Store) ListTags() ([]TagCount, error) {
 		}
 		tags = append(tags, tc)
 	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
 	if tags == nil {
 		tags = []TagCount{}
 	}
@@ -0,0 +1,80 @@
+package display
+
+import (
+	"testing"
+
+	"github.com/lerko/nib/internal/db"
+)
+
+func TestDisplayGlyph_Fluid(t *testing.T) {
+	tests := []struct {
+		glyph db.Glyph
+		want  string
+	}{
+		{db.GlyphNote, "—"},
+		{db.GlyphTodo, "○"},
+		{db.GlyphEvent, "◇"},
+	}
+	for _, tt := range tests {
+		got := DisplayGlyph(tt.glyph, nil)
+		if got != tt.want {
+			t.Errorf("DisplayGlyph(%q, nil) = %q, want %q", tt.glyph, got, tt.want)
+		}
+	}
+}
+
+func TestDisplayGlyph_Card(t *testing.T) {
+	tests := []struct {
+		cardType db.CardType
+		want     string
+	}{
+		{db.CardSnippet, "◆"},
+		{db.CardTemplate, "◈"},
+		{db.CardChecklist, "☐"},
+		{db.CardDecision, "⚖"},
+		{db.CardLink, "↗"},
+	}
+	for _, tt := range tests {
+		ct := tt.cardType
+		got := DisplayGlyph(db.GlyphNote, &ct)
+		if got != tt.want {
+			t.Errorf("DisplayGlyph(note, %q) = %q, want %q", tt.cardType, got, tt.want)
+		}
+	}
+}
+
+func TestDisplayGlyph_CardOverridesGlyph(t *testing.T) {
+	ct := db.CardSnippet
+	got := DisplayGlyph(db.GlyphTodo, &ct)
+	if got != "◆" {
+		t.Errorf("card_type should override glyph, got %q", got)
+	}
+}
+
+func TestDisplayGlyph_UnknownFallback(t *testing.T) {
+	got := DisplayGlyph(db.Glyph("unknown"), nil)
+	if got != "—" {
+		t.Errorf("unknown glyph should fall back to —, got %q", got)
+	}
+}
+
+func TestFormatID_Long(t *testing.T) {
+	got := FormatID("01HXYZ1234567890ABCDEFGH")
+	if got != "01HXYZ123456" {
+		t.Errorf("expected 12-char truncation, got %q", got)
+	}
+}
+
+func TestFormatID_Short(t *testing.T) {
+	got := FormatID("ABC")
+	if got != "ABC" {
+		t.Errorf("short ID should pass through, got %q", got)
+	}
+}
+
+func TestFormatID_Exact12(t *testing.T) {
+	got := FormatID("123456789012")
+	if got != "123456789012" {
+		t.Errorf("exact 12-char should pass through, got %q", got)
+	}
+}
@@ -7,11 +7,13 @@ import (
 )

 type Result struct {
-	Body       string
-	Glyph      string
-	TimeAnchor *string
-	Tags       []string
-	CardSuffix *string
+	Body        string
+	Glyph       string
+	Title       *string
+	Description *string
+	TimeAnchor  *string
+	Tags        []string
+	CardSuffix  *string
 }

 var validCardTypes = map[string]string{
@@ -35,61 +37,139 @@ func Parse(input string) (*Result, error) {
 		Tags:  []string{},
 	}

-	tokens := strings.Fields(input)
-	if len(tokens) == 0 {
-		return nil, fmt.Errorf("empty input")
-	}
+	remaining := input

-	first := tokens[0]
-	switch first {
-	case "-", "▸":
-		r.Glyph = "todo"
-		tokens = tokens[1:]
-	case "*", "◇":
-		r.Glyph = "event"
-		tokens = tokens[1:]
-	}
-
-	var bodyParts []string
-	seen := map[string]bool{}
-
-	for _, tok := range tokens {
-		switch {
-		case strings.HasPrefix(tok, "@") && len(tok) > 1:
-			timeStr := tok[1:]
-			if err := validateTime(timeStr); err != nil {
-				return nil, fmt.Errorf("invalid time %q: %w", timeStr, err)
-			}
-			if r.TimeAnchor != nil {
-				return nil, fmt.Errorf("multiple time anchors")
-			}
-			r.TimeAnchor = &timeStr
-
-		case strings.HasPrefix(tok, "#") && len(tok) > 1:
-			tag := tok[1:]
-			if !seen[tag] {
-				r.Tags = append(r.Tags, tag)
-				seen[tag] = true
-			}
-
-		case strings.HasPrefix(tok, "^") && len(tok) > 1:
-			suffix := tok[1:]
-			cardType, ok := validCardTypes[suffix]
-			if !ok {
-				return nil, fmt.Errorf("invalid card type %q", suffix)
-			}
-			if r.CardSuffix != nil {
-				return nil, fmt.Errorf("multiple card suffixes")
-			}
-			r.CardSuffix = &cardType
-
-		default:
-			bodyParts = append(bodyParts, tok)
+	if sp := strings.IndexByte(remaining, ' '); sp >= 0 {
+		switch remaining[:sp] {
+		case "-", "▸":
+			r.Glyph = "todo"
+			remaining = strings.TrimSpace(remaining[sp+1:])
+		case "*", "◇":
+			r.Glyph = "event"
+			remaining = strings.TrimSpace(remaining[sp+1:])
+		}
+	} else {
+		switch remaining {
+		case "-", "▸":
+			r.Glyph = "todo"
+			remaining = ""
+		case "*", "◇":
+			r.Glyph = "event"
+			remaining = ""
 		}
 	}

-	r.Body = strings.Join(bodyParts, " ")
-	if r.Body == "" {
+	var titleRaw, descRaw string
+	hasTitle := false
+
+	lines := strings.SplitN(remaining, "\n", 2)
+	firstLine := strings.TrimSpace(lines[0])
+
+	if strings.HasPrefix(firstLine, "|") {
+		hasTitle = true
+		titleContent := firstLine[1:]
+		if idx := strings.Index(titleContent, " // "); idx >= 0 {
+			titleRaw = strings.TrimSpace(titleContent[:idx])
+			descRaw = strings.TrimSpace(titleContent[idx+4:])
+		} else {
+			titleRaw = strings.TrimSpace(titleContent)
+		}
+		if len(lines) > 1 {
+			remaining = lines[1]
+		} else {
+			remaining = ""
+		}
+	} else {
+		allLines := strings.Split(remaining, "\n")
+		var descParts []string
+		startBody := 0
+		for i, line := range allLines {
+			trimmed := strings.TrimSpace(line)
+			if strings.HasPrefix(trimmed, "// ") || trimmed == "//" {
+				descParts = append(descParts, strings.TrimSpace(trimmed[2:]))
+				startBody = i + 1
+			} else {
+				break
+			}
+		}
+		if len(descParts) > 0 {
+			descRaw = strings.Join(descParts, " ")
+			remaining = strings.Join(allLines[startBody:], "\n")
+		} else if !strings.Contains(firstLine, "://") {
+			if idx := strings.Index(firstLine, " // "); idx >= 0 {
+				descRaw = strings.TrimSpace(firstLine[idx+4:])
+				remaining = strings.TrimSpace(firstLine[:idx])
+				if len(lines) > 1 {
+					remaining += "\n" + lines[1]
+				}
+			}
+		}
+	}
+
+	seen := map[string]bool{}
+	extract := func(text string) (string, error) {
+		tokens := strings.Fields(text)
+		var parts []string
+		for _, tok := range tokens {
+			switch {
+			case strings.HasPrefix(tok, "@") && len(tok) > 1:
+				timeStr := tok[1:]
+				if err := validateTime(timeStr); err != nil {
+					return "", fmt.Errorf("invalid time %q: %w", timeStr, err)
+				}
+				if r.TimeAnchor != nil {
+					return "", fmt.Errorf("multiple time anchors")
+				}
+				r.TimeAnchor = &timeStr
+			case strings.HasPrefix(tok, "#") && len(tok) > 1:
+				tag := tok[1:]
+				if !seen[tag] {
+					r.Tags = append(r.Tags, tag)
+					seen[tag] = true
+				}
+			case strings.HasPrefix(tok, "^") && len(tok) > 1:
+				suffix := tok[1:]
+				cardType, ok := validCardTypes[suffix]
+				if !ok {
+					return "", fmt.Errorf("invalid card type %q", suffix)
+				}
+				if r.CardSuffix != nil {
+					return "", fmt.Errorf("multiple card suffixes")
+				}
+				r.CardSuffix = &cardType
+			default:
+				parts = append(parts, tok)
+			}
+		}
+		return strings.Join(parts, " "), nil
+	}
+
+	if hasTitle {
+		clean, err := extract(titleRaw)
+		if err != nil {
+			return nil, err
+		}
+		if clean != "" {
+			r.Title = &clean
+		}
+	}
+	if descRaw != "" {
+		clean, err := extract(descRaw)
+		if err != nil {
+			return nil, err
+		}
+		if clean != "" {
+			r.Description = &clean
+		}
+	}
+
+	clean, err := extract(remaining)
+	if err != nil {
+		return nil, err
+	}
+	r.Body = clean
+
+	if r.Body == "" && r.Title == nil {
 		return nil, fmt.Errorf("empty body after extracting modifiers")
 	}

@@ -13,46 +13,61 @@ func TestParse(t *testing.T) {
 		input      string
 		wantBody   string
 		wantGlyph  string
+		wantTitle  *string
+		wantDesc   *string
 		wantTime   *string
 		wantTags   []string
 		wantCard   *string
 		wantErrSub string
 	}{
 		// Glyph detection
-		{"plain note", "hello world", "hello world", "note", nil, nil, nil, ""},
-		{"dash todo", "- deploy nginx", "deploy nginx", "todo", nil, nil, nil, ""},
-		{"unicode todo", "▸ deploy nginx", "deploy nginx", "todo", nil, nil, nil, ""},
-		{"star event", "* dentist", "dentist", "event", nil, nil, nil, ""},
-		{"unicode event", "◇ dentist", "dentist", "event", nil, nil, nil, ""},
+		{"plain note", "hello world", "hello world", "note", nil, nil, nil, nil, nil, ""},
+		{"dash todo", "- deploy nginx", "deploy nginx", "todo", nil, nil, nil, nil, nil, ""},
+		{"unicode todo", "▸ deploy nginx", "deploy nginx", "todo", nil, nil, nil, nil, nil, ""},
+		{"star event", "* dentist", "dentist", "event", nil, nil, nil, nil, nil, ""},
+		{"unicode event", "◇ dentist", "dentist", "event", nil, nil, nil, nil, nil, ""},

 		// Time anchor
-		{"with time", "meeting @14:00", "meeting", "note", sp("14:00"), nil, nil, ""},
-		{"time at start", "@9:30 standup", "standup", "note", sp("9:30"), nil, nil, ""},
-		{"invalid hours", "meeting @25:00", "", "", nil, nil, nil, "invalid time"},
-		{"invalid minutes", "meeting @14:60", "", "", nil, nil, nil, "invalid time"},
+		{"with time", "meeting @14:00", "meeting", "note", nil, nil, sp("14:00"), nil, nil, ""},
+		{"time at start", "@9:30 standup", "standup", "note", nil, nil, sp("9:30"), nil, nil, ""},
+		{"invalid hours", "meeting @25:00", "", "", nil, nil, nil, nil, nil, "invalid time"},
+		{"invalid minutes", "meeting @14:60", "", "", nil, nil, nil, nil, nil, "invalid time"},

 		// Tags
-		{"single tag", "deploy #ops", "deploy", "note", nil, []string{"ops"}, nil, ""},
-		{"multiple tags", "deploy #ops #infra", "deploy", "note", nil, []string{"ops", "infra"}, nil, ""},
-		{"duplicate tags", "deploy #ops #ops", "deploy", "note", nil, []string{"ops"}, nil, ""},
-		{"tag with hyphen", "task #dev-ops", "task", "note", nil, []string{"dev-ops"}, nil, ""},
+		{"single tag", "deploy #ops", "deploy", "note", nil, nil, nil, []string{"ops"}, nil, ""},
+		{"multiple tags", "deploy #ops #infra", "deploy", "note", nil, nil, nil, []string{"ops", "infra"}, nil, ""},
+		{"duplicate tags", "deploy #ops #ops", "deploy", "note", nil, nil, nil, []string{"ops"}, nil, ""},
+		{"tag with hyphen", "task #dev-ops", "task", "note", nil, nil, nil, []string{"dev-ops"}, nil, ""},

 		// Card suffix
-		{"caret card", "trick #nginx ^card", "trick", "note", nil, []string{"nginx"}, sp("snippet"), ""},
-		{"caret c", "trick ^c", "trick", "note", nil, nil, sp("snippet"), ""},
-		{"caret template", "deploy ${host} ^template", "deploy ${host}", "note", nil, nil, sp("template"), ""},
-		{"caret snippet explicit", "trick ^snippet", "trick", "note", nil, nil, sp("snippet"), ""},
-		{"invalid card type", "thing ^bogus", "", "", nil, nil, nil, "invalid card type"},
+		{"caret card", "trick #nginx ^card", "trick", "note", nil, nil, nil, []string{"nginx"}, sp("snippet"), ""},
+		{"caret c", "trick ^c", "trick", "note", nil, nil, nil, nil, sp("snippet"), ""},
+		{"caret template", "deploy ${host} ^template", "deploy ${host}", "note", nil, nil, nil, nil, sp("template"), ""},
+		{"caret snippet explicit", "trick ^snippet", "trick", "note", nil, nil, nil, nil, sp("snippet"), ""},
+		{"invalid card type", "thing ^bogus", "", "", nil, nil, nil, nil, nil, "invalid card type"},

 		// Combined
-		{"full input", "- deploy nginx to staging @15:00 #ops", "deploy nginx to staging", "todo", sp("15:00"), []string{"ops"}, nil, ""},
-		{"full with card", "figured out the proxy_pass trick #nginx ^card", "figured out the proxy_pass trick", "note", nil, []string{"nginx"}, sp("snippet"), ""},
+		{"full input", "- deploy nginx to staging @15:00 #ops", "deploy nginx to staging", "todo", nil, nil, sp("15:00"), []string{"ops"}, nil, ""},
+		{"full with card", "figured out the proxy_pass trick #nginx ^card", "figured out the proxy_pass trick", "note", nil, nil, nil, []string{"nginx"}, sp("snippet"), ""},
+
+		// Title
+		{"title with body", "|nginx trick\nproxy_pass trailing slash #ops", "proxy_pass trailing slash", "note", sp("nginx trick"), nil, nil, []string{"ops"}, nil, ""},
+		{"no title", "no pipe here #ops", "no pipe here", "note", nil, nil, nil, []string{"ops"}, nil, ""},
+		{"todo with title", "- |deploy staging\nrebuild docker #ops", "rebuild docker", "todo", sp("deploy staging"), nil, nil, []string{"ops"}, nil, ""},
+		{"title only", "|title only", "", "note", sp("title only"), nil, nil, nil, nil, ""},
+		{"title and desc", "|title // description #ops\nbody here", "body here", "note", sp("title"), sp("description"), nil, []string{"ops"}, nil, ""},
+		{"todo title desc", "- |deploy staging // rebuild and push #ops", "", "todo", sp("deploy staging"), sp("rebuild and push"), nil, []string{"ops"}, nil, ""},
+
+		// Description without title
+		{"leading desc", "// leading desc\nbody content", "body content", "note", nil, sp("leading desc"), nil, nil, nil, ""},
+		{"inline desc", "body text // inline desc", "body text", "note", nil, sp("inline desc"), nil, nil, nil, ""},
+		{"url no split", "http://example.com // should not split", "http://example.com // should not split", "note", nil, nil, nil, nil, nil, ""},

 		// Edge cases
-		{"empty input", "", "", "", nil, nil, nil, "empty"},
-		{"only glyph", "-", "", "", nil, nil, nil, "empty body"},
-		{"only modifiers", "#ops @14:00", "", "", nil, nil, nil, "empty body"},
-		{"whitespace only", "   ", "", "", nil, nil, nil, "empty"},
+		{"empty input", "", "", "", nil, nil, nil, nil, nil, "empty"},
+		{"only glyph", "-", "", "", nil, nil, nil, nil, nil, "empty body"},
+		{"only modifiers", "#ops @14:00", "", "", nil, nil, nil, nil, nil, "empty body"},
+		{"whitespace only", "   ", "", "", nil, nil, nil, nil, nil, "empty"},
 	}

 	for _, tt := range tests {
@@ -79,6 +94,12 @@ func TestParse(t *testing.T) {
 			if got.Glyph != tt.wantGlyph {
 				t.Errorf("glyph: got %q, want %q", got.Glyph, tt.wantGlyph)
 			}
+			if !ptrEq(got.Title, tt.wantTitle) {
+				t.Errorf("title: got %v, want %v", strPtr(got.Title), strPtr(tt.wantTitle))
+			}
+			if !ptrEq(got.Description, tt.wantDesc) {
+				t.Errorf("description: got %v, want %v", strPtr(got.Description), strPtr(tt.wantDesc))
+			}
 			if !ptrEq(got.TimeAnchor, tt.wantTime) {
 				t.Errorf("time_anchor: got %v, want %v", strPtr(got.TimeAnchor), strPtr(tt.wantTime))
 			}
@@ -115,37 +115,92 @@
    input = input.trim();
    if (!input) return null;

-    const tokens = input.split(/\s+/);
    let glyph = 'note';
+    let remaining = input;

-    const first = tokens[0];
-    if (first === '-' || first === '▸') { glyph = 'todo'; tokens.shift(); }
-    else if (first === '*' || first === '◇') { glyph = 'event'; tokens.shift(); }
+    const sp = remaining.indexOf(' ');
+    if (sp >= 0) {
+      const first = remaining.slice(0, sp);
+      if (first === '-' || first === '▸') { glyph = 'todo'; remaining = remaining.slice(sp + 1).trim(); }
+      else if (first === '*' || first === '◇') { glyph = 'event'; remaining = remaining.slice(sp + 1).trim(); }
+    } else {
+      if (remaining === '-' || remaining === '▸') { glyph = 'todo'; remaining = ''; }
+      else if (remaining === '*' || remaining === '◇') { glyph = 'event'; remaining = ''; }
+    }

-    const bodyParts = [];
-    let timeAnchor = null;
-    const tags = [];
-    const seenTags = {};
-    let cardSuffix = null;
+    let titleRaw = null, descRaw = null, hasTitle = false;
+    const lines = remaining.split('\n');
+    const firstLine = (lines[0] || '').trim();

-    for (const tok of tokens) {
-      if (tok.startsWith('@') && tok.length > 1) {
-        timeAnchor = tok.slice(1);
-      } else if (tok.startsWith('#') && tok.length > 1) {
-        const tag = tok.slice(1);
-        if (!seenTags[tag]) { tags.push(tag); seenTags[tag] = true; }
-      } else if (tok.startsWith('^') && tok.length > 1) {
-        const suffix = tok.slice(1);
-        if (VALID_CARDS[suffix]) cardSuffix = VALID_CARDS[suffix];
+    if (firstLine.startsWith('|')) {
+      hasTitle = true;
+      const titleContent = firstLine.slice(1);
+      const descIdx = titleContent.indexOf(' // ');
+      if (descIdx >= 0) {
+        titleRaw = titleContent.slice(0, descIdx).trim();
+        descRaw = titleContent.slice(descIdx + 4).trim();
      } else {
-        bodyParts.push(tok);
+        titleRaw = titleContent.trim();
+      }
+      remaining = lines.slice(1).join('\n');
+    } else {
+      let descParts = [], startBody = 0;
+      for (let i = 0; i < lines.length; i++) {
+        const trimmed = lines[i].trim();
+        if (trimmed.startsWith('// ') || trimmed === '//') {
+          descParts.push(trimmed.slice(2).trim());
+          startBody = i + 1;
+        } else { break; }
+      }
+      if (descParts.length) {
+        descRaw = descParts.join(' ');
+        remaining = lines.slice(startBody).join('\n');
+      } else if (!firstLine.includes('://')) {
+        const dIdx = firstLine.indexOf(' // ');
+        if (dIdx >= 0) {
+          descRaw = firstLine.slice(dIdx + 4).trim();
+          remaining = firstLine.slice(0, dIdx).trim();
+          if (lines.length > 1) remaining += '\n' + lines.slice(1).join('\n');
+        }
      }
    }

-    const body = bodyParts.join(' ');
-    if (!body) return null;
+    let timeAnchor = null, cardSuffix = null;
+    const tags = [], seenTags = {};

-    return { body, glyph, timeAnchor, tags, cardSuffix };
+    function extract(text) {
+      const tokens = text.split(/\s+/).filter(Boolean);
+      const parts = [];
+      for (const tok of tokens) {
+        if (tok.startsWith('@') && tok.length > 1) {
+          timeAnchor = tok.slice(1);
+        } else if (tok.startsWith('#') && tok.length > 1) {
+          const tag = tok.slice(1);
+          if (!seenTags[tag]) { tags.push(tag); seenTags[tag] = true; }
+        } else if (tok.startsWith('^') && tok.length > 1) {
+          const suffix = tok.slice(1);
+          if (VALID_CARDS[suffix]) cardSuffix = VALID_CARDS[suffix];
+        } else {
+          parts.push(tok);
+        }
+      }
+      return parts.join(' ');
+    }
+
+    let title = null, description = null;
+    if (hasTitle) {
+      const clean = extract(titleRaw || '');
+      if (clean) title = clean;
+    }
+    if (descRaw) {
+      const clean = extract(descRaw);
+      if (clean) description = clean;
+    }
+
+    const body = extract(remaining);
+    if (!body && !title) return null;
+
+    return { body, glyph, title, description, timeAnchor, tags, cardSuffix };
  }

  function detectCardType(body) {
@@ -258,9 +313,17 @@
    const time = e.time_anchor ? `<span class="entity-time">@${e.time_anchor}</span>` : '';
    const useBadge = e.use_count > 0 ? `<span class="use-badge">${e.use_count}×</span>` : '';

+    let label;
+    if (e.title) {
+      const preview = e.body ? `<span class="entity-preview">${escHtml(e.body)}</span>` : '';
+      label = `<span class="entity-title">${escHtml(e.title)}</span>${preview}`;
+    } else {
+      label = `<span class="entity-body">${escHtml(e.body)}</span>`;
+    }
+
    return `<div class="entity-item ${selected}" data-index="${idx}" data-id="${e.id}">
      <span class="entity-glyph ${gc}">${glyph}</span>
-      <span class="entity-body">${escHtml(e.body)}</span>
+      ${label}
      ${time}
      <span class="entity-tags">${tags}</span>
      <span class="entity-meta">${useBadge}</span>
@@ -296,18 +359,27 @@
    }
    actions += `<button class="action-btn danger" onclick="nibApp.deleteEntity('${e.id}')">delete</button>`;

+    const descHtml = e.description ? `<div class="detail-desc" data-id="${e.id}">${escHtml(e.description)}</div>` : '';
+    const titleHtml = e.title ? `<h2 class="detail-title" data-id="${e.id}">${escHtml(e.title)}</h2>` : '';
+
    pane.innerHTML = `
      <div class="detail-header">
        <span class="detail-glyph ${gc}">${glyph}</span>
        <span class="detail-id">${shortId}</span>
        ${e.time_anchor ? `<span class="entity-time">@${e.time_anchor}</span>` : ''}
      </div>
+      ${descHtml}
+      ${titleHtml}
      <div class="detail-body" data-id="${e.id}">${escHtml(e.body)}</div>
      ${tags ? `<div class="detail-tags">${tags}</div>` : ''}
      ${cardContent}
      <div class="detail-actions">${actions}</div>
    `;

+    const titleEl = pane.querySelector('.detail-title');
+    if (titleEl) titleEl.addEventListener('dblclick', () => startEditField('title'));
+    const descEl = pane.querySelector('.detail-desc');
+    if (descEl) descEl.addEventListener('dblclick', () => startEditField('description'));
    const bodyEl = pane.querySelector('.detail-body');
    if (bodyEl) bodyEl.addEventListener('dblclick', startEditBody);
  }
@@ -349,7 +421,7 @@
        </div>`;

      case 'link':
-        if (data.url) {
+        if (data.url && isSafeUrl(data.url)) {
          return `<div style="margin-bottom:12px">
            <button class="action-btn" onclick="window.open('${escAttr(data.url)}', '_blank')">open link</button>
          </div>`;
@@ -395,6 +467,40 @@
    });
  }

+  function startEditField(field) {
+    const e = state.entities[state.selectedIndex];
+    if (!e) return;
+    const cls = field === 'title' ? '.detail-title' : '.detail-desc';
+    const el = $(`${cls}[data-id="${e.id}"]`);
+    if (!el || el.tagName === 'INPUT') return;
+
+    const input = document.createElement('input');
+    input.type = 'text';
+    input.className = 'detail-field-edit';
+    input.value = e[field] || '';
+    input.placeholder = field;
+    el.replaceWith(input);
+    input.focus();
+
+    async function save() {
+      const val = input.value.trim();
+      if (val !== (e[field] || '')) {
+        await api.updateEntity(e.id, { [field]: val || null });
+        await loadEntities();
+        const idx = state.entities.findIndex(x => x.id === e.id);
+        if (idx >= 0) selectEntity(idx);
+      } else {
+        renderDetailPane();
+      }
+    }
+
+    input.addEventListener('blur', save);
+    input.addEventListener('keydown', (ev) => {
+      if (ev.key === 'Enter') { ev.preventDefault(); input.removeEventListener('blur', save); save(); }
+      if (ev.key === 'Escape') { ev.preventDefault(); input.removeEventListener('blur', save); renderDetailPane(); }
+    });
+  }
+
  // ========== Actions ==========

  function selectEntity(idx) {
@@ -565,9 +671,10 @@
        list.innerHTML = sources.map(e => {
          const g = displayGlyph(e);
          const gc = glyphClass(e);
+          const label = e.title ? escHtml(e.title) : escHtml(e.body);
          return `<div class="absorb-source-item" data-id="${e.id}">
            <span class="entity-glyph ${gc}">${g}</span>
-            <span class="entity-body">${escHtml(e.body)}</span>
+            <span class="entity-body">${label}</span>
          </div>`;
        }).join('');
      }
@@ -615,6 +722,8 @@
      glyph: parsed.glyph,
      tags: parsed.tags,
    };
+    if (parsed.title) data.title = parsed.title;
+    if (parsed.description) data.description = parsed.description;
    if (parsed.timeAnchor) data.time_anchor = parsed.timeAnchor;
    if (parsed.cardSuffix) data.card_type = parsed.cardSuffix;

@@ -754,6 +863,10 @@
    return escHtml(s).replace(/'/g, '&#39;');
  }

+  function isSafeUrl(url) {
+    return /^https?:\/\//i.test(url);
+  }
+
  // ========== Theme ==========

  const themeToggle = $('#theme-toggle');
@@ -309,6 +309,25 @@ main {
 .glyph-decision { color: var(--note); }
 .glyph-link { color: var(--danger); }

+.entity-title {
+    font-family: var(--sans);
+    font-size: 12px;
+    font-weight: 500;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.entity-preview {
+    font-family: var(--mono);
+    font-size: 11px;
+    color: var(--muted);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-left: 8px;
+}
+
 .entity-body {
    flex: 1;
    font-family: var(--mono);
@@ -385,6 +404,48 @@ main {
    color: var(--dim);
 }

+.detail-desc {
+    font-family: var(--sans);
+    font-size: 11px;
+    color: var(--muted);
+    margin-bottom: 4px;
+    cursor: text;
+    padding: 2px 6px;
+    margin-left: -6px;
+    border-radius: var(--r2);
+    transition: background var(--t-fast);
+}
+
+.detail-desc:hover { background: var(--raised); }
+
+.detail-title {
+    font-family: var(--sans);
+    font-size: 16px;
+    font-weight: 500;
+    margin-bottom: 12px;
+    cursor: text;
+    padding: 2px 6px;
+    margin-left: -6px;
+    border-radius: var(--r2);
+    transition: background var(--t-fast);
+}
+
+.detail-title:hover { background: var(--raised); }
+
+.detail-field-edit {
+    display: block;
+    width: 100%;
+    font-family: var(--sans);
+    font-size: 14px;
+    margin-bottom: 12px;
+    padding: 4px 8px;
+    background: var(--bg);
+    color: var(--text);
+    border: 1px solid var(--accent);
+    border-radius: var(--r2);
+    outline: none;
+}
+
 .detail-body {
    font-family: var(--mono);
    font-size: 13px;