@prmichaelsen/acp-visualizer 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prmichaelsen/acp-visualizer",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "description": "Browser-based dashboard for visualizing ACP progress.yaml data",
   "bin": {

package/src/lib/yaml-loader.spec.ts

@@ -186,6 +186,34 @@ milestones:
     expect(result.milestones[0].id).toBe('milestone_1')
   })
 
+  it('maps task keys to milestone IDs when formats differ', () => {
+    const yaml = `
+milestones:
+  - id: M1
+    name: First
+    status: completed
+  - id: M2
+    name: Second
+    status: in_progress
+
+tasks:
+  milestone_1:
+    - id: t1
+      name: Task A
+      status: completed
+  milestone_2:
+    - id: t2
+      name: Task B
+      status: in_progress
+`
+    const result = parseProgressYaml(yaml)
+    // Tasks keyed as milestone_1 should map to milestone ID M1
+    expect(result.tasks['M1']).toHaveLength(1)
+    expect(result.tasks['M1'][0].name).toBe('Task A')
+    expect(result.tasks['M2']).toHaveLength(1)
+    expect(result.tasks['M2'][0].name).toBe('Task B')
+  })
+
   it('handles null values in dates', () => {
     const yaml = `
 milestones:

package/src/lib/yaml-loader.ts

@@ -35,6 +35,7 @@ const TASK_ALIASES: Record<string, string> = {
   done_date: 'completed_date',
   filename: 'file',
   path: 'file',
+  document: 'file',
   milestone: 'milestone_id',
 }
 
@@ -134,7 +135,11 @@ function normalizeMilestone(raw: unknown, index: number): Milestone {
     id: safeString(known.id, `milestone_${index + 1}`),
     name: safeString(known.name, `Milestone ${index + 1}`),
     status: normalizeStatus(known.status),
-    progress: safeNumber(known.progress),
+    progress: known.progress != null
+      ? safeNumber(known.progress)
+      : safeNumber(known.tasks_total) > 0
+        ? Math.round((safeNumber(known.tasks_completed) / safeNumber(known.tasks_total)) * 100)
+        : normalizeStatus(known.status) === 'completed' ? 100 : 0,
     started: known.started ? safeString(known.started) : null,
     completed: known.completed ? safeString(known.completed) : null,
     estimated_weeks: safeString(known.estimated_weeks, '0'),
@@ -171,12 +176,35 @@ function normalizeTask(raw: unknown, milestoneId: string, index: number): Task {
   }
 }
 
-function normalizeTasks(raw: unknown): Record<string, Task[]> {
+function normalizeTasks(raw: unknown, milestones: Milestone[]): Record<string, Task[]> {
   const result: Record<string, Task[]> = {}
   const obj = asRecord(raw)
-  for (const [milestoneId, tasks] of Object.entries(obj)) {
+
+  // Build a map from task key patterns to milestone IDs.
+  // Handles mismatch: tasks keyed as "milestone_1" but milestone.id = "M1"
+  const keyToMilestoneId = new Map<string, string>()
+  for (let i = 0; i < milestones.length; i++) {
+    const m = milestones[i]
+    // The task key might be the milestone ID itself, or "milestone_N"
+    keyToMilestoneId.set(m.id, m.id)
+    keyToMilestoneId.set(m.id.toLowerCase(), m.id)
+    keyToMilestoneId.set(`milestone_${i + 1}`, m.id)
+    // Also handle "milestone_N" where N matches the numeric part of "MN"
+    const numMatch = m.id.match(/(\d+)/)
+    if (numMatch) {
+      keyToMilestoneId.set(`milestone_${numMatch[1]}`, m.id)
+    }
+  }
+
+  for (const [rawKey, tasks] of Object.entries(obj)) {
     if (Array.isArray(tasks)) {
-      result[milestoneId] = tasks.map((t, i) => normalizeTask(t, milestoneId, i))
+      // Resolve the key to a milestone ID, or keep as-is
+      const milestoneId = keyToMilestoneId.get(rawKey) || rawKey
+      const existing = result[milestoneId] || []
+      result[milestoneId] = [
+        ...existing,
+        ...tasks.map((t, i) => normalizeTask(t, milestoneId, existing.length + i)),
+      ]
     }
   }
   return result
@@ -248,10 +276,12 @@ export function parseProgressYaml(raw: string): ProgressData {
     }
     const d = doc as Record<string, unknown>
 
+    const milestones = normalizeMilestones(d.milestones)
+
     return {
       project: normalizeProject(d.project),
-      milestones: normalizeMilestones(d.milestones),
-      tasks: normalizeTasks(d.tasks),
+      milestones,
+      tasks: normalizeTasks(d.tasks, milestones),
       recent_work: normalizeWorkEntries(d.recent_work),
       next_steps: normalizeStringArray(d.next_steps),
       notes: normalizeStringArray(d.notes),