claude-code-watch 0.0.10 → 0.0.12

package/bin/claude-watch.js

@@ -7,6 +7,7 @@ const cp = require('child_process');
 
 const { startServer } = require('../src/server/server');
 const { listSessions, listActiveSessions } = require('../src/watcher/watcher');
+const { compareVersions, parseDuration } = require('../src/cli-helpers');
 
 const { version: VERSION } = require('../package.json');
 
@@ -41,14 +42,8 @@ ENVIRONMENT:
 `);
 }
 
-function compareVersions(a, b) {
-  const pa = a.split('.').map(Number);
-  const pb = b.split('.').map(Number);
-  for (let i = 0; i < 3; i++) {
-    if (pa[i] > pb[i]) return 1;
-    if (pa[i] < pb[i]) return -1;
-  }
-  return 0;
+function printVersion() {
+  console.log(`claude-watch v${VERSION}`);
 }
 
 function fetchLatestVersion() {
@@ -118,9 +113,8 @@ async function runUpdate() {
   console.log(`  Latest version: v${latest}`);
   console.log('  Running npm install -g claude-code-watch@latest...\n');
 
-  const { execSync } = require('child_process');
   try {
-    execSync('npm install -g claude-code-watch@latest', { stdio: 'inherit' });
+    cp.execSync('npm install -g claude-code-watch@latest', { stdio: 'inherit' });
     console.log(`\n  Updated to v${latest}. Restart to use the new version.`);
   } catch {
     console.error('\n  Update failed. Try manually: npm install -g claude-code-watch@latest');
@@ -128,19 +122,6 @@ async function runUpdate() {
   }
 }
 
-function parseDuration(s) {
-  const match = s.match(/^(\d+)(ms|s|m|h)$/);
-  if (!match) throw new Error(`Invalid duration: ${s}`);
-  const val = parseInt(match[1], 10);
-  switch (match[2]) {
-    case 'ms': return val;
-    case 's': return val * 1000;
-    case 'm': return val * 60 * 1000;
-    case 'h': return val * 3600 * 1000;
-    default: throw new Error(`Invalid duration unit: ${match[2]}`);
-  }
-}
-
 async function main() {
   const args = process.argv.slice(2);
 
@@ -157,9 +138,16 @@ async function main() {
     openBrowser: true,
   };
 
-  // First pass: collect all option values
+  // Action flags
+  let listSessionsLimit = 0;   // 0 = no list, >0 = limit
+  let listActiveLimit = 0;     // 0 = no list, >0 = limit, -1 = all
+  let showVersion = false;
+  let showHelp = false;
+  let doUpdate = false;
+
   for (let i = 0; i < args.length; i++) {
-    switch (args[i]) {
+    const arg = args[i];
+    switch (arg) {
       case '-s':
         options.sessionID = args[++i] || '';
         break;
@@ -169,7 +157,7 @@ async function main() {
       case '-p':
       case '--port': {
         if (i + 1 >= args.length || args[i + 1].startsWith('-')) {
-          console.error(`Error: ${args[i]} requires a port number`);
+          console.error(`Error: ${arg} requires a port number`);
           process.exit(1);
         }
         const pv = parseInt(args[++i], 10);
@@ -183,7 +171,7 @@ async function main() {
       case '-h':
       case '--host':
         if (i + 1 >= args.length || args[i + 1].startsWith('-')) {
-          console.error(`Error: ${args[i]} requires a host address`);
+          console.error(`Error: ${arg} requires a host address`);
           process.exit(1);
         }
         options.host = args[++i];
@@ -214,75 +202,85 @@ async function main() {
       case '--no-open':
         options.openBrowser = false;
         break;
-      default:
-        break;
-    }
-  }
-
-  // Second pass: execute action flags with fully resolved options
-  for (let i = 0; i < args.length; i++) {
-    switch (args[i]) {
       case '-l': {
-        const v = parseInt(args[i + 1]);
-        const limit = !isNaN(v) ? v : 10;
+        const next = args[i + 1];
+        const v = parseInt(next);
+        listSessionsLimit = !isNaN(v) ? v : 10;
         if (!isNaN(v)) i++;
-        const sessions = await listSessions(limit);
-        if (sessions.length === 0) {
-          console.log('No sessions found.');
-        } else {
-          const now = Date.now();
-          for (const s of sessions) {
-            const age = Math.round((now - new Date(s.modified).getTime()) / 1000);
-            const ageStr = age < 60 ? `${age}s ago` : age < 3600 ? `${Math.floor(age / 60)}m ago` : `${Math.floor(age / 3600)}h ago`;
-            const active = s.isActive ? '●' : '○';
-            const id = s.id.length > 40 ? s.id.slice(0, 37) + '...' : s.id;
-            console.log(`${active} ${id}  ${s.projectPath || '?'}  ${ageStr}`);
-          }
-        }
-        return;
+        break;
       }
       case '-a': {
-        const v = parseInt(args[i + 1]);
-        const limit = !isNaN(v) ? v : 0;
-        if (!isNaN(v)) i++;
-        const sessions = await listActiveSessions(options.activeWindow);
-        const result = limit > 0 ? sessions.slice(0, limit) : sessions;
-        if (result.length === 0) {
-          console.log('No active sessions found.');
-        } else {
-          const now = Date.now();
-          for (const s of result) {
-            const age = Math.round((now - new Date(s.modified).getTime()) / 1000);
-            const ageStr = age < 60 ? `${age}s ago` : age < 3600 ? `${Math.floor(age / 60)}m ago` : `${Math.floor(age / 3600)}h ago`;
-            const id = s.id.length > 40 ? s.id.slice(0, 37) + '...' : s.id;
-            console.log(`● ${id}  ${s.projectPath || '?'}  ${ageStr}`);
-          }
-        }
-        return;
+        const next = args[i + 1];
+        const v = parseInt(next);
+        if (!isNaN(v)) { listActiveLimit = v; i++; }
+        else { listActiveLimit = -1; }
+        break;
       }
       case '-v':
-        console.log(`claude-watch v${VERSION}`);
-        return;
+        showVersion = true;
+        break;
       case '--help':
-        printHelp();
-        return;
+        showHelp = true;
+        break;
       case 'update':
-        await runUpdate();
-        return;
-      // Skip option flags already handled in first pass
-      case '-s': case '-n': case '-p': case '--port':
-      case '-h': case '--host': case '-w': case '-c':
-      case '-m': case '-D': case '--poll': case '--no-open':
+        doUpdate = true;
         break;
       default:
-        if (args[i].startsWith('-')) {
-          console.error(`Unknown option: ${args[i]}`);
+        if (arg.startsWith('-')) {
+          console.error(`Unknown option: ${arg}`);
           printHelp();
           process.exit(1);
         }
     }
   }
 
+  // Execute action flags
+  if (showVersion) {
+    printVersion();
+    return;
+  }
+  if (showHelp) {
+    printHelp();
+    return;
+  }
+  if (doUpdate) {
+    await runUpdate();
+    return;
+  }
+  if (listSessionsLimit > 0) {
+    const sessions = await listSessions(listSessionsLimit);
+    if (sessions.length === 0) {
+      console.log('No sessions found.');
+    } else {
+      const now = Date.now();
+      for (const s of sessions) {
+        const age = Math.round((now - new Date(s.modified).getTime()) / 1000);
+        const ageStr = age < 60 ? `${age}s ago` : age < 3600 ? `${Math.floor(age / 60)}m ago` : `${Math.floor(age / 3600)}h ago`;
+        const active = s.isActive ? '●' : '○';
+        const id = s.id.length > 40 ? s.id.slice(0, 37) + '...' : s.id;
+        console.log(`${active} ${id}  ${s.projectPath || '?'}  ${ageStr}`);
+      }
+    }
+    return;
+  }
+  if (listActiveLimit !== 0) {
+    const limit = listActiveLimit > 0 ? listActiveLimit : 0;
+    const sessions = await listActiveSessions(options.activeWindow);
+    const result = limit > 0 ? sessions.slice(0, limit) : sessions;
+    if (result.length === 0) {
+      console.log('No active sessions found.');
+    } else {
+      const now = Date.now();
+      for (const s of result) {
+        const age = Math.round((now - new Date(s.modified).getTime()) / 1000);
+        const ageStr = age < 60 ? `${age}s ago` : age < 3600 ? `${Math.floor(age / 60)}m ago` : `${Math.floor(age / 3600)}h ago`;
+        const id = s.id.length > 40 ? s.id.slice(0, 37) + '...' : s.id;
+        console.log(`● ${id}  ${s.projectPath || '?'}  ${ageStr}`);
+      }
+    }
+    return;
+  }
+
   checkForUpdate();
   startServer(options);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-watch",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Web-based real-time monitor for Claude Code.",
   "main": "./src/server/server.js",
   "bin": {
@@ -10,7 +10,7 @@
   "scripts": {
     "start": "node bin/claude-watch.js",
     "dev": "node --watch bin/claude-watch.js --no-open",
-    "test": "node --test tests/all.test.js tests/watcher.test.js tests/server.test.js"
+    "test": "node --test tests/all.test.js tests/watcher.test.js tests/server.test.js tests/cli.test.js"
   },
   "files": [
     "bin",

package/public/favicon.svg

@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <linearGradient id="bg" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#7c3aed"/>
+      <stop offset="100%" stop-color="#4c1d95"/>
+    </linearGradient>
+  </defs>
+  <rect width="32" height="32" rx="6" fill="url(#bg)"/>
+  <!-- Eye outline - wide almond, flatter top/bottom -->
+  <path d="M4 16 C6 11 10 9 16 9 C22 9 26 11 28 16 C26 21 22 23 16 23 C10 23 6 21 4 16Z" fill="#1f2937" stroke="#c084fc" stroke-width="2"/>
+  <!-- Iris - horizontal ellipse -->
+  <ellipse cx="16" cy="16" rx="6" ry="4.5" fill="#a855f7" stroke="#e9d5ff" stroke-width="1.5"/>
+  <!-- Pupil -->
+  <ellipse cx="16" cy="16" rx="2.5" ry="2" fill="#0f0a1a"/>
+  <!-- Shine -->
+  <circle cx="14" cy="14.5" r="1.2" fill="#f9fafb"/>
+</svg>

package/public/index.html

@@ -4,6 +4,7 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>claude-watch</title>
+<link rel="icon" type="image/svg+xml" href="favicon.svg">
 <link rel="stylesheet" href="vendor/github-dark.min.css">
 <style>
 *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
@@ -386,23 +387,25 @@ const MAX_ITEMS = 3000;
 const MAX_LINES = 50;
 let renderedItemCount = 0;
 let needsFullRender = true;
-  visibleDirty = true;
 
 // ══════════════════════════════════════════════════════════════════════════════
 // Markdown renderer (marked + highlight.js)
 // ══════════════════════════════════════════════════════════════════════════════
 
 const mdRenderer = new marked.Renderer();
-mdRenderer.code = function (code, lang) {
+mdRenderer.code = function (codeOrObj, langOrEsc) {
+  // marked v4: code(text, lang, escaped) — marked v5+: code({ text, lang })
+  const text = typeof codeOrObj === 'object' ? codeOrObj.text : codeOrObj;
+  const lang = typeof codeOrObj === 'object' ? codeOrObj.lang : langOrEsc;
   let highlighted;
   if (lang && hljs.getLanguage(lang)) {
     try {
-      highlighted = hljs.highlight(code, { language: lang }).value;
+      highlighted = hljs.highlight(text, { language: lang }).value;
     } catch {
-      highlighted = hljs.highlightAuto(code).value;
+      highlighted = hljs.highlightAuto(text).value;
     }
   } else {
-    highlighted = hljs.highlightAuto(code).value;
+    highlighted = hljs.highlightAuto(text).value;
   }
   const langTag = lang ? `<span class="lang-tag">${esc(lang)}</span>` : '';
   return `<div class="code-block-wrapper">
