@drakulavich/oura-cli 0.7.0 → 0.7.1

package/CHANGELOG.md

@@ -6,6 +6,17 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.7.1] - 2026-09-12
+
+### Fixed
+- Whether a day's activity totals are final is now read off the day itself. Oura's `class_5_min` carries one character per five-minute slot, so a day reporting a full 288 of them has been closed out; `sync` stores the length in a new `daily_activity.class_5_min_slots` column and `report` reads it. The converse does not hold, and the rule does not claim it: a count *below* 288 is not evidence a day is still open. A day's span is `timestamp(d+1) − timestamp(d)`, so travelling east shortens it — 2023-12-15 came back with 276 slots and 13,637 steps, 2024-01-13 with 270 and 15,736, both closed long ago — while 288 also comes back for 23-hour days and caps longer ones. So the slot count is read as positive evidence of closure only, and a day short of 288 falls back to the old next-day rule rather than being called open. The old rule inferred it instead — a day counted as complete once a *later* day had its own record — which described the ring's behaviour rather than the day, and came apart wherever the two did: a ring that stopped uploading froze its last day as "still accumulating" forever, keeping real steps out of every average; a report timezone west of the ring's discarded a day the cache had already closed; and `completeThrough` could name a day holding no activity record at all, promising an average over a day the table never printed. Rows written before the column exists keep NULL and take the same fallback, so an upgraded cache fills in as `sync` re-fetches each day — `sync --from` fills older days on demand. Because the slot count can only ever close a day and never reopen one, upgrading never makes a day with an activity record *less* complete than it already was: over a real 1,044-day cache the two rules together name exactly the days the old rule named. (#74)
+- `db trends`, `db stats` and `db week` now use that same judgement, so the screens stop disagreeing about one week (the all-time averages in `db stats` move by a few steps for the same reason: the day in progress no longer counts). `db trends` averaged the day in progress as though it were whole while `report` excluded it, and `db week` showed its part-day steps unmarked: the same seven days gave a 7,610 step average in one place and 6,639 in another. Activity, steps and active calories now stop at the last complete day in the window; sleep and readiness are final once they exist and still cover all of it. The week table marks the day with `*` and `DaySummary` carries `partial`, matching what `report` has always shown. (#75)
+- `sync` no longer aborts on a heart-rate sample without a `timestamp`. The `day` column is derived from it, so a null threw a `TypeError` at insert time, outside the CLI's error mapping, and every collection after `hr` in the run never synced. A row whose identity field is missing, null, empty, or not the type the column stores is now dropped before insert, counted in the JSON under `dropped` and named on the collection's line (`1 dropped (no timestamp/source)`); the row was unusable anyway, since those columns are what it would have been stored under. A row is judged by the columns its table keys on, not by the manifest's identity fields: a daily summary Oura sends without an `id` is still stored under its `day`. (#106)
+- An empty `200` from a snapshot endpoint no longer clears its table. `ring` is fetched whole every run and was replaced with whatever came back, so a partial read or an upstream hiccup deleted every ring and the JSON showed nothing in `removed`. The snapshot path now follows the rule the ranged collections already had: an empty answer describes nothing, so the rows are kept and reported under `refused` with the `--prune=ring` hint; a ring genuinely gone from the account is applied with that flag. Rings a non-empty response no longer lists are counted in `removed`, as they always should have been. (#105)
+- `db trends` and `db stats` say what is missing on an empty cache instead of printing a header over nothing, or seventeen lines of `0 rows`. Both now carry the same "run `oura-cli sync`, then this command again" line that `db today` and `db week` already print. (#85)
+- `report --period month` chunks its week buckets from the newest day back, so the remainder of a 30-day window is the oldest row and is labelled with its size (`2026-08-13 (2 days)`), not an unlabelled stub at the bottom that read as activity collapsing by 85 %. The `*` note names the bucket it marks (`the week of …`) instead of saying "today" above a table with no day rows. (#84)
+- The `describe` and `manifest` snapshots now cover the real command registry. The old snapshot was built from a hand-listed fixture that did not include `sync`, so #103 added `--prune` to a published contract and no test moved. The registry lives in `src/commands/registry.ts`, the contract test asserts it matches the argv normalizer's command set, and the fixture-based tests stay as they were, since a controlled input is what they need. (#104)
+
 ## [0.7.0] - 2026-09-09
 
 ### Added

package/README.md

@@ -96,7 +96,7 @@ oura-cli report                   # weekly (default)
 oura-cli report --period month    # 30-day window with weekly buckets
 ```
 
-Reports cover daily scores, averages, deltas vs the previous window, sleep details, and a short recommendation block. A day whose activity is still accumulating (today, or the last day before the ring stopped syncing) is shown with a `*` and kept out of the activity averages and recommendations; the JSON says so via `days[].partial` and `completeThrough`.
+Reports cover daily scores, averages, deltas vs the previous window, sleep details, and a short recommendation block. A day whose activity is still accumulating — normally just today — is shown with a `*` and kept out of the activity averages and recommendations; the JSON says so via `days[].partial` and `completeThrough`. `db today`, `db date` and `db week` carry the same `partial` flag, and `db week` marks the day with a `*` too, so the two screens cannot disagree. A day is treated as closed once Oura reports a full 24 hours of five-minute activity slots for it, so a ring that stops syncing no longer freezes its last day as unfinished.
 
 ### Trends and stats
 

package/dist/index.js

@@ -1407,6 +1407,12 @@ CREATE TABLE IF NOT EXISTS ring_battery_level (
 CREATE UNIQUE INDEX IF NOT EXISTS idx_ring_battery_level_unique ON ring_battery_level(timestamp);
 CREATE INDEX IF NOT EXISTS idx_ring_battery_level_day ON ring_battery_level(day);
     `
+  },
+  {
+    version: 4,
+    sql: `
+ALTER TABLE daily_activity ADD COLUMN class_5_min_slots INTEGER;
+    `
   }
 ];
 
@@ -2013,7 +2019,8 @@ var activity = defineCollection({
     { name: "total_calories", type: "INTEGER", pick: (r) => r.total_calories },
     { name: "target_calories", type: "INTEGER", pick: (r) => r.target_calories },
     { name: "contributors", type: "TEXT", pick: (r) => JSON.stringify(r.contributors) },
-    { name: "timestamp", type: "TEXT", pick: (r) => r.timestamp }
+    { name: "timestamp", type: "TEXT", pick: (r) => r.timestamp },
+    { name: "class_5_min_slots", type: "INTEGER", pick: (r) => r.class_5_min?.length ?? null }
   ]
 });
 
@@ -2385,6 +2392,24 @@ function insertSql(c) {
 function rowValues(c, row) {
   return c.columns.map((col) => col.pick(row));
 }
+function identityColumns(c) {
+  const unique = c.columns.filter((col) => col.unique).map((col) => col.name);
+  if (unique.length > 0)
+    return unique;
+  const pk = c.columns.filter((col) => col.pk).map((col) => col.name);
+  if (pk.length > 0)
+    return pk;
+  return (c.indexes ?? []).find((i) => i.unique)?.columns ?? [];
+}
+function hasIdentity(c, row) {
+  if (row == null || typeof row !== "object")
+    return false;
+  return identityColumns(c).every((name) => {
+    const col = c.columns.find((k) => k.name === name);
+    const v = col?.pick(row);
+    return col?.type === "TEXT" ? typeof v === "string" && v !== "" : typeof v === "number" && Number.isFinite(v);
+  });
+}
 var MS_PER_DAY = 86400000;
 function dateQueries(start, end, maxDays, offset) {
   const query = (s, e) => ({ start_date: shiftDay(s, offset[0]), end_date: shiftDay(e, offset[1]) });
@@ -2525,15 +2550,6 @@ function describeCommand(version, getCommands) {
 }
 
 // src/db/reconcile.ts
-function identityColumns(c) {
-  const unique = c.columns.filter((col) => col.unique).map((col) => col.name);
-  if (unique.length > 0)
-    return unique;
-  const pk = c.columns.filter((col) => col.pk).map((col) => col.name);
-  if (pk.length > 0)
-    return pk;
-  return (c.indexes ?? []).find((i) => i.unique)?.columns ?? [];
-}
 var MAX_REMOVED_SHARE = 0.5;
 var ALWAYS_SAFE_TO_REMOVE = 5;
 var KEY_SEPARATOR = "\x00";
@@ -2655,12 +2671,18 @@ async function importDaily(db, client, clock, log, window = {}, options = {}) {
   const fetched = {};
   const added = {};
   const removed = {};
+  const dropped = {};
   const refused = {};
   const pruned = {};
   const mayPrune = (name) => options.prune === "all" || (options.prune?.includes(name) ?? false);
   for (const { c, start } of plan) {
-    const pieces = await fetchCollectionByPiece(client, c, start, end, tz);
+    const returned = await fetchCollectionByPiece(client, c, start, end, tz);
+    const pieces = returned.map((piece) => piece.filter((r) => hasIdentity(c, r)));
     const rows = pieces.flat();
+    const missing = returned.flat().length - rows.length;
+    if (missing > 0)
+      dropped[c.table] = missing;
+    const droppedTail = missing > 0 ? `, ${missing} dropped (no ${identityColumns(c).join("/")})` : "";
     const stmt = db.query(insertSql(c));
     if (c.rangeParams === "none") {
       const pk = c.columns.find((col) => col.pk)?.name;
@@ -2668,14 +2690,28 @@ async function importDaily(db, client, clock, log, window = {}, options = {}) {
         throw new Error(`Snapshot collection ${c.name} must declare a primary-key column (enforced by the registry tests).`);
       const ids = () => new Set(db.query(`SELECT ${pk} AS id FROM ${c.table}`).all().map((r) => r.id));
       const known = ids();
-      db.transaction((rs) => {
-        db.exec(`DELETE FROM ${c.table}`);
-        for (const r of rs)
-          stmt.run(...rowValues(c, r));
-      })(rows);
-      fetched[c.table] = rows.length;
-      added[c.table] = [...ids()].filter((id) => !known.has(id)).length;
-      _log(`  + ${c.name} (${c.table}): ${rows.length} fetched, ${added[c.table]} new${rows.length === 0 ? ", table cleared" : ""}`);
+      const unstorable = rows.length === 0 && missing > 0;
+      const refuse = rows.length === 0 && known.size > 0 && (unstorable || !mayPrune(c.name));
+      if (!refuse) {
+        db.transaction((rs) => {
+          db.exec(`DELETE FROM ${c.table}`);
+          for (const r of rs)
+            stmt.run(...rowValues(c, r));
+        })(rows);
+      }
+      const now = ids();
+      const gone = [...known].filter((id) => !now.has(id)).length;
+      fetched[c.table] = rows.length + missing;
+      added[c.table] = [...now].filter((id) => !known.has(id)).length;
+      if (gone > 0)
+        removed[c.table] = gone;
+      if (refuse && !unstorable)
+        refused[c.table] = { rows: known.size, collection: c.name };
+      else if (rows.length === 0 && gone > 0)
+        pruned[c.table] = { rows: gone, collection: c.name };
+      const tail = gone > 0 ? `, ${gone} stale removed${pruned[c.table] ? " (past the truncation guard)" : ""}` : "";
+      const kept = !refuse ? "" : unstorable ? `, ${known.size} rows kept: the response held no storable rows` : `, ${known.size} rows kept that the API did not return \u2014 an empty answer describes nothing; re-run with --prune=${c.name} to apply it`;
+      _log(`  + ${c.name} (${c.table}): ${fetched[c.table]} fetched, ${added[c.table]} new${droppedTail}${tail}${kept}`);
       continue;
     }
     const { windowPlan, gone } = db.transaction((ps) => {
@@ -2685,7 +2721,7 @@ async function importDaily(db, client, clock, log, window = {}, options = {}) {
           stmt.run(...rowValues(c, r));
       return { windowPlan, gone: applyWindowPlan(db, c, windowPlan) };
     }).immediate(pieces);
-    fetched[c.table] = rows.length;
+    fetched[c.table] = rows.length + missing;
     added[c.table] = windowPlan.added;
     if (gone > 0)
       removed[c.table] = gone;
@@ -2695,7 +2731,7 @@ async function importDaily(db, client, clock, log, window = {}, options = {}) {
       pruned[c.table] = { rows: windowPlan.bypassed, collection: c.name };
     const tail = gone > 0 ? `, ${gone} stale removed${windowPlan.bypassed > 0 ? ` (${windowPlan.bypassed} past the truncation guard)` : ""}` : "";
     const kept = windowPlan.refused > 0 ? `, ${windowPlan.refused} rows kept that the API did not return \u2014 too many to drop on one response; re-run with --prune=${c.name} to apply them` : "";
-    _log(`  + ${c.name} (${c.table}): ${rows.length} fetched, ${added[c.table]} new${tail}${kept}`);
+    _log(`  + ${c.name} (${c.table}): ${fetched[c.table]} fetched, ${added[c.table]} new${droppedTail}${tail}${kept}`);
   }
   _log("Import complete.");
   return {
@@ -2704,6 +2740,7 @@ async function importDaily(db, client, clock, log, window = {}, options = {}) {
     fetched,
     added,
     removed,
+    dropped,
     refused,
     pruned,
     isFirstSync,
@@ -2711,8 +2748,28 @@ async function importDaily(db, client, clock, log, window = {}, options = {}) {
   };
 }
 
+// src/db/day-complete.ts
+var SLOTS_PER_DAY = 288;
+function dayCompleteness(db, today) {
+  const rows = db.query("SELECT day, class_5_min_slots AS slots FROM daily_activity").all();
+  const slotsByDay = new Map(rows.map((r) => [r.day, r.slots]));
+  const daysDesc = rows.map((r) => r.day).sort().reverse();
+  const newestDay = daysDesc[0] ?? null;
+  const isComplete = (day) => {
+    if (!slotsByDay.has(day))
+      return false;
+    if ((slotsByDay.get(day) ?? 0) >= SLOTS_PER_DAY)
+      return true;
+    return day < today && newestDay !== null && newestDay > day;
+  };
+  return {
+    isComplete,
+    completeThrough: (start, end) => daysDesc.find((d) => d >= start && d <= end && isComplete(d)) ?? null
+  };
+}
+
 // src/db/queries.ts
-function getDaySummary(db, day) {
+function getDaySummary(db, day, complete) {
   const sl = db.query("SELECT score FROM daily_sleep WHERE day=?").get(day);
   const rd = db.query("SELECT score, temperature_deviation FROM daily_readiness WHERE day=?").get(day);
   const ac = db.query("SELECT score, steps FROM daily_activity WHERE day=?").get(day);
@@ -2721,6 +2778,7 @@ function getDaySummary(db, day) {
   const sm = db.query(`SELECT total_sleep_duration, deep_sleep_duration, rem_sleep_duration, average_hrv, lowest_heart_rate, efficiency FROM sleep_model WHERE day=? AND type='long_sleep'`).get(day);
   return {
     day,
+    partial: ac != null && !complete.isComplete(day),
     sleep_score: sl?.score ?? null,
     readiness_score: rd?.score ?? null,
     activity_score: ac?.score ?? null,
@@ -2739,15 +2797,17 @@ function getDaySummary(db, day) {
 function getTrends(db, days, today) {
   const start = shiftDay(today, -(days - 1));
   const results = [];
+  const activityEnd = dayCompleteness(db, today).completeThrough(start, today) ?? shiftDay(start, -1);
   const metrics = [
-    ["Sleep Score", "daily_sleep", "score"],
-    ["Readiness", "daily_readiness", "score"],
-    ["Activity", "daily_activity", "score"],
-    ["Steps", "daily_activity", "steps"],
-    ["Active Cal", "daily_activity", "active_calories"]
+    ["Sleep Score", "daily_sleep", "score", false],
+    ["Readiness", "daily_readiness", "score", false],
+    ["Activity", "daily_activity", "score", true],
+    ["Steps", "daily_activity", "steps", true],
+    ["Active Cal", "daily_activity", "active_calories", true]
   ];
-  for (const [label, table, col] of metrics) {
-    const row = db.query(`SELECT AVG(${col}) as avg, MIN(${col}) as min, MAX(${col}) as max, COUNT(${col}) as count FROM ${table} WHERE day BETWEEN ? AND ?`).get(start, today);
+  for (const [label, table, col, accumulates] of metrics) {
+    const end = accumulates ? activityEnd : today;
+    const row = db.query(`SELECT AVG(${col}) as avg, MIN(${col}) as min, MAX(${col}) as max, COUNT(${col}) as count FROM ${table} WHERE day BETWEEN ? AND ?`).get(start, end);
     if (row.count > 0 && row.avg !== null) {
       results.push({ label, avg: +row.avg.toFixed(0), min: row.min, max: row.max, count: row.count });
     }
@@ -2898,12 +2958,13 @@ function formatWeekTable(days, format, emptyHint) {
   }
   const header = `${"Day".padEnd(12)} ${"Sleep".padStart(6)} ${"Ready".padStart(6)} ${"Activity".padStart(9)} ${"Steps".padStart(7)} ${"Stress".padEnd(10)}`;
   const sep = source_default.gray("\u2500".repeat(56));
-  const rows = days.map((d) => `${padRight(d.day, 12)} ${padLeft(scoreColor(d.sleep_score), 6)} ${padLeft(scoreColor(d.readiness_score), 6)} ` + `${padLeft(scoreColor(d.activity_score), 9)} ${padLeft(String(d.steps ?? "\u2014"), 7)} ${padRight(d.stress ?? "\u2014", 10)}`);
+  const rows = days.map((d) => `${padRight(d.partial ? `${d.day}*` : d.day, 12)} ${padLeft(scoreColor(d.sleep_score), 6)} ${padLeft(scoreColor(d.readiness_score), 6)} ` + `${padLeft(scoreColor(d.activity_score), 9)} ${padLeft(String(d.steps ?? "\u2014"), 7)} ${padRight(d.stress ?? "\u2014", 10)}`);
+  const note = days.some((d) => d.partial) ? ["  * still accumulating; its activity totals are not final."] : [];
   return [`
-  Last 7 Days`, sep, `  ${header}`, sep, ...rows.map((r) => `  ${r}`)].join(`
+  Last 7 Days`, sep, `  ${header}`, sep, ...rows.map((r) => `  ${r}`), ...note].join(`
 `);
 }
-function formatTrends(trends, days, format) {
+function formatTrends(trends, days, format, emptyHint) {
   if (format === "json")
     return JSON.stringify(trends, null, 2);
   const lines = [
@@ -2911,13 +2972,15 @@ function formatTrends(trends, days, format) {
     source_default.bold(`  Trends: last ${days} days`),
     source_default.gray("\u2500".repeat(50))
   ];
+  if (emptyHint && trends.length === 0)
+    lines.push(`  No Oura data for the last ${days} days yet.`, `  ${emptyHint}`);
   for (const t of trends) {
     lines.push(`  ${t.label.padEnd(15)} avg: ${String(t.avg).padStart(5)}  min: ${String(t.min).padStart(5)}  max: ${String(t.max).padStart(5)}  (${t.count} days)`);
   }
   return lines.join(`
 `);
 }
-function formatStats(stats, format) {
+function formatStats(stats, format, emptyHint) {
   if (format === "json")
     return JSON.stringify(stats, null, 2);
   const lines = [
@@ -2925,6 +2988,10 @@ function formatStats(stats, format) {
     source_default.bold("  Database Statistics"),
     source_default.gray("\u2550".repeat(50))
   ];
+  if (emptyHint && stats.tables.every((t) => t.rows === 0)) {
+    return [...lines, "  No Oura data in the database yet.", `  ${emptyHint}`].join(`
+`);
+  }
   for (const t of stats.tables) {
     lines.push(`  ${t.table.padEnd(22)} ${String(t.rows).padStart(8)} rows`);
   }
@@ -2984,7 +3051,7 @@ async function runSync(ctx, window = {}, options = {}) {
   const lines = [];
   const log = ctx.format === "table" ? (m) => lines.push(m) : undefined;
   const importResult = await importDaily(ctx.db, ctx.client, { today: ctx.today, tz: ctx.tz }, log, window, options);
-  const today = getDaySummary(ctx.db, ctx.today);
+  const today = getDaySummary(ctx.db, ctx.today, dayCompleteness(ctx.db, ctx.today));
   return {
     json: { import: importResult, today },
     text: () => [...lines, formatImportSummary(importResult), formatDaySummary(today, "table")].join(`
@@ -3013,7 +3080,7 @@ var dbCommand = defineCommand({
       meta: { name: "today", description: "Today's summary from local database" },
       needs: { db: true },
       run(ctx) {
-        const summary = getDaySummary(ctx.db, ctx.today);
+        const summary = getDaySummary(ctx.db, ctx.today, dayCompleteness(ctx.db, ctx.today));
         return { json: summary, text: () => formatDaySummary(summary, "table", SYNC_HINT) };
       }
     }),
@@ -3023,7 +3090,7 @@ var dbCommand = defineCommand({
       needs: { db: true },
       run(ctx, args) {
         const day = assertCalendarDate(String(args.day), "<day>");
-        const summary = getDaySummary(ctx.db, day);
+        const summary = getDaySummary(ctx.db, day, dayCompleteness(ctx.db, ctx.today));
         return { json: summary, text: () => formatDaySummary(summary, "table") };
       }
     }),
@@ -3031,7 +3098,8 @@ var dbCommand = defineCommand({
       meta: { name: "week", description: "Last 7 days from local database" },
       needs: { db: true },
       run(ctx) {
-        const days = daysBack(ctx.today, 7).map((d) => getDaySummary(ctx.db, d));
+        const complete = dayCompleteness(ctx.db, ctx.today);
+        const days = daysBack(ctx.today, 7).map((d) => getDaySummary(ctx.db, d, complete));
         return { json: days, text: () => formatWeekTable(days, "table", "Run `oura-cli sync`, then `oura-cli db week` again.") };
       }
     }),
@@ -3042,7 +3110,7 @@ var dbCommand = defineCommand({
       run(ctx, args) {
         const n = args.days === undefined ? 30 : assertPositiveInt(String(args.days), "<days>");
         const trends = getTrends(ctx.db, n, ctx.today);
-        return { json: trends, text: () => formatTrends(trends, n, "table") };
+        return { json: trends, text: () => formatTrends(trends, n, "table", "Run `oura-cli sync`, then `oura-cli db trends` again.") };
       }
     }),
     stats: dataCommand({
@@ -3050,7 +3118,7 @@ var dbCommand = defineCommand({
       needs: { db: true },
       run(ctx) {
         const stats = getStats(ctx.db, ctx.today);
-        return { json: stats, text: () => formatStats(stats, "table") };
+        return { json: stats, text: () => formatStats(stats, "table", "Run `oura-cli sync`, then `oura-cli db stats` again.") };
       }
     })
   }
@@ -3073,9 +3141,8 @@ function getReport(db, days, today) {
   const prevWeekStart = shiftDay(today, -(days * 2 - 1));
   const windowDays = daysBack(today, days);
   const lastUpload = db.query("SELECT MAX(timestamp) AS t FROM heartrate").get().t;
-  const newestActivityDay = db.query("SELECT MAX(day) AS d FROM daily_activity").get().d;
-  const isComplete = (d) => d < today && newestActivityDay !== null && newestActivityDay > d;
-  const completeThrough = [...windowDays].reverse().find(isComplete) ?? null;
+  const complete = dayCompleteness(db, today);
+  const completeThrough = complete.completeThrough(weekStart, today);
   const activityEnd = completeThrough ?? shiftDay(weekStart, -1);
   const dailyRows = [];
   for (const d of windowDays) {
@@ -3089,7 +3156,7 @@ function getReport(db, days, today) {
       readiness: rd?.score ?? null,
       activity: ac?.score ?? null,
       steps: ac?.steps ?? null,
-      partial: ac != null && !isComplete(d)
+      partial: ac != null && !complete.isComplete(d)
     });
   }
   const metrics = [
@@ -3190,8 +3257,8 @@ var RECOMMENDATIONS = {
 };
 function bucketDaysIntoWeeks(days) {
   const buckets = [];
-  for (let i = 0;i < days.length; i += 7) {
-    const chunk = days.slice(i, i + 7);
+  for (let end = days.length;end > 0; end -= 7) {
+    const chunk = days.slice(Math.max(0, end - 7), end);
     const weekOf = chunk[0].day;
     const sleepVals = chunk.map((d) => d.sleep).filter((v) => v !== null);
     const readinessVals = chunk.map((d) => d.readiness).filter((v) => v !== null);
@@ -3199,6 +3266,7 @@ function bucketDaysIntoWeeks(days) {
     const stepsVals = chunk.map((d) => d.steps).filter((v) => v !== null);
     buckets.push({
       weekOf,
+      days: chunk.length,
       avgSleep: sleepVals.length > 0 ? sleepVals.reduce((a, b) => a + b, 0) / sleepVals.length : null,
       avgReadiness: readinessVals.length > 0 ? readinessVals.reduce((a, b) => a + b, 0) / readinessVals.length : null,
       avgActivity: activityVals.length > 0 ? activityVals.reduce((a, b) => a + b, 0) / activityVals.length : null,
@@ -3206,13 +3274,17 @@ function bucketDaysIntoWeeks(days) {
       partial: chunk.some((d) => d.partial)
     });
   }
-  return buckets;
+  return buckets.reverse();
 }
-function partialDayNote(data) {
+function bucketLabel(b) {
+  const stub = b.days < 7 ? ` (${b.days} day${b.days === 1 ? "" : "s"})` : "";
+  return `${b.weekOf}${stub}${b.partial ? "*" : ""}`;
+}
+function partialDayNote(data, bucket) {
   const partial = data.days.find((d) => d.partial);
   if (!partial)
     return null;
-  const which = partial.day === data.weekEnd ? "today" : partial.dayLabel;
+  const which = bucket ? `the week of ${bucket.weekOf}` : partial.day === data.weekEnd ? "today" : partial.dayLabel;
   const covers = data.completeThrough ? `through ${data.completeThrough}` : "no complete day yet";
   return `  * ${which} is still accumulating; activity averages cover ${covers}.`;
 }
@@ -3227,7 +3299,8 @@ function formatReport(data, format, period) {
     lines.push(source_default.bold("  Oura Monthly Report"));
   }
   lines.push(source_default.gray(`  ${data.weekStart} \u2014 ${data.weekEnd}`));
-  const note = partialDayNote(data);
+  const buckets = period === "month" ? bucketDaysIntoWeeks(data.days) : [];
+  const note = partialDayNote(data, buckets.find((b) => b.partial));
   if (note)
     lines.push(source_default.yellow(note));
   lines.push("");
@@ -3249,16 +3322,15 @@ function formatReport(data, format, period) {
     }
     lines.push("");
   } else {
-    const buckets = bucketDaysIntoWeeks(data.days);
     lines.push(source_default.bold("  Last 30 Days:"));
-    lines.push(source_default.gray("  " + "\u2500".repeat(60)));
-    lines.push(`  ${"Week of".padEnd(12)} ${"Sleep".padStart(6)} ${"Ready".padStart(6)} ${"Active".padStart(7)} ${"Steps".padStart(10)}`);
-    lines.push(source_default.gray("  " + "\u2500".repeat(60)));
+    lines.push(source_default.gray("  " + "\u2500".repeat(69)));
+    lines.push(`  ${"Week of".padEnd(21)} ${"Sleep".padStart(6)} ${"Ready".padStart(6)} ${"Active".padStart(7)} ${"Steps".padStart(10)}`);
+    lines.push(source_default.gray("  " + "\u2500".repeat(69)));
     for (const b of buckets) {
       const avgSleepInt = b.avgSleep !== null ? Math.round(b.avgSleep) : null;
       const avgReadyInt = b.avgReadiness !== null ? Math.round(b.avgReadiness) : null;
       const avgActiveInt = b.avgActivity !== null ? Math.round(b.avgActivity) : null;
-      lines.push(`  ${(b.partial ? b.weekOf + "*" : b.weekOf).padEnd(12)} ${scoreCell(avgSleepInt, 6)} ${scoreCell(avgReadyInt, 6)} ${scoreCell(avgActiveInt, 7)} ${stepsCell(b.totalSteps, 10)}`);
+      lines.push(`  ${bucketLabel(b).padEnd(21)} ${scoreCell(avgSleepInt, 6)} ${scoreCell(avgReadyInt, 6)} ${scoreCell(avgActiveInt, 7)} ${stepsCell(b.totalSteps, 10)}`);
     }
     lines.push("");
   }
@@ -3588,6 +3660,22 @@ var fetchCommand = dataCommand({
   }
 });
 
+// src/commands/registry.ts
+function buildRegistry(version) {
+  const subCommands = Object.assign(Object.create(null), {
+    login: loginCommand,
+    describe: describeCommand(version, () => subCommands),
+    healthcheck: healthcheckCommand(version),
+    doctor: doctorCommand,
+    manifest: manifestCommand(version, () => subCommands),
+    fetch: fetchCommand,
+    sync: syncCommand,
+    db: dbCommand,
+    report: reportCommand
+  });
+  return subCommands;
+}
+
 // src/lib/citty-error.ts
 var ANSI2 = /\u001b\[[0-9;]*m/g;
 var COMMAND_NAME = /^[a-z][a-z0-9-]{0,19}$/;
@@ -3649,17 +3737,7 @@ function fromCittyError(err, removedCommandHints = {}, rawArgs = []) {
 
 // src/index.ts
 var VERSION = JSON.parse(readFileSync2(new URL("../package.json", import.meta.url), "utf-8")).version;
-var subCommands = Object.assign(Object.create(null), {
-  login: loginCommand,
-  describe: describeCommand(VERSION, () => subCommands),
-  healthcheck: healthcheckCommand(VERSION),
-  doctor: doctorCommand,
-  manifest: manifestCommand(VERSION, () => subCommands),
-  fetch: fetchCommand,
-  sync: syncCommand,
-  db: dbCommand,
-  report: reportCommand
-});
+var subCommands = buildRegistry(VERSION);
 var FETCH_HINT = "The per-collection commands were replaced in 0.5.0 by `oura-cli fetch <collection>`, e.g. `oura-cli fetch sleep --day 2026-09-01`. Run `oura-cli fetch --help`.";
 var REMOVED_COMMANDS = {
   reset: "`db reset` was removed in 0.5.0; delete the database file (`--db` / OURA_DB_PATH) and run `oura-cli sync` to rebuild it.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drakulavich/oura-cli",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Oura Ring CLI — query and analyze Oura Ring health data from the command line, designed for humans and AI agents.",
   "keywords": [
     "oura",