Improve TUI with editable task view and better layout of task detail view

Author: bricef

internal/tui/app.go

@@ -463,9 +463,12 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.detail.commenting = false
 				m.detail.postErr = ""
 				return m, nil
-			case "ctrl+d":
+			case "enter":
 				cmd := m.detail.submitComment(m.client)
 				return m, cmd
+			case "ctrl+j":
+				m.detail.input.InsertString("\n")
+				return m, nil
 			default:
 				cmd := m.detail.update(msg)
 				return m, cmd

internal/tui/deptree.go

@@ -92,39 +92,38 @@ func buildDepTree(current model.Task, deps []model.Dependency, related map[strin
 
 	var b strings.Builder
 
-	// Parents (tasks that depend on current task).
-	for i, p := range parents {
-		prefix := "├── "
-		if i == len(parents)-1 && len(children) == 0 && len(relatesTo) == 0 {
-			prefix = "├── "
-		}
-		b.WriteString(renderDepNode(prefix, p) + "\n")
-		b.WriteString("│\n")
+	// Parents (tasks that depend on current task) — outer level.
+	for _, p := range parents {
+		b.WriteString(renderDepNode("◆ ", p) + "\n")
 	}
 
-	// Current task (highlighted).
+	// Current task (highlighted) — indented under parents.
 	currentTitle := current.Title
 	if len(currentTitle) > 50 {
 		currentTitle = currentTitle[:47] + "..."
 	}
-	b.WriteString(depCurrentStyle.Render(fmt.Sprintf("◆ %s: %s", currentRef, currentTitle)) + "  " + dimStyle.Render("["+current.State+"]") + "\n")
-
-	// Children (tasks that current depends on).
-	for i, c := range children {
-		connector := "├── "
-		if i == len(children)-1 && len(relatesTo) == 0 {
-			connector = "└── "
-		}
-		b.WriteString(renderDepNode(connector, c) + "\n")
+	prefix := ""
+	childIndent := ""
+	if len(parents) > 0 {
+		prefix = "└──"
+		childIndent = "   "
 	}
+	b.WriteString(prefix + depCurrentStyle.Render(fmt.Sprintf("◆ %s: %s", currentRef, currentTitle)) + "  " + dimStyle.Render("["+current.State+"]") + "\n")
 
-	// Related tasks.
-	for i, r := range relatesTo {
-		connector := "├── "
-		if i == len(relatesTo)-1 {
-			connector = "└── "
+	// Children and related — indented under current task.
+	allBelow := make([]string, 0, len(children)+len(relatesTo))
+	for _, c := range children {
+		allBelow = append(allBelow, renderDepNode("◆ ", c))
+	}
+	for _, r := range relatesTo {
+		allBelow = append(allBelow, renderRelated("◆ ", r))
+	}
+	for i, line := range allBelow {
+		connector := "├──"
+		if i == len(allBelow)-1 {
+			connector = "└──"
 		}
-		b.WriteString(renderRelated(connector, r) + "\n")
+		b.WriteString(childIndent + connector + line + "\n")
 	}
 
 	return b.String()
@@ -140,7 +139,7 @@ func renderDepNode(prefix string, node depTreeNode) string {
 	}
 	ref := depRefStyle.Render(node.ref)
 	state := dimStyle.Render("[" + node.state + "]")
-	return fmt.Sprintf("%s%s: %s  %s", prefix, ref, title, state)
+	return prefix + fmt.Sprintf("%s: %s  %s", ref, title, state)
 }
 
 func renderRelated(prefix string, node depTreeNode) string {
@@ -154,5 +153,5 @@ func renderRelated(prefix string, node depTreeNode) string {
 	ref := depRefStyle.Render(node.ref)
 	state := dimStyle.Render("[" + node.state + "]")
 	label := depTypeStyle.Render("relates to")
-	return fmt.Sprintf("%s%s %s: %s  %s", prefix, label, ref, title, state)
+	return prefix + fmt.Sprintf("%s %s:  %s  %s", label, ref, title, state)
 }

internal/tui/detail.go

@@ -243,7 +243,7 @@ func (m detailModel) render(width, height int) string {
 
 	// Description.
 	if t.Description != "" {
-		b.WriteString(detailSectionStyle.Render("Description") + "\n")
+		b.WriteString(detailSectionStyle.Render("Description") + "\n\n")
 		descWidth := width - 2
 		if descWidth < 20 {
 			descWidth = 20
@@ -255,21 +255,21 @@ func (m detailModel) render(width, height int) string {
 
 	// Dependency tree.
 	if len(d.dependencies) > 0 {
-		b.WriteString(detailSectionStyle.Render("Dependencies") + "\n")
+		b.WriteString(detailSectionStyle.Render("Dependencies") + "\n\n")
 		b.WriteString(buildDepTree(t, d.dependencies, d.related))
 	}
 
 	// Attachments.
 	if len(d.attachments) > 0 {
-		b.WriteString(detailSectionStyle.Render("Attachments") + "\n")
+		b.WriteString(detailSectionStyle.Render("Attachments") + "\n\n")
 		for _, att := range d.attachments {
 			b.WriteString(fmt.Sprintf("  [%s] %s — %s\n", dimStyle.Render(string(att.RefType)), att.Label, att.Reference))
 		}
 	}
 
 	// Comments.
 	if len(d.comments) > 0 {
-		b.WriteString(detailSectionStyle.Render(fmt.Sprintf("Comments (%d)", len(d.comments))) + "\n")
+		b.WriteString(detailSectionStyle.Render(fmt.Sprintf("Comments (%d)", len(d.comments))) + "\n\n")
 		indentLen := 2 + 16 + 1 // "  " + "YYYY-MM-DD HH:MM" + " "
 		for _, c := range d.comments {
 			ts := c.CreatedAt.Format("2006-01-02 15:04")
@@ -299,7 +299,7 @@ func (m detailModel) render(width, height int) string {
 
 	// Audit (last 10).
 	if len(d.audit) > 0 {
-		b.WriteString(detailSectionStyle.Render("Recent Activity") + "\n")
+		b.WriteString(detailSectionStyle.Render("Recent Activity") + "\n\n")
 		start := 0
 		if len(d.audit) > 10 {
 			start = len(d.audit) - 10

internal/tui/keymap.go

@@ -299,21 +299,23 @@ var detailKeyMap = detailKeys{
 
 // commentKeys defines key bindings shown when the comment textarea is active.
 type commentKeys struct {
-	Submit key.Binding
-	Cancel key.Binding
+	Submit  key.Binding
+	Newline key.Binding
+	Cancel  key.Binding
 }
 
 func (k commentKeys) ShortHelp() []key.Binding {
-	return []key.Binding{k.Submit, k.Cancel}
+	return []key.Binding{k.Submit, k.Newline, k.Cancel}
 }
 
 func (k commentKeys) FullHelp() [][]key.Binding {
-	return [][]key.Binding{{k.Submit, k.Cancel}}
+	return [][]key.Binding{{k.Submit, k.Newline, k.Cancel}}
 }
 
 var commentKeyMap = commentKeys{
-	Submit: key.NewBinding(key.WithKeys("ctrl+d"), key.WithHelp("ctrl+d", "submit")),
-	Cancel: key.NewBinding(key.WithKeys("esc"), key.WithHelp("esc", "cancel")),
+	Submit:  key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "submit")),
+	Newline: key.NewBinding(key.WithKeys("ctrl+j"), key.WithHelp("ctrl+j", "newline")),
+	Cancel:  key.NewBinding(key.WithKeys("esc"), key.WithHelp("esc", "cancel")),
 }
 
 var keyHelp = key.NewBinding(key.WithKeys("?"), key.WithHelp("?", "help"))