@saga-ai/dashboard 4.2.0 → 4.2.1

package/dist/cli.cjs

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/cli.ts
-var import_node_fs7 = require("node:fs");
-var import_node_path8 = require("node:path");
+var import_node_fs6 = require("node:fs");
+var import_node_path7 = require("node:path");
 var import_node_process6 = __toESM(require("node:process"), 1);
 var import_commander = require("commander");
 
@@ -38,14 +38,14 @@ var import_node_process4 = __toESM(require("node:process"), 1);
 
 // src/server/index.ts
 var import_node_http = require("node:http");
-var import_node_path6 = require("node:path");
+var import_node_path5 = require("node:path");
 var import_express3 = __toESM(require("express"), 1);
 
 // src/server/routes.ts
 var import_express2 = require("express");
 
 // src/server/parser.ts
-var import_node_fs3 = require("node:fs");
+var import_node_fs2 = require("node:fs");
 var import_promises = require("node:fs/promises");
 
 // ../saga-utils/src/directory.ts
@@ -74,6 +74,13 @@ function createStoryPaths(projectRoot, storyId) {
     journalMd: `${storyDir}/journal.md`
   };
 }
+function createWorktreePaths(projectRoot, storyId) {
+  const { worktrees } = createSagaPaths(projectRoot);
+  return {
+    storyId,
+    worktreeDir: `${worktrees}/${storyId}`
+  };
+}
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/external.js
 var external_exports = {};
