@worca/ui 0.8.1 → 0.9.0-rc.2

package/server/watcher.js

@@ -2,6 +2,25 @@ import { createHash } from 'node:crypto';
 import { existsSync, readdirSync, readFileSync, watch } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
+import {
+  assignEventsToIterations,
+  readDispatchEventsFromJsonl,
+} from './dispatch-events-aggregator.js';
+
+/**
+ * Enrich a status object with dispatch events read from events.jsonl in the
+ * same run directory. Mutates `status.stages` by adding `dispatch_events` to
+ * matching iterations. No-op when events.jsonl is missing (e.g. a run that
+ * started before the emit was wired, or a run with no dispatches).
+ */
+function enrichWithDispatchEvents(status, runDir) {
+  if (!status?.stages) return status;
+  const eventsPath = join(runDir, 'events.jsonl');
+  const events = readDispatchEventsFromJsonl(eventsPath);
+  if (events.length === 0) return status;
+  status.stages = assignEventsToIterations(events, status.stages);
+  return status;
+}
 
 export function createRunId(status) {
   // Prefer run_id from status (new per-run format)
@@ -35,9 +54,11 @@ export function discoverRuns(worcaDir) {
   if (existsSync(activeRunPath)) {
     try {
       const activeId = readFileSync(activeRunPath, 'utf8').trim();
-      const candidate = join(worcaDir, 'runs', activeId, 'status.json');
+      const runDir = join(worcaDir, 'runs', activeId);
+      const candidate = join(runDir, 'status.json');
       if (existsSync(candidate)) {
-        const status = JSON.parse(readFileSync(candidate, 'utf8'));
+        let status = JSON.parse(readFileSync(candidate, 'utf8'));
+        status = enrichWithDispatchEvents(status, runDir);
         const active =
           !isTerminal(status) && status.pipeline_status === 'running';
         const id = createRunId(status);
@@ -53,10 +74,12 @@ export function discoverRuns(worcaDir) {
   const runsDir = join(worcaDir, 'runs');
   if (existsSync(runsDir)) {
     for (const entry of readdirSync(runsDir)) {
-      const statusPath = join(runsDir, entry, 'status.json');
+      const runDir = join(runsDir, entry);
+      const statusPath = join(runDir, 'status.json');
       if (!existsSync(statusPath)) continue;
       try {
-        const status = JSON.parse(readFileSync(statusPath, 'utf8'));
+        let status = JSON.parse(readFileSync(statusPath, 'utf8'));
+        status = enrichWithDispatchEvents(status, runDir);
         const id = createRunId(status);
         if (seenIds.has(id)) continue;
         seenIds.add(id);
@@ -140,8 +163,10 @@ export async function discoverRunsAsync(worcaDir) {
   const activeRunPath = join(worcaDir, 'active_run');
   try {
     const activeId = (await readFile(activeRunPath, 'utf8')).trim();
-    const candidate = join(worcaDir, 'runs', activeId, 'status.json');
-    const status = JSON.parse(await readFile(candidate, 'utf8'));
+    const runDir = join(worcaDir, 'runs', activeId);
+    const candidate = join(runDir, 'status.json');
+    let status = JSON.parse(await readFile(candidate, 'utf8'));
+    status = enrichWithDispatchEvents(status, runDir);
     const active = !isTerminal(status) && status.pipeline_status === 'running';
     const id = createRunId(status);
     runs.push({ id, active, ...status });
@@ -156,15 +181,17 @@ export async function discoverRunsAsync(worcaDir) {
     const entries = await readdir(runsDir);
     const readPromises = entries.map(async (entry) => {
       try {
-        const statusPath = join(runsDir, entry, 'status.json');
+        const runDir = join(runsDir, entry);
+        const statusPath = join(runDir, 'status.json');
         const status = JSON.parse(await readFile(statusPath, 'utf8'));
-        return status;
+        return { status, runDir };
       } catch {
         return null;
       }
     });
-    for (const status of await Promise.all(readPromises)) {
-      if (!status) continue;
+    for (const result of await Promise.all(readPromises)) {
+      if (!result) continue;
+      const status = enrichWithDispatchEvents(result.status, result.runDir);
       const id = createRunId(status);
       if (seenIds.has(id)) continue;
       seenIds.add(id);

package/server/worca-setup.js

@@ -20,10 +20,24 @@ export function checkWorcaInstalled(projectPath) {
 }
 
 /**
- * Read the worca-cc version from a project's .claude/worca/__init__.py.
+ * Read the worca-cc version from a project's worca installation.
+ * Tries .claude/worca/version.json first, then falls back to __init__.py.
  * Returns the version string or null if not found.
  */
 export function readProjectWorcaVersion(projectPath) {
+  // Try version.json first (preferred format)
+  try {
+    const versionJson = JSON.parse(
+      readFileSync(
+        join(projectPath, '.claude', 'worca', 'version.json'),
+        'utf8',
+      ),
+    );
+    if (versionJson.version) return versionJson.version;
+  } catch {
+    // fall through to __init__.py
+  }
+  // Fall back to __init__.py
   try {
     const initPy = readFileSync(
       join(projectPath, '.claude', 'worca', '__init__.py'),

package/server/ws-modular.js

@@ -11,6 +11,7 @@ import { join } from 'node:path';
 import { WebSocketServer } from 'ws';
 import { readProjects, synthesizeDefaultProject } from './project-registry.js';
 import { TIER_FULL, TIER_POLLING, WatcherSet } from './watcher-set.js';
+import { readProjectWorcaVersion } from './worca-setup.js';
 import { createBroadcaster } from './ws-broadcaster.js';
 import { createClientManager } from './ws-client-manager.js';
 import { createMessageRouter } from './ws-message-router.js';
@@ -157,9 +158,12 @@ export function attachWsServer(httpServer, config) {
     }
 
     // Broadcast projects-updated to all clients
+    // Shape must match GET /api/projects so frontend state stays consistent
+    // (include worcaVersion — without it, clients would show "unknown" after
+    // the WS event clobbers the enriched REST response on add/remove)
     const projectList = freshProjects.map((p) => ({
-      name: p.name,
-      path: p.path,
+      ...p,
+      worcaVersion: readProjectWorcaVersion(p.path),
     }));
     broadcaster.broadcast('projects-updated', { projects: projectList });
   }