@herbcaudill/ralph 1.1.0 → 1.2.0

package/dist/index.js

@@ -134,15 +134,183 @@ var EnhancedTextInput = ({
 };
 
 // src/components/SessionRunner.tsx
-import { appendFileSync, writeFileSync as writeFileSync2, readFileSync as readFileSync6, existsSync as existsSync10 } from "fs";
-import { join as join11, basename } from "path";
-import { randomUUID } from "crypto";
+import { appendFileSync, readFileSync as readFileSync7, existsSync as existsSync9, mkdirSync as mkdirSync3 } from "fs";
+import { join as join12, basename } from "path";
+
+// ../shared/dist/persistence/SessionPersister.js
+import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, unlinkSync } from "fs";
+import { appendFile, readFile } from "fs/promises";
+import { join } from "path";
+var SessionPersister = class {
+  constructor(storageDir) {
+    this.storageDir = storageDir;
+    if (!existsSync(storageDir)) {
+      mkdirSync(storageDir, { recursive: true });
+    }
+  }
+  /** Append an event to a session's JSONL file. */
+  async appendEvent(sessionId, event, app) {
+    const filePath = this.sessionPath(sessionId, app);
+    const dir = this.getAppDir(app);
+    if (!existsSync(dir)) {
+      mkdirSync(dir, { recursive: true });
+    }
+    const line = JSON.stringify(event) + "\n";
+    await appendFile(filePath, line, "utf-8");
+  }
+  /** Read all events for a session. */
+  async readEvents(sessionId, app) {
+    const filePath = this.sessionPath(sessionId, app);
+    if (!existsSync(filePath))
+      return [];
+    const content = await readFile(filePath, "utf-8");
+    return content.split("\n").filter((line) => line.trim()).map((line) => JSON.parse(line));
+  }
+  /** Read events since a given timestamp. */
+  async readEventsSince(sessionId, since, app) {
+    const events = await this.readEvents(sessionId, app);
+    return events.filter((e) => e.timestamp >= since);
+  }
+  /**
+   * List all session IDs (derived from JSONL filenames).
+   * If app is provided, lists sessions only from that app's directory.
+   * If app is undefined, lists sessions from all directories including root.
+   */
+  listSessions(app) {
+    return this.listSessionsWithApp(app).map((s) => s.sessionId);
+  }
+  /**
+   * List all sessions with their app namespace.
+   * If app is provided, lists sessions only from that app's directory.
+   * If app is undefined, lists sessions from all directories including root.
+   */
+  listSessionsWithApp(app) {
+    if (!existsSync(this.storageDir))
+      return [];
+    if (app !== void 0) {
+      const appDir = this.getAppDir(app);
+      if (!existsSync(appDir))
+        return [];
+      return readdirSync(appDir).filter((f) => f.endsWith(".jsonl")).map((f) => ({ sessionId: f.replace(/\.jsonl$/, ""), app }));
+    }
+    const sessions = [];
+    const entries = readdirSync(this.storageDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isFile() && entry.name.endsWith(".jsonl")) {
+        sessions.push({ sessionId: entry.name.replace(/\.jsonl$/, ""), app: void 0 });
+      } else if (entry.isDirectory()) {
+        const appDir = join(this.storageDir, entry.name);
+        for (const file of readdirSync(appDir)) {
+          if (file.endsWith(".jsonl")) {
+            sessions.push({ sessionId: file.replace(/\.jsonl$/, ""), app: entry.name });
+          }
+        }
+      }
+    }
+    return sessions;
+  }
+  /** Get the most recently created session ID, or null if none. */
+  getLatestSessionId(app) {
+    const sessions = this.listSessions(app);
+    if (sessions.length === 0)
+      return null;
+    let latest = null;
+    for (const id of sessions) {
+      const filePath = app ? this.sessionPath(id, app) : this.findSessionPath(id);
+      if (!filePath || !existsSync(filePath))
+        continue;
+      const stat = statSync(filePath);
+      if (!latest || stat.birthtimeMs > latest.birthtime) {
+        latest = { id, birthtime: stat.birthtimeMs };
+      }
+    }
+    return latest?.id ?? null;
+  }
+  /** Delete a session's JSONL file. */
+  deleteSession(sessionId, app) {
+    const filePath = this.sessionPath(sessionId, app);
+    if (existsSync(filePath)) {
+      unlinkSync(filePath);
+    }
+  }
+  /** Read session metadata from the first event (session_created) in the JSONL file. */
+  readSessionMetadata(sessionId, app) {
+    const filePath = this.sessionPath(sessionId, app);
+    if (!existsSync(filePath))
+      return null;
+    try {
+      const content = readFileSync(filePath, "utf-8");
+      const firstLine = content.split("\n").find((line) => line.trim());
+      if (!firstLine)
+        return null;
+      const event = JSON.parse(firstLine);
+      if (event.type === "session_created") {
+        return {
+          adapter: event.adapter ?? "claude",
+          cwd: event.cwd,
+          createdAt: event.timestamp ?? 0,
+          app: event.app,
+          systemPrompt: event.systemPrompt
+        };
+      }
+      return null;
+    } catch {
+      return null;
+    }
+  }
+  /** Check if a session exists. */
+  hasSession(sessionId, app) {
+    return existsSync(this.sessionPath(sessionId, app));
+  }
+  /** Get the full file path for a session. */
+  getSessionPath(sessionId, app) {
+    return this.sessionPath(sessionId, app);
+  }
+  /** Get the directory for an app. */
+  getAppDir(app) {
+    return app ? join(this.storageDir, app) : this.storageDir;
+  }
+  /** Get the file path for a session. */
+  sessionPath(sessionId, app) {
+    return join(this.getAppDir(app), `${sessionId}.jsonl`);
+  }
+  /** Find the session path by searching root and app directories. */
+  findSessionPath(sessionId) {
+    const rootPath = join(this.storageDir, `${sessionId}.jsonl`);
+    if (existsSync(rootPath))
+      return rootPath;
+    if (existsSync(this.storageDir)) {
+      const entries = readdirSync(this.storageDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory()) {
+          const appPath = join(this.storageDir, entry.name, `${sessionId}.jsonl`);
+          if (existsSync(appPath))
+            return appPath;
+        }
+      }
+    }
+    return null;
+  }
+};
+
+// ../shared/dist/persistence/getDefaultStorageDir.js
+import { homedir, platform } from "os";
+import { join as join2 } from "path";
+function getDefaultStorageDir() {
+  if (platform() === "win32") {
+    const localAppData = process.env.LOCALAPPDATA ?? join2(homedir(), "AppData", "Local");
+    return join2(localAppData, "ralph", "agent-sessions");
+  }
+  return join2(homedir(), ".local", "share", "ralph", "agent-sessions");
+}
+
+// src/components/SessionRunner.tsx
 import { query } from "@anthropic-ai/claude-agent-sdk";
 
 // src/lib/addTodo.ts
 import { execSync } from "child_process";
