exe-watcher 0.2.68 → 0.2.70

package/README.md

@@ -31,7 +31,7 @@ npm install -g exe-watcher
 exe-watcher report
 ```
 
-Version 0.2.68 resumes large Claude history scans and repairs previously skipped days within the existing resource limits. Recorded API-equivalent costs and saved totals are preserved through refresh failures, restarts and day changes. AI time and the floating quota display are included. Terminal installs require Node 22.13 or newer; the Mac app includes its own compatible runtime. Download the matching app from [Releases](https://github.com/AskExe/exe-watcher/releases/latest) or [odd.community/watcher](https://odd.community/watcher). To run the current CLI from source:
+Version 0.2.70 adds local active AI app tracking and broader, clearly labeled historical personal-time estimates. It also explains that first-time history setup can take 10 minutes or more for large AI histories, with saved progress and recovery details. Large Claude history scans resume within the existing resource limits. Recorded API-equivalent costs and saved totals are preserved through refresh failures, restarts and day changes. AI time and the floating quota display are included. Terminal installs require Node 22.13 or newer; the Mac app includes its own compatible runtime. Download the matching app from [Releases](https://github.com/AskExe/exe-watcher/releases/latest) or [odd.community/watcher](https://odd.community/watcher). To run the current CLI from source:
 
 ```bash
 git clone https://github.com/AskExe/exe-watcher.git
@@ -45,7 +45,7 @@ node dist/cli.js report
 
 ## Built for AI employee teams
 
