zozul-cli 0.3.7 → 0.4.0

package/src/dashboard/index.html

@@ -58,6 +58,21 @@
   .source-badge.local { border-color: var(--blue); color: var(--blue); }
   .source-badge.clickable { cursor: pointer; }
   .source-badge.clickable:hover { opacity: 0.7; }
+  .view-toggle {
+    background: none;
+    border: 1px solid var(--border);
+    color: var(--text-dim);
+    padding: 4px 10px;
+    border-radius: 6px;
+    cursor: pointer;
+    font-family: var(--mono);
+    font-size: 13px;
+    font-weight: 600;
+    min-width: 32px;
+    transition: border-color 0.15s, color 0.15s;
+  }
+  .view-toggle:hover { border-color: var(--accent); color: var(--text); }
+  .view-toggle.tokens { color: var(--blue, #64b5f6); border-color: var(--blue, #64b5f6); }
   .auto-btn {
     background: none;
     border: 1px solid var(--border);
@@ -437,6 +452,7 @@
   <span class="subtitle">Agent Observability</span>
   <div class="header-right">
     <span class="source-badge" id="source-badge" style="display:none" onclick="toggleDataSource()">Local</span>
+    <button class="view-toggle" id="view-mode-toggle" onclick="toggleViewMode()" title="Switch between cost and token view">$</button>
     <button class="auto-btn" onclick="manualRefresh()" title="Auto-refresh every 10s">
       <span class="live-dot"></span>
       Auto
@@ -458,9 +474,9 @@
   <div id="view-summary" class="view active">
     <div class="time-selector"></div>
     <div class="stats-grid" id="summary-stats"></div>
-    <div class="chart-card"><h3>Daily Cost (30d)</h3><canvas id="chart-daily-cost"></canvas></div>
+    <div class="chart-card"><h3 id="chart-title">Daily Cost (30d)</h3><canvas id="chart-daily-cost"></canvas></div>
     <div class="panel">
-      <div class="panel-header"><span>Cost by Project</span></div>
+      <div class="panel-header"><span id="project-panel-title">Cost by Project</span></div>
       <ul class="project-list" id="project-breakdown"></ul>
     </div>
   </div>
@@ -512,7 +528,7 @@
           <th class="sortable" data-sort="sessions:project_path">Project</th>
           <th class="sortable" data-sort="sessions:started_at">Started</th>
           <th class="sortable" data-sort="sessions:total_duration_ms">Duration</th>
-          <th class="sortable" data-sort="sessions:total_turns">Turns</th>
+          <th class="sortable" data-sort="sessions:user_turns">Prompts</th>
           <th class="sortable desc" data-sort="sessions:total_cost_usd">Cost</th>
           <th class="sortable" data-sort="sessions:model">Model</th>
         </tr></thead>
@@ -640,6 +656,7 @@ let remoteAvailable = false;
 let autoRefreshTimer = null;
 let currentView = 'summary';
 let currentTimeWindow = '7d';
+let viewMode = 'cost'; // 'cost' or 'tokens'
 let previousView = 'tasks';
 let allTaskGroups = [];
 let allTagStats = [];
@@ -712,7 +729,16 @@ function toggleDataSource() {
 async function fetchJson(path) {
   if (dataSource === 'remote' && typeof ZOZUL_CONFIG !== 'undefined') {
     try {
-      const url = ZOZUL_CONFIG.remote.baseUrl + path.replace('/api/', '/');
+      let remotePath = path.replace('/api/', '/');
+      // Ensure trailing slash before query params to avoid 307 redirects (which drop headers)
+      const qIdx = remotePath.indexOf('?');
+      if (qIdx === -1) {
+        if (!remotePath.endsWith('/')) remotePath += '/';
+      } else {
+        const base = remotePath.slice(0, qIdx);
+        if (!base.endsWith('/')) remotePath = base + '/' + remotePath.slice(qIdx);
+      }
+      const url = ZOZUL_CONFIG.remote.baseUrl + remotePath;
       const res = await fetch(url, { headers: { 'X-API-Key': ZOZUL_CONFIG.remote.apiKey } });
       if (res.ok) return res.json();
     } catch {}
@@ -771,6 +797,24 @@ function fmtCost(n) {
   const v = n ?? 0;
   return v >= 1 ? '$' + v.toFixed(2) : '$' + v.toFixed(4);
 }
+function fmtTokens(n) {
+  const v = n ?? 0;
+  if (v >= 1_000_000) return (v / 1_000_000).toFixed(1) + 'M';
+  if (v >= 1_000) return (v / 1_000).toFixed(1) + 'K';
+  return v.toLocaleString();
+}
+function fmtMetric(cost, tokens) {
+  if (viewMode === 'tokens') return tokens != null ? fmtTokens(tokens) : '\u2014';
+  return fmtCost(cost);
+}
+function toggleViewMode() {
+  viewMode = viewMode === 'cost' ? 'tokens' : 'cost';
+  const btn = document.getElementById('view-mode-toggle');
+  btn.textContent = viewMode === 'cost' ? '$' : 'T';
+  btn.classList.toggle('tokens', viewMode === 'tokens');
+  btn.title = viewMode === 'cost' ? 'Switch to token view' : 'Switch to cost view';
+  loadViewData(currentView);
+}
 function fmtDuration(ms) {
   if (!ms || ms <= 0) return '\u2014';
   const s = Math.floor(ms / 1000);
@@ -836,9 +880,13 @@ function timeQueryString() {
   return 'from=' + encodeURIComponent(from) + '&to=' + encodeURIComponent(now.toISOString());
 }
 
+function chartStepForWindow() {
+  return currentTimeWindow === '24h' ? '1h' : '1d';
+}
+
 function renderTimeSelectors() {
   document.querySelectorAll('.time-selector').forEach(el => {
-    el.innerHTML = ['7d', '30d', 'all'].map(w =>
+    el.innerHTML = ['24h', '7d', '30d', 'all'].map(w =>
       '<button class="time-btn' + (w === currentTimeWindow ? ' active' : '') + '" data-window="' + w + '">' +
       (w === 'all' ? 'All' : w) + '</button>'
     ).join('');
@@ -934,18 +982,23 @@ async function loadSummary() {
     const timeQs = timeQueryString();
     const timeParam = timeQs ? '?' + timeQs : '';
     const timeSep = timeQs ? '&' + timeQs : '';
-    const [stats, tasks, costSeries, sessionsResp] = await Promise.all([
+    const chartRange = currentTimeWindow === 'all' ? '90d' : currentTimeWindow;
+    const chartStep = currentTimeWindow === '24h' ? '1h' : '1d';
+    const [stats, tasks, costSeries, tokenSeries, sessionsResp] = await Promise.all([
       fetchJson('/api/stats' + timeParam),
       fetchJson('/api/tasks'),
-      fetchJson('/api/metrics/cost?range=' + (currentTimeWindow === 'all' ? '90d' : currentTimeWindow) + '&step=1d'),
+      fetchJson('/api/metrics/cost?range=' + chartRange + '&step=' + chartStep),
+      fetchJson('/api/metrics/tokens?range=' + chartRange + '&step=' + chartStep),
       fetchJson('/api/sessions?limit=500&offset=0' + timeSep),
     ]);
+    const totalTokens = (stats.total_input_tokens ?? 0) + (stats.total_output_tokens ?? 0) + (stats.total_cache_read_tokens ?? 0);
     renderSummaryStats({
       totalCost: stats.total_cost_usd ?? 0,
+      totalTokens,
       totalSessions: stats.total_sessions ?? 0,
       totalTasks: tasks.length ?? 0,
     });
-    renderDailyCostChart(costSeries);
+    renderUsageChart(costSeries, tokenSeries);
     const sessions = Array.isArray(sessionsResp) ? sessionsResp : sessionsResp.sessions;
     renderProjectBreakdown(sessions);
   } catch (e) {
@@ -953,18 +1006,52 @@ async function loadSummary() {
   }
 }
 
-function renderDailyCostChart(costData) {
-  if (!costData || !costData.length) return;
-  const labels = costData.map(d => {
+function renderUsageChart(costData, tokenData) {
+  const isTokens = viewMode === 'tokens';
+  const isHourly = currentTimeWindow === '24h';
+  const sourceData = isTokens ? tokenData : costData;
+
+  const titleEl = document.getElementById('chart-title');
+  if (titleEl) {
+    const period = isHourly ? 'Hourly' : 'Daily';
+    titleEl.textContent = isTokens ? period + ' Tokens' : period + ' Cost';
+  }
+
+  if (!sourceData || !sourceData.length) return;
+
+  const labels = sourceData.map(d => {
     const dt = new Date(d.timestamp);
-    return dt.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+    return isHourly
+      ? dt.toLocaleTimeString(undefined, { hour: 'numeric', hour12: true })
+      : dt.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
   });
-  const data = costData.map(d => d.cost);
+
+  let data, label, bgColor, borderColor, tooltipFmt, yFmt;
+  if (isTokens) {
+    data = sourceData.map(d => (d.input ?? 0) + (d.output ?? 0) + (d.cache_read ?? 0));
+    label = 'Tokens';
+    bgColor = 'rgba(100,181,246,0.3)';
+    borderColor = '#64b5f6';
+    tooltipFmt = ctx => fmtTokens(ctx.parsed.y);
+    yFmt = v => fmtTokens(v);
+  } else {
+    data = sourceData.map(d => d.cost);
+    label = 'Cost (USD)';
+    bgColor = 'rgba(255,152,0,0.3)';
+    borderColor = '#ff9800';
+    tooltipFmt = ctx => '$' + ctx.parsed.y.toFixed(4);
+    yFmt = v => '$' + v.toFixed(2);
+  }
 
   const existing = chartInstances['chart-daily-cost'];
   if (existing) {
     existing.data.labels = labels;
     existing.data.datasets[0].data = data;
+    existing.data.datasets[0].label = label;
+    existing.data.datasets[0].backgroundColor = bgColor;
+    existing.data.datasets[0].borderColor = borderColor;
+    existing.options.plugins.tooltip.callbacks.label = tooltipFmt;
+    existing.options.scales.y.ticks.callback = yFmt;
     existing.update('none');
     return;
   }
@@ -976,10 +1063,10 @@ function renderDailyCostChart(costData) {
     data: {
       labels,
       datasets: [{
-        label: 'Cost (USD)',
+        label,
         data,
-        backgroundColor: 'rgba(255,152,0,0.3)',
-        borderColor: '#ff9800',
+        backgroundColor: bgColor,
+        borderColor,
         borderWidth: 1,
         borderRadius: 3,
       }]
@@ -988,11 +1075,11 @@ function renderDailyCostChart(costData) {
       responsive: true,
       plugins: {
         legend: { display: false },
-        tooltip: { callbacks: { label: ctx => '$' + ctx.parsed.y.toFixed(4) } },
+        tooltip: { callbacks: { label: tooltipFmt } },
       },
       scales: {
         x: { ticks: { color: '#8b8fa3', font: { family: '"JetBrains Mono", monospace', size: 10 } } },
-        y: { ticks: { color: '#8b8fa3', font: { family: '"JetBrains Mono", monospace', size: 10 }, callback: v => '$' + v.toFixed(2) } },
+        y: { ticks: { color: '#8b8fa3', font: { family: '"JetBrains Mono", monospace', size: 10 }, callback: yFmt } },
       }
     }
   });
@@ -1009,26 +1096,34 @@ function renderProjectBreakdown(sessions) {
   const byProject = {};
   for (const s of sessions) {
     const proj = s.project_path || 'Unknown';
-    if (!byProject[proj]) byProject[proj] = 0;
-    byProject[proj] += s.total_cost_usd || 0;
-  }
-  const sorted = Object.entries(byProject).sort((a, b) => b[1] - a[1]);
-  const maxCost = sorted[0]?.[1] || 1;
-
-  el.innerHTML = sorted.slice(0, 10).map(([proj, cost]) => {
-    const pct = Math.round(cost / maxCost * 100);
+    if (!byProject[proj]) byProject[proj] = { cost: 0, tokens: 0 };
+    byProject[proj].cost += s.total_cost_usd || 0;
+    byProject[proj].tokens += (s.total_input_tokens || 0) + (s.total_output_tokens || 0) + (s.total_cache_read_tokens || 0);
+  }
+  const isTokens = viewMode === 'tokens';
+  const panelTitle = document.getElementById('project-panel-title');
+  if (panelTitle) panelTitle.textContent = isTokens ? 'Tokens by Project' : 'Cost by Project';
+  const sorted = Object.entries(byProject).sort((a, b) => (isTokens ? b[1].tokens - a[1].tokens : b[1].cost - a[1].cost));
+  const maxVal = (isTokens ? sorted[0]?.[1].tokens : sorted[0]?.[1].cost) || 1;
+
+  el.innerHTML = sorted.slice(0, 10).map(([proj, vals]) => {
+    const val = isTokens ? vals.tokens : vals.cost;
+    const pct = Math.round(val / maxVal * 100);
     return '<li class="project-item">' +
       '<span class="project-name" title="' + escHtml(proj) + '">' + escHtml(basename(proj)) + '</span>' +
       '<div class="project-bar-wrap"><div class="project-bar" style="width:' + pct + '%"></div></div>' +
-      '<span class="project-cost">' + fmtCost(cost) + '</span>' +
+      '<span class="project-cost">' + (isTokens ? fmtTokens(val) : fmtCost(val)) + '</span>' +
     '</li>';
   }).join('');
 }
 
 function renderSummaryStats(s) {
   const grid = document.getElementById('summary-stats');
+  const primary = viewMode === 'tokens'
+    ? { label: 'Total Tokens', value: fmtTokens(s.totalTokens) }
+    : { label: 'Total Cost', value: fmtCost(s.totalCost) };
   grid.innerHTML = [
-    { label: 'Total Cost', value: fmtCost(s.totalCost), hero: true },
+    { label: primary.label, value: primary.value, hero: true },
     { label: 'Total Sessions', value: fmtNum(s.totalSessions), hero: true },
     { label: 'Total Tasks', value: fmtNum(s.totalTasks), hero: true },
   ].map(c =>
@@ -1066,7 +1161,7 @@ function renderTaskTable(groups) {
     return '<tr class="clickable" onclick="showTaskDetail(\'' + escHtml(g.tags).replace(/'/g, "\\'") + '\')">' +
       '<td>' + pills + '</td>' +
       '<td>' + fmtDuration(g.total_duration_ms) + '</td>' +
-      '<td><span class="badge badge-cost">' + fmtCost(g.total_cost_usd) + '</span></td>' +
+      '<td><span class="badge badge-cost">' + fmtMetric(g.total_cost_usd, g.total_tokens) + '</span></td>' +
       '<td>' + fmtNum(g.human_interventions) + '</td>' +
       '<td title="' + fmtAbsolute(g.last_seen) + '">' + fmtRelative(g.last_seen) + '</td>' +
       '</tr>';
@@ -1110,7 +1205,7 @@ async function showTaskDetail(tagSet) {
     } else {
       stats = await fetchJson('/api/tasks/stats?' + qs);
     }
-    const turns = await fetchJson('/api/tasks/turns?' + qs + '&limit=' + PAGE_SIZE + '&offset=0');
+    const turns = await enrichTurnsWithCost(await fetchJson('/api/tasks/turns?' + qs + '&limit=' + PAGE_SIZE + '&offset=0'));
 
     statsEl.innerHTML = [
       { label: 'Task', value: '<span style="font-size:14px">' + pills + '</span>' },
@@ -1170,13 +1265,13 @@ function taskDetailQs() {
 
 async function taskDetailNext() {
   taskDetailOffset += PAGE_SIZE;
-  const turns = await fetchJson('/api/tasks/turns?' + taskDetailQs() + '&limit=' + PAGE_SIZE + '&offset=' + taskDetailOffset);
+  const turns = await enrichTurnsWithCost(await fetchJson('/api/tasks/turns?' + taskDetailQs() + '&limit=' + PAGE_SIZE + '&offset=' + taskDetailOffset));
   renderTaskDetailTurns(turns);
 }
 
 async function taskDetailPrev() {
   taskDetailOffset = Math.max(0, taskDetailOffset - PAGE_SIZE);
-  const turns = await fetchJson('/api/tasks/turns?' + taskDetailQs() + '&limit=' + PAGE_SIZE + '&offset=' + taskDetailOffset);
+  const turns = await enrichTurnsWithCost(await fetchJson('/api/tasks/turns?' + taskDetailQs() + '&limit=' + PAGE_SIZE + '&offset=' + taskDetailOffset));
   renderTaskDetailTurns(turns);
 }
 
@@ -1186,8 +1281,10 @@ async function loadTags() {
   try {
     const tasks = await fetchJson('/api/tasks');
     if (!tasks.length) { allTagStats = []; renderTagTable([]); return; }
+    const timeQs = timeQueryString();
+    const timeSep = timeQs ? '&' + timeQs : '';
     const statsList = await Promise.all(
-      tasks.map(t => fetchJson('/api/tasks/stats?tags=' + encodeURIComponent(t.task) + '&mode=any')
+      tasks.map(t => fetchJson('/api/tasks/stats?tags=' + encodeURIComponent(t.task) + '&mode=any' + timeSep)
         .then(s => ({ ...s, tag: t.task, last_seen: t.last_tagged }))
         .catch(() => ({ tag: t.task, turn_count: t.turn_count, human_interventions: 0, total_duration_ms: 0, total_cost_usd: 0, last_seen: t.last_tagged }))
       )
@@ -1198,6 +1295,7 @@ async function loadTags() {
       human_interventions: s.user_turns ?? s.human_interventions ?? 0,
       total_duration_ms: s.total_duration_ms ?? 0,
       total_cost_usd: s.total_cost_usd ?? 0,
+      total_tokens: (s.total_input_tokens ?? 0) + (s.total_output_tokens ?? 0) + (s.total_cache_read_tokens ?? 0),
       last_seen: s.last_seen,
     }));
     renderTagTable(sortData(allTagStats, sortState.tags));
@@ -1216,7 +1314,7 @@ function renderTagTable(stats) {
     '<tr class="clickable" onclick="showTagDetail(\'' + escHtml(t.tag).replace(/'/g, "\\'") + '\')">' +
       '<td><span class="tag-pill">' + escHtml(t.tag) + '</span></td>' +
       '<td>' + fmtDuration(t.total_duration_ms) + '</td>' +
-      '<td><span class="badge badge-cost">' + fmtCost(t.total_cost_usd) + '</span></td>' +
+      '<td><span class="badge badge-cost">' + fmtMetric(t.total_cost_usd, t.total_tokens) + '</span></td>' +
       '<td>' + fmtNum(t.human_interventions) + '</td>' +
       '<td title="' + fmtAbsolute(t.last_seen) + '">' + fmtRelative(t.last_seen) + '</td>' +
     '</tr>'
@@ -1357,30 +1455,54 @@ async function showSession(id, returnTo) {
   document.getElementById('session-detail-stats').innerHTML = '<div class="stat-card" style="grid-column:1/-1"><div class="label">Loading...</div></div>';
   document.getElementById('session-detail-turns').innerHTML = '';
 
-  const [session, turns] = await Promise.all([
+  const [session, turns, subagents] = await Promise.all([
     fetchJson('/api/sessions/' + id),
     fetchJson('/api/sessions/' + id + '/turns'),
+    fetchJson('/api/sessions/' + id + '/subagents').catch(() => []),
   ]);
 
-  document.getElementById('session-detail-stats').innerHTML = [
+  const stats = [
     { label: 'Session ID', value: '<span class="session-id" onclick="copyText(\'' + session.id + '\')" title="Click to copy">' + shortId(session.id) + ' <span class="copy-icon">&#x2398;</span></span>' },
     { label: 'Project', value: '<span title="' + escHtml(session.project_path ?? '') + '">' + escHtml(basename(session.project_path)) + '</span>' },
     { label: 'Model', value: '<span style="font-family:var(--mono);font-size:13px">' + escHtml(session.model ?? '\u2014') + '</span>' },
     { label: 'Duration', value: fmtDuration(session.total_duration_ms) },
-    { label: 'Turns', value: session.total_turns },
+    { label: 'Prompts', value: session.user_turns ?? session.total_turns },
     { label: 'Input Tokens', value: fmtNum(session.total_input_tokens) },
     { label: 'Output Tokens', value: fmtNum(session.total_output_tokens) },
     { label: 'Cost', value: fmtCost(session.total_cost_usd) },
-  ].map(c =>
+  ];
+  if (subagents.length > 0) {
+    stats.push({ label: 'Agents', value: String(subagents.length) });
+  }
+  document.getElementById('session-detail-stats').innerHTML = stats.map(c =>
     '<div class="stat-card"><div class="label">' + c.label + '</div><div class="value" style="font-size:14px">' + c.value + '</div></div>'
   ).join('');
 
   const turnsDiv = document.getElementById('session-detail-turns');
-  if (!turns.length) {
+  let html = '';
+
+  if (subagents.length > 0) {
+    html += '<div style="margin-bottom:16px"><h3 style="font-size:13px;color:var(--text-dim);margin:0 0 8px">Agent Sub-Sessions</h3>' +
+      '<table class="data-table" style="width:100%"><thead><tr>' +
+      '<th>Agent Type</th><th>Duration</th><th>Turns</th><th>Started</th>' +
+      '</tr></thead><tbody>' +
+      subagents.map(s =>
+        '<tr class="clickable" onclick="showSession(\'' + s.id + '\', \'sessions\')">' +
+        '<td><span class="tag-pill">' + escHtml(s.agent_type ?? 'unknown') + '</span></td>' +
+        '<td>' + fmtDuration(s.total_duration_ms) + '</td>' +
+        '<td>' + (s.total_turns ?? 0) + '</td>' +
+        '<td title="' + fmtAbsolute(s.started_at) + '">' + fmtRelative(s.started_at) + '</td>' +
+        '</tr>'
+      ).join('') +
+      '</tbody></table></div>';
+  }
+
+  if (!turns.length && !subagents.length) {
     turnsDiv.innerHTML = '<div class="empty">No turns recorded.</div>';
     return;
   }
-  turnsDiv.innerHTML = turns.map((t, i) => renderTurnHtml(t, 'tc-' + i)).join('');
+  html += turns.map((t, i) => renderTurnHtml(t, 'tc-' + i)).join('');
+  turnsDiv.innerHTML = html;
 }
 
 // ── Shared turn rendering ──
@@ -1511,8 +1633,8 @@ function renderSessionsTable(sessions) {
       '<td' + projAttr + '>' + escHtml(proj) + '</td>' +
       '<td title="' + fmtAbsolute(s.started_at) + '">' + fmtRelative(s.started_at) + '</td>' +
       '<td>' + fmtDuration(s.total_duration_ms) + '</td>' +
-      '<td>' + (s.total_turns ?? 0) + '</td>' +
-      '<td><span class="badge badge-cost">' + fmtCost(s.total_cost_usd) + '</span></td>' +
+      '<td>' + (s.user_turns ?? s.total_turns ?? 0) + '</td>' +
+      '<td><span class="badge badge-cost">' + fmtMetric(s.total_cost_usd, (s.total_input_tokens || 0) + (s.total_output_tokens || 0) + (s.total_cache_read_tokens || 0)) + '</span></td>' +
       '<td style="font-family:var(--mono);font-size:11px;color:var(--text-dim)">' + escHtml(s.model ?? '\u2014') + '</td>' +
       '</tr>';
   }).join('');

package/src/hooks/server.ts

@@ -218,6 +218,13 @@ function handleApiRoute(url: string, repo: SessionRepo, res: http.ServerResponse
     return;
   }
 
+  const subagentsMatch = path.match(/^\/api\/sessions\/([^/]+)\/subagents$/);
+  if (subagentsMatch) {
+    const subs = repo.getSubSessions(subagentsMatch[1]);
+    sendJson(res, 200, subs);
+    return;
+  }
+
   if (path === "/api/metrics/tokens") {
     const { from, to, stepSeconds } = parseTimeRange(url);
     sendJson(res, 200, repo.getTokenTimeSeries(from, to, stepSeconds));

package/src/parser/ingest.ts

@@ -1,5 +1,5 @@
 import type { SessionRepo } from "../storage/repo.js";
-import { discoverSessionFiles, parseSessionFile } from "./jsonl.js";
+import { discoverSessionFiles, parseSessionFile, type DiscoveredFile } from "./jsonl.js";
 import type { ParsedSession } from "./types.js";
 import { getActiveContext } from "../context/index.js";
 
@@ -15,8 +15,8 @@ export async function ingestAllSessions(
   let ingested = 0;
   let skipped = 0;
 
-  for (const { filePath, projectPath } of files) {
-    const parsed = await parseSessionFile(filePath, projectPath);
+  for (const { filePath, projectPath, parentSessionId, agentType } of files) {
+    const parsed = await parseSessionFile(filePath, projectPath, { parentSessionId, agentType });
 
     if (!opts.force) {
       const existing = repo.getSession(parsed.sessionId);
@@ -40,9 +40,12 @@ export async function ingestSessionFile(
   repo: SessionRepo,
   filePath: string,
   projectPath?: string,
-  opts: { noTag?: boolean } = {},
+  opts: { noTag?: boolean; parentSessionId?: string; agentType?: string } = {},
 ): Promise<ParsedSession> {
-  const parsed = await parseSessionFile(filePath, projectPath);
+  const parsed = await parseSessionFile(filePath, projectPath, {
+    parentSessionId: opts.parentSessionId,
+    agentType: opts.agentType,
+  });
   persistSession(repo, parsed, opts);
   return parsed;
 }
@@ -51,6 +54,8 @@ function persistSession(repo: SessionRepo, parsed: ParsedSession, opts: { noTag?
   repo.upsertSession({
     id: parsed.sessionId,
     project_path: parsed.projectPath,
+    parent_session_id: parsed.parentSessionId,
+    agent_type: parsed.agentType,
     started_at: parsed.startedAt,
     ended_at: parsed.endedAt,
     total_input_tokens: parsed.totalInputTokens,

package/src/parser/jsonl.ts

@@ -23,8 +23,15 @@ const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.
  * Discover all session JSONL files across all projects.
  * Files are stored directly in each project directory (not in a sessions/ subdir).
  */
-export function discoverSessionFiles(): { filePath: string; projectPath: string }[] {
-  const results: { filePath: string; projectPath: string }[] = [];
+export type DiscoveredFile = {
+  filePath: string;
+  projectPath: string;
+  parentSessionId?: string;
+  agentType?: string;
+};
+
+export function discoverSessionFiles(): DiscoveredFile[] {
+  const results: DiscoveredFile[] = [];
 
   if (!fs.existsSync(PROJECTS_DIR)) return results;
 
@@ -36,11 +43,37 @@ export function discoverSessionFiles(): { filePath: string; projectPath: string
     const decodedProject = decodeProjectPath(projectDir);
 
     for (const file of fs.readdirSync(projectDirPath)) {
-      if (!UUID_RE.test(file)) continue;
-      results.push({
-        filePath: path.join(projectDirPath, file),
-        projectPath: decodedProject,
-      });
+      // Main session JSONL files
+      if (UUID_RE.test(file)) {
+        results.push({
+          filePath: path.join(projectDirPath, file),
+          projectPath: decodedProject,
+        });
+      }
+
+      // Check for subagents directory inside UUID-named session dirs
+      const uuidDirMatch = file.match(/^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i);
+      if (uuidDirMatch) {
+        const subagentsDir = path.join(projectDirPath, file, "subagents");
+        if (fs.existsSync(subagentsDir)) {
+          const parentSessionId = uuidDirMatch[1];
+          for (const agentFile of fs.readdirSync(subagentsDir)) {
+            if (!agentFile.endsWith(".jsonl")) continue;
+            let agentType: string | undefined;
+            try {
+              const metaPath = path.join(subagentsDir, agentFile.replace(".jsonl", ".meta.json"));
+              const meta = JSON.parse(fs.readFileSync(metaPath, "utf-8"));
+              agentType = meta.agentType;
+            } catch { /* no meta or invalid JSON */ }
+            results.push({
+              filePath: path.join(subagentsDir, agentFile),
+              projectPath: decodedProject,
+              parentSessionId,
+              agentType,
+            });
+          }
+        }
+      }
     }
   }
 
@@ -57,6 +90,7 @@ export function discoverSessionFiles(): { filePath: string; projectPath: string
 export async function parseSessionFile(
   filePath: string,
   projectPath?: string,
+  opts?: { parentSessionId?: string; agentType?: string },
 ): Promise<ParsedSession> {
   const entries = await readJsonlFile(filePath);
   const sessionId = path.basename(filePath, ".jsonl");
@@ -165,6 +199,8 @@ export async function parseSessionFile(
   return {
     sessionId,
     projectPath: projectPath ?? null,
+    parentSessionId: opts?.parentSessionId ?? null,
+    agentType: opts?.agentType ?? null,
     startedAt: startedAt ?? new Date().toISOString(),
     endedAt,
     model,

package/src/parser/types.ts

@@ -54,6 +54,8 @@ export interface SessionEntry {
 export interface ParsedSession {
   sessionId: string;
   projectPath: string | null;
+  parentSessionId: string | null;
+  agentType: string | null;
   startedAt: string;
   endedAt: string | null;
   model: string | null;

package/src/parser/watcher.ts

@@ -30,9 +30,9 @@ export async function watchSessionFiles(opts: WatcherOptions): Promise<() => voi
   if (catchUp) {
     const files = discoverSessionFiles();
     let caught = 0;
-    for (const { filePath, projectPath } of files) {
+    for (const { filePath, projectPath, parentSessionId, agentType } of files) {
       try {
-        await ingestSessionFile(repo, filePath, projectPath);
+        await ingestSessionFile(repo, filePath, projectPath, { parentSessionId, agentType });
         caught++;
       } catch {
         // Ignore parse errors on individual files
@@ -61,7 +61,11 @@ export async function watchSessionFiles(opts: WatcherOptions): Promise<() => voi
       timers.delete(filePath);
       try {
         const projectPath = decodeProjectPath(filePath);
-        await ingestSessionFile(repo, filePath, projectPath ?? undefined);
+        const subagentInfo = extractSubagentInfo(filePath);
+        await ingestSessionFile(repo, filePath, projectPath ?? undefined, {
+          parentSessionId: subagentInfo?.parentSessionId,
+          agentType: subagentInfo?.agentType,
+        });
         if (verbose) {
           process.stderr.write(`[watcher] ingested: ${filePath}\n`);
         }
@@ -103,14 +107,35 @@ export async function watchSessionFiles(opts: WatcherOptions): Promise<() => voi
   };
 }
 
+/**
+ * Extract parent session ID and agent type from a subagent file path.
+ * Path format: .../<parent-uuid>/subagents/<agent-id>.jsonl
+ */
+function extractSubagentInfo(filePath: string): { parentSessionId: string; agentType: string | undefined } | null {
+  const match = filePath.match(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\/subagents\/([^/]+)\.jsonl$/i);
+  if (!match) return null;
+  const parentSessionId = match[1];
+  let agentType: string | undefined;
+  try {
+    const metaPath = filePath.replace(".jsonl", ".meta.json");
+    const meta = JSON.parse(fs.readFileSync(metaPath, "utf-8"));
+    agentType = meta.agentType;
+  } catch { /* missing or invalid meta */ }
+  return { parentSessionId, agentType };
+}
+
 /**
  * Extract the decoded project path from an absolute JSONL file path.
- * ~/.claude/projects/<encoded>/<uuid>.jsonl
- * where <encoded> has "/" replaced with "-".
+ * Handles both main sessions and subagent files:
+ *   ~/.claude/projects/<encoded>/<uuid>.jsonl
+ *   ~/.claude/projects/<encoded>/<uuid>/subagents/<agent-id>.jsonl
  */
 function decodeProjectPath(filePath: string): string | null {
-  // Match project dir directly containing the UUID file
-  const match = filePath.match(/projects\/([^/]+)\/[0-9a-f-]{36}\.jsonl$/i);
-  if (!match) return null;
-  return match[1].replace(/-/g, "/");
+  // Main session: projects/<encoded>/<uuid>.jsonl
+  const parentMatch = filePath.match(/projects\/([^/]+)\/[0-9a-f-]{36}\.jsonl$/i);
+  if (parentMatch) return parentMatch[1].replace(/-/g, "/");
+  // Subagent: projects/<encoded>/<uuid>/subagents/<agent-id>.jsonl
+  const subMatch = filePath.match(/projects\/([^/]+)\/[0-9a-f-]{36}\/subagents\/[^/]+\.jsonl$/i);
+  if (subMatch) return subMatch[1].replace(/-/g, "/");
+  return null;
 }

package/src/storage/db.ts

@@ -116,11 +116,35 @@ function migrate(db: Database.Database): void {
       last_synced_at TEXT
     );
   `);
+
+  // Additive migrations (safe to re-run; errors mean column already exists)
+  const addColumns = [
+    `ALTER TABLE sessions ADD COLUMN parent_session_id TEXT`,
+    `ALTER TABLE sessions ADD COLUMN agent_type TEXT`,
+  ];
+  for (const sql of addColumns) {
+    try { db.exec(sql); } catch { /* column already exists */ }
+  }
+  db.exec(`CREATE INDEX IF NOT EXISTS idx_sessions_parent ON sessions(parent_session_id)`);
+
+  // Deduplicate otel_metrics and add unique constraint to match backend
+  try {
+    db.exec(`
+      DELETE FROM otel_metrics WHERE id NOT IN (
+        SELECT MIN(id) FROM otel_metrics
+        GROUP BY session_id, name, timestamp, json_extract(attributes, '$.type')
+      );
+      CREATE UNIQUE INDEX uq_otel_metrics_session_name_ts_type
+        ON otel_metrics(session_id, name, timestamp, json_extract(attributes, '$.type'));
+    `);
+  } catch { /* index already exists */ }
 }
 
 export type SessionRow = {
   id: string;
   project_path: string | null;
+  parent_session_id: string | null;
+  agent_type: string | null;
   started_at: string;
   ended_at: string | null;
   total_input_tokens: number;