mixdog 0.9.166 → 0.9.167

package/src/standalone/usage-stats-period.mjs

@@ -1,6 +1,6 @@
 import { usageRollupDayKey } from '../runtime/shared/llm/usage-rollup.mjs';
 
-const VIEWS = new Set(['hour', 'day', 'week', 'month', 'all']);
+const VIEWS = new Set(['hour', '7d', 'day', 'week', 'month', 'year', 'all', 'custom']);
 
 function midnight(value) {
   const date = new Date(value);
@@ -20,65 +20,63 @@ function anchorDate(anchor, now) {
   return date;
 }
 
-function periodStart(date, view) {
-  const start = midnight(date);
-  if (view !== 'hour') start.setDate(1);
-  if (view === 'week') start.setMonth(Math.floor(start.getMonth() / 3) * 3);
-  if (view === 'month') start.setMonth(0);
-  return start;
-}
-
-function shiftMonths(date, count) {
+function shiftDays(date, count) {
   const shifted = new Date(date);
-  shifted.setMonth(shifted.getMonth() + count);
+  shifted.setDate(shifted.getDate() + count);
   return shifted;
 }
 
-function calendarCount(from, to) {
-  const cursor = midnight(from);
-  const end = midnight(to);
-  let count = 0;
-  while (cursor <= end) {
-    count++;
-    cursor.setDate(cursor.getDate() + 1);
-  }
-  return count;
+function calendarBounds(start, end, now, days) {
+  const toMs = Math.min(now, shiftDays(end, 1).getTime() - 1);
+  return { fromMs: start.getTime(), toMs, endMs: toMs,
+    startDay: usageRollupDayKey(start.getTime()), endDay: usageRollupDayKey(end.getTime()), days };
 }
 
 /**
- * One owner for calendar selection and navigation.
- * hour = today, day = a month, week = a calendar quarter, month = a year.
- * Display bounds include future slots; accounting bounds never exceed now.
+ * One owner for trailing ranges and navigation.
+ * hour = 24 elapsed hours; 7d/day/week/month = 7/30/90/365 local calendar dates.
+ * Calendar ranges include today. An anchor is the final included date.
+ * year groups retained history by year; all remains a legacy API alias.
+ * Display and accounting bounds both stop at the end of the selected range.
  */
-export function resolveUsageStatsPeriod({ view = 'hour', anchor, now = Date.now() } = {}) {
+export function resolveUsageStatsPeriod({ view = 'hour', anchor, startDay, endDay, now = Date.now() } = {}) {
   if (!VIEWS.has(view)) throw new TypeError('Unknown usage statistics view');
   if (!Number.isFinite(now) || now <= 0) throw new TypeError('Usage period requires a valid current time');
   const today = usageRollupDayKey(now);
-  if (view === 'all') {
+  if (view === 'year' || view === 'all') {
     return { view, anchor: null, fromMs: 0, toMs: now, startDay: null, endDay: today,
       days: null, previousAnchor: null, nextAnchor: null, isCurrent: true };
   }
-  const current = periodStart(now, view);
-  // Hourly history is deliberately not navigable.
-  const requested = view === 'hour' ? current : periodStart(anchorDate(anchor, now), view);
-  const start = requested > current ? current : requested;
-  const step = view === 'day' ? 1 : view === 'week' ? 3 : 12;
-  const next = view === 'hour' ? new Date(start) : shiftMonths(start, step);
-  if (view === 'hour') next.setDate(next.getDate() + 1);
-  const endMs = next.getTime() - 1;
-  const toMs = Math.min(now, endMs);
-  const previous = view === 'hour' ? null : shiftMonths(start, -step);
+  if (view === 'hour') {
+    const fromMs = now - 24 * 60 * 60 * 1000;
+    return { view, anchor: null, fromMs, toMs: now, endMs: now,
+      startDay: usageRollupDayKey(fromMs), endDay: today,
+      days: 1, previousAnchor: null, nextAnchor: null, isCurrent: true };
+  }
+  if (view === 'custom') {
+    if (startDay == null || endDay == null) throw new TypeError('Usage range requires a start and end date');
+    const start = anchorDate(startDay, now);
+    const end = anchorDate(endDay, now);
+    if (start > end) throw new RangeError('Usage range start must not follow its end');
+    if (end > midnight(now)) throw new RangeError('Usage range cannot include future dates');
+    const days = (Date.UTC(end.getFullYear(), end.getMonth(), end.getDate())
+      - Date.UTC(start.getFullYear(), start.getMonth(), start.getDate())) / 86400000 + 1;
+    return { view, anchor: null, ...calendarBounds(start, end, now, days),
+      previousAnchor: null, nextAnchor: null, isCurrent: endDay === today };
+  }
+  const current = midnight(now);
+  const requested = anchorDate(anchor, now);
+  const end = requested > current ? current : requested;
+  const days = view === '7d' ? 7 : view === 'day' ? 30 : view === 'week' ? 90 : 365;
+  const start = shiftDays(end, 1 - days);
+  const previous = shiftDays(start, -1);
+  const next = shiftDays(end, days);
   return {
     view,
-    anchor: usageRollupDayKey(start.getTime()),
-    fromMs: start.getTime(),
-    toMs,
-    endMs,
-    startDay: usageRollupDayKey(start.getTime()),
-    endDay: usageRollupDayKey(endMs),
-    days: view === 'hour' ? 0 : calendarCount(start, toMs),
-    previousAnchor: previous && previous.getFullYear() >= 1970 ? usageRollupDayKey(previous.getTime()) : null,
-    nextAnchor: view !== 'hour' && next <= current ? usageRollupDayKey(next.getTime()) : null,
-    isCurrent: start.getTime() === current.getTime(),
+    anchor: usageRollupDayKey(end.getTime()),
+    ...calendarBounds(start, end, now, days),
+    previousAnchor: previous.getFullYear() >= 1970 ? usageRollupDayKey(previous.getTime()) : null,
+    nextAnchor: end < current ? usageRollupDayKey(Math.min(next.getTime(), current.getTime())) : null,
+    isCurrent: end.getTime() === current.getTime(),
   };
 }

package/src/tui/app/use-transcript-window.mjs

@@ -27,6 +27,7 @@ import {
   transcriptHarvestInputsEqual,
 } from './transcript-window.mjs';
 import { shouldSuppressFullyFailedToolItem } from '../transcript-tool-failures.mjs';
+import { TUI_DEBUG } from '../session/transcript-spill.mjs';
 
 // ── Harvest circuit breaker ────────────────────────────────────────────────
 // The measured-height harvest is a deps-less layout effect: every
@@ -39,7 +40,6 @@ import { shouldSuppressFullyFailedToolItem } from '../transcript-tool-failures.m
 // the bump (the caches keep the latest heights, the next external render
 // consumes them) and trace the culprits for diagnosis.
 const HARVEST_BUMP_STREAK_LIMIT = 10;
-const TUI_DEBUG = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_TUI_DEBUG || ''));
 let harvestBreakerLogged = false;
 function traceHarvestBreaker(changedKeys) {
   // Always report the FIRST trip per process (one stderr line beats a crash);

package/src/tui/components/StatusLine.jsx

@@ -22,6 +22,7 @@ import { useSharedTick } from '../hooks/useSharedTick.mjs';
 // instant-local L2 can render the Shell segment itself instead of grafting it
 // out of the previous full line.
 import { shellJobsStatus } from '../../ui/statusline-segments.mjs';
+import { formatElapsed, num, terminalColumns } from '../../ui/statusline-format.mjs';
 
 // Loaded at RUNTIME (not bundled) so its vendored statusline-lib relative
 // imports resolve from the real src/ui location, not the dist/ bundle dir.
@@ -138,15 +139,6 @@ function statusColors() {
   };
 }
 
-function terminalColumns() {
-  const cols = Number(process.stdout?.columns);
-  return Number.isFinite(cols) && cols > 0 ? Math.floor(cols) : 120;
-}
-
-function localNum(value) {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : 0;
-}
 
 function localContextPct({
   provider = '',
@@ -198,27 +190,6 @@ function localL2SpinnerFrame(now = Date.now()) {
   return LOCAL_WORKER_SPINNER_FRAMES[index] || LOCAL_WORKER_SPINNER_FRAMES[0];
 }
 
-// Byte-identical replica of src/tui/time-format.mjs formatDuration() with
-// DEFAULT options (no mostSignificantOnly / hideTrailingZeros), wrapped to drop
-// sub-1s. Output shape: '' (<1s), `Xs`, `Xm Ys`, `Xh Ym Zs`, `Xd Yh Zm`. Mirrors
-// statusline.mjs formatElapsed so instant-local L2 elapsed matches full render.
-function localFormatElapsed(ms) {
-  if (!Number.isFinite(Number(ms))) return '';
-  const value = Math.max(0, Number(ms) || 0);
-  if (value < 60_000) {
-    if (value < 1_000) return '';
-    return `${Math.floor(value / 1000)}s`;
-  }
-  const days = Math.floor(value / 86_400_000);
-  const hours = Math.floor((value % 86_400_000) / 3_600_000);
-  const minutes = Math.floor((value % 3_600_000) / 60_000);
-  const seconds = Math.floor((value % 60_000) / 1000);
-  if (days > 0) return `${days}d ${hours}h ${minutes}m`;
-  if (hours > 0) return `${hours}h ${minutes}m ${seconds}s`;
-  if (minutes > 0) return `${minutes}m ${seconds}s`;
-  return `${seconds}s`;
-}
-
 function localRunningWorkerCount(agentWorkers = [], agentJobs = []) {
   const seen = new Set();
   for (const worker of Array.isArray(agentWorkers) ? agentWorkers : []) {
@@ -281,7 +252,7 @@ function localStatusLineL2({
   if (runningCount > 0) {
     const label = `Running ${runningCount} Agent${runningCount === 1 ? '' : 's'}`;
     const oldestStart = localOldestWorkerStartMs(agentWorkers, agentJobs);
-    const elapsed = oldestStart > 0 ? localFormatElapsed(now - oldestStart) : '';
+    const elapsed = oldestStart > 0 ? formatElapsed(now - oldestStart) : '';
     l2Parts.push(`${spin} ${STATUS}${label}${RESET}${elapsedSuffix(elapsed)}`);
   }
   // Session-scoped like the full path: one host process owns many sessions'
@@ -298,12 +269,12 @@ function localStatusLineL2({
   const tools = activeTools && typeof activeTools === 'object' ? activeTools : {};
   const exploreInfo = tools.explore || null;
   const searchInfo = tools.search || null;
-  if (exploreInfo && localNum(exploreInfo.count) > 0) {
-    const elapsed = localNum(exploreInfo.startedAt) > 0 ? localFormatElapsed(now - localNum(exploreInfo.startedAt)) : '';
+  if (exploreInfo && num(exploreInfo.count) > 0) {
+    const elapsed = num(exploreInfo.startedAt) > 0 ? formatElapsed(now - num(exploreInfo.startedAt)) : '';
     l2Parts.push(`${spin} ${STATUS}Exploring${RESET}${elapsedSuffix(elapsed)}`);
   }
-  if (searchInfo && localNum(searchInfo.count) > 0) {
-    const elapsed = localNum(searchInfo.startedAt) > 0 ? localFormatElapsed(now - localNum(searchInfo.startedAt)) : '';
+  if (searchInfo && num(searchInfo.count) > 0) {
+    const elapsed = num(searchInfo.startedAt) > 0 ? formatElapsed(now - num(searchInfo.startedAt)) : '';
     l2Parts.push(`${spin} ${STATUS}Web Searching${RESET}${elapsedSuffix(elapsed)}`);
   }
   return l2Parts.length ? l2Parts.join(segSep) : '';
@@ -416,13 +387,13 @@ function StatusLineView({ sessionId, clientHostPid, provider, model, effort, fas
     : '';
   const statsForSignature = stats && typeof stats === 'object' ? stats : {};
   const statsSignature = [
-    localNum(statsForSignature.currentContextTokens),
-    localNum(statsForSignature.currentEstimatedContextTokens),
-    localNum(statsForSignature.inputTokens),
-    localNum(statsForSignature.latestInputTokens),
-    localNum(statsForSignature.promptTokens),
-    localNum(statsForSignature.turns),
-    localNum(statsForSignature.contextTokens),
+    num(statsForSignature.currentContextTokens),
+    num(statsForSignature.currentEstimatedContextTokens),
+    num(statsForSignature.inputTokens),
+    num(statsForSignature.latestInputTokens),
+    num(statsForSignature.promptTokens),
+    num(statsForSignature.turns),
+    num(statsForSignature.contextTokens),
     String(statsForSignature.currentContextSource || ''),
   ].join('|');
   const refreshMs = hasActiveStatuslineWork(line, agentWorkers, agentJobs, activeTools) ? STATUSLINE_ACTIVE_REFRESH_MS : STATUSLINE_REFRESH_MS;