@robbeverhelst/do 1.21.0 → 1.23.0

package/dist/do.js

@@ -1177,6 +1177,33 @@ function mapColumnsInSQLToAlias(query, alias) {
   }));
 }
 
+// ../../node_modules/.bun/drizzle-orm@0.45.2+c7294ea0f0c54ed0/node_modules/drizzle-orm/pg-core/checks.js
+class CheckBuilder {
+  constructor(name, value) {
+    this.name = name;
+    this.value = value;
+  }
+  static [entityKind] = "PgCheckBuilder";
+  brand;
+  build(table) {
+    return new Check(table, this);
+  }
+}
+
+class Check {
+  constructor(table, builder) {
+    this.table = table;
+    this.name = builder.name;
+    this.value = builder.value;
+  }
+  static [entityKind] = "PgCheck";
+  name;
+  value;
+}
+function check(name, value) {
+  return new CheckBuilder(name, value);
+}
+
 // ../../node_modules/.bun/drizzle-orm@0.45.2+c7294ea0f0c54ed0/node_modules/drizzle-orm/utils.js
 function orderSelectedFields(fields, pathPrefix) {
   return Object.entries(fields).reduce((result, [name, field]) => {
@@ -4224,6 +4251,7 @@ var areas = pgTable("areas", {
 
 // ../../packages/schema/src/db/core.ts
 var routineKind = pgEnum("routine_kind", ["sequence", "time_blocked"]);
+var routineStepRef = pgEnum("routine_step_ref", ["free", "habit", "task"]);
 var projectStatus = pgEnum("project_status", [
   "planning",
   "active",
@@ -4260,11 +4288,22 @@ var routineSteps = pgTable("routine_steps", {
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
   routineId: text("routine_id").notNull().references(() => routines.id),
   title: text("title").notNull(),
+  refKind: routineStepRef("ref_kind").notNull().default("free"),
+  habitId: text("habit_id").references(() => habits.id),
+  taskId: text("task_id").references(() => tasks.id),
   sortOrder: integer("sort_order").notNull().default(0),
   durationMinutes: integer("duration_minutes"),
   notes: text("notes"),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
-}, (t) => [index("routine_steps_routine_order_idx").on(t.routineId, t.sortOrder)]);
+}, (t) => [
+  index("routine_steps_routine_order_idx").on(t.routineId, t.sortOrder),
+  index("routine_steps_habit_idx").on(t.habitId),
+  check("routine_steps_ref_kind_chk", sql`(
+        (${t.refKind} = 'free'  AND ${t.habitId} IS NULL AND ${t.taskId} IS NULL) OR
+        (${t.refKind} = 'habit' AND ${t.habitId} IS NOT NULL AND ${t.taskId} IS NULL) OR
+        (${t.refKind} = 'task'  AND ${t.taskId} IS NOT NULL AND ${t.habitId} IS NULL)
+      )`)
+]);
 var routineRuns = pgTable("routine_runs", {
   id: text("id").primaryKey(),
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
@@ -4280,13 +4319,19 @@ var routineRunSteps = pgTable("routine_run_steps", {
   runId: text("run_id").notNull().references(() => routineRuns.id),
   stepId: text("step_id").notNull().references(() => routineSteps.id),
   title: text("title").notNull(),
+  refKind: routineStepRef("ref_kind").notNull().default("free"),
+  habitId: text("habit_id").references(() => habits.id),
+  habitEntryId: text("habit_entry_id").references(() => habitEntries.id),
   sortOrder: integer("sort_order").notNull().default(0),
   durationMinutes: integer("duration_minutes"),
   status: routineRunStepStatus("status").notNull().default("pending"),
   elapsedSeconds: integer("elapsed_seconds").notNull().default(0),
   carriedOver: boolean("carried_over").notNull().default(false),
   completedAt: timestamp("completed_at", { withTimezone: true })
-}, (t) => [index("routine_run_steps_run_order_idx").on(t.runId, t.sortOrder)]);
+}, (t) => [
+  index("routine_run_steps_run_order_idx").on(t.runId, t.sortOrder),
+  check("routine_run_steps_ref_kind_chk", sql`(${t.refKind} <> 'habit' OR ${t.habitId} IS NOT NULL)`)
+]);
 var projects = pgTable("projects", {
   id: text("id").primaryKey().references(() => nodes.id),
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
@@ -4336,6 +4381,7 @@ var habitMeasurementType = pgEnum("habit_measurement_type", [
   "negative"
 ]);
 var habitPeriod = pgEnum("habit_period", ["day", "week", "month"]);
+var habitEntrySource = pgEnum("habit_entry_source", ["manual", "routine"]);
 var recurrenceMode = pgEnum("recurrence_mode", ["rigid", "flexible"]);
 var recurrenceFreq = pgEnum("recurrence_freq", ["daily", "weekly", "monthly", "yearly"]);
 var recurrenceUnit = pgEnum("recurrence_unit", ["day", "week", "month"]);
@@ -4387,6 +4433,7 @@ var habitEntries = pgTable("habit_entries", {
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
   habitId: text("habit_id").notNull().references(() => habits.id),
   value: doublePrecision("value").notNull().default(1),
+  source: habitEntrySource("source").notNull().default("manual"),
   occurredAt: timestamp("occurred_at", { withTimezone: true }).notNull(),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
 }, (t) => [index("habit_entries_habit_occurred_idx").on(t.habitId, t.occurredAt)]);
@@ -5092,7 +5139,7 @@ __export(exports_external, {
   clone: () => clone,
   cidrv6: () => cidrv62,
   cidrv4: () => cidrv42,
-  check: () => check,
+  check: () => check2,
   catch: () => _catch2,
   boolean: () => boolean3,
   bigint: () => bigint3,
@@ -17209,7 +17256,7 @@ __export(exports_schemas2, {
   codec: () => codec,
   cidrv6: () => cidrv62,
   cidrv4: () => cidrv42,
-  check: () => check,
+  check: () => check2,
   catch: () => _catch2,
   boolean: () => boolean3,
   bigint: () => bigint3,
@@ -17501,8 +17548,8 @@ var ZodType = /* @__PURE__ */ $constructor("ZodType", (inst, def) => {
       reg.add(this, meta2);
       return this;
     },
-    refine(check, params) {
-      return this.check(refine(check, params));
+    refine(check2, params) {
+      return this.check(refine(check2, params));
     },
     superRefine(refinement, params) {
       return this.check(superRefine(refinement, params));
@@ -18644,7 +18691,7 @@ var ZodCustom = /* @__PURE__ */ $constructor("ZodCustom", (inst, def) => {
   ZodType.init(inst, def);
   inst._zod.processJSONSchema = (ctx, json2, params) => customProcessor(inst, ctx, json2, params);
 });
-function check(fn) {
+function check2(fn) {
   const ch = new $ZodCheck({
     check: "custom"
   });
@@ -19595,6 +19642,7 @@ var habitMeasurementTypeSchema = exports_external.enum([
   "negative"
 ]);
 var habitPeriodSchema = exports_external.enum(["day", "week", "month"]);
+var habitEntrySourceSchema = exports_external.enum(habitEntrySource.enumValues);
 var createHabitInputSchema = exports_external.object({
   id: ulidSchema,
   title: exports_external.string().min(1),
@@ -19616,6 +19664,7 @@ var updateHabitInputSchema = exports_external.object({
 var createHabitEntryInputSchema = exports_external.object({
   id: ulidSchema,
   value: exports_external.number().nonnegative().default(1),
+  source: habitEntrySourceSchema.default("manual"),
   occurredAt: exports_external.coerce.date().optional()
 });
 var habitStreakSchema = exports_external.object({
@@ -19625,10 +19674,15 @@ var habitStreakSchema = exports_external.object({
   periodTarget: exports_external.number(),
   satisfiedToday: exports_external.boolean()
 });
+var habitRoutineRefSchema = exports_external.object({
+  id: ulidSchema,
+  title: exports_external.string()
+});
 var habitSummarySchema = habitSchema.extend({
   title: exports_external.string(),
   createdAt: exports_external.coerce.date(),
-  streak: habitStreakSchema
+  streak: habitStreakSchema,
+  inRoutines: exports_external.array(habitRoutineRefSchema).default([])
 });
 var habitHeatmapCellSchema = exports_external.object({
   date: exports_external.string(),
@@ -19688,6 +19742,7 @@ var updateOccurrenceInputSchema = exports_external.object({
 }).strict();
 // ../../packages/schema/src/contracts/routines.ts
 var routineKindSchema = exports_external.enum(routineKind.enumValues);
+var routineStepRefSchema = exports_external.enum(routineStepRef.enumValues);
 var routineSchema = createSelectSchema(routines);
 var routineStepSchema = createSelectSchema(routineSteps, {
   createdAt: exports_external.coerce.date()
@@ -19695,9 +19750,61 @@ var routineStepSchema = createSelectSchema(routineSteps, {
 var routineStepInputSchema = exports_external.object({
   id: ulidSchema,
   title: exports_external.string().min(1),
+  refKind: routineStepRefSchema.default("free"),
+  habitId: ulidSchema.nullish(),
+  taskId: ulidSchema.nullish(),
+  newHabit: createHabitInputSchema.optional(),
   sortOrder: exports_external.number().int().min(0).optional(),
   durationMinutes: exports_external.number().int().positive().nullish(),
   notes: exports_external.string().nullish()
+}).superRefine((step, ctx) => {
+  if (step.refKind === "habit") {
+    const linkId = step.newHabit?.id ?? step.habitId;
+    if (!linkId) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "a habit step needs habitId or newHabit",
+        path: ["habitId"]
+      });
+    }
+    if (step.newHabit && step.habitId && step.newHabit.id !== step.habitId) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "habitId must equal newHabit.id",
+        path: ["habitId"]
+      });
+    }
+    if (step.taskId) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "a habit step cannot also set taskId",
+        path: ["taskId"]
+      });
+    }
+  } else if (step.refKind === "task") {
+    if (!step.taskId) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "a task step needs taskId",
+        path: ["taskId"]
+      });
+    }
+    if (step.habitId || step.newHabit) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "a task step cannot set a habit link",
+        path: ["habitId"]
+      });
+    }
+  } else {
+    if (step.habitId || step.taskId || step.newHabit) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "a free step cannot set a habit/task link",
+        path: ["refKind"]
+      });
+    }
+  }
 });
 var createRoutineInputSchema = exports_external.object({
   id: ulidSchema,
@@ -19735,10 +19842,13 @@ var routineRunSchema = createSelectSchema(routineRuns, {
 var routineRunStepSchema = createSelectSchema(routineRunSteps, {
   completedAt: exports_external.coerce.date().nullable()
 });
+var routineRunStepViewSchema = routineRunStepSchema.extend({
+  habit: habitSummarySchema.nullable().default(null)
+});
 var routineRunViewSchema = routineRunSchema.extend({
   routineTitle: exports_external.string(),
   kind: routineKindSchema,
-  steps: exports_external.array(routineRunStepSchema)
+  steps: exports_external.array(routineRunStepViewSchema)
 });
 var startRoutineRunInputSchema = exports_external.object({
   id: ulidSchema,
@@ -19746,7 +19856,9 @@ var startRoutineRunInputSchema = exports_external.object({
 });
 var updateRoutineRunStepInputSchema = exports_external.object({
   status: routineRunStepStatusSchema.optional(),
-  elapsedSeconds: exports_external.number().int().nonnegative().optional()
+  elapsedSeconds: exports_external.number().int().nonnegative().optional(),
+  habitValue: exports_external.number().nonnegative().optional(),
+  logAgain: exports_external.boolean().optional()
 }).strict();
 var updateRoutineRunInputSchema = exports_external.object({
   status: routineRunStatusSchema.optional()
@@ -21196,7 +21308,7 @@ function parseCapture2(input) {
 
 // src/meta.ts
 var CLI_NAME = "do";
-var VERSION = "1.21.0";
+var VERSION = "1.23.0";
 var API_PREFIX = "/api/v1";
 var DEFAULT_API_URL = "http://localhost:3001";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robbeverhelst/do",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "private": false,
   "description": "do — the agent-drivable CLI over the public /api/v1 surface",
   "type": "module",