claude-code-kanban 4.4.0 → 4.5.0

package/lib/parsers.js

@@ -222,12 +222,29 @@ function scrapeScalarFromBlob(blob, re) {
 const sessionInfoCache = new Map();
 const SESSION_INFO_CACHE_MAX = 2000;
 
+// Session-scoped /goal: a goal_status attachment carries the active condition
+// (latest-wins as the Stop hook re-evaluates). Only an unmet goal is "active" —
+// a met goal auto-clears in Claude Code, so treat met as removal, same as a
+// `/goal clear` command line. Returns the goal value to apply, or `undefined`
+// when the line is not a goal event (caller keeps its current value).
+function extractGoalFromLine(data) {
+  if (data.type === 'attachment' && data.attachment?.type === 'goal_status') {
+    return data.attachment.met ? null : { condition: data.attachment.condition || '' };
+  }
+  if (data.type === 'user' && typeof data.message?.content === 'string'
+      && data.message.content.includes('<command-name>/goal</command-name>')
+      && /<command-args>\s*clear/.test(data.message.content)) {
+    return null;
+  }
+  return undefined;
+}
+
 // gitBranch in the JSONL is pinned to the launch-time repo by Claude Code
 // and goes stale once cwd shifts (Bash `cd`, submodule). Callers needing the
 // live branch must resolve it from cwd separately. Cache is reset on inode
 // change or truncation (size < scannedUpTo).
 function readSessionInfoFromJsonl(jsonlPath) {
-  const result = { slug: null, projectPath: null, cwd: null, gitBranch: null, customTitle: null, logicalParentUuid: null };
+  const result = { slug: null, projectPath: null, cwd: null, gitBranch: null, customTitle: null, logicalParentUuid: null, goal: null };
   let stat;
   let fd;
   try {
@@ -248,6 +265,7 @@ function readSessionInfoFromJsonl(jsonlPath) {
       cwd: cached.cwd,
       gitBranch: cached.gitBranch,
       logicalParentUuid: cached.logicalParentUuid || null,
+      goal: cached.goal || null,
       customTitle: readCustomTitle(jsonlPath, stat)
     };
   }
@@ -258,6 +276,7 @@ function readSessionInfoFromJsonl(jsonlPath) {
     result.cwd = cached.cwd;
     result.gitBranch = cached.gitBranch;
     result.logicalParentUuid = cached.logicalParentUuid || null;
+    result.goal = cached.goal || null;
   }
 
   let lastCwdSeen = result.cwd;
@@ -273,6 +292,9 @@ function readSessionInfoFromJsonl(jsonlPath) {
       if (data.subtype === 'compact_boundary' && data.logicalParentUuid && !result.logicalParentUuid) {
         result.logicalParentUuid = data.logicalParentUuid;
       }
+      // Forward → last wins.
+      const goalUpdate = extractGoalFromLine(data);
+      if (goalUpdate !== undefined) result.goal = goalUpdate;
     } catch (e) {}
   };
 
@@ -337,6 +359,9 @@ function readSessionInfoFromJsonl(jsonlPath) {
         const tn = fs.readSync(fd, tailBuf, 0, TAIL_SIZE, tailStart);
         const lines = tailBuf.toString('utf8', 0, tn).split('\n');
         let latestTailCwd = null;
+        // undefined = no goal event seen in tail (keep head's); otherwise the
+        // most recent tail goal/clear supersedes head (tail bytes are later).
+        let tailGoal;
         for (let i = lines.length - 1; i >= 0; i--) {
           try {
             const data = JSON.parse(lines[i]);
@@ -344,10 +369,12 @@ function readSessionInfoFromJsonl(jsonlPath) {
             if (!result.projectPath && data.cwd) result.projectPath = data.cwd;
             if (!result.gitBranch && data.gitBranch) result.gitBranch = data.gitBranch;
             if (!latestTailCwd && data.cwd) latestTailCwd = data.cwd;
-            if (latestTailCwd && result.slug && result.projectPath && result.gitBranch) break;
+            if (tailGoal === undefined) tailGoal = extractGoalFromLine(data);
+            if (latestTailCwd && tailGoal !== undefined && result.slug && result.projectPath && result.gitBranch) break;
           } catch (e) {}
         }
         if (latestTailCwd) lastCwdSeen = latestTailCwd;
+        if (tailGoal !== undefined) result.goal = tailGoal;
       }
       scannedUpTo = stat.size;
     }
@@ -367,7 +394,8 @@ function readSessionInfoFromJsonl(jsonlPath) {
       projectPath: result.projectPath,
       gitBranch: result.gitBranch,
       cwd: result.cwd,
-      logicalParentUuid: result.logicalParentUuid
+      logicalParentUuid: result.logicalParentUuid,
+      goal: result.goal
     });
     if (sessionInfoCache.size > SESSION_INFO_CACHE_MAX) {
       const firstKey = sessionInfoCache.keys().next().value;
@@ -402,6 +430,7 @@ function readRecentMessages(jsonlPath, limit = 10) {
     fd = require('fs').openSync(jsonlPath, 'r');
     const messages = [];
     const toolResults = new Map();
+    const toolResultExtras = new Map();
     let readSize = Math.min(65536, stat.size);
 
     while (messages.length < limit) {
@@ -417,6 +446,7 @@ function readRecentMessages(jsonlPath, limit = 10) {
 
       messages.length = 0;
       toolResults.clear();
+      toolResultExtras.clear();
       for (const line of clean.split('\n')) {
         if (!line.trim()) continue;
         try {
@@ -478,11 +508,20 @@ function readRecentMessages(jsonlPath, limit = 10) {
                 const params = {};
                 if (inp) {
                   if (block.name === 'Edit') {
+                    if (inp.file_path) params.file_path = inp.file_path;
                     if (inp.old_string) params.old_string = inp.old_string;
                     if (inp.new_string) params.new_string = inp.new_string;
                     if (inp.replace_all) params.replace_all = true;
                   } else if (block.name === 'Write') {
-                    if (inp.content) params.content = inp.content.length > TOOL_RESULT_MAX ? inp.content.slice(0, TOOL_RESULT_MAX) + '\n... (truncated)' : inp.content;
+                    if (inp.file_path) params.file_path = inp.file_path;
+                    if (inp.content) {
+                      if (inp.content.length > TOOL_RESULT_MAX) {
+                        params.content = inp.content.slice(0, TOOL_RESULT_MAX) + '\n... (truncated)';
+                        params.contentFull = inp.content;
+                      } else {
+                        params.content = inp.content;
+                      }
+                    }
                   } else if (block.name === 'Grep') {
                     if (inp.path) params.path = inp.path;
                     if (inp.glob) params.glob = inp.glob;
@@ -538,6 +577,19 @@ function readRecentMessages(jsonlPath, limit = 10) {
                     if (inp.message && typeof inp.message === 'object') {
                       params.protocol = inp.message;
                     }
+                  } else {
+                    // Passthrough for unknown tools (e.g. MCP `mcp__...`) so the detail panel
+                    // can render args instead of "No details". Truncate large strings to bound
+                    // wire/cache size, matching the Write `content` cap above.
+                    for (const [k, v] of Object.entries(inp)) {
+                      if (k === 'description' || v == null) continue;
+                      if (typeof v === 'string' && v.length > TOOL_RESULT_MAX) {
+                        params[k] = v.slice(0, TOOL_RESULT_MAX) + '\n... (truncated)';
+                        params[k + 'Full'] = v;
+                      } else {
+                        params[k] = v;
+                      }
+                    }
                   }
                 }
                 const msg = {
@@ -634,9 +686,25 @@ function readRecentMessages(jsonlPath, limit = 10) {
                   if (resultText) {
                     toolResults.set(block.tool_use_id, resultText);
                   }
+                  // AskUserQuestion (and similar) stash the structured
+                  // {questions, answers} payload at the line-level
+                  // obj.toolUseResult — the block.content string is just a
+                  // short confirmation. Capture it so the renderer can show
+                  // the actual answers + option descriptions.
+                  const tur = obj.toolUseResult;
+                  let answerPayload = null;
+                  if (tur && typeof tur === 'object' && !Array.isArray(tur)
+                      && tur.answers && typeof tur.answers === 'object') {
+                    answerPayload = {
+                      answers: tur.answers,
+                      questions: Array.isArray(tur.questions) ? tur.questions : null,
+                    };
+                    toolResultExtras.set(block.tool_use_id, { answerPayload });
+                  }
                   toolResultRefs.push({
                     toolUseId: block.tool_use_id,
-                    preview: resultText ? resultText.slice(0, 200) : ''
+                    preview: resultText ? resultText.slice(0, 200) : '',
+                    answerPayload,
                   });
                 }
               });
@@ -662,15 +730,27 @@ function readRecentMessages(jsonlPath, limit = 10) {
     }
 
     // Attach tool results to their corresponding tool_use messages.
-    // For perf, we never ship the full text in the messages payload — when
-    // truncated, the client lazy-fetches via /api/sessions/:id/tool-result/:toolUseId.
+    // When truncated, ship the full text inline as toolResultFull so the
+    // modal expand toggle is instant. The lazy fetch at
+    // /api/sessions/:id/tool-result/:toolUseId remains a fallback for older
+    // cached payloads that may lack toolResultFull.
     for (const msg of messages) {
       if (msg.type === 'tool_use' && msg.toolUseId && toolResults.has(msg.toolUseId)) {
         const full = toolResults.get(msg.toolUseId);
         const truncated = full.length > TOOL_RESULT_MAX;
-        msg.toolResult = truncated ? full.slice(0, TOOL_RESULT_MAX) + '\n... (truncated)' : full;
+        if (truncated) {
+          msg.toolResult = full.slice(0, TOOL_RESULT_MAX) + '\n... (truncated)';
+          msg.toolResultFull = full;
+        } else {
+          msg.toolResult = full;
+        }
         msg.toolResultTruncated = truncated;
       }
+      if (msg.type === 'tool_use' && msg.tool === 'AskUserQuestion'
+          && msg.toolUseId && toolResultExtras.has(msg.toolUseId)) {
+        const extra = toolResultExtras.get(msg.toolUseId);
+        if (extra.answerPayload) msg.answerPayload = extra.answerPayload;
+      }
     }
 
     require('fs').closeSync(fd);
@@ -878,6 +958,13 @@ function buildSessionDigest(jsonlPath) {
     for (const [key, entry] of Object.entries(map)) {
       if (nameByToolUseId[key]) entry.name = nameByToolUseId[key];
       if (descByToolUseId[key]) entry.description = descByToolUseId[key];
+      // Prefer the full prompt from the assistant's tool_use input — Claude Code's
+      // agent_progress system messages embed a truncated prompt that ends mid-sentence.
+      // Only override when entry already had a prompt (i.e. agent_progress path);
+      // bg/teammate paths intentionally keep prompt null per existing contract.
+      if (entry.prompt && promptByToolUseId[key] && promptByToolUseId[key].length > entry.prompt.length) {
+        entry.prompt = promptByToolUseId[key];
+      }
     }
   } catch (_) {}
   const rejectedAgentIds = new Set();
@@ -977,10 +1064,10 @@ function extractPromptFromTranscript(jsonlPath) {
         const obj = JSON.parse(firstLine);
         if (obj.type === 'user') {
           const content = obj.message?.content;
-          if (typeof content === 'string') return content.slice(0, 500);
+          if (typeof content === 'string') return content;
           if (Array.isArray(content)) {
             for (const b of content) {
-              if (b.type === 'text' && b.text) return b.text.slice(0, 500);
+              if (b.type === 'text' && b.text) return b.text;
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-kanban",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "A web-based Kanban board for viewing Claude Code tasks with agent teams support",
   "main": "server.js",
   "bin": {

package/plugin/plugins/claude-code-kanban/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "claude-code-kanban",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Agent activity tracking for claude-code-kanban dashboard"
 }

package/plugin/plugins/claude-code-kanban/scripts/agent-spy.sh

@@ -58,7 +58,7 @@ if [ "$EVENT" = "PermissionRequest" ] || { [ "$EVENT" = "PreToolUse" ] && { [ "$
     status: "waiting",
     kind: $kind,
     toolName: (.tool_name // "unknown"),
-    toolInput: ((.tool_input | tostring)[0:200] // ""),
+    toolInput: ((.tool_input | tostring) // ""),
     timestamp: $ts
   }' > "$DIR/_waiting.json"
   exit 0

package/public/app.js

@@ -161,12 +161,16 @@ async function fetchSessions(includeTasks = true) {
     const allPinnedIds = new Set([...pinnedSessionIds, ...stickySessionIds]);
     if (revealedPlanSessionId) allPinnedIds.add(revealedPlanSessionId);
     if (revealedStorageSessionId) allPinnedIds.add(revealedStorageSessionId);
+    // When server filters by activity, the focused session may not be active —
+    // include it in pinned so the server still returns it.
+    if (sessionFilter === 'active' && currentSessionId) allPinnedIds.add(currentSessionId);
     const pinnedParam = allPinnedIds.size > 0 ? `&pinned=${[...allPinnedIds].join(',')}` : '';
     const projectParam =
       filterProject && filterProject !== '__recent__' ? `&project=${encodeURIComponent(filterProject)}` : '';
-    const sessionsPromise = fetch(`/api/sessions?limit=${sessionLimit}${pinnedParam}${projectParam}`).then((r) =>
-      r.json(),
-    );
+    const filterParam = sessionFilter === 'active' ? '&filter=active' : '';
+    const sessionsPromise = fetch(
+      `/api/sessions?limit=${sessionLimit}${pinnedParam}${projectParam}${filterParam}`,
+    ).then((r) => r.json());
 
     let newSessions, newTasks;
     if (includeTasks) {
@@ -582,7 +586,6 @@ async function fetchTasks(sessionId) {
 const WAITING_TTL_MS = 30 * 60 * 1000;
 const AGENT_LOG_MAX = 8;
 const LIVE_INDICATOR_MS = 10 * 1000;
-const ACTIVE_PLAN_MS = 10 * 60 * 1000;
 // #endregion
 
 function resetAgentState() {
@@ -1144,42 +1147,80 @@ function toggleToolGroup(id) {
   if (el) el.classList.toggle('show');
 }
 
-const WAITING_PLAN_PREVIEW_CHARS = 120;
-const WAITING_PREVIEW_MAX_CHARS = 200;
-
 function getWaitingLabel(kind, tool) {
   if (kind !== 'question') return `Awaiting permission: ${tool}`;
   if (tool === 'ExitPlanMode') return 'Plan awaiting approval';
   return 'Question pending';
 }
 
-function getWaitingPreview(toolInput) {
-  if (!toolInput) return '';
-  try {
-    const parsed = JSON.parse(toolInput);
-    if (parsed.questions?.[0]?.question) return parsed.questions[0].question;
-    if (parsed.plan) {
-      const t = parsed.plan.match(/^#\s+(.+)/m);
-      return t ? t[1] : parsed.plan.slice(0, WAITING_PLAN_PREVIEW_CHARS);
-    }
-    if (parsed.command) return parsed.command;
-    if (parsed.file_path) return parsed.file_path;
-  } catch (_) {
-    /* toolInput may be truncated/non-JSON */
-  }
+function getWaitingPill(kind, tool) {
+  if (kind === 'question' && tool === 'ExitPlanMode') return 'Plan awaiting approval';
+  if (kind === 'question') return 'Question pending';
+  return 'Awaiting permission';
+}
+
+function deriveWaitingDetail(tool, params) {
+  if (!params) return '';
+  const trunc = (s) => (s.length > 80 ? `${s.slice(0, 80)}...` : s);
+  if (params.file_path) return params.file_path.replace(/^.*[/\\]/, '');
+  if (params.command) return trunc(params.command);
+  if (params.pattern) return trunc(params.pattern);
+  if (params.query) return trunc(params.query);
+  if (params.url) return trunc(params.url);
+  if (params.skill) {
+    const s = params.skill + (typeof params.args === 'string' ? ` ${params.args}` : '');
+    return trunc(s);
+  }
+  if (tool === 'AskUserQuestion' && params.questions?.[0]?.question) return trunc(params.questions[0].question);
+  if (tool === 'ExitPlanMode' && typeof params.plan === 'string') {
+    const t = params.plan.match(/^#\s+(.+)/m);
+    return trunc(t ? t[1] : params.plan);
+  }
+  if (params.description) return trunc(String(params.description));
   return '';
 }
 
+function renderWaitingBody(tool, params) {
+  if (!params) return '';
+  if (tool === 'AskUserQuestion' && Array.isArray(params.questions)) {
+    const items = params.questions
+      .map((q) => {
+        const head = `<div style="font-weight:600">${escapeHtml(q.question || '')}</div>`;
+        const opts = Array.isArray(q.options)
+          ? `<ul style="margin:2px 0 0 16px;padding:0">${q.options
+              .map(
+                (o) =>
+                  `<li><span style="font-weight:600">${escapeHtml(o.label || '')}</span>${o.description ? ` — <span style="color:var(--text-muted)">${escapeHtml(o.description)}</span>` : ''}</li>`,
+              )
+              .join('')}</ul>`
+          : '';
+        return `<div style="margin-top:6px">${head}${opts}</div>`;
+      })
+      .join('');
+    return items;
+  }
+  return renderToolParamsHtml(params);
+}
+
 function renderWaitingEntry() {
   if (!isWaitingFresh()) return '';
   const tool = currentWaiting.toolName || 'unknown';
-  const label = getWaitingLabel(currentWaiting.kind, tool);
-  const preview = getWaitingPreview(currentWaiting.toolInput);
-  const previewHtml = preview
-    ? `<div class="msg-waiting-preview">${escapeHtml(preview.slice(0, WAITING_PREVIEW_MAX_CHARS))}</div>`
-    : '';
+  let params = null;
+  if (currentWaiting.toolInput) {
+    try {
+      params = JSON.parse(currentWaiting.toolInput);
+    } catch (_) {
+      /* toolInput may be truncated/non-JSON */
+    }
+  }
+  const pillText = getWaitingPill(currentWaiting.kind, tool);
+  const detail = deriveWaitingDetail(tool, params);
+  const detailHtml = detail ? ` <span style="color:var(--text-secondary)">${escapeHtml(detail)}</span>` : '';
+  const bodyHtml = renderWaitingBody(tool, params);
+  const bodyWrap = bodyHtml ? `<div class="msg-waiting-body">${bodyHtml}</div>` : '';
+  const pill = `<span class="msg-waiting-pill">${escapeHtml(pillText)}</span>`;
   const discardBtn = `<button class="msg-waiting-discard" title="Discard permission prompt" onclick="event.stopPropagation();discardWaiting()"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="14" height="14"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg></button>`;
-  return `<div class="msg-item msg-waiting" onclick="msgDetailFollowLatest=false;showWaitingDetail()">${ICON_CHAT}<div class="msg-body"><div class="msg-text">${escapeHtml(label)}</div>${previewHtml}<div class="msg-time">waiting…</div></div>${discardBtn}</div>`;
+  return `<div class="msg-item msg-waiting" onclick="msgDetailFollowLatest=false;showWaitingDetail()">${getToolIcon(tool)}<div class="msg-body"><div class="msg-text">${pill} <span style="font-weight:600">${escapeHtml(tool)}</span>${detailHtml}</div>${bodyWrap}<div class="msg-time">waiting…</div></div>${discardBtn}</div>`;
 }
 
 // biome-ignore lint/correctness/noUnusedVariables: used in HTML onclick
@@ -1354,6 +1395,20 @@ function togglePin(msgIndex) {
     currentPins.splice(idx, 1);
   } else {
     pinnedCollapsed = false;
+    // Strip large server-truncated `*Full` payloads (Write contentFull,
+    // MCP passthrough <k>Full) before stashing in localStorage — a few
+    // pinned big writes can blow past the per-origin quota. On pin
+    // expand, the modal falls back to the truncated string + the lazy
+    // /api/sessions/:id/tool-result/:toolUseId endpoint.
+    let paramsForPin = null;
+    if (m.params) {
+      paramsForPin = {};
+      for (const [k, v] of Object.entries(m.params)) {
+        if (k === 'contentFull') continue;
+        if (k.endsWith('Full') && typeof v === 'string' && typeof m.params[k.slice(0, -4)] === 'string') continue;
+        paramsForPin[k] = v;
+      }
+    }
     currentPins.push({
       id,
       type: m.type,
@@ -1363,6 +1418,9 @@ function togglePin(msgIndex) {
       toolUseId: m.toolUseId || null,
       toolResult: m.toolResult || null,
       toolResultTruncated: m.toolResultTruncated || false,
+      toolResultFull: null,
+      answerPayload: m.answerPayload || null,
+      params: paramsForPin,
       detail: m.detail || null,
       fullDetail: m.fullDetail || null,
       description: m.description || null,
@@ -1671,7 +1729,9 @@ function showMsgDetail(idx) {
     } else {
       mainHtml = TASK_TOOLS.has(m.tool) ? '' : '<em>No details</em>';
     }
-    body.innerHTML = mainHtml + toolParamsHtml + taskResultHtml + (hasAgentTabs ? '' : toolResultHtml) + agentExtraHtml;
+    const answersHtml = m.answerPayload ? renderAnswerPayloadHtml(m.answerPayload) : '';
+    body.innerHTML =
+      mainHtml + toolParamsHtml + answersHtml + taskResultHtml + (hasAgentTabs ? '' : toolResultHtml) + agentExtraHtml;
   } else if (m.type === 'teammate') {
     document.getElementById('msg-detail-title').textContent = m.teammateId || 'Teammate';
     document.getElementById('msg-detail-agent-btn').style.display = 'none';
@@ -1890,16 +1950,75 @@ function renderTaskResult(toolResult) {
   return `${html}</div>`;
 }
 
+function renderAnswerPayloadHtml(answerPayload) {
+  if (!answerPayload?.answers || typeof answerPayload.answers !== 'object') return '';
+  const qs = Array.isArray(answerPayload.questions) ? answerPayload.questions : [];
+  const findOptionDesc = (qText, label) => {
+    const q = qs.find((x) => x && x.question === qText);
+    if (!q || !Array.isArray(q.options)) return null;
+    const opt = q.options.find((o) => o && o.label === label);
+    return opt?.description ? opt.description : null;
+  };
+  const rows = Object.entries(answerPayload.answers)
+    .map(([q, a]) => {
+      const ansList = Array.isArray(a) ? a : [a];
+      const items = ansList
+        .map((label) => {
+          const desc = findOptionDesc(q, label);
+          const descHtml = desc ? ` <span style="color:var(--text-muted)">— ${escapeHtml(desc)}</span>` : '';
+          return `<li><span style="font-weight:600">${escapeHtml(String(label))}</span>${descHtml}</li>`;
+        })
+        .join('');
+      return `<div style="margin-top:6px">
+      <div style="font-size:0.75rem;color:var(--text-muted);margin-bottom:2px">${escapeHtml(q)}</div>
+      <ul style="margin:2px 0 0 16px;padding:0">${items}</ul>
+    </div>`;
+    })
+    .join('');
+  return `<div style="margin-top:10px;padding-top:8px;border-top:1px solid var(--border)">
+    <div style="font-size:0.8rem;color:var(--text-muted);margin-bottom:4px">Answers</div>
+    ${rows}
+  </div>`;
+}
+
 function renderToolParamsHtml(params) {
   if (!params) return '';
-  const BLOCK_KEYS = new Set(['old_string', 'new_string', 'content', 'plan']);
+  const BLOCK_KEYS = new Set(['old_string', 'new_string', 'content', 'contentFull', 'plan']);
   const badges = [],
-    blocks = [];
+    blocks = [],
+    jsonBlocks = [];
   for (const [k, v] of Object.entries(params)) {
     if (BLOCK_KEYS.has(k)) continue;
+    // Skip sibling `<k>Full` entries — they're used as expand targets, not
+    // rendered as their own field. Only treat it as a sibling when the
+    // trimmed key holds a server-truncated string (ends with the truncation
+    // marker), otherwise a real param that happens to end in "Full" would
+    // disappear.
+    if (k.endsWith('Full')) {
+      const baseKey = k.slice(0, -4);
+      const base = params[baseKey];
+      if (typeof base === 'string' && base.endsWith('... (truncated)') && typeof v === 'string') {
+        continue;
+      }
+    }
+    if (v !== null && typeof v === 'object') {
+      let pretty;
+      try {
+        pretty = JSON.stringify(v, null, 2);
+      } catch (_) {
+        pretty = String(v);
+      }
+      if (pretty.length > CONTENT_TRUNCATE_MAX) {
+        pretty = `${pretty.slice(0, CONTENT_TRUNCATE_MAX)}\n... (truncated)`;
+      }
+      jsonBlocks.push({ k, pretty });
+      continue;
+    }
     const display = typeof v === 'boolean' ? (v ? 'yes' : 'no') : String(v);
     if (display.length > 60) {
-      blocks.push({ k, display });
+      const fullKey = `${k}Full`;
+      const full = typeof params[fullKey] === 'string' ? params[fullKey] : null;
+      blocks.push({ k, display, full });
     } else {
       badges.push(
         `<span style="display:inline-flex;align-items:center;gap:3px;padding:1px 6px;border-radius:3px;background:var(--bg-secondary);font-size:0.75rem"><span style="color:var(--text-muted)">${escapeHtml(k)}:</span> ${escapeHtml(display)}</span>`,
@@ -1908,8 +2027,19 @@ function renderToolParamsHtml(params) {
   }
   let html = '';
   if (badges.length) html += `<div style="margin-top:6px;display:flex;flex-wrap:wrap;gap:4px">${badges.join('')}</div>`;
-  for (const { k, display } of blocks) {
-    html += `<div style="margin-top:6px;font-size:0.75rem"><span style="color:var(--text-muted)">${escapeHtml(k)}:</span> <span style="word-break:break-all">${escapeHtml(display)}</span></div>`;
+  for (const { k, display, full } of blocks) {
+    let suffix = '';
+    if (full && full.length > display.length) {
+      const toggle = makeExpandToggle(escapeHtml(display), escapeHtml(full), { fontSize: '0.75rem' });
+      suffix = ` ${toggle.btn}${toggle.full}`;
+    }
+    html += `<div style="margin-top:6px;font-size:0.75rem"><span style="color:var(--text-muted)">${escapeHtml(k)}:</span> <span style="word-break:break-all">${escapeHtml(display)}</span>${suffix}</div>`;
+  }
+  for (const { k, pretty } of jsonBlocks) {
+    html += `<div style="margin-top:8px;padding-top:6px;border-top:1px solid var(--border)">
+          <div style="font-size:0.75rem;color:var(--text-muted);margin-bottom:2px">${escapeHtml(k)}</div>
+          <pre class="${TINTED_PRE_CLASS}" style="max-height:300px;overflow:auto;font-size:0.75rem">${escapeHtml(pretty)}</pre>
+        </div>`;
   }
   if (params.old_string || params.new_string) {
     html += `<div style="margin-top:8px;padding-top:6px;border-top:1px solid var(--border)">`;
@@ -1924,14 +2054,18 @@ function renderToolParamsHtml(params) {
     html += `</div>`;
   }
   if (params.content) {
-    const contentTruncated = params.content.length > CONTENT_TRUNCATE_MAX;
-    const truncContent = contentTruncated
-      ? `${params.content.slice(0, CONTENT_TRUNCATE_MAX)}\n... (truncated)`
+    // params.contentFull is set by the server when the truncated `content`
+    // ends with `... (truncated)`. Fall back to params.content otherwise so
+    // small writes render as before.
+    const fullContent = params.contentFull || params.content;
+    const isTruncated = !!params.contentFull || params.content.length > CONTENT_TRUNCATE_MAX;
+    const truncContent = isTruncated
+      ? `${params.content.slice(0, CONTENT_TRUNCATE_MAX)}${params.content.length > CONTENT_TRUNCATE_MAX ? '\n... (truncated)' : ''}`
       : params.content;
     let writeMoreBtn = '',
       fullBlock = '';
-    if (contentTruncated) {
-      const toggle = makeExpandToggle(escapeHtml(truncContent), escapeHtml(params.content), {
+    if (isTruncated) {
+      const toggle = makeExpandToggle(escapeHtml(truncContent), escapeHtml(fullContent), {
         fontSize: '0.75rem',
         maxHeight: '500px',
         tinted: true,
@@ -2109,6 +2243,16 @@ async function postAndToast(url, body, label) {
 async function openMsgInEditor() {
   const m = getDetailMsg();
   if (!m) return;
+  // Write/Edit tool calls record the source path — open that directly instead
+  // of dumping the rendered modal body into a temp buffer.
+  const filePath =
+    m.type === 'tool_use' && (m.tool === 'Write' || m.tool === 'Edit')
+      ? m.params?.file_path || m.fullDetail || null
+      : null;
+  if (filePath) {
+    postAndToast('/api/open-in-editor', { file: filePath }, 'in editor');
+    return;
+  }
   const title = m.type === 'tool_use' ? m.tool : m.compactSummary ? 'compact-summary' : m.type;
   postAndToast('/api/open-in-editor', { content: getMessageDisplayContent(m), title }, 'in editor');
 }
@@ -2463,7 +2607,6 @@ function renderSessions() {
   // project filter → search filter → ensure pinned/sticky sessions are always included
   let filteredSessions = sessions;
   if (sessionFilter === 'active') {
-    const now = Date.now();
     const activeSessionIds = new Set();
     filteredSessions = filteredSessions.filter((s) => {
       if (dismissedSessionIds.has(s.id)) return false;
@@ -2472,8 +2615,7 @@ function renderSessions() {
         ((!s.sharedTaskList && (s.pending > 0 || s.inProgress > 0)) ||
           s.hasActiveAgents ||
           s.hasWaitingForUser ||
-          s.hasRecentLog ||
-          (s.hasPlan && !s.planImplementationSessionId && now - new Date(s.modifiedAt).getTime() <= ACTIVE_PLAN_MS));
+          s.hasRecentLog);
       if (isActive) activeSessionIds.add(s.id);
       return isActive;
     });
@@ -2613,6 +2755,7 @@ function renderSessions() {
             ${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>` : ''}
+            ${renderGoalSubtitle(session)}
             <div class="session-progress">
               <span class="session-indicators">
                 ${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>` : ''}
@@ -2715,6 +2858,7 @@ function renderSessions() {
       const folderName = projectPath.split(/[/\\]/).pop();
       const isCollapsed = collapsedProjectGroups.has(projectPath);
       const escapedPath = escapeHtml(projectPath);
+      const activeCount = projectSessions.reduce((n, s) => n + (isSessionActive(s) ? 1 : 0), 0);
       const breadcrumbParts = projectPath
         .replace(/^\/home\/[^/]+/, '~')
         .split(/[/\\]/)
@@ -2727,7 +2871,7 @@ function renderSessions() {
             <div class="project-group-header${isCollapsed ? ' collapsed' : ''}" data-group-path="${escapedPath}">
               <svg class="group-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="6 9 12 15 18 9"/></svg>
               <span class="group-name">${escapeHtml(folderName)}</span>
-              <span class="group-count">${projectSessions.length}</span>
+              <span class="group-count" title="${activeCount} active / ${projectSessions.length} total">${activeCount > 0 ? `<span class="group-count-active">${activeCount}</span><span class="group-count-sep">/</span>` : ''}${projectSessions.length}</span>
               <span class="project-view-btn" data-project-path="${escapedPath}" title="Open project view — combined tasks from all sessions">
                 <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
               </span>
@@ -2741,11 +2885,12 @@ function renderSessions() {
 
     if (ungrouped.length > 0 && sortedGroups.length > 0) {
       const isCollapsed = collapsedProjectGroups.has('__ungrouped__');
+      const ungroupedActive = ungrouped.reduce((n, s) => n + (isSessionActive(s) ? 1 : 0), 0);
       html += `
             <div class="project-group-header${isCollapsed ? ' collapsed' : ''}" data-group-path="__ungrouped__">
               <svg class="group-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="6 9 12 15 18 9"/></svg>
               <span class="group-name">Ungrouped</span>
-              <span class="group-count">${ungrouped.length}</span>
+              <span class="group-count" title="${ungroupedActive} active / ${ungrouped.length} total">${ungroupedActive > 0 ? `<span class="group-count-active">${ungroupedActive}</span><span class="group-count-sep">/</span>` : ''}${ungrouped.length}</span>
             </div>
             <div class="project-group-sessions${isCollapsed ? ' collapsed' : ''}">
               ${renderGroupSessions(ungrouped, '__pinned___ungrouped__')}
@@ -5803,6 +5948,13 @@ function showInfoModal(session, teamConfig, tasks, planContent, parentInfo) {
   });
   html += `</div>`;
 
+  if (session.goal?.condition) {
+    html += `<div class="info-goal-card">
+          <div class="info-goal-head"><span class="info-goal-icon">◎</span>Goal</div>
+          <div class="info-goal-text">${escapeHtml(session.goal.condition)}</div>
+        </div>`;
+  }
+
   if (session.contextStatus) {
     html += `<hr style="border: none; border-top: 1px solid var(--border); margin: 12px 0;">`;
     html += renderContextDetail(session.contextStatus);
@@ -6044,6 +6196,16 @@ function renderLoopModalBody(data) {
   body.innerHTML = section('Wakeups', wakeups, 'wakeup') + section('Cron jobs', crons, 'cron');
 }
 
+function renderGoalSubtitle(session) {
+  const g = session.goal;
+  if (!g?.condition) return '';
+  const short = g.condition.length > 70 ? `${g.condition.slice(0, 70)}…` : g.condition;
+  // Only active (unmet) goals reach here — a met goal auto-clears. Clicking
+  // opens the info modal (full text); stopPropagation so it doesn't also
+  // trigger the card's fetchTasks.
+  return `<div class="session-goal" onclick="event.stopPropagation(); showSessionInfoModal('${session.id}')" title="${escapeHtml(g.condition)}"><span class="session-goal-icon">◎</span>${escapeHtml(short)}</div>`;
+}
+
 function renderLoopBadge(session) {
   const li = session.loopInfo;
   const total = (li?.wakeupCount || 0) + (li?.cronCount || 0);
@@ -6181,13 +6343,14 @@ function showToolStatsModal(sessionId) {
 }
 
 function renderToolStatsBody(data) {
-  const { totalCalls, uniqueTools, totalFailed, tools } = data;
+  const { totalCalls, uniqueTools, totalFailed, totalRejected, tools } = data;
 
   const summary = `
     <div class="tool-stats-summary">
       <div class="tool-stats-chip"><span class="tool-stats-chip-val">${totalCalls}</span><span class="tool-stats-chip-lbl">Total calls</span></div>
       <div class="tool-stats-chip"><span class="tool-stats-chip-val">${uniqueTools}</span><span class="tool-stats-chip-lbl">Unique tools</span></div>
       <div class="tool-stats-chip"><span class="tool-stats-chip-val${totalFailed > 0 ? ' failed' : ''}">${totalFailed}</span><span class="tool-stats-chip-lbl">Failed</span></div>
+      <div class="tool-stats-chip"><span class="tool-stats-chip-val${totalRejected > 0 ? ' rejected' : ''}">${totalRejected}</span><span class="tool-stats-chip-lbl">Rejected</span></div>
     </div>`;
 
   if (!tools?.length) {
@@ -6212,6 +6375,7 @@ function renderToolStatsBody(data) {
       <th onclick="toolStatsSortBy('count')">Calls${arrow('count')}</th>
       <th onclick="toolStatsSortBy('success')">✓ Success${arrow('success')}</th>
       <th onclick="toolStatsSortBy('failed')">✗ Failed${arrow('failed')}</th>
+      <th onclick="toolStatsSortBy('rejected')">⊘ Rejected${arrow('rejected')}</th>
       <th onclick="toolStatsSortBy('impact')" title="Share of total tool output by character count">Impact${arrow('impact')}</th>
     </tr></thead>
     <tbody>${sorted
@@ -6221,6 +6385,7 @@ function renderToolStatsBody(data) {
       <td>${t.count}</td>
       <td>${t.success > 0 ? `<span class="badge-success">${t.success}</span>` : '—'}</td>
       <td>${t.failed > 0 ? `<span class="badge-failed">${t.failed}</span>` : '—'}</td>
+      <td>${t.rejected > 0 ? `<span class="badge-rejected">${t.rejected}</span>` : '—'}</td>
       <td class="impact-cell">${
         t.impact != null
           ? `<div class="impact-cell-inner"><div class="impact-bar-wrap"><div class="impact-bar-fill" style="width:${t.impact}%"></div></div><span class="impact-pct">${t.impact < 1 ? '<1' : t.impact}%</span></div>`

package/public/style.css

@@ -525,6 +525,24 @@ body::before {
   text-overflow: ellipsis;
 }
 
+.session-goal {
+  font-size: 10px;
+  margin-top: 2px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  cursor: pointer;
+  color: var(--warning);
+}
+.session-goal .session-goal-icon {
+  margin-right: 3px;
+  font-weight: 700;
+}
+.session-goal:hover {
+  text-decoration: underline;
+  text-underline-offset: 2px;
+}
+
 .session-item.plan-reveal {
   outline: 1.5px solid var(--plan);
   background: var(--plan-dim);
@@ -1868,6 +1886,36 @@ body::before {
   border-top: 1px solid var(--border);
 }
 
+.info-goal-card {
+  margin: 12px 0;
+  padding: 10px 14px;
+  background: var(--bg-elevated);
+  border: 1px solid var(--border);
+  border-left: 3px solid var(--warning);
+  border-radius: 8px;
+}
+.info-goal-head {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  color: var(--text-muted);
+}
+.info-goal-icon {
+  color: var(--warning);
+}
+.info-goal-text {
+  margin-top: 6px;
+  font-size: 13px;
+  line-height: 1.45;
+  color: var(--text-primary);
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
 .info-grid {
   display: grid;
   grid-template-columns: auto 1fr auto;
@@ -2501,12 +2549,27 @@ body::before {
   color: var(--danger, #e54d4d);
 }
 .msg-waiting .msg-text {
+  font-weight: 500;
+}
+.msg-waiting-pill {
+  display: inline-block;
+  padding: 1px 6px;
+  margin-right: 6px;
+  border-radius: 3px;
+  background: color-mix(in srgb, var(--warning, #f5a623) 22%, transparent);
+  color: var(--warning, #f5a623);
+  font-size: 10px;
   font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.3px;
+  vertical-align: middle;
 }
-.msg-waiting-preview {
-  font-size: 11px;
-  opacity: 0.85;
-  margin-top: 2px;
+.msg-waiting-body {
+  font-size: 12px;
+  margin-top: 4px;
+  word-break: break-word;
+}
+.msg-waiting-body pre {
   white-space: pre-wrap;
   word-break: break-word;
 }
@@ -3470,6 +3533,20 @@ select.form-input option:checked {
   font-weight: 600;
 }
 
+.badge-rejected {
+  display: inline-block;
+  background: rgba(245, 158, 11, 0.15);
+  color: #f59e0b;
+  border-radius: 4px;
+  padding: 1px 6px;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.tool-stats-chip-val.rejected {
+  color: #f59e0b;
+}
+
 .impact-bar-wrap {
   width: 48px;
   height: 6px;
@@ -3949,6 +4026,16 @@ pre.mermaid svg {
   line-height: 1;
 }
 
+.project-group-header .group-count-active {
+  color: var(--success);
+  font-weight: 500;
+}
+
+.project-group-header .group-count-sep {
+  margin: 0 1px;
+  opacity: 0.5;
+}
+
 .project-group-header .group-path-toggle {
   color: var(--text-muted);
   cursor: pointer;

package/server.js

@@ -159,6 +159,10 @@ function isAgentFresh(agent) {
   return (Date.now() - new Date(ts).getTime()) < AGENT_TTL_MS;
 }
 
+function isAgentLive(agent) {
+  return agent.status === 'active' || agent.status === 'idle';
+}
+
 // Claude Code records gitBranch from the launch-time repo and never updates it
 // when cwd shifts (Bash `cd`, submodule, sibling repo). Resolve on-demand from
 // the live cwd instead. Cached per-cwd with a short TTL so a list refresh
@@ -216,7 +220,7 @@ function checkAgentStatus(agentDir, stale, logMtime, isTeam) {
     for (const file of readdirSync(agentDir).filter(f => f.endsWith('.jsonl') && !f.startsWith('_'))) {
       try {
         const agent = readAgentJsonl(path.join(agentDir, file));
-        if (isTeam && (agent.status === 'active' || agent.status === 'idle')) {
+        if (isTeam && isAgentLive(agent)) {
           result.hasActive = true;
           if (agent.status === 'active') result.hasRunning = true;
         } else if (isAgentFresh(agent)) {
@@ -456,6 +460,8 @@ function refreshSessionMetadataPath(jsonlPath) {
   if (info.cwd) existing.cwd = info.cwd;
   if (info.gitBranch) existing.gitBranch = info.gitBranch;
   if (info.customTitle) existing.customTitle = info.customTitle;
+  // Direct assign (not guarded) so a /goal clear propagates as null.
+  existing.goal = info.goal || null;
   if (info.logicalParentUuid) existing.logicalParentUuid = info.logicalParentUuid;
   return true;
 }
@@ -541,6 +547,7 @@ function loadSessionMetadata() {
           cwd: sessionInfo.cwd || null,
           gitBranch: sessionInfo.gitBranch || null,
           customTitle: sessionInfo.customTitle || null,
+          goal: sessionInfo.goal || null,
           jsonlPath: jsonlPath,
           logicalParentUuid: sessionInfo.logicalParentUuid || null
         };
@@ -690,6 +697,7 @@ function buildSessionObject(id, meta, overrides = {}) {
     description: meta.description || null,
     gitBranch: resolveSessionGitBranch(meta),
     customTitle: meta.customTitle || null,
+    goal: meta.goal || null,
     taskCount: 0,
     completed: 0,
     inProgress: 0,
@@ -729,6 +737,7 @@ app.get('/api/sessions', async (req, res) => {
 
     const pinnedParam = req.query.pinned;
     const pinnedIds = pinnedParam ? new Set(pinnedParam.split(',').filter(Boolean)) : new Set();
+    const activeFilter = req.query.filter === 'active';
 
     const metadata = loadSessionMetadata();
     const sessionsMap = new Map();
@@ -751,6 +760,24 @@ app.get('/api/sessions', async (req, res) => {
           const logAge = logMtime ? Date.now() - logMtime : Infinity;
           const stale = logAge > AGENT_STALE_MS;
 
+          const isTeam = isTeamSession(entry.name);
+          const teamConfig = isTeam ? loadTeamConfig(entry.name) : null;
+          const resolvedAgentDir = path.join(AGENT_ACTIVITY_DIR, teamConfig?.leadSessionId || entry.name);
+          const agentStatus = checkAgentStatus(resolvedAgentDir, stale, logMtime, isTeam);
+
+          // Cheap-probe: when filter=active, skip expensive enrichment for inactive non-pinned sessions.
+          // Mirrors the post-filter predicate using only signals already computed above.
+          if (activeFilter && !pinnedIds.has(entry.name)) {
+            const hasRecentLog = logAge <= SESSION_STALE_MS;
+            const cheaplyActive = logStat.hasMessages && (
+              hasRecentLog
+              || agentStatus.hasActive
+              || !!agentStatus.waitingForUser
+              || (pending > 0 || inProgress > 0)
+            );
+            if (!cheaplyActive) continue;
+          }
+
           // Use newest of: task file mtime, JSONL mtime, directory mtime
           let modifiedAt = newestTaskMtime ? newestTaskMtime.toISOString() : stat.mtime.toISOString();
           if (logMtime) {
@@ -758,17 +785,9 @@ app.get('/api/sessions', async (req, res) => {
             if (jsonlMtime > modifiedAt) modifiedAt = jsonlMtime;
           }
 
-          const isTeam = isTeamSession(entry.name);
-          const teamConfig = isTeam ? loadTeamConfig(entry.name) : null;
           const memberCount = teamConfig?.members?.length || 0;
           const planInfo = getPlanInfo(meta.slug);
 
-          const resolvedAgentDir = (() => {
-            const rid = teamConfig?.leadSessionId || entry.name;
-            return path.join(AGENT_ACTIVITY_DIR, rid);
-          })();
-          const agentStatus = checkAgentStatus(resolvedAgentDir, stale, logMtime, isTeam);
-
           sessionsMap.set(entry.name, buildSessionObject(entry.name, meta, {
             _logStat: logStat,
             taskCount,
@@ -844,14 +863,24 @@ app.get('/api/sessions', async (req, res) => {
         const logMtime = logStat.mtime;
         const logAge = logMtime ? Date.now() - logMtime : Infinity;
         const stale = logAge > AGENT_STALE_MS;
+        const metaIsTeam = isTeamSession(sessionId);
+        const metaAgentDir = path.join(AGENT_ACTIVITY_DIR, sessionId);
+        const metaAgentStatus = checkAgentStatus(metaAgentDir, stale, logMtime, metaIsTeam);
+
+        // Cheap-probe: no tasks here (metadata-only), so active = recent log OR live agent.
+        if (activeFilter && !pinnedIds.has(sessionId)) {
+          const hasRecentLog = logAge <= SESSION_STALE_MS;
+          const cheaplyActive = logStat.hasMessages && (
+            hasRecentLog || metaAgentStatus.hasActive || !!metaAgentStatus.waitingForUser
+          );
+          if (!cheaplyActive) continue;
+        }
+
         let modifiedAt = meta.created || null;
         if (logMtime) {
           const jsonlMtime = new Date(logMtime).toISOString();
           if (!modifiedAt || jsonlMtime > modifiedAt) modifiedAt = jsonlMtime;
         }
-        const metaIsTeam = isTeamSession(sessionId);
-        const metaAgentDir = path.join(AGENT_ACTIVITY_DIR, sessionId);
-        const metaAgentStatus = checkAgentStatus(metaAgentDir, stale, logMtime, metaIsTeam);
         sessionsMap.set(sessionId, buildSessionObject(sessionId, meta, {
           _logStat: logStat,
           modifiedAt: modifiedAt || new Date(0).toISOString(),
@@ -900,16 +929,21 @@ app.get('/api/sessions', async (req, res) => {
             existing.memberCount = cfg.members?.length || 0;
             existing.name = existing.name || cfg.name || dir.name;
             teamLeaderIds.add(leaderId);
-            // Attach team-named task directory if present
+            // Attach team-named task directory if present.
+            // Prefer team task dir over an empty session-UUID task dir — when a team session has
+            // both a UUID-named dir (often empty: just .lock/.highwatermark) and a team-named dir
+            // holding the real tasks, the leader card otherwise shows 0/0.
             const teamTaskDir = path.join(TASKS_DIR, dir.name);
-            if (!existing.tasksDir && existsSync(teamTaskDir)) {
+            if (existsSync(teamTaskDir)) {
               const counts = getTaskCounts(teamTaskDir);
-              existing.taskCount = counts.taskCount;
-              existing.completed = counts.completed;
-              existing.inProgress = counts.inProgress;
-              existing.pending = counts.pending;
-              existing.tasksDir = teamTaskDir;
-              existing.sharedTaskList = dir.name;
+              if (!existing.tasksDir || counts.taskCount > (existing.taskCount || 0)) {
+                existing.taskCount = counts.taskCount;
+                existing.completed = counts.completed;
+                existing.inProgress = counts.inProgress;
+                existing.pending = counts.pending;
+                existing.tasksDir = teamTaskDir;
+                existing.sharedTaskList = dir.name;
+              }
             }
             // Re-check agent status with isTeam=true
             const agentDir = path.join(AGENT_ACTIVITY_DIR, leaderId);
@@ -984,6 +1018,22 @@ app.get('/api/sessions', async (req, res) => {
       }));
     }
 
+    // Server-side activity filter (mirrors the client predicate in public/app.js).
+    // Pinned IDs bypass — they should always be in the response.
+    if (activeFilter) {
+      const isActive = (s) =>
+        s.hasMessages && (
+          (!s.sharedTaskList && (s.pending > 0 || s.inProgress > 0))
+          || s.hasActiveAgents
+          || s.hasWaitingForUser
+          || s.hasRecentLog
+        );
+      for (const [id, s] of sessionsMap) {
+        if (pinnedIds.has(id)) continue;
+        if (!isActive(s)) sessionsMap.delete(id);
+      }
+    }
+
     // Convert map to array and sort by most recently modified
     let sessions = Array.from(sessionsMap.values());
     sessions.sort((a, b) => new Date(b.modifiedAt) - new Date(a.modifiedAt));
@@ -1242,7 +1292,7 @@ app.get('/api/sessions/:sessionId/agents', (req, res) => {
         const agentTs = agent.updatedAt || agent.startedAt;
         const agentStale = !sessionStale && agentTs && (Date.now() - new Date(agentTs).getTime()) > AGENT_STALE_MS;
         if (!isAgentFresh(agent) || sessionStale || agentStale) {
-          if (agent.status === 'active' || agent.status === 'idle') {
+          if (isAgentLive(agent)) {
             const agentName = agentDisplayName(agent);
             const isTeamMember = isTeam && agentName && teamMemberNames.has(agentName);
             if (!isTeamMember) {
@@ -1254,7 +1304,7 @@ app.get('/api/sessions/:sessionId/agents', (req, res) => {
         agents.push(agent);
       } catch (e) { /* skip invalid */ }
     }
-    const liveAgents = agents.filter(a => a.status === 'active' || a.status === 'idle');
+    const liveAgents = agents.filter(isAgentLive);
     if (liveAgents.length && meta.jsonlPath) {
       try {
         const terminated = getTerminatedTeammates(meta.jsonlPath);
@@ -1280,7 +1330,7 @@ app.get('/api/sessions/:sessionId/agents', (req, res) => {
           getSessionDigest(meta.jsonlPath);
         if (rejectedAgentIds.size || rejectedPrompts.size || killedAgentIds.size) {
           for (const agent of liveAgents) {
-            if (agent.status !== 'active' && agent.status !== 'idle') continue;
+            if (!isAgentLive(agent)) continue;
             let reason = null;
             if (killedAgentIds.has(agent.agentId)) reason = 'killed-by-harness';
             else if (rejectedAgentIds.has(agent.agentId) || (agent.prompt && rejectedPrompts.has(agent.prompt))) {
@@ -1298,13 +1348,16 @@ app.get('/api/sessions/:sessionId/agents', (req, res) => {
 
     const dirty = new Set();
 
-    const agentsNeedingPrompt = agents.filter(a => !a.prompt && !a.promptUnavailable);
-    const agentsNeedingName = agents.filter(a => !a.agentName && !a.agentNameUnavailable);
-    const agentsNeedingDesc = agents.filter(a => !a.description && !a.descriptionUnavailable);
-    if ((agentsNeedingPrompt.length || agentsNeedingName.length || agentsNeedingDesc.length) && meta.jsonlPath) {
-      let byAgentId = {};
-      let nameByAgentId = {};
-      let descByAgentId = {};
+    // Agents may be missing prompt/name/description because the parent's agent_progress
+    // event or the subagent's own transcript hadn't been written yet at last poll. While
+    // the agent is still active, keep retrying instead of latching *Unavailable permanently
+    // (same pattern as agentsNeedingModel below). Each field shares the same resolve flow:
+    // look up in progressMap by agentId, fall back to per-field extractor, persist only
+    // on actual change.
+    const byAgentId = {};
+    const nameByAgentId = {};
+    const descByAgentId = {};
+    if (meta.jsonlPath) {
       try {
         const progressMap = getProgressMap(meta.jsonlPath);
         for (const entry of Object.values(progressMap)) {
@@ -1313,22 +1366,34 @@ app.get('/api/sessions/:sessionId/agents', (req, res) => {
           if (entry.description && !descByAgentId[entry.agentId]) descByAgentId[entry.agentId] = entry.description;
         }
       } catch (_) {}
-      for (const agent of agentsNeedingPrompt) {
-        const prompt = byAgentId[agent.agentId]
-          || (() => { try { return extractPromptFromTranscript(subagentJsonlPath(meta, agent.agentId)); } catch (_) { return null; } })();
-        if (prompt) agent.prompt = prompt;
-        else agent.promptUnavailable = true;
-        dirty.add(agent);
-      }
-      for (const agent of agentsNeedingName) {
-        if (nameByAgentId[agent.agentId]) agent.agentName = nameByAgentId[agent.agentId];
-        else agent.agentNameUnavailable = true;
-        dirty.add(agent);
-      }
-      for (const agent of agentsNeedingDesc) {
-        if (descByAgentId[agent.agentId]) agent.description = descByAgentId[agent.agentId];
-        else agent.descriptionUnavailable = true;
-        dirty.add(agent);
+    }
+    const reconcileFields = [
+      {
+        field: 'prompt',
+        flag: 'promptUnavailable',
+        lookup: (a) => {
+          if (byAgentId[a.agentId]) return byAgentId[a.agentId];
+          try { return extractPromptFromTranscript(subagentJsonlPath(meta, a.agentId)); } catch (_) { return null; }
+        },
+      },
+      { field: 'agentName',   flag: 'agentNameUnavailable',   lookup: (a) => nameByAgentId[a.agentId] || null },
+      { field: 'description', flag: 'descriptionUnavailable', lookup: (a) => descByAgentId[a.agentId] || null },
+    ];
+    if (meta.jsonlPath) {
+      for (const { field, flag, lookup } of reconcileFields) {
+        for (const agent of agents) {
+          if (agent[field]) continue;
+          if (agent[flag] && !isAgentLive(agent)) continue;
+          const value = lookup(agent);
+          if (value) {
+            agent[field] = value;
+            delete agent[flag];
+            dirty.add(agent);
+          } else if (!isAgentLive(agent) && !agent[flag]) {
+            agent[flag] = true;
+            dirty.add(agent);
+          }
+        }
       }
     }
 
@@ -1758,7 +1823,7 @@ function buildToolStats(jsonlPath) {
         if (!entry) continue;
         const { displayName, isSkill } = entry;
         seenResults.add(block.tool_use_id);
-        if (!toolMap[displayName]) toolMap[displayName] = { count: 0, success: 0, failed: 0, outputBytes: 0 };
+        if (!toolMap[displayName]) toolMap[displayName] = { count: 0, success: 0, failed: 0, rejected: 0, outputBytes: 0 };
         toolMap[displayName].count++;
         const raw = typeof block.content === 'string' ? block.content
           : Array.isArray(block.content) ? block.content.map(b => b.text || '').join('\n') : '';
@@ -1771,13 +1836,17 @@ function buildToolStats(jsonlPath) {
             skillPromptIds[promptId].push(displayName);
           }
         }
-        const lower = raw.toLowerCase();
-        const failed = /^error/i.test(raw.trimStart())
-          || /exit code [1-9]/.test(lower)
-          || lower.includes('command failed')
-          || (lower.includes('failed') && lower.includes('error'));
-        if (failed) toolMap[displayName].failed++;
-        else toolMap[displayName].success++;
+        const isRejected = typeof obj.toolUseResult === 'string' && /rejected/i.test(obj.toolUseResult);
+        if (isRejected) toolMap[displayName].rejected++;
+        else {
+          const lower = raw.toLowerCase();
+          const failed = /^error/i.test(raw.trimStart())
+            || /exit code [1-9]/.test(lower)
+            || lower.includes('command failed')
+            || (lower.includes('failed') && lower.includes('error'));
+          if (failed) toolMap[displayName].failed++;
+          else toolMap[displayName].success++;
+        }
       }
     }
   }
@@ -1785,7 +1854,7 @@ function buildToolStats(jsonlPath) {
   // Count tool_use blocks that never got a tool_result
   for (const [id, { displayName }] of Object.entries(toolUseById)) {
     if (seenResults.has(id)) continue;
-    if (!toolMap[displayName]) toolMap[displayName] = { count: 0, success: 0, failed: 0, outputBytes: 0 };
+    if (!toolMap[displayName]) toolMap[displayName] = { count: 0, success: 0, failed: 0, rejected: 0, outputBytes: 0 };
     toolMap[displayName].count++;
   }
 
@@ -1797,10 +1866,11 @@ function buildToolStats(jsonlPath) {
     }
   }
 
-  let totalCalls = 0, totalFailed = 0, totalOutputBytes = 0;
+  let totalCalls = 0, totalFailed = 0, totalRejected = 0, totalOutputBytes = 0;
   for (const s of Object.values(toolMap)) {
     totalCalls += s.count;
     totalFailed += s.failed;
+    totalRejected += s.rejected;
     totalOutputBytes += s.outputBytes || 0;
   }
   const uniqueTools = Object.keys(toolMap).length;
@@ -1809,10 +1879,10 @@ function buildToolStats(jsonlPath) {
   for (const [name, stats] of Object.entries(toolMap)) {
     const impact = totalOutputBytes > 0 ? Math.round((stats.outputBytes || 0) / totalOutputBytes * 100) : 0;
     const displayName = name.startsWith('mcp__') ? name.split('__').slice(2).join('__') || name : name;
-    tools.push({ name: displayName, count: stats.count, success: stats.success, failed: stats.failed, impact });
+    tools.push({ name: displayName, count: stats.count, success: stats.success, failed: stats.failed, rejected: stats.rejected, impact });
   }
 
-  return { totalCalls, uniqueTools, totalFailed, tools };
+  return { totalCalls, uniqueTools, totalFailed, totalRejected, tools };
 }
 
 app.get('/api/sessions/:sessionId/tool-stats', (req, res) => {
@@ -2402,13 +2472,38 @@ cleanupContextStatus();
 setInterval(cleanupAgentActivity, CLEANUP_INTERVAL_MS);
 setInterval(cleanupContextStatus, 30 * 60 * 1000);
 
-const server = app.listen(PORT, () => {
+// Warm the metadata + loop-info caches in the background so the first user
+// request lands warm. The cheap-probe in /api/sessions skips per-session
+// enrichment for inactive sessions, so we no longer drive a full self-request
+// here — that was 690× wasted work for an active-filter first hit.
+// Yields to the event loop periodically so any inbound request isn't starved.
+async function prewarmCaches() {
+  const t0 = Date.now();
+  try {
+    const metadata = loadSessionMetadata();
+
+    let i = 0;
+    for (const meta of Object.values(metadata)) {
+      if (meta?.jsonlPath) {
+        try { refreshLoopInfoState(meta.jsonlPath); } catch {}
+      }
+      if (++i % 50 === 0) await new Promise(r => setImmediate(r));
+    }
+
+    console.log(`[prewarm] done in ${Date.now() - t0}ms (${Object.keys(metadata).length} sessions)`);
+  } catch (e) {
+    console.warn('[prewarm] failed:', e.message);
+  }
+}
+
+  const server = app.listen(PORT, () => {
     const actualPort = server.address().port;
     console.log(`Claude Task Kanban running at http://localhost:${actualPort}`);
 
     if (process.argv.includes('--open')) {
       import('open').then(open => open.default(`http://localhost:${actualPort}`));
     }
+    setImmediate(prewarmCaches);
   });
 
   server.on('error', (err) => {
@@ -2421,6 +2516,7 @@ const server = app.listen(PORT, () => {
         if (process.argv.includes('--open')) {
           import('open').then(open => open.default(`http://localhost:${actualPort}`));
         }
+        setImmediate(prewarmCaches);
       });
     } else {
       throw err;