Add things

.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)",
+      "Bash(ls:*)",
+      "Bash(go fmt:*)",
+      "Bash(go build:*)",
+      "Bash(go vet:*)",
+      "Bash(timew export:*)"
+    ]
+  }
+}

CLAUDE.md

@@ -0,0 +1,236 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+TaskSquire is a Go-based Terminal User Interface (TUI) for Taskwarrior and Timewarrior. It uses the Bubble Tea framework (Model-View-Update pattern) from the Charm ecosystem.
+
+**Key Technologies:**
+- Go 1.22.2
+- Bubble Tea (MVU pattern)
+- Lip Gloss (styling)
+- Huh (forms)
+- Bubbles (components)
+
+## Build and Development Commands
+
+### Running and Building
+```bash
+# Run directly
+go run main.go
+
+# Build binary
+go build -o tasksquire main.go
+
+# Format code (always run before committing)
+go fmt ./...
+
+# Vet code
+go vet ./...
+
+# Tidy dependencies
+go mod tidy
+```
+
+### Testing
+```bash
+# Run all tests
+go test ./...
+
+# Run tests for specific package
+go test ./taskwarrior
+
+# Run single test
+go test ./taskwarrior -run TestTaskSquire_GetContext
+
+# Run with verbose output
+go test -v ./...
+
+# Run with coverage
+go test -cover ./...
+```
+
+### Linting
+```bash
+# Lint with golangci-lint (via nix-shell)
+golangci-lint run
+```
+
+### Development Environment
+The project uses Nix for development environment setup:
+```bash
+# Enter Nix development shell
+nix develop
+
+# Or use direnv (automatically loads .envrc)
+direnv allow
+```
+
+## Architecture
+
+### High-Level Structure
+
+TaskSquire follows the MVU (Model-View-Update) pattern with a component-based architecture:
+
+1. **Entry Point (`main.go`)**: Initializes TaskSquire and TimeSquire, creates Common state container, and starts Bubble Tea program
+2. **Common State (`common/`)**: Shared state, components interface, keymaps, styles, and utilities
+3. **Pages (`pages/`)**: Top-level UI views (report, taskEditor, timePage, pickers)
+4. **Components (`components/`)**: Reusable UI widgets (input, table, timetable, picker)
+5. **Business Logic**:
+   - `taskwarrior/`: Wraps Taskwarrior CLI, models, and config parsing
+   - `timewarrior/`: Wraps Timewarrior CLI, models, and config parsing
+
+### Component System
+
+All UI elements implement the `Component` interface:
+```go
+type Component interface {
+    tea.Model  // Init(), Update(tea.Msg), View()
+    SetSize(width int, height int)
+}
+```
+
+Components can be composed hierarchically. The `Common` struct manages a page stack for navigation.
+
+### Page Navigation Pattern
+
+- **Main Page** (`pages/main.go`): Root page with tab switching between Tasks and Time views
+- **Page Stack**: Managed by `common.Common`, allows pushing/popping subpages
+  - `common.PushPage(page)` - push a new page on top
+  - `common.PopPage()` - return to previous page
+  - `common.HasSubpages()` - check if subpages are active
+- **Tab Switching**: Only works at top level (when no subpages active)
+
+### State Management
+
+The `common.Common` struct acts as a shared state container:
+- `TW`: TaskWarrior interface for task operations
+- `TimeW`: TimeWarrior interface for time tracking
+- `Keymap`: Centralized key bindings
+- `Styles`: Centralized styling (parsed from Taskwarrior config)
+- `Udas`: User Defined Attributes from Taskwarrior config
+- `pageStack`: Stack-based page navigation
+
+### Taskwarrior Integration
+
+The `TaskWarrior` interface provides all task operations:
+- Task CRUD: `GetTasks()`, `ImportTask()`, `SetTaskDone()`
+- Task control: `StartTask()`, `StopTask()`, `DeleteTask()`
+- Context management: `GetContext()`, `GetContexts()`, `SetContext()`
+- Reports: `GetReport()`, `GetReports()`
+- Config parsing: Manual parsing of Taskwarrior config format
+
+All Taskwarrior operations use `exec.Command()` to call the `task` CLI binary. Results are parsed from JSON output.
+
+### Timewarrior Integration
+
+The `TimeWarrior` interface provides time tracking operations:
+- Interval management: `GetIntervals()`, `ModifyInterval()`, `DeleteInterval()`
+- Tracking control: `StartTracking()`, `StopTracking()`, `ContinueTracking()`
+- Tag management: `GetTags()`, `GetTagCombinations()`
+- Utility: `FillInterval()`, `JoinInterval()`, `Undo()`
+
+Similar to TaskWarrior, uses `exec.Command()` to call the `timew` CLI binary.
+
+### Custom JSON Marshaling
+
+The `Task` struct uses custom `MarshalJSON()` and `UnmarshalJSON()` to handle:
+- User Defined Attributes (UDAs) stored in `Udas map[string]any`
+- Dynamic field handling via `json.RawMessage`
+- Virtual tags (filtered from regular tags)
+
+### Configuration and Environment
+
+- **Taskwarrior Config**: Located via `TASKRC` env var, or fallback to `~/.taskrc` or `~/.config/task/taskrc`
+- **Timewarrior Config**: Located via `TIMEWARRIORDB` env var, or fallback to `~/.timewarrior/timewarrior.cfg`
+- **Config Parsing**: Custom parser in `taskwarrior/config.go` handles Taskwarrior's config format
+- **Theme Colors**: Extracted from Taskwarrior config and used in Lip Gloss styles
+
+### Concurrency
+
+- Both `TaskSquire` and `TimeSquire` use `sync.Mutex` to protect shared state
+- Lock pattern: `ts.mu.Lock()` followed by `defer ts.mu.Unlock()`
+- Operations are synchronous (no goroutines in typical flows)
+
+### Logging
+
+- Uses `log/slog` for structured logging
+- Logs written to `app.log` in current directory
+- Errors logged but execution typically continues (graceful degradation)
+- Log pattern: `slog.Error("message", "key", value)`
+
+## Code Style and Patterns
+
+### Import Organization
+Standard library first, then third-party, then local:
+```go
+import (
+    "context"
+    "fmt"
+
+    tea "github.com/charmbracelet/bubbletea"
+
+    "tasksquire/common"
+    "tasksquire/taskwarrior"
+)
+```
+
+### Naming Conventions
+- Exported types: `PascalCase` (e.g., `TaskSquire`, `ReportPage`)
+- Unexported fields: `camelCase` (e.g., `configLocation`, `activeReport`)
+- Interfaces: Often end in 'er' or describe capability (e.g., `TaskWarrior`, `TimeWarrior`, `Component`)
+
+### Error Handling
+- Log errors with `slog.Error()` and continue execution
+- Don't panic unless fatal initialization error
+- Return errors from functions, don't log and return
+
+### MVU Pattern in Bubble Tea
+Components follow the MVU pattern:
+- `Init() tea.Cmd`: Initialize and return commands for side effects
+- `Update(tea.Msg) (tea.Model, tea.Cmd)`: Handle messages, update state, return commands
+- `View() string`: Render UI as string
+
+Custom messages for inter-component communication:
+```go
+type MyCustomMsg struct {
+    data string
+}
+
+func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+    switch msg := msg.(type) {
+    case MyCustomMsg:
+        // Handle custom message
+    }
+    return m, nil
+}
+```
+
+### Styling with Lip Gloss
+- Centralized styles in `common/styles.go`
+- Theme colors parsed from Taskwarrior config
+- Create reusable style functions, not inline styles
+
+### Testing Patterns
+- Table-driven tests with struct slices
+- Helper functions like `TaskWarriorTestSetup()`
+- Use `t.TempDir()` for isolated test environments
+- Include `prep func()` in test cases for setup
+
+## Important Implementation Details
+
+### Virtual Tags
+Taskwarrior has virtual tags (ACTIVE, BLOCKED, etc.) that are filtered out from regular tags. See the `virtualTags` map in `taskwarrior/taskwarrior.go`.
+
+### Non-Standard Reports
+Some Taskwarrior reports require special handling (burndown, calendar, etc.). See `nonStandardReports` map.
+
+### Timestamp Format
+Taskwarrior uses ISO 8601 format: `20060102T150405Z` (defined as `dtformat` constant)
+
+### Color Parsing
+Custom color parsing from Taskwarrior config format in `common/styles.go`
+
+### VSCode Debugging
+Launch configuration available for remote debugging on port 43000 (see `.vscode/launch.json`)

common/keymap.go

@@ -6,31 +6,34 @@ import (
 
 // Keymap is a collection of key bindings.
 type Keymap struct {
-	Quit       key.Binding
-	Back       key.Binding
-	Ok         key.Binding
-	Delete     key.Binding
-	Input      key.Binding
-	Add        key.Binding
-	Edit       key.Binding
-	Up         key.Binding
-	Down       key.Binding
-	Left       key.Binding
-	Right      key.Binding
-	Next       key.Binding
-	Prev       key.Binding
-	NextPage   key.Binding
-	PrevPage   key.Binding
-	SetReport  key.Binding
-	SetContext key.Binding
-	SetProject key.Binding
-	Select     key.Binding
-	Insert     key.Binding
-	Tag        key.Binding
-	Undo       key.Binding
-	Fill       key.Binding
-	StartStop  key.Binding
-	Join       key.Binding
+	Quit            key.Binding
+	Back            key.Binding
+	Ok              key.Binding
+	Delete          key.Binding
+	Input           key.Binding
+	Add             key.Binding
+	Edit            key.Binding
+	Up              key.Binding
+	Down            key.Binding
+	Left            key.Binding
+	Right           key.Binding
+	Next            key.Binding
+	Prev            key.Binding
+	NextPage        key.Binding
+	PrevPage        key.Binding
+	SetReport       key.Binding
+	SetContext      key.Binding
+	SetProject      key.Binding
+	PickProjectTask key.Binding
+	Select          key.Binding
+	Insert          key.Binding
+	Tag             key.Binding
+	Undo            key.Binding
+	Fill            key.Binding
+	StartStop       key.Binding
+	Join            key.Binding
+	ViewDetails     key.Binding
+	Subtask         key.Binding
 }
 
 // TODO: use config values for key bindings
@@ -127,6 +130,11 @@ func NewKeymap() *Keymap {
 			key.WithHelp("p", "Set project"),
 		),
 
+		PickProjectTask: key.NewBinding(
+			key.WithKeys("P"),
+			key.WithHelp("P", "Pick project task"),
+		),
+
 		Select: key.NewBinding(
 			key.WithKeys(" "),
 			key.WithHelp("space", "Select"),
@@ -161,5 +169,15 @@ func NewKeymap() *Keymap {
 			key.WithKeys("J"),
 			key.WithHelp("J", "Join with previous"),
 		),
+
+		ViewDetails: key.NewBinding(
+			key.WithKeys("v"),
+			key.WithHelp("v", "view details"),
+		),
+
+		Subtask: key.NewBinding(
+			key.WithKeys("S"),
+			key.WithHelp("S", "Create subtask"),
+		),
 	}
 }

common/styles.go

