things-api 0.9.0 → 0.11.0

package/dist/cli/render.js

@@ -7,13 +7,12 @@
  * (agents and humans both need stable references); colors engage on a TTY only
  * (../cli/style.ts).
  */
-import { isTodayMember, } from "../read/views.js";
-import { localToday } from "../model/dates.js";
-import { templateStatus } from "../model/recurrence.js";
-import { blue, bold, dim, strike, underline } from "./style.js";
-import { areaMark, CHECKLIST_MARK, countChip, dateChip, deadlineToken, eveningMoon, LEGEND, LEGEND_GROUPS, loggedDate, NOTES_MARK, projectCircle, REMINDER_MARK, todayStar, todoBox, } from "./glyphs.js";
-import { partitionSomedaySection, splitSectionBlocks, } from "../read/pagination.js";
+import { isTodayMember, localToday, partitionSomedaySection, splitSectionBlocks, templateStatus, } from "../index.js";
+import { renderNow, renderZone } from "./clock.js";
+import { bold, dim, strike, underline } from "./style.js";
+import { areaMark, CHECKLIST_MARK, containerLabel, countChip, dateChip, deadlineToken, eveningMoon, LEGEND, LEGEND_GROUPS, loggedDate, NOTES_MARK, projectCircle, projectTitleAccent, REMINDER_MARK, todayStar, todoBox, } from "./glyphs.js";
 import { FULL_MONTHS, upcomingBucket } from "./period.js";