-import { existsSync, readFileSync, writeFileSync } from "fs";
-import { join } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { join as join3 } from "path";
 
 // src/lib/insertTodo.ts
 var insertTodo = (content, description) => {
@@ -165,8 +333,8 @@ ${content}`;
 
 // src/lib/addTodo.ts
 var addTodo = (description, cwd = process.cwd()) => {
-  const todoPath = join(cwd, ".ralph", "todo.md");
-  const content = existsSync(todoPath) ? readFileSync(todoPath, "utf-8") : "";
+  const todoPath = join3(cwd, ".ralph", "todo.md");
+  const content = existsSync2(todoPath) ? readFileSync2(todoPath, "utf-8") : "";
   const newContent = insertTodo(content, description);
   writeFileSync(todoPath, newContent);
   let indexContent = "";
@@ -197,8 +365,8 @@ var addTodo = (description, cwd = process.cwd()) => {
 };
 
 // src/lib/getProgress.ts
-import { existsSync as existsSync2 } from "fs";
-import { join as join3 } from "path";
+import { existsSync as existsSync3 } from "fs";
+import { join as join5 } from "path";
 
 // src/lib/getBeadsProgress.ts
 import { execSync as execSync2 } from "child_process";
@@ -235,13 +403,13 @@ var getBeadsProgress = (initialCount, startupTimestamp) => {
 };
 
 // src/lib/getTodoProgress.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { join as join2 } from "path";
-var ralphDir = join2(process.cwd(), ".ralph");
-var todoFile = join2(ralphDir, "todo.md");
+import { readFileSync as readFileSync3 } from "fs";
+import { join as join4 } from "path";
+var ralphDir = join4(process.cwd(), ".ralph");
+var todoFile = join4(ralphDir, "todo.md");
 var getTodoProgress = () => {
   try {
-    const content = readFileSync2(todoFile, "utf-8");
+    const content = readFileSync3(todoFile, "utf-8");
     const uncheckedMatches = content.match(/- \[ \]/g);
     const unchecked = uncheckedMatches ? uncheckedMatches.length : 0;
     const checkedMatches = content.match(/- \[[xX]\]/g);
@@ -254,22 +422,22 @@ var getTodoProgress = () => {
 };
 
 // src/lib/getProgress.ts
-var beadsDir = join3(process.cwd(), ".beads");
-var ralphDir2 = join3(process.cwd(), ".ralph");
-var todoFile2 = join3(ralphDir2, "todo.md");
+var beadsDir = join5(process.cwd(), ".beads");
+var ralphDir2 = join5(process.cwd(), ".ralph");
+var todoFile2 = join5(ralphDir2, "todo.md");
 var getProgress = (initialCount, startupTimestamp) => {
-  if (existsSync2(beadsDir)) {
+  if (existsSync3(beadsDir)) {
     return getBeadsProgress(initialCount, startupTimestamp);
   }
-  if (existsSync2(todoFile2)) {
+  if (existsSync3(todoFile2)) {
     return getTodoProgress();
   }
   return { type: "none", completed: 0, total: 0 };
 };
 
 // src/lib/captureStartupSnapshot.ts
-import { existsSync as existsSync3 } from "fs";
-import { join as join5 } from "path";
+import { existsSync as existsSync4 } from "fs";
+import { join as join7 } from "path";
 
 // src/lib/captureBeadsSnapshot.ts
 import { execSync as execSync3 } from "child_process";
@@ -301,13 +469,13 @@ var captureBeadsSnapshot = () => {
 };
 
 // src/lib/captureTodoSnapshot.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { join as join4 } from "path";
-var ralphDir3 = join4(process.cwd(), ".ralph");
-var todoFile3 = join4(ralphDir3, "todo.md");
+import { readFileSync as readFileSync4 } from "fs";
+import { join as join6 } from "path";
+var ralphDir3 = join6(process.cwd(), ".ralph");
+var todoFile3 = join6(ralphDir3, "todo.md");
 var captureTodoSnapshot = () => {
   try {
-    const content = readFileSync3(todoFile3, "utf-8");
+    const content = readFileSync4(todoFile3, "utf-8");
     const uncheckedMatches = content.match(/- \[ \]/g);
     const unchecked = uncheckedMatches ? uncheckedMatches.length : 0;
     const checkedMatches = content.match(/- \[[xX]\]/g);
@@ -323,14 +491,14 @@ var captureTodoSnapshot = () => {
 };
 
 // src/lib/captureStartupSnapshot.ts
-var beadsDir2 = join5(process.cwd(), ".beads");
-var ralphDir4 = join5(process.cwd(), ".ralph");
-var todoFile4 = join5(ralphDir4, "todo.md");
+var beadsDir2 = join7(process.cwd(), ".beads");
+var ralphDir4 = join7(process.cwd(), ".ralph");
+var todoFile4 = join7(ralphDir4, "todo.md");
 var captureStartupSnapshot = () => {
-  if (existsSync3(beadsDir2)) {
+  if (existsSync4(beadsDir2)) {
     return captureBeadsSnapshot();
   }
-  if (existsSync3(todoFile4)) {
+  if (existsSync4(todoFile4)) {
     return captureTodoSnapshot();
   }
   return void 0;
@@ -356,20 +524,20 @@ import { spawn } from "child_process";
 
 // ../../../beads-sdk/dist/socket.js
 import { createConnection } from "net";
-import { join as join6 } from "path";
-import { existsSync as existsSync4 } from "fs";
+import { join as join8 } from "path";
+import { existsSync as existsSync5 } from "fs";
 var DaemonSocket = class {
   constructor(options = {}) {
     this.socket = null;
     this.connected = false;
     const cwd = options.cwd ?? process.cwd();
-    this.socketPath = join6(cwd, ".beads", "bd.sock");
+    this.socketPath = join8(cwd, ".beads", "bd.sock");
     this.connectTimeout = options.connectTimeout ?? 2e3;
     this.requestTimeout = options.requestTimeout ?? 5e3;
   }
   /** Check if the beads daemon socket file exists. */
   socketExists() {
-    return existsSync4(this.socketPath);
+    return existsSync5(this.socketPath);
   }
   /** Check if connected to the daemon. */
   get isConnected() {
@@ -377,12 +545,10 @@ var DaemonSocket = class {
   }
   /** Connect to the beads daemon. Returns true if connected, false otherwise. */
   async connect() {
-    if (!this.socketExists()) {
+    if (!this.socketExists())
       return false;
-    }
-    if (this.connected && this.socket) {
+    if (this.connected && this.socket)
       return true;
-    }
     return new Promise((resolve2) => {
       this.socket = createConnection(this.socketPath);
       const timeout = setTimeout(() => {
@@ -485,9 +651,8 @@ function watchMutations(onMutation, options = {}) {
       client = new DaemonSocket({ cwd });
       const connected = await client.connect();
       if (!connected) {
-        if (!stopped) {
+        if (!stopped)
           timeoutId = setTimeout(poll, interval);
-        }
         return;
       }
     }
@@ -496,17 +661,15 @@ function watchMutations(onMutation, options = {}) {
       for (const mutation of mutations) {
         onMutation(mutation);
         const mutationTime = new Date(mutation.Timestamp).getTime();
-        if (mutationTime > lastTimestamp) {
+        if (mutationTime > lastTimestamp)
           lastTimestamp = mutationTime;
-        }
       }
     } catch {
       client?.close();
       client = null;
     }
-    if (!stopped) {
+    if (!stopped)
       timeoutId = setTimeout(poll, interval);
-    }
   };
   poll();
   return () => {
@@ -684,43 +847,6 @@ var useTerminalSize = () => {
   return size;
 };
 
-// src/lib/getNextLogFile.ts
-import { existsSync as existsSync6, mkdirSync } from "fs";
-import { join as join8 } from "path";
-
-// src/lib/findMaxLogNumber.ts
-import { readdirSync, existsSync as existsSync5 } from "fs";
-import { join as join7 } from "path";
-var EVENT_LOG_PATTERN = /^events-(\d+)\.jsonl$/;
-var findMaxLogNumber = () => {
-  const ralphDir6 = join7(process.cwd(), ".ralph");
-  if (!existsSync5(ralphDir6)) {
-    return 0;
-  }
-  const files = readdirSync(ralphDir6);
-  let maxNumber = 0;
-  for (const file of files) {
-    const match = file.match(EVENT_LOG_PATTERN);
-    if (match) {
-      const num = parseInt(match[1], 10);
-      if (num > maxNumber) {
-        maxNumber = num;
-      }
-    }
-  }
-  return maxNumber;
-};
-
-// src/lib/getNextLogFile.ts
-var getNextLogFile = () => {
-  const ralphDir6 = join8(process.cwd(), ".ralph");
-  if (!existsSync6(ralphDir6)) {
-    mkdirSync(ralphDir6, { recursive: true });
-  }
-  const maxNumber = findMaxLogNumber();
-  return join8(ralphDir6, `events-${maxNumber + 1}.jsonl`);
-};
-
 // src/lib/parseTaskLifecycle.ts
 function parseTaskLifecycleEvent(text) {
   const startingMatch = text.match(/<start_task>([a-z]+-[a-z0-9]+(?:\.[a-z0-9]+)*)<\/start_task>/i);
@@ -741,23 +867,23 @@ function parseTaskLifecycleEvent(text) {
 }
 
 // src/lib/getPromptContent.ts
-import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
-import { join as join10, dirname as dirname3 } from "path";
-import { fileURLToPath } from "url";
+import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
+import { join as join11, dirname as dirname4 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // ../shared/dist/prompts/loadPrompt.js
-import { existsSync as existsSync8, readFileSync as readFileSync4, copyFileSync, mkdirSync as mkdirSync2 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync5, copyFileSync, mkdirSync as mkdirSync2 } from "fs";
 import { join as join9, dirname as dirname2 } from "path";
 
 // ../shared/dist/prompts/getWorkspaceRoot.js
-import { existsSync as existsSync7 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 import { dirname, resolve } from "path";
 function getWorkspaceRoot(cwd = process.cwd()) {
   const start = resolve(cwd);
   let current = start;
   while (true) {
     const gitPath = resolve(current, ".git");
-    if (existsSync7(gitPath)) {
+    if (existsSync6(gitPath)) {
       return current;
     }
     const parent = dirname(current);
@@ -773,22 +899,22 @@ var WORKFLOW_PLACEHOLDER = "{WORKFLOW}";
 function loadSessionPrompt(options) {
   const { templatesDir, cwd = process.cwd() } = options;
   const workspaceRoot = getWorkspaceRoot(cwd);
-  const corePromptPath = join9(templatesDir, "core-prompt.md");
-  if (!existsSync8(corePromptPath)) {
+  const corePromptPath = join9(templatesDir, "core.prompt.md");
+  if (!existsSync7(corePromptPath)) {
     throw new Error(`Core prompt not found at ${corePromptPath}`);
   }
-  const corePrompt = readFileSync4(corePromptPath, "utf-8");
-  const customWorkflowPath = join9(workspaceRoot, ".ralph", "workflow.md");
-  const defaultWorkflowPath = join9(templatesDir, "workflow.md");
+  const corePrompt = readFileSync5(corePromptPath, "utf-8");
+  const customWorkflowPath = join9(workspaceRoot, ".ralph", "workflow.prompt.md");
+  const defaultWorkflowPath = join9(templatesDir, "workflow.prompt.md");
   let workflowContent;
   let hasCustomWorkflow2;
   let workflowPath;
-  if (existsSync8(customWorkflowPath)) {
-    workflowContent = readFileSync4(customWorkflowPath, "utf-8");
+  if (existsSync7(customWorkflowPath)) {
+    workflowContent = readFileSync5(customWorkflowPath, "utf-8");
     hasCustomWorkflow2 = true;
     workflowPath = customWorkflowPath;
-  } else if (existsSync8(defaultWorkflowPath)) {
-    workflowContent = readFileSync4(defaultWorkflowPath, "utf-8");
+  } else if (existsSync7(defaultWorkflowPath)) {
+    workflowContent = readFileSync5(defaultWorkflowPath, "utf-8");
     hasCustomWorkflow2 = false;
     workflowPath = defaultWorkflowPath;
   } else {
@@ -802,15 +928,23 @@ function loadSessionPrompt(options) {
   };
 }
 
+// ../shared/dist/prompts/templatesDir.js
+import { dirname as dirname3, join as join10 } from "path";
+import { fileURLToPath } from "url";
+var TEMPLATES_DIR = join10(dirname3(fileURLToPath(import.meta.url)), "..", "..", "templates");
+
 // src/lib/getPromptContent.ts
 var getPromptContent = () => {
-  const __dirname = dirname3(fileURLToPath(import.meta.url));
+  const __dirname = dirname4(fileURLToPath2(import.meta.url));
   const workspaceRoot = getWorkspaceRoot(process.cwd());
-  const ralphDir6 = join10(workspaceRoot, ".ralph");
-  const promptFile = join10(ralphDir6, "prompt.md");
-  const templatesDir = join10(__dirname, "..", "..", "templates");
-  if (existsSync9(promptFile)) {
-    return readFileSync5(promptFile, "utf-8");
+  const ralphDir6 = join11(workspaceRoot, ".ralph");
+  const promptFile = join11(ralphDir6, "prompt.prompt.md");
+  let templatesDir = join11(__dirname, "..", "..", "templates");
+  if (!existsSync8(join11(templatesDir, "core.prompt.md"))) {
+    templatesDir = join11(__dirname, "..", "templates");
+  }
+  if (existsSync8(promptFile)) {
+    return readFileSync6(promptFile, "utf-8");
   }
   const { content } = loadSessionPrompt({
     templatesDir,
@@ -821,7 +955,7 @@ var getPromptContent = () => {
 
 // src/lib/sdkMessageToEvent.ts
 var sdkMessageToEvent = (message) => {
-  if (message.type === "assistant" || message.type === "user" || message.type === "result") {
+  if (message.type === "assistant" || message.type === "result") {
     return message;
   }
   return null;
@@ -1167,7 +1301,7 @@ var renderStaticItem = (item) => {
     return /* @__PURE__ */ React4.createElement(Header, { claudeVersion: item.claudeVersion, ralphVersion: item.ralphVersion });
   }
   if (item.type === "session") {
-    return /* @__PURE__ */ React4.createElement(Box2, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Gradient2, { colors: ["#30A6E4", "#EBC635"] }, /* @__PURE__ */ React4.createElement(BigText2, { text: `R${item.session}`, font: "tiny" })));
+    return /* @__PURE__ */ React4.createElement(Box2, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Gradient2, { colors: ["#30A6E4", "#EBC635"] }, /* @__PURE__ */ React4.createElement(BigText2, { text: `R${item.session}`, font: "tiny" })), item.sessionId && /* @__PURE__ */ React4.createElement(React4.Fragment, null, /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, "session ", item.sessionId.slice(0, 8)), /* @__PURE__ */ React4.createElement(Text4, null, " ")));
   }
   const lines = formatContentBlock(item.block);
   return /* @__PURE__ */ React4.createElement(Box2, { flexDirection: "column", marginBottom: 1 }, lines.map((line, i) => /* @__PURE__ */ React4.createElement(Text4, { key: i }, line || " ")));
@@ -1175,8 +1309,8 @@ var renderStaticItem = (item) => {
 
 // src/components/SessionRunner.tsx
 var log2 = createDebugLogger("session");
-var ralphDir5 = join11(process.cwd(), ".ralph");
-var todoFile5 = join11(ralphDir5, "todo.md");
+var ralphDir5 = join12(process.cwd(), ".ralph");
+var todoFile5 = join12(ralphDir5, "todo.md");
 var repoName = basename(process.cwd());
 var SessionRunner = ({
   totalSessions,
@@ -1213,7 +1347,9 @@ var SessionRunner = ({
   const [isPaused, setIsPaused] = useState3(false);
   const isPausedRef = useRef(false);
   const [currentTaskId, setCurrentTaskId] = useState3(null);
+  const [sessionId, setSessionId] = useState3(null);
   const sessionIdRef = useRef(null);
+  const taskCompletedAbortRef = useRef(false);
   const [staticItems, setStaticItems] = useState3([
     { type: "header", claudeVersion, ralphVersion, key: "header" }
   ]);
@@ -1345,10 +1481,11 @@ var SessionRunner = ({
   }, [isWatching, startupSnapshot]);
   useEffect3(() => {
     const newItems = [];
-    if (currentSession > lastSessionRef.current) {
+    if (currentSession > lastSessionRef.current && sessionId) {
       newItems.push({
         type: "session",
         session: currentSession,
+        sessionId,
         key: `session-${currentSession}`
       });
       lastSessionRef.current = currentSession;
@@ -1364,7 +1501,7 @@ var SessionRunner = ({
     if (newItems.length > 0) {
       setStaticItems((prev) => [...prev, ...newItems]);
     }
-  }, [events, currentSession]);
+  }, [events, currentSession, sessionId]);
   useEffect3(() => {
     if (currentSession > totalSessions) {
       exit();
@@ -1380,16 +1517,12 @@ var SessionRunner = ({
       }
       return;
     }
-    if (!logFileRef.current) {
-      logFileRef.current = getNextLogFile();
-      writeFileSync2(logFileRef.current, "");
-    }
-    const logFile = logFileRef.current;
+    logFileRef.current = null;
     setEvents([]);
     const promptContent = getPromptContent();
-    const todoExists = existsSync10(todoFile5);
+    const todoExists = existsSync9(todoFile5);
     setHasTodoFile(todoExists);
-    const todoContent = todoExists ? readFileSync6(todoFile5, "utf-8") : "";
+    const todoContent = todoExists ? readFileSync7(todoFile5, "utf-8") : "";
     const roundHeader = `# Ralph, round ${currentSession}
 
 `;
@@ -1399,9 +1532,10 @@ var SessionRunner = ({
 
 ${todoContent}` : `${roundHeader}${promptContent}`;
     const abortController = new AbortController();
+    taskCompletedAbortRef.current = false;
     setIsRunning(true);
-    const sessionId = randomUUID();
-    sessionIdRef.current = sessionId;
+    sessionIdRef.current = null;
+    setSessionId(null);
     const messageQueue = new MessageQueue();
     messageQueueRef.current = messageQueue;
     messageQueue.push(createUserMessage(fullPrompt));
@@ -1427,7 +1561,18 @@ ${todoContent}` : `${roundHeader}${promptContent}`;
           }
         })) {
           log2(`Received message type: ${message.type}`);
-          appendFileSync(logFile, JSON.stringify(message) + "\n");
+          if (!logFileRef.current && message.type === "system" && "session_id" in message && typeof message.session_id === "string") {
+            const storageDir = join12(getDefaultStorageDir(), "ralph");
+            if (!existsSync9(storageDir)) {
+              mkdirSync3(storageDir, { recursive: true });
+            }
+            logFileRef.current = join12(storageDir, `${message.session_id.slice(0, 8)}.jsonl`);
+            sessionIdRef.current = message.session_id;
+            setSessionId(message.session_id);
+          }
+          if (logFileRef.current) {
+            appendFileSync(logFileRef.current, JSON.stringify(message) + "\n");
+          }
           const event = sdkMessageToEvent(message);
           if (event) {
             setEvents((prev) => [...prev, event]);
@@ -1443,22 +1588,32 @@ ${todoContent}` : `${roundHeader}${promptContent}`;
                     if (taskInfo.action === "starting") {
                       setCurrentTaskId(taskInfo.taskId ?? null);
                       log2(`Task started: ${taskInfo.taskId}`);
-                      const taskStartedEvent = {
-                        type: "ralph_task_started",
-                        taskId: taskInfo.taskId,
-                        session: currentSession,
-                        sessionId: sessionIdRef.current
-                      };
-                      appendFileSync(logFile, JSON.stringify(taskStartedEvent) + "\n");
+                      if (logFileRef.current) {
+                        const taskStartedEvent = {
+                          type: "ralph_task_started",
+                          taskId: taskInfo.taskId,
+                          session: currentSession,
+                          sessionId: sessionIdRef.current
+                        };
+                        appendFileSync(logFileRef.current, JSON.stringify(taskStartedEvent) + "\n");
+                      }
                     } else if (taskInfo.action === "completed") {
                       log2(`Task completed: ${taskInfo.taskId}`);
-                      const taskCompletedEvent = {
-                        type: "ralph_task_completed",
-                        taskId: taskInfo.taskId,
-                        session: currentSession,
-                        sessionId: sessionIdRef.current
-                      };
-                      appendFileSync(logFile, JSON.stringify(taskCompletedEvent) + "\n");
+                      if (logFileRef.current) {
+                        const taskCompletedEvent = {
+                          type: "ralph_task_completed",
+                          taskId: taskInfo.taskId,
+                          session: currentSession,
+                          sessionId: sessionIdRef.current
+                        };
+                        appendFileSync(
+                          logFileRef.current,
+                          JSON.stringify(taskCompletedEvent) + "\n"
+                        );
+                      }
+                      log2(`Aborting session after task completion to enforce session boundary`);
+                      taskCompletedAbortRef.current = true;
+                      abortController.abort();
                     }
                   }
                 }