@@ -588,8 +591,8 @@ function handleNewBgTask(payload) {
 function handleSessionRemoved(payload) {
   const idx = sessions.findIndex(s => s.id === payload.sessionID);
   if (idx >= 0) {
-    const session = sessions.splice(idx, 1)[0];
-    sessions.push(session);
+    sessions.splice(idx, 1);
+    sessionsMap.delete(payload.sessionID);
   }
   updateFilters();
   rebuildNodes();
@@ -733,7 +736,7 @@ function getNodeHTML(node, idx) {
     return `<div class="tree-row${selClass ? ' selected' : ''}">
       <div class="tree-node" onclick="treeClick(${idx})" data-idx="${idx}">
         <span class="tree-prefix">${treePrefix(node)}</span>${activeDot} ${node.collapsed ? '▸' : '▾'} ${esc(displayName)}
-        ${node.collapsed && agentCount > 0 ? `(${agentCount})` : ''}
+        ${node.collapsed && agentCount > 0 ? `(${esc(String(agentCount))})` : ''}
         ${subInfo}
       </div>
       <span class="tree-actions">
@@ -1112,11 +1115,11 @@ function removeSelectedSession() {
   if (node.type === 'session') sid = node.id;
   else sid = node.sessionID;
   if (!sid) return;
-  if (!confirm(`Move session ${sid.slice(0, 12)}... to bottom?`)) return;
+  if (!confirm(`Remove session ${sid.slice(0, 12)}...?`)) return;
   const idx = sessions.findIndex(s => s.id === sid);
   if (idx >= 0) {
-    const session = sessions.splice(idx, 1)[0];
-    sessions.push(session);
+    sessions.splice(idx, 1);
+    sessionsMap.delete(sid);
   }
   sendCmd('removeSession', { sessionID: sid });
   updateFilters();

package/src/cli-helpers.js

@@ -0,0 +1,26 @@
+'use strict';
+
+function compareVersions(a, b) {
+  var pa = a.split('.').map(Number);
+  var pb = b.split('.').map(Number);
+  for (var i = 0; i < 3; i++) {
+    if ((pa[i] || 0) > (pb[i] || 0)) return 1;
+    if ((pa[i] || 0) < (pb[i] || 0)) return -1;
+  }
+  return 0;
+}
+
+function parseDuration(s) {
+  var match = s.match(/^(\d+)(ms|s|m|h)$/);
+  if (!match) throw new Error('Invalid duration: ' + s);
+  var val = parseInt(match[1], 10);
+  switch (match[2]) {
+    case 'ms': return val;
+    case 's': return val * 1000;
+    case 'm': return val * 60 * 1000;
+    case 'h': return val * 3600 * 1000;
+    default: throw new Error('Invalid duration unit: ' + match[2]);
+  }
+}
+
+module.exports = { compareVersions, parseDuration };

package/src/parser/parser.js

@@ -43,7 +43,8 @@ function setDebugAll(val) {
 
 function agentDisplayName(agentID) {
   if (!agentID) return 'Main';
-  return `Agent-${agentID.slice(0, Math.min(AgentIDDisplayLength, agentID.length))}`;
+  var id = String(agentID);
+  return 'Agent-' + id.slice(0, Math.min(AgentIDDisplayLength, id.length));
 }
 
 // ============================================================================
@@ -281,7 +282,7 @@ function diagnosticsBody(diagnostics) {
 // ============================================================================
 
 function parsePRLink(raw, timestamp) {
-  if (!raw.prNumber && !raw.prUrl) return [];
+  if (raw.prNumber == null && !raw.prUrl) return [];
   let content;
   if (raw.prRepository && raw.prUrl) {
     content = `PR #${raw.prNumber} ${raw.prRepository} \u2192 ${raw.prUrl}`;
@@ -441,8 +442,8 @@ function formatToolInput(toolName, input) {
       if (inp.path) return `${inp.pattern} in ${inp.path}`;
       return inp.pattern || '';
     case 'Grep':
-      if (inp.path) return `/${inp.pattern}/ in ${inp.path}`;
-      return `/${inp.pattern}/`;
+      if (inp.path) return `/${inp.pattern || ''}/ in ${inp.path}`;
+      return `/${inp.pattern || ''}/`;
     case 'WebFetch':
       return inp.prompt || '';
     case 'WebSearch':
@@ -493,4 +494,8 @@ module.exports = {
   contextWindowFor,
   formatTokenCount,
   AgentIDDisplayLength,
+  formatToolInput,
+  prettyToolName,
+  agentDisplayName,
+  MAX_TOOL_INPUT_LENGTH,
 };

package/src/server/server.js

@@ -55,6 +55,8 @@ class DashboardServer {
       ctx = { inputTokens: 0, outputTokens: 0, cacheCreation: 0, cacheRead: 0, model: '', contextWindow: 200000, lastActivity: Date.now() };
       this.contextMap.set(key, ctx);
     }
+    // inputTokens: Claude API returns cumulative total per call, not incremental — use Math.max
+    // outputTokens/cache tokens: API returns incremental values — use +=
     if (item.inputTokens) ctx.inputTokens = Math.max(ctx.inputTokens, item.inputTokens);
     if (item.outputTokens) ctx.outputTokens += item.outputTokens;
     if (item.cacheCreationTokens) ctx.cacheCreation += item.cacheCreationTokens;
@@ -93,9 +95,16 @@ class DashboardServer {
 
   broadcast(type, payload) {
     const msg = JSON.stringify({ type, payload });
+    const toRemove = [];
     for (const ws of this.clients) {
       if (ws.readyState === 1) {
-        try { ws.send(msg); } catch { this.clients.delete(ws); ws.terminate(); }
+        try { ws.send(msg); } catch { toRemove.push(ws); }
+      }
+    }
+    for (const ws of toRemove) {
+      this.clients.delete(ws);
+      try { ws.terminate(); } catch (err) {
+        if (this.debugAll) console.error('[server] terminate error:', err.message);
       }
     }
   }
@@ -121,7 +130,7 @@ class DashboardServer {
   }
 
   async handleHTTP(req, res) {
-    const url = new URL(req.url, `http://${req.headers.host}`);
+    const url = new URL(req.url, `http://${req.headers.host || 'localhost'}`);
     const p = url.pathname;
 
     if (p === '/' || p === '/index.html') {
@@ -183,21 +192,25 @@ class DashboardServer {
       const filePath = params.get('path');
       if (!filePath) { this.sendJSON(res, { error: 'Missing path param' }, 400); return; }
       const resolved = path.resolve(filePath);
-      const allowedPrefix = path.resolve(os.homedir(), '.claude', 'projects');
-      // Resolve symlinks before prefix check to prevent symlink-based path traversal
+      // Resolve both the user-provided path AND the allowed prefix through realpath
+      // to ensure consistent comparison even if homedir contains symlinks
+      let realPath;
+      let allowedPrefix;
       try {
-        const realPath = await fs.promises.realpath(resolved);
+        const homeReal = await fs.promises.realpath(os.homedir());
+        allowedPrefix = path.join(homeReal, '.claude', 'projects');
+        realPath = await fs.promises.realpath(resolved);
         if (!realPath.startsWith(allowedPrefix)) {
           this.sendJSON(res, { error: 'Access denied' }, 403);
           return;
         }
       } catch {
-        // realpath fails for non-existent files — block them
+        // realpath fails for non-existent files or if homedir can't be resolved — block them
         this.sendJSON(res, { error: 'Access denied' }, 403);
         return;
       }
       try {
-        const content = await fs.promises.readFile(resolved, 'utf-8');
+        const content = await fs.promises.readFile(realPath, 'utf-8');
         this.sendJSON(res, { content });
       } catch (err) {
         this.sendJSON(res, { error: err.message }, 404);
@@ -215,7 +228,9 @@ class DashboardServer {
       try {
         const cmd = JSON.parse(data.toString('utf-8'));
         this.handleCommand(ws, cmd);
-      } catch {}
+      } catch (err) {
+        if (this.debugAll) console.error('[server] WS message error:', err.message);
+      }
     });
 
     ws.on('close', () => {
@@ -239,11 +254,13 @@ class DashboardServer {
         this.broadcast('autoDiscoveryChanged', { enabled: this.watcher.isAutoDiscoveryEnabled() });
         break;
       case 'removeSession':
-        this.watcher.removeSession(cmd.sessionID);
-        this.broadcast('sessionRemoved', { sessionID: cmd.sessionID });
+        if (typeof cmd.sessionID === 'string' && cmd.sessionID) {
+          this.watcher.removeSession(cmd.sessionID);
+          this.broadcast('sessionRemoved', { sessionID: cmd.sessionID });
+        }
         break;
       case 'setSkipHistory':
-        this.watcher.setSkipHistory(cmd.skip);
+        this.watcher.setSkipHistory(cmd.skip === true);
         break;
       case 'getContext':
         this.sendContext(ws);
@@ -348,19 +365,23 @@ class DashboardServer {
       const confirmed = await askYesNo(`Port ${port} is occupied by process(es) ${pids.join(', ')}. Kill them? [y/N] `);
       if (!confirmed) {
         console.error(`Port ${port} is in use. Exiting.`);
+        this.stop();
         process.exit(1);
       }
 
+      const myPid = process.pid;
       for (const pid of pids) {
         const parsedPid = parseInt(pid, 10);
-        if (Number.isInteger(parsedPid) && parsedPid > 0) {
+        if (Number.isInteger(parsedPid) && parsedPid > 1 && parsedPid !== myPid) {
           try {
             if (process.platform === 'win32') {
               cp.execSync(`taskkill /PID ${parsedPid} /F`, { encoding: 'utf-8' });
             } else {
               process.kill(parsedPid, 'SIGTERM');
             }
-          } catch {}
+          } catch (err) {
+            console.error(`[server] Failed to SIGTERM pid ${parsedPid}: ${err.message}`);
+          }
         }
       }
 
@@ -369,8 +390,10 @@ class DashboardServer {
         await new Promise(r => setTimeout(r, 3000));
         for (const pid of pids) {
           const parsedPid = parseInt(pid, 10);
-          if (Number.isInteger(parsedPid) && parsedPid > 0) {
-            try { process.kill(parsedPid, 0); process.kill(parsedPid, 'SIGKILL'); } catch {}
+          if (Number.isInteger(parsedPid) && parsedPid > 1 && parsedPid !== myPid) {
+            try { process.kill(parsedPid, 0); process.kill(parsedPid, 'SIGKILL'); } catch {
+              // Process already gone — nothing to do
+            }
           }
         }
       }
@@ -423,9 +446,11 @@ class DashboardServer {
     this.server.on('error', (err) => {
       if (err.code === 'EADDRINUSE') {
         console.error(`Port ${this.port} is still in use after attempting to free it. Exiting.`);
+        this.stop();
         process.exit(1);
       } else {
         console.error(`Server error: ${err.message}`);
+        this.stop();
         process.exit(1);
       }
     });
@@ -438,6 +463,7 @@ class DashboardServer {
       await w.start();
     } catch (err) {
       console.error('Watcher init error:', err.message);
+      this.stop();
       process.exit(1);
     }
 
@@ -490,6 +516,7 @@ async function startServer(options = {}) {
 }
 
 function askYesNo(prompt) {
+  if (!process.stdin.isTTY) return Promise.resolve(false);
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   return new Promise(resolve => {
     rl.question(prompt, answer => {

package/src/watcher/watcher.js

@@ -424,15 +424,21 @@ class Watcher extends EventEmitter {
 
     if (p.endsWith('.jsonl')) {
       if (p.includes('/subagents/')) {
-        this._handleNewSubagentFile(p);
+        this._handleNewSubagentFile(p).catch(err => {
+        if (this.debug) console.error('[watcher] _handleNewSubagentFile error:', err.message);
+      });
       } else if (this.watchActive) {
-        this._handleNewSessionFile(p); // fire-and-forget, session will be discovered on next poll
+        this._handleNewSessionFile(p).catch(err => {
+          if (this.debug) console.error('[watcher] _handleNewSessionFile error:', err.message);
+        });
       }
       return;
     }
 
     if (p.endsWith('.txt') && p.includes('/tool-results/')) {
-      this._handleNewToolResultFile(p);
+      this._handleNewToolResultFile(p).catch(err => {
+        if (this.debug) console.error('[watcher] _handleNewToolResultFile error:', err.message);
+      });
     }
   }
 
@@ -448,9 +454,13 @@ class Watcher extends EventEmitter {
         continue;
       }
       if (base === 'subagents' && entry.name.endsWith('.jsonl')) {
-        this._handleNewSubagentFile(fullPath);
+        this._handleNewSubagentFile(fullPath).catch(err => {
+          if (this.debug) console.error('[watcher] _handleNewSubagentFile error:', err.message);
+        });
       } else if (base === 'tool-results' && entry.name.endsWith('.txt')) {
-        this._handleNewToolResultFile(fullPath);
+        this._handleNewToolResultFile(fullPath).catch(err => {
+          if (this.debug) console.error('[watcher] _handleNewToolResultFile error:', err.message);
+        });
       }
     }
   }
@@ -542,7 +552,9 @@ class Watcher extends EventEmitter {
       this.pendingSubagents.delete(session.id);
       for (const sp of pending) {
         const agentID = path.basename(sp).replace(/^agent-/, '').replace(/\.jsonl$/, '');
-        this._registerSubagent(session, session.id, agentID, sp);
+        this._registerSubagent(session, session.id, agentID, sp).catch(err => {
+          if (this.debug) console.error('[watcher] _registerSubagent error (pending):', err.message);
+        });
       }
     }
   }
@@ -561,7 +573,9 @@ class Watcher extends EventEmitter {
       return;
     }
 
-    this._registerSubagent(session, sessionID, agentID, p); // fire-and-forget, event handler context
+    this._registerSubagent(session, sessionID, agentID, p).catch(err => {
+      if (this.debug) console.error('[watcher] _registerSubagent error:', err.message);
+    });
   }
 
   async _registerSubagent(session, sessionID, agentID, p) {
@@ -772,32 +786,42 @@ class Watcher extends EventEmitter {
           if (!line.includes('"tool_')) continue;
 
           if (line.includes('"tool_use"')) {
-            const idMatch = line.match(/"id"\s*:\s*"([^"]+)"/);
-            if (!idMatch) continue;
-            const tid = idMatch[1];
-            if (session.toolIndex.has(tid)) continue;
-            const nameMatch = line.match(/"name"\s*:\s*"([^"]+)"/);
-            session.toolIndex.set(tid, {
-              toolName: nameMatch ? nameMatch[1] : '',
-              parentAgentID: agentID,
-              hasResult: false,
-            });
+            try {
+              var raw = JSON.parse(line);
+              var content = raw.message && raw.message.content;
+              if (!Array.isArray(content)) continue;
+              for (var block of content) {
+                if (block.type !== 'tool_use' || !block.id) continue;
+                if (session.toolIndex.has(block.id)) continue;
+                session.toolIndex.set(block.id, {
+                  toolName: block.name || '',
+                  parentAgentID: agentID,
+                  hasResult: false,
+                });
+              }
+            } catch { continue; }
           }
 
           if (line.includes('"tool_result"')) {
-            const useIdMatch = line.match(/"tool_use_id"\s*:\s*"([^"]+)"/);
-            if (!useIdMatch) continue;
-            const tid = useIdMatch[1];
-            const existing = session.toolIndex.get(tid);
-            if (existing) {
-              existing.hasResult = true;
-            } else {
-              session.toolIndex.set(tid, {
-                toolName: '',
-                parentAgentID: '',
-                hasResult: true,
-              });
-            }
+            try {
+              var raw2 = JSON.parse(line);
+              var content2 = raw2.message && raw2.message.content;
+              if (!Array.isArray(content2)) continue;
+              for (var block2 of content2) {
+                if (block2.type !== 'tool_result' || !block2.tool_use_id) continue;
+                var tid = block2.tool_use_id;
+                var existing = session.toolIndex.get(tid);
+                if (existing) {
+                  existing.hasResult = true;
+                } else {
+                  session.toolIndex.set(tid, {
+                    toolName: '',
+                    parentAgentID: '',
+                    hasResult: true,
+                  });
+                }
+              }
+            } catch { continue; }
           }
         }
       } catch (err) {
@@ -971,7 +995,7 @@ class Watcher extends EventEmitter {
           const { bytesRead } = await handle.read(buf, 0, readLen, readFrom);
           if (bytesRead === 0) break;
 
-          const chunk = bytesRead < readLen ? buf.toString('utf-8', 0, bytesRead) : buf.toString('utf-8');
+          const chunk = buf.toString('utf-8', 0, bytesRead);
           const combined = carryOver + chunk;
 
           // Detect CRLF from first newline in the combined text
@@ -1217,7 +1241,7 @@ async function _listSessionsFiltered(limit, activeWithin) {
 
   const candidates = [];
   try {
-    await _walkDirStatic(claudeDir, (filePath, stats) => {
+    await _walkDirAsync(claudeDir, (filePath, stats) => {
       if (!isMainSessionFile(filePath, stats)) return;
       if (activeWithin > 0 && (now - stats.mtimeMs) > activeWithin) return;
       candidates.push({ filePath, stats });
@@ -1244,14 +1268,13 @@ async function _listSessionsFiltered(limit, activeWithin) {
   return sessions;
 }
 
-async function _walkDirStatic(dir, callback) {
-  return _walkDirAsync(dir, callback);
-}
-
 module.exports = {
   Watcher,
   Session,
   BackgroundTask,
   listSessions,
   listActiveSessions,
+  resolveProjectPath,
+  isMainSessionFile,
+  readAgentType,
 };