+import { fitRow, getFitWidth, resolveFit, stripSgr, TITLE_MIN, visibleWidth, } from "./width.js";
 /**
  * A view's TTY-only title preamble: bold view name + its dim Things deep link,
  * then a blank line — e.g. `Anytime (things:///show?id=anytime)`. The id is the
@@ -25,9 +24,8 @@ export function viewHeaderLines(view) {
     const title = view.charAt(0).toUpperCase() + view.slice(1);
     return [`${bold(title)} ${dim(`(things:///show?id=${view})`)}`, ""];
 }
-const ANSI = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
-export const stripAnsi = (s) => s.replace(ANSI, "");
-const visibleWidth = (s) => [...stripAnsi(s)].length;
+/** Re-export the canonical ANSI-stripper (impl in ./width.ts) — the legend and `--json` legend path use it. */
+export const stripAnsi = stripSgr;
 /** Left-column width for the legend's glyph samples (short marks align; long textual samples overflow). */
 const LEGEND_GUTTER = 10;
 /**
@@ -52,15 +50,20 @@ export function renderLegend() {
     }
     return lines;
 }
+/** Wraps a `#a #b` tag form in the row's dim styling (incl. its leading space). */
+const styleTags = (form) => ` ${dim(form)}`;
 /**
  * One item line:
  * `<uuid-prefix>  <box> [★|⏾] [logged-date] [‹chip›] <title> [‹n›] [⍾] [≡] [≔] (container) #tags [⚑ deadline]`.
  * Repeating templates seat ↻ INSIDE the box (`[↻]`/`(↻)`) rather than as a
- * separate mark; open project rows render their circle and title blue.
- * The box is the glyph-language state carrier (../glyphs.ts): `[ ]`-family
- * for to-dos, `( )`-family for projects — state survives with color
- * stripped. Completed titles dim; canceled titles dim+strike (the `[×]`
- * mark keeps the state when strike/ANSI is unavailable). Human output shows
+ * separate mark; open project circles render blue, and project TITLES render
+ * bold + default-colored in every state (projectTitleAccent — the render-
+ * language law). The box is the glyph-language state carrier (../glyphs.ts):
+ * `[ ]`-family for to-dos, `( )`-family for projects — state survives with
+ * color stripped. Completed titles dim; canceled titles dim+strike (the `[×]`
+ * mark keeps the state when strike/ANSI is unavailable) — except where a view
+ * declares resolved its norm (Logbook, `resolvedNormal`), where completed is
+ * plain and canceled keeps only its strike. Human output shows
  * a SHORTENED uuid prefix (every command accepts unique prefixes >= 6
  * chars); `uuidWidth` is the display length from uuidDisplayWidth — never
  * below 8 so a copied prefix stays unique across the whole database, not
@@ -71,15 +74,16 @@ export function renderLegend() {
  * (../style.ts); `--json` always carries full uuids.
  */
 export function formatItem(item, uuidWidth = 0, opts = {}) {
-    const todayIso = localToday(opts.now);
+    // The consumer render clock supplies now+zone when the caller pins neither
+    // (production CLI); an explicit opts.now (tests) still wins, and the zone
+    // defaults to undefined off a set render clock — byte-identical to before.
+    const todayIso = localToday(opts.now ?? renderNow(), renderZone());
     const asTitle = opts.projectTitle === true && item.type === "project";
     const box = item.type === "project" ? projectCircle(item) : todoBox(item);
     const meta = [];
     if (opts.mark != null)
         meta.push(opts.mark);
     // ↻ now lives INSIDE the box for templates (glyphs.ts) — no separate mark.
-    if (opts.statusWord !== undefined)
-        meta.push(dim(opts.statusWord));
     if (item.status !== "open" && item.stopped !== null)
         meta.push(loggedDate(item.stopped, todayIso));
     if (opts.hideDateChip === true) {
@@ -90,6 +94,12 @@ export function formatItem(item, uuidWidth = 0, opts = {}) {
     // Repeating templates chip their app-materialized next occurrence.
     else if (item.repeating.isTemplate && item.repeating.nextOccurrence != null)
         meta.push(dateChip(item.repeating.nextOccurrence, todayIso));
+    // A template with NO next date chips its scheduling word instead
+    // (waiting/paused/ended), in the same ‹chevron› form — derived HERE so every
+    // list view inherits it, not just upcoming's Repeating To-Dos section. (The
+    // detail card's prose repeat state is NOT chipped.)
+    else if (item.repeating.isTemplate)
+        meta.push(dim(`‹${templateStatus(item.repeating, todayIso)}›`));
     // List rows mute their tags (the GUI's gray pills); tags go green only on
     // the opened resource (todo show / the project|area header row).
     const tags = item.tags.length > 0 ? ` ${dim(`#${item.tags.map((t) => t.title).join(" #")}`)}` : "";
@@ -98,9 +108,16 @@ export function formatItem(item, uuidWidth = 0, opts = {}) {
     // template rows drop it via the sentinel guard: their deadline column
     // carries app-internal 4001-01-01 sentinels (upcoming's synthesized
     // occurrences carry REAL rule-derived deadlines and must keep the flag).
+    // The full-vs-compact deadline form is decided ONCE per view from the effective
+    // width against the two derived floors (width.ts resolveFit) — never per row —
+    // so the right-pinned gutter never mixes `Aug 12` and `8/12`. The null path
+    // (pipes/grep/--json/non-TTY) is always full-form (byte-identical contract).
+    const rawFitWidth = getFitWidth();
+    const fit = rawFitWidth === null ? null : resolveFit(rawFitWidth, FULL_FIT_FLOOR, COMPACT_FIT_FLOOR);
+    const compact = fit?.compact === true;
     const rule = item.repeating.rule;
     const deadline = item.status === "open" && item.deadline !== null && item.deadline < "4000"
-        ? ` ${deadlineToken(item.deadline, todayIso)}`
+        ? ` ${deadlineToken(item.deadline, todayIso, compact)}`
         : // The GUI's bare flag on no-date repeating templates: the rule WILL
             // assign each occurrence a deadline (fixed rules always do; after-
             // completion only with a start offset), date unknown until spawned.
@@ -113,7 +130,10 @@ export function formatItem(item, uuidWidth = 0, opts = {}) {
     const context = container !== null
         ? container.uuid === opts.suppressProject
             ? ""
-            : ` (${container.title})`
+            : // The ↻ prefix (containerLabel) marks a container that is a repeating
+                // TEMPLATE project — the whole `(…)` run is dimmed below, so the mark
+                // rides the muted container styling. Areas never carry the flag.
+                ` (${containerLabel(container.title, container.isRepeatingTemplate === true)})`
         : item.area
             ? item.area.uuid === opts.suppressArea
                 ? ""
@@ -121,17 +141,32 @@ export function formatItem(item, uuidWidth = 0, opts = {}) {
             : "";
     // width 0 (the default) means "no column" — show the full uuid untouched.
     const shownUuid = uuidWidth > 0 ? uuidCol(item.uuid, uuidWidth) : item.uuid;
-    let title = item.title;
-    if (asTitle)
-        title = bold(underline(title));
-    else if (item.status === "canceled")
-        title = dim(strike(title));
-    else if (item.status === "completed")
-        title = dim(title);
-    // Open project rows render their title blue — GUI parity (list accent) and
-    // a color cue reinforcing the round bracket. To-dos stay default-colored.
-    else if (item.type === "project")
-        title = blue(title);
+    // Title styling composes four independent channels (docs/design/render-
+    // language.md) — a row marks only its deviations from the container's normal:
+    //   strike    — a canceled item (kept in EVERY context, GUI parity)
+    //   dim       — a resolved row DEVIATING from its list's norm (completed/
+    //               canceled among open rows); dropped where resolved IS the norm
+    //               (the Logbook passes resolvedNormal)
+    //   bold      — the project TYPE weight, every project row and every state,
+    //               routed through the single law projectTitleAccent (glyphs.ts)
+    //   underline — heading ROLE only (asTitle): a project that heads its own
+    //               to-do group, never a plain project row
+    // Title styling is a closure over the raw text so the width fitter can
+    // truncate the PLAIN title and re-apply the same wraps — the ellipsis/clip
+    // boundary always lands outside the SGR runs (a cut never splits an escape).
+    const resolved = item.status === "completed" || item.status === "canceled";
+    const styleTitle = (text) => {
+        let t = text;
+        if (item.status === "canceled")
+            t = strike(t);
+        if (resolved && opts.resolvedNormal !== true)
+            t = dim(t);
+        if (item.type === "project")
+            t = projectTitleAccent(t);
+        if (asTitle)
+            t = underline(t);
+        return t;
+    };
     // GUI indicator order after the title: bell, document, checklist.
     const tail = [
         ...(item.type === "project" ? [countChip(item)] : []),
@@ -139,12 +174,34 @@ export function formatItem(item, uuidWidth = 0, opts = {}) {
         ...(item.notes !== "" ? [dim(NOTES_MARK)] : []),
         ...(item.type === "to-do" && item.checklistItemsCount > 0 ? [dim(CHECKLIST_MARK)] : []),
     ];
-    return [
-        `${dim(shownUuid)} `,
-        box,
-        ...meta,
-        `${title}${tail.length > 0 ? ` ${tail.join(" ")}` : ""}${tags}${context === "" ? "" : dim(context)}${deadline}`,
-    ].join(" ");
+    // Named segments (docs/design/width-aware-tty.md): the fixed left run (uuid +
+    // box + meta chips), the fixed tail markers, the collapsible tags, the CLI-
+    // only container, and the full deadline. `styleTags` wraps a `#a #b` form in
+    // the row's dim styling (incl. its leading space); the fitter folds the list.
+    const left = `${dim(shownUuid)}  ${box}${meta.length > 0 ? ` ${meta.join(" ")}` : ""}`;
+    const tailStr = tail.length > 0 ? ` ${tail.join(" ")}` : "";
+    const ctxStr = context === "" ? "" : dim(context);
+    const tagNames = item.tags.map((t) => t.title);
+    const full = `${left} ${styleTitle(item.title)}${tailStr}${tags}${ctxStr}${deadline}`;
+    // width null (the default — pipes/grep/--json/non-TTY) means NO fitting:
+    // return the fully-composed row, byte-identical to before this feature.
+    if (fit === null)
+        return full;
+    const seg = {
+        left,
+        rawTitle: item.title,
+        styleTitle,
+        tail: tailStr,
+        tagNames,
+        styleTags,
+        context: ctxStr,
+        deadline,
+        full,
+    };
+    // Fit to the effective width: never below the compact floor (a sub-floor
+    // terminal renders at COMPACT_FIT_FLOOR and wraps, rather than clipping
+    // metadata). resolveFit already clamped fit.width up to the compact floor.
+    return fitRow(seg, fit.width);
 }
 /**
  * Row prefix in today-aware views: yellow ★ for Today members, cyan ⏾ for
@@ -152,13 +209,83 @@ export function formatItem(item, uuidWidth = 0, opts = {}) {
  * startDate is exactly today — the UI's daily expiry), null otherwise.
  */
 export function todayMark(item, now) {
-    if (!isTodayMember(item, now))
+    const instant = now ?? renderNow();
+    const zone = renderZone();
+    if (!isTodayMember(item, instant, zone))
         return null;
-    const evening = item.todaySection === "evening" && item.startDate === localToday(now);
+    const evening = item.todaySection === "evening" && item.startDate === localToday(instant, zone);
     return evening ? eveningMoon() : todayStar();
 }
 /** Minimum displayed-prefix length: shorter prefixes collide across the DB. */
-const UUID_DISPLAY_MIN = 8;
+export const UUID_DISPLAY_MIN = 8;
+/**
+ * The two DERIVED width floors (docs/design/width-aware-tty.md § Compact
+ * deadline forms). Not chosen: computed from the actual glyph inventory as the
+ * worst-case FIXED furniture a row can carry plus a {@link TITLE_MIN}-column
+ * title. The only part that differs between the floors is the deadline token —
+ * the FULL floor budgets the full worst-case form (`⚑ 14 days left`), the
+ * COMPACT floor the narrow iOS-oracle worst case (`⚑ 14d left`; year-bearing
+ * far dates collapse to the bare year in compact mode, so they no longer
+ * compete — Mike's ruling 2026-07-14). Everything else
+ * is shared, so this returns both from one enumeration. Enumerated parts (any
+ * glyph change re-derives these; `width.test.ts` recomputes them independently
+ * so they cannot silently drift):
+ *   - the id column (never shrinks) + its two-space separator
+ *   - the checkbox glyph
+ *   - a space + the widest meta chip (a future ‹date› carrying a year)
+ *   - a space + the tail: project count chip + all three marks ◷ ≡ ≔
+ *     (a conservative superset — the count chip and checklist never truly
+ *     co-occur on one row, but budgeting both keeps the floor safe)
+ *   - a space + the bare `#…` marker (tags never fully vanish)
+ *   - a space + the longest deadline token (full or compact worst case)
+ *   - a space + a TITLE_MIN-column title
+ *
+ * The driver fits every row to at least the COMPACT floor
+ * (`max(terminalWidth, COMPACT_FIT_FLOOR)`); a width in `[compact, full)` renders
+ * compact deadlines and every wider width the full form. So the worst-furniture
+ * row's title lands at exactly TITLE_MIN at whichever floor is active, every
+ * lighter row's title is wider (no per-row raggedness), and below the compact
+ * floor the terminal wraps (nothing is clipped) — mirroring the GUI, whose
+ * minimum WINDOW width is the same worst-case derivation.
+ */
+function computeFitFloors() {
+    const todayIso = "2000-01-01";
+    const box = "[ ]"; // every box form is 3 cells
+    const metaChip = dateChip("2027-09-22", todayIso); // widest ‹date› (with year)
+    const countChipWorst = countChip({
+        untrashedLeafActionsCount: 999,
+        openUntrashedLeafActionsCount: 999,
+    });
+    const tail = [countChipWorst, REMINDER_MARK, NOTES_MARK, CHECKLIST_MARK].join(" ");
+    const fullDeadline = deadlineToken("2000-01-15", todayIso); // ⚑ 14 days left — longest full form
+    // Compact worst case: the widest token that can appear in compact mode. Far
+    // dates collapse to the bare year (`⚑ 2001`, 6 cells), so the narrow
+    // relative `⚑ 14d left` (10 cells) governs; keep the max() so the floor
+    // stays safe if the compact vocabulary ever shifts.
+    const compactDeadline = Math.max(visibleWidth(deadlineToken("2000-01-15", todayIso, true)), // ⚑ 14d left
+    visibleWidth(deadlineToken("2001-02-10", todayIso, true)));
+    const furniture = UUID_DISPLAY_MIN +
+        2 + // the two spaces after the id column
+        visibleWidth(box) +
+        1 +
+        visibleWidth(metaChip) + // space + widest meta chip
+        1 + // the space before the title
+        TITLE_MIN +
+        1 +
+        visibleWidth(tail) + // space + count chip + ◷ ≡ ≔
+        1 +
+        visibleWidth("#…") + // space + the bare tag marker
+        1; // the space before the deadline token
+    return {
+        full: furniture + visibleWidth(fullDeadline),
+        compact: furniture + compactDeadline,
+    };
+}
+const FIT_FLOORS = computeFitFloors();
+/** The full-form TTY row floor — worst-case furniture + full deadline. See {@link computeFitFloors}. */
+export const FULL_FIT_FLOOR = FIT_FLOORS.full;
+/** The compact-form TTY row floor — worst-case furniture + compact deadline. See {@link computeFitFloors}. */
+export const COMPACT_FIT_FLOOR = FIT_FLOORS.compact;
 /**
  * Display width for a list's uuid column: the shortest prefix that is
  * unique WITHIN the list, floored at UUID_DISPLAY_MIN (list-local
@@ -200,31 +327,66 @@ export function renderList(items) {
  * the per-row ★/⏾, where the marker still carries information.
  *
  * This Evening mirrors the GUI: it renders ONLY when evening items exist —
- * a truly-empty evening has no header at all. `full` is the pre-cap view and
- * `shown` the rows that survived the global `--limit`; the split lets the
- * section stay honest under truncation. When the cap hid some or all evening
- * rows, an honest muted hint counts the hidden ones and names the `--limit`
- * that reveals them — never the misleading `(empty)` a truncated evening used
- * to show. `base` is the user's own invocation (flags echoed). The global
- * footer (row driver) still reports the whole-view remainder separately.
+ * a truly-empty evening has no header at all. `view` is the rows that survived
+ * the global `--limit`; `sections` is the metadata's pre-cap per-section counts
+ * ({@link SectionCount}) — the Today/This-Evening totals the hint math needs, so
+ * the section stays honest under truncation without a pre-cap copy of the view.
+ * When the cap hid some or all evening rows, an honest muted hint counts the
+ * hidden ones and points at the isolated `--evening` view — never the misleading
+ * `(empty)` a truncated evening used to show. (In `--evening` mode that pointer
+ * is redundant, so the hint keeps the `--limit`/`--all` levers instead.) `base`
+ * is the user's own invocation (flags echoed). The global footer (row driver)
+ * still reports the whole-view remainder separately.
+ *
+ * `options.eveningOnly` (the `--evening` section filter) renders ONLY the This
+ * Evening block — the Today header and its `(empty)` placeholder are suppressed
+ * because that section is deliberately filtered out, not merely empty.
  */
-export function renderToday(full, shown, base) {
-    const w = uuidDisplayWidth([...shown.today, ...shown.evening]);
-    const lines = [
-        `${bold("──")} ${todayStar()} ${bold(`Today (badge: ${full.badge.dueOrOverdue} due/overdue · ${full.badge.other} other) ──`)}`,
-        ...(shown.today.length === 0 ? ["(empty)"] : shown.today.map((i) => formatItem(i, w))),
-    ];
-    if (full.evening.length > 0) {
+export function renderToday(view, sections, base, options) {
+    // Pre-cap totals from the truncation metadata; fall back to the shown view's
+    // own lengths when a caller hands an unbounded view with no section counts.
+    const todayTotal = sections?.find((s) => s.key === "today")?.total ?? view.today.length;
+    const eveningTotal = sections?.find((s) => s.key === "evening")?.total ?? view.evening.length;
+    const w = uuidDisplayWidth([...view.today, ...view.evening]);
+    const eveningOnly = options?.eveningOnly === true;
+    const lines = eveningOnly
+        ? []
+        : [
+            `${bold("──")} ${todayStar()} ${bold(`Today (badge: ${view.badge.dueOrOverdue} due/overdue · ${view.badge.other} other) ──`)}`,
+            ...(view.today.length === 0 ? ["(empty)"] : view.today.map((i) => formatItem(i, w))),
+        ];
+    if (eveningTotal > 0) {
+        // A blank line before the header matches every other grouped renderer's
+        // section spacing — but only when the Today section rendered above it. In
+        // --evening mode the header is the first line, so no leading blank.
+        if (!eveningOnly)
+            lines.push("");
         lines.push(`${bold("──")} ${eveningMoon()} ${bold("This Evening ──")}`);
-        for (const i of shown.evening)
+        for (const i of view.evening)
             lines.push(formatItem(i, w));
-        const hidden = full.evening.length - shown.evening.length;
+        const hidden = eveningTotal - view.evening.length;
         if (hidden > 0) {
-            const total = full.today.length + full.evening.length;
-            const more = shown.evening.length > 0 ? "more " : "";
-            lines.push(dim(`… ${hidden} ${more}evening item${hidden === 1 ? "" : "s"} — \`${base} --limit ${total}\` · all: \`${base} --all\``));
+            const more = view.evening.length > 0 ? "more " : "";
+            const count = `${hidden} ${more}evening item${hidden === 1 ? "" : "s"}`;
+            // Normal Today view: the global truncation footer already carries the
+            // quantity levers (a bigger --limit / --all), so this hint is a pure
+            // pointer to the isolated This Evening view. In --evening mode that
+            // pointer is redundant (--evening is already active), so keep offering
+            // the levers that actually reveal more rows.
+            if (eveningOnly) {
+                const total = todayTotal + eveningTotal;
+                lines.push(dim(`… ${count} — \`${base} --limit ${total}\` · \`${base} --all\``));
+            }
+            else {
+                lines.push(dim(`… ${count} — \`${base} --evening\``));
+            }
         }
     }
+    else if (eveningOnly) {
+        // Evening filter with no evening members: the section is genuinely empty
+        // (nothing was filtered out here), so an honest `(empty)` is correct.
+        lines.push("(empty)");
+    }
     return lines;
 }
 /**
@@ -284,33 +446,44 @@ export function renderProjectsSidebar(items, hints) {
             lines.push(`${bold("──")} ${areaMark()} ${bold(`${group.area.title} ──`)}`);
         }
         lines.push(...rows.map((item) => formatItem(item, w, { suppressArea: group.area?.uuid ?? null })));
+        // A per-group locator count (not a standalone disclosure): it marks WHERE
+        // the hidden later projects sit; the single reveal command rides the
+        // whole-view placeholder below.
         if (group.hidden > 0)
-            lines.push(dim(`…${group.hidden} later project${group.hidden === 1 ? "" : "s"}`));
+            lines.push(dim(`… ${group.hidden} later project${group.hidden === 1 ? "" : "s"}`));
         else if (group.area !== null && rows.length === 0)
             lines.push(dim("(no projects)"));
     }
     if (total > 0)
-        lines.push("", dim(`(${total} later project${total === 1 ? "" : "s"} — visible with \`things projects --show-later\`)`));
+        lines.push("", disclosureHint(total, "later project", [{ command: "things projects --show-later" }]));
     return lines;
 }
+/** Upcoming rows group under startDate, or under deadline for non-template rows. */
+const groupDate = (i) => i.startDate ?? (i.repeating.isTemplate ? null : i.deadline);
 /**
  * Upcoming rows under GUI-style date headers (empty periods are simply
  * absent), with the trailing Repeating To-Dos section: templates with no
  * set next occurrence, carrying their waiting/paused/ended status word and
  * the bare ⚑ when the rule will assign a deadline per occurrence.
+ *
+ * Deadline-forecast rows (UPC1) keep startDate=null but carry a real future
+ * deadline; they group under their DEADLINE date via COALESCE(startDate,
+ * deadline) — no when-date pill (the header carries the date; formatItem's
+ * chip keys on startDate, so a null-startDate row shows only the ⚑ deadline
+ * flag, mirroring the GUI's bare-flag anatomy).
  */
 export function renderUpcoming(items, now) {
     if (items.length === 0)
         return ["(empty)"];
-    const todayIso = localToday(now);
+    const todayIso = localToday(now ?? renderNow(), renderZone());
     const w = uuidDisplayWidth(items);
     const fmtOpts = now === undefined ? {} : { now };
-    const dated = items.filter((i) => i.startDate !== null);
+    const dated = items.filter((i) => groupDate(i) !== null);
     const resting = items.filter((i) => i.startDate === null && i.repeating.isTemplate);
     const lines = [];
     let openHeader = null;
     for (const item of dated) {
-        const bucket = upcomingBucket(item.startDate ?? "", todayIso);
+        const bucket = upcomingBucket(groupDate(item) ?? "", todayIso);
         if (bucket.label !== openHeader) {
             if (lines.length > 0)
                 lines.push("");
@@ -323,9 +496,10 @@ export function renderUpcoming(items, now) {
         if (lines.length > 0)
             lines.push("");
         lines.push(bold("── Repeating To-Dos ──"));
-        for (const item of resting) {
-            lines.push(formatItem(item, w, { ...fmtOpts, statusWord: templateStatus(item.repeating, todayIso) }));
-        }
+        // The ‹waiting›/‹paused›/‹ended› chip is derived inside formatItem
+        // (a template with no next date), so resting rows need no special opts.
+        for (const item of resting)
+            lines.push(formatItem(item, w, fmtOpts));
     }
     return lines;
 }
@@ -334,12 +508,15 @@ export function renderUpcoming(items, now) {
  * — `── July ──` within the current year, `── March 2025 ──` beyond (finer
  * than the GUI's bare per-year buckets, deliberately). Truncation past the
  * row limit is reported by the shared hint the command appends, not here.
+ * Resolved is the Logbook's NORM, so rows pass `resolvedNormal`: completed
+ * titles render plain and canceled titles keep their strikethrough but drop
+ * the dim (the blue `[✓]`/`[×]` marks and logged date are unchanged).
  */
 export function renderLogbook(items, now) {
     if (items.length === 0)
         return ["(empty)"];
     const w = uuidDisplayWidth(items);
-    const currentYear = localToday(now).slice(0, 4);
+    const currentYear = localToday(now ?? renderNow(), renderZone()).slice(0, 4);
     const lines = [];
     let openHeading = null;
     for (const item of items) {
@@ -353,7 +530,9 @@ export function renderLogbook(items, now) {
             lines.push(bold(`── ${heading} ──`));
             openHeading = heading;
         }
-        lines.push(formatItem(item, w, now === undefined ? {} : { now }));
+        // The Logbook's normal IS the resolved state — rows render plain
+        // (completed) / strike-only (canceled), never dim (render-language delta 6).
+        lines.push(formatItem(item, w, { resolvedNormal: true, ...(now === undefined ? {} : { now }) }));
     }
     return lines;
 }
@@ -409,10 +588,34 @@ export function renderSections(sections, star = false) {
     return lines;
 }
 /** Single-quote a title for a copy-pasteable drill-down command. */
-function quoteTitle(title) {
+export function quoteTitle(title) {
     return `'${title.replace(/'/g, "'\\''")}'`;
 }
-const takeUpTo = (items, limit) => limit === null ? items : items.slice(0, limit);
+/**
+ * The one disclosure-hint grammar (docs/design/render-language.md § Disclosure
+ * hints): a muted `… <count> <noun> — [label:] `command` [· [label:] `command`]`.
+ * Every muted hint that discloses more content routes through here so the
+ * grammar lives in ONE place (the same one-law pattern as projectTitleAccent).
+ *
+ * `count` pluralizes `noun` (pass a `{ one, many }` pair when the plural is not
+ * a trailing `s`); each action is a FULL command echoing the user's own
+ * invocation, and a `label` prefixes an action only where it adds semantics the
+ * command text doesn't carry (e.g. `recent:` before a capped `--show-logged`).
+ * `indent` marks a TRUNCATION FOOTER — two spaces under its partially-shown
+ * section — whereas a HIDDEN-SECTION placeholder stays flush at the position
+ * its unrendered section would occupy.
+ */
+export function disclosureHint(count, noun, actions, opts = {}) {
+    const phrase = typeof noun === "string"
+        ? `${noun}${count === 1 ? "" : "s"}`
+        : count === 1
+            ? noun.one
+            : noun.many;
+    const acts = actions
+        .map((a) => `${a.label === undefined ? "" : `${a.label}: `}\`${a.command}\``)
+        .join(" · ");
+    return dim(`${opts.indent === true ? "  " : ""}… ${count} ${phrase} — ${acts}`);
+}
 /** Muted per-block truncation line: `… N more — \`drill-down\``. */
 function blockMoreLine(total, shown, drill) {
     return dim(`  … ${total - shown} more${drill === null ? "" : ` — \`${drill}\``}`);
@@ -421,36 +624,51 @@ function blockMoreLine(total, shown, drill) {
  * Type-aware variant for blocks that mix project rows and to-dos (someday's
  * loose/area blocks): the hidden remainder is split by type — `… 5 more
  * projects, 14 more to-dos` — omitting a type with nothing hidden and
- * pluralizing per count.
+ * pluralizing per count. The counts come from the block metadata (projects
+ * always list first, so the hidden split is derivable from `totalProjects`).
  */
-function mixedMoreLine(hidden, drill) {
-    const projects = hidden.filter((i) => i.type === "project").length;
-    const todos = hidden.length - projects;
+function mixedMoreLine(projects, todos, drill) {
     const parts = [
         ...(projects > 0 ? [`${projects} more project${projects === 1 ? "" : "s"}`] : []),
         ...(todos > 0 ? [`${todos} more to-do${todos === 1 ? "" : "s"}`] : []),
     ];
     return dim(`  … ${parts.join(", ")}${drill === null ? "" : ` — \`${drill}\``}`);
 }
+/** The area/loose block for a section, matched by identity in the grouped metadata. */
+function areaBlockFor(grouped, area) {
+    const kind = area === null ? "loose" : "area";
+    const ref = area?.uuid ?? null;
+    return grouped.blocks.find((b) => b.kind === kind && b.ref === ref);
+}
+/** A nested project block anywhere in the grouped metadata, matched by project uuid. */
+function projectBlockFor(grouped, projectUuid) {
+    for (const b of grouped.blocks) {
+        const hit = b.children?.find((c) => c.kind === "project" && c.ref === projectUuid);
+        if (hit !== undefined)
+            return hit;
+    }
+    return undefined;
+}
 /**
  * Muted bottom line for a truncated grouped view: `── more per group — see
- * more: \`<base> <bigger flags>\` · all: \`<base> --all\` ──`, where the
- * bigger-flags command doubles exactly the caps that actually truncated.
+ * more: \`<base> <bigger flags>\` · \`<base> --all\` ──`, where the bigger-flags
+ * command doubles exactly the caps that actually truncated.
  */
 function groupedBottomLine(base, escalations, allBase = base) {
     const seeMore = escalations.length > 0 ? `see more: \`${base} ${escalations.join(" ")}\` · ` : "";
-    return dim(`── more per group — ${seeMore}all: \`${allBase} --all\` ──`);
+    return dim(`── more per group — ${seeMore}\`${allBase} --all\` ──`);
 }
 /**
  * The anytime preview: the FULL block skeleton — every area header and every
- * project row — always renders; `limits.area` caps the loose block and each
- * area's direct to-dos, `limits.project` each project's to-dos. A truncated
- * block trails a muted `… N more — \`things (project|area) show '…'\``
- * drill-down (the loose block has no container, so it shows only the count),
- * and the view ends with one line escalating the caps that hit. Today members
- * are starred. Mirrors renderSections' layout exactly.
+ * project row — always renders; the `sections` are the already-bounded view
+ * and `grouped` the per-block metadata that carries each block's pre-cap total,
+ * so a truncated block trails a muted `… N more — \`things (project|area) show
+ * '…'\`` drill-down (the loose block has no container, so it shows only the
+ * count), and the view ends with one line escalating the caps that hit
+ * (`limits` supplies the doubling). Today members are starred. Mirrors
+ * renderSections' layout exactly.
  */
-export function renderAnytimePreview(sections, limits, base) {
+export function renderAnytimePreview(sections, grouped, limits, base) {
     const all = sections.flatMap((s) => s.items);
     if (all.length === 0)
         return ["(empty)"];
@@ -467,31 +685,33 @@ export function renderAnytimePreview(sections, limits, base) {
             blank();
             lines.push(`${bold("──")} ${areaMark()} ${bold(`${section.area.title} ──`)}`);
         }
+        // The section is already bounded, so its direct/child lists ARE the shown
+        // rows; the pre-cap totals come from the block metadata.
         const { direct, projects } = splitSectionBlocks(section);
         const suppressArea = section.area?.uuid ?? null;
-        const shownDirect = takeUpTo(direct, limits.area);
-        for (const item of shownDirect) {
+        const areaBlock = areaBlockFor(grouped, section.area);
+        for (const item of direct) {
             lines.push(formatItem(item, w, { suppressArea, mark: todayMark(item) }));
         }
-        if (direct.length > shownDirect.length) {
+        if (areaBlock !== undefined && areaBlock.total > areaBlock.shown) {
             areaHit = true;
             const drill = section.area === null ? null : `things area show ${quoteTitle(section.area.title)}`;
-            lines.push(blockMoreLine(direct.length, shownDirect.length, drill));
+            lines.push(blockMoreLine(areaBlock.total, areaBlock.shown, drill));
         }
         for (const { project, items: children } of projects) {
             blank();
             lines.push(formatItem(project, w, { projectTitle: true, suppressArea, mark: todayMark(project) }));
-            const shownChildren = takeUpTo(children, limits.project);
-            for (const item of shownChildren) {
+            for (const item of children) {
                 lines.push(formatItem(item, w, {
                     suppressProject: project.uuid,
                     suppressArea,
                     mark: todayMark(item),
                 }));
             }
-            if (children.length > shownChildren.length) {
+            const projectBlock = areaBlock?.children?.find((c) => c.kind === "project" && c.ref === project.uuid);
+            if (projectBlock !== undefined && projectBlock.total > projectBlock.shown) {
                 projectHit = true;
-                lines.push(blockMoreLine(children.length, shownChildren.length, `things project show ${quoteTitle(project.title)}`));
+                lines.push(blockMoreLine(projectBlock.total, projectBlock.shown, `things project show ${quoteTitle(project.title)}`));
             }
         }
     }
@@ -516,7 +736,7 @@ export function renderAnytimePreview(sections, limits, base) {
  * When the toggle is off and such items exist, a muted bottom hint counts
  * them and names the flag.
  */
-export function renderSomedayPreview(sections, limits, base, showActive, hiddenActiveItems) {
+export function renderSomedayPreview(sections, grouped, limits, base, showActive, hiddenActiveItems) {
     const all = sections.flatMap((s) => s.items);
     const lines = [];
     let areaHit = false;
@@ -532,6 +752,8 @@ export function renderSomedayPreview(sections, limits, base, showActive, hiddenA
         const w = uuidDisplayWidth(all);
         const trailing = [];
         for (const section of sections) {
+            // The section is already bounded; re-partitioning it yields the SHOWN own
+            // items and child groups, with pre-cap totals read from the metadata.
             const { own, children } = partitionSomedaySection(section);
             trailing.push(...children);
             if (section.area !== null) {
@@ -539,13 +761,18 @@ export function renderSomedayPreview(sections, limits, base, showActive, hiddenA
                 lines.push(`${bold("──")} ${areaMark()} ${bold(`${section.area.title} ──`)}`);
             }
             const suppressArea = section.area?.uuid ?? null;
-            const shownOwn = takeUpTo(own, limits.area);
-            for (const item of shownOwn)
+            for (const item of own)
                 lines.push(formatItem(item, w, { suppressArea }));
-            if (own.length > shownOwn.length) {
+            const ownBlock = areaBlockFor(grouped, section.area);
+            if (ownBlock !== undefined && ownBlock.total > ownBlock.shown) {
                 areaHit = true;
                 const drill = section.area === null ? null : `things area show ${quoteTitle(section.area.title)}`;
-                lines.push(mixedMoreLine(own.slice(shownOwn.length), drill));
+                // Projects list first, so the hidden split is derivable from the block's
+                // totalProjects and how many of them were shown.
+                const shownProjects = Math.min(ownBlock.shown, ownBlock.totalProjects ?? 0);
+                const hiddenProjects = (ownBlock.totalProjects ?? 0) - shownProjects;
+                const hiddenTodos = ownBlock.total - ownBlock.shown - hiddenProjects;
+                lines.push(mixedMoreLine(hiddenProjects, hiddenTodos, drill));
             }
         }
         if (trailing.length > 0) {
@@ -553,14 +780,14 @@ export function renderSomedayPreview(sections, limits, base, showActive, hiddenA
             lines.push(bold("── From active projects ──"));
             for (const group of trailing) {
                 blank();
-                lines.push(`${dim(uuidCol(group.project.uuid, w))}  ${bold(underline(group.project.title))}`);
-                const shown = takeUpTo(group.items, limits.project);
-                for (const item of shown) {
+                lines.push(`${dim(uuidCol(group.project.uuid, w))}  ${underline(projectTitleAccent(group.project.title))}`);
+                for (const item of group.items) {
                     lines.push(formatItem(item, w, { suppressProject: group.project.uuid }));
                 }
-                if (group.items.length > shown.length) {
+                const projectBlock = projectBlockFor(grouped, group.project.uuid);
+                if (projectBlock !== undefined && projectBlock.total > projectBlock.shown) {
                     projectHit = true;
-                    lines.push(blockMoreLine(group.items.length, shown.length, `things project show ${quoteTitle(group.project.title)}`));
+                    lines.push(blockMoreLine(projectBlock.total, projectBlock.shown, `things project show ${quoteTitle(group.project.title)}`));
                 }
             }
         }
@@ -578,7 +805,10 @@ export function renderSomedayPreview(sections, limits, base, showActive, hiddenA
     }
     if (!showActive && hiddenActiveItems > 0) {
         blank();
-        lines.push(dim(`(${hiddenActiveItems} someday to-do${hiddenActiveItems === 1 ? "" : "s"} inside active projects — visible with \`things someday --show-active-project-items\`)`));
+        lines.push(disclosureHint(hiddenActiveItems, {
+            one: "someday to-do inside active projects",
+            many: "someday to-dos inside active projects",
+        }, [{ command: `${base} --show-active-project-items` }]));
     }
     return lines;
 }