@robbeverhelst/do 1.347.0 → 1.348.0

package/dist/do.js

@@ -14420,7 +14420,7 @@ var configError = (message) => new CliError("config", message, EXIT.CONFIG);
 
 // src/meta.ts
 var CLI_NAME = "do";
-var VERSION = "1.347.0";
+var VERSION = "1.348.0";
 var API_PREFIX = "/api/v1";
 var DEFAULT_API_URL = "http://localhost:3001";
 
@@ -18030,7 +18030,8 @@ var habits = pgTable("habits", {
   eventSourceId: text("event_source_id"),
   eventMatch: text("event_match"),
   eventOffset: text("event_offset"),
-  durationMinutes: integer2("duration_minutes")
+  durationMinutes: integer2("duration_minutes"),
+  activeMonths: integer2("active_months").array()
 }, (t) => [
   index("habits_tenant_idx").on(t.tenantId),
   index("habits_tenant_area_idx").on(t.tenantId, t.areaId),
@@ -18299,7 +18300,8 @@ var challengeParts = pgTable("challenge_parts", {
   challengeId: text("challenge_id").notNull().references(() => challenges.id, { onDelete: "cascade" }),
   kind: challengePartKind("kind").notNull(),
   subjectId: text("subject_id").notNull(),
-  position: integer2("position").notNull()
+  position: integer2("position").notNull(),
+  resumeOnStart: boolean4("resume_on_start").notNull().default(false)
 }, (t) => [
   index("challenge_parts_tenant_idx").on(t.tenantId),
   index("challenge_parts_challenge_idx").on(t.challengeId, t.position),
@@ -21397,7 +21399,8 @@ var habitSchema = createSelectSchema(habits, {
   eventSourceId: string2().nullable().default(null),
   eventMatch: string2().nullable().default(null),
   eventOffset: string2().nullable().default(null),
-  durationMinutes: number2().int().nullable().default(null)
+  durationMinutes: number2().int().nullable().default(null),
+  activeMonths: array(number2().int()).nullable().default(null)
 });
 var habitEntrySchema = createSelectSchema(habitEntries, {
   occurredAt: exports_coerce.date(),
@@ -21416,6 +21419,12 @@ var habitTimeOfDaySchema = union([
 ]);
 var HABIT_DURATION_MAX_MINUTES = 600;
 var habitDurationMinutesSchema = number2().int().min(1).max(HABIT_DURATION_MAX_MINUTES);
+var habitActiveMonthsSchema = array(number2().int().min(1).max(12)).max(12).nullable().transform((months) => {
+  if (!months)
+    return null;
+  const set = [...new Set(months)].sort((x, y) => x - y);
+  return set.length === 0 || set.length === 12 ? null : set;
+});
 var habitAliasSchema = string2().trim().min(1).max(60);
 var habitAliasesSchema = array(habitAliasSchema).max(12).transform((aliases) => aliases.filter((a, i) => aliases.findIndex((b) => b.toLowerCase() === a.toLowerCase()) === i));
 var habitScheduleSchema = discriminatedUnion("kind", [
@@ -21455,7 +21464,8 @@ var createHabitInputSchema = createInsertSchema(habits, {
   aliases: habitAliasesSchema.optional(),
   timeOfDay: habitTimeOfDaySchema.nullish(),
   remind: boolean2().optional(),
-  durationMinutes: habitDurationMinutesSchema.nullish()
+  durationMinutes: habitDurationMinutesSchema.nullish(),
+  activeMonths: habitActiveMonthsSchema.optional()
 }).omit({ tenantId: true, recurrenceRuleId: true, retiredAt: true, ...eventColumns }).extend({
   title: string2().min(1),
   schedule: habitScheduleSchema.optional(),
@@ -21472,7 +21482,8 @@ var updateHabitInputSchema = createUpdateSchema(habits, {
   aliases: habitAliasesSchema.optional(),
   timeOfDay: habitTimeOfDaySchema.nullish(),
   remind: boolean2().optional(),
-  durationMinutes: habitDurationMinutesSchema.nullish()
+  durationMinutes: habitDurationMinutesSchema.nullish(),
+  activeMonths: habitActiveMonthsSchema.optional()
 }).omit({
   id: true,
   tenantId: true,
@@ -22737,6 +22748,11 @@ var updateRoutineRunInputSchema = object({
 var routineRunsQuerySchema = object({
   limit: exports_coerce.number().int().min(1).max(200).optional()
 });
+var recentRoutineRunsQuerySchema = object({
+  since: exports_coerce.date().optional(),
+  status: routineRunStatusSchema.optional(),
+  limit: exports_coerce.number().int().min(1).max(200).default(50)
+});
 var routineDoneInputSchema = object({
   id: ulidSchema.optional(),
   occurrenceDate: exports_coerce.date().nullish()
@@ -22804,7 +22820,11 @@ var routineTodayStepSchema = object({
   minutes: number2().int().nullable(),
   done: boolean2(),
   depth: number2().int().nonnegative().default(0),
-  optional: boolean2().default(false)
+  optional: boolean2().default(false),
+  habitId: string2().nullable().default(null),
+  routineId: string2().nullable().default(null),
+  habitToday: _enum2(["due", "not_due", "paused"]).nullable().default(null),
+  amount: object({ value: number2(), target: number2().nullable(), unit: string2().nullable() }).nullable().default(null)
 });
 var routineTodayStateSchema = _enum2(["done", "running", "upcoming", "resting"]);
 var routineTodaySchema = object({
@@ -31326,7 +31346,8 @@ var houseUpkeepSoonSchema = object({
   nextOn: day.nullable(),
   placeTitle: string2().nullable().default(null),
   lastOn: day.nullable().default(null),
-  occurrenceId: string2().nullable().default(null)
+  occurrenceId: string2().nullable().default(null),
+  thisMonth: boolean2().optional()
 });
 var housePlaceTileSchema = object({
   id: string2(),
@@ -37345,6 +37366,16 @@ var reviewMarkSchema = object({
   date: progressDateSchema,
   state: reviewMarkStateSchema
 });
+var reviewTallySchema = object({ done: countSchema2, due: countSchema2 });
+var reviewHabitsSchema = object({
+  kept30: reviewTallySchema,
+  kept30Before: reviewTallySchema,
+  checkIns: countSchema2,
+  checkInsByAgent: countSchema2,
+  checkInsFromRoutines: countSchema2,
+  paused: countSchema2,
+  grown: countSchema2
+});
 var reviewNumbersSchema = object({
   tasksDone: countSchema2,
   tasksDoneDelta: number2().int(),
@@ -37367,7 +37398,13 @@ var reviewStreakSchema = object({
   current: countSchema2,
   best: countSchema2,
   unitLabel: string2().min(1),
-  marks: array(reviewMarkSchema)
+  marks: array(reviewMarkSchema),
+  state: _enum2(["active", "recovering", "broken"]).optional(),
+  graceUsed: countSchema2.optional(),
+  graceBudget: countSchema2.optional(),
+  kept30: reviewTallySchema.optional(),
+  period: reviewTallySchema.optional(),
+  paused: boolean2().optional()
 });
 var reviewProjectSchema = object({
   projectId: string2().min(1),
@@ -37386,7 +37423,8 @@ var reviewSummarySchema = object({
   numbers: reviewNumbersSchema,
   series: array(reviewSeriesEntrySchema).length(8),
   streaks: array(reviewStreakSchema),
-  projects: array(reviewProjectSchema)
+  projects: array(reviewProjectSchema),
+  habits: reviewHabitsSchema.optional()
 }).refine((s) => s.series.at(-1)?.current === true, {
   message: "the last series entry is the asked period",
   path: ["series"]
@@ -37439,7 +37477,7 @@ var progressOperations = defineOperations({
     scopes: ["tasks:read", "habits:read"],
     tag: "Reads",
     summary: "Review summary",
-    description: "Plan > Review in one read, for the ISO week (Monday to Sunday) or calendar month holding `date` (default: the one holding today, in the key's member's saved timezone): the headline numbers (tasks done, mine and the agents', against the period before; habit days met and due; projects with a task done; challenges running), tasks done and habit days met for the last 8 periods (oldest first, the last one the asked period), one streak row per live habit (current and best run, `unitLabel` `N days` for a daily habit and `N in a row` otherwise, and a mark per day of the week or per week of the month: done, missed, open, later or not_due, a day it isn't due that never breaks the run), and each open project's tasks done of its total, the most recently active first.",
+    description: "Plan > Review in one read, for the ISO week (Monday to Sunday) or calendar month holding `date` (default: the one holding today, in the key's member's saved timezone): the headline numbers (tasks done, mine and the agents', against the period before; habit days met and due; projects with a task done; challenges running), tasks done and habit days met for the last 8 periods (oldest first, the last one the asked period), one streak row per live habit (current and best run, `unitLabel` `N days` for a daily habit and `N in a row` otherwise, and a mark per day of the week or per week of the month: done, missed, open, later or not_due, a day it isn't due that never breaks the run), and each open project's tasks done of its total, the most recently active first. For Review \u203A Habits each streak row also carries its `state` (active, recovering or broken), grace used of its budget, `kept30` (due days met of due over the last 30 days), `period` (met of due in the asked period) and whether it rests today (`paused`), and `habits` gives the tiles: kept over the last 30 days and the 30 before, the period's check-ins with how many an agent and a routine made, and how many habits rest and have grown.",
     query: [
       {
         name: "span",
@@ -38091,6 +38129,19 @@ var routineOperations = defineOperations({
     response: { description: "`{ today, routines }`." },
     operationId: "routines_today"
   },
+  recentRuns: {
+    method: "get",
+    path: "/routines/runs",
+    scopes: ["routines:read"],
+    tag: "Routines",
+    summary: "Recent runs",
+    description: "The Space's recent routine runs across its live routines, newest first, each with its per-step state: `since` (a day or an instant) keeps those started at or after it, `status` (`in_progress`, `completed`, `abandoned`) keeps one kind, `limit` (1\u2013200, 50 by default) the newest. The Runs page reads the last completed run and the runs left unfinished in the last 7 days from it.",
+    querySchema: recentRoutineRunsQuerySchema,
+    status: 200,
+    response: { description: "The runs, newest first." },
+    errors: { 400: true },
+    operationId: "routines_recent_runs"
+  },
   getRun: {
     method: "get",
     path: "/routines/runs/{runId}",
@@ -48220,9 +48271,14 @@ var SCHEDULE_FLAGS = [
     type: "string",
     description: "How long it takes (15m, 1h, 1h30m; 1\u2013600 minutes); none clears it back to 15m."
   },
+  {
+    name: "season",
+    type: "string",
+    description: "Only in season: a run of months (Oct-Apr) or a list (oct,nov,dec or 10,11,12); off makes it all year."
+  },
   { name: "data", type: "string", description: "JSON for any other field of the contract." }
 ];
-var SCHEDULE_NOTES = 'One of --every-day, --on mo,we,fr, --every 3d|2w [--from YYYY-MM-DD], --monthly 1|last sets its schedule; days it isn\'t due never break the streak. Without one, it keeps `period` + `frequencyCount` (3\xD7 a week). A schedule that follows the waste calendar goes in --data: `{"schedule":{"kind":"event","sourceId":"<its connection id>","match":"bin collection","offset":"day_before_evening"}}` (or `same_day`; a match naming a kind, "PMD", follows only those pickups). The reply\'s `nextDue` lists its next 4 due days. --time 16:30|morning|midday|evening and --for 20m put it on your do calendar at that time on each due day (a part of day at 08:00, 12:30 or 19:00; 15 minutes without --for).';
+var SCHEDULE_NOTES = 'One of --every-day, --on mo,we,fr, --every 3d|2w [--from YYYY-MM-DD], --monthly 1|last sets its schedule; days it isn\'t due never break the streak. Without one, it keeps `period` + `frequencyCount` (3\xD7 a week). A schedule that follows the waste calendar goes in --data: `{"schedule":{"kind":"event","sourceId":"<its connection id>","match":"bin collection","offset":"day_before_evening"}}` (or `same_day`; a match naming a kind, "PMD", follows only those pickups). The reply\'s `nextDue` lists its next 4 due days. --time 16:30|morning|midday|evening and --for 20m put it on your do calendar at that time on each due day (a part of day at 08:00, 12:30 or 19:00; 15 minutes without --for). --season Oct-Apr keeps it to those months: out of season it isn\'t due, its days never break the streak, and it leaves every list (--season off: all year).';
 function localToday() {
   const now = new Date;
   const pad = (n) => String(n).padStart(2, "0");
@@ -48282,6 +48338,44 @@ function timingFromFlags(flags) {
   }
   return out;
 }
+var MONTH_NAMES = [
+  "jan",
+  "feb",
+  "mar",
+  "apr",
+  "may",
+  "jun",
+  "jul",
+  "aug",
+  "sep",
+  "oct",
+  "nov",
+  "dec"
+];
+function monthOf(raw) {
+  const text = raw.trim().toLowerCase();
+  const n = /^\d{1,2}$/.test(text) ? Number(text) : MONTH_NAMES.indexOf(text.slice(0, 3)) + 1;
+  if (n < 1 || n > 12)
+    throw usageError(`--season: "${raw}" isn't a month`);
+  return n;
+}
+function seasonFromFlag(raw) {
+  const text = raw.trim().toLowerCase();
+  if (text === "off" || text === "none")
+    return null;
+  return text.split(",").flatMap((part) => {
+    const [from, to] = part.split("-");
+    if (to === undefined)
+      return [monthOf(part)];
+    const start = monthOf(from);
+    const length = (monthOf(to) - start + 12) % 12 + 1;
+    return Array.from({ length }, (_, i) => (start - 1 + i) % 12 + 1);
+  });
+}
+function seasonFromFlags(flags) {
+  const season = flagString(flags, "season");
+  return season === undefined ? {} : { activeMonths: seasonFromFlag(season) };
+}
 var commands20 = [
   {
     spec: {
@@ -48302,7 +48396,8 @@ var commands20 = [
         ...title ? { title } : {},
         ...readDataFlag(flags),
         ...schedule ? { schedule } : {},
-        ...timingFromFlags(flags)
+        ...timingFromFlags(flags),
+        ...seasonFromFlags(flags)
       });
       if (flagBool(flags, "dry-run")) {
         return {
@@ -48319,7 +48414,7 @@ var commands20 = [
   {
     spec: {
       path: ["habits", "update"],
-      summary: "Change a habit: its schedule (--every-day, --on, --every, --monthly), --time, --for or --data.",
+      summary: "Change a habit: its schedule (--every-day, --on, --every, --monthly), --time, --for, --season or --data.",
       args: [{ name: "id", required: true, description: "Habit ULID." }],
       flags: SCHEDULE_FLAGS,
       scopes: [...habitOperations.update.scopes],
@@ -48332,10 +48427,11 @@ var commands20 = [
       const body = parseInput(updateHabitInputSchema, {
         ...readDataFlag(flags),
         ...schedule ? { schedule } : {},
-        ...timingFromFlags(flags)
+        ...timingFromFlags(flags),
+        ...seasonFromFlags(flags)
       });
       if (Object.keys(body).length === 0)
-        throw usageError("nothing to change \u2014 pass a schedule flag such as --on mo,we, --time, --for, or --data");
+        throw usageError("nothing to change \u2014 pass a schedule flag such as --on mo,we, --time, --for, --season, or --data");
       const client = requireClient();
       if (flagBool(flags, "dry-run")) {
         const before = await client.get(pathOf(habitOperations.get, { id }));
@@ -54960,6 +55056,23 @@ function renderRoutinesToday(data, mode) {
   }).join(`
 `);
 }
+var RUN_WORDS = {
+  in_progress: "going",
+  completed: "done",
+  abandoned: "left"
+};
+function renderRecentRuns(data, mode) {
+  const list = (data.data ?? data) || [];
+  if (list.length === 0)
+    return "No runs.";
+  return list.map((r) => {
+    const steps = r.steps.filter((s) => s.refKind !== "routine");
+    const done = steps.filter((s) => s.status === "done").length;
+    const when = r.startedAt.slice(0, 16).replace("T", " ");
+    return `${when}  ${r.routineTitle}  ${paint(mode, "dim", `${RUN_WORDS[r.status] ?? r.status} \xB7 ${done} of ${steps.length} done  ${r.id}`)}`;
+  }).join(`
+`);
+}
 function renderRoutineTaskAdded(data) {
   const run = data;
   const last = run.steps?.at(-1)?.title ?? "the task";
@@ -55377,6 +55490,46 @@ var routineCommands = [
 ];
 var commands42 = [
   ...routineCommands,
+  {
+    spec: {
+      path: ["routines", "runs"],
+      summary: "Recent runs across your routines: when, how far, done or left.",
+      args: [],
+      flags: [
+        {
+          name: "since",
+          type: "string",
+          description: "Only runs started on or after this day (YYYY-MM-DD) or instant."
+        },
+        { name: "status", type: "string", description: "in_progress, completed or abandoned." },
+        {
+          name: "limit",
+          type: "string",
+          description: "How many, newest first (1-200, default 50)."
+        }
+      ],
+      scopes: [...routineOperations.recentRuns.scopes],
+      returns: "RoutineRunView[]",
+      notes: `${routeOf(routineOperations.recentRuns)}. A routine in Trash is left out. "Left" runs (abandoned) can be finished again from the app's Runs page.`
+    },
+    run: async ({ flags, requireClient }) => {
+      const query = parseInput(recentRoutineRunsQuerySchema, {
+        since: flagString(flags, "since"),
+        status: flagString(flags, "status"),
+        limit: flagString(flags, "limit")
+      });
+      return {
+        data: await requireClient().get(pathOf(routineOperations.recentRuns), {
+          query: {
+            since: query.since ? flagString(flags, "since") : undefined,
+            status: query.status,
+            limit: String(query.limit)
+          }
+        }),
+        render: renderRecentRuns
+      };
+    }
+  },
   {
     spec: {
       path: ["routines", "today"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robbeverhelst/do",
-  "version": "1.347.0",
+  "version": "1.348.0",
   "private": false,
   "description": "do — the agent-drivable CLI over the public /api/v1 surface",
   "homepage": "https://github.com/robbeverhelst/do/tree/main/apps/cli",