@robbeverhelst/do 1.384.0 → 1.386.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.384.0";
+var VERSION = "1.386.0";
 var API_PREFIX = "/api/v1";
 var DEFAULT_API_URL = "http://localhost:3001";
 
@@ -19020,7 +19020,9 @@ var recipes = pgTable("recipes", {
   favorite: boolean4("favorite").notNull().default(false),
   kind: recipeKind("kind").notNull().default("recipe"),
   cookedWeightG: doublePrecision("cooked_weight_g"),
-  nutritionCache: jsonb("nutrition_cache").$type()
+  nutritionCache: jsonb("nutrition_cache").$type(),
+  photoUrl: text("photo_url"),
+  photoCredit: text("photo_credit")
 }, (t) => [
   index("recipes_tenant_idx").on(t.tenantId)
 ]);
@@ -19052,7 +19054,9 @@ var mealPlans = pgTable("meal_plans", {
   company: text("company"),
   leftoverPortions: integer2("leftover_portions"),
   leftoverEatBy: date5("leftover_eat_by", { mode: "string" }),
-  leftoverFrozen: boolean4("leftover_frozen").notNull().default(false)
+  leftoverFrozen: boolean4("leftover_frozen").notNull().default(false),
+  eaterUserIds: text("eater_user_ids").array().notNull().default([]),
+  guests: integer2("guests").notNull().default(0)
 }, (t) => [
   index("meal_plans_tenant_planned_idx").on(t.tenantId, t.plannedFor),
   check2("meal_plans_state_check", sql`${t.state} IN ('planned', 'cooked', 'out', 'unsure', 'draft')`)
@@ -25088,7 +25092,10 @@ var blockTemplateInstanceSchema = object({
   routineId: string2().nullable()
 });
 var PLAN_VS_RECORD_RANGES = [7, 30, 90];
+var PLAN_VS_RECORD_MONTH_RANGES = ["month", "six", "year", "all"];
+var planVsRecordMonthRangeSchema = _enum2(PLAN_VS_RECORD_MONTH_RANGES);
 var planVsRecordQuerySchema = object({
+  range: planVsRecordMonthRangeSchema.optional(),
   days: exports_coerce.number().refine((d) => PLAN_VS_RECORD_RANGES.includes(d), {
     message: "days must be 7, 30 or 90"
   }).default(30)
@@ -25142,6 +25149,7 @@ var planVsRecordSuggestionSchema = object({
 });
 var planVsRecordSchema = object({
   days: number2().int(),
+  range: planVsRecordMonthRangeSchema.nullable().default(null),
   since: string2().nullable(),
   recordedDays: number2().int(),
   week: array(planVsRecordDaySchema),
@@ -35262,7 +35270,9 @@ var weekMenuFields = {
   company: string2().max(120).nullish(),
   leftoverPortions: number2().int().positive().nullish(),
   leftoverEatBy: civilDate2.nullish(),
-  leftoverFrozen: boolean2().optional()
+  leftoverFrozen: boolean2().optional(),
+  eaterUserIds: array(ulidSchema).max(50).optional(),
+  guests: number2().int().min(0).max(99).optional()
 };
 var mealPlanSchema = createSelectSchema(mealPlans, {
   plannedFor: exports_coerce.date(),
@@ -35271,7 +35281,9 @@ var mealPlanSchema = createSelectSchema(mealPlans, {
   company: string2().nullable().default(null),
   leftoverPortions: number2().int().nullable().default(null),
   leftoverEatBy: string2().nullable().default(null),
-  leftoverFrozen: boolean2().default(false)
+  leftoverFrozen: boolean2().default(false),
+  eaterUserIds: array(string2()).default([]),
+  guests: number2().int().default(0)
 });
 var createMealPlanInputSchema = createInsertSchema(mealPlans, {
   id: ulidSchema,
@@ -35338,6 +35350,8 @@ var mealWeekSlotSchema = object({
   cook: mealWeekCookSchema.nullable(),
   company: string2().nullable(),
   notes: string2().nullable(),
+  eaters: array(mealWeekCookSchema).default([]),
+  guests: number2().int().min(0).default(0),
   time: string2().nullable()
 });
 var mealWeekDaySchema = object({
@@ -35370,7 +35384,8 @@ var mealWeekSchema = object({
     out: number2().int().min(0)
   }),
   leftovers: array(mealWeekLeftoverSchema),
-  draft: array(mealWeekDraftDaySchema).length(7)
+  draft: array(mealWeekDraftDaySchema).length(7),
+  openDrafts: array(mealWeekDraftDaySchema).default([])
 });
 
 // ../../packages/schema/src/operations/meal-plans.ts
@@ -35570,8 +35585,60 @@ var moneyOdooUndoResultSchema = object({
   line: string2()
 });
 
-// ../../packages/schema/src/contracts/money-net-worth.ts
+// ../../packages/schema/src/contracts/money-flow.ts
 var amount5 = string2();
+var MONEY_FLOW_START = "start";
+var moneyFlowQuerySchema = object({
+  from: union([moneyMonthSchema, literal(MONEY_FLOW_START)]).optional(),
+  to: moneyMonthSchema.optional(),
+  scope: moneyBudgetScopeSchema.optional()
+}).refine((q) => !q.from || q.from === MONEY_FLOW_START || !q.to || q.from <= q.to, {
+  message: "from must not be after to",
+  path: ["from"]
+});
+var moneyFlowSourceSchema = object({
+  kind: _enum2(["income", "moved_in"]),
+  categoryId: ulidSchema.nullable(),
+  name: string2(),
+  amount: amount5
+});
+var MONEY_FLOW_OUTS = [
+  "fixed",
+  "flexible",
+  "moved_out",
+  "goals",
+  "invested",
+  "kept"
+];
+var moneyFlowOutKindSchema = _enum2(MONEY_FLOW_OUTS);
+var moneyFlowOutSchema = object({
+  kind: moneyFlowOutKindSchema,
+  name: string2(),
+  amount: amount5
+});
+var moneyFlowCategorySchema = object({
+  categoryId: ulidSchema.nullable(),
+  name: string2(),
+  amount: amount5
+});
+var moneyFlowSchema = object({
+  scope: moneyBudgetScopeSchema,
+  from: moneyMonthSchema,
+  to: moneyMonthSchema,
+  through: moneyMonthSchema,
+  firstMonth: moneyMonthSchema.nullable(),
+  in: amount5,
+  sources: array(moneyFlowSourceSchema),
+  fromSavings: amount5,
+  outs: array(moneyFlowOutSchema),
+  fixed: array(moneyFlowCategorySchema),
+  flexible: array(moneyFlowCategorySchema),
+  unsorted: amount5,
+  saved: amount5
+});
+
+// ../../packages/schema/src/contracts/money-net-worth.ts
+var amount6 = string2();
 var moneySnapshotSourceSchema = _enum2(moneySnapshotSource.enumValues);
 var moneyNetWorthQuerySchema = object({
   scope: moneyBudgetScopeSchema.optional(),
@@ -35579,9 +35646,9 @@ var moneyNetWorthQuerySchema = object({
 });
 var moneyNetWorthPointSchema = object({
   month: moneyMonthSchema,
-  total: amount5.nullable(),
-  have: amount5.nullable(),
-  owe: amount5.nullable()
+  total: amount6.nullable(),
+  have: amount6.nullable(),
+  owe: amount6.nullable()
 });
 var moneyNetWorthAccountSchema = object({
   accountId: ulidSchema,
@@ -35589,7 +35656,7 @@ var moneyNetWorthAccountSchema = object({
   kind: moneyAccountKindSchema,
   visibility: _enum2(NODE_VISIBILITY_VALUES),
   currency: string2(),
-  value: amount5,
+  value: amount6,
   source: moneySnapshotSourceSchema,
   month: moneyMonthSchema,
   pensionSubtype: moneyPensionSubtypeSchema.nullable(),
@@ -35606,11 +35673,11 @@ var moneyNetWorthUnknownSchema = moneyNetWorthAccountSchema.pick({
 var moneyNetWorthSchema = object({
   scope: moneyBudgetScopeSchema,
   month: moneyMonthSchema,
-  total: amount5,
-  have: amount5,
-  owe: amount5,
-  liquid: amount5,
-  locked: amount5,
+  total: amount6,
+  have: amount6,
+  owe: amount6,
+  liquid: amount6,
+  locked: amount6,
   points: array(moneyNetWorthPointSchema),
   accounts: array(moneyNetWorthAccountSchema),
   complete: boolean2(),
@@ -35625,7 +35692,7 @@ var moneySnapshotSchema = object({
   id: ulidSchema,
   accountId: ulidSchema,
   month: moneyMonthSchema,
-  value: amount5,
+  value: amount6,
   source: moneySnapshotSourceSchema
 });
 
@@ -35715,22 +35782,22 @@ var moneySettlementViewSchema = object({
 });
 
 // ../../packages/schema/src/contracts/money-year.ts
-var amount6 = string2();
+var amount7 = string2();
 var moneyYearQuerySchema = object({
   year: exports_coerce.number().int().min(2000).max(2100).optional(),
   scope: moneyBudgetScopeSchema.optional()
 });
 var moneyYearMonthSchema = object({
   month: moneyMonthSchema,
-  income: amount6,
-  spent: amount6
+  income: amount7,
+  spent: amount7
 });
 var moneyYearCategorySchema = object({
   categoryId: ulidSchema.nullable(),
   name: string2(),
   group: _enum2(["fixed", "flexible", "income"]).nullable(),
-  amount: amount6,
-  lastYear: amount6
+  amount: amount7,
+  lastYear: amount7
 });
 var MONEY_YEAR_STREAM_CHANGES = ["new", "stopped", "up", "down", "same"];
 var moneyYearStreamChangeSchema = _enum2(MONEY_YEAR_STREAM_CHANGES);
@@ -35739,8 +35806,8 @@ var moneyYearStreamSchema = object({
   title: string2(),
   cadence: moneyCadenceSchema,
   visibility: _enum2(NODE_VISIBILITY_VALUES),
-  thisYear: amount6,
-  lastYear: amount6,
+  thisYear: amount7,
+  lastYear: amount7,
   change: moneyYearStreamChangeSchema
 });
 var moneyYearGoalSchema = object({
@@ -35749,14 +35816,14 @@ var moneyYearGoalSchema = object({
   visibility: _enum2(NODE_VISIBILITY_VALUES),
   status: moneyGoalStatusSchema,
   projectTitle: string2().nullable(),
-  thisYear: amount6,
-  saved: amount6,
-  target: amount6
+  thisYear: amount7,
+  saved: amount7,
+  target: amount7
 });
 var moneyYearTotalsSchema = object({
-  income: amount6,
-  spent: amount6,
-  saved: amount6
+  income: amount7,
+  spent: amount7,
+  saved: amount7
 });
 var moneyYearSchema = object({
   year: number2().int(),
@@ -36410,6 +36477,23 @@ var moneyOperations = defineOperations({
     response: { description: "The year." },
     errors: { 400: true }
   },
+  flow: {
+    method: "get",
+    path: "/money/flow",
+    scopes: ["finance:read"],
+    tag: "Money",
+    summary: "Get where the money went",
+    description: "What came in over a span of months and where it went, as the flow chart draws it: `sources` (each income category, null `categoryId` for income not sorted yet, and with a `scope` narrower than `all` `moved_in`, money moved in from the other budget accounts; biggest first) adding up to `in`; `outs` in the chart's order, only what's above zero: `fixed` and `flexible` spending (refunds netted, plain transfers left out; what isn't sorted yet sits under flexible), `moved_out` (to the other budget accounts, with a narrower scope), `goals` (a deposit linked to a goal, or spending toward it from the budget), `invested` (transfers into an investment or a pension account) and `kept` (what's left); `fromSavings` when more went out than came in. `fixed` and `flexible` by category, biggest first, with `unsorted`, and `saved` (goals, invested and kept). Read over the accounts counted in the budget; another member's Only me account or goal never adds to it. `from` and `to` are months (`YYYY-MM`; `to` this month and `from` `to` by default, `from=start` the ledger's first month, `firstMonth`); a span under way counts to this month (`through`). `scope`: `all` (default), `space` or `owner`.",
+    query: [
+      { name: "from", description: "The first month, YYYY-MM, or start (default: to)." },
+      { name: "to", description: "The last month, YYYY-MM (default this one)." },
+      { name: "scope", description: "all, space or owner." }
+    ],
+    querySchema: moneyFlowQuerySchema,
+    status: 200,
+    response: { description: "The flow." },
+    errors: { 400: true }
+  },
   netWorthRead: {
     method: "get",
     path: "/money/net-worth",
@@ -38979,8 +39063,12 @@ var readOperations = defineOperations({
 var recipeSchema = createSelectSchema(recipes, {
   kind: (s) => s.default("recipe"),
   cookedWeightG: number2().positive().nullable().default(null),
-  nutritionCache: recipeNutritionCacheSchema.nullable().default(null)
+  nutritionCache: recipeNutritionCacheSchema.nullable().default(null),
+  photoUrl: string2().nullable().default(null),
+  photoCredit: string2().nullable().default(null)
 });
+var photoUrlSchema = string2().trim().url().max(2048).refine((u) => /^https?:\/\//i.test(u), "an http(s) URL");
+var photoCreditSchema = string2().trim().max(200);
 var recipeIngredientSchema = createSelectSchema(recipeIngredients, {
   createdAt: exports_coerce.date()
 });
@@ -38998,7 +39086,9 @@ var createRecipeInputSchema = createInsertSchema(recipes, {
   prepMinutes: number2().int().min(0).nullish(),
   cookMinutes: number2().int().min(0).nullish(),
   tags: array(string2()).optional(),
-  cookedWeightG: number2().positive().nullish()
+  cookedWeightG: number2().positive().nullish(),
+  photoUrl: photoUrlSchema.nullish(),
+  photoCredit: photoCreditSchema.nullish()
 }).omit({ tenantId: true, nutritionCache: true }).extend({
   title: string2().min(1),
   parentId: ulidSchema.nullish(),
@@ -39010,7 +39100,9 @@ var updateRecipeInputSchema = createUpdateSchema(recipes, {
   prepMinutes: number2().int().min(0).nullish(),
   cookMinutes: number2().int().min(0).nullish(),
   tags: array(string2()).optional(),
-  cookedWeightG: number2().positive().nullish()
+  cookedWeightG: number2().positive().nullish(),
+  photoUrl: photoUrlSchema.nullish(),
+  photoCredit: photoCreditSchema.nullish()
 }).omit({ id: true, tenantId: true, nutritionCache: true }).extend({
   title: string2().min(1).optional(),
   parentId: ulidSchema.nullish(),
@@ -41441,9 +41533,14 @@ var timeBlockOperations = defineOperations({
     scopes: ["calendar:read"],
     tag: "Calendar",
     summary: "Plan vs what happened",
-    description: 'How the key\'s member\'s life blocks went against their plan over the last `days` (7, 30 or 90; default 30): `week`, last week (Monday to Sunday) as strips (each block\'s planned and recorded minutes into the day, and the day in words, "Held mostly", "Evening went elsewhere"); `hours`, where that week\'s time went per group of kinds, recorded against planned; `moves`, which blocks move over the range\'s weekdays and how, in words ("Lunch \xB7 60\u201375 min \xB7 Runs about twice the 30 planned \xB7 17 of 22"), counting a record once it\'s confirmed or 48 h old, each with `latestId` (its latest block); `evening`, the weekday evenings\' tasks (Tasks planned from 17:00) held, in words with the days work ran past 17:30, and a confidence word, or null; and `suggestion`, one template length to change ("plan it like it is", apply with `PATCH /api/v1/block-templates/{id}` `{ minutes }`) or null. Moving is information, not a miss: no score, no streak.',
+    description: "How the key's member's life blocks went against their plan over the last `days` (7, 30 or 90; default 30), or a month `range` in its place (Review's Range menu: `month`, this month so far; `six`, from the first of the month five back; `year`, this year so far; `all`, since the first recorded block; the response says its `days` and `range`): `week`, last week (Monday to Sunday) as strips (each block's planned and recorded minutes into the day, and the day in words, \"Held mostly\", \"Evening went elsewhere\"); `hours`, where that week's time went per group of kinds, recorded against planned; `moves`, which blocks move over the range's weekdays and how, in words (\"Lunch \xB7 60\u201375 min \xB7 Runs about twice the 30 planned \xB7 17 of 22\"), counting a record once it's confirmed or 48 h old, each with `latestId` (its latest block); `evening`, the weekday evenings' tasks (Tasks planned from 17:00) held, in words with the days work ran past 17:30, and a confidence word, or null; and `suggestion`, one template length to change (\"plan it like it is\", apply with `PATCH /api/v1/block-templates/{id}` `{ minutes }`) or null. Moving is information, not a miss: no score, no streak.",
     query: [
-      { name: "days", description: "7, 30 (default) or 90.", type: "integer", enum: [7, 30, 90] }
+      { name: "days", description: "7, 30 (default) or 90.", type: "integer", enum: [7, 30, 90] },
+      {
+        name: "range",
+        description: "month, six, year or all, in place of days.",
+        enum: ["month", "six", "year", "all"]
+      }
     ],
     querySchema: planVsRecordQuerySchema,
     status: 200,
@@ -54361,6 +54458,33 @@ var commands34 = [
       render: renderRecord
     })
   }),
+  defineCommand({
+    operation: moneyOperations.flow,
+    path: ["money", "flow"],
+    summary: "Where the money went over a span of months: in by source, out to fixed, flexible, goals, invested and kept.",
+    args: [],
+    flags: [
+      {
+        name: "from",
+        type: "string",
+        description: "The first month, YYYY-MM, or start (default: --to)."
+      },
+      { name: "to", type: "string", description: "The last month, YYYY-MM (default this one)." },
+      { name: "scope", type: "string", description: "all (default) | space | owner." }
+    ],
+    returns: "MoneyFlow",
+    notes: ". sources (income by category, moved_in with a narrower scope) adding up to in; outs in the chart's order (fixed \xB7 flexible \xB7 moved_out \xB7 goals \xB7 invested \xB7 kept), only what's above zero; fromSavings when more went out than came in; fixed and flexible by category, with unsorted (what isn't sorted sits under flexible) and saved. `do money flow --from 2026-05 --to 2026-10`; `--from start` reads since the ledger begins.",
+    run: async ({ flags, requireClient }) => ({
+      data: await requireClient().get(pathOf(moneyOperations.flow), {
+        query: {
+          from: flagString(flags, "from"),
+          to: flagString(flags, "to"),
+          scope: flagString(flags, "scope")
+        }
+      }),
+      render: renderRecord
+    })
+  }),
   defineCommand({
     operation: moneyOperations.netWorthRead,
     path: ["money", "net-worth"],
@@ -59413,16 +59537,27 @@ var commands58 = [
       path: ["time-blocks", "plan-vs-record"],
       summary: "How the life blocks went against their plan: last week day by day, where the time went, which blocks move (in words), and one template change worth making.",
       args: [],
-      flags: [{ name: "days", type: "string", description: "7, 30 (default) or 90." }],
+      flags: [
+        { name: "days", type: "string", description: "7, 30 (default) or 90." },
+        {
+          name: "range",
+          type: "string",
+          description: "month | six | year | all (Review's months), in place of --days."
+        }
+      ],
       scopes: [...timeBlockOperations.planVsRecord.scopes],
       returns: "PlanVsRecord",
-      notes: `${routeOf(timeBlockOperations.planVsRecord)}?days= (plan vs record). No score, no streak.`
+      notes: `${routeOf(timeBlockOperations.planVsRecord)}?days= or ?range= (plan vs record). No score, no streak.`
     },
     run: async ({ flags, requireClient }) => {
       const days = flagString(flags, "days");
+      const range = flagString(flags, "range");
       return {
         data: await requireClient().get(pathOf(timeBlockOperations.planVsRecord), {
-          query: days === undefined ? {} : { days }
+          query: {
+            ...days === undefined ? {} : { days },
+            ...range === undefined ? {} : { range }
+          }
         }),
         render: renderRecord
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robbeverhelst/do",
-  "version": "1.384.0",
+  "version": "1.386.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",