claude-code-kanban 1.18.0 → 1.19.0-rc.1

package/hooks/agent-spy.sh

@@ -4,13 +4,43 @@
 
 INPUT=$(cat)
 
-SESSION_ID=$(echo "$INPUT" | jq -r '.session_id // empty')
-AGENT_ID=$(echo "$INPUT" | jq -r '.agent_id // empty')
-EVENT=$(echo "$INPUT" | jq -r '.hook_event_name // empty')
+# Single jq call to extract all routing fields (was 3-4 separate calls)
+eval "$(echo "$INPUT" | jq -r '
+  @sh "SESSION_ID=\(.session_id // "")",
+  @sh "AGENT_ID=\(.agent_id // "")",
+  @sh "EVENT=\(.hook_event_name // "")",
+  @sh "TOOL_NAME=\(.tool_name // "")",
+  @sh "AGENT_TYPE_RAW=\(.agent_type // "")"
+')"
 
-[ -z "$SESSION_ID" ] || [ -z "$AGENT_ID" ] && exit 0
+[ -z "$SESSION_ID" ] && exit 0
+
+# PostToolUse: clear waiting state (permission granted or question answered)
+if [ "$EVENT" = "PostToolUse" ]; then
+  WFILE="$HOME/.claude/agent-activity/$SESSION_ID/_waiting.json"
+  [ -f "$WFILE" ] && rm -f "$WFILE"
+  exit 0
+fi
+
+# Waiting-for-user events → write _waiting.json marker
+if [ "$EVENT" = "PermissionRequest" ] || { [ "$EVENT" = "PreToolUse" ] && [ "$TOOL_NAME" = "AskUserQuestion" ]; }; then
+  DIR="$HOME/.claude/agent-activity/$SESSION_ID"
+  mkdir -p "$DIR"
+  KIND="permission"
+  [ "$EVENT" = "PreToolUse" ] && KIND="question"
+  TS=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+  echo "$INPUT" | jq -c --arg kind "$KIND" --arg ts "$TS" '{
+    status: "waiting",
+    kind: $kind,
+    toolName: (.tool_name // "unknown"),
+    toolInput: ((.tool_input | tostring)[0:200] // ""),
+    timestamp: $ts
+  }' > "$DIR/_waiting.json"
+  exit 0
+fi
+
+[ -z "$AGENT_ID" ] && exit 0
 
-AGENT_TYPE_RAW=$(echo "$INPUT" | jq -r '.agent_type // empty')
 DIR="$HOME/.claude/agent-activity/$SESSION_ID"
 FILE="$DIR/$AGENT_ID.json"
 
@@ -33,27 +63,26 @@ if [ "$EVENT" = "SubagentStart" ]; then
 EOF
 
 elif [ "$EVENT" = "SubagentStop" ]; then
-  # Read type and startedAt from existing file if available
   AGENT_TYPE="$AGENT_TYPE_RAW"
   STARTED_AT="$TS"
   if [ -f "$FILE" ]; then
-    [ -z "$AGENT_TYPE" ] && AGENT_TYPE=$(jq -r '.type // "unknown"' "$FILE")
-    STARTED_AT=$(jq -r '.startedAt // empty' "$FILE")
-    [ -z "$STARTED_AT" ] && STARTED_AT="$TS"
+    eval "$(jq -r '@sh "PREV_TYPE=\(.type // "unknown")", @sh "PREV_START=\(.startedAt // "")"' "$FILE")"
+    [ -z "$AGENT_TYPE" ] && AGENT_TYPE="$PREV_TYPE"
+    [ -n "$PREV_START" ] && STARTED_AT="$PREV_START"
   fi
-  LAST_MSG=$(echo "$INPUT" | jq -r '.last_assistant_message // ""')
-  LAST_MSG_ESC=$(echo "$LAST_MSG" | jq -Rs '.')
-  cat > "$FILE" <<EOF
-{"agentId":"$AGENT_ID","type":"$AGENT_TYPE","status":"stopped","startedAt":"$STARTED_AT","lastMessage":$LAST_MSG_ESC,"stoppedAt":"$TS","updatedAt":"$TS"}
-EOF
+  echo "$INPUT" | jq -c \
+    --arg id "$AGENT_ID" --arg type "$AGENT_TYPE" --arg started "$STARTED_AT" --arg ts "$TS" \
+    '{agentId: $id, type: $type, status: "stopped", startedAt: $started,
+      lastMessage: (.last_assistant_message // ""), stoppedAt: $ts, updatedAt: $ts}' \
+    > "$FILE"
 
 elif [ "$EVENT" = "TeammateIdle" ]; then
   AGENT_TYPE="$AGENT_TYPE_RAW"
   STARTED_AT="$TS"
   if [ -f "$FILE" ]; then
-    [ -z "$AGENT_TYPE" ] && AGENT_TYPE=$(jq -r '.type // "unknown"' "$FILE")
-    STARTED_AT=$(jq -r '.startedAt // empty' "$FILE")
-    [ -z "$STARTED_AT" ] && STARTED_AT="$TS"
+    eval "$(jq -r '@sh "PREV_TYPE=\(.type // "unknown")", @sh "PREV_START=\(.startedAt // "")"' "$FILE")"
+    [ -z "$AGENT_TYPE" ] && AGENT_TYPE="$PREV_TYPE"
+    [ -n "$PREV_START" ] && STARTED_AT="$PREV_START"
   fi
   cat > "$FILE" <<EOF
 {"agentId":"$AGENT_ID","type":"$AGENT_TYPE","status":"idle","startedAt":"$STARTED_AT","updatedAt":"$TS"}

package/install.js

@@ -14,7 +14,14 @@ const HOOK_SCRIPT_SRC = path.join(__dirname, 'hooks', 'agent-spy.sh');
 const AGENT_ACTIVITY_DIR = path.join(CLAUDE_DIR, 'agent-activity');
 
 const HOOK_COMMAND = '~/.claude/hooks/agent-spy.sh';
-const HOOK_EVENTS = ['SubagentStart', 'SubagentStop', 'TeammateIdle'];
+const HOOK_EVENTS = [
+  { event: 'SubagentStart' },
+  { event: 'SubagentStop' },
+  { event: 'TeammateIdle' },
+  { event: 'PermissionRequest' },
+  { event: 'PreToolUse', matcher: 'AskUserQuestion' },
+  { event: 'PostToolUse' },
+];
 
 // ANSI helpers
 const green = s => `\x1b[32m${s}\x1b[0m`;
@@ -95,12 +102,13 @@ async function runInstall() {
   if (!settings.hooks) settings.hooks = {};
 
   const needed = [];
-  for (const event of HOOK_EVENTS) {
+  for (const { event, matcher } of HOOK_EVENTS) {
     if (!settings.hooks[event]) settings.hooks[event] = [];
+    const matcherStr = matcher || '';
     const exists = settings.hooks[event].some(g =>
-      g.hooks?.some(h => h.command === HOOK_COMMAND)
+      g.matcher === matcherStr && g.hooks?.some(h => h.command === HOOK_COMMAND)
     );
-    if (!exists) needed.push(event);
+    if (!exists) needed.push({ event, matcher: matcherStr });
   }
 
   let settingsUpdated = false;
@@ -108,11 +116,11 @@ async function runInstall() {
     console.log(`    ${green('✓')} Already configured`);
     settingsUpdated = true;
   } else {
-    console.log(`    Adding hooks for: ${needed.join(', ')}`);
+    console.log(`    Adding hooks for: ${needed.map(n => n.matcher ? `${n.event}:${n.matcher}` : n.event).join(', ')}`);
     if (await prompt(`    Update settings? [Y/n] `)) {
-      for (const event of needed) {
+      for (const { event, matcher } of needed) {
         settings.hooks[event].push({
-          matcher: '',
+          matcher,
           hooks: [{ type: 'command', command: HOOK_COMMAND, timeout: 5 }]
         });
       }
@@ -147,7 +155,8 @@ async function runUninstall() {
       const settings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
       if (settings.hooks) {
         let removed = 0;
-        for (const event of HOOK_EVENTS) {
+        const eventNames = [...new Set(HOOK_EVENTS.map(e => e.event))];
+        for (const event of eventNames) {
           if (!Array.isArray(settings.hooks[event])) continue;
           const before = settings.hooks[event].length;
           settings.hooks[event] = settings.hooks[event].filter(g =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-kanban",
-  "version": "1.18.0",
+  "version": "1.19.0-rc.1",
   "description": "A web-based Kanban board for viewing Claude Code tasks with agent teams support",
   "main": "server.js",
   "bin": {
@@ -8,7 +8,8 @@
   },
   "scripts": {
     "start": "node server.js",
-    "dev": "node server.js --open"
+    "dev": "node server.js --open",
+    "test": "bash tests/test-agent-spy.sh"
   },
   "repository": {
     "type": "git",

package/public/index.html

@@ -472,6 +472,20 @@
       margin-top: 6px;
     }
 
+    .session-latest-msg {
+      font-size: 11px;
+      color: var(--text-muted);
+      margin-top: 2px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .session-latest-msg .lm-label {
+      color: var(--text-tertiary);
+      font-weight: 500;
+      font-size: 10px;
+    }
+
     /* Footer */
     .sidebar-footer {
       flex-shrink: 0;
@@ -563,6 +577,24 @@
       margin-top: 4px;
     }
 
+    .latest-message {
+      flex: 1;
+      font-size: 11px;
+      color: var(--text-secondary);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      text-align: right;
+      padding: 0 16px;
+      min-width: 0;
+      display: none;
+    }
+    .latest-message.visible { display: block; }
+    .latest-message .lm-label {
+      color: var(--accent);
+      font-weight: 500;
+    }
+
     .view-actions {
       display: flex;
       align-items: center;
@@ -856,7 +888,7 @@
       position: fixed;
       top: 0;
       right: 0;
-      width: 440px;
+      width: 540px;
       height: 100vh;
       background: var(--bg-surface);
       border-left: 1px solid var(--border);
@@ -1389,6 +1421,110 @@
       padding: 6px 10px;
     }
 
+    /* Message log panel */
+    .message-panel {
+      position: fixed;
+      top: 0;
+      right: 0;
+      width: 540px;
+      height: 100vh;
+      background: var(--bg-surface);
+      border-left: 1px solid var(--border);
+      box-shadow: -8px 0 24px rgba(0, 0, 0, 0.15);
+      display: none;
+      flex-direction: column;
+      z-index: 99;
+      overflow: hidden;
+    }
+    .message-panel.visible { display: flex; }
+    .message-panel-header {
+      padding: 16px 20px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      background-image: linear-gradient(to right, transparent, var(--border), transparent);
+      background-size: 100% 1px;
+      background-repeat: no-repeat;
+      background-position: bottom;
+    }
+    .message-panel-header h3 {
+      font-family: var(--serif);
+      font-size: 14px;
+      font-weight: 500;
+    }
+    .message-panel-content {
+      flex: 1;
+      overflow-y: auto;
+      padding: 12px 16px;
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+    }
+    .msg-item {
+      display: flex;
+      gap: 8px;
+      padding: 8px 10px;
+      border-radius: 6px;
+      font-size: 12px;
+      line-height: 1.5;
+      background: var(--bg-elevated);
+      border: 1px solid var(--border);
+    }
+    .msg-item.msg-user {
+      border-left: 3px solid var(--text-muted);
+    }
+    .msg-item.msg-assistant {
+      border-left: 3px solid var(--accent);
+    }
+    .msg-item.msg-tool {
+      border-left: 3px solid var(--team);
+      font-size: 11px;
+      padding: 5px 10px;
+      color: var(--text-secondary);
+    }
+    .msg-icon {
+      flex-shrink: 0;
+      width: 16px;
+      height: 16px;
+      margin-top: 2px;
+      opacity: 0.6;
+    }
+    .msg-body { flex: 1; min-width: 0; }
+    .msg-text {
+      white-space: pre-wrap;
+      word-break: break-word;
+      color: var(--text-primary);
+      display: -webkit-box;
+      -webkit-line-clamp: 3;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+    }
+    .msg-tool .msg-text { color: var(--text-secondary); }
+    .msg-detail-pre {
+      white-space: pre-wrap;
+      word-break: break-all;
+      margin: 0;
+      font-family: var(--font-mono);
+      font-size: 0.85rem;
+    }
+    .msg-cmd .msg-text code {
+      background: var(--bg-hover);
+      padding: 2px 6px;
+      border-radius: 3px;
+      font-size: 11px;
+    }
+    .msg-time {
+      font-size: 10px;
+      color: var(--text-muted);
+      margin-top: 4px;
+    }
+    .msg-empty {
+      text-align: center;
+      color: var(--text-muted);
+      padding: 40px 20px;
+      font-size: 12px;
+    }
+
     /* Agent footer panel */
     .agent-footer {
       display: none;
@@ -1455,6 +1591,27 @@
       max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
     }
 
+    .agent-badge { font-size: 12px; cursor: default; }
+
+    /* Permission pending — indicated by ❓ badge only */
+    .permission-badge {
+      display: inline-flex;
+      align-items: center;
+      gap: 6px;
+      padding: 6px 12px;
+      background: var(--warning-dim);
+      border: 1px solid var(--warning);
+      border-radius: 8px;
+      font-size: 12px;
+      color: var(--warning);
+      white-space: nowrap;
+      animation: permission-pulse 1.5s ease-in-out infinite;
+    }
+    @keyframes permission-pulse {
+      0%, 100% { opacity: 1; }
+      50% { opacity: 0.5; }
+    }
+
     /* Light mode */
     body.light {
       --bg-deep: #e8e6e3;
@@ -2006,6 +2163,7 @@
             <h1 id="session-title" class="view-title">Session</h1>
             <p id="session-meta" class="view-meta"></p>
           </div>
+          <div id="latest-message" class="latest-message"></div>
           <div class="view-actions">
             <div class="view-progress">
               <div class="progress-bar">
@@ -2013,6 +2171,11 @@
               </div>
               <span id="progress-percent" class="progress-text">0%</span>
             </div>
+            <button id="message-toggle" class="icon-btn" onclick="toggleMessagePanel()" title="Session log (L)" aria-label="Toggle session log">
+              <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>
+              </svg>
+            </button>
             <button id="theme-toggle" class="icon-btn" onclick="toggleTheme()" title="Toggle theme" aria-label="Toggle theme">
               <svg id="theme-icon-dark" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                 <path d="M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z"/>
@@ -2099,6 +2262,18 @@
       </header>
       <div id="detail-content" class="detail-content"></div>
     </aside>
+
+    <aside id="message-panel" class="message-panel">
+      <header class="message-panel-header">
+        <h3>Session Log</h3>
+        <button class="detail-close" onclick="toggleMessagePanel()" aria-label="Close message panel">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M6 18L18 6M6 6l12 12"/>
+          </svg>
+        </button>
+      </header>
+      <div id="message-panel-content" class="message-panel-content"></div>
+    </aside>
   </div>
 
   <script>
@@ -2116,7 +2291,12 @@
     let bulkDeleteSessionId = null; // Track session for bulk delete
     let ownerFilter = '';
     let currentAgents = [];
+    let currentWaiting = null;
     let lastAgentsHash = '';
+    let messagePanelOpen = false;
+    let lastMessagesHash = '';
+    let lastInlineMessage = '';
+    let currentMessages = [];
     let agentDurationInterval = null;
     let selectedTaskId = null;
     let selectedSessionId = null;
@@ -2497,9 +2677,13 @@
         currentTasks = newTasks;
         currentSessionId = sessionId;
         ownerFilter = '';
+        lastMessagesHash = '';
+        lastInlineMessage = '';
+        document.getElementById('latest-message').classList.remove('visible');
         updateUrl();
         renderSession();
         fetchAgents(sessionId);
+        fetchMessages(sessionId);
       } catch (error) {
         console.error('Failed to fetch tasks:', error);
         currentTasks = [];
@@ -2511,15 +2695,17 @@
     }
 
     const AGENT_COOLDOWN_MS = 3 * 60 * 1000;
-    const AGENT_STALE_MS = 5 * 60 * 1000;
+    const AGENT_STALE_MS = 5 * 60 * 1000; // kept for reference; no longer used for force-stopping
     const AGENT_LOG_MAX = 8;
 
     async function fetchAgents(sessionId) {
       try {
         const res = await fetch(`/api/sessions/${sessionId}/agents`);
-        if (!res.ok) { currentAgents = []; renderAgentFooter(); return; }
-        const agents = await res.json();
-        const hash = JSON.stringify(agents);
+        if (!res.ok) { currentAgents = []; currentWaiting = null; renderAgentFooter(); return; }
+        const data = await res.json();
+        const agents = Array.isArray(data) ? data : (data.agents || []);
+        currentWaiting = data.waitingForUser || null;
+        const hash = JSON.stringify(data);
         if (hash === lastAgentsHash) return;
         lastAgentsHash = hash;
         currentAgents = agents;
@@ -2529,6 +2715,133 @@
       }
     }
 
+    function toggleMessagePanel() {
+      const panel = document.getElementById('message-panel');
+      messagePanelOpen = !messagePanelOpen;
+      panel.classList.toggle('visible', messagePanelOpen);
+      document.getElementById('message-toggle')?.classList.toggle('active', messagePanelOpen);
+      if (messagePanelOpen && currentSessionId) {
+        if (currentMessages.length) renderMessages(currentMessages);
+        fetchMessages(currentSessionId);
+      }
+    }
+
+    async function fetchMessages(sessionId) {
+      try {
+        const res = await fetch(`/api/sessions/${sessionId}/messages?limit=15`);
+        if (!res.ok) return;
+        const data = await res.json();
+        const hash = JSON.stringify(data.messages);
+        if (hash === lastMessagesHash) return;
+        lastMessagesHash = hash;
+        currentMessages = data.messages;
+        updateLatestMessage(data.messages);
+        if (messagePanelOpen) renderMessages(data.messages);
+      } catch (e) {
+        console.error('[fetchMessages]', e);
+      }
+    }
+
+    function parseCommandMessage(text) {
+      const nameMatch = text.match(/<command-name>([^<]+)<\/command-name>/);
+      if (nameMatch) return nameMatch[1].trim();
+      const msgMatch = text.match(/<command-message>([^<]+)<\/command-message>/);
+      if (msgMatch) return '/' + msgMatch[1].trim();
+      return null;
+    }
+
+    function cleanMessageText(text) {
+      const cmd = parseCommandMessage(text);
+      if (cmd) return cmd;
+      return text
+        .replace(/<[^>]+>/g, '')
+        .replace(/\*\*/g, '')
+        .replace(/^#+\s*/gm, '')
+        .replace(/\n/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim();
+    }
+
+    function updateLatestMessage(messages) {
+      const el = document.getElementById('latest-message');
+      let last = null;
+      for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].type === 'assistant' || messages[i].type === 'user') { last = messages[i]; break; }
+      }
+      if (!last) { el.classList.remove('visible'); lastInlineMessage = ''; return; }
+      const label = last.type === 'assistant' ? 'Claude' : 'User';
+      const cleaned = cleanMessageText(last.text);
+      const text = cleaned.length > 120 ? cleaned.slice(0, 120) + '...' : cleaned;
+      const html = `<span class="lm-label">${escapeHtml(label)}:</span> ${escapeHtml(text)}`;
+      el.innerHTML = html;
+      el.classList.add('visible');
+      if (lastInlineMessage !== html) {
+        lastInlineMessage = html;
+        renderSessions();
+      }
+    }
+
+    function renderMessages(messages) {
+      const container = document.getElementById('message-panel-content');
+      if (!messages.length) {
+        container.innerHTML = '<div class="msg-empty">No messages found for this session</div>';
+        return;
+      }
+      container.innerHTML = messages.map((m, i) => {
+        const clickable = `onclick="showMsgDetail(${i})" style="cursor:pointer"`;
+        if (m.type === 'user') {
+          const cmd = parseCommandMessage(m.text);
+          const displayText = cmd ? cmd : escapeHtml(cleanMessageText(m.text));
+          const isCmd = !!cmd;
+          return `<div class="msg-item msg-user${isCmd ? ' msg-cmd' : ''}" ${clickable}>
+            <svg class="msg-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"/><circle cx="12" cy="7" r="4"/></svg>
+            <div class="msg-body"><div class="msg-text">${isCmd ? '<code>' + escapeHtml(displayText) + '</code>' : displayText}</div><div class="msg-time">${formatDate(m.timestamp)}</div></div>
+          </div>`;
+        } else if (m.type === 'assistant') {
+          return `<div class="msg-item msg-assistant" ${clickable}>
+            <svg class="msg-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="11" width="18" height="10" rx="2"/><circle cx="9" cy="16" r="1.5"/><circle cx="15" cy="16" r="1.5"/><path d="M12 2v4M8 7h8"/></svg>
+            <div class="msg-body"><div class="msg-text">${escapeHtml(cleanMessageText(m.text))}</div><div class="msg-time">${m.model ? escapeHtml(m.model) + ' · ' : ''}${formatDate(m.timestamp)}</div></div>
+          </div>`;
+        } else if (m.type === 'tool_use') {
+          const toolDetail = m.detail ? ` <span style="color:var(--text-muted)">${escapeHtml(m.detail)}</span>` : '';
+          return `<div class="msg-item msg-tool" ${clickable}>
+            <svg class="msg-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"/></svg>
+            <div class="msg-body"><div class="msg-text">${escapeHtml(m.tool)}${toolDetail}</div><div class="msg-time">${formatDate(m.timestamp)}</div></div>
+          </div>`;
+        }
+        return '';
+      }).join('');
+      container.scrollTop = container.scrollHeight;
+    }
+
+    function showMsgDetail(idx) {
+      const m = currentMessages[idx];
+      if (!m) return;
+      const body = document.getElementById('msg-detail-body');
+      if (m.type === 'tool_use') {
+        document.getElementById('msg-detail-title').textContent = m.tool;
+        const fullText = m.fullDetail || m.detail || '';
+        const descHtml = m.description && m.description !== fullText ? `<div style="margin-bottom:8px;color:var(--text-secondary);font-size:0.85rem">${escapeHtml(m.description)}</div>` : '';
+        body.innerHTML = fullText ? descHtml + `<pre class="msg-detail-pre">${escapeHtml(fullText)}</pre>` : '<em>No details</em>';
+      } else {
+        const text = m.fullText || m.text;
+        document.getElementById('msg-detail-title').textContent = m.type === 'assistant' ? 'Claude' : 'User';
+        if (typeof marked !== 'undefined' && typeof DOMPurify !== 'undefined') {
+          body.innerHTML = DOMPurify.sanitize(marked.parse(text));
+        } else {
+          body.textContent = text;
+        }
+      }
+      const meta = [formatDate(m.timestamp)];
+      if (m.model) meta.unshift(m.model);
+      document.getElementById('msg-detail-meta').textContent = meta.join(' · ');
+      document.getElementById('msg-detail-modal').classList.add('visible');
+    }
+
+    function closeMsgDetailModal() {
+      document.getElementById('msg-detail-modal').classList.remove('visible');
+    }
+
     function formatDuration(ms) {
       const s = Math.floor(ms / 1000);
       if (s < 60) return `${s}s`;
@@ -2543,13 +2856,7 @@
       const label = document.getElementById('agent-footer-label');
       const now = Date.now();
 
-      // Mark stale "active" agents as stopped (SubagentStop unreliable for shutdown agents)
-      const agents = currentAgents.map(a => {
-        if (a.status === 'active' && a.startedAt && (now - new Date(a.startedAt).getTime()) > AGENT_STALE_MS) {
-          return { ...a, status: 'stopped', stoppedAt: a.updatedAt };
-        }
-        return a;
-      });
+      const agents = currentAgents;
       // Filter shutdown ghosts: for same-type agents, keep if they overlapped (parallel)
       // or started >30s after previous stopped (legitimate re-spawn). Filter the rest.
       const byType = {};
@@ -2572,7 +2879,10 @@
         .sort((a, b) => new Date(b.updatedAt || 0) - new Date(a.updatedAt || 0))
         .slice(0, AGENT_LOG_MAX);
 
-      if (visible.length === 0) {
+      const permFresh = currentWaiting && currentWaiting.timestamp &&
+        (now - new Date(currentWaiting.timestamp).getTime()) < 120000;
+
+      if (visible.length === 0 && !permFresh) {
         footer.classList.remove('visible');
         clearInterval(agentDurationInterval);
         agentDurationInterval = null;
@@ -2586,7 +2896,11 @@
       footer.classList.toggle('collapsed', collapsed);
       document.getElementById('agent-footer-toggle').innerHTML = collapsed ? '&#x25B4;' : '&#x25BE;';
 
-      content.innerHTML = visible.map(a => {
+      const permHtml = permFresh
+        ? `<div class="permission-badge">${currentWaiting.kind === 'question' ? '❓ Question pending' : '⏳ Awaiting: ' + escapeHtml(currentWaiting.toolName || 'unknown')}</div>`
+        : '';
+
+      content.innerHTML = permHtml + visible.map(a => {
         const elapsed = a.status === 'stopped' && a.stoppedAt
           ? new Date(a.stoppedAt).getTime() - new Date(a.startedAt || a.stoppedAt).getTime()
           : now - new Date(a.startedAt || a.updatedAt).getTime();
@@ -2685,7 +2999,7 @@
         viewMode = 'all';
         currentSessionId = null;
         ownerFilter = '';
-        currentAgents = []; lastAgentsHash = ''; renderAgentFooter();
+        currentAgents = []; currentWaiting = null; lastAgentsHash = ''; renderAgentFooter();
         const res = await fetch('/api/tasks/all');
         let tasks = await res.json();
         if (filterProject) {
@@ -2728,7 +3042,12 @@
 
       let filteredSessions = sessions;
       if (sessionFilter === 'active') {
-        filteredSessions = filteredSessions.filter(s => s.pending > 0 || s.inProgress > 0 || s.hasPlan);
+        const ACTIVE_PLAN_MS = 15 * 60 * 1000;
+        const RECENTLY_MODIFIED_MS = 5 * 60 * 1000;
+        const now = Date.now();
+        filteredSessions = filteredSessions.filter(s => s.pending > 0 || s.inProgress > 0 || s.hasActiveAgents || s.hasWaitingForUser ||
+          (s.hasPlan && (now - new Date(s.modifiedAt).getTime()) <= ACTIVE_PLAN_MS) ||
+          (now - new Date(s.modifiedAt).getTime()) <= RECENTLY_MODIFIED_MS);
       }
       if (filterProject) {
         filteredSessions = filteredSessions.filter(s => matchesProjectFilter(s.project));
@@ -2804,15 +3123,15 @@
           : modifiedDisplay;
 
         // Build tooltip
-        const tooltip = [timeDisplay, gitBranch ? `Branch: ${gitBranch}` : ''].filter(Boolean).join(' | ');
+        const tooltip = [session.id, timeDisplay, gitBranch ? `Branch: ${gitBranch}` : ''].filter(Boolean).join(' | ');
 
         const isTeam = session.isTeam;
         const memberCount = session.memberCount || 0;
 
         return `
-          <button onclick="fetchTasks('${session.id}')" data-session-id="${session.id}" class="session-item ${isActive ? 'active' : ''}" title="${tooltip}">
+          <button onclick="fetchTasks('${session.id}')" data-session-id="${session.id}" class="session-item ${isActive ? 'active' : ''} ${session.hasWaitingForUser ? 'permission-pending' : ''}" title="${tooltip}">
             <div class="session-name">${escapeHtml(primaryName)}</div>
-            ${secondaryName ? `<div class="session-secondary">${escapeHtml(secondaryName)}</div>` : ''}
+            ${isActive && lastInlineMessage ? `<div class="session-latest-msg">${lastInlineMessage}</div>` : secondaryName ? `<div class="session-secondary">${escapeHtml(secondaryName)}</div>` : ''}
             ${gitBranch ? `<div class="session-branch">${gitBranch}</div>` : ''}
             ${session.planTitle ? `<div class="session-plan">${escapeHtml(session.planTitle)}</div>` : ''}
             <div class="session-progress">
@@ -2820,6 +3139,8 @@
                 ${isTeam ? `<span class="team-badge" title="${memberCount} team members"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/></svg>${memberCount}</span>` : ''}
                 ${(isTeam || session.project) ? `<span class="team-info-btn" onclick="event.stopPropagation(); showSessionInfoModal('${session.id}')" title="View session info">ℹ</span>` : ''}
                 ${session.hasPlan ? `<span class="plan-indicator" onclick="event.stopPropagation(); openPlanForSession('${session.id}')" title="View plan"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg></span>` : ''}
+                ${session.hasRunningAgents ? '<span class="agent-badge" title="Active agents">🤖</span>' : ''}
+                ${session.hasWaitingForUser ? '<span class="agent-badge" title="Waiting for user">❓</span>' : ''}
                 ${hasInProgress ? '<span class="pulse"></span>' : ''}
               </span>
               <div class="progress-bar"><div class="progress-fill" style="width: ${percent}%"></div></div>
@@ -3517,7 +3838,12 @@
         return;
       }
 
-      if (document.querySelector('.modal-overlay.visible')) return;
+      if (document.querySelector('.modal-overlay.visible')) {
+        if (e.key === 'Escape') {
+          document.querySelectorAll('.modal-overlay.visible').forEach(m => m.classList.remove('visible'));
+        }
+        return;
+      }
 
       if (e.key === '[') {
         e.preventDefault();
@@ -3525,6 +3851,12 @@
         return;
       }
 
+      if ((e.key === 'L' || e.key === 'l') && e.shiftKey) {
+        e.preventDefault();
+        toggleMessagePanel();
+        return;
+      }
+
       // Tab toggles focus zone
       if (e.key === 'Tab') {
         e.preventDefault();
@@ -3605,8 +3937,9 @@
         return;
       }
 
-      if (e.key === 'Escape' && detailPanel.classList.contains('visible')) {
-        closeDetailPanel();
+      if (e.key === 'Escape') {
+        if (detailPanel.classList.contains('visible')) closeDetailPanel();
+        else if (messagePanelOpen) toggleMessagePanel();
       }
 
       if (e.key === 'p' || e.key === 'P') {
@@ -3637,12 +3970,19 @@
     function setupEventSource() {
       let retryDelay = 1000;
       let eventSource;
+      let wasConnected = false;
 
       function connect() {
         eventSource = new EventSource('/api/events');
 
         eventSource.onopen = () => {
-          retryDelay = 1000; // Reset on successful connection
+          if (wasConnected) {
+            console.warn('[SSE] Reconnected after drop — forcing full refresh');
+            fetchSessions().catch(() => {});
+            if (currentSessionId) fetchTasks(currentSessionId);
+          }
+          wasConnected = true;
+          retryDelay = 1000;
           connectionStatus.innerHTML = `
             <span class="connection-dot live"></span>
             <span>Connected</span>
@@ -3651,24 +3991,37 @@
 
         eventSource.onerror = () => {
           eventSource.close();
+          console.warn('[SSE] Connection lost, retrying in', retryDelay, 'ms');
           connectionStatus.innerHTML = `
             <span class="connection-dot error"></span>
             <span>Reconnecting...</span>
           `;
           setTimeout(connect, retryDelay);
-          retryDelay = Math.min(retryDelay * 2, 30000); // Max 30s
+          retryDelay = Math.min(retryDelay * 2, 30000);
         };
 
-        let refreshTimer = null;
+        let taskRefreshTimer = null;
+        let metadataRefreshTimer = null;
+        let pendingTaskSessionIds = new Set();
+
         function debouncedRefresh(sessionId, isMetadata) {
-          clearTimeout(refreshTimer);
-          const delay = isMetadata ? 2000 : 500;
-          refreshTimer = setTimeout(() => {
-            fetchSessions().catch(err => console.error('[SSE] fetchSessions failed:', err));
-            if (currentSessionId && (isMetadata || sessionId === currentSessionId)) {
-              fetchTasks(currentSessionId);
-            }
-          }, delay);
+          if (isMetadata) {
+            clearTimeout(metadataRefreshTimer);
+            metadataRefreshTimer = setTimeout(() => {
+              fetchSessions().catch(err => console.error('[SSE] fetchSessions failed:', err));
+              if (currentSessionId) fetchMessages(currentSessionId);
+            }, 2000);
+          } else {
+            pendingTaskSessionIds.add(sessionId);
+            clearTimeout(taskRefreshTimer);
+            taskRefreshTimer = setTimeout(() => {
+              fetchSessions().catch(err => console.error('[SSE] fetchSessions failed:', err));
+              if (currentSessionId && pendingTaskSessionIds.has(currentSessionId)) {
+                fetchTasks(currentSessionId);
+              }
+              pendingTaskSessionIds.clear();
+            }, 500);
+          }
         }
 
         eventSource.onmessage = (event) => {
@@ -3683,6 +4036,7 @@
           }
 
           if (data.type === 'agent-update') {
+            fetchSessions().catch(err => console.error('[SSE] fetchSessions failed:', err));
             if (currentSessionId && data.sessionId === currentSessionId) {
               fetchAgents(currentSessionId);
             }
@@ -3691,13 +4045,15 @@
           if (data.type === 'team-update') {
             console.log('[SSE] Team update:', data.teamName);
             debouncedRefresh(data.teamName, false);
-            if (currentSessionId && data.teamName === currentSessionId) {
-              fetchTasks(currentSessionId);
-            }
           }
         };
       }
 
+      // Fallback poll every 30s in case SSE silently drops
+      setInterval(() => {
+        fetchSessions().catch(() => {});
+      }, 30000);
+
       connect();
     }
 
@@ -4211,6 +4567,22 @@
     });
   </script>
 
+  <!-- Message Detail Modal -->
+  <div id="msg-detail-modal" class="modal-overlay" onclick="closeMsgDetailModal()">
+    <div class="modal" onclick="event.stopPropagation()" style="max-width: 640px;">
+      <div class="modal-header">
+        <h3 class="modal-title" id="msg-detail-title">Message</h3>
+        <button class="modal-close" aria-label="Close" onclick="closeMsgDetailModal()">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 6L6 18M6 6l12 12"/></svg>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div id="msg-detail-body" style="white-space: pre-wrap; word-break: break-word; font-size: 13px; line-height: 1.6; max-height: 60vh; overflow-y: auto;"></div>
+        <div id="msg-detail-meta" style="margin-top: 12px; font-size: 11px; color: var(--text-muted);"></div>
+      </div>
+    </div>
+  </div>
+
   <!-- Help Modal -->
   <div id="help-modal" class="modal-overlay" onclick="closeHelpModal()">
     <div class="modal" onclick="event.stopPropagation()">
@@ -4285,6 +4657,10 @@
                 <td style="padding: 4px 0; color: var(--text-secondary);"><kbd style="background: var(--bg-hover); padding: 2px 6px; border-radius: 4px; font-family: monospace;">D</kbd></td>
                 <td style="padding: 4px 0; color: var(--text-primary);">Delete selected task</td>
               </tr>
+              <tr>
+                <td style="padding: 4px 0; color: var(--text-secondary);"><kbd style="background: var(--bg-hover); padding: 2px 6px; border-radius: 4px; font-family: monospace;">Shift+L</kbd></td>
+                <td style="padding: 4px 0; color: var(--text-primary);">Toggle session log</td>
+              </tr>
             </table>
           </div>
         </div>

package/server.js

@@ -43,6 +43,70 @@ const TEAMS_DIR = path.join(CLAUDE_DIR, 'teams');
 const PLANS_DIR = path.join(CLAUDE_DIR, 'plans');
 const AGENT_ACTIVITY_DIR = path.join(CLAUDE_DIR, 'agent-activity');
 
+const PERMISSION_TTL_MS = 1800000;
+const AGENT_TTL_MS = 3600000;
+const AGENT_STALE_MS = 120000;
+
+function checkWaitingForUser(agentDir) {
+  try {
+    const waitFile = path.join(agentDir, '_waiting.json');
+    if (!existsSync(waitFile)) return null;
+    const data = JSON.parse(readFileSync(waitFile, 'utf8'));
+    if (data.status === 'waiting' && data.timestamp) {
+      const age = Date.now() - new Date(data.timestamp).getTime();
+      if (age < PERMISSION_TTL_MS) return data;
+    }
+  } catch (e) { /* skip invalid */ }
+  return null;
+}
+
+function isAgentFresh(agent) {
+  if (!agent.updatedAt) return true;
+  return (Date.now() - new Date(agent.updatedAt).getTime()) < AGENT_TTL_MS;
+}
+
+function isSessionStale(meta) {
+  if (!meta.jsonlPath) return false;
+  try {
+    const mtime = statSync(meta.jsonlPath).mtime;
+    return (Date.now() - mtime.getTime()) > AGENT_STALE_MS;
+  } catch (e) { return false; }
+}
+
+function checkActiveAgents(sessionId, meta) {
+  const teamConfig = loadTeamConfig(sessionId);
+  const resolvedId = (teamConfig && teamConfig.leadSessionId) ? teamConfig.leadSessionId : sessionId;
+  const agentDir = path.join(AGENT_ACTIVITY_DIR, resolvedId);
+  if (!existsSync(agentDir)) return false;
+  try {
+    if (meta && isSessionStale(meta)) return false;
+    if (checkWaitingForUser(agentDir)) return true;
+    for (const file of readdirSync(agentDir).filter(f => f.endsWith('.json') && !f.startsWith('_'))) {
+      try {
+        const agent = JSON.parse(readFileSync(path.join(agentDir, file), 'utf8'));
+        if ((agent.status === 'active' || agent.status === 'idle') && isAgentFresh(agent)) {
+          return true;
+        }
+      } catch (e) { /* skip invalid */ }
+    }
+  } catch (e) { /* ignore */ }
+  return false;
+}
+
+function checkRunningAgents(agentDir, meta) {
+  if (!existsSync(agentDir)) return false;
+  if (meta && isSessionStale(meta)) return false;
+  try {
+    for (const file of readdirSync(agentDir).filter(f => f.endsWith('.json') && !f.startsWith('_'))) {
+      try {
+        const agent = JSON.parse(readFileSync(path.join(agentDir, file), 'utf8'));
+        if (agent.status === 'active' && isAgentFresh(agent)) return true;
+      } catch (e) { /* skip invalid */ }
+    }
+  } catch (e) { /* ignore */ }
+  return false;
+}
+
 function isTeamSession(sessionId) {
   return existsSync(path.join(TEAMS_DIR, sessionId, 'config.json'));
 }
@@ -78,55 +142,121 @@ app.use(express.json());
 // Serve static files
 app.use(express.static(path.join(__dirname, 'public')));
 
-/**
- * Read customTitle and slug from a JSONL file
- * Returns { customTitle, slug } - customTitle from /rename, slug from session
- */
-function readSessionInfoFromJsonl(jsonlPath) {
-  const result = { customTitle: null, slug: null, projectPath: null };
+const messageCache = new Map();
+const MESSAGE_CACHE_TTL = 5000;
 
+function readRecentMessages(jsonlPath, limit = 10) {
+  let fd;
   try {
-    if (!existsSync(jsonlPath)) return result;
-
-    // Read first 64KB - should contain custom-title and at least one message with slug/cwd
-    const fd = require('fs').openSync(jsonlPath, 'r');
-    const buffer = Buffer.alloc(65536);
-    const bytesRead = require('fs').readSync(fd, buffer, 0, 65536, 0);
-    require('fs').closeSync(fd);
-
-    const content = buffer.toString('utf8', 0, bytesRead);
-    const lines = content.split('\n');
-
-    for (const line of lines) {
-      if (!line.trim()) continue;
-      try {
-        const data = JSON.parse(line);
+    const stat = statSync(jsonlPath);
+    const cached = messageCache.get(jsonlPath);
+    if (cached && cached.mtime === stat.mtimeMs && Date.now() - cached.ts < MESSAGE_CACHE_TTL) {
+      return cached.messages;
+    }
 
-        // Check for custom-title entry (from /rename command)
-        if (data.type === 'custom-title' && data.customTitle) {
-          result.customTitle = data.customTitle;
-        }
+    fd = require('fs').openSync(jsonlPath, 'r');
+    const messages = [];
+    let readSize = 65536;
 
-        // Check for slug in user/assistant messages
-        if (data.slug && !result.slug) {
-          result.slug = data.slug;
-        }
+    while (messages.length < limit && readSize <= stat.size) {
+      const start = Math.max(0, stat.size - readSize);
+      const bufSize = Math.min(readSize, stat.size);
+      const buf = Buffer.alloc(bufSize);
+      require('fs').readSync(fd, buf, 0, bufSize, start);
 
-        // Extract project path from cwd field (actual path, no encoding issues)
-        if (data.cwd && !result.projectPath) {
-          result.projectPath = data.cwd;
-        }
+      const text = buf.toString('utf8');
+      const firstNewline = text.indexOf('\n');
+      const clean = firstNewline >= 0 ? text.substring(firstNewline + 1) : text;
 
-        // Stop early if we found all three
-        if (result.customTitle && result.slug && result.projectPath) break;
-      } catch (e) {
-        // Skip malformed lines
+      messages.length = 0;
+      for (const line of clean.split('\n')) {
+        if (!line.trim()) continue;
+        try {
+          const obj = JSON.parse(line);
+          if (obj.type === 'assistant' && obj.message?.content && Array.isArray(obj.message.content)) {
+            for (const block of obj.message.content) {
+              if (block.type === 'text' && block.text) {
+                const truncated = block.text.length > 500;
+                messages.push({
+                  type: 'assistant',
+                  text: truncated ? block.text.slice(0, 500) + '...' : block.text,
+                  fullText: truncated ? block.text : null,
+                  timestamp: obj.timestamp,
+                  model: obj.message.model || null
+                });
+              } else if (block.type === 'tool_use') {
+                let detail = null;
+                let fullDetail = null;
+                let inp = null;
+                if (block.input) {
+                  inp = typeof block.input === 'string' ? (() => { try { return JSON.parse(block.input); } catch(_) { return {}; } })() : block.input;
+                  if (inp.file_path) { detail = inp.file_path.replace(/^.*[/\\]/, ''); fullDetail = inp.file_path; }
+                  else if (inp.command) { detail = inp.command.length > 80 ? inp.command.slice(0, 80) + '...' : inp.command; fullDetail = inp.command; }
+                  else if (inp.pattern) { detail = inp.pattern; fullDetail = inp.pattern; }
+                  else if (inp.query) { detail = inp.query; fullDetail = inp.query; }
+                  else if (inp.description) { detail = inp.description; fullDetail = inp.description; }
+                }
+                messages.push({
+                  type: 'tool_use',
+                  tool: block.name,
+                  detail,
+                  fullDetail: fullDetail !== detail ? fullDetail : null,
+                  description: inp?.description || null,
+                  timestamp: obj.timestamp
+                });
+              }
+            }
+          } else if (obj.type === 'user' && obj.message?.role === 'user' && !obj.isMeta) {
+            if (typeof obj.message.content === 'string') {
+              const t = obj.message.content;
+              const uTruncated = t.length > 500;
+              messages.push({
+                type: 'user',
+                text: uTruncated ? t.slice(0, 500) + '...' : t,
+                fullText: uTruncated ? t : null,
+                timestamp: obj.timestamp
+              });
+            }
+          }
+        } catch (e) { /* partial line */ }
       }
+
+      if (readSize >= stat.size) break;
+      readSize *= 4;
     }
+
+    require('fs').closeSync(fd);
+    fd = null;
+    const result = messages.slice(-limit);
+    messageCache.set(jsonlPath, { messages: result, mtime: stat.mtimeMs, ts: Date.now() });
+    return result;
   } catch (e) {
-    // Return partial results
+    if (fd) try { require('fs').closeSync(fd); } catch (_) {}
+    return [];
   }
+}
 
+/**
+ * Extract slug and projectPath from first few lines of a session JSONL.
+ * Slug and cwd appear in the first few entries, so 4KB is plenty.
+ */
+function readSessionInfoFromJsonl(jsonlPath) {
+  const result = { slug: null, projectPath: null };
+  try {
+    if (!existsSync(jsonlPath)) return result;
+    const fd = require('fs').openSync(jsonlPath, 'r');
+    const buf = Buffer.alloc(4096);
+    const n = require('fs').readSync(fd, buf, 0, 4096, 0);
+    require('fs').closeSync(fd);
+    for (const line of buf.toString('utf8', 0, n).split('\n')) {
+      try {
+        const data = JSON.parse(line);
+        if (data.slug) result.slug = data.slug;
+        if (data.cwd) result.projectPath = data.cwd;
+        if (result.slug && result.projectPath) break;
+      } catch (e) {}
+    }
+  } catch (e) {}
   return result;
 }
 
@@ -168,7 +298,6 @@ function loadSessionMetadata() {
         }
 
         metadata[sessionId] = {
-          customTitle: sessionInfo.customTitle,
           slug: sessionInfo.slug,
           project: sessionInfo.projectPath || null,
           jsonlPath: jsonlPath
@@ -196,7 +325,6 @@ function loadSessionMetadata() {
             if (entry.sessionId) {
               if (!metadata[entry.sessionId]) {
                 metadata[entry.sessionId] = {
-                  customTitle: null,
                   slug: null,
                   project: entry.projectPath || null,
                   jsonlPath: null
@@ -229,8 +357,7 @@ function loadSessionMetadata() {
           const project = parentMeta?.project || leadMember?.cwd || teamConfig.working_dir || null;
 
           metadata[dir.name] = {
-            customTitle: teamConfig.description || dir.name,
-            slug: null,
+            slug: teamConfig.description || dir.name,
             project,
             jsonlPath: parentMeta?.jsonlPath || null,
             description: teamConfig.description || parentMeta?.description || null,
@@ -249,9 +376,6 @@ function loadSessionMetadata() {
   return metadata;
 }
 
-/**
- * Get display name for a session: customTitle > slug > null (frontend shows UUID)
- */
 function getPlanInfo(slug) {
   if (!slug) return { hasPlan: false, planTitle: null };
   const planPath = path.join(PLANS_DIR, `${slug}.md`);
@@ -266,7 +390,6 @@ function getPlanInfo(slug) {
 }
 
 function getSessionDisplayName(sessionId, meta) {
-  if (meta?.customTitle) return meta.customTitle;
   if (meta?.slug) return meta.slug;
   return null; // Frontend will show UUID as fallback
 }
@@ -331,6 +454,12 @@ app.get('/api/sessions', async (req, res) => {
           const memberCount = isTeam ? (loadTeamConfig(entry.name)?.members?.length || 0) : 0;
           const planInfo = getPlanInfo(meta.slug);
 
+          const resolvedAgentDir = (() => {
+            const tc = loadTeamConfig(entry.name);
+            const rid = (tc && tc.leadSessionId) ? tc.leadSessionId : entry.name;
+            return path.join(AGENT_ACTIVITY_DIR, rid);
+          })();
+
           sessionsMap.set(entry.name, {
             id: entry.name,
             name: getSessionDisplayName(entry.name, meta),
@@ -346,6 +475,9 @@ app.get('/api/sessions', async (req, res) => {
             modifiedAt: modifiedAt,
             isTeam,
             memberCount,
+            hasActiveAgents: checkActiveAgents(entry.name, meta),
+            hasRunningAgents: checkRunningAgents(resolvedAgentDir, meta),
+            hasWaitingForUser: !!checkWaitingForUser(resolvedAgentDir),
             ...planInfo
           });
         }
@@ -360,6 +492,7 @@ app.get('/api/sessions', async (req, res) => {
           try { modifiedAt = statSync(meta.jsonlPath).mtime.toISOString(); } catch (e) {}
         }
         const planInfo = getPlanInfo(meta.slug);
+        const metaAgentDir = path.join(AGENT_ACTIVITY_DIR, sessionId);
         sessionsMap.set(sessionId, {
           id: sessionId,
           name: getSessionDisplayName(sessionId, meta),
@@ -375,11 +508,45 @@ app.get('/api/sessions', async (req, res) => {
           modifiedAt: modifiedAt || new Date(0).toISOString(),
           isTeam: false,
           memberCount: 0,
+          hasActiveAgents: checkActiveAgents(sessionId, meta),
+          hasRunningAgents: checkRunningAgents(metaAgentDir, meta),
+          hasWaitingForUser: !!checkWaitingForUser(metaAgentDir),
           ...planInfo
         });
       }
     }
 
+    // Add sessions from agent-activity that have _waiting.json but no tasks/metadata
+    if (existsSync(AGENT_ACTIVITY_DIR)) {
+      try {
+        for (const dir of readdirSync(AGENT_ACTIVITY_DIR, { withFileTypes: true })) {
+          if (!dir.isDirectory() || sessionsMap.has(dir.name)) continue;
+          const agentDir = path.join(AGENT_ACTIVITY_DIR, dir.name);
+          const waiting = checkWaitingForUser(agentDir);
+          if (!waiting) continue;
+          const meta = metadata[dir.name] || {};
+          sessionsMap.set(dir.name, {
+            id: dir.name,
+            name: getSessionDisplayName(dir.name, meta),
+            slug: meta.slug || null,
+            project: meta.project || null,
+            description: meta.description || null,
+            gitBranch: meta.gitBranch || null,
+            taskCount: 0,
+            completed: 0,
+            inProgress: 0,
+            pending: 0,
+            createdAt: meta.created || null,
+            modifiedAt: waiting.timestamp || new Date().toISOString(),
+            isTeam: false,
+            memberCount: 0,
+            hasActiveAgents: true,
+            hasWaitingForUser: true,
+          });
+        }
+      } catch (e) { /* ignore */ }
+    }
+
     // Hide leader UUID sessions that are represented by a team session
     const teamLeaderIds = new Set();
     for (const [sid, session] of sessionsMap) {
@@ -515,21 +682,42 @@ app.get('/api/sessions/:sessionId/agents', (req, res) => {
     sessionId = teamConfig.leadSessionId;
   }
   const agentDir = path.join(AGENT_ACTIVITY_DIR, sessionId);
-  if (!existsSync(agentDir)) return res.json([]);
+  if (!existsSync(agentDir)) return res.json({ agents: [], waitingForUser: null });
   try {
-    const files = readdirSync(agentDir).filter(f => f.endsWith('.json'));
+    const metadata = loadSessionMetadata();
+    const meta = metadata[sessionId] || {};
+    const sessionStale = isSessionStale(meta);
+
+    const files = readdirSync(agentDir).filter(f => f.endsWith('.json') && !f.startsWith('_'));
     const agents = [];
     for (const file of files) {
       try {
-        agents.push(JSON.parse(readFileSync(path.join(agentDir, file), 'utf8')));
+        const agent = JSON.parse(readFileSync(path.join(agentDir, file), 'utf8'));
+        if (!isAgentFresh(agent)) continue;
+        if (sessionStale && (agent.status === 'active' || agent.status === 'idle')) {
+          agent.status = 'stopped';
+          if (!agent.stoppedAt) agent.stoppedAt = agent.updatedAt || agent.startedAt;
+        }
+        agents.push(agent);
       } catch (e) { /* skip invalid */ }
     }
-    res.json(agents);
+    const waitingForUser = checkWaitingForUser(agentDir);
+    res.json({ agents, waitingForUser });
   } catch (e) {
-    res.json([]);
+    res.json({ agents: [], waitingForUser: null });
   }
 });
 
+app.get('/api/sessions/:sessionId/messages', (req, res) => {
+  const limit = Math.min(parseInt(req.query.limit, 10) || 10, 50);
+  const metadata = loadSessionMetadata();
+  const meta = metadata[req.params.sessionId];
+  const jsonlPath = meta?.jsonlPath;
+  if (!jsonlPath) return res.json({ messages: [], sessionId: req.params.sessionId });
+  const messages = readRecentMessages(jsonlPath, limit);
+  res.json({ messages, sessionId: req.params.sessionId });
+});
+
 app.get('/api/version', (req, res) => {
   const pkg = require('./package.json');
   res.json({ version: pkg.version });
@@ -675,9 +863,14 @@ app.get('/api/events', (req, res) => {
   res.setHeader('Connection', 'keep-alive');
 
   clients.add(res);
+  console.log(`[SSE] Client connected (total: ${clients.size})`);
+
+  const heartbeat = setInterval(() => res.write(':heartbeat\n\n'), 30000);
 
   req.on('close', () => {
+    clearInterval(heartbeat);
     clients.delete(res);
+    console.log(`[SSE] Client disconnected (total: ${clients.size})`);
   });
 
   // Send initial ping
@@ -782,14 +975,14 @@ const agentActivityWatcher = chokidar.watch(AGENT_ACTIVITY_DIR, {
 const AGENT_FILE_CAP = 20;
 
 agentActivityWatcher.on('all', (event, filePath) => {
-  if ((event === 'add' || event === 'change') && filePath.endsWith('.json')) {
+  if ((event === 'add' || event === 'change' || event === 'unlink') && filePath.endsWith('.json')) {
     const relativePath = path.relative(AGENT_ACTIVITY_DIR, filePath);
     const sessionId = relativePath.split(path.sep)[0];
     // Cleanup: if session dir exceeds cap, delete oldest files by mtime
     if (event === 'add') {
       try {
         const sessionDir = path.join(AGENT_ACTIVITY_DIR, sessionId);
-        const files = readdirSync(sessionDir).filter(f => f.endsWith('.json'));
+        const files = readdirSync(sessionDir).filter(f => f.endsWith('.json') && !f.startsWith('_'));
         if (files.length > AGENT_FILE_CAP) {
           const withStats = files.map(f => {
             const fp = path.join(sessionDir, f);