things-api 0.9.0 → 0.11.0

package/dist/read/detail.js

@@ -1,20 +1,27 @@
 import { mapChecklistItem, mapHeading, mapProject, mapTodo, } from "../model/mappers.js";
 import { decodeRecurrenceRule } from "../model/recurrence.js";
+import { encodePackedDate, localToday } from "../model/dates.js";
 import { fetchChecklistRows, fetchTagsForTasks, fetchTaskByUuid, makeHeadingProjectResolver, makeRefResolver, } from "./queries.js";
 import { logBoundary, markLogged } from "./log-boundary.js";
 import { inheritedTagsFor } from "./tags.js";
-export function byUuid(db, uuid) {
+// `now`/`zone` supply the evaluation clock used to gate `todaySection` to
+// Today members (see mappers.mapTodaySection). They default to the host clock —
+// matching this module's existing logBoundary default; the client facade passes
+// the injected clock so a pinned-clock `show` reads under the consumer's Today.
+export function byUuid(db, uuid, now = new Date(), zone) {
     const row = fetchTaskByUuid(db, uuid);
     if (!row)
         return null;
-    return materializeOne(db, row);
+    return materializeOne(db, row, encodePackedDate(localToday(now, zone)));
 }
-function materializeOne(db, row) {
+function materializeOne(db, row, packedToday) {
     const refs = makeRefResolver(db);
     if (row.type === 2)
         return mapHeading(row, refs);
     const tags = fetchTagsForTasks(db, [row.uuid]).get(row.uuid) ?? [];
-    const entity = row.type === 1 ? mapProject(row, refs, tags) : mapTodo(row, refs, tags);
+    const entity = row.type === 1
+        ? mapProject(row, refs, tags, packedToday)
+        : mapTodo(row, refs, tags, packedToday);
     markLogged([entity], logBoundary(db));
     entity.inheritedTags = inheritedTagsFor(db, row);
     if (entity.type === "to-do") {

package/dist/read/detail.js.map

@@ -1 +1 @@
-{"version":3,"file":"detail.js","sourceRoot":"","sources":["../../src/read/detail.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,OAAO,GAER,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,0BAA0B,EAC1B,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,UAAU,MAAM,CAAC,EAAgB,EAAE,IAAY;IACnD,MAAM,GAAG,GAAG,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,OAAO,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,cAAc,CAAC,EAAgB,EAAE,GAAY;IACpD,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IACjC,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,iBAAiB,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACnE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACvF,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IACtC,MAAM,CAAC,aAAa,GAAG,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACjD,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,CAAC,SAAS,GAAG,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9C,uEAAuE;QACvE,sDAAsD;QACtD,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC5B,MAAM,CAAC,GAAG,0BAA0B,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,IAAI;gBAAE,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,IAAI,GAAG,CAAC,kBAAkB,KAAK,IAAI,EAAE,CAAC;QACnE,IAAI,CAAC;YACH,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACvE,CAAC;QAAC,MAAM,CAAC;YACP,mEAAmE;YACnE,6DAA6D;QAC/D,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAAgB,EAAE,QAAgB;IAC7D,OAAO,kBAAkB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"detail.js","sourceRoot":"","sources":["../../src/read/detail.ts"],"names":[],"mappings":"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"}

package/dist/read/filter-contract.d.ts

@@ -0,0 +1,117 @@
+/**
+ * The per-view filter contract — the ONE declarative statement of which read
+ * filters each view honors, plus the shared predicates that enforce them. Both
+ * consumer surfaces (CLI commands, MCP tools) derive their per-view guards from
+ * this table instead of hand-coding view lists, so a filter's applicability is
+ * stated once and can never drift between surfaces.
+ *
+ * The table says, per view: whether the `overdue` content scope applies; what
+ * tag semantics the view carries (inheritance-inclusive `inherited`, container-
+ * direct `direct`, or `rejected` where the view has no per-row tags to filter);
+ * the bound model the view truncates under (`flat` row cap, `grouped` per-block
+ * caps, or `none`); and whether the view offers the status-widening flags
+ * (search's logged/trashed/all) that `overdue` refuses to combine with.
+ *
+ * The exact usage-error COPY stays surface-owned (consumer voice differs per
+ * surface — CLI `--tag`, MCP `tag`; docs/design/surface-copy.md): a surface
+ * hands {@link validateViewArgs} its own phrasing via {@link FilterVocab}, and
+ * this module owns only the DECISION of which message applies.
+ */
+import type { ViewFilter } from "./views.ts";
+/** Every read view whose filter applicability the contract governs. */
+export type ViewName = "today" | "inbox" | "anytime" | "someday" | "upcoming" | "logbook" | "trash" | "search" | "changes" | "projects" | "areas" | "project-show" | "area-show";
+/**
+ * How a view's tag filter behaves:
+ * - `inherited` — FLAT views: a `--tag` matches direct OR container-inherited
+ *   membership (plus hierarchy descendants).
+ * - `direct` — CONTAINER views (`project show`, `area show`): a `--tag` matches
+ *   a tag carried DIRECTLY on the row (the container's own inherited tags are
+ *   suppressed, since every child inherits them).
+ * - `rejected` — the view has no per-row tag list to filter (an area list row,
+ *   a tag list row, the changes feed); tag flags do not apply.
+ */
+export type TagSemantics = "inherited" | "direct" | "rejected";
+/** The truncation model a view bounds under. */
+export type BoundModel = "flat" | "grouped" | "none";
+/** One row of {@link FILTER_CONTRACT}: a single view's filter applicability. */
+export interface ViewFilterSpec {
+    /** Whether the `overdue` content scope (open, past-deadline) applies. */
+    readonly overdue: boolean;
+    /** The view's tag-filter semantics. */
+    readonly tag: TagSemantics;
+    /** The bound model the view truncates under. */
+    readonly bound: BoundModel;
+    /**
+     * Whether the view offers the status-widening flags (logged/trashed/all).
+     * Only `search` does; `overdue` refuses to combine with them there.
+     */
+    readonly statusWidening: boolean;
+}
+/**
+ * The single source of truth for read-filter applicability, one row per view.
+ * Consumed by both surfaces' per-view guards (CLI command actions, MCP tool
+ * handlers) so no surface hand-maintains its own view list.
+ */
+export declare const FILTER_CONTRACT: Record<ViewName, ViewFilterSpec>;
+/**
+ * The three universal tag-filter inputs in their canonical (CLI-flag) spelling.
+ * The CLI's parsed options match this verbatim; the MCP surface maps its
+ * snake_case inputs (`exact_tag`) onto it before calling the shared predicates.
+ */
+export interface TagPresence {
+    tag?: readonly string[] | undefined;
+    exactTag?: boolean | undefined;
+    untagged?: boolean | undefined;
+}
+/** True when any tag-PRESENCE flag was passed (a positive filter, not a negation). */
+export declare function hasTagPresence(a: TagPresence): boolean;
+/**
+ * True when the tag flags are mutually incoherent: the `untagged` negation
+ * inverts a tag presence, so it does not combine with a tag-presence flag. A
+ * pure predicate — each surface emits its own usage error in its own voice.
+ */
+export declare function tagFlagConflict(a: TagPresence): boolean;
+/** Build the {@link ViewFilter} tag fields from the parsed flags (empty keys omitted). */
+export declare function tagFilterFields(a: TagPresence): ViewFilter;
+/** The parsed read-filter inputs {@link validateViewArgs} inspects. */
+export interface FilterArgs extends TagPresence {
+    overdue?: boolean | undefined;
+    /** search only: the status-widening flags overdue refuses to combine with. */
+    logged?: boolean | undefined;
+    trashed?: boolean | undefined;
+    all?: boolean | undefined;
+}
+/**
+ * The surface's exact usage-error copy for each conflict {@link validateViewArgs}
+ * can detect. Built per call by the surface (it knows the view/kind and its own
+ * flag spellings), so the SHARED module decides WHICH message applies while the
+ * message text stays consumer-voiced per surface.
+ */
+export interface FilterVocab {
+    /** `untagged` combined with a tag-presence flag. */
+    untaggedConflict: string;
+    /** `overdue` passed to a view that does not honor it. */
+    overdueRejected: string;
+    /** `overdue` combined with a status-widening flag (search). */
+    overdueStatusWiden: string;
+}
+/** {@link validateViewArgs} outcome: the built filter, or the usage message to emit. */
+export type ViewValidation = {
+    ok: true;
+    filter: ViewFilter;
+} | {
+    ok: false;
+    message: string;
+};
+/**
+ * Validate a view's filter arguments against {@link FILTER_CONTRACT} and, when
+ * coherent, build the {@link ViewFilter} tag+overdue portion. The checks (and
+ * their precedence) live here so both surfaces stay in lockstep; the surface
+ * supplies its own exact copy via {@link FilterVocab}.
+ *
+ * Does NOT enforce tag-REJECTION (a view refusing tag flags outright): that
+ * lives at the two call sites that currently reject — the areas/projects/tags
+ * collection listers — so this stays a pure no-op for the flat/container views
+ * that merely ignore tags on a sub-path (e.g. `trash`).
+ */
+export declare function validateViewArgs(view: ViewName, args: FilterArgs, vocab: FilterVocab): ViewValidation;

package/dist/read/filter-contract.js

@@ -0,0 +1,78 @@
+/**
+ * The single source of truth for read-filter applicability, one row per view.
+ * Consumed by both surfaces' per-view guards (CLI command actions, MCP tool
+ * handlers) so no surface hand-maintains its own view list.
+ */
+export const FILTER_CONTRACT = {
+    // Current-work flat views: overdue applies, tags are inheritance-inclusive.
+    today: { overdue: true, tag: "inherited", bound: "flat", statusWidening: false },
+    inbox: { overdue: true, tag: "inherited", bound: "flat", statusWidening: false },
+    // Grouped catalogues: overdue applies, per-block caps.
+    anytime: { overdue: true, tag: "inherited", bound: "grouped", statusWidening: false },
+    someday: { overdue: true, tag: "inherited", bound: "grouped", statusWidening: false },
+    // Forward-looking / closed-item flat views: overdue deliberately does NOT apply.
+    upcoming: { overdue: false, tag: "inherited", bound: "flat", statusWidening: false },
+    logbook: { overdue: false, tag: "inherited", bound: "flat", statusWidening: false },
+    trash: { overdue: false, tag: "rejected", bound: "flat", statusWidening: false },
+    // Search: overdue applies but refuses the status-widening flags.
+    search: { overdue: true, tag: "inherited", bound: "flat", statusWidening: true },
+    // Sync feed: neither overdue nor tags apply.
+    changes: { overdue: false, tag: "rejected", bound: "flat", statusWidening: false },
+    // Projects LIST is a FLAT view — each project row filtered by its own
+    // (inheritance-inclusive) tags; overdue keeps past-deadline projects.
+    projects: { overdue: true, tag: "inherited", bound: "none", statusWidening: false },
+    // Areas LIST rows carry no deadline and no per-row tag filter.
+    areas: { overdue: false, tag: "rejected", bound: "none", statusWidening: false },
+    // Single-container views: overdue and DIRECT-tag filtering apply to children.
+    "project-show": { overdue: true, tag: "direct", bound: "grouped", statusWidening: false },
+    "area-show": { overdue: true, tag: "direct", bound: "grouped", statusWidening: false },
+};
+/** True when any tag-PRESENCE flag was passed (a positive filter, not a negation). */
+export function hasTagPresence(a) {
+    return (a.tag?.length ?? 0) > 0 || a.exactTag === true;
+}
+/**
+ * True when the tag flags are mutually incoherent: the `untagged` negation
+ * inverts a tag presence, so it does not combine with a tag-presence flag. A
+ * pure predicate — each surface emits its own usage error in its own voice.
+ */
+export function tagFlagConflict(a) {
+    return a.untagged === true && hasTagPresence(a);
+}
+/** Build the {@link ViewFilter} tag fields from the parsed flags (empty keys omitted). */
+export function tagFilterFields(a) {
+    return {
+        ...(a.tag !== undefined && a.tag.length > 0 && { tags: [...a.tag] }),
+        ...(a.exactTag === true && { exactTag: true }),
+        ...(a.untagged === true && { untagged: true }),
+    };
+}
+/**
+ * Validate a view's filter arguments against {@link FILTER_CONTRACT} and, when
+ * coherent, build the {@link ViewFilter} tag+overdue portion. The checks (and
+ * their precedence) live here so both surfaces stay in lockstep; the surface
+ * supplies its own exact copy via {@link FilterVocab}.
+ *
+ * Does NOT enforce tag-REJECTION (a view refusing tag flags outright): that
+ * lives at the two call sites that currently reject — the areas/projects/tags
+ * collection listers — so this stays a pure no-op for the flat/container views
+ * that merely ignore tags on a sub-path (e.g. `trash`).
+ */
+export function validateViewArgs(view, args, vocab) {
+    const spec = FILTER_CONTRACT[view];
+    if (tagFlagConflict(args))
+        return { ok: false, message: vocab.untaggedConflict };
+    if (args.overdue === true && !spec.overdue) {
+        return { ok: false, message: vocab.overdueRejected };
+    }
+    if (args.overdue === true &&
+        spec.statusWidening &&
+        (args.logged === true || args.trashed === true || args.all === true)) {
+        return { ok: false, message: vocab.overdueStatusWiden };
+    }
+    return {
+        ok: true,
+        filter: { ...tagFilterFields(args), ...(args.overdue === true && { overdue: true }) },
+    };
+}
+//# sourceMappingURL=filter-contract.js.map

package/dist/read/filter-contract.js.map

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

package/dist/read/log-boundary.d.ts

@@ -20,7 +20,7 @@
  * FORWARD past the interval's own edge.
  */
 import type { DatabaseSync } from "node:sqlite";
-export declare function logBoundary(db: DatabaseSync, now?: Date): Date;
+export declare function logBoundary(db: DatabaseSync, now?: Date, zone?: string): Date;
 /** Stamp `logged` on mapped entities (closed AND at/before the boundary). */
 export declare function markLogged<T extends {
     status: string;

package/dist/read/log-boundary.js

@@ -1,8 +1,18 @@
-export function logBoundary(db, now = new Date()) {
+import { dayBoundInstant, localToday } from "../model/dates.js";
+// `zone` (optional IANA zone) is threaded so the daily/weekly/monthly sweep
+// edge is the CONSUMER'S local midnight, not the host's — byte-identical to a
+// bare `new Date(now); setHours(0,…)` when absent. logInterval=0 (immediately,
+// the golden default) is zone-independent (the boundary is `now`).
+export function logBoundary(db, now = new Date(), zone) {
     const row = db.prepare("SELECT logInterval, manualLogDate FROM TMSettings").get();
     const manual = row?.manualLogDate != null ? new Date(row.manualLogDate * 1000) : null;
-    const startOfDay = new Date(now);
-    startOfDay.setHours(0, 0, 0, 0);
+    const startOfDay = zone === undefined
+        ? (() => {
+            const d = new Date(now);
+            d.setHours(0, 0, 0, 0);
+            return d;
+        })()
+        : dayBoundInstant(localToday(now, zone), "start", zone);
     let auto;
     switch (row?.logInterval ?? 0) {
         case 0:

package/dist/read/log-boundary.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-boundary.js","sourceRoot":"","sources":["../../src/read/log-boundary.ts"],"names":[],"mappings":"AAuBA,MAAM,UAAU,WAAW,CAAC,EAAgB,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE;IAC5D,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,mDAAmD,CAAC,CAAC,GAAG,EAElE,CAAC;IACd,MAAM,MAAM,GAAG,GAAG,EAAE,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtF,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IACjC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAChC,IAAI,IAAU,CAAC;IACf,QAAQ,GAAG,EAAE,WAAW,IAAI,CAAC,EAAE,CAAC;QAC9B,KAAK,CAAC;YACJ,IAAI,GAAG,GAAG,CAAC;YACX,MAAM;QACR,KAAK,CAAC;YACJ,IAAI,GAAG,UAAU,CAAC;YAClB,MAAM;QACR,KAAK,CAAC,CAAC,CAAC,CAAC;YACP,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YACpC,IAAI,GAAG,CAAC,CAAC;YACT,MAAM;QACR,CAAC;QACD,KAAK,CAAC,CAAC,CAAC,CAAC;YACP,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACb,IAAI,GAAG,CAAC,CAAC;YACT,MAAM;QACR,CAAC;QACD;YACE,IAAI,GAAG,MAAM,IAAI,GAAG,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,UAAU,CACxB,KAAU,EACV,QAAc;IAEd,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC;IAC5F,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"log-boundary.js","sourceRoot":"","sources":["../../src/read/log-boundary.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEhE,4EAA4E;AAC5E,8EAA8E;AAC9E,+EAA+E;AAC/E,mEAAmE;AACnE,MAAM,UAAU,WAAW,CAAC,EAAgB,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,IAAa;IAC3E,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,mDAAmD,CAAC,CAAC,GAAG,EAElE,CAAC;IACd,MAAM,MAAM,GAAG,GAAG,EAAE,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtF,MAAM,UAAU,GACd,IAAI,KAAK,SAAS;QAChB,CAAC,CAAC,CAAC,GAAS,EAAE;YACV,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACvB,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAU,CAAC;IACf,QAAQ,GAAG,EAAE,WAAW,IAAI,CAAC,EAAE,CAAC;QAC9B,KAAK,CAAC;YACJ,IAAI,GAAG,GAAG,CAAC;YACX,MAAM;QACR,KAAK,CAAC;YACJ,IAAI,GAAG,UAAU,CAAC;YAClB,MAAM;QACR,KAAK,CAAC,CAAC,CAAC,CAAC;YACP,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YACpC,IAAI,GAAG,CAAC,CAAC;YACT,MAAM;QACR,CAAC;QACD,KAAK,CAAC,CAAC,CAAC,CAAC;YACP,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACb,IAAI,GAAG,CAAC,CAAC;YACT,MAAM;QACR,CAAC;QACD;YACE,IAAI,GAAG,MAAM,IAAI,GAAG,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,UAAU,CACxB,KAAU,EACV,QAAc;IAEd,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC;IAC5F,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/read/predicates.d.ts

@@ -2,6 +2,36 @@
 export declare const LIVE = "t.type IN (0, 1) AND t.trashed = 0 AND (t.rt1_recurrenceRule IS NULL AND t.repeater IS NULL)";
 /** {@link LIVE} restricted to open (status = 0) rows. */
 export declare const OPEN = "t.type IN (0, 1) AND t.trashed = 0 AND (t.rt1_recurrenceRule IS NULL AND t.repeater IS NULL) AND t.status = 0";
+/**
+ * The GUI-visible set: open rows PLUS closed (completed/canceled) rows the
+ * periodic log-move sweep has NOT yet carried to the Logbook — completion ≠
+ * logged (src/read/log-boundary.ts). A closed row keeps its slot in its list
+ * until the sweep passes it, exactly as the GUI keeps it checked in place; it
+ * leaves when the sweep boundary advances past its stopDate (boundary-relative,
+ * no new state). This is {@link LIVE} widened to that set: swept iff
+ * status IN (2,3) AND stopDate IS NOT NULL AND stopDate <= boundary — the
+ * negation of the {@link markLogged} `logged` predicate, so an included closed
+ * row always materializes with `logged=false`. Mirrors the project/area card
+ * precedent (project-view.ts / area-view.ts keep a closed-but-unswept row
+ * checked in place). ONE bind: the log boundary as epoch seconds
+ * (logBoundary(db, now).getTime() / 1000). Ruling 2026-07-14 (Mike): GUI parity
+ * — `today` and `anytime` show checked-but-unswept rows.
+ */
+export declare const OPEN_OR_UNSWEPT = "t.type IN (0, 1) AND t.trashed = 0 AND (t.rt1_recurrenceRule IS NULL AND t.repeater IS NULL) AND NOT (t.status IN (2, 3) AND t.stopDate IS NOT NULL AND t.stopDate <= ?)";
+/**
+ * The `--overdue` content scope: OPEN items whose deadline falls strictly
+ * BEFORE today. Due-TODAY is deliberately NOT overdue (`<`, not `<=`) —
+ * mirroring the app's own Today badge split, where a deadline EQUAL to today
+ * reads as "due" and only an EARLIER deadline reads as "overdue". One bind:
+ * today as a packed-date int (encodePackedDate(localToday(now))), so the
+ * boundary rides the same injected clock every other view uses — never a
+ * hardcoded date. The `t.status = 0` clause re-tightens the OPEN_OR_UNSWEPT
+ * views (today/anytime) so a checked-but-unswept row that happens to sit past
+ * a deadline is excluded — overdue is remaining, OPEN work. Trash exclusion is
+ * the hosting view's job (every view this composes into already drops trashed
+ * and derived-trashed rows), so it is not repeated here.
+ */
+export declare const OVERDUE = "t.deadline IS NOT NULL AND t.deadline < ? AND t.status = 0";
 /** An item's own anytime membership: unscheduled-active, or dated <= today. */
 export declare const ANYTIME_SELF: (col: string) => string;
 /**

package/dist/read/predicates.js

@@ -12,6 +12,36 @@ import { NOT_TEMPLATE } from "./queries.js";
 export const LIVE = `t.type IN (0, 1) AND t.trashed = 0 AND ${NOT_TEMPLATE}`;
 /** {@link LIVE} restricted to open (status = 0) rows. */
 export const OPEN = `${LIVE} AND t.status = 0`;
+/**
+ * The GUI-visible set: open rows PLUS closed (completed/canceled) rows the
+ * periodic log-move sweep has NOT yet carried to the Logbook — completion ≠
+ * logged (src/read/log-boundary.ts). A closed row keeps its slot in its list
+ * until the sweep passes it, exactly as the GUI keeps it checked in place; it
+ * leaves when the sweep boundary advances past its stopDate (boundary-relative,
+ * no new state). This is {@link LIVE} widened to that set: swept iff
+ * status IN (2,3) AND stopDate IS NOT NULL AND stopDate <= boundary — the
+ * negation of the {@link markLogged} `logged` predicate, so an included closed
+ * row always materializes with `logged=false`. Mirrors the project/area card
+ * precedent (project-view.ts / area-view.ts keep a closed-but-unswept row
+ * checked in place). ONE bind: the log boundary as epoch seconds
+ * (logBoundary(db, now).getTime() / 1000). Ruling 2026-07-14 (Mike): GUI parity
+ * — `today` and `anytime` show checked-but-unswept rows.
+ */
+export const OPEN_OR_UNSWEPT = `${LIVE} AND NOT (t.status IN (2, 3) AND t.stopDate IS NOT NULL AND t.stopDate <= ?)`;
+/**
+ * The `--overdue` content scope: OPEN items whose deadline falls strictly
+ * BEFORE today. Due-TODAY is deliberately NOT overdue (`<`, not `<=`) —
+ * mirroring the app's own Today badge split, where a deadline EQUAL to today
+ * reads as "due" and only an EARLIER deadline reads as "overdue". One bind:
+ * today as a packed-date int (encodePackedDate(localToday(now))), so the
+ * boundary rides the same injected clock every other view uses — never a
+ * hardcoded date. The `t.status = 0` clause re-tightens the OPEN_OR_UNSWEPT
+ * views (today/anytime) so a checked-but-unswept row that happens to sit past
+ * a deadline is excluded — overdue is remaining, OPEN work. Trash exclusion is
+ * the hosting view's job (every view this composes into already drops trashed
+ * and derived-trashed rows), so it is not repeated here.
+ */
+export const OVERDUE = `t.deadline IS NOT NULL AND t.deadline < ? AND t.status = 0`;
 /** An item's own anytime membership: unscheduled-active, or dated <= today. */
 export const ANYTIME_SELF = (col) => `((${col}.start = 1 AND (${col}.startDate IS NULL OR ${col}.startDate <= ?))
     OR (${col}.start = 2 AND ${col}.startDate IS NOT NULL AND ${col}.startDate <= ?))`;

package/dist/read/predicates.js.map

@@ -1 +1 @@
-{"version":3,"file":"predicates.js","sourceRoot":"","sources":["../../src/read/predicates.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,oFAAoF;AACpF,MAAM,CAAC,MAAM,IAAI,GAAG,0CAA0C,YAAY,EAAE,CAAC;AAE7E,yDAAyD;AACzD,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,IAAI,mBAAmB,CAAC;AAE/C,+EAA+E;AAC/E,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE,CAClD,KAAK,GAAG,mBAAmB,GAAG,yBAAyB,GAAG;UAClD,GAAG,kBAAkB,GAAG,8BAA8B,GAAG,mBAAmB,CAAC;AAEvF;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,gFAAgF,CAAC;AAE5G;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,WAAW;6CACR,WAAW;8CACV,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;AAEpE;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;;QAE3B,WAAW;+CAC4B,WAAW,uBAAuB,CAAC"}
+{"version":3,"file":"predicates.js","sourceRoot":"","sources":["../../src/read/predicates.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,oFAAoF;AACpF,MAAM,CAAC,MAAM,IAAI,GAAG,0CAA0C,YAAY,EAAE,CAAC;AAE7E,yDAAyD;AACzD,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,IAAI,mBAAmB,CAAC;AAE/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,IAAI,8EAA8E,CAAC;AAErH;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,4DAA4D,CAAC;AAEpF,+EAA+E;AAC/E,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE,CAClD,KAAK,GAAG,mBAAmB,GAAG,yBAAyB,GAAG;UAClD,GAAG,kBAAkB,GAAG,8BAA8B,GAAG,mBAAmB,CAAC;AAEvF;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,gFAAgF,CAAC;AAE5G;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,WAAW;6CACR,WAAW;8CACV,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;AAEpE;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;;QAE3B,WAAW;+CAC4B,WAAW,uBAAuB,CAAC"}

package/dist/read/project-view.d.ts

@@ -9,6 +9,7 @@
  */
 import type { DatabaseSync } from "node:sqlite";
 import type { Heading, IsoDateGroup, Project, Todo } from "../model/entities.ts";
+import { type ViewFilter } from "./views.ts";
 export interface ProjectView {
     project: Project;
     /** Open, unscheduled/current children not under a heading, by index. */
@@ -27,8 +28,18 @@ export interface ProjectView {
     };
     logged: Todo[];
     trashed: Todo[];
+    /**
+     * PLOG1 (additive): count of untrashed OPEN (status=0) children this project
+     * still holds while it is ITSELF completed or canceled — including once swept
+     * to the Logbook. Such items are invisible in every live app view (Today /
+     * Anytime / Inbox / Upcoming), reachable only by drilling into this card
+     * (the app's GUI "Put Back" into a completed parent can strand them —
+     * docs/lab/plog1-research.md). 0 when the project is open, or holds no such
+     * child.
+     */
+    openChildrenWhileResolved: number;
 }
 export declare class ProjectNotFoundError extends Error {
     constructor(uuid: string);
 }
-export declare function projectView(db: DatabaseSync, uuid: string, now?: Date): ProjectView;
+export declare function projectView(db: DatabaseSync, uuid: string, now?: Date, filter?: ViewFilter, zone?: string): ProjectView;

package/dist/read/project-view.js

@@ -2,37 +2,58 @@ import { encodePackedDate, localToday, decodePackedDate } from "../model/dates.j
 import { mapHeading, mapProject, mapTodo } from "../model/mappers.js";
 import { fetchTagsForTasks, fetchTaskByUuid, fetchTaskRows, makeRefResolver } from "./queries.js";
 import { logBoundary, markLogged } from "./log-boundary.js";
+import { OVERDUE } from "./predicates.js";
 import { inheritedTagsFor } from "./tags.js";
+import { tagFilter } from "./views.js";
 export class ProjectNotFoundError extends Error {
     constructor(uuid) {
         super(`no project with uuid ${uuid}`);
         this.name = "ProjectNotFoundError";
     }
 }
-export function projectView(db, uuid, now) {
+export function projectView(db, uuid, now, filter = {}, zone) {
+    const overdue = filter.overdue === true;
     const projectRow = fetchTaskByUuid(db, uuid);
     if (!projectRow || projectRow.type !== 1)
         throw new ProjectNotFoundError(uuid);
     const refs = makeRefResolver(db);
+    // The view's injected clock — gates `todaySection` to Today members in the
+    // mapper AND drives the scheduled/overdue bucketing below.
+    const packedToday = encodePackedDate(localToday(now, zone));
     const tagsOf = (rows) => fetchTagsForTasks(db, rows.map((r) => r.uuid));
     const projectTags = tagsOf([projectRow]);
-    const project = mapProject(projectRow, refs, projectTags.get(projectRow.uuid) ?? []);
+    const project = mapProject(projectRow, refs, projectTags.get(projectRow.uuid) ?? [], packedToday);
     // The card view surfaces area-inherited tags (the UI's tag filter honors them).
     project.inheritedTags = inheritedTagsFor(db, projectRow);
     const headingRows = fetchTaskRows(db, `t.type = 2 AND t.project = ? AND t.trashed = 0 ORDER BY t."index" ASC`, [uuid]);
     const headings = headingRows.map((h) => mapHeading(h, refs));
+    // OWN-DEADLINE UNIFORM: `--overdue` narrows the child TO-DOS to those whose
+    // OWN deadline is overdue (open, strictly before today) via the shared
+    // OVERDUE predicate — NO recursion into anything, and the project header
+    // itself always renders. Headings that keep no surviving child collapse
+    // (below). Its single packed-today bind trails the two uuid binds.
+    const overdueSql = overdue ? ` AND ${OVERDUE}` : "";
+    const overdueBinds = overdue ? [encodePackedDate(localToday(now, zone))] : [];
+    // Tag scope (§9a): the child to-dos are filtered by a tag carried DIRECTLY on
+    // the row — the container semantics. The project's own tags are inherited by
+    // EVERY child, so an inheritance-inclusive `--tag` would be vacuous here;
+    // suppressing the container hop makes `--tag` mean "children with this tag on
+    // themselves" (still descendant-expanded), and `--untagged` "children with no
+    // direct tag". No recursion; the header always renders. The tag binds trail
+    // the two uuid binds and lead the overdue bind, matching their left-to-right
+    // order in the SQL.
+    const tf = tagFilter(db, filter, { container: true });
     const childRows = fetchTaskRows(db, `t.type = 0 AND (t.project = ? OR t.heading IN (
        SELECT uuid FROM TMTask WHERE type = 2 AND project = ?
-     ))
-     ORDER BY t."index" ASC`, [uuid, uuid]);
+     ))${tf.sql}${overdueSql}
+     ORDER BY t."index" ASC`, [uuid, uuid, ...tf.binds, ...overdueBinds]);
     const childTags = tagsOf(childRows);
-    const boundary = logBoundary(db, now);
+    const boundary = logBoundary(db, now, zone);
     const todos = childRows.map((r) => ({
         row: r,
-        todo: mapTodo(r, refs, childTags.get(r.uuid) ?? []),
+        todo: mapTodo(r, refs, childTags.get(r.uuid) ?? [], packedToday),
     }));
     markLogged([project, ...todos.map((t) => t.todo)], boundary);
-    const packedToday = encodePackedDate(localToday(now));
     const active = [];
     const byHeading = new Map();
     const scheduledRows = [];
@@ -40,6 +61,10 @@ export function projectView(db, uuid, now) {
     const someday = [];
     const logged = [];
     const trashed = [];
+    // Every untrashed, non-template OPEN child, regardless of which bucket it
+    // lands in below — surfaced (only when the project is itself resolved) as
+    // the PLOG1 stranded-open-child count.
+    let openChildren = 0;
     for (const { row, todo } of todos) {
         if (row.trashed === 1) {
             trashed.push(todo);
@@ -49,6 +74,8 @@ export function projectView(db, uuid, now) {
             repeating.push(todo);
             continue;
         }
+        if (row.status === 0)
+            openChildren += 1;
         if (row.status !== 0) {
             // Completion ≠ logged: closed items the log-move sweep has not
             // passed stay checked IN PLACE (their heading / the active block),
@@ -90,23 +117,29 @@ export function projectView(db, uuid, now) {
     logged.sort((a, b) => (b.stopped?.getTime() ?? 0) - (a.stopped?.getTime() ?? 0));
     const scheduled = [];
     // Within a day the UI sorts by todayIndex ASC (Upcoming drag order).
-    for (const { date, todo } of scheduledRows.sort((a, b) => a.date.localeCompare(b.date) || a.ti - b.ti)) {
+    for (const { date, todo } of scheduledRows.toSorted((a, b) => a.date.localeCompare(b.date) || a.ti - b.ti)) {
         const last = scheduled[scheduled.length - 1];
         if (last && last.date === date)
             last.items.push(todo);
         else
             scheduled.push({ date, items: [todo] });
     }
+    // Under any content scope (`--overdue` or a tag filter), a heading whose
+    // children were all filtered out collapses rather than rendering an empty
+    // section; a heading with a surviving child is kept. With no scope active
+    // every heading renders (its own empty state).
+    const contentScoped = overdue || tf.sql !== "";
+    const headingGroups = headings
+        .map((heading) => ({ heading, items: byHeading.get(heading.uuid) ?? [] }))
+        .filter((g) => !contentScoped || g.items.length > 0);
     return {
         project,
         active,
-        headings: headings.map((heading) => ({
-            heading,
-            items: byHeading.get(heading.uuid) ?? [],
-        })),
+        headings: headingGroups,
         later: { scheduled, repeating, someday },
         logged,
         trashed,
+        openChildrenWhileResolved: project.status === "open" ? 0 : openChildren,
     };
 }
 //# sourceMappingURL=project-view.js.map

package/dist/read/project-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-view.js","sourceRoot":"","sources":["../../src/read/project-view.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAgB,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAClG,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAmB7C,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,IAAY;QACtB,KAAK,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACrC,CAAC;CACF;AAED,MAAM,UAAU,WAAW,CAAC,EAAgB,EAAE,IAAY,EAAE,GAAU;IACpE,MAAM,UAAU,GAAG,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC;QAAE,MAAM,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAE/E,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,CAAC,IAAe,EAAE,EAAE,CACjC,iBAAiB,CACf,EAAE,EACF,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACxB,CAAC;IACJ,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACrF,gFAAgF;IAChF,OAAO,CAAC,aAAa,GAAG,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzD,MAAM,WAAW,GAAG,aAAa,CAC/B,EAAE,EACF,uEAAuE,EACvE,CAAC,IAAI,CAAC,CACP,CAAC;IACF,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,aAAa,CAC7B,EAAE,EACF;;;4BAGwB,EACxB,CAAC,IAAI,EAAE,IAAI,CAAC,CACb,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClC,GAAG,EAAE,CAAC;QACN,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KACpD,CAAC,CAAC,CAAC;IACJ,UAAU,CAAC,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAE7D,MAAM,WAAW,GAAG,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACtD,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,MAAM,aAAa,GAAoD,EAAE,CAAC;IAC1E,MAAM,SAAS,GAAW,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAW,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAW,EAAE,CAAC;IAE3B,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;QAClC,IAAI,GAAG,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;YAC9B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,+DAA+D;YAC/D,mEAAmE;YACnE,mEAAmE;YACnE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClB,SAAS;YACX,CAAC;YACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChB,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChB,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;YACD,SAAS;QACX,CAAC;QACD,IAAI,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC9C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,IAAI,GAAG,CAAC,SAAS,GAAG,WAAW,EAAE,CAAC;YAC1D,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE;gBAC3C,EAAE,EAAE,GAAG,CAAC,UAAU,IAAI,CAAC;gBACvB,IAAI;aACL,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACjC,SAAS;QACX,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACjF,MAAM,SAAS,GAAyB,EAAE,CAAC;IAC3C,qEAAqE;IACrE,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,aAAa,CAAC,IAAI,CAC7C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CACtD,EAAE,CAAC;QACF,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7C,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI;YAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;YACjD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO;QACL,OAAO;QACP,MAAM;QACN,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACnC,OAAO;YACP,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;SACzC,CAAC,CAAC;QACH,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE;QACxC,MAAM;QACN,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"project-view.js","sourceRoot":"","sources":["../../src/read/project-view.ts"],"names":[],"mappings":"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"}