@bulletproof-sh/ctrl-daemon 0.0.13 → 0.0.15

package/dist/index.js

@@ -11,6 +11,7 @@ var __export = (target, all) => {
 };
 
 // src/index.ts
+import * as fs3 from "fs";
 import * as path3 from "path";
 
 // src/analytics.ts
@@ -4315,7 +4316,7 @@ var PANEL_MARGIN_X = 5;
 var PANEL_MARGIN_Y = 3;
 var PANEL_MIN_WIDTH = 40;
 var PANEL_MIN_HEIGHT = 12;
-var PANEL_HEADER_HEIGHT = 8;
+var PANEL_HEADER_HEIGHT = 9;
 var LOG_RING_SIZE = 200;
 var BORDER_GLOW_SPEED = 0.05;
 var BOX = {
@@ -4842,10 +4843,19 @@ function restoreConsole() {
 }
 
 // src/sessionWatcher.ts
-function startSessionWatcher(agentId, filePath, agents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast) {
+var SHARED_BUF_SIZE = 64 * 1024;
+var sharedReadBuf = Buffer.allocUnsafe(SHARED_BUF_SIZE);
+function startSessionWatcher(agentId, filePath, agents, openFds, staleAgents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast) {
+  try {
+    const fd = fs.openSync(filePath, "r");
+    openFds.set(agentId, fd);
+  } catch (e) {
+    daemonLog(`Failed to open fd for agent ${agentId}: ${e}`);
+    return;
+  }
   try {
     const watcher = fs.watch(filePath, () => {
-      readNewLines(agentId, agents, waitingTimers, permissionTimers, broadcast);
+      readNewLines(agentId, agents, openFds, staleAgents, waitingTimers, permissionTimers, broadcast);
     });
     fileWatchers.set(agentId, watcher);
   } catch (e) {
@@ -4856,47 +4866,58 @@ function startSessionWatcher(agentId, filePath, agents, fileWatchers, pollingTim
       clearInterval(interval);
       return;
     }
-    readNewLines(agentId, agents, waitingTimers, permissionTimers, broadcast);
+    readNewLines(agentId, agents, openFds, staleAgents, waitingTimers, permissionTimers, broadcast);
   }, FILE_WATCHER_POLL_INTERVAL_MS);
   pollingTimers.set(agentId, interval);
 }
-function readNewLines(agentId, agents, waitingTimers, permissionTimers, broadcast) {
+function readNewLines(agentId, agents, openFds, staleAgents, waitingTimers, permissionTimers, broadcast) {
   const agent = agents.get(agentId);
   if (!agent)
     return;
+  const fd = openFds.get(agentId);
+  if (fd === undefined)
+    return;
   try {
-    const stat = fs.statSync(agent.jsonlFile);
+    const stat = fs.fstatSync(fd);
     if (stat.size <= agent.fileOffset)
       return;
-    const buf = Buffer.alloc(stat.size - agent.fileOffset);
-    const fd = fs.openSync(agent.jsonlFile, "r");
-    fs.readSync(fd, buf, 0, buf.length, agent.fileOffset);
-    fs.closeSync(fd);
+    const readSize = stat.size - agent.fileOffset;
+    const buf = readSize <= sharedReadBuf.length ? sharedReadBuf : Buffer.allocUnsafe(readSize);
+    const bytesRead = fs.readSync(fd, buf, 0, readSize, agent.fileOffset);
     agent.fileOffset = stat.size;
-    const text = agent.lineBuffer + buf.toString("utf-8");
+    const text = agent.lineBuffer + buf.toString("utf-8", 0, bytesRead);
     const lines = text.split(`
 `);
     agent.lineBuffer = lines.pop() || "";
-    const hasLines = lines.some((l) => l.trim());
-    if (hasLines) {
-      agent.lastActivityAt = Date.now();
-      cancelWaitingTimer(agentId, waitingTimers);
-      cancelPermissionTimer(agentId, permissionTimers);
-      if (agent.permissionSent) {
-        agent.permissionSent = false;
-        broadcast({ type: "agentToolPermissionClear", id: agentId });
-      }
-    }
+    let activityUpdated = false;
     for (const line of lines) {
       if (!line.trim())
         continue;
+      if (!activityUpdated) {
+        agent.lastActivityAt = Date.now();
+        cancelWaitingTimer(agentId, waitingTimers);
+        cancelPermissionTimer(agentId, permissionTimers);
+        if (agent.permissionSent) {
+          agent.permissionSent = false;
+          broadcast({ type: "agentToolPermissionClear", id: agentId });
+        }
+        activityUpdated = true;
+      }
       processTranscriptLine(agentId, line, agents, waitingTimers, permissionTimers, broadcast);
     }
   } catch (e) {
     daemonLog(`Read error for agent ${agentId}: ${e}`);
+    staleAgents.add(agentId);
   }
 }
-function stopSessionWatcher(agentId, fileWatchers, pollingTimers, waitingTimers, permissionTimers) {
+function stopSessionWatcher(agentId, openFds, fileWatchers, pollingTimers, waitingTimers, permissionTimers) {
+  const fd = openFds.get(agentId);
+  if (fd !== undefined) {
+    try {
+      fs.closeSync(fd);
+    } catch {}
+    openFds.delete(agentId);
+  }
   fileWatchers.get(agentId)?.close();
   fileWatchers.delete(agentId);
   const pt = pollingTimers.get(agentId);
@@ -4960,7 +4981,7 @@ function collectAllJsonlFiles(projectsRoot) {
   }
   return files;
 }
-function startProjectScanner(rootDir, scanAll, agents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast, idleTimeoutMs) {
+function startProjectScanner(rootDir, scanAll, agents, openFds, staleAgents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast, idleTimeoutMs) {
   const knownJsonlFiles = new Set;
   let nextAgentId = 1;
   function scan() {
@@ -4993,17 +5014,18 @@ function startProjectScanner(rootDir, scanAll, agents, fileWatchers, pollingTime
       agents.set(id, agent);
       daemonLog(`Agent ${id}: watching ${path2.basename(filePath)}`);
       broadcast({ type: "agentCreated", id });
-      startSessionWatcher(id, filePath, agents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast);
-      readNewLines(id, agents, waitingTimers, permissionTimers, broadcast);
+      startSessionWatcher(id, filePath, agents, openFds, staleAgents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast);
+      readNewLines(id, agents, openFds, staleAgents, waitingTimers, permissionTimers, broadcast);
     }
     for (const [agentId, agent] of agents) {
       const lastActivity = agent.lastActivityAt || 0;
       const idle = now - lastActivity > idleTimeoutMs;
-      const removed = !fs2.existsSync(agent.jsonlFile);
+      const removed = staleAgents.has(agentId);
       if (removed || idle) {
         const reason = removed ? "JSONL removed" : "idle timeout";
         daemonLog(`Agent ${agentId}: ${reason}, closing`);
-        stopSessionWatcher(agentId, fileWatchers, pollingTimers, waitingTimers, permissionTimers);
+        staleAgents.delete(agentId);
+        stopSessionWatcher(agentId, openFds, fileWatchers, pollingTimers, waitingTimers, permissionTimers);
         agents.delete(agentId);
         knownJsonlFiles.delete(agent.jsonlFile);
         broadcast({ type: "agentClosed", id: agentId });
@@ -5118,6 +5140,7 @@ var CURSOR_SHOW = "\x1B[?25h";
 var CLEAR_SCREEN = "\x1B[2J";
 var RESET_ATTRS = "\x1B[0m";
 var resizeCallback = null;
+var moveToTable = [];
 function onSigwinch() {
   resizeCallback?.();
 }
@@ -5144,8 +5167,19 @@ function offResize() {
   resizeCallback = null;
   process.removeListener("SIGWINCH", onSigwinch);
 }
+function buildMoveToTable(rows, cols) {
+  const table = [];
+  for (let r = 0;r <= rows; r++) {
+    const row = [];
+    for (let c = 0;c <= cols; c++) {
+      row.push(`\x1B[${r};${c}H`);
+    }
+    table.push(row);
+  }
+  moveToTable = table;
+}
 function moveTo(row, col) {
-  return `\x1B[${row};${col}H`;
+  return moveToTable[row]?.[col] ?? `\x1B[${row};${col}H`;
 }
 
 // src/tui/renderer.ts
@@ -5182,7 +5216,7 @@ function setCell(buf, row, col, char, fg, bold, dim) {
   }
 }
 function flushDiff(current, previous) {
-  let out = "";
+  const parts = [];
   let lastFg = "\x00";
   let lastBold = false;
   let lastDim = false;
@@ -5198,7 +5232,7 @@ function flushDiff(current, previous) {
           const prev = prevRow[c];
           if (cur.char === " " && cur.fg === "" && prev.char === " " && prev.fg === "") {
             if (runStart !== -1) {
-              out += flushRun(curRow, r, runStart, c, lastFg, lastBold, lastDim);
+              parts.push(flushRun(curRow, r, runStart, c, lastFg, lastBold, lastDim));
               const last = curRow[c - 1];
               lastFg = last.fg;
               lastBold = last.bold;
@@ -5216,7 +5250,7 @@ function flushDiff(current, previous) {
         if (runStart === -1)
           runStart = c;
       } else if (runStart !== -1) {
-        out += flushRun(curRow, r, runStart, c, lastFg, lastBold, lastDim);
+        parts.push(flushRun(curRow, r, runStart, c, lastFg, lastBold, lastDim));
         const last = curRow[c - 1];
         lastFg = last.fg;
         lastBold = last.bold;
@@ -5225,9 +5259,9 @@ function flushDiff(current, previous) {
       }
     }
   }
-  if (out.length > 0) {
-    out += RESET;
-    process.stdout.write(out);
+  if (parts.length > 0) {
+    parts.push(RESET);
+    process.stdout.write(parts.join(""));
   }
 }
 function flushRun(row, r, start, end, lastFg, lastBold, lastDim) {
@@ -5331,33 +5365,21 @@ function renderPanel(buf, panel, logs, agentCount, clientCount, version2, webUrl
     }
   }
   if (version2 && LOGO_LINES.length >= 3) {
-    const vStr = `v${version2}`;
+    const infoStr = `v${version2} \xB7 ${agentCount} agent${agentCount !== 1 ? "s" : ""} \xB7 ${clientCount} client${clientCount !== 1 ? "s" : ""}`;
     const maxLen = innerWidth - (LOGO_LINES[2]?.length || 0) - 3;
-    if (maxLen > 4) {
-      const trimmed = vStr.slice(0, maxLen);
-      const col = x + width - 2 - trimmed.length;
-      writeString(buf, logoStartRow + 2, col, trimmed, CYAN_FG, false, true);
-    }
-  }
-  if (LOGO_LINES.length >= 4) {
-    const maxLen = innerWidth - (LOGO_LINES[3]?.length || 0) - 3;
     if (maxLen > 10) {
-      const trimmed = webUrl.slice(0, maxLen);
+      const trimmed = infoStr.slice(0, maxLen);
       const col = x + width - 2 - trimmed.length;
-      writeString(buf, logoStartRow + 3, col, trimmed, CYAN_FG, false, true);
+      writeString(buf, logoStartRow + 2, col, trimmed, CYAN_FG, false, true);
     }
   }
-  if (LOGO_LINES.length >= 5) {
-    const countStr = `${agentCount} agent${agentCount !== 1 ? "s" : ""} \xB7 ${clientCount} client${clientCount !== 1 ? "s" : ""}`;
-    const statusStr = `\u2713 ${countStr}`;
-    const maxCountLen = innerWidth - (LOGO_LINES[4]?.length || 0) - 3;
-    if (maxCountLen > 10) {
-      const trimmed = statusStr.slice(0, maxCountLen);
-      const countCol = x + width - 2 - trimmed.length;
-      writeString(buf, logoStartRow + 4, countCol, trimmed, BRIGHT_GREEN_FG, false, false);
-    }
+  const urlRow = logoStartRow + LOGO_LINES.length;
+  if (urlRow < y + height - 2) {
+    const trimmed = webUrl.slice(0, innerWidth - 2);
+    const col = x + 1 + Math.floor((innerWidth - trimmed.length) / 2);
+    writeString(buf, urlRow, col, trimmed, CYAN_FG, false, false);
   }
-  const sepRow = y + LOGO_LINES.length + 1;
+  const sepRow = urlRow + 1;
   if (sepRow < y + height - 1) {
     const sepBorderIdx = Math.floor(glowPosition) % perimeter;
     setCell(buf, sepRow, x, BOX.teeLeft, borderColor(sepBorderIdx, perimeter), false, false);
@@ -5478,9 +5500,7 @@ for (let offset = 0;offset <= 4; offset++) {
   }
   GRADIENT_STRINGS.push(arr);
 }
-var LIGHTNING_HEAD = fg256(231);
-var LIGHTNING_NEAR = fg256(159);
-var LIGHTNING_TAIL = fg256(49);
+var LIGHTNING_COLORS = [fg256(231), fg256(159), fg256(49)];
 function renderRain(layers, buf, panel) {
   const bufRows = buf.rows;
   const bufCols = buf.cols;
@@ -5495,51 +5515,22 @@ function renderRain(layers, buf, panel) {
     const gradStrs = GRADIENT_STRINGS[brightnessOffset];
     const colCount = Math.min(layer.columns.length, bufCols);
     for (let col = 0;col < colCount; col++) {
-      if (panelVisible && col >= panelX && col < panelX2) {
-        const drops = layer.columns[col].drops;
-        for (let d = 0;d < drops.length; d++) {
-          const drop = drops[d];
-          const headRow = drop.y | 0;
-          const trailLen = drop.trailLen;
-          for (let i = 0;i < trailLen; i++) {
-            const row = headRow - i;
-            if (row < 0 || row >= bufRows)
-              continue;
-            if (row >= panelY && row < panelY2)
-              continue;
-            let color;
-            if (drop.isLightning) {
-              color = i === 0 ? LIGHTNING_HEAD : i === 1 ? LIGHTNING_NEAR : LIGHTNING_TAIL;
-            } else {
-              const gradIdx = trailLen > 1 ? i * gradLen / (trailLen - 1) | 0 : 0;
-              color = gradStrs[Math.min(gradIdx, gradLen)];
-            }
-            const bold = i === 0 || drop.isLightning;
-            const dim = !drop.isLightning && i > trailLen * 0.7;
-            setCell(buf, row, col, drop.chars[i], color, bold, dim);
-          }
-        }
-      } else {
-        const drops = layer.columns[col].drops;
-        for (let d = 0;d < drops.length; d++) {
-          const drop = drops[d];
-          const headRow = drop.y | 0;
-          const trailLen = drop.trailLen;
-          for (let i = 0;i < trailLen; i++) {
-            const row = headRow - i;
-            if (row < 0 || row >= bufRows)
-              continue;
-            let color;
-            if (drop.isLightning) {
-              color = i === 0 ? LIGHTNING_HEAD : i === 1 ? LIGHTNING_NEAR : LIGHTNING_TAIL;
-            } else {
-              const gradIdx = trailLen > 1 ? i * gradLen / (trailLen - 1) | 0 : 0;
-              color = gradStrs[Math.min(gradIdx, gradLen)];
-            }
-            const bold = i === 0 || drop.isLightning;
-            const dim = !drop.isLightning && i > trailLen * 0.7;
-            setCell(buf, row, col, drop.chars[i], color, bold, dim);
-          }
+      const checkPanel = panelVisible && col >= panelX && col < panelX2;
+      const drops = layer.columns[col].drops;
+      for (let d = 0;d < drops.length; d++) {
+        const drop = drops[d];
+        const headRow = drop.y | 0;
+        const trailLen = drop.trailLen;
+        for (let i = 0;i < trailLen; i++) {
+          const row = headRow - i;
+          if (row < 0 || row >= bufRows)
+            continue;
+          if (checkPanel && row >= panelY && row < panelY2)
+            continue;
+          const color = drop.isLightning ? LIGHTNING_COLORS[Math.min(i, 2)] : gradStrs[Math.min(trailLen > 1 ? i * gradLen / (trailLen - 1) | 0 : 0, gradLen)];
+          const bold = i === 0 || drop.isLightning;
+          const dim = !drop.isLightning && i > trailLen * 0.7;
+          setCell(buf, row, col, drop.chars[i], color, bold, dim);
         }
       }
     }
@@ -5566,6 +5557,7 @@ var tuiOptions = null;
 function handleResize() {
   const { rows, cols } = getTerminalSize();
   clearScreen();
+  buildMoveToTable(rows, cols);
   bufA = createFrameBuffer(rows, cols);
   bufB = createFrameBuffer(rows, cols);
   currentIsA = true;
@@ -5599,6 +5591,7 @@ function startTui(options) {
   tuiOptions = options;
   enterAltScreen();
   const { rows, cols } = getTerminalSize();
+  buildMoveToTable(rows, cols);
   bufA = createFrameBuffer(rows, cols);
   bufB = createFrameBuffer(rows, cols);
   currentIsA = true;
@@ -5766,6 +5759,8 @@ async function main() {
     scanDirs = [projectsRoot];
   }
   const agents = new Map;
+  const openFds = new Map;
+  const staleAgents = new Set;
   const fileWatchers = new Map;
   const pollingTimers = new Map;
   const waitingTimers = new Map;
@@ -5796,7 +5791,7 @@ async function main() {
     ...analyticsConfig
   });
   const scanAll = !projectDir;
-  const scanner = startProjectScanner(scanDirs[0], scanAll, agents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast, idleTimeoutMs);
+  const scanner = startProjectScanner(scanDirs[0], scanAll, agents, openFds, staleAgents, fileWatchers, pollingTimers, waitingTimers, permissionTimers, broadcast, idleTimeoutMs);
   const updateCheckTimer = setInterval(async () => {
     const msg = await checkForUpdate();
     if (msg) {
@@ -5810,6 +5805,11 @@ async function main() {
 [ctrl-daemon] Shutting down...`);
     scanner.stop();
     server.stop();
+    for (const fd of openFds.values()) {
+      try {
+        fs3.closeSync(fd);
+      } catch {}
+    }
     for (const watcher of fileWatchers.values())
       watcher.close();
     for (const timer of pollingTimers.values())

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bulletproof-sh/ctrl-daemon",
-	"version": "0.0.13",
+	"version": "0.0.15",
 	"description": "WebSocket daemon for ctrl — watches Claude Code sessions and broadcasts agent state",
 	"type": "module",
 	"license": "BUSL-1.1",