@@ -27,6 +27,10 @@ type Styles struct {
 	Form       *huh.Theme
 	TableStyle TableStyle
 
+	Tab       lipgloss.Style
+	ActiveTab lipgloss.Style
+	TabBar    lipgloss.Style
+
 	ColumnFocused lipgloss.Style
 	ColumnBlurred lipgloss.Style
 	ColumnInsert  lipgloss.Style
@@ -71,6 +75,19 @@ func NewStyles(config *taskwarrior.TWConfig) *Styles {
 
 	styles.Form = formTheme
 
+	styles.Tab = lipgloss.NewStyle().
+		Padding(0, 1).
+		Foreground(lipgloss.Color("240"))
+
+	styles.ActiveTab = styles.Tab.
+		Foreground(lipgloss.Color("252")).
+		Bold(true)
+
+	styles.TabBar = lipgloss.NewStyle().
+		Border(lipgloss.NormalBorder(), false, false, true, false).
+		BorderForeground(lipgloss.Color("240")).
+		MarginBottom(1)
+
 	styles.ColumnFocused = lipgloss.NewStyle().Border(lipgloss.RoundedBorder(), true).Padding(1)
 	styles.ColumnBlurred = lipgloss.NewStyle().Border(lipgloss.HiddenBorder(), true).Padding(1)
 	styles.ColumnInsert = lipgloss.NewStyle().Border(lipgloss.RoundedBorder(), true).Padding(1)

common/sync.go

@@ -0,0 +1,85 @@
+package common
+
+import (
+	"log/slog"
+
+	"tasksquire/taskwarrior"
+	"tasksquire/timewarrior"
+)
+
+// FindTaskByUUID queries Taskwarrior for a task with the given UUID.
+// Returns nil if not found.
+func FindTaskByUUID(tw taskwarrior.TaskWarrior, uuid string) *taskwarrior.Task {
+	if uuid == "" {
+		return nil
+	}
+
+	// Use empty report to query by UUID filter
+	report := &taskwarrior.Report{Name: ""}
+	tasks := tw.GetTasks(report, "uuid:"+uuid)
+
+	if len(tasks) > 0 {
+		return tasks[0]
+	}
+
+	return nil
+}
+
+// SyncIntervalToTask synchronizes a Timewarrior interval's state to the corresponding Taskwarrior task.
+// Action should be "start" or "stop".
+// This function is idempotent and handles edge cases gracefully.
+func SyncIntervalToTask(interval *timewarrior.Interval, tw taskwarrior.TaskWarrior, action string) {
+	if interval == nil {
+		return
+	}
+
+	// Extract UUID from interval tags
+	uuid := timewarrior.ExtractUUID(interval.Tags)
+	if uuid == "" {
+		slog.Debug("Interval has no UUID tag, skipping task sync",
+			"intervalID", interval.ID)
+		return
+	}
+
+	// Find corresponding task
+	task := FindTaskByUUID(tw, uuid)
+	if task == nil {
+		slog.Warn("Task not found for UUID, skipping sync",
+			"uuid", uuid)
+		return
+	}
+
+	// Perform sync action
+	switch action {
+	case "start":
+		// Start task if it's pending (idempotent - taskwarrior handles already-started tasks)
+		if task.Status == "pending" {
+			slog.Info("Starting Taskwarrior task from interval",
+				"uuid", uuid,
+				"description", task.Description,
+				"alreadyStarted", task.Start != "")
+			tw.StartTask(task)
+		} else {
+			slog.Debug("Task not pending, skipping start",
+				"uuid", uuid,
+				"status", task.Status)
+		}
+
+	case "stop":
+		// Only stop if task is pending and currently started
+		if task.Status == "pending" && task.Start != "" {
+			slog.Info("Stopping Taskwarrior task from interval",
+				"uuid", uuid,
+				"description", task.Description)
+			tw.StopTask(task)
+		} else {
+			slog.Debug("Task not started or not pending, skipping stop",
+				"uuid", uuid,
+				"status", task.Status,
+				"hasStart", task.Start != "")
+		}
+
+	default:
+		slog.Error("Unknown sync action", "action", action)
+	}
+}

common/task.go

@@ -29,7 +29,7 @@ type Task struct {
 	Depends     []string     `json:"depends,omitempty"`
 	DependsIds  string       `json:"-"`
 	Urgency     float32      `json:"urgency,omitempty"`
-	Parent      string       `json:"parent,omitempty"`
+	Parent      string       `json:"parenttask,omitempty"`
 	Due         string       `json:"due,omitempty"`
 	Wait        string       `json:"wait,omitempty"`
 	Scheduled   string       `json:"scheduled,omitempty"`
@@ -125,7 +125,7 @@ func (t *Task) GetString(fieldWFormat string) string {
 		}
 		return strings.Join(t.Tags, " ")
 
-	case "parent":
+	case "parenttask":
 		if format == "short" {
 			return t.Parent[:8]
 		}

components/autocomplete/autocomplete.go

@@ -83,6 +83,17 @@ func (a *Autocomplete) SetMinChars(min int) {
 	a.minChars = min
 }
 
+// SetSuggestions updates the available suggestions
+func (a *Autocomplete) SetSuggestions(suggestions []string) {
+	a.allSuggestions = suggestions
+	a.updateFilteredSuggestions()
+}
+
+// HasSuggestions returns true if the autocomplete is currently showing suggestions
+func (a *Autocomplete) HasSuggestions() bool {
+	return a.showSuggestions && len(a.filteredSuggestions) > 0
+}
+
 // Init initializes the autocomplete
 func (a *Autocomplete) Init() tea.Cmd {
 	return textinput.Blink

components/detailsviewer/detailsviewer.go

@@ -0,0 +1,174 @@
+package detailsviewer
+
+import (
+	"log/slog"
+	"tasksquire/common"
+	"tasksquire/taskwarrior"
+
+	"github.com/charmbracelet/bubbles/viewport"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/glamour"
+	"github.com/charmbracelet/lipgloss"
+)
+
+// DetailsViewer is a reusable component for displaying task details
+type DetailsViewer struct {
+	common   *common.Common
+	viewport viewport.Model
+	task     *taskwarrior.Task
+	focused  bool
+	width    int
+	height   int
+}
+
+// New creates a new DetailsViewer component
+func New(com *common.Common) *DetailsViewer {
+	return &DetailsViewer{
+		common:   com,
+		viewport: viewport.New(0, 0),
+		focused:  false,
+	}
+}
+
+// SetTask updates the task to display
+func (d *DetailsViewer) SetTask(task *taskwarrior.Task) {
+	d.task = task
+	d.updateContent()
+}
+
+// Focus sets the component to focused state (for future interactivity)
+func (d *DetailsViewer) Focus() {
+	d.focused = true
+}
+
+// Blur sets the component to blurred state
+func (d *DetailsViewer) Blur() {
+	d.focused = false
+}
+
+// IsFocused returns whether the component is focused
+func (d *DetailsViewer) IsFocused() bool {
+	return d.focused
+}
+
+// SetSize implements common.Component
+func (d *DetailsViewer) SetSize(width, height int) {
+	d.width = width
+	d.height = height
+
+	// Account for border and padding (4 chars horizontal, 4 lines vertical)
+	d.viewport.Width = max(width-4, 0)
+	d.viewport.Height = max(height-4, 0)
+
+	// Refresh content with new width
+	d.updateContent()
+}
+
+// Init implements tea.Model
+func (d *DetailsViewer) Init() tea.Cmd {
+	return nil
+}
+
+// Update implements tea.Model
+func (d *DetailsViewer) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmd tea.Cmd
+	d.viewport, cmd = d.viewport.Update(msg)
+	return d, cmd
+}
+
+// View implements tea.Model
+func (d *DetailsViewer) View() string {
+	// Title bar
+	titleStyle := lipgloss.NewStyle().
+		Bold(true).
+		Foreground(lipgloss.Color("252"))
+
+	helpStyle := lipgloss.NewStyle().
+		Foreground(lipgloss.Color("240"))
+
+	header := lipgloss.JoinHorizontal(
+		lipgloss.Left,
+		titleStyle.Render("Details"),
+		" ",
+		helpStyle.Render("(↑/↓ scroll, v/ESC close)"),
+	)
+
+	// Container style
+	containerStyle := lipgloss.NewStyle().
+		Border(lipgloss.RoundedBorder()).
+		BorderForeground(lipgloss.Color("240")).
+		Padding(0, 1).
+		Width(d.width).
+		Height(d.height)
+
+	// Optional: highlight border when focused (for future interactivity)
+	if d.focused {
+		containerStyle = containerStyle.
+			BorderForeground(lipgloss.Color("86"))
+	}
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		header,
+		d.viewport.View(),
+	)
+
+	return containerStyle.Render(content)
+}
+
+// updateContent refreshes the viewport content based on current task
+func (d *DetailsViewer) updateContent() {
+	if d.task == nil {
+		d.viewport.SetContent("(No task selected)")
+		return
+	}
+
+	detailsValue := ""
+	if details, ok := d.task.Udas["details"]; ok && details != nil {
+		detailsValue = details.(string)
+	}
+
+	if detailsValue == "" {
+		d.viewport.SetContent("(No details for this task)")
+		return
+	}
+
+	// Render markdown with glamour
+	renderer, err := glamour.NewTermRenderer(
+		glamour.WithAutoStyle(),
+		glamour.WithWordWrap(d.viewport.Width),
+	)
+	if err != nil {
+		slog.Error("failed to create markdown renderer", "error", err)
+		// Fallback to plain text
+		wrapped := lipgloss.NewStyle().
+			Width(d.viewport.Width).
+			Render(detailsValue)
+		d.viewport.SetContent(wrapped)
+		d.viewport.GotoTop()
+		return
+	}
+
+	rendered, err := renderer.Render(detailsValue)
+	if err != nil {
+		slog.Error("failed to render markdown", "error", err)
+		// Fallback to plain text
+		wrapped := lipgloss.NewStyle().
+			Width(d.viewport.Width).
+			Render(detailsValue)
+		d.viewport.SetContent(wrapped)
+		d.viewport.GotoTop()
+		return
+	}
+
+	d.viewport.SetContent(rendered)
+	d.viewport.GotoTop()
+}
+
+// Helper function
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}

components/input/multiselect.go

@@ -637,6 +637,11 @@ func (m *MultiSelect) GetValue() any {
 	return *m.value
 }
 
+// IsFiltering returns true if the multi-select is currently filtering.
+func (m *MultiSelect) IsFiltering() bool {
+	return m.filtering
+}
+
 func min(a, b int) int {
 	if a < b {
 		return a

components/picker/picker.go

@@ -36,7 +36,9 @@ type Picker struct {
 	onCreate        func(string) tea.Cmd
 	title           string
 	filterByDefault bool
+	defaultValue    string
 	baseItems       []list.Item
+	focused         bool
 }
 
 type PickerOption func(*Picker)
@@ -53,6 +55,30 @@ func WithOnCreate(onCreate func(string) tea.Cmd) PickerOption {
 	}
 }
 
+func WithDefaultValue(value string) PickerOption {
+	return func(p *Picker) {
+		p.defaultValue = value
+	}
+}
+
+func (p *Picker) Focus() tea.Cmd {
+	p.focused = true
+	return nil
+}
+
+func (p *Picker) Blur() tea.Cmd {
+	p.focused = false
+	return nil
+}
+
+func (p *Picker) GetValue() string {
+	item := p.list.SelectedItem()
+	if item == nil {
+		return ""
+	}
+	return item.FilterValue()
+}
+
 func New(
 	c *common.Common,
 	title string,
@@ -69,6 +95,7 @@ func New(
 	l.SetShowHelp(false)
 	l.SetShowStatusBar(false)
 	l.SetFilteringEnabled(true)
+	l.Filter = list.UnsortedFilter // Preserve item order, don't rank by match quality
 
 	// Custom key for filtering (insert mode)
 	l.KeyMap.Filter = key.NewBinding(
@@ -76,12 +103,26 @@ func New(
 		key.WithHelp("i", "filter"),
 	)
 
+	// Disable the quit key binding - we don't want Esc to quit the list
+	// Esc should only cancel filtering mode
+	l.KeyMap.Quit = key.NewBinding(
+		key.WithKeys(), // No keys bound
+		key.WithHelp("", ""),
+	)
+
+	// Also disable force quit
+	l.KeyMap.ForceQuit = key.NewBinding(
+		key.WithKeys(), // No keys bound
+		key.WithHelp("", ""),
+	)
+
 	p := &Picker{
 		common:       c,
 		list:         l,
 		itemProvider: itemProvider,
 		onSelect:     onSelect,
 		title:        title,
+		focused:      true,
 	}
 
 	if c.TW.GetConfig().Get("uda.tasksquire.picker.filter_by_default") == "yes" {
@@ -92,8 +133,24 @@ func New(
 		opt(p)
 	}
 
+	// If a default value is provided, don't start in filter mode
+	if p.defaultValue != "" {
+		p.filterByDefault = false
+	}
+
+	if p.filterByDefault {
+		// Manually trigger filter mode on the list so it doesn't require a global key press
+		p.list, _ = p.list.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'i'}})
+	}
+
+	// Refresh items after entering filter mode to ensure they're visible
 	p.Refresh()
 
+	// If a default value is provided, select the corresponding item
+	if p.defaultValue != "" {
+		p.SelectItemByFilterValue(p.defaultValue)
+	}
+
 	return p
 }
 
@@ -103,18 +160,22 @@ func (p *Picker) Refresh() tea.Cmd {
 }
 
 func (p *Picker) updateListItems() tea.Cmd {
-	items := p.baseItems
-	filterVal := p.list.FilterValue()
+	return p.updateListItemsWithFilter(p.list.FilterValue())
+}
+
+func (p *Picker) updateListItemsWithFilter(filterVal string) tea.Cmd {
+	items := make([]list.Item, 0, len(p.baseItems)+1)
+
+	// First add all base items
+	items = append(items, p.baseItems...)
 
 	if p.onCreate != nil && filterVal != "" {
+		// Add the creation item at the end (bottom of the list)
 		newItem := creationItem{
 			text:   "(new) " + filterVal,
 			filter: filterVal,
 		}
-		newItems := make([]list.Item, len(items)+1)
-		copy(newItems, items)
-		newItems[len(items)] = newItem
-		items = newItems
+		items = append(items, newItem)
 	}
 
 	return p.list.SetItems(items)
@@ -134,27 +195,42 @@ func (p *Picker) SetSize(width, height int) {
 }
 
 func (p *Picker) Init() tea.Cmd {
-	if p.filterByDefault {
-		return func() tea.Msg {
-			return tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'i'}}
-		}
-	}
-	return nil
+	// Trigger list item update to ensure items are properly displayed,
+	// especially when in filter mode with an empty filter
+	return p.updateListItems()
 }
 
 func (p *Picker) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	if !p.focused {
+		return p, nil
+	}
+
 	var cmd tea.Cmd
+	var cmds []tea.Cmd
 
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
-		// If filtering, let the list handle keys (including Enter to stop filtering)
+		// If filtering, update items with predicted filter before list processes the key
 		if p.list.FilterState() == list.Filtering {
-			if key.Matches(msg, p.common.Keymap.Ok) {
-				items := p.list.VisibleItems()
-				if len(items) == 1 {
-					return p, p.handleSelect(items[0])
+			currentFilter := p.list.FilterValue()
+			predictedFilter := currentFilter
+
+			// Predict what the filter will be after this key
+			switch msg.Type {
+			case tea.KeyRunes:
+				predictedFilter = currentFilter + string(msg.Runes)
+			case tea.KeyBackspace:
+				if len(currentFilter) > 0 {
+					predictedFilter = currentFilter[:len(currentFilter)-1]
 				}
 			}
+
+			// Update items with predicted filter before list processes the message
+			if predictedFilter != currentFilter {
+				preCmd := p.updateListItemsWithFilter(predictedFilter)
+				cmds = append(cmds, preCmd)
+			}
+
 			break // Pass to list.Update
 		}
 
@@ -168,15 +244,10 @@ func (p *Picker) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 	}
 
-	prevFilter := p.list.FilterValue()
 	p.list, cmd = p.list.Update(msg)
+	cmds = append(cmds, cmd)
 
-	if p.list.FilterValue() != prevFilter {
-		updateCmd := p.updateListItems()
-		return p, tea.Batch(cmd, updateCmd)
-	}
-
-	return p, cmd
+	return p, tea.Batch(cmds...)
 }
 
 func (p *Picker) handleSelect(item list.Item) tea.Cmd {
@@ -189,7 +260,12 @@ func (p *Picker) handleSelect(item list.Item) tea.Cmd {
 }
 
 func (p *Picker) View() string {
-	title := p.common.Styles.Form.Focused.Title.Render(p.title)
+	var title string
+	if p.focused {
+		title = p.common.Styles.Form.Focused.Title.Render(p.title)
+	} else {
+		title = p.common.Styles.Form.Blurred.Title.Render(p.title)
+	}
 	return lipgloss.JoinVertical(lipgloss.Left, title, p.list.View())
 }
 

components/table/table.go

@@ -27,6 +27,7 @@ type Model struct {
 	focus     bool
 	styles    common.TableStyle
 	styleFunc StyleFunc
+	taskTree  *taskwarrior.TaskTree
 
 	viewport viewport.Model
 	start    int
@@ -242,9 +243,31 @@ func (m *Model) parseColumns(cols []Column) []Column {
 		return cols
 	}
 
+	// Calculate max tree depth for indentation
+	maxTreeWidth := 0
+	if m.taskTree != nil {
+		for _, node := range m.taskTree.FlatList {
+			// Calculate indentation: depth * 2 spaces + tree characters (3 chars for "└─ ")
+			treeWidth := 0
+			if node.Depth > 0 {
+				treeWidth = node.Depth*2 + 3
+			}
+			// Add progress indicator width for parent tasks (e.g., " (3/5)" = 6 chars max)
+			if node.HasChildren() {
+				treeWidth += 7
+			}
+			maxTreeWidth = max(maxTreeWidth, treeWidth)
+		}
+	}
+
 	for i, col := range cols {
 		for _, task := range m.rows {
-			col.ContentWidth = max(col.ContentWidth, lipgloss.Width(task.GetString(col.Name)))
+			contentWidth := lipgloss.Width(task.GetString(col.Name))
+			// Add tree width to description column
+			if strings.Contains(col.Name, "description") {
+				contentWidth += maxTreeWidth
+			}
+			col.ContentWidth = max(col.ContentWidth, contentWidth)
 		}
 		cols[i] = col
 	}
@@ -351,6 +374,13 @@ func WithKeyMap(km KeyMap) Option {
 	}
 }
 
+// WithTaskTree sets the task tree for hierarchical display.
+func WithTaskTree(tree *taskwarrior.TaskTree) Option {
+	return func(m *Model) {
+		m.taskTree = tree
+	}
+}
+
 // Update is the Bubble Tea update loop.
 func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	if !m.focus {
@@ -571,6 +601,21 @@ func (m Model) headersView() string {
 
 func (m *Model) renderRow(r int) string {
 	var s = make([]string, 0, len(m.cols))
+
+	// Extract tree metadata for this row
+	var depth int
+	var hasChildren bool
+	var progress string
+	if m.taskTree != nil && r < len(m.taskTree.FlatList) {
+		node := m.taskTree.FlatList[r]
+		depth = node.Depth
+		hasChildren = node.HasChildren()
+		if hasChildren {
+			completed, total := node.GetChildrenStatus()
+			progress = fmt.Sprintf(" (%d/%d)", completed, total)
+		}
+	}
+
 	for i, col := range m.cols {
 		// for i, task := range m.rows[r] {
 		if m.cols[i].Width <= 0 {
@@ -589,8 +634,16 @@ func (m *Model) renderRow(r int) string {
 			cellStyle = cellStyle.Inherit(m.styles.Selected)
 		}
 
+		// Render cell content with tree formatting for description column
+		var cellContent string
+		if strings.Contains(col.Name, "description") && m.taskTree != nil {
+			cellContent = m.renderTreeDescription(r, depth, hasChildren, progress)
+		} else {
+			cellContent = m.rows[r].GetString(col.Name)
+		}
+
 		style := lipgloss.NewStyle().Width(m.cols[i].Width).MaxWidth(m.cols[i].Width).Inline(true)
-		renderedCell := cellStyle.Render(style.Render(runewidth.Truncate(m.rows[r].GetString(col.Name), m.cols[i].Width, "…")))
+		renderedCell := cellStyle.Render(style.Render(runewidth.Truncate(cellContent, m.cols[i].Width, "…")))
 		s = append(s, renderedCell)
 	}
 
@@ -603,6 +656,25 @@ func (m *Model) renderRow(r int) string {
 	return row
 }
 
+// renderTreeDescription renders the description column with tree indentation and progress
+func (m *Model) renderTreeDescription(rowIdx int, depth int, hasChildren bool, progress string) string {
+	task := m.rows[rowIdx]
+	desc := task.Description
+
+	// Build indentation and tree characters
+	prefix := ""
+	if depth > 0 {
+		prefix = strings.Repeat("  ", depth) + "└─ "
+	}
+
+	// Add progress indicator for parent tasks
+	if hasChildren {
+		desc = desc + progress
+	}
+
+	return prefix + desc
+}
+
 func max(a, b int) int {
 	if a > b {
 		return a

components/timestampeditor/timestampeditor.go

@@ -187,14 +187,14 @@ func (t *TimestampEditor) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				t.adjustDate(1)
 			}
 
-		// Time field adjustments (uppercase - 30 minutes) or date adjustments (week)
+		// Time field adjustments (uppercase - 60 minutes) or date adjustments (week)
 		case "J":
 			// Set current time on first edit if empty
 			if t.isEmpty {
 				t.setCurrentTime()
 			}
 			if t.currentField == TimeField {
-				t.adjustTime(-30)
+				t.adjustTime(-60)
 			} else {
 				t.adjustDate(-7)
 			}
@@ -204,7 +204,7 @@ func (t *TimestampEditor) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				t.setCurrentTime()
 			}
 			if t.currentField == TimeField {
-				t.adjustTime(30)
+				t.adjustTime(60)
 			} else {
 				t.adjustDate(7)
 			}

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715787315,
-        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -13,27 +13,51 @@
           inherit system;
         };
 
-        buildDeps = with pkgs; [ 
-          go_1_22
-          gcc
-        ];
+        tasksquire = pkgs.buildGoModule {
+          pname = "tasksquire";
+          version = "0.1.0";
+          src = ./.;
 
-        devDeps = with pkgs; buildDeps ++ [
-          gotools
-          golangci-lint
-          gopls
-          go-outline
-          gopkgs
-          go-tools
-          gotests
-          delve
-        ];
+          vendorHash = "sha256-fDzQuKBZPkOATMMnYcFv/aJP62XDhL9LjM/UYre9JQ4=";
+
+          ldflags = [ "-s" "-w" ];
+
+          nativeBuildInputs = with pkgs; [
+            taskwarrior3
+            timewarrior
+          ];
+
+          meta = with pkgs.lib; {
+            description = "A Terminal User Interface (TUI) for Taskwarrior";
+            mainProgram = "tasksquire";
+          };
+        };
       in
       {
-          devShell = pkgs.mkShell { 
-          buildInputs = devDeps;
-          CGO_CFLAGS="-O";
+        packages.default = tasksquire;
+        packages.tasksquire = tasksquire;
+        apps.default = flake-utils.lib.mkApp { drv = tasksquire; };
+
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            go_1_24
+            gcc
+            gotools
+            golangci-lint
+            gopls
+            go-outline
+            gopkgs
+            go-tools
+            gotests
+            delve
+            taskwarrior3
+            timewarrior
+          ];
+          CGO_CFLAGS = "-O";
         };
+
+        # Backward compatibility
+        devShell = self.devShells.${system}.default;
       });
 }
 

go.mod

@@ -1,39 +1,51 @@
 module tasksquire
 
-go 1.22.2
+go 1.23.0
+
+toolchain go1.24.12
 
 require (
 	github.com/charmbracelet/bubbles v0.18.0
 	github.com/charmbracelet/bubbletea v0.26.4
+	github.com/charmbracelet/glamour v0.10.0
 	github.com/charmbracelet/huh v0.4.2
-	github.com/charmbracelet/lipgloss v0.11.0
-	github.com/mattn/go-runewidth v0.0.15
-	golang.org/x/term v0.21.0
+	github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834
+	github.com/mattn/go-runewidth v0.0.16
+	github.com/sahilm/fuzzy v0.1.1
+	golang.org/x/term v0.31.0
 )
 
 require (
+	github.com/alecthomas/chroma/v2 v2.14.0 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/catppuccin/go v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.1.2 // indirect
+	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/x/ansi v0.8.0 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
+	github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
 	github.com/charmbracelet/x/exp/strings v0.0.0-20240524151031-ff83003bf67a // indirect
 	github.com/charmbracelet/x/exp/term v0.0.0-20240606154654-7c42867b53c7 // indirect
-	github.com/charmbracelet/x/input v0.1.1 // indirect
-	github.com/charmbracelet/x/term v0.1.1 // indirect
-	github.com/charmbracelet/x/windows v0.1.2 // indirect
+	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/dlclark/regexp2 v1.11.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/gorilla/css v1.0.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.15.2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/sahilm/fuzzy v0.1.1 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	github.com/yuin/goldmark v1.7.8 // indirect
+	github.com/yuin/goldmark-emoji v1.0.5 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 )

go.sum

@@ -1,33 +1,55 @@
+github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
+github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=
+github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I=
+github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
+github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=
+github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/catppuccin/go v0.2.0 h1:ktBeIrIP42b/8FGiScP9sgrWOss3lw0Z5SktRoithGA=
 github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
 github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
 github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
 github.com/charmbracelet/bubbletea v0.26.4 h1:2gDkkzLZaTjMl/dQBpNVtnvcCxsh/FCkimep7FC9c40=
 github.com/charmbracelet/bubbletea v0.26.4/go.mod h1:P+r+RRA5qtI1DOHNFn0otoNwB4rn+zNAzSj/EXz6xU0=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
+github.com/charmbracelet/glamour v0.10.0 h1:MtZvfwsYCx8jEPFJm3rIBFIMZUfUJ765oX8V6kXldcY=
+github.com/charmbracelet/glamour v0.10.0/go.mod h1:f+uf+I/ChNmqo087elLnVdCiVgjSKWuXa/l6NU2ndYk=
 github.com/charmbracelet/huh v0.4.2 h1:5wLkwrA58XDAfEZsJzNQlfJ+K8N9+wYwvR5FOM7jXFM=
 github.com/charmbracelet/huh v0.4.2/go.mod h1:g9OXBgtY3zRV4ahnVih9bZE+1yGYN+y2C9Q6L2P+WM0=
-github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g=
-github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8=
-github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
-github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
+github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 h1:ZR7e0ro+SZZiIZD7msJyA+NjkCNNavuiPBLgerbOziE=
+github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834/go.mod h1:aKC/t2arECF6rNOnaKaVU6y4t4ZeHQzqfxedE/VkVhA=
+github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
+github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
+github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
+github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
+github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a h1:G99klV19u0QnhiizODirwVksQB91TJKV/UaTnACcG30=
+github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
+github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf h1:rLG0Yb6MQSDKdB52aGX55JT1oi0P0Kuaj7wi1bLUpnI=
+github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf/go.mod h1:B3UgsnsBZS/eX42BlaNiJkD1pPOUa+oF1IYC6Yd2CEU=
 github.com/charmbracelet/x/exp/strings v0.0.0-20240524151031-ff83003bf67a h1:lOpqe2UvPmlln41DGoii7wlSZ/q8qGIon5JJ8Biu46I=
 github.com/charmbracelet/x/exp/strings v0.0.0-20240524151031-ff83003bf67a/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
 github.com/charmbracelet/x/exp/term v0.0.0-20240606154654-7c42867b53c7 h1:6Rw/MHf+Rm7wlUr+euFyaGw1fNKeZPKVh4gkFHUjFsY=
 github.com/charmbracelet/x/exp/term v0.0.0-20240606154654-7c42867b53c7/go.mod h1:UZyEz89i6+jVx2oW3lgmIsVDNr7qzaKuvPVoSdwqDR0=
-github.com/charmbracelet/x/input v0.1.1 h1:YDOJaTUKCqtGnq9PHzx3pkkl4pXDOANUHmhH3DqMtM4=
-github.com/charmbracelet/x/input v0.1.1/go.mod h1:jvdTVUnNWj/RD6hjC4FsoB0SeZCJ2ZBkiuFP9zXvZI0=
-github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI=
-github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw=
-github.com/charmbracelet/x/windows v0.1.2 h1:Iumiwq2G+BRmgoayww/qfcvof7W/3uLoelhxojXlRWg=
-github.com/charmbracelet/x/windows v0.1.2/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ=
+github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
+github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
+github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
+github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -37,16 +59,18 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
+github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
-github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
-github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
+github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
@@ -55,15 +79,22 @@ github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
 github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
+github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC4cIk=
+github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
+golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=

main.go

@@ -41,6 +41,9 @@ func main() {
 	}
 
 	ts := taskwarrior.NewTaskSquire(taskrcPath)
+	if ts == nil {
+		log.Fatal("Failed to initialize TaskSquire. Please check your Taskwarrior installation and taskrc file.")
+	}
 	tws := timewarrior.NewTimeSquire(timewConfigPath)
 	ctx := context.Background()
 	common := common.NewCommon(ctx, ts, tws)

on-modify.timewarrior

@@ -0,0 +1,118 @@
+#!/usr/bin/env python3
+
+###############################################################################
+#
+# Copyright 2016 - 2021, 2023, Gothenburg Bit Factory
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# https://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+import json
+import subprocess
+import sys
+
+# Hook should extract all the following for use as Timewarrior tags:
+#   UUID
+#   Project
+#   Tags
+#   Description
+#   UDAs
+
+try:
+    input_stream = sys.stdin.buffer
+except AttributeError:
+    input_stream = sys.stdin
+
+
+def extract_tags_from(json_obj):
+    # Extract attributes for use as tags.
+    tags = [json_obj['description']]
+
+    # Add UUID with prefix for reliable task linking
+    if 'uuid' in json_obj:
+        tags.append('uuid:' + json_obj['uuid'])
+
+    # Add project with prefix for separate column display
+    if 'project' in json_obj:
+        tags.append('project:' + json_obj['project'])
+
+    if 'tags' in json_obj:
+        if type(json_obj['tags']) is str:
+            # Usage of tasklib (e.g. in taskpirate) converts the tag list into a string
+            # If this is the case, convert it back into a list first
+            # See https://github.com/tbabej/taskpirate/issues/11
+            task_tags = [tag for tag in json_obj['tags'].split(',') if tag != 'next']
+            tags.extend(task_tags)
+        else:
+            # Filter out the 'next' tag
+            task_tags = [tag for tag in json_obj['tags'] if tag != 'next']
+            tags.extend(task_tags)
+
+    return tags
+
+
+def extract_annotation_from(json_obj):
+
+    if 'annotations' not in json_obj:
+        return '\'\''
+
+    return json_obj['annotations'][0]['description']
+
+
+def main(old, new):
+
+    start_or_stop = ''
+
+    # Started task.
+    if 'start' in new and 'start' not in old:
+        start_or_stop = 'start'
+
+    # Stopped task.
+    elif ('start' not in new or 'end' in new) and 'start' in old:
+        start_or_stop = 'stop'
+
+    if start_or_stop:
+        tags = extract_tags_from(new)
+
+        subprocess.call(['timew', start_or_stop] + tags + [':yes'])
+
+    # Modifications to task other than start/stop
+    elif 'start' in new and 'start' in old:
+        old_tags = extract_tags_from(old)
+        new_tags = extract_tags_from(new)
+
+        if old_tags != new_tags:
+            subprocess.call(['timew', 'untag', '@1'] + old_tags + [':yes'])
+            subprocess.call(['timew', 'tag', '@1'] + new_tags + [':yes'])
+
+        old_annotation = extract_annotation_from(old)
+        new_annotation = extract_annotation_from(new)
+
+        if old_annotation != new_annotation:
+            subprocess.call(['timew', 'annotate', '@1', new_annotation])
+
+
+if __name__ == "__main__":
+    old = json.loads(input_stream.readline().decode("utf-8", errors="replace"))
+    new = json.loads(input_stream.readline().decode("utf-8", errors="replace"))
+    print(json.dumps(new))
+    main(old, new)

opencode_sandbox.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# 1. Resolve the absolute path of opencode from your Nix environment
+OPENCODE_PATH=$(command -v opencode)
+
+if [ -z "$OPENCODE_PATH" ]; then
+    echo "❌ Error: 'opencode' not found in your PATH."
+    exit 1
+fi
+
+echo "🛡️  Engaging Bubblewrap Sandbox..."
+echo "📍 Using binary: $OPENCODE_PATH"
+
+# 2. Run bwrap using the absolute path
+bwrap \
+  --ro-bind /bin /bin \
+  --ro-bind /usr /usr \
+  --ro-bind /lib /lib \
+  --ro-bind /lib64 /lib64 \
+  --ro-bind /nix /nix \
+  --ro-bind /home/pan/.nix-profile/bin /home/pan/.nix-profile/bin \
+  --ro-bind /home/pan/.config/opencode /home/pan/.config/opencode \
+  --ro-bind /etc/resolv.conf /etc/resolv.conf \
+  --ro-bind /etc/hosts /etc/hosts \
+  --ro-bind-try /etc/ssl/certs /etc/ssl/certs \
+  --ro-bind-try /etc/static/ssl/certs /etc/static/ssl/certs \
+  --bind /home/pan/.local/share/opencode /home/pan/.local/share/opencode \
+  --proc /proc \
+  --dev-bind /dev /dev \
+  --tmpfs /tmp \
+  --unshare-all \
+  --share-net \
+  --die-with-parent \
+  --bind "$(pwd)" "$(pwd)" \
+  --chdir "$(pwd)" \
+  --setenv PATH "$PATH" \
+  --setenv HOME "$HOME" \
+  --setenv TASKRC "$TASKRC" \
+  --setenv TASKDATA "$TASKDATA" \
+  "$OPENCODE_PATH" "$@"

pages/main.go

@@ -5,14 +5,18 @@ import (
 
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 )
 
 type MainPage struct {
 	common     *common.Common
 	activePage common.Component
 
-	taskPage common.Component
-	timePage common.Component
+	taskPage   common.Component
+	timePage   common.Component
+	currentTab int
+	width      int
+	height     int
 }
 
 func NewMainPage(common *common.Common) *MainPage {
@@ -24,6 +28,7 @@ func NewMainPage(common *common.Common) *MainPage {
 	m.timePage = NewTimePage(common)
 
 	m.activePage = m.taskPage
+	m.currentTab = 0
 
 	return m
 }
@@ -37,17 +42,39 @@ func (m *MainPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		m.height = msg.Height
 		m.common.SetSize(msg.Width, msg.Height)
+
+		tabHeight := lipgloss.Height(m.renderTabBar())
+		contentHeight := msg.Height - tabHeight
+		if contentHeight < 0 {
+			contentHeight = 0
+		}
+
+		newMsg := tea.WindowSizeMsg{Width: msg.Width, Height: contentHeight}
+		activePage, cmd := m.activePage.Update(newMsg)
+		m.activePage = activePage.(common.Component)
+		return m, cmd
+
 	case tea.KeyMsg:
 		// Only handle tab key for page switching when at the top level (no subpages active)
 		if key.Matches(msg, m.common.Keymap.Next) && !m.common.HasSubpages() {
 			if m.activePage == m.taskPage {
 				m.activePage = m.timePage
+				m.currentTab = 1
 			} else {
 				m.activePage = m.taskPage
+				m.currentTab = 0
 			}
-			// Re-size the new active page just in case
-			m.activePage.SetSize(m.common.Width(), m.common.Height())
+
+			tabHeight := lipgloss.Height(m.renderTabBar())
+			contentHeight := m.height - tabHeight
+			if contentHeight < 0 {
+				contentHeight = 0
+			}
+			m.activePage.SetSize(m.width, contentHeight)
+
 			// Trigger a refresh/init on switch? Maybe not needed if we keep state.
 			// But we might want to refresh data.
 			return m, m.activePage.Init()
@@ -60,6 +87,22 @@ func (m *MainPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, cmd
 }
 
-func (m *MainPage) View() string {
-	return m.activePage.View()
+func (m *MainPage) renderTabBar() string {
+	var tabs []string
+	headers := []string{"Tasks", "Time"}
+
+	for i, header := range headers {
+		style := m.common.Styles.Tab
+		if m.currentTab == i {
+			style = m.common.Styles.ActiveTab
+		}
+		tabs = append(tabs, style.Render(header))
+	}
+
+	row := lipgloss.JoinHorizontal(lipgloss.Top, tabs...)
+	return m.common.Styles.TabBar.Width(m.common.Width()).Render(row)
+}
+
+func (m *MainPage) View() string {
+	return lipgloss.JoinVertical(lipgloss.Left, m.renderTabBar(), m.activePage.View())
 }

pages/messaging.go

@@ -82,3 +82,7 @@ func doTick() tea.Cmd {
 		return tickMsg(t)
 	})
 }
+
+type TaskPickedMsg struct {
+	Task *taskwarrior.Task
+}

pages/projectTaskPicker.go

@@ -0,0 +1,465 @@
+package pages
+
+import (
+	"fmt"
+	"tasksquire/common"
+	"tasksquire/components/picker"
+	"tasksquire/taskwarrior"
+	"tasksquire/timewarrior"
+	"time"
+
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/list"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+)
+
+type ProjectTaskPickerPage struct {
+	common *common.Common
+
+	// Both pickers visible simultaneously
+	projectPicker   *picker.Picker
+	taskPicker      *picker.Picker
+	selectedProject string
+	selectedTask    *taskwarrior.Task
+
+	// Focus tracking: 0 = project picker, 1 = task picker
+	focusedPicker int
+}
+
+type projectTaskPickerProjectSelectedMsg struct {
+	project string
+}
+
+type projectTaskPickerTaskSelectedMsg struct {
+	task *taskwarrior.Task
+}
+
+func NewProjectTaskPickerPage(com *common.Common) *ProjectTaskPickerPage {
+	p := &ProjectTaskPickerPage{
+		common:        com,
+		focusedPicker: 0,
+	}
+
+	// Create project picker
+	projectItemProvider := func() []list.Item {
+		projects := com.TW.GetProjects()
+		items := make([]list.Item, 0, len(projects))
+
+		for _, proj := range projects {
+			items = append(items, picker.NewItem(proj))
+		}
+		return items
+	}
+
+	projectOnSelect := func(item list.Item) tea.Cmd {
+		return func() tea.Msg {
+			return projectTaskPickerProjectSelectedMsg{project: item.FilterValue()}
+		}
+	}
+
+	p.projectPicker = picker.New(
+		com,
+		"Projects",
+		projectItemProvider,
+		projectOnSelect,
+	)
+
+	// Initialize with the first project's tasks
+	projects := com.TW.GetProjects()
+	if len(projects) > 0 {
+		p.selectedProject = projects[0]
+		p.createTaskPicker(projects[0])
+	} else {
+		// No projects - create empty task picker
+		p.createTaskPicker("")
+	}
+
+	p.SetSize(com.Width(), com.Height())
+
+	return p
+}
+
+func (p *ProjectTaskPickerPage) createTaskPicker(project string) {
+	// Build filters for tasks
+	filters := []string{"+track", "status:pending"}
+
+	if project != "" {
+		// Tasks in the selected project
+		filters = append(filters, "project:"+project)
+	}
+
+	taskItemProvider := func() []list.Item {
+		tasks := p.common.TW.GetTasks(nil, filters...)
+		items := make([]list.Item, 0, len(tasks))
+
+		for i := range tasks {
+			// Just use the description as the item text
+			// picker.NewItem creates a simple item with title and filter value
+			items = append(items, picker.NewItem(tasks[i].Description))
+		}
+		return items
+	}
+
+	taskOnSelect := func(item list.Item) tea.Cmd {
+		return func() tea.Msg {
+			// Find the task by description
+			tasks := p.common.TW.GetTasks(nil, filters...)
+			for _, task := range tasks {
+				if task.Description == item.FilterValue() {
+					// tasks is already []*Task, so task is already *Task
+					return projectTaskPickerTaskSelectedMsg{task: task}
+				}
+			}
+			return nil
+		}
+	}
+
+	title := "Tasks with +track"
+	if project != "" {
+		title = fmt.Sprintf("Tasks: %s", project)
+	}
+
+	p.taskPicker = picker.New(
+		p.common,
+		title,
+		taskItemProvider,
+		taskOnSelect,
+		picker.WithFilterByDefault(false), // Start in list mode, not filter mode
+	)
+}
+
+func (p *ProjectTaskPickerPage) Init() tea.Cmd {
+	// Focus the project picker initially
+	p.projectPicker.Focus()
+	return tea.Batch(p.projectPicker.Init(), p.taskPicker.Init())
+}
+
+func (p *ProjectTaskPickerPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		p.SetSize(msg.Width, msg.Height)
+
+	case projectTaskPickerProjectSelectedMsg:
+		// Project selected - update task picker
+		p.selectedProject = msg.project
+		p.createTaskPicker(msg.project)
+		// Move focus to task picker
+		p.projectPicker.Blur()
+		p.taskPicker.Focus()
+		p.focusedPicker = 1
+		p.SetSize(p.common.Width(), p.common.Height())
+		return p, p.taskPicker.Init()
+
+	case projectTaskPickerTaskSelectedMsg:
+		// Task selected - emit TaskPickedMsg and return to parent
+		p.selectedTask = msg.task
+		model, err := p.common.PopPage()
+		if err != nil {
+			return p, tea.Quit
+		}
+		return model, func() tea.Msg {
+			return TaskPickedMsg{Task: p.selectedTask}
+		}
+
+	case UpdatedTasksMsg:
+		// Task was edited - refresh the task list and recreate the task picker
+		if p.selectedProject != "" {
+			p.createTaskPicker(p.selectedProject)
+			p.SetSize(p.common.Width(), p.common.Height())
+			// Keep the task picker focused
+			p.taskPicker.Focus()
+			p.focusedPicker = 1
+			return p, p.taskPicker.Init()
+		}
+		return p, nil
+
+	case tea.KeyMsg:
+		// Check if the focused picker is in filtering mode BEFORE handling any keys
+		var focusedPickerFiltering bool
+		if p.focusedPicker == 0 {
+			focusedPickerFiltering = p.projectPicker.IsFiltering()
+		} else {
+			focusedPickerFiltering = p.taskPicker.IsFiltering()
+		}
+
+		switch {
+		case key.Matches(msg, p.common.Keymap.Back):
+			// If the focused picker is filtering, let it handle the escape key to dismiss the filter
+			// and don't exit the page
+			if focusedPickerFiltering {
+				// Don't handle the Back key - let it fall through to the picker
+				break
+			}
+			// Exit picker completely
+			model, err := p.common.PopPage()
+			if err != nil {
+				return p, tea.Quit
+			}
+			return model, BackCmd
+
+		case key.Matches(msg, p.common.Keymap.Add):
+			// Don't handle 'a' if focused picker is filtering - let the picker handle it for typing
+			if focusedPickerFiltering {
+				break
+			}
+			// Create new task with selected project and track tag pre-filled
+			newTask := taskwarrior.NewTask()
+			newTask.Project = p.selectedProject
+			newTask.Tags = []string{"track"}
+
+			// Open task editor with pre-populated task
+			taskEditor := NewTaskEditorPage(p.common, newTask)
+			p.common.PushPage(p)
+			return taskEditor, taskEditor.Init()
+
+		case key.Matches(msg, p.common.Keymap.Edit):
+			// Don't handle 'e' if focused picker is filtering - let the picker handle it for typing
+			if focusedPickerFiltering {
+				break
+			}
+			// Edit task when task picker is focused and a task is selected
+			if p.focusedPicker == 1 && p.selectedProject != "" {
+				// Get the currently highlighted task
+				selectedItemText := p.taskPicker.GetValue()
+				if selectedItemText != "" {
+					// Find the task by description
+					filters := []string{"+track", "status:pending"}
+					filters = append(filters, "project:"+p.selectedProject)
+
+					tasks := p.common.TW.GetTasks(nil, filters...)
+					for _, task := range tasks {
+						if task.Description == selectedItemText {
+							// Found the task - open editor
+							p.selectedTask = task
+							taskEditor := NewTaskEditorPage(p.common, *task)
+							p.common.PushPage(p)
+							return taskEditor, taskEditor.Init()
+						}
+					}
+				}
+			}
+			return p, nil
+
+		case key.Matches(msg, p.common.Keymap.Tag):
+			// Don't handle 't' if focused picker is filtering - let the picker handle it for typing
+			if focusedPickerFiltering {
+				break
+			}
+			// Open time editor with task pre-filled when task picker is focused
+			if p.focusedPicker == 1 && p.selectedProject != "" {
+				// Get the currently highlighted task
+				selectedItemText := p.taskPicker.GetValue()
+				if selectedItemText != "" {
+					// Find the task by description
+					filters := []string{"+track", "status:pending"}
+					filters = append(filters, "project:"+p.selectedProject)
+
+					tasks := p.common.TW.GetTasks(nil, filters...)
+					for _, task := range tasks {
+						if task.Description == selectedItemText {
+							// Found the task - create new interval with task pre-filled
+							interval := createIntervalFromTask(task)
+
+							// Open time editor with pre-populated interval
+							timeEditor := NewTimeEditorPage(p.common, interval)
+							p.common.PushPage(p)
+							return timeEditor, timeEditor.Init()
+						}
+					}
+				}
+			}
+			return p, nil
+
+		case key.Matches(msg, p.common.Keymap.Next):
+			// Tab: switch focus between pickers
+			if p.focusedPicker == 0 {
+				p.projectPicker.Blur()
+				p.taskPicker.Focus()
+				p.focusedPicker = 1
+			} else {
+				p.taskPicker.Blur()
+				p.projectPicker.Focus()
+				p.focusedPicker = 0
+			}
+			return p, nil
+
+		case key.Matches(msg, p.common.Keymap.Prev):
+			// Shift+Tab: switch focus between pickers (reverse)
+			if p.focusedPicker == 1 {
+				p.taskPicker.Blur()
+				p.projectPicker.Focus()
+				p.focusedPicker = 0
+			} else {
+				p.projectPicker.Blur()
+				p.taskPicker.Focus()
+				p.focusedPicker = 1
+			}
+			return p, nil
+		}
+	}
+
+	// Update the focused picker
+	var cmd tea.Cmd
+	if p.focusedPicker == 0 {
+		// Track the previous project selection
+		previousProject := p.selectedProject
+
+		_, cmd = p.projectPicker.Update(msg)
+		cmds = append(cmds, cmd)
+
+		// Check if the highlighted project changed
+		currentProject := p.projectPicker.GetValue()
+		if currentProject != previousProject && currentProject != "" {
+			// Update the selected project and refresh task picker
+			p.selectedProject = currentProject
+			p.createTaskPicker(currentProject)
+			p.SetSize(p.common.Width(), p.common.Height())
+			cmds = append(cmds, p.taskPicker.Init())
+		}
+	} else {
+		_, cmd = p.taskPicker.Update(msg)
+		cmds = append(cmds, cmd)
+	}
+
+	return p, tea.Batch(cmds...)
+}
+
+func (p *ProjectTaskPickerPage) View() string {
+	// Render both pickers (they handle their own focused/blurred styling)
+	projectView := p.projectPicker.View()
+	taskView := p.taskPicker.View()
+
+	// Create distinct styling for focused vs blurred pickers
+	var projectStyled, taskStyled string
+
+	if p.focusedPicker == 0 {
+		// Project picker is focused
+		projectStyled = lipgloss.NewStyle().
+			Border(lipgloss.ThickBorder()).
+			BorderForeground(lipgloss.Color("6")). // Cyan for focused
+			Padding(0, 1).
+			Render(projectView)
+
+		taskStyled = lipgloss.NewStyle().
+			Border(lipgloss.NormalBorder()).
+			BorderForeground(lipgloss.Color("240")). // Gray for blurred
+			Padding(0, 1).
+			Render(taskView)
+	} else {
+		// Task picker is focused
+		projectStyled = lipgloss.NewStyle().
+			Border(lipgloss.NormalBorder()).
+			BorderForeground(lipgloss.Color("240")). // Gray for blurred
+			Padding(0, 1).
+			Render(projectView)
+
+		taskStyled = lipgloss.NewStyle().
+			Border(lipgloss.ThickBorder()).
+			BorderForeground(lipgloss.Color("6")). // Cyan for focused
+			Padding(0, 1).
+			Render(taskView)
+	}
+
+	// Layout side by side if width permits, otherwise stack vertically
+	var content string
+	if p.common.Width() >= 100 {
+		// Side by side layout
+		content = lipgloss.JoinHorizontal(lipgloss.Top, projectStyled, "  ", taskStyled)
+	} else {
+		// Vertical stack layout
+		content = lipgloss.JoinVertical(lipgloss.Left, projectStyled, "", taskStyled)
+	}
+
+	// Add help text
+	helpText := "Tab/Shift+Tab: switch focus • Enter: select • a: add task • e: edit • t: track time • Esc: cancel"
+	helpStyled := lipgloss.NewStyle().
+		Foreground(lipgloss.Color("241")).
+		Italic(true).
+		Render(helpText)
+
+	fullContent := lipgloss.JoinVertical(lipgloss.Left, content, "", helpStyled)
+
+	return lipgloss.Place(
+		p.common.Width(),
+		p.common.Height(),
+		lipgloss.Center,
+		lipgloss.Center,
+		fullContent,
+	)
+}
+
+func (p *ProjectTaskPickerPage) SetSize(width, height int) {
+	p.common.SetSize(width, height)
+
+	// Calculate sizes based on layout
+	var projectWidth, taskWidth, listHeight int
+
+	if width >= 100 {
+		// Side by side layout
+		projectWidth = 30
+		taskWidth = width - projectWidth - 10 // Account for margins and padding
+		if taskWidth > 60 {
+			taskWidth = 60
+		}
+	} else {
+		// Vertical stack layout
+		projectWidth = width - 8
+		taskWidth = width - 8
+		if projectWidth > 60 {
+			projectWidth = 60
+		}
+		if taskWidth > 60 {
+			taskWidth = 60
+		}
+	}
+
+	// Height for each picker
+	listHeight = height - 10 // Account for help text and padding
+	if listHeight > 25 {
+		listHeight = 25
+	}
+	if listHeight < 10 {
+		listHeight = 10
+	}
+
+	if p.projectPicker != nil {
+		p.projectPicker.SetSize(projectWidth, listHeight)
+	}
+
+	if p.taskPicker != nil {
+		p.taskPicker.SetSize(taskWidth, listHeight)
+	}
+}
+
+// createIntervalFromTask creates a new time interval pre-filled with task metadata
+func createIntervalFromTask(task *taskwarrior.Task) *timewarrior.Interval {
+	interval := timewarrior.NewInterval()
+
+	// Set start time to now (UTC format)
+	interval.Start = time.Now().UTC().Format("20060102T150405Z")
+	// Leave End empty for active tracking
+	interval.End = ""
+
+	// Build tags from task metadata
+	tags := []string{}
+
+	// Add UUID tag for task linking
+	if task.Uuid != "" {
+		tags = append(tags, "uuid:"+task.Uuid)
+	}
+
+	// Add project tag
+	if task.Project != "" {
+		tags = append(tags, "project:"+task.Project)
+	}
+
+	// Add existing task tags (excluding virtual tags)
+	tags = append(tags, task.Tags...)
+
+	interval.Tags = tags
+
+	return interval
+}

pages/report.go

@@ -3,13 +3,13 @@ package pages
 
 import (
 	"tasksquire/common"
+	"tasksquire/components/detailsviewer"
 	"tasksquire/components/table"
 	"tasksquire/taskwarrior"
 
 	"github.com/charmbracelet/bubbles/key"
-
-	// "github.com/charmbracelet/bubbles/table"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 )
 
 type ReportPage struct {
@@ -25,6 +25,10 @@ type ReportPage struct {
 
 	taskTable table.Model
 
+	// Details panel state
+	detailsPanelActive bool
+	detailsViewer      *detailsviewer.DetailsViewer
+
 	subpage common.Component
 }
 
@@ -38,11 +42,13 @@ func NewReportPage(com *common.Common, report *taskwarrior.Report) *ReportPage {
 	// }
 
 	p := &ReportPage{
-		common:        com,
-		activeReport:  report,
-		activeContext: com.TW.GetActiveContext(),
-		activeProject: "",
-		taskTable:     table.New(com),
+		common:             com,
+		activeReport:       report,
+		activeContext:      com.TW.GetActiveContext(),
+		activeProject:      "",
+		taskTable:          table.New(com),
+		detailsPanelActive: false,
+		detailsViewer:      detailsviewer.New(com),
 	}
 
 	return p
@@ -51,8 +57,39 @@ func NewReportPage(com *common.Common, report *taskwarrior.Report) *ReportPage {
 func (p *ReportPage) SetSize(width int, height int) {
 	p.common.SetSize(width, height)
 
-	p.taskTable.SetWidth(width - p.common.Styles.Base.GetHorizontalFrameSize())
-	p.taskTable.SetHeight(height - p.common.Styles.Base.GetVerticalFrameSize())
+	baseHeight := height - p.common.Styles.Base.GetVerticalFrameSize()
+	baseWidth := width - p.common.Styles.Base.GetHorizontalFrameSize()
+
+	var tableHeight int
+	if p.detailsPanelActive {
+		// Allocate 60% for table, 40% for details panel
+		// Minimum 5 lines for details, minimum 10 lines for table
+		detailsHeight := max(min(baseHeight*2/5, baseHeight-10), 5)
+		tableHeight = baseHeight - detailsHeight - 1 // -1 for spacing
+
+		// Set component size (component handles its own border/padding)
+		p.detailsViewer.SetSize(baseWidth, detailsHeight)
+	} else {
+		tableHeight = baseHeight
+	}
+
+	p.taskTable.SetWidth(baseWidth)
+	p.taskTable.SetHeight(tableHeight)
+}
+
+// Helper functions
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
 }
 
 func (p *ReportPage) Init() tea.Cmd {
@@ -82,9 +119,23 @@ func (p *ReportPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case UpdateProjectMsg:
 		p.activeProject = string(msg)
 		cmds = append(cmds, p.getTasks())
+	case TaskPickedMsg:
+		if msg.Task != nil && msg.Task.Status == "pending" {
+			p.common.TW.StopActiveTasks()
+			p.common.TW.StartTask(msg.Task)
+		}
+		cmds = append(cmds, p.getTasks())
 	case UpdatedTasksMsg:
 		cmds = append(cmds, p.getTasks())
 	case tea.KeyMsg:
+		// Handle ESC when details panel is active
+		if p.detailsPanelActive && key.Matches(msg, p.common.Keymap.Back) {
+			p.detailsPanelActive = false
+			p.detailsViewer.Blur()
+			p.SetSize(p.common.Width(), p.common.Height())
+			return p, nil
+		}
+
 		switch {
 		case key.Matches(msg, p.common.Keymap.Quit):
 			return p, tea.Quit
@@ -108,6 +159,40 @@ func (p *ReportPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			cmd := p.subpage.Init()
 			p.common.PushPage(p)
 			return p.subpage, cmd
+		case key.Matches(msg, p.common.Keymap.Subtask):
+			if p.selectedTask != nil {
+				// Create new task inheriting parent's attributes
+				newTask := taskwarrior.NewTask()
+
+				// Set parent relationship
+				newTask.Parent = p.selectedTask.Uuid
+
+				// Copy parent's attributes
+				newTask.Project = p.selectedTask.Project
+				newTask.Priority = p.selectedTask.Priority
+				newTask.Tags = make([]string, len(p.selectedTask.Tags))
+				copy(newTask.Tags, p.selectedTask.Tags)
+
+				// Copy UDAs (except "details" which is task-specific)
+				if p.selectedTask.Udas != nil {
+					newTask.Udas = make(map[string]any)
+					for k, v := range p.selectedTask.Udas {
+						// Skip "details" UDA - it's specific to parent task
+						if k == "details" {
+							continue
+						}
+						// Deep copy other UDA values
+						newTask.Udas[k] = v
+					}
+				}
+
+				// Open task editor with pre-populated task
+				p.subpage = NewTaskEditorPage(p.common, newTask)
+				cmd := p.subpage.Init()
+				p.common.PushPage(p)
+				return p.subpage, cmd
+			}
+			return p, nil
 		case key.Matches(msg, p.common.Keymap.Ok):
 			p.common.TW.SetTaskDone(p.selectedTask)
 			return p, p.getTasks()
@@ -119,6 +204,11 @@ func (p *ReportPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			cmd := p.subpage.Init()
 			p.common.PushPage(p)
 			return p.subpage, cmd
+		case key.Matches(msg, p.common.Keymap.PickProjectTask):
+			p.subpage = NewProjectTaskPickerPage(p.common)
+			cmd := p.subpage.Init()
+			p.common.PushPage(p)
+			return p.subpage, cmd
 		case key.Matches(msg, p.common.Keymap.Tag):
 			if p.selectedTask != nil {
 				tag := p.common.TW.GetConfig().Get("uda.tasksquire.tag.default")
@@ -137,34 +227,70 @@ func (p *ReportPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, p.common.Keymap.StartStop):
 			if p.selectedTask != nil && p.selectedTask.Status == "pending" {
 				if p.selectedTask.Start == "" {
+					p.common.TW.StopActiveTasks()
 					p.common.TW.StartTask(p.selectedTask)
 				} else {
 					p.common.TW.StopTask(p.selectedTask)
 				}
 				return p, p.getTasks()
 			}
+		case key.Matches(msg, p.common.Keymap.ViewDetails):
+			if p.selectedTask != nil {
+				// Toggle details panel
+				p.detailsPanelActive = !p.detailsPanelActive
+				if p.detailsPanelActive {
+					p.detailsViewer.SetTask(p.selectedTask)
+					p.detailsViewer.Focus()
+				} else {
+					p.detailsViewer.Blur()
+				}
+				p.SetSize(p.common.Width(), p.common.Height())
+				return p, nil
+			}
 		}
 	}
 
 	var cmd tea.Cmd
-	p.taskTable, cmd = p.taskTable.Update(msg)
-	cmds = append(cmds, cmd)
 
-	if p.tasks != nil && len(p.tasks) > 0 {
-		p.selectedTask = p.tasks[p.taskTable.Cursor()]
+	// Route keyboard messages to details viewer when panel is active
+	if p.detailsPanelActive {
+		var viewerCmd tea.Cmd
+		var viewerModel tea.Model
+		viewerModel, viewerCmd = p.detailsViewer.Update(msg)
+		p.detailsViewer = viewerModel.(*detailsviewer.DetailsViewer)
+		cmds = append(cmds, viewerCmd)
 	} else {
-		p.selectedTask = nil
+		// Route to table when details panel not active
+		p.taskTable, cmd = p.taskTable.Update(msg)
+		cmds = append(cmds, cmd)
+
+		if p.tasks != nil && len(p.tasks) > 0 {
+			p.selectedTask = p.tasks[p.taskTable.Cursor()]
+		} else {
+			p.selectedTask = nil
+		}
 	}
 
 	return p, tea.Batch(cmds...)
 }
 
 func (p *ReportPage) View() string {
-	// return p.common.Styles.Main.Render(p.taskTable.View()) + "\n"
 	if p.tasks == nil || len(p.tasks) == 0 {
 		return p.common.Styles.Base.Render("No tasks found")
 	}
-	return p.taskTable.View()
+
+	tableView := p.taskTable.View()
+
+	if !p.detailsPanelActive {
+		return tableView
+	}
+
+	// Combine table and details panel vertically
+	return lipgloss.JoinVertical(
+		lipgloss.Left,
+		tableView,
+		p.detailsViewer.View(),
+	)
 }
 
 func (p *ReportPage) populateTaskTable(tasks taskwarrior.Tasks) {
@@ -172,37 +298,68 @@ func (p *ReportPage) populateTaskTable(tasks taskwarrior.Tasks) {
 		return
 	}
 
+	// Build task tree for hierarchical display
+	taskTree := taskwarrior.BuildTaskTree(tasks)
+
+	// Use flattened tree list for display order
+	orderedTasks := make(taskwarrior.Tasks, len(taskTree.FlatList))
+	for i, node := range taskTree.FlatList {
+		orderedTasks[i] = node.Task
+	}
+
 	selected := p.taskTable.Cursor()
 
+	// Adjust cursor for tree ordering
 	if p.selectedTask != nil {
-		for i, task := range tasks {
+		for i, task := range orderedTasks {
 			if task.Uuid == p.selectedTask.Uuid {
 				selected = i
+				break
 			}
 		}
 	}
-	if selected > len(tasks)-1 {
-		selected = len(tasks) - 1
+	if selected > len(orderedTasks)-1 {
+		selected = len(orderedTasks) - 1
+	}
+
+	// Calculate proper dimensions based on whether details panel is active
+	baseHeight := p.common.Height() - p.common.Styles.Base.GetVerticalFrameSize()
+	baseWidth := p.common.Width() - p.common.Styles.Base.GetHorizontalFrameSize()
+
+	var tableHeight int
+	if p.detailsPanelActive {
+		// Allocate 60% for table, 40% for details panel
+		// Minimum 5 lines for details, minimum 10 lines for table
+		detailsHeight := max(min(baseHeight*2/5, baseHeight-10), 5)
+		tableHeight = baseHeight - detailsHeight - 1 // -1 for spacing
+	} else {
+		tableHeight = baseHeight
 	}
 
 	p.taskTable = table.New(
 		p.common,
 		table.WithReport(p.activeReport),
-		table.WithTasks(tasks),
+		table.WithTasks(orderedTasks),
+		table.WithTaskTree(taskTree),
 		table.WithFocused(true),
-		table.WithWidth(p.common.Width()-p.common.Styles.Base.GetVerticalFrameSize()),
-		table.WithHeight(p.common.Height()-p.common.Styles.Base.GetHorizontalFrameSize()-1),
+		table.WithWidth(baseWidth),
+		table.WithHeight(tableHeight),
 		table.WithStyles(p.common.Styles.TableStyle),
 	)
 
 	if selected == 0 {
 		selected = p.taskTable.Cursor()
 	}
-	if selected < len(tasks) {
+	if selected < len(orderedTasks) {
 		p.taskTable.SetCursor(selected)
 	} else {
 		p.taskTable.SetCursor(len(p.tasks) - 1)
 	}
+
+	// Refresh details content if panel is active
+	if p.detailsPanelActive && p.selectedTask != nil {
+		p.detailsViewer.SetTask(p.selectedTask)
+	}
 }
 
 func (p *ReportPage) getTasks() tea.Cmd {

pages/taskEditor.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"tasksquire/components/input"
+	"tasksquire/components/picker"
 	"tasksquire/components/timestampeditor"
 	"tasksquire/taskwarrior"
 
@@ -41,6 +42,8 @@ type TaskEditorPage struct {
 	area       int
 	areaPicker *areaPicker
 	areas      []area
+
+	infoViewport viewport.Model
 }
 
 func NewTaskEditorPage(com *common.Common, task taskwarrior.Task) *TaskEditorPage {
@@ -56,7 +59,7 @@ func NewTaskEditorPage(com *common.Common, task taskwarrior.Task) *TaskEditorPag
 	tagOptions := p.common.TW.GetTags()
 
 	p.areas = []area{
-		NewTaskEdit(p.common, &p.task),
+		NewTaskEdit(p.common, &p.task, p.task.Uuid == ""),
 		NewTagEdit(p.common, &p.task.Tags, tagOptions),
 		NewTimeEdit(p.common, &p.task.Due, &p.task.Scheduled, &p.task.Wait, &p.task.Until),
 		NewDetailsEdit(p.common, &p.task),
@@ -68,6 +71,11 @@ func NewTaskEditorPage(com *common.Common, task taskwarrior.Task) *TaskEditorPag
 
 	p.areaPicker = NewAreaPicker(com, []string{"Task", "Tags", "Dates"})
 
+	p.infoViewport = viewport.New(0, 0)
+	if p.task.Uuid != "" {
+		p.infoViewport.SetContent(p.common.TW.GetInformation(&p.task))
+	}
+
 	p.columnCursor = 1
 	if p.task.Uuid == "" {
 		p.mode = modeInsert
@@ -94,10 +102,20 @@ func (p *TaskEditorPage) SetSize(width, height int) {
 	} else {
 		p.colHeight = height - p.common.Styles.ColumnFocused.GetVerticalFrameSize()
 	}
+
+	p.infoViewport.Width = width - p.colWidth - p.common.Styles.ColumnFocused.GetHorizontalFrameSize()*2 - 5
+	if p.infoViewport.Width < 0 {
+		p.infoViewport.Width = 0
+	}
+	p.infoViewport.Height = p.colHeight
 }
 
 func (p *TaskEditorPage) Init() tea.Cmd {
-	return nil
+	var cmds []tea.Cmd
+	for _, a := range p.areas {
+		cmds = append(cmds, a.Init())
+	}
+	return tea.Batch(cmds...)
 }
 
 func (p *TaskEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -110,12 +128,20 @@ func (p *TaskEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		p.mode = mode(msg)
 	case prevColumnMsg:
 		p.columnCursor--
+		maxCols := 2
+		if p.task.Uuid != "" {
+			maxCols = 3
+		}
 		if p.columnCursor < 0 {
-			p.columnCursor = len(p.areas) - 1
+			p.columnCursor = maxCols - 1
 		}
 	case nextColumnMsg:
 		p.columnCursor++
-		if p.columnCursor > len(p.areas)-1 {
+		maxCols := 2
+		if p.task.Uuid != "" {
+			maxCols = 3
+		}
+		if p.columnCursor >= maxCols {
 			p.columnCursor = 0
 		}
 	case prevAreaMsg:
@@ -166,20 +192,26 @@ func (p *TaskEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					picker, cmd := p.areaPicker.Update(msg)
 					p.areaPicker = picker.(*areaPicker)
 					return p, cmd
-				} else {
+				} else if p.columnCursor == 1 {
 					model, cmd := p.areas[p.area].Update(prevFieldMsg{})
 					p.areas[p.area] = model.(area)
 					return p, cmd
+				} else if p.columnCursor == 2 {
+					p.infoViewport.LineUp(1)
+					return p, nil
 				}
 			case key.Matches(msg, p.common.Keymap.Down):
 				if p.columnCursor == 0 {
 					picker, cmd := p.areaPicker.Update(msg)
 					p.areaPicker = picker.(*areaPicker)
 					return p, cmd
-				} else {
+				} else if p.columnCursor == 1 {
 					model, cmd := p.areas[p.area].Update(nextFieldMsg{})
 					p.areas[p.area] = model.(area)
 					return p, cmd
+				} else if p.columnCursor == 2 {
+					p.infoViewport.LineDown(1)
+					return p, nil
 				}
 			}
 		}
@@ -212,25 +244,31 @@ func (p *TaskEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					picker, cmd := p.areaPicker.Update(msg)
 					p.areaPicker = picker.(*areaPicker)
 					return p, cmd
-				} else {
+				} else if p.columnCursor == 1 {
 					model, cmd := p.areas[p.area].Update(prevFieldMsg{})
 					p.areas[p.area] = model.(area)
 					return p, cmd
 				}
+				return p, nil
 			case key.Matches(msg, p.common.Keymap.Next):
 				if p.columnCursor == 0 {
 					picker, cmd := p.areaPicker.Update(msg)
 					p.areaPicker = picker.(*areaPicker)
 					return p, cmd
-				} else {
+				} else if p.columnCursor == 1 {
 					model, cmd := p.areas[p.area].Update(nextFieldMsg{})
 					p.areas[p.area] = model.(area)
 					return p, cmd
 				}
+				return p, nil
 			case key.Matches(msg, p.common.Keymap.Ok):
+				isFiltering := p.areas[p.area].IsFiltering()
 				model, cmd := p.areas[p.area].Update(msg)
 				if p.area != 3 {
 					p.areas[p.area] = model.(area)
+					if isFiltering {
+						return p, cmd
+					}
 					return p, tea.Batch(cmd, nextField())
 				}
 				return p, cmd
@@ -241,6 +279,10 @@ func (p *TaskEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			picker, cmd := p.areaPicker.Update(msg)
 			p.areaPicker = picker.(*areaPicker)
 			return p, cmd
+		} else if p.columnCursor == 2 {
+			var cmd tea.Cmd
+			p.infoViewport, cmd = p.infoViewport.Update(msg)
+			return p, cmd
 		} else {
 			model, cmd := p.areas[p.area].Update(msg)
 			p.areas[p.area] = model.(area)
@@ -253,29 +295,31 @@ func (p *TaskEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (p *TaskEditorPage) View() string {
 	var focusedStyle, blurredStyle lipgloss.Style
 	if p.mode == modeInsert {
-		focusedStyle = p.common.Styles.ColumnInsert.Width(p.colWidth).Height(p.colHeight)
+		focusedStyle = p.common.Styles.ColumnInsert
 	} else {
-		focusedStyle = p.common.Styles.ColumnFocused.Width(p.colWidth).Height(p.colHeight)
+		focusedStyle = p.common.Styles.ColumnFocused
 	}
-	blurredStyle = p.common.Styles.ColumnBlurred.Width(p.colWidth).Height(p.colHeight)
-	// var picker, area string
-	var area string
-	if p.columnCursor == 0 {
-		// picker = focusedStyle.Render(p.areaPicker.View())
-		area = blurredStyle.Render(p.areas[p.area].View())
-	} else {
-		// picker = blurredStyle.Render(p.areaPicker.View())
-		area = focusedStyle.Render(p.areas[p.area].View())
+	blurredStyle = p.common.Styles.ColumnBlurred
 
+	var area string
+	if p.columnCursor == 1 {
+		area = focusedStyle.Copy().Width(p.colWidth).Height(p.colHeight).Render(p.areas[p.area].View())
+	} else {
+		area = blurredStyle.Copy().Width(p.colWidth).Height(p.colHeight).Render(p.areas[p.area].View())
 	}
 
 	if p.task.Uuid != "" {
+		var infoView string
+		if p.columnCursor == 2 {
+			infoView = focusedStyle.Copy().Width(p.infoViewport.Width).Height(p.infoViewport.Height).Render(p.infoViewport.View())
+		} else {
+			infoView = blurredStyle.Copy().Width(p.infoViewport.Width).Height(p.infoViewport.Height).Render(p.infoViewport.View())
+		}
 		area = lipgloss.JoinHorizontal(
 			lipgloss.Top,
 			area,
-			p.common.Styles.ColumnFocused.Render(p.common.TW.GetInformation(&p.task)),
+			infoView,
 		)
-
 	}
 
 	tabs := ""
@@ -305,8 +349,11 @@ type area interface {
 	tea.Model
 	SetCursor(c int)
 	GetName() string
+	IsFiltering() bool
 }
 
+type focusMsg struct{}
+
 type areaPicker struct {
 	common *common.Common
 	list   list.Model
@@ -378,26 +425,66 @@ func (a *areaPicker) View() string {
 	return a.list.View()
 }
 
+type EditableField interface {
+	tea.Model
+	Focus() tea.Cmd
+	Blur() tea.Cmd
+}
+
 type taskEdit struct {
 	common *common.Common
-	fields []huh.Field
+	fields []EditableField
 	cursor int
 
+	projectPicker *picker.Picker
 	// newProjectName *string
 	newAnnotation *string
 	udaValues     map[string]*string
 }
 
-func NewTaskEdit(com *common.Common, task *taskwarrior.Task) *taskEdit {
+func NewTaskEdit(com *common.Common, task *taskwarrior.Task, isNew bool) *taskEdit {
 	// newProject := ""
-	projectOptions := append([]string{"(none)"}, com.TW.GetProjects()...)
 	if task.Project == "" {
 		task.Project = "(none)"
 	}
 
+	itemProvider := func() []list.Item {
+		projects := com.TW.GetProjects()
+		items := []list.Item{picker.NewItem("(none)")}
+		for _, proj := range projects {
+			items = append(items, picker.NewItem(proj))
+		}
+		return items
+	}
+	onSelect := func(item list.Item) tea.Cmd {
+		return nil
+	}
+	onCreate := func(newProject string) tea.Cmd {
+		// The new project name will be used as the project value
+		// when the task is saved
+		return nil
+	}
+
+	opts := []picker.PickerOption{picker.WithOnCreate(onCreate)}
+
+	// Check if task has a pre-filled project (e.g., from ProjectTaskPickerPage)
+	hasPrefilledProject := task.Project != "" && task.Project != "(none)"
+
+	if isNew && !hasPrefilledProject {
+		// New task with no project → start in filter mode for quick project search
+		opts = append(opts, picker.WithFilterByDefault(true))
+	} else {
+		// Either existing task OR new task with pre-filled project → show list with project selected
+		opts = append(opts, picker.WithDefaultValue(task.Project))
+	}
+
+	projPicker := picker.New(com, "Project", itemProvider, onSelect, opts...)
+	projPicker.SetSize(70, 8)
+	projPicker.Blur()
+
 	defaultKeymap := huh.NewDefaultKeyMap()
 
-	fields := []huh.Field{
+	fields := []EditableField{
 		huh.NewInput().
 			Title("Task").
 			Value(&task.Description).
@@ -411,12 +498,7 @@ func NewTaskEdit(com *common.Common, task *taskwarrior.Task) *taskEdit {
 			Prompt(": ").
 			WithTheme(com.Styles.Form),
 
-		input.NewSelect(com).
-			Options(true, input.NewOptions(projectOptions...)...).
-			Title("Project").
-			Value(&task.Project).
-			WithKeyMap(defaultKeymap).
-			WithTheme(com.Styles.Form),
+		projPicker,
 
 		// huh.NewInput().
 		// 	Title("New Project").
@@ -509,8 +591,9 @@ func NewTaskEdit(com *common.Common, task *taskwarrior.Task) *taskEdit {
 		WithTheme(com.Styles.Form))
 
 	t := taskEdit{
-		common: com,
-		fields: fields,
+		common:        com,
+		fields:        fields,
+		projectPicker: projPicker,
 
 		udaValues: udaValues,
 
@@ -527,6 +610,13 @@ func (t *taskEdit) GetName() string {
 	return "Task"
 }
 
+func (t *taskEdit) IsFiltering() bool {
+	if f, ok := t.fields[t.cursor].(interface{ IsFiltering() bool }); ok {
+		return f.IsFiltering()
+	}
+	return false
+}
+
 func (t *taskEdit) SetCursor(c int) {
 	t.fields[t.cursor].Blur()
 	if c < 0 {
@@ -538,11 +628,25 @@ func (t *taskEdit) SetCursor(c int) {
 }
 
 func (t *taskEdit) Init() tea.Cmd {
-	return nil
+	var cmds []tea.Cmd
+	// Ensure focus on the active field (especially for the first one)
+	if len(t.fields) > 0 {
+		cmds = append(cmds, func() tea.Msg {
+			return focusMsg{}
+		})
+	}
+	for _, f := range t.fields {
+		cmds = append(cmds, f.Init())
+	}
+	return tea.Batch(cmds...)
 }
 
 func (t *taskEdit) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg.(type) {
+	case focusMsg:
+		if len(t.fields) > 0 {
+			return t, t.fields[t.cursor].Focus()
+		}
 	case nextFieldMsg:
 		if t.cursor == len(t.fields)-1 {
 			t.fields[t.cursor].Blur()
@@ -561,7 +665,7 @@ func (t *taskEdit) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		t.fields[t.cursor].Focus()
 	default:
 		field, cmd := t.fields[t.cursor].Update(msg)
-		t.fields[t.cursor] = field.(huh.Field)
+		t.fields[t.cursor] = field.(EditableField)
 		return t, cmd
 	}
 
@@ -624,6 +728,13 @@ func (t *tagEdit) GetName() string {
 	return "Tags"
 }
 
+func (t *tagEdit) IsFiltering() bool {
+	if f, ok := t.fields[t.cursor].(interface{ IsFiltering() bool }); ok {
+		return f.IsFiltering()
+	}
+	return false
+}
+
 func (t *tagEdit) SetCursor(c int) {
 	t.fields[t.cursor].Blur()
 	if c < 0 {
@@ -736,6 +847,10 @@ func (t *timeEdit) GetName() string {
 	return "Dates"
 }
 
+func (t *timeEdit) IsFiltering() bool {
+	return false
+}
+
 func (t *timeEdit) SetCursor(c int) {
 	if len(t.fields) == 0 {
 		return
@@ -868,6 +983,10 @@ func (d *detailsEdit) GetName() string {
 	return "Details"
 }
 
+func (d *detailsEdit) IsFiltering() bool {
+	return false
+}
+
 func (d *detailsEdit) SetCursor(c int) {
 }
 
@@ -1035,6 +1154,8 @@ func (d *detailsEdit) View() string {
 // }
 
 func (p *TaskEditorPage) updateTasksCmd() tea.Msg {
+	p.task.Project = p.areas[0].(*taskEdit).projectPicker.GetValue()
+
 	if p.task.Project == "(none)" {
 		p.task.Project = ""
 	}

pages/timeEditor.go

@@ -1,14 +1,18 @@
 package pages
 
 import (
+	"fmt"
 	"log/slog"
 	"strings"
 	"tasksquire/common"
 	"tasksquire/components/autocomplete"
+	"tasksquire/components/picker"
 	"tasksquire/components/timestampeditor"
+	"tasksquire/taskwarrior"
 	"tasksquire/timewarrior"
 
 	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 )
@@ -18,17 +22,160 @@ type TimeEditorPage struct {
 	interval *timewarrior.Interval
 
 	// Fields
-	startEditor *timestampeditor.TimestampEditor
-	endEditor   *timestampeditor.TimestampEditor
-	tagsInput   *autocomplete.Autocomplete
-	adjust      bool
+	projectPicker *picker.Picker
+	taskPicker    *picker.Picker
+	startEditor   *timestampeditor.TimestampEditor
+	endEditor     *timestampeditor.TimestampEditor
+	tagsInput     *autocomplete.Autocomplete
+	adjust        bool
 
 	// State
-	currentField int
-	totalFields  int
+	selectedProject string
+	selectedTask    *taskwarrior.Task
+	currentField    int
+	totalFields     int
+	uuid            string // Preserved UUID tag
+	track           string // Preserved track tag (if present)
+}
+
+type timeEditorProjectSelectedMsg struct {
+	project string
+}
+
+type timeEditorTaskSelectedMsg struct {
+	task *taskwarrior.Task
+}
+
+// createTaskPickerForProject creates a picker showing tasks with +track tag for the given project
+func createTaskPickerForProject(com *common.Common, project string, defaultTask string) *picker.Picker {
+	// Build filters for tasks with +track tag
+	filters := []string{"+track", "status:pending"}
+	if project != "" {
+		filters = append(filters, "project:"+project)
+	}
+
+	taskItemProvider := func() []list.Item {
+		tasks := com.TW.GetTasks(nil, filters...)
+		// Add "(none)" as first option, then all tasks
+		items := make([]list.Item, 0, len(tasks)+1)
+		items = append(items, picker.NewItem("(none)"))
+		for i := range tasks {
+			items = append(items, picker.NewItem(tasks[i].Description))
+		}
+		return items
+	}
+
+	taskOnSelect := func(item list.Item) tea.Cmd {
+		return func() tea.Msg {
+			// Handle "(none)" selection
+			if item.FilterValue() == "(none)" {
+				return timeEditorTaskSelectedMsg{task: nil}
+			}
+			// Find the task by description
+			tasks := com.TW.GetTasks(nil, filters...)
+			for _, task := range tasks {
+				if task.Description == item.FilterValue() {
+					return timeEditorTaskSelectedMsg{task: task}
+				}
+			}
+			return nil
+		}
+	}
+
+	title := "Task"
+	if project != "" {
+		title = fmt.Sprintf("Task (%s)", project)
+	}
+
+	opts := []picker.PickerOption{
+		picker.WithFilterByDefault(false), // Start in list mode, not filter mode
+	}
+
+	// Pre-select task if provided, otherwise default to "(none)"
+	if defaultTask != "" {
+		opts = append(opts, picker.WithDefaultValue(defaultTask))
+	} else {
+		opts = append(opts, picker.WithDefaultValue("(none)"))
+	}
+
+	taskPicker := picker.New(
+		com,
+		title,
+		taskItemProvider,
+		taskOnSelect,
+		opts...,
+	)
+	taskPicker.SetSize(50, 10)
+
+	return taskPicker
 }
 
 func NewTimeEditorPage(com *common.Common, interval *timewarrior.Interval) *TimeEditorPage {
+	// Extract special tags (uuid, project, track) and display tags
+	uuid, selectedProject, track, displayTags := extractSpecialTags(interval.Tags)
+
+	// Track selected task for pre-selection
+	var selectedTask *taskwarrior.Task
+	var defaultTaskDescription string
+
+	// If UUID exists, fetch the task and add its title to display tags
+	if uuid != "" {
+		tasks := com.TW.GetTasks(nil, "uuid:"+uuid)
+		if len(tasks) > 0 {
+			selectedTask = tasks[0]
+			defaultTaskDescription = selectedTask.Description
+			// Add to display tags if not already present
+			// Note: formatTags() will handle quoting for display, so we store the raw title
+			displayTags = ensureTagPresent(displayTags, defaultTaskDescription)
+		}
+	}
+
+	// Create project picker with onCreate support for new projects
+	projectItemProvider := func() []list.Item {
+		projects := com.TW.GetProjects()
+		items := make([]list.Item, len(projects))
+		for i, proj := range projects {
+			items[i] = picker.NewItem(proj)
+		}
+		return items
+	}
+
+	projectOnSelect := func(item list.Item) tea.Cmd {
+		return func() tea.Msg {
+			return timeEditorProjectSelectedMsg{project: item.FilterValue()}
+		}
+	}
+
+	projectOnCreate := func(name string) tea.Cmd {
+		return func() tea.Msg {
+			return timeEditorProjectSelectedMsg{project: name}
+		}
+	}
+
+	opts := []picker.PickerOption{
+		picker.WithOnCreate(projectOnCreate),
+	}
+	if selectedProject != "" {
+		opts = append(opts, picker.WithDefaultValue(selectedProject))
+	} else {
+		opts = append(opts, picker.WithFilterByDefault(true))
+	}
+
+	projectPicker := picker.New(
+		com,
+		"Project",
+		projectItemProvider,
+		projectOnSelect,
+		opts...,
+	)
+	projectPicker.SetSize(50, 10) // Compact size for inline use
+
+	// Create task picker (only if project is selected)
+	var taskPicker *picker.Picker
+	if selectedProject != "" {
+		taskPicker = createTaskPickerForProject(com, selectedProject, defaultTaskDescription)
+	}
+
 	// Create start timestamp editor
 	startEditor := timestampeditor.New(com).
 		Title("Start").
@@ -39,38 +186,63 @@ func NewTimeEditorPage(com *common.Common, interval *timewarrior.Interval) *Time
 		Title("End").
 		ValueFromString(interval.End)
 
-	// Create tags autocomplete with combinations from past intervals
-	tagCombinations := com.TimeW.GetTagCombinations()
+	// Get tag combinations filtered by selected project
+	tagCombinations := filterTagCombinationsByProject(
+		com.TimeW.GetTagCombinations(),
+		selectedProject,
+	)
+
 	tagsInput := autocomplete.New(tagCombinations, 3, 10)
 	tagsInput.SetPlaceholder("Space separated, use \"\" for tags with spaces")
-	tagsInput.SetValue(formatTags(interval.Tags))
+	tagsInput.SetValue(formatTags(displayTags)) // Use display tags only (no uuid, project, track)
 	tagsInput.SetWidth(50)
 
 	p := &TimeEditorPage{
-		common:       com,
-		interval:     interval,
-		startEditor:  startEditor,
-		endEditor:    endEditor,
-		tagsInput:    tagsInput,
-		adjust:       true, // Enable :adjust by default
-		currentField: 0,
-		totalFields:  4, // Updated to include adjust field
+		common:          com,
+		interval:        interval,
+		projectPicker:   projectPicker,
+		taskPicker:      taskPicker,
+		startEditor:     startEditor,
+		endEditor:       endEditor,
+		tagsInput:       tagsInput,
+		adjust:          true, // Enable :adjust by default
+		selectedProject: selectedProject,
+		selectedTask:    selectedTask,
+		currentField:    0,
+		totalFields:     6, // 6 fields: project, task, tags, start, end, adjust
+		uuid:            uuid,
+		track:           track,
 	}
 
 	return p
 }
 
 func (p *TimeEditorPage) Init() tea.Cmd {
-	// Focus the first field (tags)
+	// Focus the first field (project picker)
 	p.currentField = 0
-	p.tagsInput.Focus()
-	return p.tagsInput.Init()
+	return p.projectPicker.Init()
 }
 
 func (p *TimeEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 
 	switch msg := msg.(type) {
+	case timeEditorProjectSelectedMsg:
+		// Project selection happens on Enter - advance to task picker
+		// (Auto-selection of project already happened in Update() switch)
+		p.blurCurrentField()
+		p.currentField = 1
+		cmds = append(cmds, p.focusCurrentField())
+		return p, tea.Batch(cmds...)
+
+	case timeEditorTaskSelectedMsg:
+		// Task selection happens on Enter - advance to tags field
+		// (Auto-selection of task already happened in Update() switch)
+		p.blurCurrentField()
+		p.currentField = 2
+		cmds = append(cmds, p.focusCurrentField())
+		return p, tea.Batch(cmds...)
+
 	case tea.KeyMsg:
 		switch {
 		case key.Matches(msg, p.common.Keymap.Back):
@@ -82,7 +254,31 @@ func (p *TimeEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return model, BackCmd
 
 		case key.Matches(msg, p.common.Keymap.Ok):
-			// Save and exit
+			// Handle Enter based on current field
+			if p.currentField == 0 {
+				// Project picker - let it handle Enter (will trigger projectSelectedMsg)
+				break
+			}
+
+			if p.currentField == 1 {
+				// Task picker - let it handle Enter (will trigger taskSelectedMsg)
+				break
+			}
+
+			if p.currentField == 2 {
+				// Tags field
+				if p.tagsInput.HasSuggestions() {
+					// Let autocomplete handle suggestion selection
+					break
+				}
+				// Tags confirmed without suggestions - advance to start timestamp
+				p.blurCurrentField()
+				p.currentField = 3
+				cmds = append(cmds, p.focusCurrentField())
+				return p, tea.Batch(cmds...)
+			}
+
+			// For all other fields (3-5: start, end, adjust), save and exit
 			p.saveInterval()
 			model, err := p.common.PopPage()
 			if err != nil {
@@ -111,25 +307,117 @@ func (p *TimeEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	// Update the currently focused field
 	var cmd tea.Cmd
 	switch p.currentField {
-	case 0:
+	case 0: // Project picker
+		// Track the previous project selection
+		previousProject := p.selectedProject
+
+		var model tea.Model
+		model, cmd = p.projectPicker.Update(msg)
+		if pk, ok := model.(*picker.Picker); ok {
+			p.projectPicker = pk
+		}
+
+		// Check if the highlighted project changed (auto-selection)
+		currentProject := p.projectPicker.GetValue()
+		if currentProject != previousProject && currentProject != "" {
+			// Update the selected project and refresh task picker
+			p.selectedProject = currentProject
+			// Clear task selection when project changes
+			p.selectedTask = nil
+			p.uuid = ""
+			// Create/update task picker for the new project
+			p.taskPicker = createTaskPickerForProject(p.common, currentProject, "")
+			// Refresh tag autocomplete with filtered combinations
+			cmds = append(cmds, p.updateTagSuggestions())
+		}
+	case 1: // Task picker
+		if p.taskPicker != nil {
+			// Track the previous task selection
+			var previousTaskDesc string
+			if p.selectedTask != nil {
+				previousTaskDesc = p.selectedTask.Description
+			}
+
+			var model tea.Model
+			model, cmd = p.taskPicker.Update(msg)
+			if pk, ok := model.(*picker.Picker); ok {
+				p.taskPicker = pk
+			}
+
+			// Check if the highlighted task changed (auto-selection)
+			currentTaskDesc := p.taskPicker.GetValue()
+			if currentTaskDesc != previousTaskDesc && currentTaskDesc != "" {
+				// Handle "(none)" selection - clear task state
+				if currentTaskDesc == "(none)" {
+					p.selectedTask = nil
+					p.uuid = ""
+					p.track = ""
+					// Don't clear tags - user might still want manual tags
+					// Refresh tag suggestions
+					cmds = append(cmds, p.updateTagSuggestions())
+				} else {
+					// Find and update the selected task
+					filters := []string{"+track", "status:pending"}
+					if p.selectedProject != "" {
+						filters = append(filters, "project:"+p.selectedProject)
+					}
+					tasks := p.common.TW.GetTasks(nil, filters...)
+					for _, task := range tasks {
+						if task.Description == currentTaskDesc {
+							// Update selected task
+							p.selectedTask = task
+							p.uuid = task.Uuid
+
+							// Build tags from task
+							tags := []string{}
+
+							// Add task description
+							if task.Description != "" {
+								tags = append(tags, task.Description)
+							}
+
+							// Add task tags (excluding "track" tag since it's preserved separately)
+							for _, tag := range task.Tags {
+								if tag != "track" {
+									tags = append(tags, tag)
+								}
+							}
+
+							// Store track tag if present
+							if task.HasTag("track") {
+								p.track = "track"
+							}
+
+							// Update tags input
+							p.tagsInput.SetValue(formatTags(tags))
+
+							// Refresh tag suggestions
+							cmds = append(cmds, p.updateTagSuggestions())
+							break
+						}
+					}
+				}
+			}
+		}
+	case 2: // Tags
 		var model tea.Model
 		model, cmd = p.tagsInput.Update(msg)
 		if ac, ok := model.(*autocomplete.Autocomplete); ok {
 			p.tagsInput = ac
 		}
-	case 1:
+	case 3: // Start
 		var model tea.Model
 		model, cmd = p.startEditor.Update(msg)
 		if editor, ok := model.(*timestampeditor.TimestampEditor); ok {
 			p.startEditor = editor
 		}
-	case 2:
+	case 4: // End
 		var model tea.Model
 		model, cmd = p.endEditor.Update(msg)
 		if editor, ok := model.(*timestampeditor.TimestampEditor); ok {
 			p.endEditor = editor
 		}
-	case 3:
+	case 5: // Adjust
 		// Handle adjust toggle with space/enter
 		if msg, ok := msg.(tea.KeyMsg); ok {
 			if msg.String() == " " || msg.String() == "enter" {
@@ -145,13 +433,20 @@ func (p *TimeEditorPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (p *TimeEditorPage) focusCurrentField() tea.Cmd {
 	switch p.currentField {
 	case 0:
+		return p.projectPicker.Init() // Picker doesn't have explicit Focus()
+	case 1:
+		if p.taskPicker != nil {
+			return p.taskPicker.Init()
+		}
+		return nil
+	case 2:
 		p.tagsInput.Focus()
 		return p.tagsInput.Init()
-	case 1:
-		return p.startEditor.Focus()
-	case 2:
-		return p.endEditor.Focus()
 	case 3:
+		return p.startEditor.Focus()
+	case 4:
+		return p.endEditor.Focus()
+	case 5:
 		// Adjust checkbox doesn't need focus action
 		return nil
 	}
@@ -161,12 +456,16 @@ func (p *TimeEditorPage) focusCurrentField() tea.Cmd {
 func (p *TimeEditorPage) blurCurrentField() {
 	switch p.currentField {
 	case 0:
-		p.tagsInput.Blur()
+		// Project picker doesn't have explicit Blur(), state handled by Update
 	case 1:
-		p.startEditor.Blur()
+		// Task picker doesn't have explicit Blur(), state handled by Update
 	case 2:
-		p.endEditor.Blur()
+		p.tagsInput.Blur()
 	case 3:
+		p.startEditor.Blur()
+	case 4:
+		p.endEditor.Blur()
+	case 5:
 		// Adjust checkbox doesn't need blur action
 	}
 }
@@ -179,10 +478,45 @@ func (p *TimeEditorPage) View() string {
 	sections = append(sections, titleStyle.Render("Edit Time Interval"))
 	sections = append(sections, "")
 
-	// Tags input (now first)
+	// Project picker (field 0)
+	if p.currentField == 0 {
+		sections = append(sections, p.projectPicker.View())
+	} else {
+		blurredLabelStyle := p.common.Styles.Form.Blurred.Title
+		sections = append(sections, blurredLabelStyle.Render("Project"))
+		sections = append(sections, lipgloss.NewStyle().Faint(true).Render(p.selectedProject))
+	}
+
+	sections = append(sections, "")
+	sections = append(sections, "")
+
+	// Task picker (field 1)
+	if p.currentField == 1 {
+		if p.taskPicker != nil {
+			sections = append(sections, p.taskPicker.View())
+		} else {
+			// No project selected yet
+			blurredLabelStyle := p.common.Styles.Form.Blurred.Title
+			sections = append(sections, blurredLabelStyle.Render("Task"))
+			sections = append(sections, lipgloss.NewStyle().Faint(true).Render("(select a project first)"))
+		}
+	} else {
+		blurredLabelStyle := p.common.Styles.Form.Blurred.Title
+		sections = append(sections, blurredLabelStyle.Render("Task"))
+		if p.selectedTask != nil {
+			sections = append(sections, lipgloss.NewStyle().Faint(true).Render(p.selectedTask.Description))
+		} else {
+			sections = append(sections, lipgloss.NewStyle().Faint(true).Render("(none)"))
+		}
+	}
+
+	sections = append(sections, "")
+	sections = append(sections, "")
+
+	// Tags input (field 2)
 	tagsLabelStyle := p.common.Styles.Form.Focused.Title
 	tagsLabel := tagsLabelStyle.Render("Tags")
-	if p.currentField == 0 {
+	if p.currentField == 2 {
 		sections = append(sections, tagsLabel)
 		sections = append(sections, p.tagsInput.View())
 		descStyle := p.common.Styles.Form.Focused.Description
@@ -196,15 +530,15 @@ func (p *TimeEditorPage) View() string {
 	sections = append(sections, "")
 	sections = append(sections, "")
 
-	// Start editor
+	// Start editor (field 3)
 	sections = append(sections, p.startEditor.View())
 	sections = append(sections, "")
 
-	// End editor
+	// End editor (field 4)
 	sections = append(sections, p.endEditor.View())
 	sections = append(sections, "")
 
-	// Adjust checkbox
+	// Adjust checkbox (field 5)
 	adjustLabelStyle := p.common.Styles.Form.Focused.Title
 	adjustLabel := adjustLabelStyle.Render("Adjust overlaps")
 
@@ -215,7 +549,7 @@ func (p *TimeEditorPage) View() string {
 		checkbox = "[ ]"
 	}
 
-	if p.currentField == 3 {
+	if p.currentField == 5 {
 		focusedStyle := lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("12"))
 		sections = append(sections, adjustLabel)
 		sections = append(sections, focusedStyle.Render(checkbox+" Auto-adjust overlapping intervals"))
@@ -232,7 +566,7 @@ func (p *TimeEditorPage) View() string {
 
 	// Help text
 	helpStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("8"))
-	sections = append(sections, helpStyle.Render("tab/shift+tab: navigate • enter: save • esc: cancel"))
+	sections = append(sections, helpStyle.Render("tab/shift+tab: navigate • enter: select/save • esc: cancel"))
 
 	return lipgloss.JoinVertical(lipgloss.Left, sections...)
 }
@@ -254,8 +588,29 @@ func (p *TimeEditorPage) saveInterval() {
 	p.interval.Start = p.startEditor.GetValueString()
 	p.interval.End = p.endEditor.GetValueString()
 
-	// Parse tags
-	p.interval.Tags = parseTags(p.tagsInput.GetValue())
+	// Parse display tags from input
+	displayTags := parseTags(p.tagsInput.GetValue())
+
+	// Reconstruct full tags array by combining special tags and display tags
+	var tags []string
+
+	// Add preserved special tags first
+	if p.uuid != "" {
+		tags = append(tags, "uuid:"+p.uuid)
+	}
+	if p.track != "" {
+		tags = append(tags, p.track)
+	}
+
+	// Add project tag
+	if p.selectedProject != "" {
+		tags = append(tags, "project:"+p.selectedProject)
+	}
+
+	// Add display tags (user-entered tags from the input field)
+	tags = append(tags, displayTags...)
+
+	p.interval.Tags = tags
 
 	err := p.common.TimeW.ModifyInterval(p.interval, p.adjust)
 	if err != nil {
@@ -298,3 +653,94 @@ func formatTags(tags []string) string {
 	}
 	return strings.Join(formatted, " ")
 }
+
+// extractSpecialTags separates special tags (uuid, project, track) from display tags
+// Returns uuid, project, track as separate strings, and displayTags for user editing
+func extractSpecialTags(tags []string) (uuid, project, track string, displayTags []string) {
+	for _, tag := range tags {
+		if strings.HasPrefix(tag, "uuid:") {
+			uuid = strings.TrimPrefix(tag, "uuid:")
+		} else if strings.HasPrefix(tag, "project:") {
+			project = strings.TrimPrefix(tag, "project:")
+		} else if tag == "track" {
+			track = tag
+		} else {
+			displayTags = append(displayTags, tag)
+		}
+	}
+	return
+}
+
+// extractProjectFromTags finds and removes the first tag that matches a known project
+// Returns the found project (or empty string) and the remaining tags
+// This is kept for backward compatibility but now uses extractSpecialTags internally
+func extractProjectFromTags(tags []string, projects []string) (string, []string) {
+	_, project, _, remaining := extractSpecialTags(tags)
+	return project, remaining
+}
+
+// ensureTagPresent adds a tag to the list if not already present
+func ensureTagPresent(tags []string, tag string) []string {
+	for _, t := range tags {
+		if t == tag {
+			return tags // Already present
+		}
+	}
+	return append(tags, tag)
+}
+
+// filterTagCombinationsByProject filters tag combinations to only show those
+// containing the exact project tag, and removes the project from the displayed combination
+func filterTagCombinationsByProject(combinations []string, project string) []string {
+	if project == "" {
+		return combinations
+	}
+
+	projectTag := "project:" + project
+
+	var filtered []string
+	for _, combo := range combinations {
+		// Parse the combination into individual tags
+		tags := parseTags(combo)
+
+		// Check if project exists in this combination
+		for _, tag := range tags {
+			if tag == projectTag {
+				// Found the project - now remove it from display
+				var displayTags []string
+				for _, t := range tags {
+					if t != projectTag {
+						displayTags = append(displayTags, t)
+					}
+				}
+				if len(displayTags) > 0 {
+					filtered = append(filtered, formatTags(displayTags))
+				}
+				break
+			}
+		}
+	}
+
+	return filtered
+}
+
+// updateTagSuggestions refreshes the tag autocomplete with filtered combinations
+func (p *TimeEditorPage) updateTagSuggestions() tea.Cmd {
+	combinations := filterTagCombinationsByProject(
+		p.common.TimeW.GetTagCombinations(),
+		p.selectedProject,
+	)
+
+	// Update autocomplete suggestions
+	currentValue := p.tagsInput.GetValue()
+	p.tagsInput.SetSuggestions(combinations)
+	p.tagsInput.SetValue(currentValue)
+
+	// If tags field is focused, refocus it
+	if p.currentField == 2 {
+		p.tagsInput.Focus()
+		return p.tagsInput.Init()
+	}
+
+	return nil
+}

pages/timePage.go

@@ -21,6 +21,7 @@ type TimePage struct {
 	data      timewarrior.Intervals
 
 	shouldSelectActive bool
+	pendingSyncAction  string // "start", "stop", or "" (empty means no pending action)
 
 	selectedTimespan string
 	subpage          common.Component
@@ -163,8 +164,27 @@ func (p *TimePage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case intervalsMsg:
 		p.data = timewarrior.Intervals(msg)
 		p.populateTable(p.data)
+
+		// If we have a pending sync action (from continuing an interval),
+		// execute it now that intervals are refreshed
+		if p.pendingSyncAction != "" {
+			action := p.pendingSyncAction
+			p.pendingSyncAction = ""
+			cmds = append(cmds, p.syncActiveIntervalAfterRefresh(action))
+		}
+	case TaskPickedMsg:
+		if msg.Task != nil && msg.Task.Status == "pending" {
+			p.common.TW.StopActiveTasks()
+			p.common.TW.StartTask(msg.Task)
+			cmds = append(cmds, p.getIntervals())
+			cmds = append(cmds, doTick())
+		}
 	case RefreshIntervalsMsg:
 		cmds = append(cmds, p.getIntervals())
+		cmds = append(cmds, doTick())
+	case BackMsg:
+		// Restart tick loop when returning from subpage
+		cmds = append(cmds, doTick())
 	case tickMsg:
 		cmds = append(cmds, p.getIntervals())
 		cmds = append(cmds, doTick())
@@ -178,17 +198,42 @@ func (p *TimePage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			cmd := p.subpage.Init()
 			p.common.PushPage(p)
 			return p.subpage, cmd
+		case key.Matches(msg, p.common.Keymap.PickProjectTask):
+			p.subpage = NewProjectTaskPickerPage(p.common)
+			cmd := p.subpage.Init()
+			p.common.PushPage(p)
+			return p.subpage, cmd
 		case key.Matches(msg, p.common.Keymap.StartStop):
 			row := p.intervals.SelectedRow()
 			if row != nil {
 				interval := (*timewarrior.Interval)(row)
+
+				// Validate interval before proceeding
+				if interval.IsGap {
+					slog.Debug("Cannot start/stop gap interval")
+					return p, nil
+				}
+
 				if interval.IsActive() {
+					// Stop tracking
 					p.common.TimeW.StopTracking()
+					// Sync: stop corresponding Taskwarrior task immediately (interval has UUID)
+					common.SyncIntervalToTask(interval, p.common.TW, "stop")
 				} else {
+					// Continue tracking - creates a NEW interval
+					slog.Info("Continuing interval for task sync",
+						"intervalID", interval.ID,
+						"hasUUID", timewarrior.ExtractUUID(interval.Tags) != "",
+						"uuid", timewarrior.ExtractUUID(interval.Tags))
 					p.common.TimeW.ContinueInterval(interval.ID)
 					p.shouldSelectActive = true
+					// Set pending sync action instead of syncing immediately
+					// This ensures we sync AFTER intervals are refreshed
+					p.pendingSyncAction = "start"
 				}
-				return p, tea.Batch(p.getIntervals(), doTick())
+				cmds = append(cmds, p.getIntervals())
+				cmds = append(cmds, doTick())
+				return p, tea.Batch(cmds...)
 			}
 		case key.Matches(msg, p.common.Keymap.Delete):
 			row := p.intervals.SelectedRow()
@@ -351,7 +396,8 @@ func (p *TimePage) populateTable(intervals timewarrior.Intervals) {
 		{Title: "Start", Name: startField, Width: startEndWidth},
 		{Title: "End", Name: endField, Width: startEndWidth},
 		{Title: "Duration", Name: "duration", Width: 10},
-		{Title: "Tags", Name: "tags", Width: 0}, // flexible width
+		{Title: "Project", Name: "project", Width: 0}, // flexible width
+		{Title: "Tags", Name: "tags", Width: 0},       // flexible width
 	}
 
 	// Calculate table height: total height - header (1 line) - blank line (1) - safety (1)
@@ -419,3 +465,34 @@ func (p *TimePage) getIntervals() tea.Cmd {
 		return intervalsMsg(intervals)
 	}
 }
+
+// syncActiveInterval creates a command that syncs the currently active interval to Taskwarrior
+func (p *TimePage) syncActiveInterval(action string) tea.Cmd {
+	return func() tea.Msg {
+		// Get the currently active interval
+		activeInterval := p.common.TimeW.GetActive()
+		if activeInterval != nil {
+			common.SyncIntervalToTask(activeInterval, p.common.TW, action)
+		}
+		return nil
+	}
+}
+
+// syncActiveIntervalAfterRefresh is called AFTER intervals have been refreshed
+// to ensure we're working with current data
+func (p *TimePage) syncActiveIntervalAfterRefresh(action string) tea.Cmd {
+	return func() tea.Msg {
+		// At this point, intervals have been refreshed, so GetActive() will work
+		activeInterval := p.common.TimeW.GetActive()
+		if activeInterval != nil {
+			slog.Info("Syncing active interval to task after refresh",
+				"action", action,
+				"intervalID", activeInterval.ID,
+				"hasUUID", timewarrior.ExtractUUID(activeInterval.Tags) != "")
+			common.SyncIntervalToTask(activeInterval, p.common.TW, action)
+		} else {
+			slog.Warn("No active interval found after refresh, cannot sync to task")
+		}
+		return nil
+	}
+}

taskwarrior/models.go

@@ -43,18 +43,18 @@ func (a Annotation) String() string {
 type Tasks []*Task
 
 type Task struct {
-	Id          int64  `json:"id,omitempty"`
-	Uuid        string `json:"uuid,omitempty"`
-	Description string `json:"description,omitempty"`
-	Project     string `json:"project"`
-	// Priority    string         `json:"priority"`
+	Id          int64          `json:"id,omitempty"`
+	Uuid        string         `json:"uuid,omitempty"`
+	Description string         `json:"description,omitempty"`
+	Project     string         `json:"project"`
+	Priority    string         `json:"priority,omitempty"`
 	Status      string         `json:"status,omitempty"`
 	Tags        []string       `json:"tags"`
 	VirtualTags []string       `json:"-"`
 	Depends     []string       `json:"depends,omitempty"`
 	DependsIds  string         `json:"-"`
 	Urgency     float32        `json:"urgency,omitempty"`
-	Parent      string         `json:"parent,omitempty"`
+	Parent      string         `json:"parenttask,omitempty"`
 	Due         string         `json:"due,omitempty"`
 	Wait        string         `json:"wait,omitempty"`
 	Scheduled   string         `json:"scheduled,omitempty"`
@@ -149,8 +149,8 @@ func (t *Task) GetString(fieldWFormat string) string {
 		}
 		return t.Project
 
-	// case "priority":
-	// 	return t.Priority
+	case "priority":
+		return t.Priority
 
 	case "status":
 		return t.Status
@@ -168,7 +168,7 @@ func (t *Task) GetString(fieldWFormat string) string {
 		}
 		return strings.Join(t.Tags, " ")
 
-	case "parent":
+	case "parenttask":
 		if format == "short" {
 			return t.Parent[:8]
 		}
@@ -233,7 +233,33 @@ func (t *Task) GetString(fieldWFormat string) string {
 	return ""
 }
 
-func (t *Task) GetDate(dateString string) time.Time {
+func (t *Task) GetDate(field string) time.Time {
+	var dateString string
+	switch field {
+	case "due":
+		dateString = t.Due
+	case "wait":
+		dateString = t.Wait
+	case "scheduled":
+		dateString = t.Scheduled
+	case "until":
+		dateString = t.Until
+	case "start":
+		dateString = t.Start
+	case "end":
+		dateString = t.End
+	case "entry":
+		dateString = t.Entry
+	case "modified":
+		dateString = t.Modified
+	default:
+		return time.Time{}
+	}
+
+	if dateString == "" {
+		return time.Time{}
+	}
+
 	dt, err := time.Parse(dtformat, dateString)
 	if err != nil {
 		slog.Error("Failed to parse time:", err)
@@ -291,7 +317,7 @@ func (t *Task) UnmarshalJSON(data []byte) error {
 	delete(m, "tags")
 	delete(m, "depends")
 	delete(m, "urgency")
-	delete(m, "parent")
+	delete(m, "parenttask")
 	delete(m, "due")
 	delete(m, "wait")
 	delete(m, "scheduled")

taskwarrior/models_test.go

@@ -0,0 +1,81 @@
+package taskwarrior
+
+import (
+	"testing"
+	"time"
+)
+
+func TestTask_GetString(t *testing.T) {
+	tests := []struct {
+		name         string
+		task         Task
+		fieldWFormat string
+		want         string
+	}{
+		{
+			name: "Priority",
+			task: Task{
+				Priority: "H",
+			},
+			fieldWFormat: "priority",
+			want:         "H",
+		},
+		{
+			name: "Description",
+			task: Task{
+				Description: "Buy milk",
+			},
+			fieldWFormat: "description.desc",
+			want:         "Buy milk",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.task.GetString(tt.fieldWFormat); got != tt.want {
+				t.Errorf("Task.GetString() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestTask_GetDate(t *testing.T) {
+	validDate := "20230101T120000Z"
+	parsedValid, _ := time.Parse("20060102T150405Z", validDate)
+
+	tests := []struct {
+		name  string
+		task  Task
+		field string
+		want  time.Time
+	}{
+		{
+			name: "Due date valid",
+			task: Task{
+				Due: validDate,
+			},
+			field: "due",
+			want:  parsedValid,
+		},
+		{
+			name:  "Due date empty",
+			task:  Task{},
+			field: "due",
+			want:  time.Time{},
+		},
+		{
+			name:  "Unknown field",
+			task:  Task{Due: validDate},
+			field: "unknown",
+			want:  time.Time{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.task.GetDate(tt.field); !got.Equal(tt.want) {
+				t.Errorf("Task.GetDate() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

taskwarrior/taskwarrior.go

@@ -98,6 +98,7 @@ type TaskWarrior interface {
 	DeleteTask(task *Task)
 	StartTask(task *Task)
 	StopTask(task *Task)
+	StopActiveTasks()
 	GetInformation(task *Task) string
 	AddTaskAnnotation(uuid string, annotation string)
 
@@ -127,6 +128,10 @@ func NewTaskSquire(configLocation string) *TaskSquire {
 		mutex:          sync.Mutex{},
 	}
 	ts.config = ts.extractConfig()
+	if ts.config == nil {
+		slog.Error("Failed to extract config - taskwarrior commands are failing. Check your taskrc file for syntax errors.")
+		return nil
+	}
 	ts.reports = ts.extractReports()
 	ts.contexts = ts.extractContexts()
 
@@ -146,7 +151,7 @@ func (ts *TaskSquire) GetTasks(report *Report, filter ...string) Tasks {
 
 	args := ts.defaultArgs
 
-	if report.Context {
+	if report != nil && report.Context {
 		for _, context := range ts.contexts {
 			if context.Active && context.Name != "none" {
 				args = append(args, context.ReadFilter)
@@ -159,7 +164,12 @@ func (ts *TaskSquire) GetTasks(report *Report, filter ...string) Tasks {
 		args = append(args, filter...)
 	}
 
-	cmd := exec.Command(twBinary, append(args, []string{"export", report.Name}...)...)
+	exportArgs := []string{"export"}
+	if report != nil && report.Name != "" {
+		exportArgs = append(exportArgs, report.Name)
+	}
+
+	cmd := exec.Command(twBinary, append(args, exportArgs...)...)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		slog.Error("Failed getting report:", err)
@@ -490,6 +500,33 @@ func (ts *TaskSquire) StopTask(task *Task) {
 	}
 }
 
+func (ts *TaskSquire) StopActiveTasks() {
+	ts.mutex.Lock()
+	defer ts.mutex.Unlock()
+
+	cmd := exec.Command(twBinary, append(ts.defaultArgs, []string{"+ACTIVE", "export"}...)...)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		slog.Error("Failed getting active tasks:", "error", err, "output", string(output))
+		return
+	}
+
+	tasks := make(Tasks, 0)
+	err = json.Unmarshal(output, &tasks)
+	if err != nil {
+		slog.Error("Failed unmarshalling active tasks:", err)
+		return
+	}
+
+	for _, task := range tasks {
+		cmd := exec.Command(twBinary, append(ts.defaultArgs, []string{"stop", task.Uuid}...)...)
+		err := cmd.Run()
+		if err != nil {
+			slog.Error("Failed stopping task:", err)
+		}
+	}
+}
+
 func (ts *TaskSquire) GetInformation(task *Task) string {
 	ts.mutex.Lock()
 	defer ts.mutex.Unlock()
@@ -519,7 +556,7 @@ func (ts *TaskSquire) extractConfig() *TWConfig {
 	cmd := exec.Command(twBinary, append(ts.defaultArgs, []string{"_show"}...)...)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		slog.Error("Failed getting config:", err)
+		slog.Error("Failed getting config", "error", err, "output", string(output))
 		return nil
 	}
 
@@ -577,7 +614,7 @@ func (ts *TaskSquire) extractContexts() Contexts {
 
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		slog.Error("Failed getting contexts:", err)
+		slog.Error("Failed getting contexts", "error", err, "output", string(output))
 		return nil
 	}
 

taskwarrior/tree.go

@@ -0,0 +1,127 @@
+package taskwarrior
+
+import (
+	"log/slog"
+)
+
+// TaskNode represents a task in the tree structure
+type TaskNode struct {
+	Task     *Task
+	Children []*TaskNode
+	Parent   *TaskNode
+	Depth    int
+}
+
+// TaskTree manages the hierarchical task structure
+type TaskTree struct {
+	Nodes    map[string]*TaskNode // UUID -> TaskNode
+	Roots    []*TaskNode          // Top-level tasks (no parent)
+	FlatList []*TaskNode          // Flattened tree in display order
+}
+
+// BuildTaskTree constructs a tree from a flat list of tasks
+// Three-pass algorithm:
+// 1. Create all nodes
+// 2. Establish parent-child relationships
+// 3. Calculate depths and flatten tree
+func BuildTaskTree(tasks Tasks) *TaskTree {
+	tree := &TaskTree{
+		Nodes:    make(map[string]*TaskNode),
+		Roots:    make([]*TaskNode, 0),
+		FlatList: make([]*TaskNode, 0),
+	}
+
+	// Pass 1: Create all nodes
+	for _, task := range tasks {
+		node := &TaskNode{
+			Task:     task,
+			Children: make([]*TaskNode, 0),
+			Parent:   nil,
+			Depth:    0,
+		}
+		tree.Nodes[task.Uuid] = node
+	}
+
+	// Pass 2: Establish parent-child relationships
+	// Iterate over original tasks slice to preserve order
+	for _, task := range tasks {
+		node := tree.Nodes[task.Uuid]
+		parentUUID := getParentUUID(node.Task)
+		if parentUUID == "" {
+			// No parent, this is a root task
+			tree.Roots = append(tree.Roots, node)
+		} else {
+			// Find parent node
+			parentNode, exists := tree.Nodes[parentUUID]
+			if !exists {
+				// Orphaned task - missing parent
+				slog.Warn("Task has missing parent",
+					"task_uuid", node.Task.Uuid,
+					"parent_uuid", parentUUID,
+					"task_desc", node.Task.Description)
+				// Treat as root (graceful degradation)
+				tree.Roots = append(tree.Roots, node)
+			} else {
+				// Establish relationship
+				node.Parent = parentNode
+				parentNode.Children = append(parentNode.Children, node)
+			}
+		}
+	}
+
+	// Pass 3: Calculate depths and flatten tree
+	for _, root := range tree.Roots {
+		flattenNode(root, 0, &tree.FlatList)
+	}
+
+	return tree
+}
+
+// getParentUUID extracts the parent UUID from a task's UDAs
+func getParentUUID(task *Task) string {
+	if task.Udas == nil {
+		return ""
+	}
+
+	parentVal, exists := task.Udas["parenttask"]
+	if !exists {
+		return ""
+	}
+
+	// Parent UDA is stored as a string
+	if parentStr, ok := parentVal.(string); ok {
+		return parentStr
+	}
+
+	return ""
+}
+
+// flattenNode recursively flattens the tree in depth-first order
+func flattenNode(node *TaskNode, depth int, flatList *[]*TaskNode) {
+	node.Depth = depth
+	*flatList = append(*flatList, node)
+
+	// Recursively flatten children
+	for _, child := range node.Children {
+		flattenNode(child, depth+1, flatList)
+	}
+}
+
+// GetChildrenStatus returns completed/total counts for a parent task
+func (tn *TaskNode) GetChildrenStatus() (completed int, total int) {
+	total = len(tn.Children)
+	completed = 0
+
+	for _, child := range tn.Children {
+		if child.Task.Status == "completed" {
+			completed++
+		}
+	}
+
+	return completed, total
+}
+
+// HasChildren returns true if the node has any children
+func (tn *TaskNode) HasChildren() bool {
+	return len(tn.Children) > 0
+}

taskwarrior/tree_test.go

@@ -0,0 +1,345 @@
+package taskwarrior
+
+import (
+	"testing"
+)
+
+func TestBuildTaskTree_EmptyList(t *testing.T) {
+	tasks := Tasks{}
+	tree := BuildTaskTree(tasks)
+
+	if tree == nil {
+		t.Fatal("Expected tree to be non-nil")
+	}
+
+	if len(tree.Nodes) != 0 {
+		t.Errorf("Expected 0 nodes, got %d", len(tree.Nodes))
+	}
+
+	if len(tree.Roots) != 0 {
+		t.Errorf("Expected 0 roots, got %d", len(tree.Roots))
+	}
+
+	if len(tree.FlatList) != 0 {
+		t.Errorf("Expected 0 items in flat list, got %d", len(tree.FlatList))
+	}
+}
+
+func TestBuildTaskTree_NoParents(t *testing.T) {
+	tasks := Tasks{
+		{Uuid: "task1", Description: "Task 1", Status: "pending"},
+		{Uuid: "task2", Description: "Task 2", Status: "pending"},
+		{Uuid: "task3", Description: "Task 3", Status: "completed"},
+	}
+
+	tree := BuildTaskTree(tasks)
+
+	if len(tree.Nodes) != 3 {
+		t.Errorf("Expected 3 nodes, got %d", len(tree.Nodes))
+	}
+
+	if len(tree.Roots) != 3 {
+		t.Errorf("Expected 3 roots (all tasks have no parent), got %d", len(tree.Roots))
+	}
+
+	if len(tree.FlatList) != 3 {
+		t.Errorf("Expected 3 items in flat list, got %d", len(tree.FlatList))
+	}
+
+	// All tasks should have depth 0
+	for i, node := range tree.FlatList {
+		if node.Depth != 0 {
+			t.Errorf("Task %d expected depth 0, got %d", i, node.Depth)
+		}
+		if node.HasChildren() {
+			t.Errorf("Task %d should not have children", i)
+		}
+	}
+}
+
+func TestBuildTaskTree_SimpleParentChild(t *testing.T) {
+	tasks := Tasks{
+		{Uuid: "parent1", Description: "Parent Task", Status: "pending"},
+		{
+			Uuid:        "child1",
+			Description: "Child Task 1",
+			Status:      "pending",
+			Udas:        map[string]any{"parenttask": "parent1"},
+		},
+		{
+			Uuid:        "child2",
+			Description: "Child Task 2",
+			Status:      "completed",
+			Udas:        map[string]any{"parenttask": "parent1"},
+		},
+	}
+
+	tree := BuildTaskTree(tasks)
+
+	if len(tree.Nodes) != 3 {
+		t.Fatalf("Expected 3 nodes, got %d", len(tree.Nodes))
+	}
+
+	if len(tree.Roots) != 1 {
+		t.Fatalf("Expected 1 root, got %d", len(tree.Roots))
+	}
+
+	// Check root is the parent
+	root := tree.Roots[0]
+	if root.Task.Uuid != "parent1" {
+		t.Errorf("Expected root to be parent1, got %s", root.Task.Uuid)
+	}
+
+	// Check parent has 2 children
+	if len(root.Children) != 2 {
+		t.Fatalf("Expected parent to have 2 children, got %d", len(root.Children))
+	}
+
+	// Check children status
+	completed, total := root.GetChildrenStatus()
+	if total != 2 {
+		t.Errorf("Expected total children = 2, got %d", total)
+	}
+	if completed != 1 {
+		t.Errorf("Expected completed children = 1, got %d", completed)
+	}
+
+	// Check flat list order (parent first, then children)
+	if len(tree.FlatList) != 3 {
+		t.Fatalf("Expected 3 items in flat list, got %d", len(tree.FlatList))
+	}
+
+	if tree.FlatList[0].Task.Uuid != "parent1" {
+		t.Errorf("Expected first item to be parent, got %s", tree.FlatList[0].Task.Uuid)
+	}
+
+	if tree.FlatList[0].Depth != 0 {
+		t.Errorf("Expected parent depth = 0, got %d", tree.FlatList[0].Depth)
+	}
+
+	// Children should be at depth 1
+	for i := 1; i < 3; i++ {
+		if tree.FlatList[i].Depth != 1 {
+			t.Errorf("Expected child %d depth = 1, got %d", i, tree.FlatList[i].Depth)
+		}
+		if tree.FlatList[i].Parent == nil {
+			t.Errorf("Child %d should have a parent", i)
+		} else if tree.FlatList[i].Parent.Task.Uuid != "parent1" {
+			t.Errorf("Child %d parent should be parent1, got %s", i, tree.FlatList[i].Parent.Task.Uuid)
+		}
+	}
+}
+
+func TestBuildTaskTree_MultiLevel(t *testing.T) {
+	tasks := Tasks{
+		{Uuid: "grandparent", Description: "Grandparent", Status: "pending"},
+		{
+			Uuid:        "parent1",
+			Description: "Parent 1",
+			Status:      "pending",
+			Udas:        map[string]any{"parenttask": "grandparent"},
+		},
+		{
+			Uuid:        "parent2",
+			Description: "Parent 2",
+			Status:      "pending",
+			Udas:        map[string]any{"parenttask": "grandparent"},
+		},
+		{
+			Uuid:        "child1",
+			Description: "Child 1",
+			Status:      "pending",
+			Udas:        map[string]any{"parenttask": "parent1"},
+		},
+		{
+			Uuid:        "grandchild1",
+			Description: "Grandchild 1",
+			Status:      "completed",
+			Udas:        map[string]any{"parenttask": "child1"},
+		},
+	}
+
+	tree := BuildTaskTree(tasks)
+
+	if len(tree.Nodes) != 5 {
+		t.Fatalf("Expected 5 nodes, got %d", len(tree.Nodes))
+	}
+
+	if len(tree.Roots) != 1 {
+		t.Fatalf("Expected 1 root, got %d", len(tree.Roots))
+	}
+
+	// Find nodes by UUID
+	grandparentNode := tree.Nodes["grandparent"]
+	parent1Node := tree.Nodes["parent1"]
+	child1Node := tree.Nodes["child1"]
+	grandchildNode := tree.Nodes["grandchild1"]
+
+	// Check depths
+	if grandparentNode.Depth != 0 {
+		t.Errorf("Expected grandparent depth = 0, got %d", grandparentNode.Depth)
+	}
+	if parent1Node.Depth != 1 {
+		t.Errorf("Expected parent1 depth = 1, got %d", parent1Node.Depth)
+	}
+	if child1Node.Depth != 2 {
+		t.Errorf("Expected child1 depth = 2, got %d", child1Node.Depth)
+	}
+	if grandchildNode.Depth != 3 {
+		t.Errorf("Expected grandchild depth = 3, got %d", grandchildNode.Depth)
+	}
+
+	// Check parent-child relationships
+	if len(grandparentNode.Children) != 2 {
+		t.Errorf("Expected grandparent to have 2 children, got %d", len(grandparentNode.Children))
+	}
+
+	if len(parent1Node.Children) != 1 {
+		t.Errorf("Expected parent1 to have 1 child, got %d", len(parent1Node.Children))
+	}
+
+	if len(child1Node.Children) != 1 {
+		t.Errorf("Expected child1 to have 1 child, got %d", len(child1Node.Children))
+	}
+
+	if grandchildNode.HasChildren() {
+		t.Error("Expected grandchild to have no children")
+	}
+
+	// Check flat list maintains tree order
+	if len(tree.FlatList) != 5 {
+		t.Fatalf("Expected 5 items in flat list, got %d", len(tree.FlatList))
+	}
+
+	// Grandparent should be first
+	if tree.FlatList[0].Task.Uuid != "grandparent" {
+		t.Errorf("Expected first item to be grandparent, got %s", tree.FlatList[0].Task.Uuid)
+	}
+}
+
+func TestBuildTaskTree_OrphanedTask(t *testing.T) {
+	tasks := Tasks{
+		{Uuid: "task1", Description: "Normal Task", Status: "pending"},
+		{
+			Uuid:        "orphan",
+			Description: "Orphaned Task",
+			Status:      "pending",
+			Udas:        map[string]any{"parenttask": "nonexistent"},
+		},
+	}
+
+	tree := BuildTaskTree(tasks)
+
+	if len(tree.Nodes) != 2 {
+		t.Fatalf("Expected 2 nodes, got %d", len(tree.Nodes))
+	}
+
+	// Orphaned task should be treated as root
+	if len(tree.Roots) != 2 {
+		t.Errorf("Expected 2 roots (orphan should be treated as root), got %d", len(tree.Roots))
+	}
+
+	// Both should have depth 0
+	for _, node := range tree.FlatList {
+		if node.Depth != 0 {
+			t.Errorf("Expected all tasks to have depth 0, got %d for %s", node.Depth, node.Task.Description)
+		}
+	}
+}
+
+func TestTaskNode_GetChildrenStatus(t *testing.T) {
+	tests := []struct {
+		name      string
+		children  []*TaskNode
+		wantComp  int
+		wantTotal int
+	}{
+		{
+			name:      "no children",
+			children:  []*TaskNode{},
+			wantComp:  0,
+			wantTotal: 0,
+		},
+		{
+			name: "all pending",
+			children: []*TaskNode{
+				{Task: &Task{Status: "pending"}},
+				{Task: &Task{Status: "pending"}},
+			},
+			wantComp:  0,
+			wantTotal: 2,
+		},
+		{
+			name: "all completed",
+			children: []*TaskNode{
+				{Task: &Task{Status: "completed"}},
+				{Task: &Task{Status: "completed"}},
+				{Task: &Task{Status: "completed"}},
+			},
+			wantComp:  3,
+			wantTotal: 3,
+		},
+		{
+			name: "mixed status",
+			children: []*TaskNode{
+				{Task: &Task{Status: "completed"}},
+				{Task: &Task{Status: "pending"}},
+				{Task: &Task{Status: "completed"}},
+				{Task: &Task{Status: "pending"}},
+				{Task: &Task{Status: "completed"}},
+			},
+			wantComp:  3,
+			wantTotal: 5,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			node := &TaskNode{
+				Task:     &Task{},
+				Children: tt.children,
+			}
+
+			gotComp, gotTotal := node.GetChildrenStatus()
+
+			if gotComp != tt.wantComp {
+				t.Errorf("GetChildrenStatus() completed = %d, want %d", gotComp, tt.wantComp)
+			}
+			if gotTotal != tt.wantTotal {
+				t.Errorf("GetChildrenStatus() total = %d, want %d", gotTotal, tt.wantTotal)
+			}
+		})
+	}
+}
+
+func TestTaskNode_HasChildren(t *testing.T) {
+	tests := []struct {
+		name     string
+		children []*TaskNode
+		want     bool
+	}{
+		{
+			name:     "no children",
+			children: []*TaskNode{},
+			want:     false,
+		},
+		{
+			name:     "has children",
+			children: []*TaskNode{{Task: &Task{}}},
+			want:     true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			node := &TaskNode{
+				Task:     &Task{},
+				Children: tt.children,
+			}
+
+			if got := node.HasChildren(); got != tt.want {
+				t.Errorf("HasChildren() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

timewarrior/models.go

@@ -83,7 +83,16 @@ func (i *Interval) GetString(field string) string {
 		if len(i.Tags) == 0 {
 			return ""
 		}
-		return strings.Join(i.Tags, " ")
+		// Extract and filter special tags (uuid:, project:)
+		_, _, displayTags := ExtractSpecialTags(i.Tags)
+		return strings.Join(displayTags, " ")
+
+	case "project":
+		project := ExtractProject(i.Tags)
+		if project == "" {
+			return "(none)"
+		}
+		return project
 
 	case "duration":
 		return i.GetDuration()

timewarrior/tags.go

@@ -0,0 +1,54 @@
+package timewarrior
+
+import (
+	"strings"
+)
+
+// Special tag prefixes for metadata
+const (
+	UUIDPrefix    = "uuid:"
+	ProjectPrefix = "project:"
+)
+
+// ExtractSpecialTags parses tags and separates special prefixed tags from display tags.
+// Returns: uuid, project, and remaining display tags (description + user tags)
+func ExtractSpecialTags(tags []string) (uuid string, project string, displayTags []string) {
+	displayTags = make([]string, 0, len(tags))
+
+	for _, tag := range tags {
+		switch {
+		case strings.HasPrefix(tag, UUIDPrefix):
+			uuid = strings.TrimPrefix(tag, UUIDPrefix)
+		case strings.HasPrefix(tag, ProjectPrefix):
+			project = strings.TrimPrefix(tag, ProjectPrefix)
+		case tag == "track":
+			// Skip the "track" tag - it's internal metadata
+			continue
+		default:
+			// Regular tag (description or user tag)
+			displayTags = append(displayTags, tag)
+		}
+	}
+
+	return uuid, project, displayTags
+}
+
+// ExtractUUID extracts just the UUID from tags (for sync operations)
+func ExtractUUID(tags []string) string {
+	for _, tag := range tags {
+		if strings.HasPrefix(tag, UUIDPrefix) {
+			return strings.TrimPrefix(tag, UUIDPrefix)
+		}
+	}
+	return ""
+}
+
+// ExtractProject extracts just the project name from tags
+func ExtractProject(tags []string) string {
+	for _, tag := range tags {
+		if strings.HasPrefix(tag, ProjectPrefix) {
+			return strings.TrimPrefix(tag, ProjectPrefix)
+		}
+	}
+	return ""
+}

timewarrior/timewarrior.go

@@ -142,10 +142,9 @@ func formatTagsForCombination(tags []string) string {
 	return strings.Join(formatted, " ")
 }
 
-func (ts *TimeSquire) GetIntervals(filter ...string) Intervals {
-	ts.mutex.Lock()
-	defer ts.mutex.Unlock()
-
+// getIntervalsUnlocked fetches intervals without acquiring mutex (for internal use only).
+// Caller must hold ts.mutex.
+func (ts *TimeSquire) getIntervalsUnlocked(filter ...string) Intervals {
 	args := append(ts.defaultArgs, "export")
 	if filter != nil {
 		args = append(args, filter...)
@@ -176,6 +175,14 @@ func (ts *TimeSquire) GetIntervals(filter ...string) Intervals {
 	return intervals
 }
 
+// GetIntervals fetches intervals with the given filter, acquiring mutex lock.
+func (ts *TimeSquire) GetIntervals(filter ...string) Intervals {
+	ts.mutex.Lock()
+	defer ts.mutex.Unlock()
+
+	return ts.getIntervalsUnlocked(filter...)
+}
+
 func (ts *TimeSquire) StartTracking(tags []string) error {
 	ts.mutex.Lock()
 	defer ts.mutex.Unlock()
@@ -347,8 +354,8 @@ func (ts *TimeSquire) GetActive() *Interval {
 		return nil
 	}
 
-	// Get the active interval
-	intervals := ts.GetIntervals()
+	// Get the active interval using unlocked version (we already hold the mutex)
+	intervals := ts.getIntervalsUnlocked()
 	for _, interval := range intervals {
 		if interval.End == "" {
 			return interval