codex-work-receipt 0.8.1 → 0.10.0

package/src/cli.mjs

@@ -18,13 +18,19 @@ import {
 import { generateReceipt } from "./core/generator.mjs";
 import { promptForGenerationMode } from "./core/mode-selector.mjs";
 import { printOpenSourcePrompt } from "./core/open-source.mjs";
-import { getRollingSummaryNotice, getScopeLabel } from "./core/presentation.mjs";
+import { getCustomSummaryNotice, getRollingSummaryNotice, getScopeLabel } from "./core/presentation.mjs";
+import { getProjectIdentitySecret, projectDescriptorFromPath } from "./core/project-identity.mjs";
 import { encodeSingleReceiptQr } from "./core/qr-payload.mjs";
-import { promptForRange } from "./core/selector.mjs";
+import {
+  promptForCustomRange,
+  promptForProjectRange,
+  promptForRange,
+  promptForSpecificSession,
+} from "./core/selector.mjs";
 import { installCodexSkill } from "./core/skill-installer.mjs";
 import { installCodexPet, uninstallCodexPet } from "./core/pet-installer.mjs";
 import { formatNumber } from "./lib/time.mjs";
-import { listRecentCodexSessions } from "./parsers/codex.mjs";
+import { listRecentCodexProjects, listRecentCodexSessions } from "./parsers/codex.mjs";
 
 const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PROJECT_DIR = path.dirname(SCRIPT_DIR);
@@ -185,6 +191,49 @@ async function main() {
     return;
   }
 
+  if ((options.selectSession || options.selectProject || (options.mode === "custom-range" && !options.from)) && !isInteractive()) {
+    throw new Error("交互选择命令需要在终端中运行；也可以使用 --session、--project、--from 和 --to");
+  }
+
+  let projectSecret = null;
+  const ensureProjectSecret = () => {
+    projectSecret ||= getProjectIdentitySecret({ dataDir: options.dataDir });
+    return projectSecret;
+  };
+  const loadRecentProjects = () => listRecentCodexProjects(10, {
+    projectSecret: ensureProjectSecret(),
+  });
+
+  if (options.project) {
+    options.projectId = projectDescriptorFromPath(options.project, ensureProjectSecret()).projectId;
+  }
+  if (options.selectSession) {
+    const selected = await promptForSpecificSession({
+      locale: options.locale,
+      timezone: options.timezone,
+      loadRecentSessions: () => listRecentCodexSessions(10),
+    });
+    options.mode = selected.mode;
+    options.sessionId = selected.sessionId;
+    options.modeExplicit = true;
+  } else if (options.selectProject) {
+    const selected = await promptForProjectRange({
+      locale: options.locale,
+      timezone: options.timezone,
+      loadRecentProjects,
+    });
+    options.mode = selected.mode;
+    options.projectId = selected.projectId;
+    options.hours = selected.hours || options.hours;
+    options.from = selected.from || options.from;
+    options.to = selected.to || options.to;
+    options.modeExplicit = true;
+  } else if (options.mode === "custom-range" && !options.from) {
+    const selected = await promptForCustomRange({ locale: options.locale, timezone: options.timezone });
+    options.from = selected.from;
+    options.to = selected.to;
+  }
+
   if (!options.modeExplicit && isInteractive()) {
     const workReceiptHome = getWorkReceiptHome({ dataDir: options.dataDir });
     if (!readAutoConfig({ workReceiptHome })) {
@@ -199,10 +248,14 @@ async function main() {
       locale: options.locale,
       timezone: options.timezone,
       loadRecentSessions: () => listRecentCodexSessions(10),
+      loadRecentProjects,
     });
     options.mode = selected.mode;
     options.sessionId = selected.sessionId;
     options.hours = selected.hours || options.hours;
+    options.projectId = selected.projectId || options.projectId;
+    options.from = selected.from || options.from;
+    options.to = selected.to || options.to;
   }
 
   const generated = await generateReceipt(options, {
@@ -235,7 +288,7 @@ async function main() {
     console.log(`Structured data: ${persisted.companionPath}`);
     console.log(`WeChat import file: ${persisted.transferPath}`);
     console.log(`Local history: ${persisted.receiptPath}`);
-    console.log(`Range: ${getScopeLabel(record.source.scope, options.locale, record.source.hours)} · ${record.stats.session_count} session(s)`);
+    console.log(`Range: ${getScopeLabel(record.source.scope, options.locale, record.source.hours, { rangeKind: record.source.range_kind, filterKind: record.source.filter_kind })} · ${record.stats.session_count} session(s)`);
     console.log(`Stats: ${record.stats.completed_turns} turns · ${formatNumber(record.stats.tokens.total_tokens, options.locale)} Tokens · ${record.stats.tool_calls} tool calls`);
     console.log(dataQrDataUrl
       ? `Data QR: available as one code · QR version ${dataQrVersion}`
@@ -246,13 +299,16 @@ async function main() {
     if (record.source.scope === "last-hours") {
       console.log(`Note: ${getRollingSummaryNotice(options.locale, record.source.hours)}`);
     }
+    if (record.source.scope === "custom-range" && record.source.range_kind === "exact-time") {
+      console.log(`Note: ${getCustomSummaryNotice(options.locale)}`);
+    }
     if (!miniProgramCodeDataUrl) console.log("Mini-program code: not configured; using the explicit placeholder");
   } else {
     console.log(`已生成网页：${outputFile}`);
     console.log(`结构数据：${persisted.companionPath}`);
     console.log(`微信导入文件：${persisted.transferPath}`);
     console.log(`本地历史：${persisted.receiptPath}`);
-    console.log(`统计范围：${getScopeLabel(record.source.scope, options.locale, record.source.hours)} · ${record.stats.session_count} 个会话`);
+    console.log(`统计范围：${getScopeLabel(record.source.scope, options.locale, record.source.hours, { rangeKind: record.source.range_kind, filterKind: record.source.filter_kind })} · ${record.stats.session_count} 个会话`);
     console.log(`统计：${record.stats.completed_turns} 轮 · ${formatNumber(record.stats.tokens.total_tokens, options.locale)} Token · ${record.stats.tool_calls} 次工具调用`);
     console.log(dataQrDataUrl
       ? `数据二维码：可用 · 单码 · QR version ${dataQrVersion}`
@@ -263,6 +319,9 @@ async function main() {
     if (record.source.scope === "last-hours") {
       console.log(`提示：${getRollingSummaryNotice(options.locale, record.source.hours)}`);
     }
+    if (record.source.scope === "custom-range" && record.source.range_kind === "exact-time") {
+      console.log(`提示：${getCustomSummaryNotice(options.locale)}`);
+    }
     if (!miniProgramCodeDataUrl) console.log("小程序码：尚未配置，页面使用明确占位符");
   }
   printOpenSourcePrompt("receipt", options.locale);

package/src/core/args.mjs

@@ -11,16 +11,25 @@ Usage:
   npx codex-work-receipt@latest --today --lang en
   npx codex-work-receipt@latest --range last-7-days --lang en
   npx codex-work-receipt@latest --range this-week --lang en
+  npx codex-work-receipt@latest --custom-range --lang en
+  npx codex-work-receipt@latest --select-session --lang en
+  npx codex-work-receipt@latest --select-project --lang en
   npx codex-work-receipt@latest --install-skill --lang en
   npx codex-work-receipt@latest --install-companion --lang en
   npx codex-work-receipt@latest --setup --lang en
 
 Options:
-  --range <name>              Range: latest, last-hours, today, last-7-days, this-week
+  --range <name>              Range: latest, last-hours, custom-range, today, last-7-days, this-week
   --hours <number>            Summarize the last 1-168 hours
+  --custom-range              Interactively choose a custom date or time range
+  --from <value>              Custom start: YYYY-MM-DD or YYYY-MM-DDTHH:mm
+  --to <value>                Custom end: YYYY-MM-DD or YYYY-MM-DDTHH:mm
   --latest                    Summarize the latest active Codex session (default)
   --today                     Summarize all Codex activity from today
   --session <id>              Summarize one specific Codex session
+  --select-session            Interactively choose a recent Codex session
+  --project <directory>       Limit the receipt to one local project
+  --select-project            Interactively choose a recent project and range
   --timezone <name>           Use an IANA timezone, for example Asia/Shanghai
   --lang <name>               Receipt language: zh-CN, en
   --theme <name>              Default theme: classic, diner, payroll
@@ -46,16 +55,25 @@ Codex AI 打工小票
   npx codex-work-receipt@latest --today
   npx codex-work-receipt@latest --range last-7-days
   npx codex-work-receipt@latest --range this-week
+  npx codex-work-receipt@latest --custom-range
+  npx codex-work-receipt@latest --select-session
+  npx codex-work-receipt@latest --select-project
   npx codex-work-receipt@latest --install-skill
   npx codex-work-receipt@latest --install-companion
   npx codex-work-receipt@latest --setup
 
 选项：
-  --range <name>              统计范围：latest、last-hours、today、last-7-days、this-week
+  --range <name>              统计范围：latest、last-hours、custom-range、today、last-7-days、this-week
   --hours <number>            统计最近 1～168 小时
+  --custom-range              交互选择自定义日期或精确时间区间
+  --from <value>              自定义开始：YYYY-MM-DD 或 YYYY-MM-DDTHH:mm
+  --to <value>                自定义结束：YYYY-MM-DD 或 YYYY-MM-DDTHH:mm
   --latest                    统计最近活跃的 Codex 会话（默认）
   --today                     统计本地时区今天发生的全部 Codex 活动
   --session <id>              统计指定的 Codex 会话
+  --select-session            交互选择最近的 Codex 会话
+  --project <directory>       只统计指定的本地项目目录
+  --select-project            交互选择最近项目及统计范围
   --timezone <name>           指定 IANA 时区，例如 Asia/Shanghai
   --lang <name>               小票语言：zh-CN、en
   --theme <name>              默认主题：classic、diner、payroll
@@ -79,7 +97,14 @@ export function parseArgs(argv) {
     mode: "latest",
     modeExplicit: false,
     sessionId: null,
+    selectSession: false,
+    project: null,
+    projectId: null,
+    selectProject: false,
     hours: null,
+    customRange: false,
+    from: null,
+    to: null,
     timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "Asia/Shanghai",
     locale: "zh-CN",
     theme: "classic",
@@ -103,7 +128,10 @@ export function parseArgs(argv) {
     ["--output", "output"],
     ["--data-dir", "dataDir"],
     ["--session", "sessionId"],
+    ["--project", "project"],
     ["--hours", "hours"],
+    ["--from", "from"],
+    ["--to", "to"],
   ]);
 
   for (let index = 0; index < argv.length; index += 1) {
@@ -114,7 +142,13 @@ export function parseArgs(argv) {
     } else if (argument === "--today") {
       result.mode = "today";
       result.modeExplicit = true;
-    } else if (argument === "--install-pet") result.installPet = true;
+    } else if (argument === "--custom-range") {
+      result.mode = "custom-range";
+      result.modeExplicit = true;
+      result.customRange = true;
+    } else if (argument === "--select-session") result.selectSession = true;
+    else if (argument === "--select-project") result.selectProject = true;
+    else if (argument === "--install-pet") result.installPet = true;
     else if (argument === "--uninstall-pet") result.uninstallPet = true;
     else if (argument === "--install-companion") result.installCompanion = true;
     else if (argument === "--range") {
@@ -142,6 +176,10 @@ export function parseArgs(argv) {
       } else if (key === "hours") {
         result.mode = "last-hours";
         result.modeExplicit = true;
+      } else if (key === "from" || key === "to") {
+        result.mode = "custom-range";
+        result.modeExplicit = true;
+        result.customRange = true;
       }
     } else throw new Error(`不认识的参数：${argument}`);
   }
@@ -164,6 +202,18 @@ export function parseArgs(argv) {
     }
   }
   if (result.mode === "last-hours" && result.hours === null) result.hours = 3;
+  if (result.mode === "custom-range") result.customRange = true;
+  if (Boolean(result.from) !== Boolean(result.to)) throw new Error("--from 和 --to 必须同时使用");
+  if (result.selectSession && result.selectProject) throw new Error("不能同时选择会话和项目");
+  if ((result.selectSession || result.selectProject) && result.modeExplicit) {
+    throw new Error("交互选择参数不能与统计范围参数同时使用");
+  }
+  if (result.selectSession && result.project) throw new Error("指定会话时不能同时指定项目");
+  if (result.selectProject && result.project) throw new Error("不能同时使用 --project 和 --select-project");
+  if (result.project && !result.modeExplicit) {
+    result.mode = "today";
+    result.modeExplicit = true;
+  }
   const managementActions = [
     result.setup,
     result.enableAuto,
@@ -172,8 +222,14 @@ export function parseArgs(argv) {
   ].filter(Boolean).length;
   if (managementActions > 1) throw new Error("自动保存管理参数不能同时使用");
   if (managementActions && result.modeExplicit) throw new Error("自动保存管理参数不能与统计范围参数同时使用");
+  if (managementActions && (result.selectSession || result.selectProject || result.project)) {
+    throw new Error("自动保存管理参数不能与会话或项目选择参数同时使用");
+  }
   if (managementActions && (
     result.installSkill || result.installPet || result.uninstallPet || result.installCompanion
   )) throw new Error("自动保存管理参数不能与 Skill 或桌宠管理参数同时使用");
+  if ((result.selectSession || result.selectProject || result.project) && (
+    result.installSkill || result.installPet || result.uninstallPet || result.installCompanion
+  )) throw new Error("会话或项目选择参数不能与 Skill 或桌宠管理参数同时使用");
   return result;
 }

package/src/core/fact-buckets.mjs

@@ -7,7 +7,7 @@ import {
   METRIC_SCHEMA_VERSION,
 } from "./fact-identity.mjs";
 import { dateKey, rowDate } from "../lib/time.mjs";
-import { isCalendarScope, isDateInRange, shiftDateKey } from "./range.mjs";
+import { isCalendarRange, isDateInRange, shiftDateKey } from "./range.mjs";
 
 const TOKEN_KEYS = [
   "input_tokens",
@@ -112,7 +112,7 @@ function metricsForRows(sessionRows, bucketRows, localDate, timezone) {
 }
 
 function coverageForRange(range, scanMode, observedAt) {
-  if (!isCalendarScope(range.scope)) {
+  if (!isCalendarRange(range)) {
     return {
       kind: "selected_sessions",
       scan_mode: "none",
@@ -151,7 +151,7 @@ export function buildCanonicalFacts(sessions, range, options = {}) {
 
     for (const row of sessionRows) {
       const date = rowDate(row);
-      if (!date || (isCalendarScope(range.scope) && !isDateInRange(date, range))) continue;
+      if (!date || (isCalendarRange(range) && !isDateInRange(date, range))) continue;
       const localDate = dateKey(date, accountingTimezone);
       const rows = buckets.get(localDate) || [];
       rows.push(row);

package/src/core/fact-identity.mjs

@@ -25,16 +25,20 @@ export function buildLogicalReceiptKey(metrics) {
   const sessionPart = stableId("cwg", "codex-work-receipt/session-group/v1", [
     ...[...metrics.sessionIds].sort(),
   ]);
+  const projectPart = metrics.projectId ? `:project:${metrics.projectId}` : "";
   if (metrics.mode === "latest" || metrics.mode === "session") {
-    return `${metrics.mode}:${sessionPart}:${metrics.timezone}`;
+    return `${metrics.mode}:${sessionPart}:${metrics.timezone}${projectPart}`;
   }
   if (metrics.mode === "last-hours") {
-    return `last-hours:${metrics.windowHours}:${metrics.windowStartAt.toISOString()}:${metrics.windowEndAt.toISOString()}:${metrics.timezone}`;
+    return `last-hours:${metrics.windowHours}:${metrics.windowStartAt.toISOString()}:${metrics.windowEndAt.toISOString()}:${metrics.timezone}${projectPart}`;
+  }
+  if (metrics.mode === "custom-range") {
+    return `custom-range:${metrics.boundaryKind}:${metrics.windowStartAt.toISOString()}:${metrics.windowEndAt.toISOString()}:${metrics.timezone}${projectPart}`;
   }
   if (metrics.mode === "this-week") {
-    return `this-week:${metrics.rangeStartDate}:${metrics.timezone}`;
+    return `this-week:${metrics.rangeStartDate}:${metrics.timezone}${projectPart}`;
   }
-  return `${metrics.mode}:${metrics.rangeStartDate}:${metrics.rangeEndDate}:${metrics.timezone}`;
+  return `${metrics.mode}:${metrics.rangeStartDate}:${metrics.rangeEndDate}:${metrics.timezone}${projectPart}`;
 }
 
 export function buildSummaryReceiptId(logicalReceiptKey) {

package/src/core/generator.mjs

@@ -4,6 +4,7 @@ import path from "node:path";
 import { buildCanonicalFacts } from "./fact-buckets.mjs";
 import { createReceiptFile } from "./file-payload.mjs";
 import { collectMetrics } from "./metrics.mjs";
+import { getProjectIdentitySecret } from "./project-identity.mjs";
 import { outputSlugForRange, resolveRange } from "./range.mjs";
 import {
   buildReceiptRecord,
@@ -39,11 +40,22 @@ export async function generateReceipt(
 ) {
   if (!projectDir) throw new Error("生成小票时缺少项目目录");
 
-  const range = resolveRange(options.mode, options.timezone, now, options.sessionId, options.hours);
-  const sessions = loadCodexSessions(range, { codexHome });
+  const range = resolveRange(
+    options.mode,
+    options.timezone,
+    now,
+    options.sessionId,
+    options.hours,
+    options.mode === "custom-range" ? { from: options.from, to: options.to } : null,
+    options.projectId,
+  );
+  const projectSecret = range.projectId ? getProjectIdentitySecret({ dataDir: options.dataDir }) : null;
+  const sessions = loadCodexSessions(range, { codexHome, projectSecret });
   const metrics = collectMetrics(sessions, range);
   const observedAt = now.toISOString();
-  const canonical = range.scope === "last-hours"
+  const summaryOnly = range.scope === "last-hours"
+    || (range.scope === "custom-range" && range.boundaryKind === "exact-time");
+  const canonical = summaryOnly
     ? {}
     : buildCanonicalFacts(sessions, range, { observedAt });
   const record = buildReceiptRecord(metrics, options.theme, options.locale, canonical);

package/src/core/metrics.mjs

@@ -1,9 +1,10 @@
 import { dateKey, rowDate } from "../lib/time.mjs";
+import { toolCategoryForRow } from "../lib/tool-category.mjs";
 import {
   calendarDayCount,
-  isCalendarScope,
+  isCalendarRange,
   isDateInRange,
-  isTimeWindowScope,
+  isTimeWindowRange,
 } from "./range.mjs";
 import { selectWorkProfileId } from "./presentation.mjs";
 
@@ -21,6 +22,83 @@ function addUsage(target, source) {
   for (const key of Object.keys(target)) target[key] += Number(source[key] || 0);
 }
 
+function increment(map, key, amount = 1) {
+  if (!key) return;
+  map.set(key, Number(map.get(key) || 0) + amount);
+}
+
+function roundedRatio(numerator, denominator, digits = 2) {
+  if (!denominator) return 0;
+  const scale = 10 ** digits;
+  return Math.round((Number(numerator || 0) / denominator) * scale) / scale;
+}
+
+function percentile(samples, quantile) {
+  if (!samples.length) return 0;
+  const sorted = [...samples].sort((left, right) => left - right);
+  const position = (sorted.length - 1) * quantile;
+  const lowerIndex = Math.floor(position);
+  const upperIndex = Math.ceil(position);
+  const lower = sorted[lowerIndex];
+  const upper = sorted[upperIndex];
+  return Math.round(lower + (upper - lower) * (position - lowerIndex));
+}
+
+function usageRows(map, keyName) {
+  return [...map.entries()]
+    .map(([name, count]) => ({ [keyName]: name, count }))
+    .sort((left, right) => right.count - left.count || left[keyName].localeCompare(right[keyName]));
+}
+
+function localHour(date, timezone) {
+  if (!date) return null;
+  const hour = Number(new Intl.DateTimeFormat("en-GB", {
+    timeZone: timezone,
+    hour: "2-digit",
+    hourCycle: "h23",
+  }).format(date));
+  return Number.isInteger(hour) && hour >= 0 && hour <= 23 ? hour : null;
+}
+
+function buildInsights({
+  tokens,
+  completedTurns,
+  toolCalls,
+  completedDurationMs,
+  firstTokenSamples,
+  turnDurationSamples,
+  activityByHour,
+  modelUsage,
+  toolUsage,
+}) {
+  const inputTokens = Math.max(0, Number(tokens.input_tokens || 0));
+  const cachedInputTokens = Math.max(0, Number(tokens.cached_input_tokens || 0));
+  return {
+    cache_hit_rate: inputTokens ? Math.min(1, roundedRatio(cachedInputTokens, inputTokens, 4)) : 0,
+    per_turn: {
+      total_tokens: roundedRatio(tokens.total_tokens, completedTurns),
+      output_tokens: roundedRatio(tokens.output_tokens, completedTurns),
+      tool_calls: roundedRatio(toolCalls, completedTurns),
+      work_duration_ms: Math.round(roundedRatio(completedDurationMs, completedTurns)),
+    },
+    latency_ms: {
+      first_token: {
+        sample_count: firstTokenSamples.length,
+        p50: percentile(firstTokenSamples, 0.5),
+        p90: percentile(firstTokenSamples, 0.9),
+      },
+      turn: {
+        sample_count: turnDurationSamples.length,
+        p50: percentile(turnDurationSamples, 0.5),
+        p90: percentile(turnDurationSamples, 0.9),
+      },
+    },
+    activity_by_hour: [...activityByHour],
+    model_usage: usageRows(modelUsage, "model"),
+    tool_usage: usageRows(toolUsage, "category"),
+  };
+}
+
 function sessionTokenUsage(rows, range) {
   const events = rows
     .filter((row) => row.type === "event_msg" && row.payload?.type === "token_count")
@@ -33,7 +111,7 @@ function sessionTokenUsage(rows, range) {
   for (const row of events) {
     const currentUsage = row.payload.info.total_token_usage;
     const date = rowDate(row);
-    const selected = (!isCalendarScope(range.scope) && !isTimeWindowScope(range.scope))
+    const selected = (!isCalendarRange(range) && !isTimeWindowRange(range))
       || isDateInRange(date, range);
 
     for (const key of Object.keys(totals)) {
@@ -63,6 +141,7 @@ function calculateWorkPoints(metrics) {
 
 function emptyRangeMessage(range) {
   if (range.scope === "last-hours") return `最近 ${range.hours} 小时没有找到 Codex 活动`;
+  if (range.scope === "custom-range") return "自定义时间区间内没有找到 Codex 活动";
   if (range.scope === "today") return `没有找到 ${range.targetDate} 的 Codex 活动`;
   if (range.scope === "last-7-days") return `没有找到 ${range.startDate} 至 ${range.endDate} 的 Codex 活动`;
   if (range.scope === "this-week") return `本周暂时没有找到 Codex 活动`;
@@ -78,14 +157,20 @@ export function collectMetrics(sessions, range) {
   let toolCalls = 0;
   let interruptions = 0;
   let workDurationMs = 0;
+  let completedDurationMs = 0;
   let totalFirstTokenMs = 0;
   let firstTokenSamples = 0;
+  const firstTokenLatencySamples = [];
+  const turnDurationSamples = [];
   const timestamps = [];
   const activeDateKeys = new Set();
   const models = new Set();
+  const modelUsage = new Map();
+  const toolUsage = new Map();
+  const activityByHour = Array(24).fill(0);
 
   for (const session of sessions) {
-    const scopedRows = isCalendarScope(range.scope) || isTimeWindowScope(range.scope)
+    const scopedRows = isCalendarRange(range) || isTimeWindowRange(range)
       ? session.rows.filter((row) => isDateInRange(rowDate(row), range))
       : session.rows;
 
@@ -94,40 +179,70 @@ export function collectMetrics(sessions, range) {
     sessionIds.push(session.sessionId);
     addUsage(tokens, sessionTokenUsage(session.rows, range));
 
-    for (const row of scopedRows) {
+    let activeModel = null;
+    let unattributedModelTurns = 0;
+    let sessionHasSelectedModel = false;
+    for (const row of session.rows) {
+      if (row.type === "turn_context" && row.payload?.model) activeModel = row.payload.model;
+      const selected = (!isCalendarRange(range) && !isTimeWindowRange(range))
+        || isDateInRange(rowDate(row), range);
+      if (!selected) continue;
       const date = rowDate(row);
       if (date) {
         timestamps.push(date);
         activeDateKeys.add(dateKey(date, range.timezone));
       }
 
-      if (row.type === "turn_context" && row.payload?.model) models.add(row.payload.model);
+      if (row.type === "turn_context" && row.payload?.model) {
+        models.add(row.payload.model);
+        sessionHasSelectedModel = true;
+      }
       if (row.type === "event_msg") {
         const eventType = row.payload?.type;
         if (eventType === "task_complete") {
+          const hasDuration = Number.isFinite(row.payload.duration_ms);
+          const durationMs = hasDuration ? Math.max(0, Number(row.payload.duration_ms)) : 0;
           completedTurns += 1;
-          workDurationMs += Number(row.payload.duration_ms || 0);
+          workDurationMs += durationMs;
+          completedDurationMs += durationMs;
+          if (hasDuration) turnDurationSamples.push(durationMs);
+          if (activeModel) {
+            models.add(activeModel);
+            sessionHasSelectedModel = true;
+            increment(modelUsage, activeModel);
+          }
+          else unattributedModelTurns += 1;
+          const hour = localHour(date, range.timezone);
+          if (hour !== null) activityByHour[hour] += 1;
           if (Number.isFinite(row.payload.time_to_first_token_ms)) {
-            totalFirstTokenMs += row.payload.time_to_first_token_ms;
+            const firstTokenMs = Math.max(0, Number(row.payload.time_to_first_token_ms));
+            totalFirstTokenMs += firstTokenMs;
             firstTokenSamples += 1;
+            firstTokenLatencySamples.push(firstTokenMs);
           }
         } else if (eventType === "user_message") userMessages += 1;
         else if (eventType === "turn_aborted") {
           interruptions += 1;
-          workDurationMs += Number(row.payload.duration_ms || 0);
+          workDurationMs += Math.max(0, Number(row.payload.duration_ms || 0));
+          const hour = localHour(date, range.timezone);
+          if (hour !== null) activityByHour[hour] += 1;
         }
       }
 
-      if (
-        row.type === "response_item" &&
-        (row.payload?.type === "custom_tool_call" || row.payload?.type === "function_call")
-      ) toolCalls += 1;
+      const toolCategory = toolCategoryForRow(row);
+      if (toolCategory) {
+        toolCalls += 1;
+        increment(toolUsage, toolCategory);
+      }
     }
 
     const fallbackModel = [...session.rows]
       .reverse()
       .find((row) => row.type === "turn_context" && row.payload?.model)?.payload?.model;
-    if (fallbackModel) models.add(fallbackModel);
+    if (fallbackModel && (!sessionHasSelectedModel || unattributedModelTurns)) {
+      models.add(fallbackModel);
+      if (unattributedModelTurns) increment(modelUsage, fallbackModel, unattributedModelTurns);
+    }
   }
 
   if (!scopedSessions.length || !timestamps.length) throw new Error(emptyRangeMessage(range));
@@ -144,7 +259,9 @@ export function collectMetrics(sessions, range) {
     windowStartAt: range.startAt,
     windowEndAt: range.endAt,
     windowHours: range.hours,
-    calendarDayCount: isCalendarScope(range.scope) ? calendarDayCount(range) : 1,
+    boundaryKind: range.boundaryKind,
+    projectId: range.projectId,
+    calendarDayCount: isCalendarRange(range) ? calendarDayCount(range) : 1,
     activeDayCount: Math.max(1, activeDateKeys.size),
     sessionIds,
     sessionCount: scopedSessions.length,
@@ -159,6 +276,17 @@ export function collectMetrics(sessions, range) {
     tokens,
     models: [...models],
   };
+  metrics.insights = buildInsights({
+    tokens,
+    completedTurns,
+    toolCalls,
+    completedDurationMs,
+    firstTokenSamples: firstTokenLatencySamples,
+    turnDurationSamples,
+    activityByHour,
+    modelUsage,
+    toolUsage,
+  });
   metrics.workProfileId = selectWorkProfileId(metrics);
   metrics.workPoints = calculateWorkPoints(metrics);
   return metrics;