@unbrained/pm-cli 2026.6.30 → 2026.7.2

package/dist/cli-bundle/chunks/{chunk-HIBK6H4S.js → chunk-XCHUVHKU.js}

@@ -1,31 +1,31 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a060da65-925f-55ab-b13e-d07fceedaeaf")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="95fd55ba-b62a-5ca4-8d6a-02955d7b5692")}catch(e){}}();
 import {
   runActivity
-} from "./chunk-FBZ5XAAF.js";
+} from "./chunk-YPKFV2JR.js";
 import {
   collectRuntimeFilterValues,
   matchesRuntimeFilters,
   runList
-} from "./chunk-ZIE6WXJ2.js";
+} from "./chunk-Q6K2OACU.js";
 import {
   parseIntegerLimit,
   parsePriority,
   parseType
-} from "./chunk-JVQ7UOYC.js";
+} from "./chunk-2CHRYUXL.js";
 import {
   listAllFrontMatterLight
-} from "./chunk-KGQ3W65B.js";
+} from "./chunk-NRZS637N.js";
 import {
   isTerminalStatus,
   normalizeStatusForRegistry,
   normalizeStatusInput
-} from "./chunk-V3KLX7U7.js";
+} from "./chunk-KN3URLKS.js";
 import {
   compareTimestampStrings,
   nowIso,
   resolveIsoOrRelative
-} from "./chunk-KRASIL6M.js";
+} from "./chunk-K2VYLVX4.js";
 import {
   CONTEXT_DEPTH_VALUES,
   CONTEXT_SECTION_VALUES,
@@ -42,7 +42,7 @@ import {
   resolveRuntimeFieldRegistry,
   resolveRuntimeStatusRegistry,
   weekdayOrderIndex
-} from "./chunk-CY5IJMUM.js";
+} from "./chunk-I66WE2HE.js";
 
 // dist/cli/commands/calendar.js
 import { encode as encodeToon } from "@toon-format/toon";
@@ -249,122 +249,130 @@ function buildRecurringEventWindow(start, end, nowValue, lookbackDays, lookahead
     end: compareTimestampStrings(windowEnd, windowStart) > 0 ? windowEnd : addUtcDays(windowStart, 1)
   };
 }
