@drakulavich/oura-cli 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -6,6 +6,30 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.3.0] - 2026-05-13
+
+### Changed (CLI surface)
+- `oura-cli report weekly` is now `oura-cli report --period week` (default).
+  `--period month` adds a 30-day report with weekly-bucket display.
+  (#1, item 9). The old `weekly` subcommand is removed.
+- `oura-cli db import` is now an alias of `oura-cli sync` — both run the same
+  handler. (#1, item 8)
+- Empty `200` response from the Oura API now throws `CliError('API_ERROR',
+  'Empty response body from Oura API.')` instead of a raw JSON parse error.
+
+### Added
+- AJV-based test coverage for every `docs/schemas/*.json` file: validates
+  JSON syntax, compiles against JSON Schema 2020-12, and asserts the
+  describe-manifest shape against `describe.json`. (#1, item 10)
+- Fixture-based tests for `OuraClient.fetch` error paths (401, 403, 429, 500,
+  empty body, Bearer redaction). (#1, item 11)
+
+### Renamed (internal API)
+- `getWeeklyReport(db)` → `getReport(db, days)` in `src/db/report.ts`.
+- `formatWeeklyReport(data, format)` → `formatReport(data, format, period)` in
+  `src/format-report.ts`.
+- Type `WeeklyReportData` → `ReportData`.
+
 ## [0.2.1] - 2026-05-13
 
 ### Added
@@ -97,6 +121,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Local SQLite cache at `~/.oura-cli/oura.db`.
 - Auth via `oura-cli login`, `OURA_TOKEN`, `OURA_TOKEN_PATH`, or `~/.oura-token`.
 
+[0.3.0]: https://github.com/drakulavich/oura-cli/releases/tag/v0.3.0
 [0.2.1]: https://github.com/drakulavich/oura-cli/releases/tag/v0.2.1
 [0.2.0]: https://github.com/drakulavich/oura-cli/releases/tag/v0.2.0
 [0.1.3]: https://github.com/drakulavich/oura-cli/releases/tag/v0.1.3

package/dist/index.js

@@ -2722,7 +2722,12 @@ class OuraClient {
       }
       throw new CliError("API_ERROR", `Oura API ${response.status}: ${body}`);
     }
-    const json = await response.json();
+    let json;
+    try {
+      json = await response.json();
+    } catch {
+      throw new CliError("API_ERROR", "Empty response body from Oura API.");
+    }
     return json.data ?? [];
   }
 }
@@ -2809,8 +2814,8 @@ function createApiCommand(name, description, endpoint) {
 }
 
 // src/commands/db.ts
-import { mkdirSync as mkdirSync2, unlinkSync } from "fs";
-import { dirname } from "path";
+import { mkdirSync as mkdirSync3, unlinkSync } from "fs";
+import { dirname as dirname2 } from "path";
 
 // src/lib/db.ts
 import { Database } from "bun:sqlite";
@@ -2999,89 +3004,6 @@ function ensureSchema2(db) {
   ensureSchema(db, MIGRATIONS);
 }
 
-// src/db/import.ts
-async function importDaily(db, client, log) {
-  const _log = log ?? (() => {});
-  const today = new Date().toISOString().slice(0, 10);
-  const lastDates = [];
-  for (const tbl of ["daily_sleep", "daily_readiness", "daily_activity"]) {
-    const row = db.query(`SELECT MAX(day) as d FROM ${tbl}`).get();
-    if (row?.d)
-      lastDates.push(row.d);
-  }
-  const startDate = lastDates.length > 0 ? lastDates.sort()[0] : new Date(Date.now() - 30 * 86400000).toISOString().slice(0, 10);
-  _log(`Syncing from ${startDate} to ${today}`);
-  const counts = {};
-  const sleepData = await client.fetch("daily_sleep", startDate, today);
-  const insertSleep = db.query("INSERT OR REPLACE INTO daily_sleep VALUES (?,?,?,?,?)");
-  for (const s of sleepData) {
-    insertSleep.run(s.id, s.day, s.score, JSON.stringify(s.contributors), s.timestamp);
-    _log(`  + sleep ${s.day}`);
-  }
-  counts.daily_sleep = sleepData.length;
-  const readinessData = await client.fetch("daily_readiness", startDate, today);
-  const insertReadiness = db.query("INSERT OR REPLACE INTO daily_readiness VALUES (?,?,?,?,?,?,?)");
-  for (const r of readinessData) {
-    insertReadiness.run(r.id, r.day, r.score, JSON.stringify(r.contributors), r.temperature_deviation, r.temperature_trend_deviation, r.timestamp);
-    _log(`  + readiness ${r.day}`);
-  }
-  counts.daily_readiness = readinessData.length;
-  const activityData = await client.fetch("daily_activity", startDate, today);
-  const insertActivity = db.query("INSERT OR REPLACE INTO daily_activity VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-  for (const a of activityData) {
-    insertActivity.run(a.id, a.day, a.score, a.active_calories, a.steps, a.equivalent_walking_distance, a.high_activity_time, a.medium_activity_time, a.low_activity_time, a.sedentary_time, a.total_calories, a.target_calories, JSON.stringify(a.contributors), a.timestamp);
-    _log(`  + activity ${a.day}`);
-  }
-  counts.daily_activity = activityData.length;
-  const hrData = await client.fetch("heartrate", today, today);
-  const insertHr = db.query("INSERT OR IGNORE INTO heartrate VALUES (?,?,?,?)");
-  for (const h of hrData) {
-    const day = h.timestamp.slice(0, 10);
-    insertHr.run(h.timestamp, h.bpm, h.source, day);
-  }
-  counts.heartrate = hrData.length;
-  if (hrData.length > 0)
-    _log(`  + heartrate ${hrData.length} records`);
-  const spo2Data = await client.fetch("daily_spo2", startDate, today);
-  const insertSpo2 = db.query("INSERT OR REPLACE INTO daily_spo2 VALUES (?,?,?,?)");
-  for (const s of spo2Data) {
-    const avg = s.spo2_percentage?.average ?? null;
-    insertSpo2.run(s.id, s.day, avg, s.breathing_disturbance_index);
-    _log(`  + spo2 ${s.day}`);
-  }
-  counts.daily_spo2 = spo2Data.length;
-  const stressData = await client.fetch("daily_stress", startDate, today);
-  const insertStress = db.query("INSERT OR REPLACE INTO daily_stress VALUES (?,?,?,?,?)");
-  for (const s of stressData) {
-    insertStress.run(s.id, s.day, s.day_summary, s.recovery_high, s.stress_high);
-    _log(`  + stress ${s.day}`);
-  }
-  counts.daily_stress = stressData.length;
-  const workoutData = await client.fetch("workout", startDate, today);
-  const insertWorkout = db.query("INSERT OR REPLACE INTO workouts VALUES (?,?,?,?,?,?,?,?,?,?)");
-  for (const w of workoutData) {
-    insertWorkout.run(w.id, w.day, w.activity, w.calories, w.distance, w.start_datetime, w.end_datetime, w.intensity, w.label ?? "", w.source);
-    _log(`  + workout ${w.day} ${w.activity}`);
-  }
-  counts.workouts = workoutData.length;
-  const sleepPeriods = await client.fetch("sleep", startDate, today);
-  const insertSleepModel = db.query(`INSERT OR REPLACE INTO sleep_model VALUES (${Array(19).fill("?").join(",")})`);
-  for (const sp of sleepPeriods) {
-    insertSleepModel.run(sp.id, sp.day, sp.average_breath, sp.average_heart_rate, sp.average_hrv, sp.awake_time, sp.bedtime_end, sp.bedtime_start, sp.deep_sleep_duration, sp.efficiency, sp.latency, sp.light_sleep_duration, sp.lowest_heart_rate, sp.period, sp.rem_sleep_duration, sp.restless_periods, sp.time_in_bed, sp.total_sleep_duration, sp.type);
-    _log(`  + sleep_period ${sp.day} (${sp.type})`);
-  }
-  counts.sleep_model = sleepPeriods.length;
-  const cvData = await client.fetch("daily_cardiovascular_age", startDate, today);
-  const insertCv = db.query("INSERT OR REPLACE INTO cardiovascular_age VALUES (?,?,?)");
-  for (const c of cvData) {
-    insertCv.run(c.id, c.day, c.vascular_age);
-    _log(`  + cardiovascular_age ${c.day}`);
-  }
-  counts.cardiovascular_age = cvData.length;
-  _log("Import complete.");
-  return { startDate, endDate: today, counts };
-}
-
 // src/db/csv-import.ts
 import { readFileSync as readFileSync2, existsSync } from "fs";
 import { join } from "path";
@@ -3392,23 +3314,124 @@ function resolveFormat({ explicit, isTty }) {
   throw new CliError("BAD_ARGS", `Unknown --format value: "${explicit}". Use "table" or "json".`);
 }
 
+// src/commands/sync.ts
+import { mkdirSync as mkdirSync2 } from "fs";
+import { dirname } from "path";
+
+// src/db/import.ts
+async function importDaily(db, client, log) {
+  const _log = log ?? (() => {});
+  const today = new Date().toISOString().slice(0, 10);
+  const lastDates = [];
+  for (const tbl of ["daily_sleep", "daily_readiness", "daily_activity"]) {
+    const row = db.query(`SELECT MAX(day) as d FROM ${tbl}`).get();
+    if (row?.d)
+      lastDates.push(row.d);
+  }
+  const startDate = lastDates.length > 0 ? lastDates.sort()[0] : new Date(Date.now() - 30 * 86400000).toISOString().slice(0, 10);
+  _log(`Syncing from ${startDate} to ${today}`);
+  const counts = {};
+  const sleepData = await client.fetch("daily_sleep", startDate, today);
+  const insertSleep = db.query("INSERT OR REPLACE INTO daily_sleep VALUES (?,?,?,?,?)");
+  for (const s of sleepData) {
+    insertSleep.run(s.id, s.day, s.score, JSON.stringify(s.contributors), s.timestamp);
+    _log(`  + sleep ${s.day}`);
+  }
+  counts.daily_sleep = sleepData.length;
+  const readinessData = await client.fetch("daily_readiness", startDate, today);
+  const insertReadiness = db.query("INSERT OR REPLACE INTO daily_readiness VALUES (?,?,?,?,?,?,?)");
+  for (const r of readinessData) {
+    insertReadiness.run(r.id, r.day, r.score, JSON.stringify(r.contributors), r.temperature_deviation, r.temperature_trend_deviation, r.timestamp);
+    _log(`  + readiness ${r.day}`);
+  }
+  counts.daily_readiness = readinessData.length;
+  const activityData = await client.fetch("daily_activity", startDate, today);
+  const insertActivity = db.query("INSERT OR REPLACE INTO daily_activity VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+  for (const a of activityData) {
+    insertActivity.run(a.id, a.day, a.score, a.active_calories, a.steps, a.equivalent_walking_distance, a.high_activity_time, a.medium_activity_time, a.low_activity_time, a.sedentary_time, a.total_calories, a.target_calories, JSON.stringify(a.contributors), a.timestamp);
+    _log(`  + activity ${a.day}`);
+  }
+  counts.daily_activity = activityData.length;
+  const hrData = await client.fetch("heartrate", today, today);
+  const insertHr = db.query("INSERT OR IGNORE INTO heartrate VALUES (?,?,?,?)");
+  for (const h of hrData) {
+    const day = h.timestamp.slice(0, 10);
+    insertHr.run(h.timestamp, h.bpm, h.source, day);
+  }
+  counts.heartrate = hrData.length;
+  if (hrData.length > 0)
+    _log(`  + heartrate ${hrData.length} records`);
+  const spo2Data = await client.fetch("daily_spo2", startDate, today);
+  const insertSpo2 = db.query("INSERT OR REPLACE INTO daily_spo2 VALUES (?,?,?,?)");
+  for (const s of spo2Data) {
+    const avg = s.spo2_percentage?.average ?? null;
+    insertSpo2.run(s.id, s.day, avg, s.breathing_disturbance_index);
+    _log(`  + spo2 ${s.day}`);
+  }
+  counts.daily_spo2 = spo2Data.length;
+  const stressData = await client.fetch("daily_stress", startDate, today);
+  const insertStress = db.query("INSERT OR REPLACE INTO daily_stress VALUES (?,?,?,?,?)");
+  for (const s of stressData) {
+    insertStress.run(s.id, s.day, s.day_summary, s.recovery_high, s.stress_high);
+    _log(`  + stress ${s.day}`);
+  }
+  counts.daily_stress = stressData.length;
+  const workoutData = await client.fetch("workout", startDate, today);
+  const insertWorkout = db.query("INSERT OR REPLACE INTO workouts VALUES (?,?,?,?,?,?,?,?,?,?)");
+  for (const w of workoutData) {
+    insertWorkout.run(w.id, w.day, w.activity, w.calories, w.distance, w.start_datetime, w.end_datetime, w.intensity, w.label ?? "", w.source);
+    _log(`  + workout ${w.day} ${w.activity}`);
+  }
+  counts.workouts = workoutData.length;
+  const sleepPeriods = await client.fetch("sleep", startDate, today);
+  const insertSleepModel = db.query(`INSERT OR REPLACE INTO sleep_model VALUES (${Array(19).fill("?").join(",")})`);
+  for (const sp of sleepPeriods) {
+    insertSleepModel.run(sp.id, sp.day, sp.average_breath, sp.average_heart_rate, sp.average_hrv, sp.awake_time, sp.bedtime_end, sp.bedtime_start, sp.deep_sleep_duration, sp.efficiency, sp.latency, sp.light_sleep_duration, sp.lowest_heart_rate, sp.period, sp.rem_sleep_duration, sp.restless_periods, sp.time_in_bed, sp.total_sleep_duration, sp.type);
+    _log(`  + sleep_period ${sp.day} (${sp.type})`);
+  }
+  counts.sleep_model = sleepPeriods.length;
+  const cvData = await client.fetch("daily_cardiovascular_age", startDate, today);
+  const insertCv = db.query("INSERT OR REPLACE INTO cardiovascular_age VALUES (?,?,?)");
+  for (const c of cvData) {
+    insertCv.run(c.id, c.day, c.vascular_age);
+    _log(`  + cardiovascular_age ${c.day}`);
+  }
+  counts.cardiovascular_age = cvData.length;
+  _log("Import complete.");
+  return { startDate, endDate: today, counts };
+}
+
+// src/commands/sync.ts
+async function runSync(opts) {
+  const format = resolveFormat({ explicit: opts.format, isTty: process.stdout.isTTY === true });
+  const dbPath = getDbPath2({ dbPath: opts.db });
+  mkdirSync2(dirname(dbPath), { recursive: true });
+  const db = openDatabase2({ dbPath: opts.db });
+  ensureSchema2(db);
+  const client = getClient(opts);
+  const log = format === "table" ? console.log : undefined;
+  const importResult = await importDaily(db, client, log);
+  const today = getDaySummary(db, todayDate());
+  db.close();
+  if (format === "json") {
+    console.log(JSON.stringify({ import: importResult, today }, null, 2));
+  } else {
+    console.log(formatDaySummary(today, format));
+  }
+}
+function syncCommand() {
+  return new Command("sync").description("Import latest data from Oura API and return today's summary").action(async (_, command) => {
+    const opts = command.parent.opts();
+    await runSync(opts);
+  });
+}
+
 // src/commands/db.ts
 function dbCommand() {
   const cmd = new Command("db").description("Query and manage the local SQLite database");
-  cmd.command("import").description("Sync new data from Oura API into local database").action(async (_, command) => {
+  cmd.command("import").description("Sync new data from Oura API into local database (alias of sync)").action(async (_, command) => {
     const opts = command.parent.parent.opts();
-    const format = resolveFormat({ explicit: opts.format, isTty: process.stdout.isTTY === true });
-    const dbPath = getDbPath2({ dbPath: opts.db });
-    mkdirSync2(dirname(dbPath), { recursive: true });
-    const db = openDatabase2({ dbPath: opts.db });
-    ensureSchema2(db);
-    const client = getClient(opts);
-    const log = format === "table" ? console.log : undefined;
-    const result = await importDaily(db, client, log);
-    if (format === "json") {
-      console.log(JSON.stringify(result, null, 2));
-    }
-    db.close();
+    await runSync(opts);
   });
   cmd.command("today").description("Today's summary from local database").action((_, command) => {
     const opts = command.parent.parent.opts();
@@ -3479,7 +3502,7 @@ function dbCommand() {
     } catch {}
     const log = format === "table" ? console.log : undefined;
     log?.("Database deleted.");
-    mkdirSync2(dirname(dbPath), { recursive: true });
+    mkdirSync3(dirname2(dbPath), { recursive: true });
     const db = openDatabase2({ dbPath: opts.db });
     ensureSchema2(db);
     importFromCSV(db, log ?? (() => {}));
@@ -3491,30 +3514,6 @@ function dbCommand() {
   return cmd;
 }
 
-// src/commands/sync.ts
-import { mkdirSync as mkdirSync3 } from "fs";
-import { dirname as dirname2 } from "path";
-function syncCommand() {
-  return new Command("sync").description("Import latest data from Oura API and return today's summary").action(async (_, command) => {
-    const opts = command.parent.opts();
-    const format = resolveFormat({ explicit: opts.format, isTty: process.stdout.isTTY === true });
-    const dbPath = getDbPath2({ dbPath: opts.db });
-    mkdirSync3(dirname2(dbPath), { recursive: true });
-    const db = openDatabase2({ dbPath: opts.db });
-    ensureSchema2(db);
-    const client = getClient(opts);
-    const log = format === "table" ? console.log : undefined;
-    const importResult = await importDaily(db, client, log);
-    const today = getDaySummary(db, todayDate());
-    db.close();
-    if (format === "json") {
-      console.log(JSON.stringify({ import: importResult, today }, null, 2));
-    } else {
-      console.log(formatDaySummary(today, format));
-    }
-  });
-}
-
 // src/db/report.ts
 function dayLabel(dateStr) {
   const d = new Date(dateStr + "T12:00:00Z");
@@ -3524,20 +3523,21 @@ function dayLabel(dateStr) {
   const mm = String(d.getUTCMonth() + 1).padStart(2, "0");
   return `${day} ${dd}/${mm}`;
 }
-function getWeeklyReport(db) {
+function getReport(db, days) {
+  const period = days <= 7 ? "week" : "month";
   const today = new Date;
   const weekEnd = today.toISOString().slice(0, 10);
-  const weekStartDate = new Date(today.getTime() - 6 * 86400000);
+  const weekStartDate = new Date(today.getTime() - (days - 1) * 86400000);
   const weekStart = weekStartDate.toISOString().slice(0, 10);
-  const prevWeekEnd = new Date(today.getTime() - 7 * 86400000).toISOString().slice(0, 10);
-  const prevWeekStart = new Date(today.getTime() - 13 * 86400000).toISOString().slice(0, 10);
-  const days = [];
-  for (let i = 6;i >= 0; i--) {
+  const prevWeekEnd = new Date(today.getTime() - days * 86400000).toISOString().slice(0, 10);
+  const prevWeekStart = new Date(today.getTime() - (days * 2 - 1) * 86400000).toISOString().slice(0, 10);
+  const dailyRows = [];
+  for (let i = days - 1;i >= 0; i--) {
     const d = new Date(today.getTime() - i * 86400000).toISOString().slice(0, 10);
     const sl = db.query("SELECT score FROM daily_sleep WHERE day=?").get(d);
     const rd = db.query("SELECT score FROM daily_readiness WHERE day=?").get(d);
     const ac = db.query("SELECT score, steps FROM daily_activity WHERE day=?").get(d);
-    days.push({
+    dailyRows.push({
       day: d,
       dayLabel: dayLabel(d),
       sleep: sl?.score ?? null,
@@ -3598,7 +3598,7 @@ function getWeeklyReport(db) {
   } else if (avgSteps.avg !== null && avgSteps.avg >= 1e4) {
     recommendations.push("steps_great");
   }
-  return { weekStart, weekEnd, days, averages, spo2, patterns: { lowSleep, lowReadiness, highActivity }, sleepDetails, recommendations };
+  return { period, weekStart, weekEnd, days: dailyRows, averages, spo2, patterns: { lowSleep, lowReadiness, highActivity }, sleepDetails, recommendations };
 }
 
 // src/format-report.ts
@@ -3622,27 +3622,66 @@ var RECOMMENDATIONS = {
   steps_low: "Low movement \u2014 aim for 8-10k steps daily.",
   steps_great: "Great activity! Step goal achieved."
 };
-function formatWeeklyReport(data, format) {
+function bucketDaysIntoWeeks(days) {
+  const buckets = [];
+  for (let i = 0;i < days.length; i += 7) {
+    const chunk = days.slice(i, i + 7);
+    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);
+    const activityVals = chunk.map((d) => d.activity).filter((v) => v !== null);
+    const stepsVals = chunk.map((d) => d.steps).filter((v) => v !== null);
+    buckets.push({
+      weekOf,
+      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,
+      totalSteps: stepsVals.length > 0 ? stepsVals.reduce((a, b) => a + b, 0) : null
+    });
+  }
+  return buckets;
+}
+function formatReport(data, format, period) {
   if (format === "json")
     return JSON.stringify(data, null, 2);
   const lines = [];
   lines.push("");
-  lines.push(source_default.bold("  Oura Weekly Report"));
+  if (period === "week") {
+    lines.push(source_default.bold("  Oura Weekly Report"));
+  } else {
+    lines.push(source_default.bold("  Oura Monthly Report"));
+  }
   lines.push(source_default.gray(`  ${data.weekStart} \u2014 ${data.weekEnd}`));
   lines.push("");
-  lines.push(source_default.bold("  Last 7 Days:"));
-  lines.push(source_default.gray("  " + "\u2500".repeat(52)));
-  lines.push(`  ${"Day".padEnd(10)} ${"Sleep".padStart(6)} ${"Ready".padStart(6)} ${"Active".padStart(7)} ${"Steps".padStart(8)}`);
-  lines.push(source_default.gray("  " + "\u2500".repeat(52)));
-  for (const d of data.days) {
-    const sleep = d.sleep !== null ? d.sleep >= 85 ? source_default.green(String(d.sleep)) : d.sleep >= 70 ? source_default.yellow(String(d.sleep)) : source_default.red(String(d.sleep)) : source_default.gray("\u2014");
-    const ready = d.readiness !== null ? d.readiness >= 85 ? source_default.green(String(d.readiness)) : d.readiness >= 70 ? source_default.yellow(String(d.readiness)) : source_default.red(String(d.readiness)) : source_default.gray("\u2014");
-    const active = d.activity !== null ? d.activity >= 85 ? source_default.green(String(d.activity)) : d.activity >= 70 ? source_default.yellow(String(d.activity)) : source_default.red(String(d.activity)) : source_default.gray("\u2014");
-    const steps = d.steps !== null ? d.steps.toLocaleString() : source_default.gray("\u2014");
-    lines.push(`  ${d.dayLabel.padEnd(10)} ${sleep.padStart(6)} ${ready.padStart(6)} ${active.padStart(7)} ${steps.padStart(8)}`);
+  if (period === "week") {
+    lines.push(source_default.bold("  Last 7 Days:"));
+    lines.push(source_default.gray("  " + "\u2500".repeat(52)));
+    lines.push(`  ${"Day".padEnd(10)} ${"Sleep".padStart(6)} ${"Ready".padStart(6)} ${"Active".padStart(7)} ${"Steps".padStart(8)}`);
+    lines.push(source_default.gray("  " + "\u2500".repeat(52)));
+    for (const d of data.days) {
+      const sleep = d.sleep !== null ? d.sleep >= 85 ? source_default.green(String(d.sleep)) : d.sleep >= 70 ? source_default.yellow(String(d.sleep)) : source_default.red(String(d.sleep)) : source_default.gray("\u2014");
+      const ready = d.readiness !== null ? d.readiness >= 85 ? source_default.green(String(d.readiness)) : d.readiness >= 70 ? source_default.yellow(String(d.readiness)) : source_default.red(String(d.readiness)) : source_default.gray("\u2014");
+      const active = d.activity !== null ? d.activity >= 85 ? source_default.green(String(d.activity)) : d.activity >= 70 ? source_default.yellow(String(d.activity)) : source_default.red(String(d.activity)) : source_default.gray("\u2014");
+      const steps = d.steps !== null ? d.steps.toLocaleString() : source_default.gray("\u2014");
+      lines.push(`  ${d.dayLabel.padEnd(10)} ${sleep.padStart(6)} ${ready.padStart(6)} ${active.padStart(7)} ${steps.padStart(8)}`);
+    }
+    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)));
+    for (const b of buckets) {
+      const sleep = b.avgSleep !== null ? b.avgSleep.toFixed(0) : "\u2014";
+      const ready = b.avgReadiness !== null ? b.avgReadiness.toFixed(0) : "\u2014";
+      const active = b.avgActivity !== null ? b.avgActivity.toFixed(0) : "\u2014";
+      const steps = b.totalSteps !== null ? b.totalSteps.toLocaleString() : "\u2014";
+      lines.push(`  ${b.weekOf.padEnd(12)} ${sleep.padStart(6)} ${ready.padStart(6)} ${active.padStart(7)} ${steps.padStart(10)}`);
+    }
+    lines.push("");
   }
-  lines.push("");
-  lines.push(source_default.bold("  Averages (this week vs previous):"));
+  lines.push(source_default.bold("  Averages (this period vs previous):"));
   for (const a of data.averages) {
     const avgStr = fmtNumber(a.avg, a.isSteps);
     let changeStr = "";
@@ -3691,17 +3730,20 @@ function formatWeeklyReport(data, format) {
 
 // src/commands/report.ts
 function reportCommand() {
-  const cmd = new Command("report").description("Generate health reports from local data");
-  cmd.command("weekly").description("Weekly health summary with trends and recommendations").action((_, command) => {
-    const opts = command.parent.parent.opts();
+  return new Command("report").description("Generate a narrative health report from local data.").option("--period <name>", "Report window: week | month", "week").action((_, command) => {
+    const opts = command.parent.opts();
+    const period = command.opts().period ?? "week";
+    if (period !== "week" && period !== "month") {
+      throw new CliError("BAD_ARGS", `--period must be "week" or "month", got "${period}".`);
+    }
     const format = resolveFormat({ explicit: opts.format, isTty: process.stdout.isTTY === true });
     const db = openDatabase2({ dbPath: opts.db });
     ensureSchema2(db);
-    const data = getWeeklyReport(db);
-    console.log(formatWeeklyReport(data, format));
+    const days = period === "week" ? 7 : 30;
+    const data = getReport(db, days);
+    console.log(formatReport(data, format, period));
     db.close();
   });
-  return cmd;
 }
 
 // src/commands/login.ts
@@ -3860,10 +3902,9 @@ function buildManifest(version) {
       },
       {
         name: "report",
-        description: "Render a narrative health report. Pick a subcommand.",
-        args: [],
-        subcommands: [
-          { name: "weekly", description: "Weekly health summary with trends and recommendations.", args: [] }
+        description: "Generate a narrative health report from local data.",
+        args: [
+          { name: "--period", type: "enum", values: ["week", "month"], description: "Report window (default week)." }
         ]
       }
     ]
@@ -3876,7 +3917,7 @@ function describeCommand(version) {
 }
 
 // src/index.ts
-var VERSION = "0.2.1";
+var VERSION = "0.3.0";
 if (process.argv.includes("--no-color") || process.env.NO_COLOR) {
   source_default.level = 0;
 }
@@ -3929,7 +3970,7 @@ program2.command("manifest").description("Print openclaw-tool-registry-compatibl
       { name: "workout", description: "Fetch workout data from Oura API.", examples: ["oura-cli workout --start 2026-05-01"] },
       { name: "sync", description: "Sync all Oura collections into the local DB.", examples: ["oura-cli sync"] },
       { name: "db", description: "Query the local SQLite cache.", examples: ["oura-cli db today"] },
-      { name: "report", description: "Render a weekly or monthly summary report.", examples: ["oura-cli report weekly"] },
+      { name: "report", description: "Render a weekly or monthly summary report.", examples: ["oura-cli report --period week"] },
       { name: "healthcheck", description: "Quick local DB health probe.", examples: ["oura-cli healthcheck"] },
       { name: "manifest", description: "Print openclaw-tool-registry-compatible manifest as JSON.", examples: ["oura-cli manifest"] }
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drakulavich/oura-cli",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Oura Ring CLI — query and analyze Oura Ring health data from the command line, designed for humans and AI agents.",
   "keywords": [
     "oura",
@@ -55,6 +55,8 @@
   },
   "devDependencies": {
     "@types/node": "^25.3.3",
+    "ajv": "^8.20.0",
+    "ajv-formats": "^3.0.1",
     "typescript": "^5.9.3"
   }
 }