@taskmark/ui 0.2.6 → 0.3.1

package/lib/taskmark/overall-tree.ts

@@ -0,0 +1,194 @@
+import type { ContributorIdentity } from "@/lib/taskmark/identity"
+import type { EpicSummary, ProjectEpicList } from "@/lib/taskmark/epic-types"
+import type {
+  EpicWorkItemsList,
+  WorkItemsViewRow,
+} from "@/lib/taskmark/flat-work-item-types"
+import type { ItemSummary, StoryItemList } from "@/lib/taskmark/item-types"
+import { isGeneralEpic } from "@/lib/taskmark/general-epic"
+import {
+  matchesWorkItemSearch,
+  type TimeframeFilterState,
+} from "@/lib/taskmark/list-filters"
+import { passesTimeframeFilter } from "@/lib/taskmark/timeframe-filters"
+
+export type OverallTreeNode = {
+  kind: "epic" | "story" | "task" | "bug"
+  id: string
+  title: string
+  status: string
+  size: string
+  points: number | null
+  tags: string[]
+  reporters: ContributorIdentity[]
+  resolvers: ContributorIdentity[]
+  created: string
+  updated: string
+  completedAt: string
+  filePath: string
+  children: OverallTreeNode[]
+  workItemCount: number
+  doneWorkItemCount: number
+}
+
+export function isOverallNodeComplete(status: string): boolean {
+  const normalized = status.trim().toLowerCase()
+  return (
+    normalized === "done" ||
+    normalized === "shelved" ||
+    normalized === "cancelled"
+  )
+}
+
+function timestamp(value: string): number {
+  const parsed = Date.parse(value)
+  return Number.isFinite(parsed) ? parsed : 0
+}
+
+/** Incomplete first, then created/updated newest-first, then id. */
+export function compareOverallNodes(
+  a: Pick<OverallTreeNode, "status" | "created" | "updated" | "id">,
+  b: Pick<OverallTreeNode, "status" | "created" | "updated" | "id">
+): number {
+  const completion = Number(isOverallNodeComplete(a.status)) -
+    Number(isOverallNodeComplete(b.status))
+  if (completion !== 0) return completion
+  const created = timestamp(b.created) - timestamp(a.created)
+  if (created !== 0) return created
+  const updated = timestamp(b.updated) - timestamp(a.updated)
+  if (updated !== 0) return updated
+  return a.id.localeCompare(b.id)
+}
+
+function itemNode(item: ItemSummary): OverallTreeNode {
+  return {
+    kind: item.type,
+    id: item.id,
+    title: item.title,
+    status: item.status,
+    size: item.size,
+    points: item.points,
+    tags: item.tags,
+    reporters: item.reporters,
+    resolvers: item.resolvers,
+    created: item.created,
+    updated: item.updated,
+    completedAt: item.completedAt,
+    filePath: item.filePath,
+    children: [],
+    workItemCount: 0,
+    doneWorkItemCount: 0,
+  }
+}
+
+function workItemNode(
+  row: WorkItemsViewRow,
+  storyItems: StoryItemList | undefined
+): OverallTreeNode {
+  const children =
+    row.kind === "story"
+      ? (storyItems?.items ?? []).map(itemNode).sort(compareOverallNodes)
+      : []
+  return {
+    kind: row.kind,
+    id: row.id,
+    title: row.title,
+    status: row.status,
+    size: row.size,
+    points: row.points,
+    tags: row.tags,
+    reporters: row.reporters,
+    resolvers: row.resolvers,
+    created: row.created,
+    updated: row.updated,
+    completedAt: row.completedAt,
+    filePath: row.filePath,
+    children,
+    workItemCount: row.workItemCount,
+    doneWorkItemCount: row.doneWorkItemCount,
+  }
+}
+
+function epicNode(
+  epic: EpicSummary,
+  workItems: EpicWorkItemsList | undefined,
+  itemsByStory: Record<string, StoryItemList>
+): OverallTreeNode {
+  const children = (workItems?.rows ?? [])
+    .map((row) => workItemNode(row, itemsByStory[`${epic.id}::${row.id}`]))
+    .sort(compareOverallNodes)
+  return {
+    kind: "epic",
+    id: epic.id,
+    title: epic.title,
+    status: epic.status,
+    size: epic.size,
+    points: epic.points,
+    tags: epic.tags,
+    reporters: epic.reporters,
+    resolvers: epic.resolvers,
+    created: epic.created,
+    updated: epic.updated,
+    completedAt: epic.completedAt,
+    filePath: epic.filePath,
+    children,
+    workItemCount: epic.workItemCount,
+    doneWorkItemCount: epic.doneWorkItemCount,
+  }
+}
+
+export function buildOverallTree(
+  epicList: ProjectEpicList,
+  workItemsByEpic: Record<string, EpicWorkItemsList>,
+  itemsByStory: Record<string, StoryItemList>
+): OverallTreeNode[] {
+  return epicList.epics
+    .filter((epic) => !(isGeneralEpic(epic) && epic.workItemCount === 0))
+    .map((epic) => epicNode(epic, workItemsByEpic[epic.id], itemsByStory))
+    .sort(compareOverallNodes)
+}
+
+export type OverallTreeFilters = {
+  query: string
+  hideCompleted: boolean
+  timeframe: TimeframeFilterState
+}
+
+/**
+ * Retain a node when it matches itself or has a matching descendant. This
+ * preserves hierarchy context for search, completed filtering, and timeframe.
+ */
+export function filterOverallTree(
+  nodes: readonly OverallTreeNode[],
+  filters: OverallTreeFilters
+): OverallTreeNode[] {
+  return nodes.flatMap((node) => {
+    const children = filterOverallTree(node.children, filters)
+    const selfMatches =
+      matchesWorkItemSearch(filters.query, node) &&
+      (!filters.hideCompleted || !isOverallNodeComplete(node.status)) &&
+      passesTimeframeFilter(filters.timeframe, node.completedAt)
+    if (!selfMatches && children.length === 0) return []
+    return [{ ...node, children }]
+  })
+}
+
+export function collectExpandableAncestorIds(
+  nodes: readonly OverallTreeNode[]
+): string[] {
+  return nodes.flatMap((node) => [
+    ...(node.children.length > 0 ? [node.id] : []),
+    ...collectExpandableAncestorIds(node.children),
+  ])
+}
+
+/**
+ * Only a search reveals matches by expanding their ancestors. Toggle filters
+ * such as hide-completed and timeframe keep whatever the user has open.
+ */
+export function searchRevealIds(
+  nodes: readonly OverallTreeNode[],
+  query: string
+): string[] {
+  return query.trim() ? collectExpandableAncestorIds(nodes) : []
+}