-function expandRecurringOccurrences(startAt, recurrence, window, occurrenceLimit) {
-  const maxOccurrences = occurrenceLimit ?? MAX_RECURRENCE_OCCURRENCES;
-  const interval = recurrence.interval ?? 1;
-  const countLimit = recurrence.count ?? Number.POSITIVE_INFINITY;
-  const until = recurrence.until;
-  const excluded = buildExcludedInstantSet(recurrence.exdates);
-  const recurrenceWeekdays = recurrence.by_weekday && recurrence.by_weekday.length > 0 ? [...recurrence.by_weekday] : [weekdayToken(startAt)];
-  const recurrenceMonthDays = recurrence.by_month_day && recurrence.by_month_day.length > 0 ? [...recurrence.by_month_day] : [new Date(startAt).getUTCDate()];
-  const weekdayFilter = recurrence.by_weekday ? new Set(recurrence.by_weekday) : void 0;
-  const monthDayFilter = recurrence.by_month_day ? new Set(recurrence.by_month_day) : void 0;
-  const sortedWeekdays = [...new Set(recurrenceWeekdays)].sort((left, right) => weekdayOrderIndex(left) - weekdayOrderIndex(right));
-  const sortedMonthDays = [...new Set(recurrenceMonthDays)].sort((left, right) => left - right);
-  const occurrences = [];
-  let produced = 0;
-  const consumeCandidate = (candidateAt) => {
-    if (compareTimestampStrings(candidateAt, startAt) < 0) {
-      return "continue";
-    }
-    if (until && compareTimestampStrings(candidateAt, until) > 0) {
-      return "stop";
-    }
-    if (compareTimestampStrings(candidateAt, window.end) >= 0) {
-      return "stop";
-    }
-    if (excluded.has(candidateAt)) {
-      return "continue";
-    }
-    produced += 1;
-    if (compareTimestampStrings(candidateAt, window.start) >= 0) {
-      occurrences.push(candidateAt);
-    }
-    if (produced >= countLimit) {
-      return "stop";
-    }
-    return "continue";
+function buildRecurrenceExpansionContext(startAt, recurrence, window, occurrenceLimit) {
+  const recurrenceWeekdays = recurrence.by_weekday !== void 0 ? [...recurrence.by_weekday] : [weekdayToken(startAt)];
+  const recurrenceMonthDays = recurrence.by_month_day !== void 0 ? [...recurrence.by_month_day] : [new Date(startAt).getUTCDate()];
+  return {
+    startAt,
+    startDate: new Date(startAt),
+    window,
+    maxOccurrences: occurrenceLimit ?? MAX_RECURRENCE_OCCURRENCES,
+    interval: recurrence.interval ?? 1,
+    countLimit: recurrence.count ?? Number.POSITIVE_INFINITY,
+    until: recurrence.until,
+    excluded: buildExcludedInstantSet(recurrence.exdates),
+    weekdayFilter: recurrence.by_weekday !== void 0 ? new Set(recurrence.by_weekday) : void 0,
+    monthDayFilter: recurrence.by_month_day !== void 0 ? new Set(recurrence.by_month_day) : void 0,
+    sortedWeekdays: [...new Set(recurrenceWeekdays)].sort((left, right) => weekdayOrderIndex(left) - weekdayOrderIndex(right)),
+    sortedMonthDays: [...new Set(recurrenceMonthDays)].sort((left, right) => left - right),
+    occurrences: [],
+    produced: 0
   };
-  const startDate = new Date(startAt);
-  if (recurrence.freq === "daily") {
-    let candidateAt = startAt;
-    for (let iteration = 0; iteration < maxOccurrences; iteration += 1) {
-      const candidateWeekday = weekdayToken(candidateAt);
-      const candidateMonthDay = new Date(candidateAt).getUTCDate();
-      const weekdayMatches = !weekdayFilter || weekdayFilter.has(candidateWeekday);
-      const monthDayMatches = !monthDayFilter || monthDayFilter.has(candidateMonthDay);
-      if (weekdayMatches && monthDayMatches && consumeCandidate(candidateAt) === "stop") {
-        break;
-      }
-      candidateAt = addUtcDays(candidateAt, interval);
-    }
-    return occurrences;
+}
+function consumeRecurrenceCandidate(context, candidateAt) {
+  if (compareTimestampStrings(candidateAt, context.startAt) < 0) {
+    return "continue";
   }
-  if (recurrence.freq === "weekly") {
-    const weekStart = startOfUtcWeekMonday(startAt);
-    for (let step = 0; step < maxOccurrences; step += 1) {
-      const candidateWeekStart = addUtcDays(weekStart, step * interval * 7);
-      for (const weekday of sortedWeekdays) {
-        const dayOffset = weekdayOrderIndex(weekday);
-        const candidateDay = addUtcDays(candidateWeekStart, dayOffset);
-        const dayDate = new Date(candidateDay);
-        const candidateAt = new Date(Date.UTC(dayDate.getUTCFullYear(), dayDate.getUTCMonth(), dayDate.getUTCDate(), startDate.getUTCHours(), startDate.getUTCMinutes(), startDate.getUTCSeconds(), startDate.getUTCMilliseconds())).toISOString();
-        const candidateMonthDay = dayDate.getUTCDate();
-        if (monthDayFilter && !monthDayFilter.has(candidateMonthDay)) {
-          continue;
-        }
-        const consumed = consumeCandidate(candidateAt);
-        if (consumed === "stop") {
-          return occurrences;
-        }
-      }
-    }
-    return occurrences;
+  if (context.until && compareTimestampStrings(candidateAt, context.until) > 0) {
+    return "stop";
   }
-  if (recurrence.freq === "monthly") {
-    const startYear = startDate.getUTCFullYear();
-    const startMonth = startDate.getUTCMonth();
-    for (let step = 0; step < maxOccurrences; step += 1) {
-      const monthAnchor = new Date(Date.UTC(startYear, startMonth + step * interval, 1, 0, 0, 0, 0));
-      const year2 = monthAnchor.getUTCFullYear();
-      const month2 = monthAnchor.getUTCMonth();
-      for (const monthDay of sortedMonthDays) {
-        const candidateAt = buildUtcTimestamp(year2, month2, monthDay, startDate);
-        if (!candidateAt) {
-          continue;
-        }
-        const candidateWeekday = weekdayToken(candidateAt);
-        if (weekdayFilter && !weekdayFilter.has(candidateWeekday)) {
-          continue;
-        }
-        const consumed = consumeCandidate(candidateAt);
-        if (consumed === "stop") {
-          return occurrences;
-        }
+  if (compareTimestampStrings(candidateAt, context.window.end) >= 0) {
+    return "stop";
+  }
+  if (context.excluded.has(candidateAt)) {
+    return "continue";
+  }
+  context.produced += 1;
+  if (compareTimestampStrings(candidateAt, context.window.start) >= 0) {
+    context.occurrences.push(candidateAt);
+  }
+  return context.produced >= context.countLimit || context.occurrences.length >= context.maxOccurrences ? "stop" : "continue";
+}
+function recurrenceDayMatchesFilters(context, candidateAt) {
+  const candidateWeekday = weekdayToken(candidateAt);
+  const candidateMonthDay = new Date(candidateAt).getUTCDate();
+  const weekdayMatches = !context.weekdayFilter || context.weekdayFilter.has(candidateWeekday);
+  const monthDayMatches = !context.monthDayFilter || context.monthDayFilter.has(candidateMonthDay);
+  return weekdayMatches && monthDayMatches;
+}
+function expandDailyOccurrences(context) {
+  let candidateAt = context.startAt;
+  for (let iteration = 0; iteration < context.maxOccurrences; iteration += 1) {
+    if (recurrenceDayMatchesFilters(context, candidateAt) && consumeRecurrenceCandidate(context, candidateAt) === "stop") {
+      break;
+    }
+    candidateAt = addUtcDays(candidateAt, context.interval);
+  }
+  return context.occurrences;
+}
+function buildWeeklyCandidateAt(context, candidateWeekStart, weekday) {
+  const dayOffset = weekdayOrderIndex(weekday);
+  const candidateDay = addUtcDays(candidateWeekStart, dayOffset);
+  const dayDate = new Date(candidateDay);
+  return new Date(Date.UTC(dayDate.getUTCFullYear(), dayDate.getUTCMonth(), dayDate.getUTCDate(), context.startDate.getUTCHours(), context.startDate.getUTCMinutes(), context.startDate.getUTCSeconds(), context.startDate.getUTCMilliseconds())).toISOString();
+}
+function expandWeeklyOccurrences(context) {
+  const weekStart = startOfUtcWeekMonday(context.startAt);
+  for (let step = 0; step < context.maxOccurrences; step += 1) {
+    const candidateWeekStart = addUtcDays(weekStart, step * context.interval * 7);
+    for (const weekday of context.sortedWeekdays) {
+      const candidateAt = buildWeeklyCandidateAt(context, candidateWeekStart, weekday);
+      if (!recurrenceDayMatchesFilters(context, candidateAt)) {
+        continue;
+      }
+      if (consumeRecurrenceCandidate(context, candidateAt) === "stop") {
+        return context.occurrences;
       }
     }
-    return occurrences;
-  }
-  const year = startDate.getUTCFullYear();
-  const month = startDate.getUTCMonth();
-  for (let step = 0; step < maxOccurrences; step += 1) {
-    const candidateYear = year + step * interval;
-    for (const monthDay of sortedMonthDays) {
-      const candidateAt = buildUtcTimestamp(candidateYear, month, monthDay, startDate);
-      if (!candidateAt) {
+  }
+  return context.occurrences;
+}
+function expandMonthlyOccurrences(context) {
+  const startYear = context.startDate.getUTCFullYear();
+  const startMonth = context.startDate.getUTCMonth();
+  for (let step = 0; step < context.maxOccurrences; step += 1) {
+    const monthAnchor = new Date(Date.UTC(startYear, startMonth + step * context.interval, 1, 0, 0, 0, 0));
+    for (const monthDay of context.sortedMonthDays) {
+      const candidateAt = buildUtcTimestamp(monthAnchor.getUTCFullYear(), monthAnchor.getUTCMonth(), monthDay, context.startDate);
+      if (!candidateAt || !recurrenceDayMatchesFilters(context, candidateAt)) {
         continue;
       }
-      const candidateWeekday = weekdayToken(candidateAt);
-      if (weekdayFilter && !weekdayFilter.has(candidateWeekday)) {
+      if (consumeRecurrenceCandidate(context, candidateAt) === "stop") {
+        return context.occurrences;
+      }
+    }
+  }
+  return context.occurrences;
+}
+function expandYearlyOccurrences(context) {
+  const year = context.startDate.getUTCFullYear();
+  const month = context.startDate.getUTCMonth();
+  for (let step = 0; step < context.maxOccurrences; step += 1) {
+    const candidateYear = year + step * context.interval;
+    for (const monthDay of context.sortedMonthDays) {
+      const candidateAt = buildUtcTimestamp(candidateYear, month, monthDay, context.startDate);
+      if (!candidateAt || !recurrenceDayMatchesFilters(context, candidateAt)) {
         continue;
       }
-      const consumed = consumeCandidate(candidateAt);
-      if (consumed === "stop") {
-        return occurrences;
+      if (consumeRecurrenceCandidate(context, candidateAt) === "stop") {
+        return context.occurrences;
       }
     }
   }
-  return occurrences;
+  return context.occurrences;
+}
+function expandRecurringOccurrences(startAt, recurrence, window, occurrenceLimit) {
+  const context = buildRecurrenceExpansionContext(startAt, recurrence, window, occurrenceLimit);
+  if (recurrence.freq === "daily") {
+    return expandDailyOccurrences(context);
+  }
+  if (recurrence.freq === "weekly") {
+    return expandWeeklyOccurrences(context);
+  }
+  if (recurrence.freq === "monthly") {
+    return expandMonthlyOccurrences(context);
+  }
+  return expandYearlyOccurrences(context);
 }
 function sortEvents(values) {
   return [...values].sort((a, b) => {
@@ -386,92 +394,98 @@ function sortEvents(values) {
     return String(a.reminder_text).localeCompare(String(b.reminder_text));
   });
 }
+function buildItemCalendarRowBase(item) {
+  return {
+    item_id: item.id,
+    item_title: item.title,
+    item_type: item.type,
+    item_status: item.status,
+    item_priority: item.priority,
+    item_assignee: item.assignee ?? null,
+    item_deadline: item.deadline ?? null,
+    item_tags: item.tags
+  };
+}
+function buildDeadlineRow(item) {
+  if (!item.deadline) {
+    return null;
+  }
+  return {
+    at: item.deadline,
+    date: toUtcDayKey(item.deadline),
+    kind: "deadline",
+    reminder_text: null,
+    event_title: null,
+    event_end: null,
+    event_location: null,
+    event_all_day: null,
+    event_timezone: null,
+    event_recurring: null,
+    event_recurrence_rule: null,
+    ...buildItemCalendarRowBase(item),
+    item_deadline: item.deadline
+  };
+}
+function buildReminderRows(item) {
+  return (item.reminders ?? []).map((reminder) => ({
+    at: reminder.at,
+    date: toUtcDayKey(reminder.at),
+    kind: "reminder",
+    reminder_text: reminder.text,
+    event_title: null,
+    event_end: null,
+    event_location: null,
+    event_all_day: null,
+    event_timezone: null,
+    event_recurring: null,
+    event_recurrence_rule: null,
+    ...buildItemCalendarRowBase(item)
+  }));
+}
+function recurringDurationMs(startAt, endAt) {
+  if (!endAt) {
+    return null;
+  }
+  const duration = Date.parse(endAt) - Date.parse(startAt);
+  return Number.isFinite(duration) && duration > 0 ? duration : null;
+}
+function eventOccurrenceEnd(occurrenceAt, event, durationMs) {
+  return event.recurrence && durationMs !== null ? new Date(new Date(occurrenceAt).getTime() + durationMs).toISOString() : event.end_at ?? null;
+}
+function buildScheduledEventRows(item, event, recurringWindow, occurrenceLimit) {
+  const recurrenceRuleSummary = formatRecurrenceRuleForSummary(event.recurrence);
+  const durationMs = recurringDurationMs(event.start_at, event.end_at);
+  const occurrences = event.recurrence ? expandRecurringOccurrences(event.start_at, event.recurrence, recurringWindow, occurrenceLimit) : [event.start_at];
+  return occurrences.map((occurrenceAt) => ({
+    at: occurrenceAt,
+    // All-day events are timezone-agnostic calendar dates: bucket by the
+    // literal start date. Timed events bucket by their local day in the
+    // event's timezone (defaults to UTC when unset).
+    date: event.all_day === true ? occurrenceAt.slice(0, 10) : toLocalDayKey(occurrenceAt, event.timezone),
+    kind: "event",
+    reminder_text: event.description ?? null,
+    event_title: event.title ?? item.title,
+    event_end: eventOccurrenceEnd(occurrenceAt, event, durationMs),
+    event_location: event.location ?? null,
+    event_all_day: event.all_day ?? null,
+    event_timezone: event.timezone ?? null,
+    event_recurring: event.recurrence ? true : false,
+    event_recurrence_rule: recurrenceRuleSummary,
+    ...buildItemCalendarRowBase(item)
+  }));
+}
 function buildEventSeed(items, recurringWindow, includeSources, occurrenceLimit) {
   const events = [];
   for (const item of items) {
-    if (includeSources.has("deadlines") && item.deadline) {
-      events.push({
-        at: item.deadline,
-        date: toUtcDayKey(item.deadline),
-        kind: "deadline",
-        reminder_text: null,
-        event_title: null,
-        event_end: null,
-        event_location: null,
-        event_all_day: null,
-        event_timezone: null,
-        event_recurring: null,
-        event_recurrence_rule: null,
-        item_id: item.id,
-        item_title: item.title,
-        item_type: item.type,
-        item_status: item.status,
-        item_priority: item.priority,
-        item_assignee: item.assignee ?? null,
-        item_deadline: item.deadline,
-        item_tags: item.tags
-      });
+    const deadlineRow = includeSources.has("deadlines") ? buildDeadlineRow(item) : null;
+    if (deadlineRow) {
+      events.push(deadlineRow);
     }
-    for (const reminder of includeSources.has("reminders") ? item.reminders ?? [] : []) {
-      events.push({
-        at: reminder.at,
-        date: toUtcDayKey(reminder.at),
-        kind: "reminder",
-        reminder_text: reminder.text,
-        event_title: null,
-        event_end: null,
-        event_location: null,
-        event_all_day: null,
-        event_timezone: null,
-        event_recurring: null,
-        event_recurrence_rule: null,
-        item_id: item.id,
-        item_title: item.title,
-        item_type: item.type,
-        item_status: item.status,
-        item_priority: item.priority,
-        item_assignee: item.assignee ?? null,
-        item_deadline: item.deadline ?? null,
-        item_tags: item.tags
-      });
+    if (includeSources.has("reminders")) {
+      events.push(...buildReminderRows(item));
     }
     for (const event of includeSources.has("events") ? item.events ?? [] : []) {
-      const recurrenceRuleSummary = formatRecurrenceRuleForSummary(event.recurrence);
-      const recurringDurationMs = (() => {
-        if (!event.end_at) {
-          return null;
-        }
-        const duration = Date.parse(event.end_at) - Date.parse(event.start_at);
-        return Number.isFinite(duration) && duration > 0 ? duration : null;
-      })();
-      const occurrences = event.recurrence ? expandRecurringOccurrences(event.start_at, event.recurrence, recurringWindow, occurrenceLimit) : [event.start_at];
-      for (const occurrenceAt of occurrences) {
-        const occurrenceEnd = event.recurrence && recurringDurationMs !== null ? new Date(new Date(occurrenceAt).getTime() + recurringDurationMs).toISOString() : event.end_at ?? null;
-        events.push({
-          at: occurrenceAt,
-          // All-day events are timezone-agnostic calendar dates: bucket by the
-          // literal start date. Timed events bucket by their local day in the
-          // event's timezone (defaults to UTC when unset).
-          date: event.all_day === true ? occurrenceAt.slice(0, 10) : toLocalDayKey(occurrenceAt, event.timezone),
-          kind: "event",
-          reminder_text: event.description ?? null,
-          event_title: event.title ?? item.title,
-          event_end: occurrenceEnd,
-          event_location: event.location ?? null,
-          event_all_day: event.all_day ?? null,
-          event_timezone: event.timezone ?? null,
-          event_recurring: event.recurrence ? true : false,
-          event_recurrence_rule: recurrenceRuleSummary,
-          item_id: item.id,
-          item_title: item.title,
-          item_type: item.type,
-          item_status: item.status,
-          item_priority: item.priority,
-          item_assignee: item.assignee ?? null,
-          item_deadline: item.deadline ?? null,
-          item_tags: item.tags
-        });
-      }
+      events.push(...buildScheduledEventRows(item, event, recurringWindow, occurrenceLimit));
     }
   }
   return sortEvents(events);
@@ -491,30 +505,44 @@ function filterItems(items, options, typeRegistry, statusRegistry, runtimeFieldF
   if (assigneeFilter !== void 0 && assigneeModeFilter === "unassigned") {
     throw new PmCliError("Cannot combine --assignee with --assignee-filter unassigned", EXIT_CODE.USAGE);
   }
-  return items.filter((item) => {
-    if (typeFilter && item.type !== typeFilter)
-      return false;
-    if (tagFilter && !item.tags.some((tag) => tag.trim().toLowerCase() === tagFilter))
-      return false;
-    if (priorityFilter !== void 0 && item.priority !== priorityFilter)
-      return false;
-    if (statusFilter && item.status !== statusFilter)
-      return false;
-    if (assigneeModeFilter === "assigned" && !item.assignee)
-      return false;
-    if (assigneeModeFilter === "unassigned" && item.assignee)
-      return false;
-    if (assigneeFilter !== void 0 && item.assignee !== assigneeFilter) {
-      return false;
-    }
-    if (sprintFilter !== void 0 && item.sprint !== sprintFilter)
-      return false;
-    if (releaseFilter !== void 0 && item.release !== releaseFilter)
-      return false;
-    if (!matchesRuntimeFilters(item, runtimeFieldFilters))
-      return false;
-    return true;
-  });
+  return items.filter((item) => itemMatchesCalendarFilters(item, {
+    typeFilter,
+    tagFilter,
+    priorityFilter,
+    statusFilter,
+    assigneeFilter,
+    assigneeModeFilter,
+    sprintFilter,
+    releaseFilter,
+    runtimeFieldFilters
+  }));
+}
+function itemMatchesCalendarFilters(item, filters) {
+  return itemMatchesCalendarIdentityFilters(item, filters) && itemMatchesCalendarOwnerFilters(item, filters) && matchesRuntimeFilters(item, filters.runtimeFieldFilters);
+}
+function itemMatchesCalendarIdentityFilters(item, filters) {
+  if (filters.typeFilter && item.type !== filters.typeFilter)
+    return false;
+  if (filters.tagFilter && !item.tags.some((tag) => tag.trim().toLowerCase() === filters.tagFilter))
+    return false;
+  if (filters.priorityFilter !== void 0 && item.priority !== filters.priorityFilter)
+    return false;
+  if (filters.statusFilter && item.status !== filters.statusFilter)
+    return false;
+  return true;
+}
+function itemMatchesCalendarOwnerFilters(item, filters) {
+  if (filters.assigneeModeFilter === "assigned" && !item.assignee)
+    return false;
+  if (filters.assigneeModeFilter === "unassigned" && item.assignee)
+    return false;
+  if (filters.assigneeFilter !== void 0 && item.assignee !== filters.assigneeFilter)
+    return false;
+  if (filters.sprintFilter !== void 0 && item.sprint !== filters.sprintFilter)
+    return false;
+  if (filters.releaseFilter !== void 0 && item.release !== filters.releaseFilter)
+    return false;
+  return true;
 }
 function includeEventInWindow(event, start, end) {
   if (start && compareTimestampStrings(event.at, start) < 0) {
@@ -544,53 +572,38 @@ function buildRange(view, options, nowValue) {
     throw new PmCliError("--from and --to are only supported for --view agenda", EXIT_CODE.USAGE);
   }
   if (view === "agenda") {
-    if (fullPeriodRequested) {
-      throw new PmCliError("--full-period is only supported for --view day|week|month. For agenda windows, use --from and --to.", EXIT_CODE.USAGE);
-    }
-    const start2 = from ?? (options.date ? anchor : includePast ? void 0 : nowValue);
-    return {
-      anchor,
-      start: start2,
-      end: to,
-      fullPeriod: false
-    };
+    return buildAgendaRange(anchor, options, nowValue, includePast, fullPeriodRequested, from, to);
   }
   if (view === "day") {
     const dayStart = startOfUtcDay(anchor);
-    const fullPeriod2 = includePast || fullPeriodRequested;
-    const start2 = fullPeriod2 ? dayStart : maxTimestamp(dayStart, nowValue);
-    return {
-      anchor,
-      start: start2,
-      end: addUtcDays(dayStart, 1),
-      periodStart: dayStart,
-      periodEnd: addUtcDays(dayStart, 1),
-      fullPeriod: fullPeriod2
-    };
+    return buildFixedPeriodRange(anchor, nowValue, includePast, fullPeriodRequested, dayStart, addUtcDays(dayStart, 1));
   }
   if (view === "week") {
     const weekStart = startOfUtcWeekMonday(anchor);
-    const fullPeriod2 = includePast || fullPeriodRequested;
-    const start2 = fullPeriod2 ? weekStart : maxTimestamp(weekStart, nowValue);
-    return {
-      anchor,
-      start: start2,
-      end: addUtcDays(weekStart, 7),
-      periodStart: weekStart,
-      periodEnd: addUtcDays(weekStart, 7),
-      fullPeriod: fullPeriod2
-    };
+    return buildFixedPeriodRange(anchor, nowValue, includePast, fullPeriodRequested, weekStart, addUtcDays(weekStart, 7));
   }
   const monthStart = startOfUtcMonth(anchor);
-  const monthEnd = startOfNextUtcMonth(anchor);
+  return buildFixedPeriodRange(anchor, nowValue, includePast, fullPeriodRequested, monthStart, startOfNextUtcMonth(anchor));
+}
+function buildAgendaRange(anchor, options, nowValue, includePast, fullPeriodRequested, from, to) {
+  if (fullPeriodRequested) {
+    throw new PmCliError("--full-period is only supported for --view day|week|month. For agenda windows, use --from and --to.", EXIT_CODE.USAGE);
+  }
+  return {
+    anchor,
+    start: from ?? (options.date ? anchor : includePast ? void 0 : nowValue),
+    end: to,
+    fullPeriod: false
+  };
+}
+function buildFixedPeriodRange(anchor, nowValue, includePast, fullPeriodRequested, periodStart, periodEnd) {
   const fullPeriod = includePast || fullPeriodRequested;
-  const start = fullPeriod ? monthStart : maxTimestamp(monthStart, nowValue);
   return {
     anchor,
-    start,
-    end: monthEnd,
-    periodStart: monthStart,
-    periodEnd: monthEnd,
+    start: fullPeriod ? periodStart : maxTimestamp(periodStart, nowValue),
+    end: periodEnd,
+    periodStart,
+    periodEnd,
     fullPeriod
   };
 }
@@ -646,11 +659,7 @@ function summarize(events) {
     recurring_events: recurringEvents
   };
 }
-async function runCalendar(options, global) {
-  const pmRoot = resolvePmRoot(process.cwd(), global.path);
-  if (!await pathExists(getSettingsPath(pmRoot))) {
-    throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);
-  }
+function resolveCalendarExecutionInputs(options) {
   const nowValue = nowIso();
   const view = parseView(options.view);
   const rangeBounds = buildRange(view, options, nowValue);
@@ -663,59 +672,85 @@ async function runCalendar(options, global) {
     throw new PmCliError("Calendar occurrence limit must be >= 1", EXIT_CODE.USAGE);
   }
   const eventsOnly = includeSources.has("events") && !includeSources.has("deadlines") && !includeSources.has("reminders");
-  const hasExplicitBounds = options.to !== void 0 || explicitLookahead !== void 0 || occurrenceLimit !== void 0;
+  const hasExplicitBounds = options.to !== void 0 || explicitLookahead !== void 0 || recurrenceLookbackDays !== void 0 || occurrenceLimit !== void 0;
   const eventsOnlyCapApplied = eventsOnly && !hasExplicitBounds;
-  const recurrenceLookaheadDays = eventsOnlyCapApplied ? DEFAULT_EVENTS_ONLY_LOOKAHEAD_DAYS : explicitLookahead;
-  const recurrenceLookbackWindowDays = eventsOnlyCapApplied && recurrenceLookbackDays === void 0 ? 0 : recurrenceLookbackDays;
+  return {
+    nowValue,
+    view,
+    rangeBounds,
+    limit,
+    includeSources,
+    occurrenceLimit,
+    recurrenceLookaheadDays: eventsOnlyCapApplied ? DEFAULT_EVENTS_ONLY_LOOKAHEAD_DAYS : explicitLookahead,
+    recurrenceLookbackWindowDays: eventsOnlyCapApplied && recurrenceLookbackDays === void 0 ? 0 : recurrenceLookbackDays,
+    eventsOnlyCapApplied
+  };
+}
+function appendCalendarCapWarning(warnings, capApplied) {
+  if (!capApplied) {
+    return;
+  }
+  warnings.push(`recurring_events_default_cap_applied:lookback=0d,lookahead=${DEFAULT_EVENTS_ONLY_LOOKAHEAD_DAYS}d -- use --recurrence-lookback-days/--recurrence-lookahead-days or --to for wider range`);
+}
+function buildCalendarFiltersResult(options, runtimeFieldFilters) {
+  return {
+    type: options.type ?? null,
+    tag: options.tag ?? null,
+    priority: options.priority ?? null,
+    status: options.status ?? null,
+    assignee: options.assignee ?? null,
+    assignee_filter: options.assigneeFilter ?? null,
+    sprint: options.sprint ?? null,
+    release: options.release ?? null,
+    runtime_filters: runtimeFieldFilters,
+    limit: options.limit ?? null,
+    include: options.include ?? null,
+    full_period: options.fullPeriod === true ? "true" : null,
+    recurrence_lookahead_days: options.recurrenceLookaheadDays ?? null,
+    recurrence_lookback_days: options.recurrenceLookbackDays ?? null,
+    occurrence_limit: options.occurrenceLimit ?? null
+  };
+}
+function buildCalendarRangeResult(options, rangeBounds) {
+  return {
+    start: rangeBounds.start ?? null,
+    end: rangeBounds.end ?? null,
+    period_start: rangeBounds.periodStart ?? null,
+    period_end: rangeBounds.periodEnd ?? null,
+    full_period: rangeBounds.fullPeriod,
+    past: options.past === true,
+    from: options.from ?? null,
+    to: options.to ?? null
+  };
+}
+async function runCalendar(options, global) {
+  const pmRoot = resolvePmRoot(process.cwd(), global.path);
+  if (!await pathExists(getSettingsPath(pmRoot))) {
+    throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);
+  }
+  const inputs = resolveCalendarExecutionInputs(options);
   const settings = await readSettings(pmRoot);
   const statusRegistry = resolveRuntimeStatusRegistry(settings.schema);
   const runtimeFieldRegistry = resolveRuntimeFieldRegistry(settings.schema);
   const runtimeFieldFilters = collectRuntimeFilterValues(options, runtimeFieldRegistry, "calendar");
   const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());
   const listWarnings = [];
-  if (eventsOnlyCapApplied) {
-    listWarnings.push(`recurring_events_default_cap_applied:lookback=0d,lookahead=${DEFAULT_EVENTS_ONLY_LOOKAHEAD_DAYS}d -- use --recurrence-lookback-days/--recurrence-lookahead-days or --to for wider range`);
-  }
+  appendCalendarCapWarning(listWarnings, inputs.eventsOnlyCapApplied);
   const items = await listAllFrontMatterLight(pmRoot, settings.item_format, typeRegistry.type_to_folder, listWarnings, settings.schema);
   const filteredItems = filterItems(items, options, typeRegistry, statusRegistry, runtimeFieldFilters);
-  const recurringWindow = buildRecurringEventWindow(rangeBounds.start, rangeBounds.end, nowValue, recurrenceLookbackWindowDays, recurrenceLookaheadDays);
-  const seededEvents = buildEventSeed(filteredItems, recurringWindow, includeSources, occurrenceLimit);
-  const rangedEvents = seededEvents.filter((event) => includeEventInWindow(event, rangeBounds.start, rangeBounds.end));
-  const limitedEvents = limit === void 0 ? rangedEvents : rangedEvents.slice(0, limit);
+  const recurringWindow = buildRecurringEventWindow(inputs.rangeBounds.start, inputs.rangeBounds.end, inputs.nowValue, inputs.recurrenceLookbackWindowDays, inputs.recurrenceLookaheadDays);
+  const seededEvents = buildEventSeed(filteredItems, recurringWindow, inputs.includeSources, inputs.occurrenceLimit);
+  const rangedEvents = seededEvents.filter((event) => includeEventInWindow(event, inputs.rangeBounds.start, inputs.rangeBounds.end));
+  const limitedEvents = inputs.limit === void 0 ? rangedEvents : rangedEvents.slice(0, inputs.limit);
   const days = bucketEventsByDay(limitedEvents);
   const warnings = [...new Set(listWarnings)].sort((left, right) => left.localeCompare(right));
   return {
-    view,
+    view: inputs.view,
     output_default: "markdown",
-    now: nowValue,
-    anchor: rangeBounds.anchor,
-    range: {
-      start: rangeBounds.start ?? null,
-      end: rangeBounds.end ?? null,
-      period_start: rangeBounds.periodStart ?? null,
-      period_end: rangeBounds.periodEnd ?? null,
-      full_period: rangeBounds.fullPeriod,
-      past: options.past === true,
-      from: options.from ?? null,
-      to: options.to ?? null
-    },
-    filters: {
-      type: options.type ?? null,
-      tag: options.tag ?? null,
-      priority: options.priority ?? null,
-      status: options.status ?? null,
-      assignee: options.assignee ?? null,
-      assignee_filter: options.assigneeFilter ?? null,
-      sprint: options.sprint ?? null,
-      release: options.release ?? null,
-      runtime_filters: runtimeFieldFilters,
-      limit: options.limit ?? null,
-      include: options.include ?? null,
-      full_period: options.fullPeriod === true ? "true" : null,
-      recurrence_lookahead_days: options.recurrenceLookaheadDays ?? null,
-      recurrence_lookback_days: options.recurrenceLookbackDays ?? null,
-      occurrence_limit: options.occurrenceLimit ?? null
-    },
+    now: inputs.nowValue,
+    anchor: inputs.rangeBounds.anchor,
+    range: buildCalendarRangeResult(options, inputs.rangeBounds),
+    filters: buildCalendarFiltersResult(options, runtimeFieldFilters),
     summary: summarize(limitedEvents),
     events: limitedEvents,
     days,
@@ -1379,53 +1414,28 @@ function formatAgendaLine(event) {
   }
   return base;
 }
-function renderContextMarkdown(result) {
-  const lines = [];
-  const focusFields = result.focus_fields;
-  const renderFocus = (item) => focusFields ? formatProjectedFocusLine(item, focusFields) : formatFocusLine(item);
-  lines.push("# pm context");
-  lines.push("");
-  lines.push(`- now: ${result.now}`);
-  lines.push(`- depth: ${result.depth}`);
-  if (result.filters.parent) {
-    lines.push(`- scope: subtree of ${result.filters.parent}`);
-  }
-  lines.push(`- active_items: ${result.summary.active_items} (in_progress: ${result.summary.in_progress}, open: ${result.summary.open})`);
-  if (result.summary.total_items !== void 0) {
-    lines.push(`- total_items: ${result.summary.total_items} (closed: ${result.summary.closed ?? 0}, canceled: ${result.summary.canceled ?? 0})`);
-  }
-  lines.push(`- agenda_events: ${result.summary.agenda_events}`);
-  lines.push(`- blocked_fallback_used: ${result.summary.blocked_fallback_used}`);
-  const renderedSections = result.sections_included.filter((section) => section !== "blockers" || (result.blockers?.length ?? 0) > 0);
-  if (renderedSections.length > 0) {
-    lines.push(`- sections: ${renderedSections.join(", ")}`);
-  }
-  lines.push("");
-  lines.push("## High-level focus");
-  if (result.high_level.length === 0) {
-    lines.push("No high-level active items.");
+function pushContextFocusSection(lines, title, rows, emptyText, renderFocus) {
+  lines.push(`## ${title}`);
+  if (rows.length === 0) {
+    lines.push(emptyText);
   } else {
-    for (const item of result.high_level) {
+    for (const item of rows) {
       lines.push(`- ${renderFocus(item)}`);
     }
   }
   lines.push("");
-  lines.push("## Low-level focus");
-  if (result.low_level.length === 0) {
-    lines.push("No low-level active items.");
-  } else {
-    for (const item of result.low_level) {
-      lines.push(`- ${renderFocus(item)}`);
-    }
+}
+function pushBlockedFallbackSection(lines, result, renderFocus) {
+  if (result.blocked_fallback.length === 0) {
+    return;
   }
-  lines.push("");
-  if (result.blocked_fallback.length > 0) {
-    lines.push("## Blocked fallback");
-    for (const item of result.blocked_fallback) {
-      lines.push(`- ${renderFocus(item)}`);
-    }
-    lines.push("");
+  lines.push("## Blocked fallback");
+  for (const item of result.blocked_fallback) {
+    lines.push(`- ${renderFocus(item)}`);
   }
+  lines.push("");
+}
+function pushAgendaSection(lines, result) {
   lines.push("## Agenda");
   lines.push(`- events: ${result.agenda.summary.events} (deadlines: ${result.agenda.summary.deadlines}, reminders: ${result.agenda.summary.reminders}, scheduled: ${result.agenda.summary.scheduled})`);
   if (result.agenda.events.length === 0) {
@@ -1436,205 +1446,373 @@ function renderContextMarkdown(result) {
     }
   }
   lines.push("");
-  if (result.hierarchy && result.hierarchy.length > 0) {
-    lines.push("## Hierarchy");
-    for (const node of result.hierarchy) {
-      const pct = node.children_total > 0 ? Math.round(node.children_closed / node.children_total * 100) : 0;
-      lines.push(`- ${node.id} ${node.type} ${node.status} "${node.title}" [${node.children_closed}/${node.children_total} done ${pct}%]`);
-      for (const child of node.children) {
-        const cpct = child.children_total > 0 ? Math.round(child.children_closed / child.children_total * 100) : 0;
-        lines.push(`  - ${child.id} ${child.type} ${child.status} "${child.title}" [${child.children_closed}/${child.children_total} done ${cpct}%]`);
-      }
+}
+function pushHierarchySection(lines, result) {
+  if (!result.hierarchy || result.hierarchy.length === 0) {
+    return;
+  }
+  lines.push("## Hierarchy");
+  for (const node of result.hierarchy) {
+    const pct = node.children_total > 0 ? Math.round(node.children_closed / node.children_total * 100) : 0;
+    lines.push(`- ${node.id} ${node.type} ${node.status} "${node.title}" [${node.children_closed}/${node.children_total} done ${pct}%]`);
+    for (const child of node.children) {
+      const cpct = child.children_total > 0 ? Math.round(child.children_closed / child.children_total * 100) : 0;
+      lines.push(`  - ${child.id} ${child.type} ${child.status} "${child.title}" [${child.children_closed}/${child.children_total} done ${cpct}%]`);
     }
-    lines.push("");
   }
-  if (result.progress && result.progress.length > 0) {
-    lines.push("## Progress");
-    for (const entry of result.progress) {
-      lines.push(`- ${entry.id} "${entry.title}" ${entry.completion_pct}% (${entry.closed}/${entry.total} closed, ${entry.in_progress} wip, ${entry.open} open, ${entry.blocked} blocked)`);
-    }
-    lines.push("");
+  lines.push("");
+}
+function pushProgressSection(lines, result) {
+  if (!result.progress || result.progress.length === 0) {
+    return;
   }
-  if (result.recently_created && result.recently_created.length > 0) {
-    lines.push("## Recently created");
-    for (const item of result.recently_created) {
-      lines.push(focusFields ? `- ${renderFocus(item)}` : `- ${dateTokenForTimestamp(item.created_at)} ${formatFocusLine(item)}`);
-    }
-    lines.push("");
+  lines.push("## Progress");
+  for (const entry of result.progress) {
+    lines.push(`- ${entry.id} "${entry.title}" ${entry.completion_pct}% (${entry.closed}/${entry.total} closed, ${entry.in_progress} wip, ${entry.open} open, ${entry.blocked} blocked)`);
   }
-  if (result.unparented && result.unparented.length > 0) {
-    lines.push("## Unparented");
-    for (const item of result.unparented) {
-      lines.push(`- ${renderFocus(item)}`);
-    }
-    lines.push("");
+  lines.push("");
+}
+function pushRecentlyCreatedSection(lines, result, focusFields, renderFocus) {
+  if (!result.recently_created || result.recently_created.length === 0) {
+    return;
   }
-  if (result.activity && result.activity.length > 0) {
-    lines.push("## Recent activity");
-    for (const entry of result.activity) {
-      const msg = entry.msg ? ` ${entry.msg}` : "";
-      lines.push(`- ${entry.ts.slice(0, 16)}Z ${entry.id} ${entry.op} by:${entry.author}${msg}`);
-    }
-    lines.push("");
-  }
-  if (result.blockers && result.blockers.length > 0) {
-    lines.push("## Blockers");
-    for (const entry of result.blockers) {
-      const by = entry.blocked_by ? `blocked_by:${entry.blocked_by}(${entry.blocked_by_status ?? "?"})` : "blocked_by:-";
-      const reason = entry.blocked_reason ? ` reason:"${entry.blocked_reason}"` : "";
-      const note = entry.unblock_note ? ` unblock:"${entry.unblock_note}"` : "";
-      lines.push(`- ${entry.id} "${entry.title}" ${by}${reason}${note}`);
-    }
-    lines.push("");
+  lines.push("## Recently created");
+  for (const item of result.recently_created) {
+    lines.push(focusFields ? `- ${renderFocus(item)}` : `- ${dateTokenForTimestamp(item.created_at)} ${formatFocusLine(item)}`);
   }
-  if (result.files && result.files.length > 0) {
-    lines.push("## Hot files");
-    for (const file of result.files) {
-      lines.push(`- ${file.path} refs:${file.references} items:[${file.items.join(",")}]`);
-    }
-    lines.push("");
+  lines.push("");
+}
+function pushUnparentedSection(lines, result, renderFocus) {
+  if (!result.unparented || result.unparented.length === 0) {
+    return;
   }
-  if (result.workload && result.workload.length > 0) {
-    lines.push("## Workload");
-    for (const entry of result.workload) {
-      const who = entry.assignee ?? "(unassigned)";
-      lines.push(`- ${who} active:${entry.active} wip:${entry.in_progress} items:[${entry.items.join(",")}]`);
-    }
-    lines.push("");
+  lines.push("## Unparented");
+  for (const item of result.unparented) {
+    lines.push(`- ${renderFocus(item)}`);
   }
-  if (result.staleness && result.staleness.length > 0) {
-    lines.push("## Stale items");
-    for (const entry of result.staleness) {
-      lines.push(`- ${entry.id} ${entry.status} stale:${entry.stale_days}d last:${entry.updated_at.slice(0, 10)} "${entry.title}"`);
-    }
-    lines.push("");
-  }
-  if (result.tests) {
-    lines.push("## Test health");
-    lines.push(`- items_with_tests: ${result.tests.items_with_tests}`);
-    lines.push(`- items_with_recent_runs: ${result.tests.items_with_recent_runs}`);
-    lines.push(`- passed: ${result.tests.recent_runs.passed}, failed: ${result.tests.recent_runs.failed}, skipped: ${result.tests.recent_runs.skipped}`);
-    if (result.tests.items_failing.length > 0) {
-      lines.push(`- items_failing: [${result.tests.items_failing.join(",")}]`);
-    }
-    lines.push("");
+  lines.push("");
+}
+function pushActivitySection(lines, result) {
+  if (!result.activity || result.activity.length === 0) {
+    return;
+  }
+  lines.push("## Recent activity");
+  for (const entry of result.activity) {
+    const msg = entry.msg ? ` ${entry.msg}` : "";
+    lines.push(`- ${entry.ts.slice(0, 16)}Z ${entry.id} ${entry.op} by:${entry.author}${msg}`);
+  }
+  lines.push("");
+}
+function pushBlockersSection(lines, result) {
+  if (!result.blockers || result.blockers.length === 0) {
+    return;
+  }
+  lines.push("## Blockers");
+  for (const entry of result.blockers) {
+    const by = entry.blocked_by ? `blocked_by:${entry.blocked_by}(${entry.blocked_by_status ?? "?"})` : "blocked_by:-";
+    const reason = entry.blocked_reason ? ` reason:"${entry.blocked_reason}"` : "";
+    const note = entry.unblock_note ? ` unblock:"${entry.unblock_note}"` : "";
+    lines.push(`- ${entry.id} "${entry.title}" ${by}${reason}${note}`);
+  }
+  lines.push("");
+}
+function pushFilesSection(lines, result) {
+  if (!result.files || result.files.length === 0) {
+    return;
+  }
+  lines.push("## Hot files");
+  for (const file of result.files) {
+    lines.push(`- ${file.path} refs:${file.references} items:[${file.items.join(",")}]`);
+  }
+  lines.push("");
+}
+function pushWorkloadSection(lines, result) {
+  if (!result.workload || result.workload.length === 0) {
+    return;
+  }
+  lines.push("## Workload");
+  for (const entry of result.workload) {
+    const who = entry.assignee ?? "(unassigned)";
+    lines.push(`- ${who} active:${entry.active} wip:${entry.in_progress} items:[${entry.items.join(",")}]`);
+  }
+  lines.push("");
+}
+function pushStalenessSection(lines, result) {
+  if (!result.staleness || result.staleness.length === 0) {
+    return;
+  }
+  lines.push("## Stale items");
+  for (const entry of result.staleness) {
+    lines.push(`- ${entry.id} ${entry.status} stale:${entry.stale_days}d last:${entry.updated_at.slice(0, 10)} "${entry.title}"`);
+  }
+  lines.push("");
+}
+function pushTestHealthSection(lines, result) {
+  if (!result.tests) {
+    return;
+  }
+  lines.push("## Test health");
+  lines.push(`- items_with_tests: ${result.tests.items_with_tests}`);
+  lines.push(`- items_with_recent_runs: ${result.tests.items_with_recent_runs}`);
+  lines.push(`- passed: ${result.tests.recent_runs.passed}, failed: ${result.tests.recent_runs.failed}, skipped: ${result.tests.recent_runs.skipped}`);
+  if (result.tests.items_failing.length > 0) {
+    lines.push(`- items_failing: [${result.tests.items_failing.join(",")}]`);
   }
+  lines.push("");
+}
+function pushEmptyContextSuggestions(lines, result) {
   const isEmpty = result.summary.active_items === 0 && result.summary.blocked === 0 && result.agenda.summary.events === 0;
-  if (isEmpty) {
-    lines.push("## Suggestions");
-    lines.push("No active work items or upcoming events. Consider:");
-    lines.push('- `pm create --type Task --title "..."` to add a new work item');
-    lines.push("- `pm list --status closed --limit 5` to review recent completions");
-    lines.push("- `pm search <keywords>` to find related past work");
-    lines.push("- `pm aggregate` for a full project status overview");
+  if (!isEmpty) {
+    return;
   }
+  lines.push("## Suggestions");
+  lines.push("No active work items or upcoming events. Consider:");
+  lines.push('- `pm create --type Task --title "..."` to add a new work item');
+  lines.push("- `pm list --status closed --limit 5` to review recent completions");
+  lines.push("- `pm search <keywords>` to find related past work");
+  lines.push("- `pm aggregate` for a full project status overview");
+}
+function renderContextMarkdown(result) {
+  const lines = [];
+  const focusFields = result.focus_fields;
+  const renderFocus = (item) => focusFields ? formatProjectedFocusLine(item, focusFields) : formatFocusLine(item);
+  lines.push("# pm context");
+  lines.push("");
+  lines.push(`- now: ${result.now}`);
+  lines.push(`- depth: ${result.depth}`);
+  if (result.filters.parent) {
+    lines.push(`- scope: subtree of ${result.filters.parent}`);
+  }
+  lines.push(`- active_items: ${result.summary.active_items} (in_progress: ${result.summary.in_progress}, open: ${result.summary.open})`);
+  if (result.summary.total_items !== void 0) {
+    lines.push(`- total_items: ${result.summary.total_items} (closed: ${result.summary.closed ?? 0}, canceled: ${result.summary.canceled ?? 0})`);
+  }
+  lines.push(`- agenda_events: ${result.summary.agenda_events}`);
+  lines.push(`- blocked_fallback_used: ${result.summary.blocked_fallback_used}`);
+  const renderedSections = result.sections_included.filter((section) => section !== "blockers" || (result.blockers?.length ?? 0) > 0);
+  if (renderedSections.length > 0) {
+    lines.push(`- sections: ${renderedSections.join(", ")}`);
+  }
+  lines.push("");
+  pushContextFocusSection(lines, "High-level focus", result.high_level, "No high-level active items.", renderFocus);
+  pushContextFocusSection(lines, "Low-level focus", result.low_level, "No low-level active items.", renderFocus);
+  pushBlockedFallbackSection(lines, result, renderFocus);
+  pushAgendaSection(lines, result);
+  pushHierarchySection(lines, result);
+  pushProgressSection(lines, result);
+  pushRecentlyCreatedSection(lines, result, focusFields, renderFocus);
+  pushUnparentedSection(lines, result, renderFocus);
+  pushActivitySection(lines, result);
+  pushBlockersSection(lines, result);
+  pushFilesSection(lines, result);
+  pushWorkloadSection(lines, result);
+  pushStalenessSection(lines, result);
+  pushTestHealthSection(lines, result);
+  pushEmptyContextSuggestions(lines, result);
   return lines.join("\n");
 }
-async function runContext(options, global) {
+async function resolveContextRuntime(options, global) {
   const pmRoot = resolvePmRoot(process.cwd(), global.path);
   const settings = await readSettings(pmRoot);
   const contextSettings = settings.context ?? SETTINGS_DEFAULTS.context;
   const statusRegistry = resolveRuntimeStatusRegistry(settings.schema);
   const depth = parseContextDepth(options.depth, contextSettings);
-  const limit = parseContextLimit(options.limit, depth);
-  const sectionsIncluded = parseContextSections(options.section, depth, contextSettings);
-  const activityLimit = parseActivityLimit(options.activityLimit, contextSettings);
-  const staleThresholdDays = parseStaleThresholdDays(options.staleThreshold, contextSettings);
-  const parentScope = parseContextParent(options.parent);
-  const focusFields = parseContextFocusFields(options.fields);
-  const needsAllItems = sectionsIncluded.some((s) => ["hierarchy", "progress", "blockers", "staleness", "recently_created", "unparented"].includes(s));
-  const baseListOptions = stripListProjectionFlags(options);
-  const unpaginatedListOptions = (extra) => ({
+  return {
+    settings,
+    contextSettings,
+    statusRegistry,
+    depth,
+    limit: parseContextLimit(options.limit, depth),
+    sectionsIncluded: parseContextSections(options.section, depth, contextSettings),
+    activityLimit: parseActivityLimit(options.activityLimit, contextSettings),
+    staleThresholdDays: parseStaleThresholdDays(options.staleThreshold, contextSettings),
+    parentScope: parseContextParent(options.parent),
+    focusFields: parseContextFocusFields(options.fields),
+    baseListOptions: stripListProjectionFlags(options)
+  };
+}
+function contextNeedsAllItems(sectionsIncluded) {
+  return sectionsIncluded.some((section) => ["hierarchy", "progress", "blockers", "staleness", "recently_created", "unparented"].includes(section));
+}
+function buildUnpaginatedContextListOptions(baseListOptions, extra) {
+  return {
     ...baseListOptions,
     ...extra,
     noTruncate: true,
     limit: void 0,
     offset: void 0
-  });
-  const listOptions = parentScope === void 0 ? { ...baseListOptions, excludeTerminal: true } : unpaginatedListOptions({ excludeTerminal: true });
+  };
+}
+async function loadContextCorpus(options, global, runtime) {
+  const needsAllItems = contextNeedsAllItems(runtime.sectionsIncluded);
+  const listOptions = runtime.parentScope === void 0 ? { ...runtime.baseListOptions, excludeTerminal: true } : buildUnpaginatedContextListOptions(runtime.baseListOptions, { excludeTerminal: true });
   const listed = await runList(void 0, listOptions, global);
   let listedFrontMatter = listed.items;
   let allItems = listedFrontMatter;
-  if (needsAllItems || parentScope !== void 0) {
-    const allListed = await runList(void 0, unpaginatedListOptions({ excludeTerminal: false }), global);
+  if (needsAllItems || runtime.parentScope !== void 0) {
+    const allListed = await runList(void 0, buildUnpaginatedContextListOptions(runtime.baseListOptions, { excludeTerminal: false }), global);
     allItems = allListed.items;
   }
   const fullCorpus = allItems;
-  let subtreeIds;
-  if (parentScope !== void 0) {
-    const subtree = collectSubtreeIds(fullCorpus, parentScope);
-    if (!subtree.found) {
-      throw new PmCliError(`Context --parent item not found: ${parentScope}`, EXIT_CODE.NOT_FOUND);
-    }
-    subtreeIds = subtree.ids;
-    listedFrontMatter = listedFrontMatter.filter((item) => subtreeIds?.has(item.id.trim().toLowerCase()));
-    allItems = allItems.filter((item) => subtreeIds?.has(item.id.trim().toLowerCase()));
+  const subtreeIds = resolveContextSubtreeIds(runtime.parentScope, fullCorpus);
+  if (subtreeIds) {
+    listedFrontMatter = listedFrontMatter.filter((item) => subtreeIds.has(item.id.trim().toLowerCase()));
+    allItems = allItems.filter((item) => subtreeIds.has(item.id.trim().toLowerCase()));
   }
+  return { listed, listedFrontMatter, allItems, fullCorpus, subtreeIds };
+}
+function resolveContextSubtreeIds(parentScope, fullCorpus) {
+  if (parentScope === void 0) {
+    return void 0;
+  }
+  const subtree = collectSubtreeIds(fullCorpus, parentScope);
+  if (!subtree.found) {
+    throw new PmCliError(`Context --parent item not found: ${parentScope}`, EXIT_CODE.NOT_FOUND);
+  }
+  return subtree.ids;
+}
+function resolveContextFocusGroups(listedFrontMatter, allItems, statusRegistry, sectionsIncluded, limit) {
   const ranked = [...listedFrontMatter].sort((left, right) => compareCriticalItems(left, right, statusRegistry));
-  const activeStatuses = statusRegistry.active_statuses.size > 0 ? statusRegistry.active_statuses : /* @__PURE__ */ new Set([statusRegistry.open_status]);
-  const blockedStatuses = statusRegistry.blocked_statuses;
+  const activeStatuses = statusRegistry.active_statuses;
   const activeItems = ranked.filter((item) => activeStatuses.has(normalizeStatusForRegistry(item.status, statusRegistry)));
-  const blockedItems = ranked.filter((item) => blockedStatuses.has(normalizeStatusForRegistry(item.status, statusRegistry)));
+  const blockedItems = ranked.filter((item) => statusRegistry.blocked_statuses.has(normalizeStatusForRegistry(item.status, statusRegistry)));
   const childrenByParent = buildChildrenByParent(allItems);
-  const focusChildrenByParent = needsAllItems ? childrenByParent : void 0;
+  const focusChildrenByParent = contextNeedsAllItems(sectionsIncluded) ? childrenByParent : void 0;
   const highLevel = activeItems.filter((item) => HIGH_LEVEL_TYPES.has(item.type)).slice(0, limit).map((item) => toContextFocusItem(item, statusRegistry, focusChildrenByParent));
   const lowLevel = activeItems.filter((item) => !HIGH_LEVEL_TYPES.has(item.type)).slice(0, limit).map((item) => toContextFocusItem(item, statusRegistry, focusChildrenByParent));
   const blockedFallbackUsed = activeItems.length === 0;
-  const blockedFallback = blockedFallbackUsed ? blockedItems.slice(0, limit).map((item) => toContextFocusItem(item, statusRegistry, focusChildrenByParent)) : [];
+  return {
+    activeItems,
+    blockedItems,
+    highLevel,
+    lowLevel,
+    blockedFallback: blockedFallbackUsed ? blockedItems.slice(0, limit).map((item) => toContextFocusItem(item, statusRegistry, focusChildrenByParent)) : [],
+    blockedFallbackUsed
+  };
+}
+async function buildContextAgenda(options, global, runtime, subtreeIds) {
   const calendarOptions = {
-    ...baseListOptions,
+    ...runtime.baseListOptions,
     view: "agenda",
     include: "all",
-    // When scoping to a subtree, pull the full agenda so the subtree filter sees
-    // every candidate event before the final per-section slice.
-    limit: parentScope === void 0 ? String(limit) : void 0
+    limit: runtime.parentScope === void 0 ? String(runtime.limit) : void 0
   };
   const agenda = await runCalendar(calendarOptions, global);
   const scopedAgenda = subtreeIds === void 0 ? agenda.events : agenda.events.filter((event) => subtreeIds.has(event.item_id.trim().toLowerCase()));
-  const agendaEvents = filterTerminalCalendarEvents(scopedAgenda, statusRegistry).slice(0, limit);
-  const agendaSummary = summarizeAgenda(agendaEvents);
-  const warnings = mergeSortedWarnings(listed.warnings, agenda.warnings);
-  const inProgressStatus = normalizeStatusInput("in_progress", statusRegistry);
-  const openStatus = normalizeStatusInput("open", statusRegistry);
-  const inProgressCount = activeItems.filter((item) => normalizeStatusForRegistry(item.status, statusRegistry) === inProgressStatus).length;
-  const openCount = activeItems.filter((item) => normalizeStatusForRegistry(item.status, statusRegistry) === openStatus).length;
-  const now = agenda.now;
-  const itemMap = /* @__PURE__ */ new Map();
-  for (const item of fullCorpus) {
-    itemMap.set(item.id, item);
+  const agendaEvents = filterTerminalCalendarEvents(scopedAgenda, runtime.statusRegistry).slice(0, runtime.limit);
+  return { agenda, agendaEvents, agendaSummary: summarizeAgenda(agendaEvents) };
+}
+function countContextStatus(items, status, statusRegistry) {
+  const targetStatus = String(status);
+  return items.filter((item) => normalizeStatusForRegistry(item.status, statusRegistry) === targetStatus).length;
+}
+async function buildOptionalContextSections(params) {
+  const { runtime, allItems, fullCorpus, focusGroups, now, global } = params;
+  const childrenByParent = buildChildrenByParent(allItems);
+  const itemMap = new Map(fullCorpus.map((item) => [item.id, item]));
+  const allNonTerminal = allItems.filter((item) => !isTerminalStatus(item.status, runtime.statusRegistry));
+  const has = (section) => runtime.sectionsIncluded.includes(section);
+  return {
+    hierarchy: has("hierarchy") ? buildHierarchy(allItems, focusGroups.activeItems, runtime.statusRegistry, runtime.limit) : void 0,
+    activity: has("activity") ? await buildActivity(runtime.activityLimit, global) : void 0,
+    progress: has("progress") ? buildProgress(allItems, focusGroups.activeItems, runtime.statusRegistry, runtime.limit) : void 0,
+    blockersSection: has("blockers") ? buildBlockers(focusGroups.blockedItems, itemMap, runtime.limit) : void 0,
+    recentlyCreated: has("recently_created") ? buildRecentlyCreated(allNonTerminal, runtime.statusRegistry, childrenByParent, runtime.limit) : void 0,
+    unparented: has("unparented") ? buildUnparented(allNonTerminal, runtime.statusRegistry, childrenByParent, runtime.limit) : void 0,
+    filesSection: has("files") ? buildHotFiles(focusGroups.activeItems, runtime.limit) : void 0,
+    workload: has("workload") ? buildWorkload(focusGroups.activeItems, runtime.statusRegistry, runtime.limit) : void 0,
+    staleness: has("staleness") ? buildStaleness(allNonTerminal, runtime.staleThresholdDays, now, runtime.limit) : void 0,
+    tests: has("tests") ? buildTestHealth(focusGroups.activeItems) : void 0
+  };
+}
+function buildContextSummaryExtras(needsAllItems, allItems, statusRegistry) {
+  if (!needsAllItems) {
+    return {};
   }
-  const allNonTerminal = allItems.filter((item) => !isTerminalStatus(item.status, statusRegistry));
-  const has = (section) => sectionsIncluded.includes(section);
-  const hierarchy = has("hierarchy") ? buildHierarchy(allItems, activeItems, statusRegistry, limit) : void 0;
-  const activity = has("activity") ? await buildActivity(activityLimit, global) : void 0;
-  const progress = has("progress") ? buildProgress(allItems, activeItems, statusRegistry, limit) : void 0;
-  const blockersSection = has("blockers") ? buildBlockers(blockedItems, itemMap, limit) : void 0;
-  const recentlyCreated = has("recently_created") ? buildRecentlyCreated(allNonTerminal, statusRegistry, childrenByParent, limit) : void 0;
-  const unparented = has("unparented") ? buildUnparented(allNonTerminal, statusRegistry, childrenByParent, limit) : void 0;
-  const filesSection = has("files") ? buildHotFiles(activeItems, limit) : void 0;
-  const workload = has("workload") ? buildWorkload(activeItems, statusRegistry, limit) : void 0;
-  const staleness = has("staleness") ? buildStaleness(allNonTerminal, staleThresholdDays, now, limit) : void 0;
-  const tests = has("tests") ? buildTestHealth(activeItems) : void 0;
-  const summaryExtras = needsAllItems ? {
+  const canceledStatus = normalizeStatusInput("canceled", statusRegistry);
+  return {
     total_items: allItems.length,
-    closed: allItems.filter((i) => isClosedStatus(i.status, statusRegistry)).length,
-    canceled: allItems.filter((i) => {
-      const canceledStatus = normalizeStatusInput("canceled", statusRegistry);
-      return normalizeStatusForRegistry(i.status, statusRegistry) === canceledStatus;
-    }).length
-  } : {};
+    closed: allItems.filter((item) => isClosedStatus(item.status, statusRegistry)).length,
+    canceled: allItems.filter((item) => normalizeStatusForRegistry(item.status, statusRegistry) === canceledStatus).length
+  };
+}
+function attachOptionalContextSections(result, sections) {
+  if (sections.hierarchy)
+    result.hierarchy = sections.hierarchy;
+  if (sections.activity)
+    result.activity = sections.activity;
+  if (sections.progress)
+    result.progress = sections.progress;
+  if (sections.blockersSection)
+    result.blockers = sections.blockersSection;
+  if (sections.recentlyCreated)
+    result.recently_created = sections.recentlyCreated;
+  if (sections.unparented)
+    result.unparented = sections.unparented;
+  if (sections.filesSection)
+    result.files = sections.filesSection;
+  if (sections.workload)
+    result.workload = sections.workload;
+  if (sections.staleness)
+    result.staleness = sections.staleness;
+  if (sections.tests)
+    result.tests = sections.tests;
+}
+function applyContextFocusProjection(result, focusFields) {
+  if (!focusFields) {
+    return;
+  }
+  result.focus_fields = focusFields;
+  result.high_level = projectContextFocusRows(result.high_level, focusFields);
+  result.low_level = projectContextFocusRows(result.low_level, focusFields);
+  result.blocked_fallback = projectContextFocusRows(result.blocked_fallback, focusFields);
+  if (result.recently_created) {
+    result.recently_created = projectContextFocusRows(result.recently_created, focusFields);
+  }
+  if (result.unparented) {
+    result.unparented = projectContextFocusRows(result.unparented, focusFields);
+  }
+}
+function maybeAttachEmptyContextSuggestions(result, activeItems, blockedItems) {
+  if (activeItems.length > 0 || blockedItems.length > 0 || result.agenda.events.length > 0) {
+    return;
+  }
+  result.suggestions = [
+    'pm create --type Task --title "..." to add a new work item',
+    "pm list --status closed --limit 5 to review recent completions",
+    "pm search <keywords> to find related past work",
+    "pm aggregate for a full project status overview"
+  ];
+}
+async function runContext(options, global) {
+  const runtime = await resolveContextRuntime(options, global);
+  const corpus = await loadContextCorpus(options, global, runtime);
+  const focusGroups = resolveContextFocusGroups(corpus.listedFrontMatter, corpus.allItems, runtime.statusRegistry, runtime.sectionsIncluded, runtime.limit);
+  const agendaContext = await buildContextAgenda(options, global, runtime, corpus.subtreeIds);
+  const warnings = mergeSortedWarnings(corpus.listed.warnings, agendaContext.agenda.warnings);
+  const inProgressCount = countContextStatus(focusGroups.activeItems, normalizeStatusInput("in_progress", runtime.statusRegistry), runtime.statusRegistry);
+  const openCount = countContextStatus(focusGroups.activeItems, normalizeStatusInput("open", runtime.statusRegistry), runtime.statusRegistry);
+  const sections = await buildOptionalContextSections({
+    runtime,
+    allItems: corpus.allItems,
+    fullCorpus: corpus.fullCorpus,
+    focusGroups,
+    now: agendaContext.agenda.now,
+    global
+  });
+  const summaryExtras = buildContextSummaryExtras(contextNeedsAllItems(runtime.sectionsIncluded), corpus.allItems, runtime.statusRegistry);
   const result = {
     output_default: "toon",
-    now,
-    depth,
-    sections_included: sectionsIncluded,
+    now: agendaContext.agenda.now,
+    depth: runtime.depth,
+    sections_included: runtime.sectionsIncluded,
     window: {
-      anchor: agenda.anchor,
-      start: agenda.range.start,
-      end: agenda.range.end,
-      past: agenda.range.past,
-      from: agenda.range.from,
-      to: agenda.range.to
+      anchor: agendaContext.agenda.anchor,
+      start: agendaContext.agenda.range.start,
+      end: agendaContext.agenda.range.end,
+      past: agendaContext.agenda.range.past,
+      from: agendaContext.agenda.range.from,
+      to: agendaContext.agenda.range.to
     },
     filters: {
       type: options.type ?? null,
@@ -1645,71 +1823,34 @@ async function runContext(options, global) {
       sprint: options.sprint ?? null,
       release: options.release ?? null,
       limit: options.limit ?? null,
-      parent: parentScope ?? null,
+      parent: runtime.parentScope ?? null,
       /* c8 ignore next -- listed/calendar runtime filters are always materialized by their command handlers */
-      runtime_filters: listed.filters.runtime_filters ?? agenda.filters.runtime_filters ?? {}
+      runtime_filters: corpus.listed.filters.runtime_filters ?? agendaContext.agenda.filters.runtime_filters ?? {}
     },
     summary: {
-      active_items: activeItems.length,
+      active_items: focusGroups.activeItems.length,
       in_progress: inProgressCount,
       open: openCount,
-      blocked: blockedItems.length,
-      blocked_fallback_used: blockedFallbackUsed,
-      high_level: highLevel.length,
-      low_level: lowLevel.length,
-      agenda_events: agendaSummary.events,
+      blocked: focusGroups.blockedItems.length,
+      blocked_fallback_used: focusGroups.blockedFallbackUsed,
+      high_level: focusGroups.highLevel.length,
+      low_level: focusGroups.lowLevel.length,
+      agenda_events: agendaContext.agendaSummary.events,
       ...summaryExtras
     },
-    high_level: highLevel,
-    low_level: lowLevel,
-    blocked_fallback: blockedFallback,
+    high_level: focusGroups.highLevel,
+    low_level: focusGroups.lowLevel,
+    blocked_fallback: focusGroups.blockedFallback,
     agenda: {
-      summary: agendaSummary,
-      events: agendaEvents
+      summary: agendaContext.agendaSummary,
+      events: agendaContext.agendaEvents
     }
   };
-  if (hierarchy)
-    result.hierarchy = hierarchy;
-  if (activity)
-    result.activity = activity;
-  if (progress)
-    result.progress = progress;
-  if (blockersSection)
-    result.blockers = blockersSection;
-  if (recentlyCreated)
-    result.recently_created = recentlyCreated;
-  if (unparented)
-    result.unparented = unparented;
-  if (filesSection)
-    result.files = filesSection;
-  if (workload)
-    result.workload = workload;
-  if (staleness)
-    result.staleness = staleness;
-  if (tests)
-    result.tests = tests;
-  if (focusFields) {
-    result.focus_fields = focusFields;
-    result.high_level = projectContextFocusRows(result.high_level, focusFields);
-    result.low_level = projectContextFocusRows(result.low_level, focusFields);
-    result.blocked_fallback = projectContextFocusRows(result.blocked_fallback, focusFields);
-    if (result.recently_created) {
-      result.recently_created = projectContextFocusRows(result.recently_created, focusFields);
-    }
-    if (result.unparented) {
-      result.unparented = projectContextFocusRows(result.unparented, focusFields);
-    }
-  }
+  attachOptionalContextSections(result, sections);
+  applyContextFocusProjection(result, runtime.focusFields);
   if (warnings.length > 0)
     result.warnings = warnings;
-  if (activeItems.length === 0 && blockedItems.length === 0 && agendaEvents.length === 0) {
-    result.suggestions = [
-      'pm create --type Task --title "..." to add a new work item',
-      "pm list --status closed --limit 5 to review recent completions",
-      "pm search <keywords> to find related past work",
-      "pm aggregate for a full project status overview"
-    ];
-  }
+  maybeAttachEmptyContextSuggestions(result, focusGroups.activeItems, focusGroups.blockedItems);
   return result;
 }
 
@@ -1728,6 +1869,6 @@ export {
   renderContextMarkdown,
   runContext
 };
-//# sourceMappingURL=chunk-HIBK6H4S.js.map
+//# sourceMappingURL=chunk-XCHUVHKU.js.map
 
-//# debugId=a060da65-925f-55ab-b13e-d07fceedaeaf
+//# debugId=95fd55ba-b62a-5ca4-8d6a-02955d7b5692