@@ -1504,6 +1659,22 @@ ${todoContent}` : `${roundHeader}${promptContent}`;
         messageQueue.close();
         messageQueueRef.current = null;
         if (abortController.signal.aborted) {
+          if (taskCompletedAbortRef.current) {
+            log2(`Session aborted after task completion \u2014 advancing to next session`);
+            taskCompletedAbortRef.current = false;
+            if (stopAfterCurrentRef.current) {
+              log2(`Stop after current requested - exiting gracefully`);
+              exit();
+              process.exit(0);
+              return;
+            }
+            if (isPausedRef.current) {
+              log2(`Paused after session ${currentSession}`);
+              return;
+            }
+            setTimeout(() => setCurrentSession((i) => i + 1), 500);
+            return;
+          }
           log2(`Abort signal detected`);
           return;
         }
@@ -1540,7 +1711,7 @@ ${todoContent}` : `${roundHeader}${promptContent}`;
       color: userMessageStatus.type === "success" ? "green" : userMessageStatus.type === "error" ? "red" : "yellow"
     },
     userMessageStatus.text
-  ), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "\u2500".repeat(columns))), /* @__PURE__ */ React5.createElement(Box3, { marginTop: 1, justifyContent: "space-between" }, isWatching ? detectedIssue ? /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " New issue: ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, detectedIssue.IssueID), detectedIssue.Title ? ` - ${detectedIssue.Title}` : "") : /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, "Waiting for new issues ", /* @__PURE__ */ React5.createElement(Spinner, { type: "simpleDotsScrolling" })) : isPaused && !isRunning ? /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, "\u23F8 Paused after round ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " ", /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Ctrl-P to resume)")) : isRunning ? stopAfterCurrent ? /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " Stopping after round", " ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " completes...", " ", /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Ctrl-S pressed)")) : isPaused ? /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " Pausing after round", " ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " completes...", " ", /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Ctrl-P pressed)")) : /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " Running round ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " ", "(max ", totalSessions, ")") : /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "simpleDotsScrolling" }), " Waiting for Ralph to start..."), progressData.type !== "none" && progressData.total > 0 && /* @__PURE__ */ React5.createElement(
+  ), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "\u2500".repeat(columns))), /* @__PURE__ */ React5.createElement(Box3, { marginTop: 1, justifyContent: "space-between" }, isWatching ? detectedIssue ? /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " New issue: ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, detectedIssue.IssueID), detectedIssue.Title ? ` - ${detectedIssue.Title}` : "") : /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, "Waiting for new issues ", /* @__PURE__ */ React5.createElement(Spinner, { type: "simpleDotsScrolling" })) : isPaused && !isRunning ? /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, "\u23F8 Paused after round ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " ", /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Ctrl-P to resume)")) : isRunning ? stopAfterCurrent ? /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " Stopping after round", " ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " completes...", " ", /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Ctrl-S pressed)")) : isPaused ? /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " Pausing after round", " ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " completes...", " ", /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "(Ctrl-P pressed)")) : /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "dots" }), " Running round ", /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, currentSession), " ", "(max ", totalSessions, ")", sessionId && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " ", sessionId.slice(0, 8))) : /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, /* @__PURE__ */ React5.createElement(Spinner, { type: "simpleDotsScrolling" }), " Waiting for Ralph to start..."), progressData.type !== "none" && progressData.total > 0 && /* @__PURE__ */ React5.createElement(
     ProgressBar,
     {
       completed: progressData.completed,
@@ -1553,7 +1724,7 @@ ${todoContent}` : `${roundHeader}${promptContent}`;
 // src/components/ReplayLog.tsx
 import React8, { useState as useState5, useEffect as useEffect5 } from "react";
 import { Box as Box6, Text as Text8, useApp as useApp2 } from "ink";
-import { readFileSync as readFileSync7 } from "fs";
+import { readFileSync as readFileSync8 } from "fs";
 
 // src/components/EventDisplay.tsx
 import React6, { useMemo, useState as useState4, useEffect as useEffect4, useRef as useRef2 } from "react";
@@ -1792,7 +1963,7 @@ var ReplayLog = ({
   const [error, setError] = useState5();
   useEffect5(() => {
     try {
-      const content = readFileSync7(filePath, "utf-8");
+      const content = readFileSync8(filePath, "utf-8");
       const eventStrings = content.split(/\n\n+/).filter((s) => s.trim());
       const parsedEvents = [];
       for (const eventStr of eventStrings) {
@@ -1826,9 +1997,8 @@ var ReplayLog = ({
 // src/components/JsonOutput.tsx
 import React9, { useState as useState6, useEffect as useEffect6, useRef as useRef3 } from "react";
 import { useApp as useApp3, Text as Text9 } from "ink";
-import { writeFileSync as writeFileSync3, readFileSync as readFileSync8, existsSync as existsSync11 } from "fs";
-import { join as join12, basename as basename2 } from "path";
-import { randomUUID as randomUUID2 } from "crypto";
+import { readFileSync as readFileSync9, existsSync as existsSync10 } from "fs";
+import { join as join13, basename as basename2 } from "path";
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 
 // src/lib/parseStdinCommand.ts
@@ -1920,7 +2090,7 @@ var outputEvent = (event) => {
 
 // src/components/JsonOutput.tsx
 var log5 = createDebugLogger("session");
-var todoFile6 = join12(process.cwd(), ".ralph", "todo.md");
+var todoFile6 = join13(process.cwd(), ".ralph", "todo.md");
 var repoName2 = basename2(process.cwd());
 var JsonOutput = ({ totalSessions, agent }) => {
   const { exit } = useApp3();
@@ -1929,7 +2099,6 @@ var JsonOutput = ({ totalSessions, agent }) => {
   const [isRunning, setIsRunning] = useState6(false);
   const [startupSnapshot] = useState6(() => captureStartupSnapshot());
   const messageQueueRef = useRef3(null);
-  const logFileRef = useRef3(null);
   const [stopAfterCurrent, setStopAfterCurrent] = useState6(false);
   const stopAfterCurrentRef = useRef3(false);
   const [isPaused, setIsPaused] = useState6(false);
@@ -1988,13 +2157,9 @@ var JsonOutput = ({ totalSessions, agent }) => {
       process.exit(0);
       return;
     }
-    if (!logFileRef.current) {
-      logFileRef.current = getNextLogFile();
-      writeFileSync3(logFileRef.current, "");
-    }
     const promptContent = getPromptContent();
-    const todoExists = existsSync11(todoFile6);
-    const todoContent = todoExists ? readFileSync8(todoFile6, "utf-8") : "";
+    const todoExists = existsSync10(todoFile6);
+    const todoContent = todoExists ? readFileSync9(todoFile6, "utf-8") : "";
     const fullPrompt = todoContent ? `${promptContent}
 
 ## Current Todo List
@@ -2002,16 +2167,7 @@ var JsonOutput = ({ totalSessions, agent }) => {
 ${todoContent}` : promptContent;
     const abortController = new AbortController();
     setIsRunning(true);
-    const sessionId = randomUUID2();
-    sessionIdRef.current = sessionId;
-    outputEvent({
-      type: "ralph_session_start",
-      session: currentSession,
-      totalSessions,
-      repo: repoName2,
-      taskId: currentTaskIdRef.current,
-      sessionId
-    });
+    sessionIdRef.current = null;
     const messageQueue = new MessageQueue();
     messageQueueRef.current = messageQueue;
     messageQueue.push(createUserMessage(fullPrompt));
@@ -2036,6 +2192,17 @@ ${todoContent}` : promptContent;
           }
         })) {
           log5(`Received message type: ${message.type}`);
+          if (!sessionIdRef.current && message.type === "system" && "session_id" in message && typeof message.session_id === "string") {
+            sessionIdRef.current = message.session_id;
+            outputEvent({
+              type: "ralph_session_start",
+              session: currentSession,
+              totalSessions,
+              repo: repoName2,
+              taskId: currentTaskIdRef.current,
+              sessionId: message.session_id
+            });
+          }
           outputEvent(message);
           if (message.type === "assistant") {
             const assistantMessage = message.message;
@@ -2169,25 +2336,25 @@ var App = ({
 // src/components/InitRalph.tsx
 import { Text as Text10, Box as Box7 } from "ink";
 import React11, { useEffect as useEffect7, useState as useState7 } from "react";
-import { existsSync as existsSync13, readFileSync as readFileSync9, appendFileSync as appendFileSync2, writeFileSync as writeFileSync4 } from "fs";
-import { join as join14, dirname as dirname5 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { existsSync as existsSync12 } from "fs";
+import { join as join15, dirname as dirname6 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/lib/copyTemplates.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync3, copyFileSync as copyFileSync2 } from "fs";
-import { join as join13, dirname as dirname4 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync4, copyFileSync as copyFileSync2 } from "fs";
+import { join as join14, dirname as dirname5 } from "path";
 function copyTemplates(templatesDir, destDir, files) {
   const result = { created: [], skipped: [], errors: [] };
   for (const { src, dest } of files) {
-    const srcPath = join13(templatesDir, src);
-    const destPath = join13(destDir, dest);
-    const destDirPath = dirname4(destPath);
-    if (!existsSync12(destDirPath)) {
-      mkdirSync3(destDirPath, { recursive: true });
+    const srcPath = join14(templatesDir, src);
+    const destPath = join14(destDir, dest);
+    const destDirPath = dirname5(destPath);
+    if (!existsSync11(destDirPath)) {
+      mkdirSync4(destDirPath, { recursive: true });
     }
-    if (existsSync12(destPath)) {
+    if (existsSync11(destPath)) {
       result.skipped.push(dest);
-    } else if (existsSync12(srcPath)) {
+    } else if (existsSync11(srcPath)) {
       copyFileSync2(srcPath, destPath);
       result.created.push(dest);
     } else {
@@ -2199,20 +2366,20 @@ function copyTemplates(templatesDir, destDir, files) {
 
 // src/components/InitRalph.tsx
 function InitRalph() {
-  const __dirname = dirname5(fileURLToPath2(import.meta.url));
+  const __dirname = dirname6(fileURLToPath3(import.meta.url));
   const [status, setStatus] = useState7("checking");
   const [createdFiles, setCreatedFiles] = useState7([]);
   const [skippedFiles, setSkippedFiles] = useState7([]);
   const [errors, setErrors] = useState7([]);
   useEffect7(() => {
-    const ralphDir6 = join14(process.cwd(), ".ralph");
-    const claudeDir = join14(process.cwd(), ".claude");
-    if (existsSync13(join14(ralphDir6, "workflow.md"))) {
+    const ralphDir6 = join15(process.cwd(), ".ralph");
+    const claudeDir = join15(process.cwd(), ".claude");
+    if (existsSync12(join15(ralphDir6, "workflow.md"))) {
       setStatus("exists");
       return;
     }
     const initialize = async () => {
-      const templatesDir = join14(__dirname, "..", "..", "templates");
+      const templatesDir = join15(__dirname, "..", "..", "templates");
       setStatus("creating");
       try {
         const allCreated = [];
@@ -2238,21 +2405,6 @@ function InitRalph() {
         allCreated.push(...agentsResult.created.map((f) => `.claude/${f}`));
         allSkipped.push(...agentsResult.skipped.map((f) => `.claude/${f}`));
         allErrors.push(...agentsResult.errors);
-        const gitignorePath = join14(process.cwd(), ".gitignore");
-        const eventsLogEntry = ".ralph/events-*.jsonl";
-        if (existsSync13(gitignorePath)) {
-          const content = readFileSync9(gitignorePath, "utf-8");
-          if (!content.includes(eventsLogEntry)) {
-            const newline = content.endsWith("\n") ? "" : "\n";
-            appendFileSync2(gitignorePath, `${newline}${eventsLogEntry}
-`);
-            allCreated.push("(added .ralph/events-*.jsonl to .gitignore)");
-          }
-        } else {
-          writeFileSync4(gitignorePath, `${eventsLogEntry}
-`);
-          allCreated.push("(created .gitignore with .ralph/events-*.jsonl)");
-        }
         setCreatedFiles(allCreated);
         setSkippedFiles(allSkipped);
         setErrors(allErrors);
@@ -2319,20 +2471,17 @@ var getDefaultSessions = () => {
 };
 
 // src/lib/getLatestLogFile.ts
-import { join as join15 } from "path";
 var getLatestLogFile = () => {
-  const maxNumber = findMaxLogNumber();
-  if (maxNumber === 0) {
-    return void 0;
-  }
-  const ralphDir6 = join15(process.cwd(), ".ralph");
-  return join15(ralphDir6, `events-${maxNumber}.jsonl`);
+  const persister = new SessionPersister(getDefaultStorageDir());
+  const latestId = persister.getLatestSessionId("ralph");
+  if (!latestId) return void 0;
+  return persister.getSessionPath(latestId, "ralph");
 };
 
 // package.json
 var package_default = {
   name: "@herbcaudill/ralph",
-  version: "1.1.0",
+  version: "1.2.0",
   description: "Autonomous AI session engine for Claude CLI",
   type: "module",
   main: "./dist/index.js",
@@ -2351,7 +2500,7 @@ var package_default = {
     typecheck: "tsc --noEmit",
     ralph: "tsx src/index.ts",
     test: "vitest run",
-    "test:e2e": "vitest --config vitest.e2e.config.ts",
+    "test:pw": "vitest --config vitest.e2e.config.ts",
     "test:watch": "vitest --watch",
     "test:ui": "vitest --ui",
     format: "prettier --write . --log-level silent",
@@ -2372,7 +2521,7 @@ var package_default = {
     url: "https://github.com/HerbCaudill/ralph.git"
   },
   dependencies: {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.7",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.29",
     chalk: "^5.6.2",
     commander: "^14.0.2",
     ink: "^6.6.0",