@robbeverhelst/do 1.333.0 → 1.334.0

package/dist/do.js

@@ -983,6 +983,10 @@ function parseArgs(argv, booleanFlags = GLOBAL_BOOLEAN_FLAGS) {
   const positionals = [];
   const flags = {};
   let positionalOnly = false;
+  const setValue = (name, value) => {
+    const was = flags[name];
+    flags[name] = typeof was === "string" ? [was, value] : Array.isArray(was) ? [...was, value] : value;
+  };
   for (let i = 0;i < argv.length; i++) {
     const token = argv[i];
     if (token === undefined)
@@ -999,7 +1003,7 @@ function parseArgs(argv, booleanFlags = GLOBAL_BOOLEAN_FLAGS) {
       const body = token.slice(2);
       const eq = body.indexOf("=");
       if (eq !== -1) {
-        flags[body.slice(0, eq)] = body.slice(eq + 1);
+        setValue(body.slice(0, eq), body.slice(eq + 1));
         continue;
       }
       if (booleans.has(body)) {
@@ -1008,7 +1012,7 @@ function parseArgs(argv, booleanFlags = GLOBAL_BOOLEAN_FLAGS) {
       }
       const next = argv[i + 1];
       if (next !== undefined && (next === "-" || !next.startsWith("-"))) {
-        flags[body] = next;
+        setValue(body, next);
         i++;
       } else {
         flags[body] = true;
@@ -1030,7 +1034,11 @@ function parseArgs(argv, booleanFlags = GLOBAL_BOOLEAN_FLAGS) {
 }
 function flagString(flags, name) {
   const v = flags[name];
-  return typeof v === "string" ? v : undefined;
+  return typeof v === "string" ? v : Array.isArray(v) ? v.at(-1) : undefined;
+}
+function flagStrings(flags, name) {
+  const v = flags[name];
+  return typeof v === "string" ? [v] : Array.isArray(v) ? v : [];
 }
 function flagBool(flags, name) {
   return flags[name] === true;
@@ -14410,7 +14418,7 @@ var configError = (message) => new CliError("config", message, EXIT.CONFIG);
 
 // src/meta.ts
 var CLI_NAME = "do";
-var VERSION = "1.333.0";
+var VERSION = "1.334.0";
 var API_PREFIX = "/api/v1";
 var DEFAULT_API_URL = "http://localhost:3001";
 
@@ -17867,6 +17875,7 @@ var automationRuns = pgTable("automation_runs", {
   automationId: text("automation_id").notNull().references(() => automations.id),
   eventType: text("event_type").notNull(),
   eventEntityId: text("event_entity_id").notNull(),
+  eventValue: jsonb("event_value"),
   status: automationRunStatus("status").notNull(),
   detail: text("detail"),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
@@ -20424,7 +20433,8 @@ var animalDayCountSchema = object({ day: string2(), count: number2().int() });
 var animalWeightPointSchema = object({
   day: string2(),
   grams: number2(),
-  at: exports_coerce.date()
+  at: exports_coerce.date(),
+  note: string2().nullish()
 });
 var animalFileSchema = object({
   id: ulidSchema,
@@ -20545,6 +20555,7 @@ var animalLogInputSchema = discriminatedUnion("kind", [
     kind: literal("weight"),
     value: number2().positive().max(200000),
     unit: _enum2(["g", "kg"]).default("g"),
+    note: string2().trim().min(1).max(120).optional(),
     occurredAt: occurredAtSchema
   }).strict(),
   object({
@@ -22030,13 +22041,25 @@ var occurrenceSchema = createSelectSchema(occurrences, {
   completedAt: exports_coerce.date().nullable()
 });
 var byDayCodeSchema = _enum2(["MO", "TU", "WE", "TH", "FR", "SA", "SU"]);
+var byDayOrdinalSchema = _enum2(["1", "2", "3", "4", "-1"]);
+var byDaySchema = union([
+  byDayCodeSchema,
+  templateLiteral([byDayOrdinalSchema, byDayCodeSchema])
+]);
+var BY_DAY_RE = /^(-1|[1-4])?(MO|TU|WE|TH|FR|SA|SU)$/;
+function parseByDay(code) {
+  const m = BY_DAY_RE.exec(code);
+  if (!m)
+    return null;
+  return { ordinal: m[1] ? Number(m[1]) : null, weekday: m[2] };
+}
 var recurrenceRuleParams = {
   timezone: string2().min(1).default("UTC"),
   interval: number2().int().positive().default(1),
   mode: recurrenceModeSchema,
   timeOfDay: string2().regex(/^([01]\d|2[0-3]):[0-5]\d$/, "time-of-day must be HH:MM (24h)").nullish(),
   freq: recurrenceFreqSchema.optional(),
-  byDay: array(byDayCodeSchema).optional(),
+  byDay: array(byDaySchema).optional(),
   until: exports_coerce.date().optional(),
   count: number2().int().positive().optional(),
   unit: recurrenceUnitSchema.optional(),
@@ -22046,6 +22069,14 @@ function refineRecurrenceRule(v, ctx) {
   if (v.mode === "rigid" && !v.freq) {
     ctx.addIssue({ code: "custom", path: ["freq"], message: "rigid rules require a freq" });
   }
+  const ordinal = v.byDay?.findIndex((code) => parseByDay(code)?.ordinal != null) ?? -1;
+  if (ordinal >= 0 && v.freq !== "monthly" && v.freq !== "yearly") {
+    ctx.addIssue({
+      code: "custom",
+      path: ["byDay", ordinal],
+      message: "an ordinal weekday (1SU, -1FR) needs a monthly or yearly freq"
+    });
+  }
   if (v.mode === "flexible") {
     if (!v.unit) {
       ctx.addIssue({ code: "custom", path: ["unit"], message: "flexible rules require a unit" });
@@ -22437,6 +22468,8 @@ var collectionEntries = pgTable("collection_entries", {
   fileIds: text("file_ids").array().notNull().default([]),
   minutes: integer2("minutes"),
   ops: jsonb("ops").$type().notNull().default([]),
+  chapter: text("chapter"),
+  linkedNoteId: text("linked_note_id").references(() => nodes.id, { onDelete: "set null" }),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
 }, (t) => [
   index("collection_entries_item_occurred_idx").on(t.itemId, t.occurredOn),
@@ -22548,8 +22581,11 @@ var collectionEntrySchema = createSelectSchema(collectionEntries, {
   taskId: string2().nullable().default(null),
   fileIds: array(string2()).default([]),
   minutes: number2().int().nullable().default(null),
-  ops: array(unknown()).default([])
+  ops: array(unknown()).default([]),
+  chapter: string2().nullable().default(null),
+  linkedNoteId: string2().nullable().default(null)
 });
+var entryChapterSchema = string2().trim().min(1).max(60);
 var entryCostSchema = number2().min(0).max(1e7).multipleOf(0.01);
 var entryFileIdsSchema = array(ulidSchema).max(20);
 var createCollectionEntryInputSchema = createInsertSchema(collectionEntries, {
@@ -22561,7 +22597,9 @@ var createCollectionEntryInputSchema = createInsertSchema(collectionEntries, {
   cost: entryCostSchema.nullish(),
   contactId: ulidSchema.nullish(),
   taskId: ulidSchema.nullish(),
-  fileIds: entryFileIdsSchema.optional()
+  fileIds: entryFileIdsSchema.optional(),
+  chapter: entryChapterSchema.nullish(),
+  linkedNoteId: ulidSchema.nullish()
 }).omit({ tenantId: true, itemId: true, createdAt: true, minutes: true, ops: true });
 var updateCollectionEntryInputSchema = object({
   occurredOn: string2().regex(/^\d{4}-\d{2}-\d{2}$/, "must be an ISO date (YYYY-MM-DD)").optional(),
@@ -22570,7 +22608,9 @@ var updateCollectionEntryInputSchema = object({
   kind: collectionEntryKindSchema.optional(),
   cost: entryCostSchema.nullish(),
   contactId: ulidSchema.nullish(),
-  fileIds: entryFileIdsSchema.optional()
+  fileIds: entryFileIdsSchema.optional(),
+  chapter: entryChapterSchema.nullish(),
+  linkedNoteId: ulidSchema.nullish()
 }).strict();
 var collectionItemViewSchema = collectionItemSchema.extend({
   title: string2(),
@@ -22643,6 +22683,7 @@ var collectionLogInputSchema = object({
   status: string2().trim().min(1).max(40).optional(),
   rating: collectionRatingSchema.nullish(),
   note: string2().max(2000).nullish(),
+  chapter: entryChapterSchema.nullish(),
   said: string2().trim().min(1).max(500).optional(),
   occurredOn: string2().regex(/^\d{4}-\d{2}-\d{2}$/, "must be an ISO date (YYYY-MM-DD)").optional()
 }).strict();
@@ -25566,13 +25607,19 @@ var moneyGoalLineSchema = createSelectSchema(moneyGoalLines, {
   createdAt: exports_coerce.date(),
   updatedAt: exports_coerce.date()
 });
+var MONEY_GOAL_SAVED_FROM = ["account", "account_share", "contributions"];
+var moneyGoalSavedFromSchema = _enum2(MONEY_GOAL_SAVED_FROM);
 var moneyGoalViewSchema = moneyGoalSchema.extend({
   title: string2(),
   visibility: _enum2(NODE_VISIBILITY_VALUES),
   accountTitle: string2().nullable(),
   accountBalance: amount.nullable(),
+  accountBalanceKnown: boolean2().nullable(),
   projectTitle: string2().nullable(),
   saved: amount,
+  savedFrom: moneyGoalSavedFromSchema,
+  remaining: amount,
+  monthlyNeed: amount.nullable(),
   linesPlanned: amount,
   linesPaid: amount
 });
@@ -31268,6 +31315,140 @@ var journalExportSchema = object({
   nextSince: exports_coerce.date()
 });
 
+// ../../packages/schema/src/contracts/journal-private.ts
+var JOURNAL_PRIVATE_TERMS = {
+  alcohol: [
+    "alcohol*",
+    "drunk*",
+    "drink*",
+    "beer*",
+    "wine*",
+    "whisky",
+    "whiskey",
+    "vodka*",
+    "gin",
+    "rum",
+    "tequila*",
+    "cocktail*",
+    "hangover*",
+    "hungover",
+    "tipsy",
+    "booze*",
+    "sober*",
+    "sobriety",
+    "bier*",
+    "wijn*",
+    "drank*",
+    "dronken*",
+    "borrel*",
+    "pint",
+    "pints",
+    "pintje*",
+    "kater*",
+    "zuipen",
+    "gezopen"
+  ],
+  smoking: [
+    "smok*",
+    "cigar*",
+    "tobacco",
+    "nicotine",
+    "vape*",
+    "vaping",
+    "roken",
+    "rook",
+    "rookte*",
+    "gerookt",
+    "roker*",
+    "sigaar*",
+    "sigaret*",
+    "tabak*",
+    "peuk*",
+    "vapen"
+  ],
+  cannabis: [
+    "cannabis",
+    "weed",
+    "hash",
+    "hashish",
+    "marijuana",
+    "joint",
+    "joints",
+    "jointje*",
+    "stoned",
+    "thc",
+    "cbd",
+    "edibles",
+    "wiet*",
+    "hasj*",
+    "blowen",
+    "blowt",
+    "geblowd"
+  ],
+  drugs: [
+    "drug*",
+    "cocaine",
+    "coca\xEFne",
+    "coke",
+    "mdma",
+    "ecstasy",
+    "xtc",
+    "ketamine",
+    "lsd",
+    "shrooms",
+    "paddo*",
+    "amphetamine*",
+    "heroin*",
+    "hero\xEFne",
+    "opioid*"
+  ],
+  relapse: [
+    "relaps*",
+    "craving*",
+    "rehab",
+    "aa meeting*",
+    "terugval*",
+    "hervallen",
+    "afkick*",
+    "ontwenning*"
+  ],
+  fertility: [
+    "fertil*",
+    "ivf",
+    "iui",
+    "ovulat*",
+    "conceiv*",
+    "conception",
+    "pregnan*",
+    "sperm*",
+    "embryo*",
+    "miscarr*",
+    "ttc",
+    "vruchtbaar*",
+    "ovulatie",
+    "eisprong",
+    "zwanger*",
+    "sperma*",
+    "miskraam",
+    "kinderwens"
+  ]
+};
+var LETTER = "[\\p{L}\\p{N}_]";
+var PRIVATE = new RegExp(`(?<!${LETTER})(?:${Object.values(JOURNAL_PRIVATE_TERMS).flat().map((term) => {
+  const stem = term.replace(/\*$/, "").replace(/\s+/g, "\\s+");
+  return term.endsWith("*") ? `${stem}${LETTER}*` : stem;
+}).join("|")})(?!${LETTER})`, "iu");
+function isPrivateLine(line) {
+  return PRIVATE.test(line);
+}
+function withoutPrivateLines(text) {
+  const kept = text.split(/\r?\n/).filter((line) => !isPrivateLine(line)).join(`
+`).replace(/\n{3,}/g, `
+
+`).trim();
+  return kept || null;
+}
+
 // ../../packages/schema/src/contracts/journal-import.ts
 var journalImportBatchSchema = string2().regex(/^\d{4}-(0[1-9]|1[0-2])$/, "a batch is a month (YYYY-MM)");
 var journalImportEntrySchema = _enum2(["summary", "retro", "log"]);
@@ -31278,6 +31459,7 @@ var journalImportFoundSchema = object({
   documents: number2().int().nonnegative().optional(),
   habits: number2().int().nonnegative().optional()
 }).strict();
+var keptLine = (max) => string2().trim().min(1).max(max).transform((v) => isPrivateLine(v) ? null : v).nullish();
 var JOURNAL_IMPORT_MAX_ITEMS = 400;
 var journalImportItemInputSchema = object({
   day: journalDateSchema,
@@ -31285,12 +31467,12 @@ var journalImportItemInputSchema = object({
   sourceHash: string2().trim().min(1).max(128),
   entry: journalImportEntrySchema.default("log"),
   hasCheck: boolean2().default(false),
-  title: string2().trim().min(1).max(200).nullish(),
-  body: string2().trim().min(1).max(20000).nullish(),
+  title: keptLine(200),
+  body: string2().trim().min(1).max(20000).transform(withoutPrivateLines).nullish(),
   rating: number2().min(1).max(10).nullish(),
-  ratingQuestion: string2().trim().min(1).max(80).nullish(),
+  ratingQuestion: keptLine(80),
   sleep: number2().min(0).max(24).nullish(),
-  highlight: string2().trim().min(1).max(200).nullish(),
+  highlight: keptLine(200),
   milestoneCandidate: boolean2().default(false),
   health: boolean2().default(false),
   found: journalImportFoundSchema.default({})
@@ -31356,8 +31538,25 @@ var journalImportAnswerInputSchema = object({
   rating: number2().min(1).max(10).nullable().optional(),
   skip: boolean2().optional()
 }).strict().refine((v) => Object.keys(v).length > 0, { message: "nothing to answer" });
+var journalImportRatingAnswerSchema = object({ day: journalDateSchema, rating: number2().min(1).max(10) }).strict();
+var journalImportApproveInputSchema = object({
+  batch: journalImportBatchSchema.optional(),
+  all: literal(true).optional(),
+  ratings: array(journalImportRatingAnswerSchema).max(JOURNAL_IMPORT_MAX_ITEMS).default([])
+}).strict().refine((v) => v.batch !== undefined !== (v.all === true), {
+  message: "approve one batch or all: send batch or all, not both"
+}).refine((v) => new Set(v.ratings.map((r) => r.day)).size === v.ratings.length, {
+  message: "one rating per day",
+  path: ["ratings"]
+});
+var journalImportOpenDaySchema = object({
+  day: journalDateSchema,
+  ratingQuestion: string2()
+});
 var journalImportApproveSchema = object({
   imported: number2().int(),
+  batches: array(journalImportBatchSchema).default([]),
+  open: array(journalImportOpenDaySchema).default([]),
   overview: journalImportOverviewSchema
 });
 
@@ -31745,12 +31944,25 @@ var journalOperations = defineOperations({
     scopes: ["journal:write"],
     tag: "Journal",
     summary: "Stage daily notes for the backfill",
-    description: "Stage parsed daily notes (`do journal import push <dir>`): one item per day (at most 400 a request) with its source file and hash, what becomes its entry (`summary`, `retro` or `log`), a one-liner, the summary's text (health lines left out), a clear `rating` or a `ratingQuestion` (\"~5/10\"), a highlight, whether it may be a milestone or had health lines, and the links counted. Nothing is written into the Journal: the member reviews and approves each month in the app, and a key can't approve. A day still waiting is replaced; one already imported is left alone (`alreadyImported`). Staged days stand behind the Journal's wall.",
+    description: "Stage parsed daily notes (`do journal import push <dir>`): one item per day (at most 400 a request) with its source file and hash, what becomes its entry (`summary`, `retro` or `log`), a one-liner, the summary's text (health lines left out), a clear `rating` or a `ratingQuestion` (\"~5/10\"), a highlight, whether it may be a milestone or had health lines, and the links counted. A line about drinking, smoking, cannabis or other drugs, relapse or fertility is stripped from the title, text, highlight and rating question here, whatever parsed the day. Nothing is written into the Journal until a batch is approved (`journal_import_approve`, or the member's Approve in the app). A day still waiting is replaced; one already imported is left alone (`alreadyImported`). Staged days stand behind the Journal's wall.",
     body: journalImportUploadInputSchema,
     status: 200,
     response: { description: "How the upload went.", view: "JournalImportUpload" },
     errors: { 400: true }
   },
+  approveImport: {
+    method: "post",
+    path: "/journal/imports/approve",
+    scopes: ["journal:write"],
+    tag: "Journal",
+    summary: "Approve staged days into the Journal",
+    description: 'Write staged days into the Journal (`do journal import approve <YYYY-MM|--all>`): one batch (`batch`, a month `YYYY-MM`) or every staged batch (`all: true`), never both. `ratings` answers the rating questions inline, one per day (`[{"day":"2026-10-03","rating":7}]`, 1 to 10). A day whose question has no answer stays staged and comes back in `open` with its question; the rest are written as imports (one-liner, summary, highlight, the `rating` and `sleep` Metrics), and a day the Journal already has keeps what\'s there and only gains a missing rating or sleep. An agent\'s approve goes through the same writes as `journal_write_day`: it shows in the member\'s change list with Undo, and past the bulk limit it waits for the member\'s confirmation (428). Lines about drinking, smoking, drugs, relapse or fertility are never written. 400 when a rating names a day that isn\'t waiting in the batch, or nothing is ready and nothing is open.',
+    body: journalImportApproveInputSchema,
+    status: 200,
+    response: { description: "How the approve went.", view: "JournalImportApprove" },
+    errors: { 400: true },
+    operationId: "journal_import_approve"
+  },
   importOverview: {
     method: "get",
     path: "/journal/imports",
@@ -33674,7 +33886,7 @@ var moneyOperations = defineOperations({
     scopes: ["finance:read"],
     tag: "Money",
     summary: "List money goals",
-    description: "The goals this key may see (the household's, and its member's Only me ones), soonest target first: `targetAmount`, `targetOn`, `monthlyPlan`, the pot's account and Project by name, `saved` (`savedBefore` plus the transactions counted toward it) and the lines' `linesPlanned`/`linesPaid`.",
+    description: "The goals this key may see (the household's, and its member's Only me ones), soonest target first: `targetAmount`, `targetOn`, `monthlyPlan`, the pot's account and Project by name, `saved` and where it comes from (`savedFrom`: `account`, the balance of the account it's alone in; `account_share`, its own capped by what a shared account has left, soonest target first; `contributions`, `savedBefore` plus the transactions counted toward it, also when the account's balance is unknown, `accountBalanceKnown: false`), `remaining`, `monthlyNeed` (to `targetOn`) and the lines' `linesPlanned`/`linesPaid`.",
     status: 200,
     response: { description: "The goals." }
   },
@@ -34814,7 +35026,8 @@ var planUnplaceInputSchema = object({ taskId: ulidSchema }).strict();
 var planListQuerySchema = object({
   kind: planKindSchema.optional(),
   status: planStatusSchema.optional(),
-  startsOn: civilDaySchema.optional()
+  startsOn: civilDaySchema.optional(),
+  taskId: ulidSchema.optional()
 });
 var planTaskSchema = object({
   id: ulidSchema,
@@ -35034,6 +35247,7 @@ var automationListItemSchema = automationViewSchema.extend({
   madeBy: object({ userId: string2(), name: string2(), you: boolean2() }).nullable(),
   lastRun: automationRunSummarySchema.nullable()
 });
+var automationRunNowSchema = object({ queued: literal(true) });
 
 // ../../packages/schema/src/db/shopping.ts
 var shoppingLists = pgTable("shopping_lists", {
@@ -38787,6 +39001,18 @@ var WEEKDAY_ALT = "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|
 var EVERY_N_RE = /\bevery\s+(\d+)\s+(day|days|week|weeks|month|months|year|years)\b/i;
 var EVERY_WEEKDAYS_RE = /\bevery\s+(?:weekday|weekdays|work\s?day|work\s?days)\b/i;
 var EVERY_WEEKDAY_RE = new RegExp(`\\bevery\\s+(${WEEKDAY_ALT})\\b`, "i");
+var EVERY_NTH_WEEKDAY_RE = new RegExp(`\\bevery\\s+(first|1st|second|2nd|third|3rd|fourth|4th|last)\\s+(${WEEKDAY_ALT}|sun)(?:\\s+of\\s+(?:the|each|every)\\s+month)?\\b`, "i");
+var NTH = {
+  first: "1",
+  "1st": "1",
+  second: "2",
+  "2nd": "2",
+  third: "3",
+  "3rd": "3",
+  fourth: "4",
+  "4th": "4",
+  last: "-1"
+};
 var EVERY_UNIT_RE = /\bevery\s+(day|week|month|year)\b/i;
 var ADVERB_RE = /\b(daily|weekly|monthly|yearly|annually)\b/i;
 var RELATIVE_RE = /\b(today|tonight|tomorrow|tmrw|tmr|yesterday)\b/i;
@@ -38918,6 +39144,12 @@ function takeEstimate(scan, take) {
   return;
 }
 function takeRecurrence(scan, take) {
+  const nth = scan.match(EVERY_NTH_WEEKDAY_RE);
+  if (nth && take(nth, "recurrence")) {
+    const ordinal = NTH[(nth[1] ?? "").toLowerCase()] ?? "1";
+    const byDay = `${ordinal}${weekdayByName(nth[2]).code}`;
+    return { mode: "rigid", freq: "monthly", interval: 1, byDay: [byDay] };
+  }
   const everyN = scan.match(EVERY_N_RE);
   if (everyN && take(everyN, "recurrence")) {
     const [, nStr = "1", unitRaw = "day"] = everyN;
@@ -39053,8 +39285,28 @@ function firstOccurrence(rule, now) {
     });
     return addDays(today, Math.min(...deltas));
   }
+  const nth = rule.freq === "monthly" ? rule.byDay?.map(parseByDay) : undefined;
+  if (nth?.length) {
+    const days = [0, 1].flatMap((ahead) => nth.flatMap((p) => {
+      if (!p)
+        return [];
+      const dow = WEEKDAYS.find((w) => w.code === p.weekday)?.dow ?? 0;
+      const day = nthWeekdayOfMonth(today.getFullYear(), today.getMonth() + ahead, dow, p.ordinal ?? 1);
+      return day >= today ? [day] : [];
+    }));
+    if (days.length > 0)
+      return new Date(Math.min(...days.map((d) => d.getTime())));
+  }
   return today;
 }
+function nthWeekdayOfMonth(year, month, dow, ordinal) {
+  if (ordinal < 0) {
+    const last = new Date(year, month + 1, 0);
+    return addDays(last, -((last.getDay() - dow + 7) % 7));
+  }
+  const first = new Date(year, month, 1);
+  return addDays(first, (dow - first.getDay() + 7) % 7 + (ordinal - 1) * 7);
+}
 function addMonths(d, months) {
   const next = new Date(d);
   next.setMonth(next.getMonth() + months);
@@ -39125,6 +39377,7 @@ var bookFacetSchema = object({
   coverSources: coverSourcesSchema.nullish(),
   pageCount: number2().int().min(1).max(1e5).nullish(),
   currentPage: number2().int().min(0).max(1e5).nullish(),
+  chapter: string2().trim().min(1).max(60).nullish(),
   isbn: string2().regex(/^[0-9Xx][0-9Xx\s-]{8,20}$/, "must be an ISBN").nullish()
 }).strict();
 var filmFacetSchema = object({
@@ -40342,7 +40595,17 @@ function renderJournalImportScan(data, mode) {
   }
   out.push(`  milestone candidates ${count((i) => Boolean(i.milestoneCandidate))}`);
   out.push(`  health lines (left for Health) ${count((i) => Boolean(i.health))}`);
-  out.push("", d.dryRun ? paint(mode, "dim", "Dry run: nothing uploaded.") : `Staged ${d.staged ?? 0}${d.alreadyImported ? ` (${d.alreadyImported} already in the Journal, left as they are)` : ""}. Approve each month in the app: Journal \u203A Import.`);
+  out.push("", d.dryRun ? paint(mode, "dim", "Dry run: nothing uploaded.") : `Staged ${d.staged ?? 0}${d.alreadyImported ? ` (${d.alreadyImported} already in the Journal, left as they are)` : ""}. Approve each month with do journal import approve <YYYY-MM>, or in the app: Journal \u203A Import.`);
+  return out.join(`
+`);
+}
+function renderJournalImportApprove(data, mode) {
+  const d = data;
+  const batches = d.batches?.length ? paint(mode, "dim", `  (${d.batches.join(", ")})`) : "";
+  const out = [`Imported ${d.imported ?? 0} days into the Journal${batches}`];
+  if (d.open?.length) {
+    out.push("", "Still asking for a rating, left staged (answer with --rating YYYY-MM-DD=N):", ...d.open.map((o) => `  ${o.day}  \u201C${o.ratingQuestion}\u201D`));
+  }
   return out.join(`
 `);
 }
@@ -41471,11 +41734,16 @@ var commands2 = [
       ],
       flags: [
         { name: "unit", type: "string", description: "For a weight: g (default) or kg." },
+        {
+          name: "note",
+          type: "string",
+          description: 'For a weight: a short note drawn under its date ("vet check done").'
+        },
         { name: "at", type: "string", description: "When (ISO 8601); default now." }
       ],
       scopes: [...animalOperations.log.scopes],
       returns: "AnimalTimelineEntry",
-      notes: `${routeOf(animalOperations.log)} (\`animal_log\`). \`do animals log <hens> eggs 2\`, \`do animals log <dog> weight 37.8 --unit kg\`, \`do animals log <hen> note "eating again"\`. Eggs are the day's count: logging again that day replaces it.`
+      notes: `${routeOf(animalOperations.log)} (\`animal_log\`). \`do animals log <hens> eggs 2\`, \`do animals log <dog> weight 37.8 --unit kg\`, \`do animals log <tortoise> weight 1409 --note "vet check done"\`, \`do animals log <hen> note "eating again"\`. Eggs are the day's count: logging again that day replaces it.`
     },
     run: async ({ args, flags, requireClient }) => {
       const id = requireArg(args, 0, "animal id");
@@ -41485,8 +41753,11 @@ var commands2 = [
         throw usageError("animals log needs a value (a number, or the note's text)");
       const at = flagString(flags, "at");
       const unit = flagString(flags, "unit");
+      const note = flagString(flags, "note");
+      if (note && kind !== "weight")
+        throw usageError("--note goes with a weight");
       const n = Number(raw);
-      const fact = kind === "note" ? { kind, text: raw } : kind === "eggs" ? { kind, count: n } : kind === "weight" ? { kind, value: n, ...unit ? { unit } : {} } : { kind, value: n };
+      const fact = kind === "note" ? { kind, text: raw } : kind === "eggs" ? { kind, count: n } : kind === "weight" ? { kind, value: n, ...unit ? { unit } : {}, ...note ? { note } : {} } : { kind, value: n };
       if (kind !== "note" && Number.isNaN(n))
         throw usageError("the value must be a number");
       const body = parseInput(animalLogInputSchema, { ...fact, ...at ? { occurredAt: at } : {} });
@@ -42414,6 +42685,20 @@ var commands7 = [
 ];
 
 // src/commands/collection.ts
+var CHAPTER_FLAG = {
+  name: "chapter",
+  type: "string",
+  description: 'Where in the work: "9" (a chapter), "chapter 9", "book 9 and on".'
+};
+var LINKED_NOTE_FLAG = {
+  name: "linked-note",
+  type: "string",
+  description: "Note ULID this Entry is tied to."
+};
+var whereFlags = (flags) => ({
+  ...flagString(flags, "chapter") ? { chapter: flagString(flags, "chapter") } : {},
+  ...flagString(flags, "linked-note") ? { linkedNoteId: flagString(flags, "linked-note") } : {}
+});
 var commands8 = [
   {
     spec: {
@@ -42537,6 +42822,53 @@ var commands8 = [
       };
     }
   },
+  {
+    spec: {
+      path: ["collection", "reading"],
+      summary: "Say where you are in a book: its chapter and/or page.",
+      args: [{ name: "id", required: true, description: "Item ULID (a book)." }],
+      flags: [
+        {
+          name: "chapter",
+          type: "string",
+          description: 'Where you are: "9" (a chapter), "chapter 9", "book 9".'
+        },
+        { name: "page", type: "string", description: "The page you're on." },
+        { name: "clear-chapter", type: "boolean", description: "Forget the chapter." }
+      ],
+      scopes: [...collectionOperations.update.scopes],
+      returns: "CollectionItemView",
+      notes: `Reads the book's facet and patches it back with the new place (${routeOf(collectionOperations.update)}). A first page moves a book you want to doing (Progress); a chapter alone moves nothing.`
+    },
+    run: async ({ args, flags, requireClient }) => {
+      const id = requireArg(args, 0, "item id");
+      const chapter = flagString(flags, "chapter");
+      const clear = flagBool(flags, "clear-chapter");
+      const page = flagString(flags, "page");
+      if (page !== undefined && !/^\d+$/.test(page)) {
+        throw usageError("--page must be a whole number, e.g. 142");
+      }
+      if (chapter === undefined && page === undefined && !clear) {
+        throw usageError('collection reading needs --chapter or --page, e.g. --chapter "9"');
+      }
+      const client = requireClient();
+      const item = await client.get(pathOf(collectionOperations.get, { id }));
+      const { chapter: kept, ...rest } = item.facet ?? {};
+      const facet = {
+        ...rest,
+        ...clear || kept === undefined ? {} : { chapter: kept }
+      };
+      if (chapter !== undefined)
+        facet.chapter = chapter;
+      if (page !== undefined)
+        facet.currentPage = Number(page);
+      const body = parseInput(updateCollectionItemInputSchema, { facet });
+      return {
+        data: await client.patch(pathOf(collectionOperations.update, { id }), body),
+        render: renderRecord
+      };
+    }
+  },
   {
     spec: {
       path: ["collection", "add-entry"],
@@ -42556,7 +42888,9 @@ var commands8 = [
           description: "What happened: use (default) \xB7 service \xB7 repair \xB7 fault \xB7 lent \xB7 returned \xB7 valued \xB7 moved."
         },
         { name: "cost", type: "string", description: "What it cost (a sweep, a repair)." },
-        { name: "contact", type: "string", description: "Contact ULID of who did it." }
+        { name: "contact", type: "string", description: "Contact ULID of who did it." },
+        CHAPTER_FLAG,
+        LINKED_NOTE_FLAG
       ],
       scopes: [...collectionOperations.addEntry.scopes],
       returns: "CollectionItemDetail"
@@ -42578,7 +42912,8 @@ var commands8 = [
         ...flagString(flags, "note") ? { note: flagString(flags, "note") } : {},
         ...flagString(flags, "kind") ? { kind: flagString(flags, "kind") } : {},
         ...cost !== undefined ? { cost: Number(cost) } : {},
-        ...flagString(flags, "contact") ? { contactId: flagString(flags, "contact") } : {}
+        ...flagString(flags, "contact") ? { contactId: flagString(flags, "contact") } : {},
+        ...whereFlags(flags)
       });
       return {
         data: await requireClient().post(pathOf(collectionOperations.addEntry, { id }), body),
@@ -42667,7 +43002,8 @@ var commands8 = [
           name: "on",
           type: "string",
           description: "Day it occurred (YYYY-MM-DD); defaults to today."
-        }
+        },
+        CHAPTER_FLAG
       ],
       scopes: [...collectionOperations.log.scopes],
       returns: "CollectionLogResult",
@@ -42688,7 +43024,8 @@ var commands8 = [
         ...flagString(flags, "status") ? { status: flagString(flags, "status") } : {},
         ...rating !== undefined ? { rating: Number(rating) } : {},
         ...flagString(flags, "note") ? { note: flagString(flags, "note") } : {},
-        ...flagString(flags, "on") ? { occurredOn: flagString(flags, "on") } : {}
+        ...flagString(flags, "on") ? { occurredOn: flagString(flags, "on") } : {},
+        ...flagString(flags, "chapter") ? { chapter: flagString(flags, "chapter") } : {}
       });
       return {
         data: await requireClient().post(pathOf(collectionOperations.log), body),
@@ -42699,7 +43036,7 @@ var commands8 = [
   {
     spec: {
       path: ["collection", "edit-entry"],
-      summary: "Fix an Entry's day, rating or note.",
+      summary: "Fix an Entry's day, rating, note, chapter or linked note.",
       args: [
         { name: "id", required: true, description: "Item ULID." },
         { name: "entryId", required: true, description: "Entry ULID." }
@@ -42707,7 +43044,9 @@ var commands8 = [
       flags: [
         { name: "rating", type: "string", description: "New rating 0.5\u20135." },
         { name: "note", type: "string", description: "New note." },
-        { name: "on", type: "string", description: "New day (YYYY-MM-DD)." }
+        { name: "on", type: "string", description: "New day (YYYY-MM-DD)." },
+        CHAPTER_FLAG,
+        LINKED_NOTE_FLAG
       ],
       scopes: [...collectionOperations.editEntry.scopes],
       returns: "CollectionItemDetail"
@@ -42722,7 +43061,8 @@ var commands8 = [
       const body = parseInput(updateCollectionEntryInputSchema, {
         ...rating !== undefined ? { rating: Number(rating) } : {},
         ...flagString(flags, "note") ? { note: flagString(flags, "note") } : {},
-        ...flagString(flags, "on") ? { occurredOn: flagString(flags, "on") } : {}
+        ...flagString(flags, "on") ? { occurredOn: flagString(flags, "on") } : {},
+        ...whereFlags(flags)
       });
       return {
         data: await requireClient().patch(pathOf(collectionOperations.editEntry, { id, entryId }), body),
@@ -46791,7 +47131,8 @@ import { createHash } from "crypto";
 import { readdirSync, readFileSync as readFileSync7 } from "fs";
 import { join as join2 } from "path";
 var DAY_FILE = /^(\d{4}-\d{2}-\d{2})\.md$/;
-var RATING = /(?:[A-Za-z]+\s*\()?(~)?\s*(\d{1,2}(?:\.\d)?)(?:\s*[-\u2013]\s*(\d{1,2}))?\s*\/\s*10\)?/;
+var SCORE = "(?:10|[1-9])";
+var RATING = new RegExp(`(?:\\p{L}+\\s*\\()?(?<![\\p{L}\\p{N}_./~-])(~)?\\s*(${SCORE}(?:\\.\\d)?)(?:\\s*[-\u2013]\\s*(${SCORE}))?\\s*/\\s*10(?![\\p{L}\\p{N}_/-]|[.,]\\d)\\)?`, "u");
 var HEALTH = /\b(symptoms?|stomach|nausea|headaches?|migraine|doctor|GP|medication|meds|pills?|blood|fever|pain|clinic|hospital)\b/i;
 var NOISE = /\b(PR monitor|GitHub daily|deploy(?:ment)? watch\w*|cron|heartbeat|sales prospects?)\b/i;
 var MILESTONE = /\b(first|went live|is live|win:|moved in|arrived|wedding|engaged)\b/i;
@@ -46860,8 +47201,8 @@ function parseDailyNote(path, day, text) {
   const ratingLine = all.find((l) => /rating/i.test(l) && RATING.test(l)) ?? all.find((l) => RATING.test(l));
   const match = ratingLine ? RATING.exec(ratingLine) : null;
   if (match) {
-    const [whole, approx, low, high] = match;
-    if (approx || high)
+    const [whole, approx, low = "", high] = match;
+    if (approx || high || low.includes("."))
       ratingQuestion = whole.trim();
     else
       rating = Number(low);
@@ -46883,7 +47224,7 @@ function parseDailyNote(path, day, text) {
       inCheck = false;
       if (line === ratingLine || /how was (the|your) day/i.test(line))
         continue;
-      if (HEALTH.test(line) || NOISE.test(line))
+      if (HEALTH.test(line) || NOISE.test(line) || isPrivateLine(line))
         continue;
       kept.push(line);
     }
@@ -46893,8 +47234,13 @@ function parseDailyNote(path, day, text) {
 `).trim() || null;
     const firstProse = (body ?? "").split(/\n\s*\n/).map((p) => plain(p)).find((p) => p.length > 0);
     title = firstProse ? firstSentence(firstProse.replace(/^The day\s*/i, "")) : null;
+  } else {
+    body = all.filter((l) => !/^#\s/.test(l) && l !== ratingLine && !/how was (the|your) day/i.test(l) && !HEALTH.test(l) && !NOISE.test(l) && !isPrivateLine(l)).join(`
+`).replace(/\n{3,}/g, `
+
+`).trim() || null;
   }
-  const milestoneLine = all.find((l) => MILESTONE.test(l) && !HEALTH.test(l) && !NOISE.test(l) && plain(l).length > 0);
+  const milestoneLine = all.find((l) => MILESTONE.test(l) && !HEALTH.test(l) && !NOISE.test(l) && !isPrivateLine(l) && plain(l).length > 0);
   const highlight = milestoneLine ? firstSentence(plain(milestoneLine), 80) : null;
   const sleep = sleepOf(all);
   const prs = (text.match(PR_REF) ?? []).length;
@@ -47275,7 +47621,7 @@ var commands24 = [
         description: "How the days name their folder (default memory/daily)."
       }
     ],
-    notes: ", 400 days a request. The day's '## Day summary' becomes its entry; a clear 'n/10' rating is kept, '~5/10' or '3-4/10' becomes a question; health and automation lines never reach the text. Nothing is written into the Journal until the member approves the month (the app only; a key can't approve). Re-running replaces what's still waiting.",
+    notes: ", 400 days a request. The day's '## Day summary' becomes its entry; a clear 'n/10' rating (n 1 to 10, standing on its own) is kept, '~5/10' or '3-4/10' becomes a question; health and automation lines never reach the text, and lines about drinking, smoking, drugs, relapse or fertility never reach the title, text or highlight (the API strips them too). A day without a summary gets its kept lines as its text. Nothing is written into the Journal until a month is approved (`do journal import approve`, or the member in the app). Re-running replaces what's still waiting.",
     run: async ({ args, flags, requireClient }) => {
       const dir = requireArg(args, 0, "dir");
       const items = scanDailyNotes(dir, flagString(flags, "label") ?? "memory/daily");
@@ -47300,6 +47646,42 @@ var commands24 = [
       };
     }
   }),
+  defineCommand({
+    operation: journalOperations.approveImport,
+    path: ["journal", "import", "approve"],
+    summary: "Approve staged days into the Journal: one month's batch, or --all; --rating answers a fuzzy rating.",
+    args: [{ name: "batch", required: false, description: "The month to approve, YYYY-MM." }],
+    flags: [
+      { name: "all", type: "boolean", description: "Approve every staged batch." },
+      {
+        name: "rating",
+        type: "string",
+        description: "Answer a day's rating question, YYYY-MM-DD=N (1 to 10); repeat per day."
+      }
+    ],
+    notes: ". A day whose rating question has no --rating stays staged and is listed as open; the rest are written as imports. An agent's approve shows in the member's change list with Undo. Lines about drinking, smoking, drugs, relapse or fertility are never written.",
+    run: async ({ args, flags, requireClient }) => {
+      const batch = args[0];
+      const all = flagBool(flags, "all");
+      if (batch === undefined === !all) {
+        throw usageError("approve one month (YYYY-MM) or --all");
+      }
+      const ratings = flagStrings(flags, "rating").map((answer) => {
+        const m = /^(\d{4}-\d{2}-\d{2})=(\d+(?:\.\d+)?)$/.exec(answer.trim());
+        if (!m)
+          throw usageError(`--rating takes YYYY-MM-DD=N, got "${answer}"`);
+        return { day: m[1], rating: Number(m[2]) };
+      });
+      const input = parseInput(journalImportApproveInputSchema, {
+        ...all ? { all: true } : { batch },
+        ratings
+      });
+      return {
+        data: await requireClient().post(pathOf(journalOperations.approveImport), input),
+        render: renderJournalImportApprove
+      };
+    }
+  }),
   defineCommand({
     operation: journalOperations.importOverview,
     path: ["journal", "import", "status"],
@@ -48186,6 +48568,47 @@ var commands30 = [
 // src/commands/money.ts
 import { readFileSync as readFileSync8 } from "fs";
 import { basename as basename5 } from "path";
+
+// ../../packages/domain/src/money.ts
+var toNumber = (cents) => Number(cents) / 100;
+function formatMoney(amount, {
+  currency = "EUR",
+  signed = false,
+  whole = false,
+  cents: always = false,
+  locale
+} = {}) {
+  const exact = typeof amount === "bigint" ? amount : amountToCents(amount);
+  const cents = whole ? roundToEuro(exact) : exact;
+  const abs = cents < 0n ? -cents : cents;
+  const text = new Intl.NumberFormat(locale ?? "en-IE", {
+    style: "currency",
+    currency,
+    minimumFractionDigits: always || abs % 100n !== 0n ? 2 : 0,
+    maximumFractionDigits: 2
+  }).format(toNumber(abs));
+  if (cents < 0n)
+    return `\u2212${text}`;
+  return signed && cents > 0n ? `+${text}` : text;
+}
+function roundToEuro(cents) {
+  const abs = cents < 0n ? -cents : cents;
+  const rounded = (abs + 50n) / 100n * 100n;
+  return cents < 0n ? -rounded : rounded;
+}
+function goalSavedSource(goal) {
+  const account = goal.accountTitle ?? "the account";
+  if (goal.savedFrom === "account")
+    return `all of ${account}`;
+  if (goal.savedFrom === "account_share")
+    return `its share of ${account}`;
+  if (goal.accountTitle && goal.accountBalanceKnown === false) {
+    return `counted toward it; the balance of ${goal.accountTitle} is unknown`;
+  }
+  return "counted toward it";
+}
+
+// src/commands/money.ts
 function renderDedupe(data) {
   const r = data;
   const lines = r.pairs.map((p) => `${p.bookedOn}  ${p.amount.padStart(10)}  ${p.description ?? p.counterpartyName ?? ""}  keep ${p.keepId}  twin ${p.twinId} (${p.twinBookedOn})${p.ambiguous ? "  ambiguous: sort by hand" : ""}`);
@@ -48194,6 +48617,38 @@ function renderDedupe(data) {
   return lines.join(`
 `);
 }
+function renderGoals(data) {
+  const goals = Array.isArray(data) ? data : [];
+  if (goals.length === 0)
+    return "(no goals yet)";
+  return goals.map((g) => {
+    const whole = (a) => formatMoney(a, { whole: true });
+    const parts = [
+      `${whole(g.saved)} of ${whole(g.targetAmount)} (${goalSavedSource(g)})`,
+      Number(g.remaining) > 0 ? `${whole(g.remaining)} to go` : "reached",
+      g.monthlyNeed && g.targetOn ? `${formatMoney(g.monthlyNeed)} a month by ${g.targetOn}` : null
+    ];
+    return `${g.title}  ${parts.filter(Boolean).join(" \xB7 ")}  ${g.id}`;
+  }).join(`
+`);
+}
+function syncLine(r) {
+  const when = r.startedAt ? `${String(r.startedAt).slice(0, 16).replace("T", " ")}  ` : "";
+  const what = r.accountTitle ? `${r.accountTitle}  ` : "";
+  const counts = `fetched ${r.fetched ?? 0} \xB7 imported ${r.imported ?? 0} \xB7 matched ${r.matched ?? 0} \xB7 duplicates ${r.duplicates ?? 0}`;
+  return `${when}${what}${r.outcome ?? "?"}  ${counts}${r.error ? `
+  ${r.error}` : ""}`;
+}
+function renderSyncLog(data) {
+  const rows = Array.isArray(data) ? data : data.data ?? [];
+  return rows.length === 0 ? "(no syncs yet)" : rows.map(syncLine).join(`
+`);
+}
+function renderSyncResults(data) {
+  const { results } = data;
+  return results.length === 0 ? "(no live bank links)" : results.map(syncLine).join(`
+`);
+}
 function partyFlag(flags) {
   const userId = flagString(flags, "with-user");
   const contactId = flagString(flags, "with-contact");
@@ -48330,7 +48785,7 @@ var commands31 = [
       });
       return {
         data: await requireClient().post(pathOf(moneyOperations.syncConnections), body),
-        render: renderRecord
+        render: renderSyncResults
       };
     }
   }),
@@ -48367,7 +48822,7 @@ var commands31 = [
     args: [{ name: "id", required: true, description: "Bank link (connection) ULID." }],
     flags: [],
     returns: "MoneyConnectionSync[]",
-    run: readOperation(moneyOperations.listConnectionSyncs, renderList, { id: "id" })
+    run: readOperation(moneyOperations.listConnectionSyncs, renderSyncLog, { id: "id" })
   }),
   defineCommand({
     operation: moneyOperations.listCategories,
@@ -49115,7 +49570,8 @@ var commands31 = [
     args: [],
     flags: [],
     returns: "MoneyGoalView[]",
-    run: readOperation(moneyOperations.listGoals, renderList)
+    notes: ". `saved` reads `savedFrom`: `account` (the only goal in its account: the balance), `account_share` (several share one: each its own, capped by what's left, soonest target first) or `contributions` (savedBefore plus what's counted toward it; also when the account's balance is unknown, `accountBalanceKnown: false`). `remaining` is the target less saved; `monthlyNeed` spreads it over the months to `targetOn`.",
+    run: readOperation(moneyOperations.listGoals, renderGoals)
   }),
   defineCommand({
     operation: moneyOperations.getGoal,
@@ -52147,7 +52603,7 @@ var commands49 = [
         "#tag": "Adds a tag. Repeatable: '#home #urgent'.",
         "!": "Stars the task \u2014 the 1\u20132 things that matter (aliases: !star/!s/!flag/!f). Drives Today's focus and the starred filter.",
         "~area": "Files it into an existing Area by its title, case-insensitive: '~garden' for 'Garden'. One word (letters, digits, - and _), so an Area named with spaces can't be named here \u2014 file it after with `do tasks update <id> --data '{\"areaId\":\"<id>\"}'`. An unknown name files nothing (never creates an Area); the first ~area wins. Valid names: `do areas list --json` (their `title`).",
-        when: "The planned day and time: 'today', 'tomorrow 3pm', 'fri', 'next monday', 'in 3 days', 'at 16:00', 'tonight' (18:00); the past for back-filling: 'yesterday', 'last friday'. A time makes it a timed task (allDay false). 'every monday' / 'every 2 weeks' / 'daily' attaches a recurrence.",
+        when: "The planned day and time: 'today', 'tomorrow 3pm', 'fri', 'next monday', 'in 3 days', 'at 16:00', 'tonight' (18:00); the past for back-filling: 'yesterday', 'last friday'. A time makes it a timed task (allDay false). 'every monday' / 'every 2 weeks' / 'daily' / 'every first sunday' / 'every last friday' attaches a recurrence.",
         "by / due": "The Deadline, never the plan: 'by friday', 'due fri', 'due tomorrow 5pm', 'by 17:00' (today). 'by' with no date after it ('pay by card') stays in the title.",
         estimate: "How long it takes (durationMinutes): '30m', '45 min', '1h', '1.5h', '1h30', '2 hours', 'for 20 mins'. Not 'in 2 hours'."
       }

package/package.json

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