@prmichaelsen/acp-visualizer 0.1.5 → 0.1.7

package/package.json

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

package/src/lib/file-watcher.ts

@@ -1,6 +1,3 @@
-import { watch } from 'fs'
-import { getProgressYamlPath } from './config'
-
 type Controller = ReadableStreamDefaultController
 
 let watcher: {
@@ -8,9 +5,12 @@ let watcher: {
   removeClient: (controller: Controller) => void
 } | null = null
 
-export function getFileWatcher() {
+export async function getFileWatcher() {
   if (watcher) return watcher
 
+  const { watch } = await import('fs')
+  const { getProgressYamlPath } = await import('./config')
+
   const filePath = getProgressYamlPath()
   const clients = new Set<Controller>()
 

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',
 }
 
@@ -171,12 +172,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 +272,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),

package/src/routes/__root.tsx

@@ -2,7 +2,7 @@ import { HeadContent, Scripts, createRootRoute, Outlet } from '@tanstack/react-r
 import { useAutoRefresh } from '../lib/useAutoRefresh'
 import { Sidebar } from '../components/Sidebar'
 import { Header } from '../components/Header'
-import { ProgressDatabaseService } from '../services/progress-database.service'
+import { getProgressData } from '../services/progress-database.service'
 import type { ProgressData } from '../lib/types'
 
 import appCss from '../styles.css?url'
@@ -12,7 +12,7 @@ export const Route = createRootRoute({
     let progressData: ProgressData | null = null
 
     try {
-      const result = ProgressDatabaseService.getProgressData()
+      const result = await getProgressData()
       if (result.ok) {
         progressData = result.data
       }

package/src/routes/api/watch.ts

@@ -5,7 +5,7 @@ export const Route = createFileRoute('/api/watch')({
   server: {
     handlers: {
       GET: async () => {
-        const watcher = getFileWatcher()
+        const watcher = await getFileWatcher()
 
         const stream = new ReadableStream({
           start(controller) {

package/src/services/progress-database.service.ts

@@ -1,14 +1,17 @@
-import { readFileSync } from 'fs'
-import { parseProgressYaml } from '../lib/yaml-loader'
-import { getProgressYamlPath } from '../lib/config'
+import { createServerFn } from '@tanstack/react-start'
 import type { ProgressData } from '../lib/types'
 
 export type ProgressResult =
   | { ok: true; data: ProgressData }
   | { ok: false; error: 'FILE_NOT_FOUND' | 'PARSE_ERROR'; message: string; path: string }
 
-export class ProgressDatabaseService {
-  static getProgressData(): ProgressResult {
+export const getProgressData = createServerFn({ method: 'GET' }).handler(
+  async (): Promise<ProgressResult> => {
+    // Dynamic imports keep fs and yaml-loader out of the client bundle
+    const { readFileSync } = await import('fs')
+    const { parseProgressYaml } = await import('../lib/yaml-loader')
+    const { getProgressYamlPath } = await import('../lib/config')
+
     const filePath = getProgressYamlPath()
 
     try {
@@ -42,5 +45,5 @@ export class ProgressDatabaseService {
         path: filePath,
       }
     }
-  }
-}
+  },
+)