-- **Floating display** — a compact on-screen quota display for Claude, Codex, Kimi, Cursor, GitHub Copilot and Gemini, with **You + AI ≈** (your estimated interaction time) and **AI Time** (work time added across all agents). Quota rings show **quota left**, default to **Weekly**, and have a **Weekly / 5h** toggle. Click either time button for its explanation. Time totals default to Today; switch to Week, Month or All Time. Enable it from the menu bar footer’s **Display settings → Floating quota display**. [Details](mac/README.md#floating-display).
+- **Floating display** — a compact on-screen quota display for Claude, Codex, Kimi, Cursor, GitHub Copilot and Gemini, with **You + AI ≈** (historical sessions plus tracked app activity) and **AI Time** (work time added across all agents). Quota rings show **quota left**, default to **Weekly**, and have a **Weekly / 5h** toggle. Click either time button for its explanation. Time totals default to Today; switch to Week, Month or All Time. Enable it from the menu bar footer’s **Display settings → Floating quota display**. [Details](mac/README.md#floating-display).
 - **AI running time** — adds recorded work across agents, so parallel work is counted as agent-hours.
 - **Elapsed busy time** — merges overlapping runs to show how long at least one agent was working.
 - **Your time ≈** — estimates interaction from short reply-to-next-prompt gaps, with known subagents excluded. It is not an attention or productivity measurement.
@@ -123,7 +123,11 @@ The menu bar dashboard and full terminal report show three times beneath the spe
 
 - **AI running:** recorded run time added across agents. Two agents running for one hour add two hours. Duplicate run IDs copied into forks count once.
 - **Elapsed busy:** time when at least one agent was running. Those two parallel agents count as one elapsed hour.
-- **Your time ≈:** an interaction estimate from reply-to-next-prompt gaps of up to five minutes, merged across chats. Known subagents and longer idle gaps are excluded. This does not measure attention, typing or time reading while an agent runs; unidentified automation may be included.
+- **Your time ≈:** historical conversation sessions plus foreground app activity tracked on this Mac. Historical sessions join nearby main-chat turn starts with a 15-minute gap; the displayed sensitivity range uses 10–30 minutes. It includes some AI waiting, excludes known subagents and long unattended gaps, and may include main-chat automation. Isolated turns get no invented padding. This is an estimate of engagement, not attention or typing. The older five-minute reply-gap estimate remains available in JSON as `userActiveMs` and in CLI details.
+
+**Track active AI app time on this Mac** can be switched off in the AI time section. It counts foreground Codex, Hansel, Claude and ChatGPT app activity, with a two-minute idle cutoff. Cursor, supported editors and terminals count only alongside a recent matching AI turn; these ambiguous intervals are marked as contextual estimates. Browsers and unsupported apps remain unknown. No keyboard contents, window titles, screenshots, accessibility access or Terminal control are needed. App switching, sleep and console-session notifications drive tracking; a single 30-second idle check runs only while an eligible app is in front. Late checks never fill sleep or scheduler gaps. Daily totals are saved privately, at most every five minutes while continuously active and on app switch/exit; a crash can lose the unsaved tail. No usage scan or extra CLI process is triggered. A writer lock prevents two Watcher copies counting the same foreground activity.
+
+The historical estimate stops when app tracking first begins, so it is never added over the same time as app activity. Period and provider views use the same boundaries. App tracking gaps while Watcher is closed or tracking is off stay unknown. Daily app totals have no project attribution; project-filtered CLI reports show historical sessions only. The stored tracking timezone is fixed to avoid overlapping days after travel. Custom partial-day CLI queries omit daily app totals they cannot precisely locate.
 
 Timing recovery starts July 1, 2025 and uses retained local evidence. **Partial history** stays visible; missing timing is **Unknown**, never zero. Recorded durations may include tool execution and waiting, rather than only time generating tokens. Open runs are not extended to the present.
 

package/dist/cli.js

@@ -6125,7 +6125,7 @@ init_cache_dir();
 init_file_lock();
 init_resource_budget();
 import { existsSync as existsSync8, readFileSync as readFileSync2, statSync as statSync3 } from "fs";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 import { homedir as homedir17 } from "os";
 import { Command } from "commander";
 
@@ -9227,7 +9227,7 @@ function owlFrame(tick) {
 }
 
 // src/dashboard.tsx
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 
 // src/time-index.ts
 init_cache_dir();
@@ -9235,14 +9235,86 @@ init_file_lock();
 init_resource_budget();
 import { createHash as createHash9, randomUUID as randomUUID5 } from "crypto";
 import { mkdir as mkdir13, open as open9, readFile as readFile14, rename as rename11, stat as stat19, unlink as unlink9, readdir as readdir15 } from "fs/promises";
-import { basename as basename11, dirname as dirname6, join as join29 } from "path";
+import { basename as basename11, dirname as dirname6, join as join30 } from "path";
 import { gzip as gzip2, gunzip as gunzip2 } from "zlib";
 import { promisify as promisify2 } from "util";
 
 // src/time-tracking.ts
 import { createHash as createHash8 } from "crypto";
+
+// src/personal-activity.ts
+init_cache_dir();
+import { openSync as openSync2, readSync as readSync2, closeSync as closeSync2, constants as constants2, fstatSync as fstatSync2 } from "fs";
+import { join as join29 } from "path";
+var ACTIVITY_LIMIT = 4 * 1024 ** 2;
+function readActivityHistory() {
+  let fd;
+  try {
+    fd = openSync2(join29(getCacheDir(), "personal-activity-v1.json"), constants2.O_RDONLY | constants2.O_NOFOLLOW | constants2.O_NONBLOCK);
+    const stat20 = fstatSync2(fd);
+    if (!stat20.isFile() || stat20.size > ACTIVITY_LIMIT) return void 0;
+    const buffer = Buffer.alloc(stat20.size);
+    if (readSync2(fd, buffer, 0, buffer.length, 0) !== buffer.length) return void 0;
+    const x = JSON.parse(buffer.toString("utf8"));
+    if (x.version !== 1 || typeof x.enabled !== "boolean" || typeof x.startedAt !== "string" || typeof x.updatedAt !== "string" || !Array.isArray(x.days) || x.days.length > 36600 || !Number.isFinite(Date.parse(x.startedAt)) || !Number.isFinite(Date.parse(x.updatedAt))) return void 0;
+    let end = 0;
+    for (const day of x.days) {
+      if (!Number.isFinite(day.start) || !Number.isFinite(day.end) || day.start < end || day.end <= day.start || day.end - day.start > 26 * 36e5) return void 0;
+      let total = 0;
+      for (const map of [day.active, day.contextual]) {
+        if (!map || typeof map !== "object" || Array.isArray(map) || Object.keys(map).length > 32) return void 0;
+        for (const value of Object.values(map)) {
+          if (!Number.isFinite(value) || value < 0) return void 0;
+          total += value;
+        }
+      }
+      if (total > day.end - day.start) return void 0;
+      end = day.end;
+    }
+    return x;
+  } catch {
+    return void 0;
+  } finally {
+    if (fd !== void 0) closeSync2(fd);
+  }
+}
+function summarizeActivity(history, range, provider = "all") {
+  if (!history) return void 0;
+  let activeMs = 0, contextualMs = 0;
+  for (const day of history.days) {
+    const overlap = Math.max(0, Math.min(day.end, range.end.getTime()) - Math.max(day.start, range.start.getTime()));
+    if (!overlap) continue;
+    if (range.start.getTime() > day.start || range.end.getTime() < Math.min(day.end, Date.parse(history.updatedAt))) continue;
+    const sum2 = (map) => provider === "all" ? Object.values(map).reduce((a, b) => a + b, 0) : Object.hasOwn(map, provider) ? map[provider] : 0;
+    activeMs += sum2(day.active);
+    contextualMs += sum2(day.contextual);
+  }
+  return { activeMs, contextualMs, startedAt: history.startedAt, updatedAt: history.updatedAt, enabled: history.enabled };
+}
+
+// src/time-tracking.ts
 var TIME_HISTORY_START = (/* @__PURE__ */ new Date("2025-07-01T00:00:00")).getTime();
 var TIME_PROVIDERS = ["claude", "codex", "cursor", "cursor-agent", "copilot", "opencode", "kimi", "pi", "omp"];
+function personalTimeMs(time) {
+  if (!time) return null;
+  if (time.personalTimeVersion !== 1 && !time.sessionEstimate) return time.userActiveMs;
+  if (!time.sessionEstimate && !time.appActivity) return null;
+  return (time.sessionEstimate?.milliseconds ?? 0) + (time.appActivity?.activeMs ?? 0) + (time.appActivity?.contextualMs ?? 0);
+}
+function estimateSessions(points, range, through = range.end.getTime()) {
+  const sorted = [...new Set(points.filter(Number.isFinite))].sort((a, b) => a - b);
+  const end = Math.min(through, range.end.getTime(), Date.now());
+  const start = Math.max(range.start.getTime(), TIME_HISTORY_START);
+  let milliseconds = 0, lowerMs = 0, upperMs = 0;
+  for (let i = 1; i < sorted.length; i++) {
+    const a = sorted[i - 1], b = sorted[i], gap = b - a;
+    const duration = Math.max(0, Math.min(b, end) - Math.max(a, start));
+    if (gap <= 30 * 6e4) upperMs += duration;
+    if (gap <= 15 * 6e4) milliseconds += duration;
+    if (gap <= 10 * 6e4) lowerMs += duration;
+  }
+  return upperMs > 0 ? { milliseconds, lowerMs, upperMs, method: "main-chat-gaps-v1", through: new Date(end).toISOString() } : void 0;
+}
 function timestamp(value) {
   const n = typeof value === "number" ? value < 1e11 ? value * 1e3 : value : typeof value === "string" ? Date.parse(value) : NaN;
   return Number.isFinite(n) && n >= TIME_HISTORY_START && n <= Date.now() + 864e5 ? n : void 0;
@@ -9394,7 +9466,7 @@ function unionIntervals(intervals, range) {
   return out;
 }
 var sum = (rows2) => rows2.reduce((n, [a, b]) => n + b - a, 0);
-function summarizeTime(index, range, provider = "all", include, exclude) {
+function summarizeTime(index, range, provider = "all", include, exclude, activity) {
   const matches = (name, terms) => terms?.some((t) => name.toLowerCase().includes(t.toLowerCase()));
   const files = Object.values(index.files).filter((f) => (provider === "all" || f.provider === provider) && (!include?.length || matches(f.project, include)) && !matches(f.project, exclude));
   const agents = /* @__PURE__ */ new Map(), estimatedAgents = /* @__PURE__ */ new Map(), user = [];
@@ -9414,9 +9486,16 @@ function summarizeTime(index, range, provider = "all", include, exclude) {
     states.set(file, copies);
   }
   const consumed = /* @__PURE__ */ new Set();
+  const mainTurns = [];
+  const recentMainTurns = /* @__PURE__ */ new Map();
   const byProvider = /* @__PURE__ */ new Map();
   let pendingFiles = 0;
   for (const file of files) {
+    for (const original of [file.state, ...Object.values(file.state.children ?? {})]) {
+      if (!original.child && original.pending !== void 0 && original.pending <= Date.now()) {
+        recentMainTurns.set(file.provider, Math.max(recentMainTurns.get(file.provider) ?? 0, original.pending));
+      }
+    }
     if (file.offset < file.size || file.unavailable) pendingFiles++;
     const row = byProvider.get(file.provider) ?? { files: 0, timedFiles: 0, agents: /* @__PURE__ */ new Map() };
     row.files++;
@@ -9431,6 +9510,12 @@ function summarizeTime(index, range, provider = "all", include, exclude) {
         return true;
       });
       const ai = unionIntervals(unique, range);
+      if (!state.child) {
+        for (const interval2 of unique) {
+          mainTurns.push(interval2[0]);
+          if (interval2[0] <= Date.now()) recentMainTurns.set(file.provider, Math.max(recentMainTurns.get(file.provider) ?? 0, interval2[0]));
+        }
+      }
       const inferred = estimatedAgents.get(state.agent) ?? [];
       inferred.push(...unique.filter((interval2) => interval2[2]));
       estimatedAgents.set(state.agent, inferred);
@@ -9447,6 +9532,9 @@ function summarizeTime(index, range, provider = "all", include, exclude) {
   const all = [...agents.values()].flatMap((v) => unionIntervals(v, range));
   const estimated = [...estimatedAgents.values()].flatMap((v) => unionIntervals(v, range));
   const busy = unionIntervals(all, range), human = unionIntervals(user, range);
+  const cutover = activity ? Date.parse(activity.startedAt) : range.end.getTime();
+  const sessionEstimate = estimateSessions(mainTurns, range, cutover);
+  const appActivity = include?.length || exclude?.length ? void 0 : summarizeActivity(activity, range, provider);
   const pending = files.filter((f) => f.offset < f.size || f.unavailable);
   const waitingFiles = pending.filter((f) => f.waitingForAppend && !f.unavailable).length;
   const recovery = {
@@ -9464,6 +9552,9 @@ function summarizeTime(index, range, provider = "all", include, exclude) {
     elapsedBusyMs: busy.length ? sum(busy) : null,
     userActiveMs: human.length ? sum(human) : null,
     estimatedAiMs: sum(estimated),
+    personalTimeVersion: 1,
+    sessionEstimate,
+    appActivity,
     coverage: all.length ? "partial" : "missing",
     pendingFiles,
     indexedFiles: files.length,
@@ -9472,11 +9563,13 @@ function summarizeTime(index, range, provider = "all", include, exclude) {
     providers: (provider === "all" ? TIME_PROVIDERS : [provider]).map((name) => {
       const row = byProvider.get(name);
       const duration = row ? [...row.agents.values()].reduce((n, a) => n + sum(unionIntervals(a, range)), 0) : 0;
-      return { name, files: row?.files ?? 0, timedFiles: row?.timedFiles ?? 0, aiRunningMs: duration || null, status: duration ? "partial" : "missing" };
+      return { name, files: row?.files ?? 0, timedFiles: row?.timedFiles ?? 0, aiRunningMs: duration || null, status: duration ? "partial" : "missing", recentMainTurnAt: recentMainTurns.get(name) };
     }),
     notes: [
       "Retained local records only, since July 1, 2025. Missing history is unknown, not zero. Run time can include tools and waiting.",
-      "Your time is an estimate of reply-to-next-prompt gaps up to 5 minutes, merged across chats. Longer idle gaps and subagents are excluded; unidentified automation may be included. It does not measure attention.",
+      "Legacy short reply gaps estimate reply-to-next-prompt gaps up to 5 minutes, merged across chats. Longer gaps and subagents are excluded; unidentified automation may be included. It does not measure attention.",
+      ...sessionEstimate ? ["Historical session time uses gaps between main-chat turn starts: 15-minute continuity, with a 10\u201330-minute sensitivity range. Overlap counts once; subagents, isolated turns and long gaps are excluded. This includes some AI waiting, may include main-chat automation, and cannot measure attention."] : [],
+      ...appActivity ? ["App activity uses foreground app and idle metadata from this Mac. Terminal/editor time needs a recent matching AI session and is separately marked as contextual. Browsers and unsupported apps are unknown. Daily totals have no project attribution; tracking gaps remain unknown."] : [],
       ...estimated.length ? ["Some AI time is inferred from prompt/response timestamps, limited to spans up to 30 minutes. Longer unmeasured gaps stay unknown."] : [],
       ...recovery.runnableFiles ? ["Timing recovery is in progress. Queued timing work continues in bounded steps; usage costs are unaffected."] : [],
       ...waitingFiles ? ["Some logs end mid-record. Their incomplete records remain unknown until more data is saved."] : [],
@@ -9586,7 +9679,7 @@ var MAX_DISK2 = 16 * 1024 ** 2;
 var MAX_FILES = 2e4;
 var BLOCK = 2 * 1024 ** 2;
 var adapterVersion = (provider) => provider === "opencode" ? 2 : 1;
-var indexPath2 = () => join29(getCacheDir(), "time-index-v1.json.gz");
+var indexPath2 = () => join30(getCacheDir(), "time-index-v1.json.gz");
 var empty = () => ({ version: 1, files: /* @__PURE__ */ Object.create(null), updatedAt: (/* @__PURE__ */ new Date()).toISOString(), warnings: [] });
 async function readTimeIndex() {
   try {
@@ -9649,11 +9742,11 @@ async function expandSources(sources, warnings) {
       continue;
     }
     for (const entry of await readdir15(source.path, { withFileTypes: true }).catch(() => [])) {
-      if (entry.isFile() && entry.name.endsWith(".jsonl")) out.push({ ...source, path: join29(source.path, entry.name) });
+      if (entry.isFile() && entry.name.endsWith(".jsonl")) out.push({ ...source, path: join30(source.path, entry.name) });
       else if (entry.isDirectory()) {
-        const folder = join29(source.path, entry.name, "subagents");
+        const folder = join30(source.path, entry.name, "subagents");
         for (const agent of await readdir15(folder, { withFileTypes: true }).catch(() => [])) {
-          if (agent.isFile() && agent.name.endsWith(".jsonl")) out.push({ ...source, path: join29(folder, agent.name) });
+          if (agent.isFile() && agent.name.endsWith(".jsonl")) out.push({ ...source, path: join30(folder, agent.name) });
         }
       }
     }
@@ -9750,7 +9843,7 @@ async function refreshTimeIndex(options = {}) {
   let current;
   let release;
   try {
-    release = await acquireFileLock(join29(getCacheDir(), "time-index.lock"), 100);
+    release = await acquireFileLock(join30(getCacheDir(), "time-index.lock"), 100);
   } catch {
     current = await readTimeIndex();
     current.warnings.push("Another timing update is running; showing the saved timing snapshot.");
@@ -9853,12 +9946,13 @@ async function refreshTimeIndex(options = {}) {
   return current;
 }
 async function getTimeReport(range, provider = "all", include, exclude, signal) {
+  const activity = readActivityHistory();
   try {
-    return summarizeTime(await refreshTimeIndex({ signal }), range, provider, include, exclude);
+    return summarizeTime(await refreshTimeIndex({ signal }), range, provider, include, exclude, activity);
   } catch (error) {
     const index = await readTimeIndex();
     index.warnings.push(`Timing unavailable: ${error instanceof Error ? error.message : String(error)}`);
-    return summarizeTime(index, range, provider, include, exclude);
+    return summarizeTime(index, range, provider, include, exclude, activity);
   }
 }
 
@@ -10572,8 +10666,25 @@ function TimePanel({ time, width }) {
     ] }),
     /* @__PURE__ */ jsxs2(Text2, { children: [
       /* @__PURE__ */ jsx2(Text2, { bold: true, children: "Your time \u2248 " }),
-      formatDuration(time?.userActiveMs ?? null),
-      /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: " \xB7 interaction-gap estimate, not attention" })
+      formatDuration(personalTimeMs(time)),
+      /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
+        " \xB7 ",
+        time?.personalTimeVersion === 1 || time?.sessionEstimate ? "historical sessions + tracked app activity" : "legacy short reply gaps"
+      ] })
+    ] }),
+    time?.sessionEstimate && /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
+      "Historical range: ",
+      formatDuration(time.sessionEstimate.lowerMs),
+      " \u2013 ",
+      formatDuration(time.sessionEstimate.upperMs),
+      " (10\u201330 min session gaps)"
+    ] }),
+    time?.appActivity && /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
+      "App activity: ",
+      formatDuration(time.appActivity.activeMs + time.appActivity.contextualMs),
+      " \xB7 ",
+      formatDuration(time.appActivity.contextualMs),
+      " inferred terminal/editor context"
     ] }),
     /* @__PURE__ */ jsxs2(Text2, { color: ORANGE3, children: [
       time?.aiRunningMs != null ? "Partial history" : "Timing unknown",
@@ -10697,11 +10808,11 @@ function InteractiveDashboard({ initialPeriod, initialProvider, refreshSeconds,
   useEffect2(() => {
     let cancelled = false;
     async function loadBudgets() {
-      const claudeDir = join30(homedir16(), ".claude", "projects");
+      const claudeDir = join31(homedir16(), ".claude", "projects");
       const budgets = /* @__PURE__ */ new Map();
       for (const project of projects.slice(0, 8)) {
         if (cancelled) return;
-        const cwd = await discoverProjectCwd(join30(claudeDir, project.project));
+        const cwd = await discoverProjectCwd(join31(claudeDir, project.project));
         if (!cwd) continue;
         budgets.set(project.project, await estimateContextBudget(cwd));
       }
@@ -11246,8 +11357,8 @@ function watchMenubarParent(parentPid, runtime = live) {
 }
 
 // src/time-snapshots.ts
-function buildTimeSnapshots(index, ranges, provider = "all", include, exclude) {
-  const views = (scope) => Object.fromEntries(Object.entries(ranges).map(([key2, range]) => [key2, summarizeTime(index, range, scope, include, exclude)]));
+function buildTimeSnapshots(index, ranges, provider = "all", include, exclude, activity) {
+  const views = (scope) => Object.fromEntries(Object.entries(ranges).map(([key2, range]) => [key2, summarizeTime(index, range, scope, include, exclude, activity)]));
   const periods = views(provider), allPeriods = provider === "all" ? void 0 : views("all");
   return { generated: (/* @__PURE__ */ new Date()).toISOString(), provider, periods, allPeriods, recovery: (allPeriods ?? periods)["all"].recovery };
 }
@@ -11875,12 +11986,12 @@ program.command("status").description("Compact status output (today + week + mon
 `);
       }
     }
-    const exeOsDir = join31(homedir17(), ".exe-os");
+    const exeOsDir = join32(homedir17(), ".exe-os");
     const exeOsDetected = existsSync8(exeOsDir);
     let agentStats = null;
     let statsFileAge = null;
     try {
-      const statsPath = join31(exeOsDir, "agent-stats.json");
+      const statsPath = join32(exeOsDir, "agent-stats.json");
       if (existsSync8(statsPath)) {
         statsFileAge = Math.round((Date.now() - statSync3(statsPath).mtimeMs) / 1e3);
         const parsed = JSON.parse(readFileSync2(statsPath, "utf-8"));
@@ -11940,9 +12051,10 @@ program.command("status").description("Compact status output (today + week + mon
       warnings
     ) : void 0;
     const timeIndex = await refreshTimeIndex();
-    const time = summarizeTime(timeIndex, getDateRange2(opts.period, now).range, pf, opts.project, opts.exclude);
+    const activity = readActivityHistory();
+    const time = summarizeTime(timeIndex, getDateRange2(opts.period, now).range, pf, opts.project, opts.exclude, activity);
     if (periodSnapshots) for (const [key2, snapshot] of Object.entries(periodSnapshots)) {
-      snapshot.time = summarizeTime(timeIndex, getDateRange2(key2, now).range, pf, opts.project, opts.exclude);
+      snapshot.time = summarizeTime(timeIndex, getDateRange2(key2, now).range, pf, opts.project, opts.exclude, activity);
     }
     const json = JSON.stringify({
       ...payload,
@@ -12250,20 +12362,23 @@ program.command("plan [action] [id]").description("Show or configure a subscript
 });
 program.command("time").description("AI running time, elapsed busy time and estimated interaction time since July 1, 2025").option("-p, --period <period>", "today, week, 30days, month, all", "all").option("--provider <provider>", "Filter by coding client", "all").option("--project <names...>", "Include projects by name").option("--exclude <names...>", "Exclude projects by name").option("--recover", "Advance one bounded historical recovery pass; safe to resume").option("--snapshots", "Return timing-only period snapshots for the menu bar").option("--format <format>", "text or json", "text").action(async (opts) => {
   const index = await refreshTimeIndex({ history: opts.recover === true });
+  const activity = readActivityHistory();
   if (opts.snapshots) {
     const now = /* @__PURE__ */ new Date();
     const ranges = Object.fromEntries(["today", "week", "30days", "month", "all"].map((key2) => [key2, getDateRange2(key2, now).range]));
-    console.log(JSON.stringify(buildTimeSnapshots(index, ranges, opts.provider, opts.project, opts.exclude)));
+    console.log(JSON.stringify(buildTimeSnapshots(index, ranges, opts.provider, opts.project, opts.exclude, activity)));
     return;
   }
-  const time = summarizeTime(index, getDateRange2(opts.period).range, opts.provider, opts.project, opts.exclude);
+  const time = summarizeTime(index, getDateRange2(opts.period).range, opts.provider, opts.project, opts.exclude, activity);
   if (opts.format === "json") console.log(JSON.stringify(time));
   else {
     console.log(`
   AI time \xB7 ${getDateRange2(opts.period).label}`);
     console.log(`  AI running:   ${formatDuration(time.aiRunningMs)} (added across agents)`);
     console.log(`  Elapsed busy: ${formatDuration(time.elapsedBusyMs)} (overlap counted once)`);
-    console.log(`  Your time:    ${formatDuration(time.userActiveMs)} (estimate)`);
+    if (time.sessionEstimate) console.log(`  Past sessions \u2248 ${formatDuration(time.sessionEstimate.milliseconds)} (10\u201330 min range: ${formatDuration(time.sessionEstimate.lowerMs)} \u2013 ${formatDuration(time.sessionEstimate.upperMs)})`);
+    if (time.appActivity) console.log(`  App activity: ${formatDuration(time.appActivity.activeMs + time.appActivity.contextualMs)} (${formatDuration(time.appActivity.contextualMs)} inferred terminal/editor context; tracking ${time.appActivity.enabled ? "on" : "off"})`);
+    console.log(`  Short reply gaps: ${formatDuration(time.userActiveMs)} (legacy interaction estimate)`);
     console.log(`  Partial history \xB7 ${time.indexedFiles} files \xB7 ${time.pendingFiles} awaiting recovery`);
     for (const row of time.providers) console.log(`  ${row.name}: ${formatDuration(row.aiRunningMs)} \xB7 ${row.timedFiles}/${row.files} files with timing in this period`);
     for (const note of time.notes) console.log(`  ${note}`);
@@ -12282,9 +12397,9 @@ program.command("compare").description("Compare two AI models side-by-side").opt
   await renderCompare(range, opts.provider);
 });
 program.command("agent-status").description("Diagnose exe-os agent data pipeline").action(() => {
-  const exeOsDir = join31(homedir17(), ".exe-os");
-  const statsPath = join31(exeOsDir, "agent-stats.json");
-  const pidPath = join31(exeOsDir, "exed.pid");
+  const exeOsDir = join32(homedir17(), ".exe-os");
+  const statsPath = join32(exeOsDir, "agent-stats.json");
+  const pidPath = join32(exeOsDir, "exed.pid");
   const dirExists = existsSync8(exeOsDir);
   const statsExists = dirExists && existsSync8(statsPath);
   const pidExists = dirExists && existsSync8(pidPath);
@@ -12319,7 +12434,7 @@ program.command("agent-status").description("Diagnose exe-os agent data pipeline
 var releaseScan;
 var stopParentWatch = watchMenubarParent(Number(process.env["EXE_WATCHER_PARENT_PID"]));
 program.hook("preAction", async (_root, command) => {
-  if (command.name() === "status" && !command.opts().cachedOnly) releaseScan = await acquireFileLock(join31(getCacheDir(), "scan.lock"));
+  if (command.name() === "status" && !command.opts().cachedOnly) releaseScan = await acquireFileLock(join32(getCacheDir(), "scan.lock"));
 });
 program.hook("postAction", async () => {
   await releaseScan?.();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "exe-watcher",
-  "version": "0.2.68",
-  "description": "The owl watching your AI coding spend — cost, tokens, agents, and projects in your terminal and menu bar",
+  "version": "0.2.70",
+  "description": "The owl watching your AI coding spend \u2014 cost, tokens, agents, and projects in your terminal and menu bar",
   "type": "module",
   "main": "./dist/cli.js",
   "bin": {