things-api 0.8.0 → 0.10.0

package/dist/read/show-target.js

@@ -1,4 +1,4 @@
-import { resolveAreaUuid, resolveTaskUuidPrefix, stripThingsUri } from "./queries.js";
+import { resolveAreaUuid, resolveProjectUuid, resolveTaskUuidPrefix, stripThingsUri, } from "./queries.js";
 export function classifyShowTarget(db, ref) {
     const stripped = stripThingsUri(ref);
     try {
@@ -23,9 +23,18 @@ export function classifyShowTarget(db, ref) {
             throw err;
     }
     try {
-        return { kind: "area", uuid: resolveAreaUuid(db, stripped) };
+        return { kind: "area", uuid: resolveAreaUuid(db, stripped, { prefixTier: false }) };
     }
     catch {
+        // fall through to project-name resolution
+    }
+    try {
+        return { kind: "project", uuid: resolveProjectUuid(db, stripped, { prefixTier: false }) };
+    }
+    catch (err) {
+        // An ambiguous project name lists its candidates — surface that verbatim.
+        if (err instanceof RangeError && err.message.includes("ambiguous"))
+            throw err;
         throw new RangeError(`no to-do, project, or area matches "${ref}" (tags and checklist items have no show view)`);
     }
 }

package/dist/read/show-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"show-target.js","sourceRoot":"","sources":["../../src/read/show-target.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAStF,MAAM,UAAU,kBAAkB,CAAC,EAAgB,EAAE,GAAW;IAC9D,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,qBAAqB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,iDAAiD,CAAC,CAAC,GAAG,CAAC,IAAI,CAGjF,CAAC;QACF,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QACrD,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACnB,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI;gBACtB,MAAM,IAAI,UAAU,CAAC,WAAW,IAAI,oCAAoC,CAAC,CAAC;YAC5E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAClE,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,oEAAoE;QACpE,sEAAsE;QACtE,oCAAoC;QACpC,IAAI,GAAG,YAAY,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,MAAM,GAAG,CAAC;QAC9E,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC;YAAE,MAAM,GAAG,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,UAAU,CAClB,uCAAuC,GAAG,gDAAgD,CAC3F,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"show-target.js","sourceRoot":"","sources":["../../src/read/show-target.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,qBAAqB,EACrB,cAAc,GACf,MAAM,cAAc,CAAC;AAStB,MAAM,UAAU,kBAAkB,CAAC,EAAgB,EAAE,GAAW;IAC9D,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,qBAAqB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,iDAAiD,CAAC,CAAC,GAAG,CAAC,IAAI,CAGjF,CAAC;QACF,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QACrD,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACnB,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI;gBACtB,MAAM,IAAI,UAAU,CAAC,WAAW,IAAI,oCAAoC,CAAC,CAAC;YAC5E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAClE,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,oEAAoE;QACpE,sEAAsE;QACtE,oCAAoC;QACpC,IAAI,GAAG,YAAY,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,MAAM,GAAG,CAAC;QAC9E,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC;YAAE,MAAM,GAAG,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtF,CAAC;IAAC,MAAM,CAAC;QACP,0CAA0C;IAC5C,CAAC;IACD,IAAI,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAC5F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,0EAA0E;QAC1E,IAAI,GAAG,YAAY,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,MAAM,GAAG,CAAC;QAC9E,MAAM,IAAI,UAAU,CAClB,uCAAuC,GAAG,gDAAgD,CAC3F,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/read/sidebar-order.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Sidebar-order arrangement for the grouped views (anytime/someday). Takes an
+ * already-materialized flat list and reproduces the UI's sidebar layout:
+ * the area-less block first, then each area by its sidebar index; inside a
+ * block, direct to-dos first, then each project followed by its members.
+ *
+ * Type-only imports from views.ts (ListItem, SidebarSection) are erased at
+ * runtime, so the sole runtime edge is views.ts → sidebar-order.ts.
+ */
+import type { DatabaseSync } from "node:sqlite";
+import type { ListItem, SidebarSection } from "./views.ts";
+/**
+ * Arranges view members into the UI's flat sidebar-mirroring order: the
+ * area-less block first (direct to-dos, then each top-level project followed
+ * by its members), then each area by its sidebar index (direct to-dos, then
+ * its projects). Project and area order here mirrors the sidebar exactly —
+ * both read the same "index" columns.
+ */
+export declare function groupBySidebar(db: DatabaseSync, items: ListItem[]): SidebarSection[];

package/dist/read/sidebar-order.js

@@ -0,0 +1,93 @@
+/** `?, ?, …` SQL placeholder list of length n. */
+const inList = (n) => Array.from({ length: n }, () => "?").join(", ");
+/**
+ * Arranges view members into the UI's flat sidebar-mirroring order: the
+ * area-less block first (direct to-dos, then each top-level project followed
+ * by its members), then each area by its sidebar index (direct to-dos, then
+ * its projects). Project and area order here mirrors the sidebar exactly —
+ * both read the same "index" columns.
+ */
+export function groupBySidebar(db, items) {
+    if (items.length === 0)
+        return [];
+    // Headed children: resolve heading -> project.
+    const headingUuids = [
+        ...new Set(items.flatMap((i) => (i.type === "to-do" && i.heading !== null ? [i.heading.uuid] : []))),
+    ];
+    const headingProject = new Map();
+    if (headingUuids.length > 0) {
+        for (const row of db
+            .prepare(`SELECT uuid, project FROM TMTask WHERE uuid IN (${inList(headingUuids.length)})`)
+            .all(...headingUuids)) {
+            headingProject.set(row.uuid, row.project);
+        }
+    }
+    const effProject = (i) => i.type !== "to-do"
+        ? null
+        : (i.project?.uuid ??
+            (i.heading !== null ? (headingProject.get(i.heading.uuid) ?? null) : null));
+    // Sidebar rank + title for areas; index + area for every referenced project
+    // (a tag-filtered list can contain a child whose project row didn't match).
+    const areaRows = db
+        .prepare(`SELECT uuid, title, "index" FROM TMArea ORDER BY "index" ASC, uuid ASC`)
+        .all();
+    const areaRank = new Map(areaRows.map((a, rank) => [a.uuid, rank]));
+    const areaTitle = new Map(areaRows.map((a) => [a.uuid, a.title ?? ""]));
+    const projectUuids = [
+        ...new Set([
+            ...items.flatMap((i) => (i.type === "project" ? [i.uuid] : [])),
+            ...items.flatMap((i) => {
+                const p = effProject(i);
+                return p === null ? [] : [p];
+            }),
+        ]),
+    ];
+    const projectMeta = new Map();
+    if (projectUuids.length > 0) {
+        for (const row of db
+            .prepare(`SELECT uuid, "index", area FROM TMTask WHERE uuid IN (${inList(projectUuids.length)})`)
+            .all(...projectUuids)) {
+            projectMeta.set(row.uuid, { index: row.index ?? 0, area: row.area });
+        }
+    }
+    // items arrive in SQL "index" order, so array position IS the per-container
+    // rank (the internal index is no longer exposed on the entity).
+    const sortKey = (i, pos) => {
+        const project = i.type === "project" ? i.uuid : effProject(i);
+        const meta = project === null ? undefined : projectMeta.get(project);
+        const area = i.area?.uuid ?? meta?.area ?? null;
+        return {
+            areaRank: area === null ? -1 : (areaRank.get(area) ?? areaRows.length),
+            area: area ?? "",
+            inProject: project === null ? 0 : 1,
+            projectIndex: meta?.index ?? 0,
+            project: project ?? "",
+            headerFirst: i.type === "project" ? 0 : 1,
+            pos,
+            uuid: i.uuid,
+        };
+    };
+    const keyed = items.map((item, pos) => ({ item, k: sortKey(item, pos) }));
+    keyed.sort((a, b) => a.k.areaRank - b.k.areaRank ||
+        a.k.area.localeCompare(b.k.area) ||
+        a.k.inProject - b.k.inProject ||
+        a.k.projectIndex - b.k.projectIndex ||
+        a.k.project.localeCompare(b.k.project) ||
+        a.k.headerFirst - b.k.headerFirst ||
+        a.k.pos - b.k.pos ||
+        a.k.uuid.localeCompare(b.k.uuid));
+    const sections = [];
+    for (const { item, k } of keyed) {
+        const areaUuid = k.area === "" ? null : k.area;
+        const last = sections.at(-1);
+        if (last === undefined || (last.area?.uuid ?? null) !== areaUuid) {
+            sections.push({
+                area: areaUuid === null ? null : { uuid: areaUuid, title: areaTitle.get(areaUuid) ?? "" },
+                items: [],
+            });
+        }
+        sections.at(-1)?.items.push(item);
+    }
+    return sections;
+}
+//# sourceMappingURL=sidebar-order.js.map

package/dist/read/sidebar-order.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sidebar-order.js","sourceRoot":"","sources":["../../src/read/sidebar-order.ts"],"names":[],"mappings":"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"}

package/dist/read/tags.d.ts

@@ -8,10 +8,34 @@
  * direct tags.
  */
 import type { DatabaseSync } from "node:sqlite";
-import type { Area, Ref, Tag } from "../model/entities.ts";
+import type { Area, Ref, Tag, TagRef } from "../model/entities.ts";
 import type { TaskRow } from "../model/mappers.ts";
+/**
+ * The `things tags` listing: the tag TREE, depth-first, so a child always
+ * FOLLOWS its parent. Siblings (and roots) order by canonical `TMTag."index"`
+ * (the app's Tags-window rank), UUID tiebreak (TAGORD1 oracle — the Tags-window
+ * order for index-tied tags is uuid-ascending, not alphabetical; see
+ * fetchTagsForTasks).
+ *
+ * DFS is unambiguous here and matches the Tags window: this is a listing of the
+ * hierarchy itself, where the parent→child relationship is the structure. That
+ * is DISTINCT from a flat multi-tag pill row (fetchTagsForTasks / areaTags),
+ * where the ratified order is flat ascending `index` and the nested-tag
+ * interleave is an open question — see fetchTagsForTasks for that caveat.
+ */
 export declare function tagsView(db: DatabaseSync): Tag[];
 export declare function areasView(db: DatabaseSync): Area[];
 export declare function areaTags(db: DatabaseSync, areaUuid: string): Ref[];
-/** Tags inherited from ancestors (heading's project, project, area) — direct tags excluded. */
-export declare function inheritedTagsFor(db: DatabaseSync, row: TaskRow): Ref[];
+/**
+ * Tags inherited from ancestors (the heading's project, the project, the area),
+ * surfaced by NAME as a plain list ({@link TagRef}) parallel to the item's own
+ * direct tags. The item's OWN direct tags are excluded (they render on the
+ * `tags:` line, not here). Which tags are inherited is still computed — a
+ * heading cannot be tagged (TAGINH1, VM-verified), so the chain is
+ * heading → project → area — but no container source/provenance is emitted.
+ *
+ * ORDER: the merged inherited set is returned in the app's CANONICAL tag order
+ * — `TMTag."index"`, uuid tiebreak (TAGORD1) — the SAME comparator the direct
+ * pill row uses (fetchTagsForTasks), applied across the project+area union.
+ */
+export declare function inheritedTagsFor(db: DatabaseSync, row: TaskRow): TagRef[];

package/dist/read/tags.js

@@ -1,19 +1,57 @@
 import { q, selectList } from "../db/schema.js";
 import { fetchTagsForTasks, fetchTaskByUuid } from "./queries.js";
+/**
+ * The `things tags` listing: the tag TREE, depth-first, so a child always
+ * FOLLOWS its parent. Siblings (and roots) order by canonical `TMTag."index"`
+ * (the app's Tags-window rank), UUID tiebreak (TAGORD1 oracle — the Tags-window
+ * order for index-tied tags is uuid-ascending, not alphabetical; see
+ * fetchTagsForTasks).
+ *
+ * DFS is unambiguous here and matches the Tags window: this is a listing of the
+ * hierarchy itself, where the parent→child relationship is the structure. That
+ * is DISTINCT from a flat multi-tag pill row (fetchTagsForTasks / areaTags),
+ * where the ratified order is flat ascending `index` and the nested-tag
+ * interleave is an open question — see fetchTagsForTasks for that caveat.
+ */
 export function tagsView(db) {
     const rows = db
-        .prepare(`SELECT ${selectList("TMTag")} FROM TMTag ORDER BY ${q("index")} ASC`)
+        .prepare(`SELECT ${selectList("TMTag")} FROM TMTag ORDER BY ${q("index")} ASC, uuid ASC`)
         .all();
     const byUuid = new Map(rows.map((r) => [r.uuid, r]));
-    return rows.map((row) => {
+    // Children grouped under their parent uuid, each list already in index/title
+    // order (the SQL sort is stable and preserves the sibling ordering).
+    const childrenOf = new Map();
+    for (const row of rows) {
+        if (!row.parent)
+            continue;
+        (childrenOf.get(row.parent) ?? childrenOf.set(row.parent, []).get(row.parent)).push(row);
+    }
+    const out = [];
+    const seen = new Set();
+    const visit = (row) => {
+        if (seen.has(row.uuid))
+            return; // cycle guard (bad parent data can't loop)
+        seen.add(row.uuid);
         const parentRow = row.parent ? byUuid.get(row.parent) : undefined;
-        return {
-            uuid: row.uuid,
+        out.push({
             title: row.title ?? "",
             shortcut: row.shortcut,
-            parent: parentRow ? { uuid: parentRow.uuid, title: parentRow.title ?? "" } : null,
-        };
-    });
+            // Parent tag's NAME (null for a root) — the tree is reconstructable from
+            // names alone; tag uuids are never surfaced.
+            parent: parentRow ? (parentRow.title ?? "") : null,
+        });
+        for (const child of childrenOf.get(row.uuid) ?? [])
+            visit(child);
+    };
+    // Roots first (no parent, or an orphan whose parent uuid is absent), in index
+    // order; DFS pulls each subtree. A final pass emits any row a parent cycle
+    // left unreached, so the listing never silently drops a tag.
+    for (const row of rows)
+        if (!row.parent || !byUuid.has(row.parent))
+            visit(row);
+    for (const row of rows)
+        visit(row);
+    return out;
 }
 export function areasView(db) {
     const rows = db
@@ -23,23 +61,41 @@ export function areasView(db) {
         uuid: row.uuid,
         title: row.title ?? "",
         visible: row.visible !== 0,
-        tags: areaTags(db, row.uuid),
+        // Surface area tags by NAME only (tag uuids are internal).
+        tags: areaTags(db, row.uuid).map((t) => ({ title: t.title })),
     }));
 }
 export function areaTags(db, areaUuid) {
+    // Canonical pill order: ascending TMTag."index" (the app's Tags-window rank),
+    // UUID tiebreak. Same comparator + nested-tag caveat as fetchTagsForTasks.
     const rows = db
         .prepare(`SELECT tg.uuid AS uuid, tg.title AS title
        FROM TMAreaTag at JOIN TMTag tg ON tg.uuid = at.tags
-       WHERE at.areas = ? ORDER BY tg.title`)
+       WHERE at.areas = ? ORDER BY tg.${q("index")}, tg.uuid`)
         .all(areaUuid);
     return rows.map((r) => ({ uuid: r.uuid, title: r.title ?? "" }));
 }
-/** Tags inherited from ancestors (heading's project, project, area) — direct tags excluded. */
+/**
+ * Tags inherited from ancestors (the heading's project, the project, the area),
+ * surfaced by NAME as a plain list ({@link TagRef}) parallel to the item's own
+ * direct tags. The item's OWN direct tags are excluded (they render on the
+ * `tags:` line, not here). Which tags are inherited is still computed — a
+ * heading cannot be tagged (TAGINH1, VM-verified), so the chain is
+ * heading → project → area — but no container source/provenance is emitted.
+ *
+ * ORDER: the merged inherited set is returned in the app's CANONICAL tag order
+ * — `TMTag."index"`, uuid tiebreak (TAGORD1) — the SAME comparator the direct
+ * pill row uses (fetchTagsForTasks), applied across the project+area union.
+ */
 export function inheritedTagsFor(db, row) {
+    // Work with uuid-carrying rows INTERNALLY (dedup + canonical ranking need the
+    // uuid); the surfaced TagRef carries the tag NAME only. First-seen wins on a
+    // duplicate — the nearer ancestor (project, collected before area) is kept.
     const collected = new Map();
     const addAll = (refs) => {
         for (const ref of refs)
-            collected.set(ref.uuid, ref);
+            if (!collected.has(ref.uuid))
+                collected.set(ref.uuid, ref);
     };
     let projectUuid = row.project;
     if (!projectUuid && row.heading) {
@@ -57,6 +113,21 @@ export function inheritedTagsFor(db, row) {
     if (areaUuid)
         addAll(areaTags(db, areaUuid));
     const direct = new Set((fetchTagsForTasks(db, [row.uuid]).get(row.uuid) ?? []).map((t) => t.uuid));
-    return [...collected.values()].filter((t) => !direct.has(t.uuid));
+    const result = [...collected.values()].filter((ref) => !direct.has(ref.uuid));
+    if (result.length > 1) {
+        // Re-rank the project+area union in one canonical `index, uuid` pass so the
+        // merged inherited chips match the GUI's tag order (the per-source lists
+        // arrive already ordered, but their concatenation is not globally sorted).
+        const rank = new Map();
+        const uuids = result.map((ref) => ref.uuid);
+        const rows = db
+            .prepare(`SELECT uuid FROM TMTag WHERE uuid IN (${uuids.map(() => "?").join(", ")})
+         ORDER BY ${q("index")}, uuid`)
+            .all(...uuids);
+        rows.forEach((r, i) => rank.set(r.uuid, i));
+        result.sort((a, b) => (rank.get(a.uuid) ?? 0) - (rank.get(b.uuid) ?? 0));
+    }
+    // Surface the tag NAME only (uuid stays internal).
+    return result.map((ref) => ({ title: ref.title }));
 }
 //# sourceMappingURL=tags.js.map

package/dist/read/tags.js.map

@@ -1 +1 @@
-{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/read/tags.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/read/tags.ts"],"names":[],"mappings":"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"}

package/dist/read/truncation.d.ts

@@ -0,0 +1,71 @@
+/**
+ * Shared list-view truncation: turn a full, filtered result into the rows a
+ * surface actually shows (default 50) plus the exact {@link Truncation}
+ * metadata every surface reports so nothing is ever silently dropped. The
+ * limit counts ITEMS in render order and truncates mid-group; grouped shapes
+ * (the Today split, sidebar sections) drop the trailing groups that fall
+ * entirely past the cut so no empty header survives. `limit === null` means
+ * "all rows" (the caller passed --all / all: true).
+ */
+import type { GroupedTruncation, Truncation } from "../contracts.ts";
+import { type AreaView } from "./area-view.ts";
+import { AREA_PREVIEW_LIMIT, DEFAULT_LIST_LIMIT, PROJECT_PREVIEW_LIMIT } from "../surface-copy.ts";
+import type { SidebarSection, TodayView } from "./views.ts";
+import { partitionSomedaySection, splitSectionBlocks, type GroupedLimits } from "./sections.ts";
+export { AREA_PREVIEW_LIMIT, DEFAULT_LIST_LIMIT, PROJECT_PREVIEW_LIMIT };
+export { partitionSomedaySection, splitSectionBlocks, type GroupedLimits };
+/** Flat list: slice to the limit; total is the full filtered length. */
+export declare function truncateList<T>(items: T[], limit: number | null): {
+    data: T[];
+    truncation: Truncation;
+};
+/**
+ * Today split: the cut runs across Today then This Evening in render order,
+ * so a limit smaller than the Today block trims Evening to nothing. The badge
+ * (a whole-view count summary) is preserved unchanged. The truncation carries
+ * a per-section (`today`/`evening`) shown/total breakdown so a renderer can
+ * keep This Evening honest under the single global cap without a pre-cap copy.
+ */
+export declare function truncateToday(view: TodayView, limit: number | null): {
+    data: TodayView;
+    truncation: Truncation;
+};
+/**
+ * Anytime: the block skeleton is ALWAYS complete — every area header and
+ * every project row survives — and the caps apply INDEPENDENTLY to each
+ * innermost item list: `limits.area` to the loose block and each area's
+ * direct to-dos, `limits.project` to each project's to-dos. Returns the
+ * per-block-truncated sections (project rows retained) plus the per-block
+ * counts and a top-level `truncated` flag.
+ */
+export declare function previewSections(sections: SidebarSection[], limits: GroupedLimits): {
+    data: SidebarSection[];
+    grouped: GroupedTruncation;
+};
+/**
+ * Someday preview: every group survives; `limits.area` (null = no cap)
+ * applies independently to each section's own block (project rows + direct
+ * to-dos are items alike there), `limits.project` to each active project's
+ * child group (the show-active-project-items toggle). Sections keep their
+ * capped children after the own block, still clustered per project.
+ */
+export declare function previewSomedaySections(sections: SidebarSection[], limits: GroupedLimits): {
+    data: SidebarSection[];
+    grouped: GroupedTruncation;
+};
+/**
+ * Sectioned cap for the `area show` detail view: its sections are containers,
+ * so there is no strict total limit — instead `limits.project` bounds the
+ * ACTIVE project-ROWS section and `limits.area` the direct-to-dos section
+ * (null = uncapped). The cap is render-aware: only the area's ACTIVE project
+ * rows are capped, while its future-scheduled and someday project rows always
+ * survive (the card renders them under its uncapped Upcoming/Someday sections),
+ * so the human view derives entirely from this bounded shape. The toggled
+ * later/logged lists and the trashed bucket pass through untouched. Counts ride
+ * the same grouped-block shape the sidebar catalogues emit (kind "projects" =
+ * the active project-rows section). `now` classifies the schedule split.
+ */
+export declare function capAreaSections(view: AreaView, limits: GroupedLimits, now?: Date): {
+    data: AreaView;
+    grouped: GroupedTruncation;
+};

package/dist/read/truncation.js

@@ -0,0 +1,217 @@
+import { localToday } from "../model/dates.js";
+import { isActiveProjectRow } from "./area-view.js";
+import { AREA_PREVIEW_LIMIT, DEFAULT_LIST_LIMIT, PROJECT_PREVIEW_LIMIT } from "../surface-copy.js";
+import { partitionSomedaySection, splitSectionBlocks } from "./sections.js";
+// The per-block cap shape and the structural section splitters live in
+// ./sections.ts (imported for capping here). Re-exported so existing importers
+// — and the truncation unit test — keep one import site.
+export { AREA_PREVIEW_LIMIT, DEFAULT_LIST_LIMIT, PROJECT_PREVIEW_LIMIT };
+export { partitionSomedaySection, splitSectionBlocks };
+const whole = (total, limit) => ({
+    shown: total,
+    total,
+    limit,
+    truncated: false,
+});
+/** Flat list: slice to the limit; total is the full filtered length. */
+export function truncateList(items, limit) {
+    const total = items.length;
+    if (limit === null || total <= limit)
+        return { data: items, truncation: whole(total, limit) };
+    return {
+        data: items.slice(0, limit),
+        truncation: { shown: limit, total, limit, truncated: true },
+    };
+}
+/**
+ * Today split: the cut runs across Today then This Evening in render order,
+ * so a limit smaller than the Today block trims Evening to nothing. The badge
+ * (a whole-view count summary) is preserved unchanged. The truncation carries
+ * a per-section (`today`/`evening`) shown/total breakdown so a renderer can
+ * keep This Evening honest under the single global cap without a pre-cap copy.
+ */
+export function truncateToday(view, limit) {
+    const todayTotal = view.today.length;
+    const eveningTotal = view.evening.length;
+    const total = todayTotal + eveningTotal;
+    const sections = (shownToday, shownEvening) => [
+        { key: "today", shown: shownToday, total: todayTotal },
+        { key: "evening", shown: shownEvening, total: eveningTotal },
+    ];
+    if (limit === null || total <= limit) {
+        return {
+            data: view,
+            truncation: { ...whole(total, limit), sections: sections(todayTotal, eveningTotal) },
+        };
+    }
+    const today = view.today.slice(0, limit);
+    const evening = view.evening.slice(0, Math.max(0, limit - today.length));
+    const shown = today.length + evening.length;
+    return {
+        data: { today, evening, badge: view.badge },
+        truncation: {
+            shown,
+            total,
+            limit,
+            truncated: true,
+            sections: sections(today.length, evening.length),
+        },
+    };
+}
+const takeUpTo = (items, limit) => limit === null ? items : items.slice(0, limit);
+/**
+ * Anytime: the block skeleton is ALWAYS complete — every area header and
+ * every project row survives — and the caps apply INDEPENDENTLY to each
+ * innermost item list: `limits.area` to the loose block and each area's
+ * direct to-dos, `limits.project` to each project's to-dos. Returns the
+ * per-block-truncated sections (project rows retained) plus the per-block
+ * counts and a top-level `truncated` flag.
+ */
+export function previewSections(sections, limits) {
+    const outSections = [];
+    const blocks = [];
+    let truncated = false;
+    for (const section of sections) {
+        const { direct, projects } = splitSectionBlocks(section);
+        const shownDirect = takeUpTo(direct, limits.area);
+        if (direct.length > shownDirect.length)
+            truncated = true;
+        // Project item-lists nest inside their area/loose block.
+        const children = [];
+        const items = [...shownDirect];
+        for (const { project, items: kids } of projects) {
+            const shownChildren = takeUpTo(kids, limits.project);
+            if (kids.length > 0) {
+                if (kids.length > shownChildren.length)
+                    truncated = true;
+                children.push({
+                    kind: "project",
+                    ref: project.uuid,
+                    title: project.title,
+                    shown: shownChildren.length,
+                    total: kids.length,
+                    limit: limits.project,
+                });
+            }
+            items.push(project, ...shownChildren);
+        }
+        if (direct.length > 0 || children.length > 0) {
+            blocks.push({
+                kind: section.area === null ? "loose" : "area",
+                ref: section.area?.uuid ?? null,
+                title: section.area?.title ?? null,
+                shown: shownDirect.length,
+                total: direct.length,
+                limit: limits.area,
+                ...(children.length > 0 && { children }),
+            });
+        }
+        outSections.push({ area: section.area, items });
+    }
+    return { data: outSections, grouped: { truncated, blocks } };
+}
+/**
+ * Someday preview: every group survives; `limits.area` (null = no cap)
+ * applies independently to each section's own block (project rows + direct
+ * to-dos are items alike there), `limits.project` to each active project's
+ * child group (the show-active-project-items toggle). Sections keep their
+ * capped children after the own block, still clustered per project.
+ */
+export function previewSomedaySections(sections, limits) {
+    const outSections = [];
+    const blocks = [];
+    let truncated = false;
+    for (const section of sections) {
+        const { own, children } = partitionSomedaySection(section);
+        const shownOwn = takeUpTo(own, limits.area);
+        if (own.length > shownOwn.length)
+            truncated = true;
+        // The active-project child groups nest inside this section's own block.
+        const childBlocks = [];
+        const items = [...shownOwn];
+        for (const group of children) {
+            const shown = takeUpTo(group.items, limits.project);
+            if (group.items.length > shown.length)
+                truncated = true;
+            childBlocks.push({
+                kind: "project",
+                ref: group.project.uuid,
+                title: group.project.title,
+                shown: shown.length,
+                total: group.items.length,
+                limit: limits.project,
+            });
+            items.push(...shown);
+        }
+        if (own.length > 0 || childBlocks.length > 0) {
+            const totalProjects = own.filter((i) => i.type === "project").length;
+            blocks.push({
+                kind: section.area === null ? "loose" : "area",
+                ref: section.area?.uuid ?? null,
+                title: section.area?.title ?? null,
+                shown: shownOwn.length,
+                total: own.length,
+                limit: limits.area,
+                totalProjects,
+                totalTodos: own.length - totalProjects,
+                ...(childBlocks.length > 0 && { children: childBlocks }),
+            });
+        }
+        outSections.push({ area: section.area, items });
+    }
+    return { data: outSections, grouped: { truncated, blocks } };
+}
+/**
+ * Sectioned cap for the `area show` detail view: its sections are containers,
+ * so there is no strict total limit — instead `limits.project` bounds the
+ * ACTIVE project-ROWS section and `limits.area` the direct-to-dos section
+ * (null = uncapped). The cap is render-aware: only the area's ACTIVE project
+ * rows are capped, while its future-scheduled and someday project rows always
+ * survive (the card renders them under its uncapped Upcoming/Someday sections),
+ * so the human view derives entirely from this bounded shape. The toggled
+ * later/logged lists and the trashed bucket pass through untouched. Counts ride
+ * the same grouped-block shape the sidebar catalogues emit (kind "projects" =
+ * the active project-rows section). `now` classifies the schedule split.
+ */
+export function capAreaSections(view, limits, now) {
+    const todayIso = localToday(now);
+    const blocks = [];
+    let truncated = false;
+    // Cap the ACTIVE project rows in place; scheduled/someday rows always survive.
+    const activeTotal = view.projects.filter((p) => isActiveProjectRow(p, todayIso)).length;
+    const shownActive = limits.project === null ? activeTotal : Math.min(activeTotal, limits.project);
+    let activeSeen = 0;
+    const projects = view.projects.filter((p) => {
+        if (!isActiveProjectRow(p, todayIso))
+            return true;
+        activeSeen += 1;
+        return limits.project === null || activeSeen <= limits.project;
+    });
+    if (activeTotal > 0) {
+        if (shownActive < activeTotal)
+            truncated = true;
+        blocks.push({
+            kind: "projects",
+            ref: view.area.uuid,
+            title: view.area.title,
+            shown: shownActive,
+            total: activeTotal,
+            limit: limits.project,
+        });
+    }
+    const active = limits.area === null ? view.active : view.active.slice(0, limits.area);
+    if (view.active.length > 0) {
+        if (active.length < view.active.length)
+            truncated = true;
+        blocks.push({
+            kind: "area",
+            ref: view.area.uuid,
+            title: view.area.title,
+            shown: active.length,
+            total: view.active.length,
+            limit: limits.area,
+        });
+    }
+    return { data: { ...view, projects, active }, grouped: { truncated, blocks } };
+}
+//# sourceMappingURL=truncation.js.map