@robbeverhelst/do 1.68.0 → 1.70.0

package/README.md

@@ -16,7 +16,7 @@ bunx @robbeverhelst/do today
 
 The daily loop, all over `/api/v1` with an API key — no destructive verbs:
 
-- `capture "<text> #tag !priority"` — quick-add a task to the inbox
+- `capture "<text> #tag ! ~area"` — quick-add a task to the inbox (`!` stars it)
 - `today` — actionable tasks (overdue / scheduled / due / in-progress)
 - `task done <id>` — complete (idempotent)
 - `task snooze <id> [--days N | --until <date>]` — reschedule

package/dist/do.js

@@ -2762,6 +2762,9 @@ class Index {
 function index(name) {
   return new IndexBuilderOn(false, name);
 }
+function uniqueIndex(name) {
+  return new IndexBuilderOn(true, name);
+}
 
 // ../../node_modules/drizzle-orm/pg-core/primary-keys.js
 function primaryKey(...config) {
@@ -4374,7 +4377,6 @@ var userSettings = pgTable("user_settings", {
 
 // ../../packages/schema/src/db/domain.ts
 var taskStatus = pgEnum("task_status", ["todo", "in_progress", "done", "cancelled"]);
-var taskPriority = pgEnum("task_priority", ["none", "low", "medium", "high"]);
 var habitMeasurementType = pgEnum("habit_measurement_type", [
   "binary",
   "quantitative",
@@ -4398,7 +4400,7 @@ var tasks = pgTable("tasks", {
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
   notes: text("notes"),
   status: taskStatus("status").notNull().default("todo"),
-  priority: taskPriority("priority").notNull().default("none"),
+  starred: boolean("starred").notNull().default(false),
   allDay: boolean("all_day").notNull().default(true),
   scheduledAt: timestamp("scheduled_at", { withTimezone: true }),
   startAt: timestamp("start_at", { withTimezone: true }),
@@ -4447,6 +4449,7 @@ var recurrenceRules = pgTable("recurrence_rules", {
   interval: integer("interval").notNull().default(1),
   freq: recurrenceFreq("freq"),
   byDay: text("by_day").array(),
+  timeOfDay: text("time_of_day"),
   until: timestamp("until", { withTimezone: true }),
   count: integer("count"),
   unit: recurrenceUnit("unit"),
@@ -4500,6 +4503,20 @@ var pushSubscriptions = pgTable("push_subscriptions", {
   auth: text("auth").notNull(),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
 }, (t) => [unique("push_subscriptions_endpoint_uniq").on(t.endpoint)]);
+// ../../packages/schema/src/db/products.ts
+var products = pgTable("products", {
+  id: text("id").primaryKey(),
+  tenantId: text("tenant_id").notNull().references(() => tenants.id),
+  name: text("name").notNull(),
+  normalizedName: text("normalized_name").notNull(),
+  category: text("category"),
+  baseUnit: text("base_unit"),
+  conversions: jsonb("conversions").$type().notNull().default({}),
+  createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
+}, (t) => [
+  uniqueIndex("products_tenant_name_key").on(t.tenantId, t.normalizedName),
+  index("products_tenant_idx").on(t.tenantId)
+]);
 // ../../packages/schema/src/db/shopping.ts
 var shoppingLists = pgTable("shopping_lists", {
   id: text("id").primaryKey().references(() => nodes.id),
@@ -4519,6 +4536,7 @@ var shoppingItems = pgTable("shopping_items", {
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
   listId: text("list_id").notNull().references(() => shoppingLists.id),
   title: text("title").notNull(),
+  productId: text("product_id").references(() => products.id),
   quantity: doublePrecision("quantity"),
   unit: text("unit"),
   isChecked: boolean("is_checked").notNull().default(false),
@@ -4529,12 +4547,14 @@ var shoppingItems = pgTable("shopping_items", {
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
 }, (t) => [
   index("shopping_items_list_order_idx").on(t.listId, t.sortOrder),
-  index("shopping_items_tenant_idx").on(t.tenantId)
+  index("shopping_items_tenant_idx").on(t.tenantId),
+  index("shopping_items_product_idx").on(t.productId)
 ]);
 // ../../packages/schema/src/db/inventory.ts
 var inventoryItems = pgTable("inventory_items", {
   id: text("id").primaryKey().references(() => nodes.id),
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
+  productId: text("product_id").references(() => products.id),
   quantity: doublePrecision("quantity").notNull().default(0),
   unit: text("unit"),
   category: text("category"),
@@ -4544,7 +4564,8 @@ var inventoryItems = pgTable("inventory_items", {
   notes: text("notes"),
   facet: jsonb("facet").$type()
 }, (t) => [
-  index("inventory_items_tenant_idx").on(t.tenantId)
+  index("inventory_items_tenant_idx").on(t.tenantId),
+  index("inventory_items_product_idx").on(t.productId)
 ]);
 // ../../packages/schema/src/db/collection.ts
 var collectionItems = pgTable("collection_items", {
@@ -4596,13 +4617,15 @@ var recipeIngredients = pgTable("recipe_ingredients", {
   tenantId: text("tenant_id").notNull().references(() => tenants.id),
   recipeId: text("recipe_id").notNull().references(() => recipes.id),
   name: text("name").notNull(),
+  productId: text("product_id").references(() => products.id),
   quantity: doublePrecision("quantity"),
   unit: text("unit"),
   sortOrder: integer("sort_order").notNull().default(0),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
 }, (t) => [
   index("recipe_ingredients_recipe_order_idx").on(t.recipeId, t.sortOrder),
-  index("recipe_ingredients_tenant_idx").on(t.tenantId)
+  index("recipe_ingredients_tenant_idx").on(t.tenantId),
+  index("recipe_ingredients_product_idx").on(t.productId)
 ]);
 var mealPlans = pgTable("meal_plans", {
   id: text("id").primaryKey().references(() => nodes.id),
@@ -19676,7 +19699,6 @@ var areaColorSchema = exports_external.enum(areaColor.enumValues);
 var reviewCadenceSchema = exports_external.enum(reviewCadence.enumValues);
 var projectStatusSchema = exports_external.enum(projectStatus.enumValues);
 var taskStatusSchema = exports_external.enum(taskStatus.enumValues);
-var taskPrioritySchema = exports_external.enum(taskPriority.enumValues);
 var routineKindSchema = exports_external.enum(routineKind.enumValues);
 var routineStepRefSchema = exports_external.enum(routineStepRef.enumValues);
 var routineRunStatusSchema = exports_external.enum(routineRunStatus.enumValues);
@@ -19789,7 +19811,7 @@ var updateTaskInputSchema = createUpdateSchema(tasks, {
   title: exports_external.string().min(1).optional(),
   parentId: ulidSchema.nullish()
 }).strict();
-var taskListFilterSchema = exports_external.enum(["all", "unsorted"]);
+var taskListFilterSchema = exports_external.enum(["all", "unsorted", "starred"]);
 // ../../packages/schema/src/contracts/habits.ts
 var habitSchema = createSelectSchema(habits);
 var habitEntrySchema = createSelectSchema(habitEntries, {
@@ -19821,12 +19843,17 @@ var createHabitEntryInputSchema = createInsertSchema(habitEntries, {
   source: habitEntrySourceSchema.default("manual"),
   occurredAt: exports_external.coerce.date().optional()
 }).omit({ tenantId: true, habitId: true, createdAt: true });
+var habitStreakStateSchema = exports_external.enum(["active", "recovering", "broken"]);
 var habitStreakSchema = exports_external.object({
   current: exports_external.number().int().nonnegative(),
   longest: exports_external.number().int().nonnegative(),
   periodValue: exports_external.number(),
   periodTarget: exports_external.number(),
-  satisfiedToday: exports_external.boolean()
+  satisfiedToday: exports_external.boolean(),
+  completionRate: exports_external.number().min(0).max(1),
+  state: habitStreakStateSchema,
+  graceBudget: exports_external.number().int().nonnegative(),
+  graceRemaining: exports_external.number().int().nonnegative()
 });
 var habitRoutineRefSchema = exports_external.object({
   id: ulidSchema,
@@ -19861,6 +19888,7 @@ var recurrenceRuleParams = {
   timezone: exports_external.string().min(1).default("UTC"),
   interval: exports_external.number().int().positive().default(1),
   mode: recurrenceModeSchema,
+  timeOfDay: exports_external.string().regex(/^([01]\d|2[0-3]):[0-5]\d$/, "time-of-day must be HH:MM (24h)").nullish(),
   freq: recurrenceFreqSchema.optional(),
   byDay: exports_external.array(byDayCodeSchema).optional(),
   until: exports_external.coerce.date().optional(),
@@ -20140,7 +20168,7 @@ var FEATURE_MODULES = [
   {
     key: "tasks",
     label: "Tasks",
-    description: "To-dos, due dates, and priorities.",
+    description: "To-dos, due dates, and starred focus.",
     group: "Track",
     defaultEnabled: true
   },
@@ -20333,6 +20361,19 @@ var reviewDayStatSchema = exports_external.object({
   completedOccurrences: exports_external.number().int().nonnegative()
 });
 var reviewStatsSchema = exports_external.array(reviewDayStatSchema);
+// ../../packages/schema/src/contracts/products.ts
+var productConversionsSchema = exports_external.record(exports_external.string(), exports_external.number());
+var productSchema = createSelectSchema(products, {
+  conversions: productConversionsSchema,
+  createdAt: exports_external.coerce.date()
+});
+var createProductInputSchema = createInsertSchema(products, {
+  id: ulidSchema,
+  name: exports_external.string().min(1),
+  category: exports_external.string().nullish(),
+  baseUnit: exports_external.string().nullish(),
+  conversions: productConversionsSchema.optional()
+}).omit({ tenantId: true, normalizedName: true, createdAt: true });
 // ../../packages/schema/src/contracts/shopping.ts
 var shoppingRecurrenceUnitSchema = exports_external.enum(["day", "week", "month"]);
 var shoppingListSchema = createSelectSchema(shoppingLists, {
@@ -20352,6 +20393,7 @@ var shoppingItemSchema = createSelectSchema(shoppingItems, {
 var shoppingItemInputSchema = createInsertSchema(shoppingItems, {
   id: ulidSchema,
   title: exports_external.string().min(1),
+  productId: ulidSchema.nullish(),
   quantity: exports_external.number().positive().nullish(),
   unit: exports_external.string().nullish(),
   isChecked: exports_external.boolean().optional(),
@@ -20517,6 +20559,7 @@ var inventoryItemSchema = createSelectSchema(inventoryItems, {
 });
 var createInventoryItemInputSchema = createInsertSchema(inventoryItems, {
   id: ulidSchema,
+  productId: ulidSchema.nullish(),
   quantity: exports_external.number().min(0).optional(),
   unit: exports_external.string().nullish(),
   category: exports_external.string().nullish(),
@@ -20531,6 +20574,7 @@ var createInventoryItemInputSchema = createInsertSchema(inventoryItems, {
   displayKind: inventoryDisplayKindSchema.optional()
 });
 var updateInventoryItemInputSchema = createUpdateSchema(inventoryItems, {
+  productId: ulidSchema.nullish(),
   quantity: exports_external.number().min(0).optional(),
   unit: exports_external.string().nullish(),
   category: exports_external.string().nullish(),
@@ -20642,6 +20686,7 @@ var recipeIngredientSchema = createSelectSchema(recipeIngredients, {
 var recipeIngredientInputSchema = exports_external.object({
   id: ulidSchema,
   name: exports_external.string().min(1),
+  productId: ulidSchema.nullish(),
   quantity: exports_external.number().positive().nullish(),
   unit: exports_external.string().nullish(),
   sortOrder: exports_external.number().int().min(0).optional()
@@ -20722,6 +20767,20 @@ var generateGroceryListInputSchema = exports_external.object({
   to: exports_external.coerce.date(),
   deduplicateInventory: exports_external.boolean().optional()
 }).strict();
+var cookedIngredientSchema = exports_external.object({
+  name: exports_external.string(),
+  unit: exports_external.string().nullable(),
+  quantity: exports_external.number().nullable(),
+  matched: exports_external.boolean(),
+  remaining: exports_external.number().nullable()
+});
+var mealPlanCookResultSchema = exports_external.object({
+  mealPlanId: ulidSchema,
+  recipeId: ulidSchema.nullable(),
+  servings: exports_external.number().int().nullable(),
+  consumedCount: exports_external.number().int().min(0),
+  ingredients: exports_external.array(cookedIngredientSchema)
+});
 // ../../packages/schema/src/contracts/notes.ts
 var noteSchema = createSelectSchema(notes);
 var createNoteInputSchema = createInsertSchema(notes, {
@@ -21601,13 +21660,12 @@ var automationConditionSchema = exports_external.object({
   op: automationConditionOpSchema,
   value: exports_external.unknown().optional()
 }).strict();
-var automationTaskPrioritySchema = exports_external.enum(["none", "low", "medium", "high"]);
 var automationActionSchema = exports_external.discriminatedUnion("type", [
   exports_external.object({
     type: exports_external.literal("create_task"),
     title: exports_external.string().min(1).max(200),
     notes: exports_external.string().max(2000).optional(),
-    priority: automationTaskPrioritySchema.optional()
+    starred: exports_external.boolean().optional()
   }).strict(),
   exports_external.object({ type: exports_external.literal("complete_task") }).strict(),
   exports_external.object({
@@ -22001,20 +22059,8 @@ function addMonths(d, months) {
 
 // ../../packages/schema/src/capture.ts
 var TAG_RE = /(?:^|\s)#([\p{L}\p{N}][\p{L}\p{N}_-]*)/gu;
-var PRIORITY_RE = /(?:^|\s)!([\p{L}]+)/gu;
+var STAR_RE = /(?:^|\s)!(star|flag|s|f)?(?=\s|$)/giu;
 var AREA_RE = /(?:^|\s)~([\p{L}\p{N}][\p{L}\p{N}_-]*)/gu;
-var PRIORITY_ALIASES = {
-  none: "none",
-  n: "none",
-  low: "low",
-  l: "low",
-  med: "medium",
-  medium: "medium",
-  m: "medium",
-  high: "high",
-  h: "high",
-  hi: "high"
-};
 function parseCapture(input, now) {
   const tags = [];
   for (const match of input.matchAll(TAG_RE)) {
@@ -22022,12 +22068,10 @@ function parseCapture(input, now) {
     if (tag && !tags.includes(tag))
       tags.push(tag);
   }
-  let priority;
-  for (const match of input.matchAll(PRIORITY_RE)) {
-    const token = match[1]?.toLowerCase();
-    const mapped = token ? PRIORITY_ALIASES[token] : undefined;
-    if (mapped)
-      priority = mapped;
+  let starred;
+  for (const _ of input.matchAll(STAR_RE)) {
+    starred = true;
+    break;
   }
   let area;
   for (const match of input.matchAll(AREA_RE)) {
@@ -22037,7 +22081,7 @@ function parseCapture(input, now) {
       break;
     }
   }
-  let stripped = blankMatches(input, [TAG_RE, PRIORITY_RE, AREA_RE]);
+  let stripped = blankMatches(input, [TAG_RE, STAR_RE, AREA_RE]);
   const when = now ? parseWhen(stripped, now) : undefined;
   if (when) {
     for (const span of [...when.spans].sort((a, b) => b.start - a.start)) {
@@ -22048,7 +22092,7 @@ function parseCapture(input, now) {
   return {
     title,
     tags,
-    ...priority ? { priority } : {},
+    ...starred ? { starred } : {},
     ...area ? { area } : {},
     ...when?.scheduledAt ? { scheduledAt: when.scheduledAt, allDay: when.allDay } : {},
     ...when?.recurrence ? { recurrence: when.recurrence } : {}
@@ -22538,7 +22582,7 @@ var automationPresets = [
           name: "Low stock \u2192 add to groceries",
           trigger: { entity: "inventory", action: "updated" },
           condition: { path: "value.lowStock", op: "eq", value: true },
-          action: { type: "create_task", title: "Restock low groceries", priority: "medium" }
+          action: { type: "create_task", title: "Restock low groceries" }
         }
       ]
     }
@@ -22571,8 +22615,8 @@ var automationPresets = [
   {
     key: "auto-task-overdue-bump",
     entity: "automation",
-    name: "Task overdue \u2192 bump priority",
-    description: "When a task goes overdue, raise a high-priority follow-up.",
+    name: "Task overdue \u2192 star a follow-up",
+    description: "When a task goes overdue, create a starred follow-up.",
     icon: "\u23F0",
     color: "#f59e0b",
     category: "Automations",
@@ -22581,10 +22625,10 @@ var automationPresets = [
         {
           ref: "automation",
           kind: "automation",
-          name: "Task overdue \u2192 bump priority",
+          name: "Task overdue \u2192 star a follow-up",
           trigger: { entity: "tasks", action: "updated" },
           condition: { path: "value.overdue", op: "eq", value: true },
-          action: { type: "create_task", title: "Reprioritise overdue task", priority: "high" }
+          action: { type: "create_task", title: "Reprioritise overdue task", starred: true }
         }
       ]
     }
@@ -22628,8 +22672,7 @@ var automationPresets = [
           condition: { path: "value.status", op: "eq", value: "finished" },
           action: {
             type: "create_task",
-            title: "Rate the book you just finished",
-            priority: "low"
+            title: "Rate the book you just finished"
           }
         }
       ]
@@ -24288,7 +24331,7 @@ function parseCapture2(input, now) {
 
 // src/meta.ts
 var CLI_NAME = "do";
-var VERSION = "1.68.0";
+var VERSION = "1.70.0";
 var API_PREFIX = "/api/v1";
 var DEFAULT_API_URL = "http://localhost:3001";
 
@@ -24816,14 +24859,18 @@ var COMMAND_SPECS = [
     path: ["capture"],
     summary: "Quick-add a task to the inbox from free text.",
     args: [
-      { name: "text", required: true, description: "Task title; may embed #tag and !priority." }
+      {
+        name: "text",
+        required: true,
+        description: "Task title; may embed #tag, ! (star) and ~area."
+      }
     ],
     flags: [],
     scopes: ["tasks:write"],
     returns: "Task",
     grammar: {
       "#tag": "Adds a tag. Repeatable: '#home #urgent'.",
-      "!priority": "Sets priority: !high|!medium|!low|!none (aliases: !h/!m/!l/!n). Last one wins."
+      "!": "Stars the task \u2014 the 1\u20132 things that matter (aliases: !star/!s/!flag/!f). Drives Today's focus and the starred filter."
     }
   },
   {
@@ -25414,10 +25461,10 @@ var STATUS_MARK = {
 function renderTask(data, mode) {
   const t = data;
   const mark = STATUS_MARK[t.status ?? ""] ?? "\u2022";
-  const prio = t.priority && t.priority !== "none" ? paint(mode, "yellow", `!${t.priority} `) : "";
+  const star = t.starred ? paint(mode, "yellow", "\u2605 ") : "";
   const when2 = t.scheduledAt ?? t.dueAt;
   const date6 = when2 ? paint(mode, "dim", `  (${shortDate(when2)})`) : "";
-  return `${mark} ${prio}${t.title ?? "(untitled)"}${date6}
+  return `${mark} ${star}${t.title ?? "(untitled)"}${date6}
   ${paint(mode, "dim", t.id)}`;
 }
 function renderToday(data, mode) {
@@ -25428,8 +25475,8 @@ function renderToday(data, mode) {
   const header = paint(mode, "bold", `Today \xB7 ${result.date} \xB7 ${result.count} item(s)`);
   const lines = result.items.map((item) => {
     const tag = paint(mode, bucketColor(item.bucket), `[${item.bucket}]`);
-    const prio = item.priority !== "none" ? ` !${item.priority}` : "";
-    return `  ${tag} ${item.title}${prio}  ${paint(mode, "dim", item.id)}`;
+    const star = item.starred ? paint(mode, "yellow", " \u2605") : "";
+    return `  ${tag} ${item.title}${star}  ${paint(mode, "dim", item.id)}`;
   });
   return [header, ...lines].join(`
 `);
@@ -25555,7 +25602,6 @@ function shortDate(iso) {
 
 // src/today.ts
 var OPEN_STATUSES = new Set(["todo", "in_progress"]);
-var PRIORITY_RANK = { high: 0, medium: 1, low: 2, none: 3 };
 function toDate(value) {
   if (value == null)
     return null;
@@ -25584,7 +25630,7 @@ function selectToday(tasks3, now) {
       id: task.id,
       title: task.title,
       status: task.status,
-      priority: task.priority,
+      starred: task.starred ?? false,
       bucket,
       scheduledAt: scheduled ? scheduled.toISOString() : null,
       dueAt: due ? due.toISOString() : null
@@ -25615,9 +25661,9 @@ function compareItems(a, b) {
   const byBucket = BUCKET_RANK[a.bucket] - BUCKET_RANK[b.bucket];
   if (byBucket !== 0)
     return byBucket;
-  const byPriority = (PRIORITY_RANK[a.priority] ?? 9) - (PRIORITY_RANK[b.priority] ?? 9);
-  if (byPriority !== 0)
-    return byPriority;
+  const byStar = Number(b.starred) - Number(a.starred);
+  if (byStar !== 0)
+    return byStar;
   const at = a.scheduledAt ?? a.dueAt ?? "";
   const bt = b.scheduledAt ?? b.dueAt ?? "";
   return at.localeCompare(bt);
@@ -25714,7 +25760,7 @@ var HANDLERS = {
       id,
       title: parsed.title,
       tags: parsed.tags,
-      ...parsed.priority ? { priority: parsed.priority } : {},
+      ...parsed.starred ? { starred: parsed.starred } : {},
       ...parsed.area ? { areaName: parsed.area } : {},
       ...parsed.scheduledAt ? { scheduledAt: parsed.scheduledAt, allDay: parsed.allDay } : {}
     });

package/package.json

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