claude-relay 2.3.0 → 2.4.0

package/README.md

@@ -6,7 +6,7 @@
 
 <h3 align="center">Web UI for Claude Code. Any device. Push notifications.</h3>
 
-[![npm version](https://img.shields.io/npm/v/claude-relay)](https://www.npmjs.com/package/claude-relay) [![npm downloads](https://img.shields.io/npm/dw/claude-relay)](https://www.npmjs.com/package/claude-relay) [![GitHub stars](https://img.shields.io/github/stars/chadbyte/claude-relay)](https://github.com/chadbyte/claude-relay)
+[![npm version](https://img.shields.io/npm/v/claude-relay)](https://www.npmjs.com/package/claude-relay) [![npm downloads](https://img.shields.io/npm/dw/claude-relay)](https://www.npmjs.com/package/claude-relay) [![GitHub stars](https://img.shields.io/github/stars/chadbyte/claude-relay)](https://github.com/chadbyte/claude-relay) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/chadbyte/claude-relay/blob/main/LICENSE)
 
 Claude Code. Anywhere.  
 Same session. Same files. Same machine.  
@@ -86,7 +86,7 @@ Scan the QR code with your phone to connect instantly, or open the URL displayed
 ## Key Features
 
 * **Push Approvals** - Approve or reject from your phone while away, so Claude Code does not get stuck waiting.
-* **Multi Project Daemon** - Manage all projects via a single port.
+* **Multi Project Daemon** - Manage all projects via a single port. Add and remove projects from the browser.
 * **Usage and Model Switching** - View token usage, rate limit bars, and switch models from the browser.
 * **Session Search** - Full-text search across all session messages with hit timeline.
 * **Auto Session Logs (JSONL)** - Conversations and execution history are always saved locally. No data loss on crashes or restarts. Location: `./.claude-relay/sessions/`
@@ -105,10 +105,10 @@ Scan the QR code with your phone to connect instantly, or open the URL displayed
 
 **Projects and Sessions**
 
-* **Multi Project** - Single port management for all projects.
+* **Multi Project** - Single port management for all projects. Add and remove projects from the browser with path autocomplete.
 * **Project Names** - Custom names make it easy to distinguish tabs.
 * **Session Persistence** - Sessions survive server restarts, browser crashes, and network drops.
-* **Session Handoff** - Start in the terminal, continue on your phone, pass back to desktop.
+* **Session Handoff** - Start in the terminal, continue on your phone, pass back to desktop. Browse and resume CLI sessions directly from the web UI.
 * **Session Search** - Full-text search across all session content with highlighted results and a rewind-style hit timeline.
 * **Rewind (Native Claude Code)** - Accessible directly from the browser UI.
 * **Draft Persistence** - Unsent messages are saved per session and restored when you switch back.
@@ -133,6 +133,7 @@ Scan the QR code with your phone to connect instantly, or open the URL displayed
 * **Send While Processing** - Queue messages without waiting for the current response to finish.
 * **Sticky Todo Overlay** - TodoWrite tasks float as a progress bar while you scroll through the conversation.
 * **Scroll Position Hold** - Reading earlier messages will not get interrupted by new content arriving.
+* **RTL Text Support** - Automatic bidirectional text rendering for Arabic, Hebrew, and other RTL languages.
 
 **Server and Security**
 
@@ -182,7 +183,7 @@ If push registration fails: check whether your browser trusts HTTPS and whether
 ```bash
 npx claude-relay              # Default (port 2633)
 npx claude-relay -p 8080      # Specify port
-npx claude-relay -y           # Skip interactive prompts (accept defaults)
+npx claude-relay --yes        # Skip interactive prompts (accept defaults)
 npx claude-relay -y --pin 123456
                               # Non-interactive with PIN (for scripts/CI)
 npx claude-relay --no-https   # Disable HTTPS
@@ -195,6 +196,7 @@ npx claude-relay --list       # List registered projects
 npx claude-relay --shutdown   # Stop the running daemon
 npx claude-relay --dangerously-skip-permissions
                               # Bypass all permission prompts (PIN required during setup)
+npx claude-relay --dev        # Development mode (foreground, auto-restart on lib/ changes, port 2635)
 ```
 
 ## Requirements
@@ -204,6 +206,20 @@ npx claude-relay --dangerously-skip-permissions
 * [mkcert](https://github.com/FiloSottile/mkcert) - For push notifications (optional)
 * [Tailscale](https://tailscale.com) - For remote access (optional)
 
+## Why claude-relay?
+
+**Why not just use tmux + Termius?**
+You can monitor the terminal remotely, but there are no push notifications and no way to approve permission requests without switching back to the terminal. On a phone, navigating a raw terminal session is clunky. You end up checking manually instead of getting notified, and the experience never feels native.
+
+**Why not just add hooks to send notifications?**
+Hooks with ntfy or Pushover can get you push notifications, but you still need shell scripts, config files, and third-party accounts just to get alerts. And once you get the notification, there is no UI to approve or reject from. You are back to opening a terminal. claude-relay gives you notifications, a one-tap approval UI, and a full web interface with a single command.
+
+**Why not use Claude Code Desktop?**
+The desktop app works great on your computer, but there is no mobile version. To access sessions from your phone, you need remote sessions on Anthropic's cloud, which requires pushing your code to GitHub first. claude-relay runs entirely on your machine and lets you connect from any device on your network.
+
+**Why not use Happy Coder?**
+Happy Coder requires installing a native app and routes through its own relay server with end-to-end encryption. claude-relay *is* the relay server, running on your machine. Open a URL and you are in. No app install, no signup, nothing leaves your network.
+
 ## Architecture
 
 claude-relay is not a wrapper that intercepts standard input/output.

package/bin/cli.js

@@ -6,6 +6,13 @@ var path = require("path");
 var { execSync, execFileSync, spawn } = require("child_process");
 var qrcode = require("qrcode-terminal");
 var net = require("net");
+
+// Detect dev mode before loading config (env must be set before require)
+var _isDev = (process.argv[1] && path.basename(process.argv[1]) === "claude-relay-dev") || process.argv.includes("--dev");
+if (_isDev) {
+  process.env.CLAUDE_RELAY_HOME = path.join(os.homedir(), ".claude-relay-dev");
+}
+
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");
 var { generateAuthToken } = require("../lib/server");
@@ -22,7 +29,7 @@ function openUrl(url) {
 }
 
 var args = process.argv.slice(2);
-var port = 2633;
+var port = _isDev ? 2635 : 2633;
 var useHttps = true;
 var skipUpdate = false;
 var debugMode = false;
@@ -33,6 +40,7 @@ var addPath = null;
 var removePath = null;
 var listMode = false;
 var dangerouslySkipPermissions = false;
+var headlessMode = false;
 
 for (var i = 0; i < args.length; i++) {
   if (args[i] === "-p" || args[i] === "--port") {
@@ -46,6 +54,8 @@ for (var i = 0; i < args.length; i++) {
     useHttps = false;
   } else if (args[i] === "--no-update" || args[i] === "--skip-update") {
     skipUpdate = true;
+  } else if (args[i] === "--dev") {
+    // Already handled above for CLAUDE_RELAY_HOME, just skip
   } else if (args[i] === "--debug") {
     debugMode = true;
   } else if (args[i] === "-y" || args[i] === "--yes") {
@@ -63,6 +73,9 @@ for (var i = 0; i < args.length; i++) {
     i++;
   } else if (args[i] === "--list") {
     listMode = true;
+  } else if (args[i] === "--headless") {
+    headlessMode = true;
+    autoYes = true;
   } else if (args[i] === "--dangerously-skip-permissions") {
     dangerouslySkipPermissions = true;
   } else if (args[i] === "-h" || args[i] === "--help") {
@@ -82,12 +95,19 @@ for (var i = 0; i < args.length; i++) {
     console.log("  --add <path>       Add a project directory (use '.' for current)");
     console.log("  --remove <path>    Remove a project directory");
     console.log("  --list             List all registered projects");
+    console.log("  --headless         Start daemon and exit immediately (implies --yes)");
     console.log("  --dangerously-skip-permissions");
     console.log("                     Bypass all permission prompts (requires --pin)");
     process.exit(0);
   }
 }
 
+// Dev mode implies debug + skip update
+if (_isDev) {
+  debugMode = true;
+  skipUpdate = true;
+}
+
 // --- Handle --shutdown before anything else ---
 if (shutdownMode) {
   var shutdownConfig = loadConfig();
@@ -467,7 +487,7 @@ function getAllIPs() {
 
 function ensureCerts(ip) {
   var homeDir = os.homedir();
-  var certDir = path.join(homeDir, ".claude-relay", "certs");
+  var certDir = path.join(process.env.CLAUDE_RELAY_HOME || path.join(homeDir, ".claude-relay"), "certs");
   var keyPath = path.join(certDir, "key.pem");
   var certPath = path.join(certDir, "cert.pem");
 
@@ -1168,7 +1188,7 @@ function setup(callback) {
 // ==============================
 // Fork the daemon process
 // ==============================
-async function forkDaemon(pin, keepAwake, extraProjects) {
+async function forkDaemon(pin, keepAwake, extraProjects, addCwd) {
   var ip = getLocalIP();
   var hasTls = false;
 
@@ -1190,12 +1210,18 @@ async function forkDaemon(pin, keepAwake, extraProjects) {
     return;
   }
 
-  var slug = generateSlug(cwd, []);
-  var allProjects = [{ path: cwd, slug: slug, addedAt: Date.now() }];
+  var allProjects = [];
+  var usedSlugs = [];
+
+  // Only include cwd if explicitly requested
+  if (addCwd) {
+    var slug = generateSlug(cwd, []);
+    allProjects.push({ path: cwd, slug: slug, addedAt: Date.now() });
+    usedSlugs.push(slug);
+  }
 
   // Add restored projects (from ~/.clayrc)
   if (extraProjects && extraProjects.length > 0) {
-    var usedSlugs = [slug];
     for (var ep = 0; ep < extraProjects.length; ep++) {
       var rp = extraProjects[ep];
       if (rp.path === cwd) continue; // skip if same as cwd
@@ -1253,10 +1279,165 @@ async function forkDaemon(pin, keepAwake, extraProjects) {
     return;
   }
 
+  // Headless mode — print status and exit immediately
+  if (headlessMode) {
+    var protocol = config.tls ? "https" : "http";
+    var url = protocol + "://" + ip + ":" + config.port;
+    console.log("  " + sym.done + "  Daemon started (PID " + config.pid + ")");
+    console.log("  " + sym.done + "  " + url);
+    console.log("  " + sym.done + "  Headless mode — exiting CLI");
+    process.exit(0);
+    return;
+  }
+
   // Show success + QR
   showServerStarted(config, ip);
 }
 
+// ==============================
+// Dev mode — foreground daemon with file watching
+// ==============================
+async function devMode(pin, keepAwake, existingPinHash) {
+  var ip = getLocalIP();
+  var hasTls = false;
+
+  if (useHttps) {
+    var certPaths = ensureCerts(ip);
+    if (certPaths) hasTls = true;
+  }
+
+  var portFree = await isPortFree(port);
+  if (!portFree) {
+    console.log("\x1b[31m[dev] Port " + port + " is already in use.\x1b[0m");
+    process.exit(1);
+    return;
+  }
+
+  var slug = generateSlug(cwd, []);
+  var allProjects = [{ path: cwd, slug: slug, addedAt: Date.now() }];
+
+  // Restore previous projects
+  var rc = loadClayrc();
+  var restorable = (rc.recentProjects || []).filter(function (p) {
+    return p.path !== cwd && fs.existsSync(p.path);
+  });
+  var usedSlugs = [slug];
+  for (var ri = 0; ri < restorable.length; ri++) {
+    var rp = restorable[ri];
+    var rpSlug = generateSlug(rp.path, usedSlugs);
+    usedSlugs.push(rpSlug);
+    allProjects.push({ path: rp.path, slug: rpSlug, title: rp.title || undefined, addedAt: rp.addedAt || Date.now() });
+  }
+
+  var config = {
+    pid: null,
+    port: port,
+    pinHash: existingPinHash || (pin ? generateAuthToken(pin) : null),
+    tls: hasTls,
+    debug: true,
+    keepAwake: keepAwake || false,
+    dangerouslySkipPermissions: dangerouslySkipPermissions,
+    projects: allProjects,
+  };
+
+  ensureConfigDir();
+  saveConfig(config);
+
+  var daemonScript = path.join(__dirname, "..", "lib", "daemon.js");
+  var libDir = path.join(__dirname, "..", "lib");
+  var child = null;
+  var intentionalKill = false;
+  var debounceTimer = null;
+
+  function spawnDaemon() {
+    child = spawn(process.execPath, [daemonScript], {
+      stdio: ["ignore", "inherit", "inherit"],
+      env: Object.assign({}, process.env, {
+        CLAUDE_RELAY_CONFIG: configPath(),
+      }),
+    });
+
+    child.on("exit", function (code) {
+      child = null;
+      if (intentionalKill) {
+        intentionalKill = false;
+        return;
+      }
+      // Unexpected exit — auto restart
+      console.log("\x1b[33m[dev] Daemon exited (code " + code + "), restarting...\x1b[0m");
+      setTimeout(spawnDaemon, 500);
+    });
+  }
+
+  function restartDaemon() {
+    intentionalKill = true;
+    if (child) {
+      child.kill("SIGTERM");
+      // Give it a moment to shut down, then spawn
+      setTimeout(spawnDaemon, 300);
+    } else {
+      intentionalKill = false;
+      spawnDaemon();
+    }
+  }
+
+  console.log("\x1b[36m[dev]\x1b[0m Starting relay on port " + port + "...");
+  console.log("\x1b[36m[dev]\x1b[0m Watching lib/ for changes (excluding lib/public/)");
+  console.log("");
+
+  spawnDaemon();
+
+  // Wait for daemon to be ready, then show CLI menu
+  await new Promise(function (resolve) { setTimeout(resolve, 1000); });
+  config.pid = child ? child.pid : null;
+  saveConfig(config);
+
+  var daemonReady = await isDaemonAliveAsync(config);
+  if (daemonReady) {
+    showServerStarted(config, ip);
+  }
+
+  // Watch lib/ for server-side file changes
+  var watcher = fs.watch(libDir, { recursive: true }, function (eventType, filename) {
+    if (!filename) return;
+    // Skip client-side files — they're served from disk
+    if (filename.startsWith("public" + path.sep) || filename.startsWith("public/")) return;
+    // Skip non-JS files
+    if (!filename.endsWith(".js")) return;
+
+    if (debounceTimer) clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(function () {
+      console.log("\x1b[36m[dev]\x1b[0m File changed: lib/" + filename);
+      console.log("\x1b[36m[dev]\x1b[0m Restarting...");
+      console.log("");
+      restartDaemon();
+    }, 300);
+  });
+
+  // Clean exit on Ctrl+C
+  var shuttingDown = false;
+  process.on("SIGINT", function () {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    console.log("\n\x1b[36m[dev]\x1b[0m Shutting down...");
+    watcher.close();
+    if (debounceTimer) clearTimeout(debounceTimer);
+    intentionalKill = true;
+    if (child) {
+      child.kill("SIGTERM");
+      child.on("exit", function () {
+        clearStaleConfig();
+        process.exit(0);
+      });
+      // Force kill after 3s
+      setTimeout(function () { process.exit(0); }, 3000);
+    } else {
+      clearStaleConfig();
+      process.exit(0);
+    }
+  });
+}
+
 // ==============================
 // Restart daemon with TLS enabled
 // ==============================
@@ -1991,6 +2172,28 @@ var currentVersion = require("../package.json").version;
   var updated = await checkAndUpdate(currentVersion, skipUpdate);
   if (updated) return;
 
+  // Dev mode — foreground daemon with file watching
+  if (_isDev) {
+    var devConfig = loadConfig();
+    var devAlive = devConfig ? await isDaemonAliveAsync(devConfig) : false;
+    if (devAlive) {
+      console.log("\x1b[36m[dev]\x1b[0m Shutting down existing daemon...");
+      await sendIPCCommand(socketPath(), { cmd: "shutdown" });
+      clearStaleConfig();
+      await new Promise(function (resolve) { setTimeout(resolve, 500); });
+    }
+    // First run — go through setup (disclaimer, port, PIN, etc.)
+    if (!devConfig) {
+      setup(function (pin, keepAwake) {
+        devMode(pin, keepAwake, null);
+      });
+    } else {
+      // Reuse existing PIN hash from previous config
+      await devMode(cliPin || null, devConfig.keepAwake || false, devConfig.pinHash || null);
+    }
+    return;
+  }
+
   var config = loadConfig();
   var alive = config ? await isDaemonAliveAsync(config) : false;
 
@@ -2072,7 +2275,8 @@ var currentVersion = require("../package.json").version;
       if (autoRestorable.length > 0) {
         console.log("  " + sym.done + "  Restoring " + autoRestorable.length + " previous project(s)");
       }
-      await forkDaemon(pin, false, autoRestorable.length > 0 ? autoRestorable : undefined);
+      var hasRestorable = autoRestorable.length > 0;
+      await forkDaemon(pin, false, hasRestorable ? autoRestorable : undefined, !hasRestorable);
     } else {
       setup(function (pin, keepAwake) {
         if (dangerouslySkipPermissions && !pin) {
@@ -2081,6 +2285,7 @@ var currentVersion = require("../package.json").version;
           process.exit(1);
           return;
         }
+
         // Check ~/.clayrc for previous projects to restore
         var rc = loadClayrc();
         var restorable = (rc.recentProjects || []).filter(function (p) {
@@ -2089,13 +2294,13 @@ var currentVersion = require("../package.json").version;
 
         if (restorable.length > 0) {
           promptRestoreProjects(restorable, function (selected) {
-            forkDaemon(pin, keepAwake, selected);
+            forkDaemon(pin, keepAwake, selected, false);
           });
         } else {
           log(sym.bar);
           log(sym.end + "  " + a.dim + "Starting relay..." + a.reset);
           log("");
-          forkDaemon(pin, keepAwake);
+          forkDaemon(pin, keepAwake, undefined, true);
         }
       });
     }

package/lib/cli-sessions.js

@@ -0,0 +1,270 @@
+var fs = require("fs");
+var path = require("path");
+var os = require("os");
+var readline = require("readline");
+
+/**
+ * Compute the encoded project directory name used by the Claude CLI.
+ * Replaces all "/" with "-", e.g. "/Users/foo/project" -> "-Users-foo-project"
+ */
+function encodeCwd(cwd) {
+  return cwd.replace(/\//g, "-");
+}
+
+/**
+ * Parse the first ~20 lines of a CLI session JSONL file to extract metadata.
+ * Returns null if the file can't be parsed or has no user messages.
+ */
+function parseSessionFile(filePath, maxLines) {
+  if (maxLines == null) maxLines = 20;
+  return new Promise(function (resolve) {
+    var sessionId = path.basename(filePath, ".jsonl");
+    var result = {
+      sessionId: sessionId,
+      firstPrompt: "",
+      model: null,
+      gitBranch: null,
+      startTime: null,
+      lastActivity: null,
+    };
+
+    var lineCount = 0;
+    var foundUser = false;
+    var stream;
+    try {
+      stream = fs.createReadStream(filePath, { encoding: "utf8" });
+    } catch (e) {
+      return resolve(null);
+    }
+
+    var rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+
+    rl.on("line", function (line) {
+      lineCount++;
+      if (lineCount > maxLines) {
+        rl.close();
+        stream.destroy();
+        return;
+      }
+
+      var obj;
+      try { obj = JSON.parse(line); } catch (e) { return; }
+
+      // Skip file-history-snapshot, queue-operation, and other non-message records
+      if (obj.type === "user" && obj.message && obj.message.role === "user") {
+        if (!foundUser) {
+          foundUser = true;
+          result.sessionId = obj.sessionId || sessionId;
+          result.gitBranch = obj.gitBranch || null;
+          if (obj.timestamp) result.startTime = obj.timestamp;
+          var content = obj.message.content || "";
+          if (typeof content === "string") {
+            result.firstPrompt = content.substring(0, 100);
+          } else if (Array.isArray(content)) {
+            for (var i = 0; i < content.length; i++) {
+              if (content[i].type === "text" && content[i].text) {
+                result.firstPrompt = content[i].text.substring(0, 100);
+                break;
+              }
+            }
+          }
+        }
+        // Track latest user timestamp for lastActivity
+        if (obj.timestamp) result.lastActivity = obj.timestamp;
+      }
+
+      // Extract model from first assistant message
+      if (!result.model && obj.message && obj.message.role === "assistant" && obj.message.model) {
+        result.model = obj.message.model;
+      }
+    });
+
+    rl.on("close", function () {
+      if (!foundUser) return resolve(null);
+
+      // Use file mtime as fallback for lastActivity, or as a better proxy
+      // since we only read the first ~20 lines
+      try {
+        var stat = fs.statSync(filePath);
+        var mtime = stat.mtime.toISOString();
+        // File mtime is always more accurate for "last activity" since we
+        // don't read the entire file
+        result.lastActivity = mtime;
+      } catch (e) {}
+
+      resolve(result);
+    });
+
+    rl.on("error", function () {
+      resolve(null);
+    });
+
+    stream.on("error", function () {
+      rl.close();
+      resolve(null);
+    });
+  });
+}
+
+/**
+ * List CLI sessions for a given project directory.
+ * Reads ~/.claude/projects/{encoded-cwd}/ and parses JSONL metadata.
+ * Returns array sorted by lastActivity descending (most recent first).
+ */
+function listCliSessions(cwd) {
+  var encoded = encodeCwd(cwd);
+  var projectDir = path.join(os.homedir(), ".claude", "projects", encoded);
+
+  return new Promise(function (resolve) {
+    fs.readdir(projectDir, { withFileTypes: true }, function (err, entries) {
+      if (err) return resolve([]);
+
+      var jsonlFiles = [];
+      for (var i = 0; i < entries.length; i++) {
+        if (entries[i].isFile() && entries[i].name.endsWith(".jsonl")) {
+          jsonlFiles.push(path.join(projectDir, entries[i].name));
+        }
+      }
+
+      if (jsonlFiles.length === 0) return resolve([]);
+
+      var pending = jsonlFiles.length;
+      var results = [];
+
+      for (var j = 0; j < jsonlFiles.length; j++) {
+        parseSessionFile(jsonlFiles[j]).then(function (session) {
+          if (session) results.push(session);
+          pending--;
+          if (pending === 0) {
+            results.sort(function (a, b) {
+              var ta = a.lastActivity || "";
+              var tb = b.lastActivity || "";
+              return ta < tb ? 1 : ta > tb ? -1 : 0;
+            });
+            resolve(results);
+          }
+        });
+      }
+    });
+  });
+}
+
+/**
+ * Get the most recent CLI session for a given project directory.
+ * Returns the session object or null if none found.
+ */
+function getMostRecentCliSession(cwd) {
+  return listCliSessions(cwd).then(function (sessions) {
+    return sessions.length > 0 ? sessions[0] : null;
+  });
+}
+
+/**
+ * Extract user message text from a CLI JSONL content field.
+ * Content can be a string or an array of content blocks.
+ */
+function extractText(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  var parts = [];
+  for (var i = 0; i < content.length; i++) {
+    if (content[i].type === "text" && content[i].text) {
+      parts.push(content[i].text);
+    }
+  }
+  return parts.join("");
+}
+
+/**
+ * Read a full CLI session JSONL file and convert it to relay-compatible
+ * history entries (user_message, delta, tool_start, tool_executing, tool_result).
+ * Returns a Promise that resolves to an array of history entries.
+ */
+function readCliSessionHistory(cwd, sessionId) {
+  var encoded = encodeCwd(cwd);
+  var filePath = path.join(os.homedir(), ".claude", "projects", encoded, sessionId + ".jsonl");
+
+  return new Promise(function (resolve) {
+    var history = [];
+    var stream;
+    try {
+      stream = fs.createReadStream(filePath, { encoding: "utf8" });
+    } catch (e) {
+      return resolve([]);
+    }
+
+    var rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+    var toolCounter = 0;
+
+    rl.on("line", function (line) {
+      var obj;
+      try { obj = JSON.parse(line); } catch (e) { return; }
+
+      if (!obj.message) return;
+
+      // User prompt
+      if (obj.type === "user" && obj.message.role === "user") {
+        // Skip tool_result records (they have type "user" but content is tool results)
+        var content = obj.message.content;
+        if (Array.isArray(content) && content.length > 0 && content[0].type === "tool_result") {
+          return;
+        }
+        var text = extractText(content);
+        if (text) {
+          history.push({ type: "user_message", text: text });
+        }
+        return;
+      }
+
+      // Assistant message
+      if (obj.message.role === "assistant" && Array.isArray(obj.message.content)) {
+        for (var i = 0; i < obj.message.content.length; i++) {
+          var block = obj.message.content[i];
+
+          if (block.type === "text" && block.text) {
+            history.push({ type: "delta", text: block.text });
+          }
+
+          if (block.type === "tool_use") {
+            var toolId = "cli-tool-" + (++toolCounter);
+            var toolName = block.name || "Tool";
+            history.push({ type: "tool_start", id: toolId, name: toolName });
+            history.push({
+              type: "tool_executing",
+              id: toolId,
+              name: toolName,
+              input: block.input || {},
+            });
+            // Emit ask_user_answered so the client re-enables input after replaying AskUserQuestion
+            if (toolName === "AskUserQuestion") {
+              history.push({ type: "ask_user_answered", toolId: toolId });
+            }
+            history.push({ type: "tool_result", id: toolId, content: "" });
+          }
+        }
+      }
+    });
+
+    rl.on("close", function () {
+      resolve(history);
+    });
+
+    rl.on("error", function () {
+      resolve([]);
+    });
+
+    stream.on("error", function () {
+      rl.close();
+      resolve([]);
+    });
+  });
+}
+
+module.exports = {
+  listCliSessions: listCliSessions,
+  getMostRecentCliSession: getMostRecentCliSession,
+  readCliSessionHistory: readCliSessionHistory,
+  parseSessionFile: parseSessionFile,
+  encodeCwd: encodeCwd,
+  extractText: extractText,
+};