package/lib/taskmark/parse-detail.ts

@@ -5,7 +5,7 @@ import {
   extractFrontmatter,
 } from "@/lib/taskmark/frontmatter"
 import { asContributorList } from "@/lib/taskmark/identity"
-import { readTimingFields } from "@/lib/taskmark/timing"
+import { readActualTimingFromWorkLog } from "@/lib/taskmark/timing"
 import type {
   CommitRow,
   EpicDetail,
@@ -85,6 +85,7 @@ function resolveKind(
 
 function buildMeta(
   frontmatter: Record<string, unknown>,
+  raw: string,
   filePath: string,
   kind: WorkItemKind
 ): WorkItemMeta | null {
@@ -92,7 +93,7 @@ function buildMeta(
   const title = asString(frontmatter.title)
   if (!id || !title) return null
 
-  const timing = readTimingFields(frontmatter)
+  const timing = readActualTimingFromWorkLog(raw)
   return {
     id,
     title,
@@ -101,11 +102,9 @@ function buildMeta(
     priority: asString(frontmatter.priority, "medium"),
     size: asString(frontmatter.size, "—"),
     points: asNumberOrNull(frontmatter.points),
-    estimateMinutes: timing.estimateMinutes,
     actualMinutes: timing.actualMinutes,
     actualMs: timing.actualMs,
     tags: asStringArray(frontmatter.tags),
-    owner: asString(frontmatter.owner),
     reporters: asContributorList(frontmatter.reporters),
     resolvers: asContributorList(frontmatter.resolvers),
     blocked: asBool(frontmatter.blocked),
@@ -147,7 +146,7 @@ export function parseWorkItemDetailFromRaw(
 
   const id = asString(frontmatter.id)
   const kind = resolveKind(frontmatter, id, hint)
-  const meta = buildMeta(frontmatter, filePath, kind)
+  const meta = buildMeta(frontmatter, raw, filePath, kind)
   if (!meta) {
     return {
       ok: false,
@@ -169,6 +168,7 @@ export function parseWorkItemDetailFromRaw(
       successMetrics: getSection(sections, "Success metrics"),
       storiesMarkdown: getSection(sections, "Stories"),
       children: [],
+      promptFeedback: [],
       commits: parseCommits(getSection(sections, "Commits")),
       workLog: parseWorkLog(getSection(sections, "Work log")),
     }

package/lib/taskmark/parse-epics.ts

@@ -8,15 +8,14 @@ import type {
   ProjectEpicList,
 } from "@/lib/taskmark/epic-types"
 import {
-  asNumberOrNull,
   asString,
   asStringArray,
   extractFrontmatter,
 } from "@/lib/taskmark/frontmatter"
 import { asContributorList } from "@/lib/taskmark/identity"
-import { readTimingFields } from "@/lib/taskmark/timing"
 import { sortEpicsGeneralFirst } from "@/lib/taskmark/general-epic"
-import { progressUnderEpic } from "@/lib/taskmark/count-leaves"
+import { deriveParentRollup } from "@/lib/taskmark/derive-parents"
+import type { BoardIndex } from "@/lib/taskmark/board-index"
 
 function listEpicMarkdownFiles(boardPath: string): string[] {
   const epicsDir = path.join(boardPath, "epics")
@@ -41,7 +40,8 @@ function listEpicMarkdownFiles(boardPath: string): string[] {
 
 function parseEpicFile(
   filePath: string,
-  project: DiscoveredProject
+  project: DiscoveredProject,
+  index?: BoardIndex
 ): { epic?: EpicSummary; error?: EpicParseError } {
   let raw: string
   try {
@@ -96,24 +96,26 @@ function parseEpicFile(
     }
   }
 
-  const progress = progressUnderEpic(project.boardPath, id)
+  const derived = deriveParentRollup(project.boardPath, id, "epic", index)
 
   return {
     epic: {
       id,
       title,
-      status: asString(frontmatter.status, "unknown"),
+      status: derived.status,
       priority: asString(frontmatter.priority, "medium"),
-      size: asString(frontmatter.size, "—"),
-      points: asNumberOrNull(frontmatter.points),
-      ...readTimingFields(frontmatter),
+      size: derived.size,
+      points: derived.points,
+      actualMinutes: derived.actualMinutes,
+      actualMs: derived.actualMs,
       tags: asStringArray(frontmatter.tags),
       reporters: asContributorList(frontmatter.reporters),
-      resolvers: asContributorList(frontmatter.resolvers),
+      resolvers: derived.resolvers,
       created: asString(frontmatter.created),
-      completedAt: asString(frontmatter.completed_at),
-      workItemCount: progress.total,
-      doneWorkItemCount: progress.done,
+      updated: asString(frontmatter.updated),
+      completedAt: derived.completedAt,
+      workItemCount: derived.leafCount,
+      doneWorkItemCount: derived.doneLeafCount,
       filePath,
       project: {
         id: project.id,
@@ -127,14 +129,15 @@ function parseEpicFile(
 
 /** Parse all epics under a project's board root (nested taskmark/ or flat *-taskmark). */
 export function parseEpicsForProject(
-  project: DiscoveredProject
+  project: DiscoveredProject,
+  index?: BoardIndex
 ): ProjectEpicList {
   const files = listEpicMarkdownFiles(project.boardPath)
   const epics: EpicSummary[] = []
   const errors: EpicParseError[] = []
 
   for (const filePath of files) {
-    const result = parseEpicFile(filePath, project)
+    const result = parseEpicFile(filePath, project, index)
     if (result.epic) epics.push(result.epic)
     if (result.error) errors.push(result.error)
   }
@@ -149,5 +152,5 @@ export function parseEpicsForProject(
 export function parseEpicsForProjects(
   projects: DiscoveredProject[]
 ): ProjectEpicList[] {
-  return projects.map(parseEpicsForProject)
+  return projects.map((project) => parseEpicsForProject(project))
 }

package/lib/taskmark/parse-flat-lists.ts

@@ -11,6 +11,7 @@ import type {
   WorkItemsViewRow,
 } from "@/lib/taskmark/flat-work-item-types"
 import { compareByStatusThenPriority } from "@/lib/taskmark/list-view-mode"
+import type { BoardIndex } from "@/lib/taskmark/board-index"
 import { parseEpicsForProject } from "@/lib/taskmark/parse-epics"
 import { parseItemsForEpic, parseItemsForStory } from "@/lib/taskmark/parse-items"
 import { parseStoriesForEpic } from "@/lib/taskmark/parse-stories"
@@ -19,9 +20,10 @@ import { parseStoriesForEpic } from "@/lib/taskmark/parse-stories"
  * Flat table of every epic, story, and task/bug on the active board.
  */
 export function parseAllWorkItemsForProject(
-  project: DiscoveredProject
+  project: DiscoveredProject,
+  index?: BoardIndex
 ): FlatWorkItemList {
-  const epicList = parseEpicsForProject(project)
+  const epicList = parseEpicsForProject(project, index)
   const rows: FlatWorkItemRow[] = []
   const errors: FlatWorkItemList["errors"] = epicList.errors.map((e) => ({
     filePath: e.filePath,
@@ -37,7 +39,6 @@ export function parseAllWorkItemsForProject(
       priority: epic.priority,
       size: epic.size,
       points: epic.points,
-      estimateMinutes: epic.estimateMinutes,
       actualMinutes: epic.actualMinutes,
       actualMs: epic.actualMs,
       epicId: epic.id,
@@ -48,7 +49,7 @@ export function parseAllWorkItemsForProject(
       project: epic.project,
     })
 
-    const storyList = parseStoriesForEpic(project, epic.id)
+    const storyList = parseStoriesForEpic(project, epic.id, index)
     for (const err of storyList.errors) {
       errors.push({ filePath: err.filePath, message: err.message })
     }
@@ -62,7 +63,6 @@ export function parseAllWorkItemsForProject(
         priority: story.priority,
         size: story.size,
         points: story.points,
-        estimateMinutes: story.estimateMinutes,
         actualMinutes: story.actualMinutes,
         actualMs: story.actualMs,
         epicId: epic.id,
@@ -73,7 +73,7 @@ export function parseAllWorkItemsForProject(
         project: story.project,
       })
 
-      const items = parseItemsForStory(project, epic.id, story.id)
+      const items = parseItemsForStory(project, epic.id, story.id, index)
       for (const err of items.errors) {
         errors.push({ filePath: err.filePath, message: err.message })
       }
@@ -86,7 +86,6 @@ export function parseAllWorkItemsForProject(
           priority: item.priority,
           size: item.size,
           points: item.points,
-          estimateMinutes: item.estimateMinutes,
           actualMinutes: item.actualMinutes,
           actualMs: item.actualMs,
           epicId: epic.id,
@@ -99,7 +98,7 @@ export function parseAllWorkItemsForProject(
       }
     }
 
-    const epicItems = parseItemsForEpic(project, epic.id)
+    const epicItems = parseItemsForEpic(project, epic.id, index)
     for (const err of epicItems.errors) {
       errors.push({ filePath: err.filePath, message: err.message })
     }
@@ -112,7 +111,6 @@ export function parseAllWorkItemsForProject(
         priority: item.priority,
         size: item.size,
         points: item.points,
-        estimateMinutes: item.estimateMinutes,
         actualMinutes: item.actualMinutes,
         actualMs: item.actualMs,
         epicId: epic.id,
@@ -130,9 +128,10 @@ export function parseAllWorkItemsForProject(
 
 /** All stories across every epic, with epic id/title for UI tags. */
 export function parseAllStoriesForProject(
-  project: DiscoveredProject
+  project: DiscoveredProject,
+  index?: BoardIndex
 ): ProjectStoriesFlatList {
-  const epicList = parseEpicsForProject(project)
+  const epicList = parseEpicsForProject(project, index)
   const stories: StoryWithEpicRow[] = []
   const errors: ProjectStoriesFlatList["errors"] = epicList.errors.map((e) => ({
     filePath: e.filePath,
@@ -140,7 +139,7 @@ export function parseAllStoriesForProject(
   }))
 
   for (const epic of epicList.epics) {
-    const storyList = parseStoriesForEpic(project, epic.id)
+    const storyList = parseStoriesForEpic(project, epic.id, index)
     for (const err of storyList.errors) {
       errors.push({ filePath: err.filePath, message: err.message })
     }
@@ -152,7 +151,6 @@ export function parseAllStoriesForProject(
         priority: story.priority,
         size: story.size,
         points: story.points,
-        estimateMinutes: story.estimateMinutes,
         actualMinutes: story.actualMinutes,
         actualMs: story.actualMs,
         epicId: epic.id,
@@ -170,9 +168,10 @@ export function parseAllStoriesForProject(
 
 /** All tasks/bugs across the board, with epic and story UI tags. */
 export function parseAllTasksForProject(
-  project: DiscoveredProject
+  project: DiscoveredProject,
+  index?: BoardIndex
 ): ProjectTasksFlatList {
-  const epicList = parseEpicsForProject(project)
+  const epicList = parseEpicsForProject(project, index)
   const items: TaskWithParentsRow[] = []
   const errors: ProjectTasksFlatList["errors"] = epicList.errors.map((e) => ({
     filePath: e.filePath,
@@ -180,13 +179,13 @@ export function parseAllTasksForProject(
   }))
 
   for (const epic of epicList.epics) {
-    const storyList = parseStoriesForEpic(project, epic.id)
+    const storyList = parseStoriesForEpic(project, epic.id, index)
     for (const err of storyList.errors) {
       errors.push({ filePath: err.filePath, message: err.message })
     }
 
     for (const story of storyList.stories) {
-      const storyItems = parseItemsForStory(project, epic.id, story.id)
+      const storyItems = parseItemsForStory(project, epic.id, story.id, index)
       for (const err of storyItems.errors) {
         errors.push({ filePath: err.filePath, message: err.message })
       }
@@ -199,7 +198,6 @@ export function parseAllTasksForProject(
           priority: item.priority,
           size: item.size,
           points: item.points,
-          estimateMinutes: item.estimateMinutes,
           actualMinutes: item.actualMinutes,
           actualMs: item.actualMs,
           epicId: epic.id,
@@ -212,7 +210,7 @@ export function parseAllTasksForProject(
       }
     }
 
-    const epicItems = parseItemsForEpic(project, epic.id)
+    const epicItems = parseItemsForEpic(project, epic.id, index)
     for (const err of epicItems.errors) {
       errors.push({ filePath: err.filePath, message: err.message })
     }
@@ -225,7 +223,6 @@ export function parseAllTasksForProject(
         priority: item.priority,
         size: item.size,
         points: item.points,
-        estimateMinutes: item.estimateMinutes,
         actualMinutes: item.actualMinutes,
         actualMs: item.actualMs,
         epicId: epic.id,
@@ -249,13 +246,14 @@ export function parseAllTasksForProject(
 export function parseWorkItemsForEpic(
   project: DiscoveredProject,
   epicId: string,
-  epicTitle?: string | null
+  epicTitle?: string | null,
+  index?: BoardIndex
 ): EpicWorkItemsList {
   const rows: WorkItemsViewRow[] = []
   const errors: EpicWorkItemsList["errors"] = []
   const title = epicTitle ?? null
 
-  const storyList = parseStoriesForEpic(project, epicId)
+  const storyList = parseStoriesForEpic(project, epicId, index)
   for (const err of storyList.errors) {
     errors.push({ filePath: err.filePath, message: err.message })
   }
@@ -269,7 +267,6 @@ export function parseWorkItemsForEpic(
       priority: story.priority,
       size: story.size,
       points: story.points,
-      estimateMinutes: story.estimateMinutes,
       actualMinutes: story.actualMinutes,
       actualMs: story.actualMs,
       epicId,
@@ -278,6 +275,7 @@ export function parseWorkItemsForEpic(
       reporters: story.reporters,
       resolvers: story.resolvers,
       created: story.created,
+      updated: story.updated,
       completedAt: story.completedAt,
       workItemCount: story.workItemCount,
       doneWorkItemCount: story.doneWorkItemCount,
@@ -286,7 +284,7 @@ export function parseWorkItemsForEpic(
     })
   }
 
-  const epicItems = parseItemsForEpic(project, epicId)
+  const epicItems = parseItemsForEpic(project, epicId, index)
   for (const err of epicItems.errors) {
     errors.push({ filePath: err.filePath, message: err.message })
   }
@@ -299,7 +297,6 @@ export function parseWorkItemsForEpic(
       priority: item.priority,
       size: item.size,
       points: item.points,
-      estimateMinutes: item.estimateMinutes,
       actualMinutes: item.actualMinutes,
       actualMs: item.actualMs,
       epicId,
@@ -308,6 +305,7 @@ export function parseWorkItemsForEpic(
       reporters: item.reporters,
       resolvers: item.resolvers,
       created: item.created,
+      updated: item.updated,
       completedAt: item.completedAt,
       workItemCount: 0,
       doneWorkItemCount: 0,
@@ -331,9 +329,10 @@ export function parseWorkItemsForEpic(
  * (excludes tasks/bugs that live under a story). Sorted by status then priority.
  */
 export function parseWorkItemsViewForProject(
-  project: DiscoveredProject
+  project: DiscoveredProject,
+  index?: BoardIndex
 ): WorkItemsViewList {
-  const epicList = parseEpicsForProject(project)
+  const epicList = parseEpicsForProject(project, index)
   const rows: WorkItemsViewRow[] = []
   const errors: WorkItemsViewList["errors"] = epicList.errors.map((e) => ({
     filePath: e.filePath,
@@ -341,7 +340,12 @@ export function parseWorkItemsViewForProject(
   }))
 
   for (const epic of epicList.epics) {
-    const epicWorkItems = parseWorkItemsForEpic(project, epic.id, epic.title)
+    const epicWorkItems = parseWorkItemsForEpic(
+      project,
+      epic.id,
+      epic.title,
+      index
+    )
     for (const err of epicWorkItems.errors) {
       errors.push({ filePath: err.filePath, message: err.message })
     }