@@ -4195,6 +4202,79 @@ var StorySchema = external_exports.object({
 // ../saga-utils/src/storage.ts
 var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
+function buildScannedStory(storyDir, storyJsonPath, worktreePath) {
+  if (!(0, import_node_fs.existsSync)(storyJsonPath)) {
+    return null;
+  }
+  let storyData;
+  try {
+    const raw = (0, import_node_fs.readFileSync)(storyJsonPath, "utf-8");
+    storyData = StorySchema.parse(JSON.parse(raw));
+  } catch {
+    return null;
+  }
+  let tasks = [];
+  try {
+    const files = (0, import_node_fs.readdirSync)(storyDir);
+    tasks = files.filter((f) => f.endsWith(".json") && f !== "story.json").map((f) => {
+      const raw = (0, import_node_fs.readFileSync)((0, import_node_path.join)(storyDir, f), "utf-8");
+      return TaskSchema.parse(JSON.parse(raw));
+    });
+  } catch {
+  }
+  const status = deriveStoryStatus(tasks);
+  const journalMdPath = (0, import_node_path.join)(storyDir, "journal.md");
+  return {
+    ...storyData,
+    status,
+    storyPath: storyJsonPath,
+    worktreePath,
+    journalPath: (0, import_node_fs.existsSync)(journalMdPath) ? journalMdPath : void 0,
+    tasks
+  };
+}
+function scanMasterStories(projectRoot, storyMap) {
+  const { stories } = createSagaPaths(projectRoot);
+  if (!(0, import_node_fs.existsSync)(stories)) {
+    return;
+  }
+  const entries = (0, import_node_fs.readdirSync)(stories, { withFileTypes: true });
+  for (const entry of entries) {
+    if (!entry.isDirectory()) {
+      continue;
+    }
+    const storyPaths = createStoryPaths(projectRoot, entry.name);
+    const scanned = buildScannedStory(storyPaths.storyDir, storyPaths.storyJson);
+    if (!scanned) {
+      continue;
+    }
+    const wtPaths = createWorktreePaths(projectRoot, entry.name);
+    if ((0, import_node_fs.existsSync)(wtPaths.worktreeDir)) {
+      scanned.worktreePath = wtPaths.worktreeDir;
+    }
+    storyMap.set(scanned.id, scanned);
+  }
+}
+function scanWorktreeStories(projectRoot, storyMap) {
+  const { worktrees } = createSagaPaths(projectRoot);
+  if (!(0, import_node_fs.existsSync)(worktrees)) {
+    return;
+  }
+  const entries = (0, import_node_fs.readdirSync)(worktrees, { withFileTypes: true });
+  for (const wtEntry of entries) {
+    if (!wtEntry.isDirectory()) {
+      continue;
+    }
+    const storyId = wtEntry.name;
+    const wtStoryDir = (0, import_node_path.join)(worktrees, storyId, ".saga", "stories", storyId);
+    const wtStoryJson = (0, import_node_path.join)(wtStoryDir, "story.json");
+    const wtPath = (0, import_node_path.join)(worktrees, storyId);
+    const scanned = buildScannedStory(wtStoryDir, wtStoryJson, wtPath);
+    if (scanned) {
+      storyMap.set(scanned.id, scanned);
+    }
+  }
+}
 function readStory(projectRoot, storyId) {
   const { storyJson } = createStoryPaths(projectRoot, storyId);
   if (!(0, import_node_fs.existsSync)(storyJson)) {
@@ -4245,27 +4325,6 @@ function listEpics(projectRoot) {
     return EpicSchema.parse(parsed);
   });
 }
-function listStories(projectRoot) {
-  const { stories } = createSagaPaths(projectRoot);
-  if (!(0, import_node_fs.existsSync)(stories)) {
-    throw new Error(`Stories directory not found: ${stories}`);
-  }
-  const entries = (0, import_node_fs.readdirSync)(stories, { withFileTypes: true });
-  return entries.filter((entry) => entry.isDirectory()).map((entry) => {
-    const storyJsonPath = (0, import_node_path.join)(stories, entry.name, "story.json");
-    if (!(0, import_node_fs.existsSync)(storyJsonPath)) {
-      return null;
-    }
-    const raw = (0, import_node_fs.readFileSync)(storyJsonPath, "utf-8");
-    let parsed;
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      throw new Error(`Malformed JSON in story file: ${storyJsonPath}`);
-    }
-    return StorySchema.parse(parsed);
-  }).filter((story) => story !== null);
-}
 function deriveStoryStatus(tasks) {
   if (tasks.length === 0) {
     return "pending";
@@ -4290,46 +4349,11 @@ function deriveEpicStatus(storyStatuses) {
   }
   return "pending";
 }
-
-// src/utils/saga-scanner.ts
-var import_node_fs2 = require("node:fs");
-var import_node_path2 = require("node:path");
-function scanStories(sagaRoot) {
-  const storiesDir = (0, import_node_path2.join)(sagaRoot, ".saga", "stories");
-  if (!(0, import_node_fs2.existsSync)(storiesDir)) {
-    return [];
-  }
-  const stories = listStories(sagaRoot);
-  return stories.map((story) => {
-    let tasks = [];
-    try {
-      tasks = listTasks(sagaRoot, story.id);
-    } catch {
-    }
-    const { journalMd } = createStoryPaths(sagaRoot, story.id);
-    const hasJournal = (0, import_node_fs2.existsSync)(journalMd);
-    return {
-      id: story.id,
-      title: story.title,
-      description: story.description,
-      epicId: story.epic,
-      guidance: story.guidance,
-      doneWhen: story.doneWhen,
-      avoid: story.avoid,
-      branch: story.branch,
-      pr: story.pr,
-      worktree: story.worktree,
-      journalPath: hasJournal ? journalMd : void 0,
-      tasks
-    };
-  });
-}
-function scanEpics(sagaRoot) {
-  const epicsDir = (0, import_node_path2.join)(sagaRoot, ".saga", "epics");
-  if (!(0, import_node_fs2.existsSync)(epicsDir)) {
-    return [];
-  }
-  return listEpics(sagaRoot);
+function scanStories(projectRoot) {
+  const storyMap = /* @__PURE__ */ new Map();
+  scanMasterStories(projectRoot, storyMap);
+  scanWorktreeStories(projectRoot, storyMap);
+  return Array.from(storyMap.values());
 }
 
 // src/server/parser.ts
@@ -4353,7 +4377,7 @@ function toStoryDetail(story) {
     id: story.id,
     title: story.title,
     description: story.description,
-    epic: story.epicId,
+    epic: story.epic,
     status: toApiStatus(derivedStatus),
     tasks,
     guidance: story.guidance,
@@ -4391,14 +4415,19 @@ function buildEpic(scannedEpic, epicStories) {
 }
 function parseStory(sagaRoot, storyId) {
   try {
-    const story = readStory(sagaRoot, storyId);
+    const wtPaths = createWorktreePaths(sagaRoot, storyId);
+    const wtStoryDir = `${wtPaths.worktreeDir}/.saga/stories/${storyId}`;
+    const wtStoryJson = `${wtStoryDir}/story.json`;
+    const useWorktree = (0, import_node_fs2.existsSync)(wtStoryJson);
+    const storyRoot = useWorktree ? wtPaths.worktreeDir : sagaRoot;
+    const story = readStory(storyRoot, storyId);
     let tasks = [];
     try {
-      tasks = listTasks(sagaRoot, storyId);
+      tasks = listTasks(storyRoot, storyId);
     } catch {
     }
-    const { journalMd } = createStoryPaths(sagaRoot, storyId);
-    const hasJournal = (0, import_node_fs3.existsSync)(journalMd);
+    const { journalMd } = createStoryPaths(storyRoot, storyId);
+    const hasJournal = (0, import_node_fs2.existsSync)(journalMd);
     const derivedStatus = deriveStoryStatus(tasks);
     return {
       id: story.id,
@@ -4472,7 +4501,11 @@ async function parseJournal(journalPath) {
 }
 function scanSagaDirectory(sagaRoot) {
   const scannedStories = scanStories(sagaRoot);
-  const scannedEpics = scanEpics(sagaRoot);
+  let scannedEpics = [];
+  try {
+    scannedEpics = listEpics(sagaRoot);
+  } catch {
+  }
   const allStories = scannedStories.map(toStoryDetail);
   const storiesByEpic = /* @__PURE__ */ new Map();
   const standaloneStories = [];
@@ -4497,9 +4530,9 @@ var import_express = require("express");
 
 // src/lib/sessions.ts
 var import_node_child_process = require("node:child_process");
-var import_node_fs4 = require("node:fs");
+var import_node_fs3 = require("node:fs");
 var import_promises2 = require("node:fs/promises");
-var import_node_path3 = require("node:path");
+var import_node_path2 = require("node:path");
 var import_node_process = __toESM(require("node:process"), 1);
 var PREVIEW_LINES_COUNT = 5;
 var PREVIEW_MAX_LENGTH = 500;
@@ -4569,7 +4602,7 @@ function listSessions() {
         name,
         status: "running",
         // If it shows up in tmux ls, it's running
-        outputFile: (0, import_node_path3.join)(OUTPUT_DIR, `${name}.jsonl`)
+        outputFile: (0, import_node_path2.join)(OUTPUT_DIR, `${name}.jsonl`)
       });
     }
   }
@@ -4584,8 +4617,8 @@ function getSessionStatus(sessionName) {
   };
 }
 function streamLogs(sessionName) {
-  const outputFile = (0, import_node_path3.join)(OUTPUT_DIR, `${sessionName}.jsonl`);
-  if (!(0, import_node_fs4.existsSync)(outputFile)) {
+  const outputFile = (0, import_node_path2.join)(OUTPUT_DIR, `${sessionName}.jsonl`);
+  if (!(0, import_node_fs3.existsSync)(outputFile)) {
     throw new Error(`Output file not found: ${outputFile}`);
   }
   return new Promise((resolve, reject) => {
@@ -4638,8 +4671,8 @@ async function buildSessionInfo(name, status) {
   if (!parsed) {
     return null;
   }
-  const outputFile = (0, import_node_path3.join)(OUTPUT_DIR, `${name}.jsonl`);
-  const outputAvailable = (0, import_node_fs4.existsSync)(outputFile);
+  const outputFile = (0, import_node_path2.join)(OUTPUT_DIR, `${name}.jsonl`);
+  const outputAvailable = (0, import_node_fs3.existsSync)(outputFile);
   let startTime = /* @__PURE__ */ new Date();
   let endTime;
   let outputPreview;
@@ -4885,9 +4918,9 @@ function createApiRouter(sagaRoot) {
 var import_ws = require("ws");
 
 // src/lib/log-stream-manager.ts
-var import_node_fs5 = require("node:fs");
+var import_node_fs4 = require("node:fs");
 var import_promises3 = require("node:fs/promises");
-var import_node_path4 = require("node:path");
+var import_node_path3 = require("node:path");
 var import_chokidar = __toESM(require("chokidar"), 1);
 function parseJsonlLines(content) {
   const messages = [];
@@ -4969,8 +5002,8 @@ var LogStreamManager = class {
    * Creates a file watcher if this is the first subscriber.
    */
   async subscribe(sessionName, ws) {
-    const outputFile = (0, import_node_path4.join)(OUTPUT_DIR, `${sessionName}.jsonl`);
-    if (!(0, import_node_fs5.existsSync)(outputFile)) {
+    const outputFile = (0, import_node_path3.join)(OUTPUT_DIR, `${sessionName}.jsonl`);
+    if (!(0, import_node_fs4.existsSync)(outputFile)) {
       this.sendToClient(ws, {
         type: "logs:error",
         sessionName,
@@ -5099,10 +5132,10 @@ var LogStreamManager = class {
     if (!subs || subs.size === 0) {
       return;
     }
-    const outputFile = (0, import_node_path4.join)(OUTPUT_DIR, `${sessionName}.jsonl`);
+    const outputFile = (0, import_node_path3.join)(OUTPUT_DIR, `${sessionName}.jsonl`);
     const finalMessages = [];
     try {
-      if ((0, import_node_fs5.existsSync)(outputFile)) {
+      if ((0, import_node_fs4.existsSync)(outputFile)) {
         const content = await (0, import_promises3.readFile)(outputFile, "utf-8");
         const lastLineCount = this.lineCounts.get(sessionName) ?? 0;
         const nonEmptyLines = content.split("\n").filter((l) => l.trim());
@@ -5148,7 +5181,7 @@ var LogStreamManager = class {
 
 // src/server/watcher.ts
 var import_node_events = require("node:events");
-var import_node_path5 = require("node:path");
+var import_node_path4 = require("node:path");
 var import_node_process2 = __toESM(require("node:process"), 1);
 var import_chokidar2 = __toESM(require("chokidar"), 1);
 var EPIC_PATH_PARTS = 3;
@@ -5161,8 +5194,8 @@ function shouldUsePolling() {
 function parseEpicsPath(parts) {
   if (parts.length === EPIC_PATH_PARTS) {
     const fileName = parts[2];
-    if ((0, import_node_path5.extname)(fileName) === ".json") {
-      const epicId = (0, import_node_path5.basename)(fileName, ".json");
+    if ((0, import_node_path4.extname)(fileName) === ".json") {
+      const epicId = (0, import_node_path4.basename)(fileName, ".json");
       return {
         epicId,
         isEpicFile: true,
@@ -5193,7 +5226,7 @@ function parseStoriesPath(parts) {
         isMainStoryFile: false
       };
     }
-    if ((0, import_node_path5.extname)(fileName) === ".json") {
+    if ((0, import_node_path4.extname)(fileName) === ".json") {
       return {
         storyId,
         isEpicFile: false,
@@ -5205,8 +5238,8 @@ function parseStoriesPath(parts) {
   return null;
 }
 function parseFilePath(filePath, sagaRoot) {
-  const relativePath = (0, import_node_path5.relative)(sagaRoot, filePath);
-  const parts = relativePath.split(import_node_path5.sep);
+  const relativePath = (0, import_node_path4.relative)(sagaRoot, filePath);
+  const parts = relativePath.split(import_node_path4.sep);
   if (parts[0] !== ".saga" || parts.length < MIN_PATH_PARTS) {
     return null;
   }
@@ -5278,8 +5311,8 @@ function createDebounceKey(parsed) {
   return `epic:${parsed.epicId}`;
 }
 function createChokidarWatcher(sagaRoot) {
-  const storiesDir = (0, import_node_path5.join)(sagaRoot, ".saga", "stories");
-  const epicsDir = (0, import_node_path5.join)(sagaRoot, ".saga", "epics");
+  const storiesDir = (0, import_node_path4.join)(sagaRoot, ".saga", "stories");
+  const epicsDir = (0, import_node_path4.join)(sagaRoot, ".saga", "epics");
   const usePolling = shouldUsePolling();
   return import_chokidar2.default.watch([storiesDir, epicsDir], {
     persistent: true,
@@ -5311,7 +5344,7 @@ function createFileEventHandler(sagaRoot, debouncer, emitter, state) {
       type: watcherEventType,
       epicId: parsed.epicId,
       storyId: parsed.storyId,
-      path: (0, import_node_path5.relative)(sagaRoot, filePath)
+      path: (0, import_node_path4.relative)(sagaRoot, filePath)
     };
     debouncer.schedule(createDebounceKey(parsed), event, (e) => {
       if (!state.closed) {
@@ -5633,8 +5666,8 @@ function createApp(sagaRoot) {
     res.json({ status: "ok" });
   });
   app.use("/api", createApiRouter(sagaRoot));
-  const clientDistPath = (0, import_node_path6.join)(__dirname, "client");
-  const _indexHtmlPath = (0, import_node_path6.join)(clientDistPath, "index.html");
+  const clientDistPath = (0, import_node_path5.join)(__dirname, "client");
+  const _indexHtmlPath = (0, import_node_path5.join)(clientDistPath, "index.html");
   app.use(import_express3.default.static(clientDistPath));
   app.get("/{*splat}", (_req, res) => {
     res.sendFile("index.html", { root: clientDistPath });
@@ -5672,17 +5705,17 @@ async function startServer(config) {
 }
 
 // src/utils/project-discovery.ts
-var import_node_fs6 = require("node:fs");
-var import_node_path7 = require("node:path");
+var import_node_fs5 = require("node:fs");
+var import_node_path6 = require("node:path");
 var import_node_process3 = __toESM(require("node:process"), 1);
 function findProjectRoot(startDir) {
   let currentDir = startDir ?? import_node_process3.default.cwd();
   while (true) {
-    const sagaDir = (0, import_node_path7.join)(currentDir, ".saga");
-    if ((0, import_node_fs6.existsSync)(sagaDir)) {
+    const sagaDir = (0, import_node_path6.join)(currentDir, ".saga");
+    if ((0, import_node_fs5.existsSync)(sagaDir)) {
       return currentDir;
     }
-    const parentDir = (0, import_node_path7.dirname)(currentDir);
+    const parentDir = (0, import_node_path6.dirname)(currentDir);
     if (parentDir === currentDir) {
       return null;
     }
@@ -5691,8 +5724,8 @@ function findProjectRoot(startDir) {
 }
 function resolveProjectPath(explicitPath) {
   if (explicitPath) {
-    const sagaDir = (0, import_node_path7.join)(explicitPath, ".saga");
-    if (!(0, import_node_fs6.existsSync)(sagaDir)) {
+    const sagaDir = (0, import_node_path6.join)(explicitPath, ".saga");
+    if (!(0, import_node_fs5.existsSync)(sagaDir)) {
       throw new Error(
         `No .saga/ directory found at specified path: ${explicitPath}
 Make sure the path points to a SAGA project root.`
@@ -5758,8 +5791,8 @@ async function sessionsLogsCommand(sessionName) {
 }
 
 // src/cli.ts
-var packageJsonPath = (0, import_node_path8.join)(__dirname, "..", "package.json");
-var packageJson = JSON.parse((0, import_node_fs7.readFileSync)(packageJsonPath, "utf-8"));
+var packageJsonPath = (0, import_node_path7.join)(__dirname, "..", "package.json");
+var packageJson = JSON.parse((0, import_node_fs6.readFileSync)(packageJsonPath, "utf-8"));
 var program = new import_commander.Command();
 program.name("saga").description("Dashboard and session monitoring for SAGA - Structured Autonomous Goal Achievement").version(packageJson.version).addHelpCommand("help [command]", "Display help for a command");
 program.option("-p, --path <dir>", "Path to SAGA project directory (overrides auto-discovery)");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saga-ai/dashboard",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Dashboard and session monitoring for SAGA - Structured Autonomous Goal Achievement",
   "type": "module",
   "bin": {