@nbtca/prompt 1.4.2 → 1.5.0

package/dist/app/views/events-render.js

@@ -3,29 +3,14 @@ import { t } from '../../i18n/index.js';
 import { renderListFieldWithContext } from '../fields/list-field.js';
 import { renderCountdownBanner, renderEventBrief } from '../../features/calendar.js';
 import { renderHeatmap } from '../../features/calendar-heatmap.js';
-import { visualWidth, wrapAnsiToVisualWidth } from '../../core/text.js';
+import { wrapAnsiWithIndent } from '../../core/text.js';
 function wrappedIndentedLines(label, cols, style) {
-    const width = Number.isFinite(cols) ? Math.max(1, Math.floor(cols ?? 1)) : Number.POSITIVE_INFINITY;
-    const styled = style(label);
-    const styledWidth = visualWidth(styled);
-    const preferredIndent = visualWidth(space.indent) < width ? space.indent : '';
-    const indent = preferredIndent
-        && styledWidth > width - visualWidth(preferredIndent)
-        && styledWidth <= width
-        ? ''
-        : preferredIndent;
-    const contentWidth = Math.max(1, width - visualWidth(indent));
-    return wrapAnsiToVisualWidth(styled, contentWidth).map((line) => `${indent}${line}`);
+    return wrapAnsiWithIndent(style(label), cols ?? Number.POSITIVE_INFINITY, space.indent);
 }
 function wrappedRenderedLine(line, cols) {
     const content = line.startsWith(space.indent) ? line.slice(space.indent.length) : line;
     return wrappedIndentedLines(content, cols, (value) => value);
 }
-// Lines a fully-expanded hub needs: banner+blank (2) + heatmap+blank (12) +
-// recent-activity heading+up to 5 events+blank (7) + hubField
-// (title+blank+6 options, 8) = 29. Below this, a terminal can't fit the
-// heatmap without pushing the menu into scroll territory — better to keep
-// it as the existing drill-down destination than show a truncated grid.
 const EXPANDED_HUB_MIN_BODY_ROWS = 29;
 function renderHubBody(state, now, bodyRows, cols) {
     const trans = t();
@@ -38,7 +23,10 @@ function renderHubBody(state, now, bodyRows, cols) {
         lines.push(...banner.split('\n'), '');
     const buckets = state.heatmapBuckets;
     if (bodyRows >= EXPANDED_HUB_MIN_BODY_ROWS && buckets && buckets.length > 0) {
-        lines.push(...renderHeatmap(buckets, now, { color: true, cols }).split('\n'));
+        lines.push(...renderHeatmap(buckets, now, {
+            color: true,
+            ...(cols === undefined ? {} : { cols }),
+        }).split('\n'));
         lines.push('');
     }
     if (state.recentEvents && state.recentEvents.length > 0) {
@@ -77,12 +65,11 @@ export function renderEvents(state, now, bodyRows = 100, cols) {
         case 'hub':
             return renderHubBody(state, now, bodyRows, cols);
         case 'heatmap':
-            // renderHeatmap() already prints its own title (space.indent +
-            // type.heading), so this mode doesn't add a second heading on top —
-            // unlike Schedule's 'week'/'unresolved' modes, which wrap a
-            // title-less renderer.
             return state.heatmapBuckets && state.heatmapBuckets.length > 0
-                ? renderHeatmap(state.heatmapBuckets, now, { color: true, cols }).split('\n')
+                ? renderHeatmap(state.heatmapBuckets, now, {
+                    color: true,
+                    ...(cols === undefined ? {} : { cols }),
+                }).split('\n')
                 : wrappedIndentedLines(trans.calendar.noEvents, cols, type.hint);
         case 'list':
             return state.listField?.render(bodyRows, cols) ?? [];
@@ -92,14 +79,20 @@ export function renderEvents(state, now, bodyRows = 100, cols) {
                 ...wrappedIndentedLines(state.detailMeta ?? '', cols, type.hint),
                 '',
                 ...(state.detailDescription
-                    ? state.detailDescription.split('\n').flatMap((line) => wrappedIndentedLines(line, cols, type.body))
+                    ? state.detailDescription
+                        .split('\n')
+                        .flatMap((line) => wrappedIndentedLines(line, cols, type.body))
                     : wrappedIndentedLines(trans.calendar.noDescription, cols, type.hint)),
                 '',
-                ...(state.statusMessage ? [...wrappedIndentedLines(state.statusMessage, cols, type.hint), ''] : []),
+                ...(state.statusMessage
+                    ? [...wrappedIndentedLines(state.statusMessage, cols, type.hint), '']
+                    : []),
             ];
             return state.detailField
                 ? renderListFieldWithContext(context, state.detailField, bodyRows, cols)
-                : Number.isFinite(bodyRows) ? context.slice(0, Math.max(0, Math.floor(bodyRows))) : context;
+                : Number.isFinite(bodyRows)
+                    ? context.slice(0, Math.max(0, Math.floor(bodyRows)))
+                    : context;
         }
         case 'search':
             return state.searchField?.render(cols) ?? [];

package/dist/app/views/events.js

@@ -7,6 +7,7 @@ import { pickIcon } from '../../core/icons.js';
 import { t } from '../../i18n/index.js';
 import { loadCalendarOrThrow, toDisplayEvent, exportEventIcs } from '../../features/calendar.js';
 import { weekRange, monthRange, filterEvents } from '../../features/calendar-query.js';
+import { addLocalDays } from '../../core/calendar-day.js';
 let state = { mode: 'loading' };
 let calendar = null;
 let currentList = [];
@@ -29,36 +30,42 @@ function buildListField(title, events, maxVisible) {
     const trans = t();
     const display = events.map(toDisplayEvent);
     const options = [
-        ...events.map((_e, i) => ({
-            value: String(i),
-            label: `${display[i].date}${display[i].time ? ' ' + display[i].time : ''}  ${display[i].title}`,
-            hint: display[i].location,
+        ...display.map((event, index) => ({
+            value: String(index),
+            label: `${event.date}${event.time ? ` ${event.time}` : ''}  ${event.title}`,
+            hint: event.location,
         })),
         { value: '__back__', label: backLabel() },
     ];
     return new ListField({
         title: title || trans.menu.events,
-        options: options.length > 1 ? options : [{ value: '__back__', label: `${trans.calendar.noEvents} — ${backLabel()}` }],
+        options: options.length > 1
+            ? options
+            : [{ value: '__back__', label: `${trans.calendar.noEvents} — ${backLabel()}` }],
         maxVisible,
     });
 }
 function showList(title, events, ctx) {
     currentList = events;
-    state = { mode: 'list', listField: buildListField(title, events, computeMaxVisible(ctx.bodyRows)) };
+    state = {
+        mode: 'list',
+        listField: buildListField(title, events, computeMaxVisible(ctx.bodyRows)),
+    };
 }
-// A glance-panel ceiling, not "browse everything" (this tab's own "Events"
-// list is for that) — just needs to be at least as many as the tallest
-// reasonable terminal could fit; renderHubBody trims further based on the
-// real ctx.bodyRows.
 const RECENT_ACTIVITY_FETCH_CAP = 15;
 function goToHub() {
     const upcoming = calendar ? calendar.upcoming({ days: 30 }) : [];
+    const nextEvent = upcoming[0];
     state = {
         mode: 'hub',
         hubField: buildHubField(),
-        nextEvent: upcoming[0] ? toDisplayEvent(upcoming[0]) : undefined,
+        ...(nextEvent === undefined ? {} : { nextEvent: toDisplayEvent(nextEvent) }),
         heatmapBuckets: calendar
-            ? calendar.heatmap({ start: new Date(Date.now() - 365 * 86400000), end: new Date(), bucket: 'day' })
+            ? calendar.heatmap({
+                start: addLocalDays(new Date(), -365),
+                end: new Date(),
+                bucket: 'day',
+            })
             : [],
         recentEvents: upcoming.slice(0, RECENT_ACTIVITY_FETCH_CAP).map(toDisplayEvent),
     };
@@ -74,10 +81,6 @@ function showDetail(raw) {
         detailDescription: e.description,
         detailEvent: raw,
         detailField: new ListField({
-            // Empty, not e.title: renderEvents already prints the event title as
-            // its own heading right above (detailTitle) -- giving the field the
-            // same string a second time repeated it verbatim just above the
-            // Export/Back options.
             title: '',
             options: [
                 { value: 'export', label: trans.calendar.exportIcs },
@@ -102,27 +105,26 @@ export const eventsView = {
         ctx.rerender();
     },
     render(ctx) {
-        // Sync the list's scroll window to the *current* terminal size on every
-        // frame (not just construction time) — this is what keeps a long list
-        // correctly windowed across a live resize.
         state.listField?.setMaxVisible(computeMaxVisible(ctx.bodyRows));
         return renderEvents(state, new Date(), ctx.bodyRows, ctx.size.cols);
     },
     capturesInput() {
         return state.mode === 'search';
     },
+    capturesPageKeys() {
+        return state.mode === 'hub' || state.mode === 'list' || state.mode === 'detail';
+    },
     footerHint(tabCount, cols = Number.POSITIVE_INFINITY) {
         if (state.mode === 'search')
             return captureFooterHint(cols);
-        // A pure "read this, any key returns to the hub" drill-down (see
-        // handleKey below) -- no field to move a cursor within or open an item
-        // from, so the generic "move · open" hint would promise keys that
-        // don't do that here.
         const passive = state.mode === 'loading' || state.mode === 'error' || state.mode === 'heatmap';
         return passive ? passiveFooterHint(tabCount, cols) : undefined;
     },
     handleBack() {
-        if (state.mode === 'list' || state.mode === 'detail' || state.mode === 'search' || state.mode === 'heatmap') {
+        if (state.mode === 'list' ||
+            state.mode === 'detail' ||
+            state.mode === 'search' ||
+            state.mode === 'heatmap') {
             if (state.mode === 'search')
                 setVimKeysActive(true);
             goToHub();
@@ -163,12 +165,17 @@ export const eventsView = {
                 }
                 if (result.selected === 'search') {
                     setVimKeysActive(false);
-                    state = { mode: 'search', searchField: new TextField({ message: t().calendar.searchPrompt, placeholder: t().calendar.searchPlaceholder, allowEmpty: true }) };
+                    state = {
+                        mode: 'search',
+                        searchField: new TextField({
+                            message: t().calendar.searchPrompt,
+                            placeholder: t().calendar.searchPlaceholder,
+                            allowEmpty: true,
+                        }),
+                    };
                 }
                 return;
             }
-            // A pure detail/drill-down view with no field of its own — any key
-            // returns to the hub, matching Schedule's 'week'/'unresolved' modes.
             case 'heatmap': {
                 goToHub();
                 return;
@@ -196,7 +203,12 @@ export const eventsView = {
                 }
                 if (result.selected === 'export' && state.detailEvent) {
                     const res = exportEventIcs(state.detailEvent);
-                    state = { ...state, statusMessage: res.ok ? `${t().calendar.exportSuccess}: ${res.path}` : `${t().calendar.exportError}: ${res.error ?? ''}` };
+                    state = {
+                        ...state,
+                        statusMessage: res.ok
+                            ? `${t().calendar.exportSuccess}: ${res.path}`
+                            : `${t().calendar.exportError}: ${res.error ?? ''}`,
+                    };
                 }
                 return;
             }
@@ -210,18 +222,19 @@ export const eventsView = {
                 if (result?.submitted !== undefined) {
                     setVimKeysActive(true);
                     const query = result.submitted.trim();
-                    if (!query || !calendar) {
+                    if (!query) {
                         goToHub();
                         return;
                     }
                     const now = new Date();
-                    const pool = calendar.inRange(now, new Date(now.getTime() + 365 * 86400000));
+                    const pool = calendar.inRange(now, addLocalDays(now, 365));
                     const results = filterEvents(pool, query);
                     showList(`${t().calendar.search}: ${query}`, results, ctx);
                 }
                 return;
             }
-            default:
+            case 'loading':
+            case 'error':
                 return;
         }
     },

package/dist/app/views/home.js

@@ -1,23 +1,16 @@
 import { c, type, space, glyph } from '../../core/theme.js';
 import { t } from '../../i18n/index.js';
 import { pickIcon } from '../../core/icons.js';
-import { padEndV, visualWidth, wrapAnsiToVisualWidth } from '../../core/text.js';
-import { peekNextClassLine, peekTodayLines, peekWeekAheadInfo, peekUnresolvedCount } from '../../features/schedule-view.js';
+import { padEndV, visualWidth, wrapAnsiWithIndent } from '../../core/text.js';
+import { peekNextClassLine, peekTodayLines, peekWeekAheadInfo, peekUnresolvedCount, } from '../../features/schedule-view.js';
 import { loadCalendarOrThrow, toDisplayEvent, renderEventBrief } from '../../features/calendar.js';
 import { weekdayShortLabel } from '../../features/schedule-render.js';
-import { campusWeekday } from '../../features/schedule-query.js';
+import { addLocalDays } from '../../core/calendar-day.js';
 import { passiveFooterHint } from '../chrome.js';
+import { campusWeekday } from '@nbtca/nbtcal/timetable';
+const WEEKDAYS = [1, 2, 3, 4, 5, 6, 7];
 function wrappedIndentedLines(label, cols, style) {
-    const width = Number.isFinite(cols) ? Math.max(1, Math.floor(cols)) : Number.POSITIVE_INFINITY;
-    const styled = style(label);
-    const preferredIndent = visualWidth(space.indent) < width ? space.indent : '';
-    const indent = preferredIndent
-        && visualWidth(styled) > width - visualWidth(preferredIndent)
-        && visualWidth(styled) <= width
-        ? ''
-        : preferredIndent;
-    const contentWidth = Math.max(1, width - visualWidth(indent));
-    return wrapAnsiToVisualWidth(styled, contentWidth).map((line) => `${indent}${line}`);
+    return wrapAnsiWithIndent(style(label), cols, space.indent);
 }
 function panelHeading(label, cols) {
     return wrappedIndentedLines(label, cols, type.heading);
@@ -39,7 +32,9 @@ function renderDayProgress(now, cols) {
     const indent = visualWidth(space.indent) + 2 + visualWidth(percentage) + 1 <= width ? space.indent : '';
     const gap = visualWidth(indent) + 2 + visualWidth(percentage) + 1 <= width
         ? '  '
-        : visualWidth(indent) + 1 + visualWidth(percentage) + 1 <= width ? ' ' : '';
+        : visualWidth(indent) + 1 + visualWidth(percentage) + 1 <= width
+            ? ' '
+            : '';
     const barWidth = Math.max(0, Math.min(DAY_PROGRESS_WIDTH, width - visualWidth(indent) - visualWidth(gap) - visualWidth(percentage)));
     const filled = Math.round(fraction * barWidth);
     const filledChar = glyph.barFilled();
@@ -57,17 +52,21 @@ function renderWeekAheadGrid(classDays, eventDays, cols) {
     const days = [1, 2, 3, 4, 5, 6, 7];
     const dayLabels = days.map((wd) => type.hint(weekdayShortLabel(wd))).join('  ');
     const headerLine = `${space.indent}${padEndV('', rowLabelW)}${dayLabels}`;
-    const classCells = days.map((wd) => {
+    const classCells = days
+        .map((wd) => {
         const isWeekend = wd === 6 || wd === 7;
-        const glyphChar = isWeekend ? weekendChar : (classDays[wd - 1] ? hasClassChar : freeChar);
+        const glyphChar = isWeekend ? weekendChar : classDays[wd - 1] ? hasClassChar : freeChar;
         return type.body(glyphChar);
-    }).join('  ');
+    })
+        .join('  ');
     const classLine = `${space.indent}${type.hint(padEndV(trans.timetable.weekAheadClasses, rowLabelW))}${classCells}`;
-    const eventCells = days.map((wd) => {
+    const eventCells = days
+        .map((wd) => {
         if (!eventDays)
             return blankCell;
         return type.body(eventDays[wd - 1] ? hasClassChar : freeChar);
-    }).join('  ');
+    })
+        .join('  ');
     const eventLine = `${space.indent}${type.hint(padEndV(trans.menu.events, rowLabelW))}${eventCells}`;
     const legend = `${space.indent}${type.hint(`${hasClassChar} ${trans.timetable.weekAheadBusy}  ${freeChar} ${trans.timetable.weekAheadFree}  ${weekendChar} ${trans.timetable.weekAheadNone}`)}`;
     const wideLines = [headerLine, classLine, eventLine, legend];
@@ -76,12 +75,8 @@ function renderWeekAheadGrid(classDays, eventDays, cols) {
         return wideLines.join('\n');
     const compactHeading = wrappedIndentedLines(`${trans.timetable.weekAheadClasses} / ${trans.menu.events}`, cols, type.hint);
     const compactDays = days.flatMap((wd) => {
-        const classCell = wd === 6 || wd === 7
-            ? weekendChar
-            : classDays[wd - 1] ? hasClassChar : freeChar;
-        const eventCell = eventDays
-            ? eventDays[wd - 1] ? hasClassChar : freeChar
-            : blankCell;
+        const classCell = wd === 6 || wd === 7 ? weekendChar : classDays[wd - 1] ? hasClassChar : freeChar;
+        const eventCell = eventDays ? (eventDays[wd - 1] ? hasClassChar : freeChar) : blankCell;
         const row = `${type.hint(weekdayShortLabel(wd))}  ${type.body(classCell)}  ${type.body(eventCell)}`;
         return wrappedIndentedLines(row, cols, (value) => value);
     });
@@ -159,7 +154,7 @@ export const homeView = {
                 nextClassLine: peekNextClassLine(),
                 todayLines: peekTodayLines(),
                 unresolvedCount: peekUnresolvedCount(),
-                weekAhead: weekAheadInfo ? { classDays: weekAheadInfo.classDays } : undefined,
+                ...(weekAheadInfo ? { weekAhead: { classDays: weekAheadInfo.classDays } } : {}),
             };
         }
         catch {
@@ -174,12 +169,15 @@ export const homeView = {
             const eventLines = items.map((e) => renderEventBrief(e, now));
             let weekAhead = data.weekAhead;
             if (weekAheadInfo) {
-                const weekEnd = new Date(weekAheadInfo.weekStartDate.getTime() + 7 * 86400000);
+                const weekEnd = addLocalDays(weekAheadInfo.weekStartDate, 7);
                 const weekEvents = cal.inRange(weekAheadInfo.weekStartDate, weekEnd);
-                const daySet = new Set(weekEvents.map((e) => campusWeekday(e.start)));
-                weekAhead = { classDays: weekAheadInfo.classDays, eventDays: [1, 2, 3, 4, 5, 6, 7].map((wd) => daySet.has(wd)) };
+                const daySet = new Set(weekEvents.map((event) => campusWeekday(event.start)));
+                weekAhead = {
+                    classDays: weekAheadInfo.classDays,
+                    eventDays: WEEKDAYS.map((weekday) => daySet.has(weekday)),
+                };
             }
-            data = { ...data, eventLines, weekAhead };
+            data = weekAhead ? { ...data, eventLines, weekAhead } : { ...data, eventLines };
         }
         catch {
             data = { ...data, eventsLoadFailed: true };

package/dist/app/views/schedule-grid-cursor.js

@@ -1,40 +1,31 @@
-import { meetingAtCursor } from '../../features/schedule-query.js';
+import { createTimetableSchedule, } from '@nbtca/nbtcal/timetable';
 export const KEY_ARROW_LEFT = '\x1b[D';
 export const KEY_ARROW_RIGHT = '\x1b[C';
 export const KEY_ARROW_UP = '\x1b[A';
 export const KEY_ARROW_DOWN = '\x1b[B';
 export const KEY_ENTER_CR = '\r';
 export const KEY_ENTER_LF = '\n';
-/** The cursor's starting position on entering hub/week mode: today's own
- * weekday (falling back to Monday on a weekend, since the grid's Sat/Sun
- * columns are always empty for a personal timetable) and the first period
- * this term's own period table actually defines. */
 export function defaultGridCursor(todayWeekday, periods) {
     const sorted = [...periods].sort((a, b) => a.period - b.period);
     const firstPeriod = sorted[0]?.period ?? 1;
-    const weekday = todayWeekday >= 1 && todayWeekday <= 5 ? todayWeekday : 1;
+    const weekday = (todayWeekday >= 1 && todayWeekday <= 5 ? todayWeekday : 1);
     return { weekday, period: firstPeriod };
 }
-/** Moves the cursor one weekday left/right, clamped to [1, 7] with no
- * wraparound -- a 7-day week has a real fixed edge, unlike a scrollable
- * list where wrapping back to the top makes sense. */
 export function moveCursorWeekday(cursor, delta) {
-    return { ...cursor, weekday: Math.max(1, Math.min(7, cursor.weekday + delta)) };
+    return {
+        ...cursor,
+        weekday: Math.max(1, Math.min(7, cursor.weekday + delta)),
+    };
 }
-/** Moves the cursor to the previous/next *defined* period in the sorted
- * period table (not period±1 -- real period numbers aren't always
- * contiguous), clamped at the first/last period with no wraparound. */
 export function moveCursorPeriod(cursor, periods, delta) {
     const sorted = [...periods].sort((a, b) => a.period - b.period);
     if (sorted.length === 0)
         return cursor;
     const idx = sorted.findIndex((p) => p.period === cursor.period);
     const nextIdx = Math.max(0, Math.min(sorted.length - 1, (idx === -1 ? 0 : idx) + delta));
-    return { ...cursor, period: sorted[nextIdx].period };
+    const nextPeriod = sorted[nextIdx];
+    return nextPeriod ? { ...cursor, period: nextPeriod.period } : cursor;
 }
-/** Pure key-to-action mapping shared by hub mode's inline grid and the
- * standalone full-screen 'week' mode -- both are cursor-navigable over the
- * exact same rules, so this is the one place that logic lives. */
 export function handleGridKey(key, cursor, tt, week) {
     if (key === KEY_ARROW_LEFT)
         return { kind: 'moveCursor', cursor: moveCursorWeekday(cursor, -1) };
@@ -45,7 +36,7 @@ export function handleGridKey(key, cursor, tt, week) {
     if (key === KEY_ARROW_DOWN)
         return { kind: 'moveCursor', cursor: moveCursorPeriod(cursor, tt.periods, 1) };
     if (key === KEY_ENTER_CR || key === KEY_ENTER_LF) {
-        const meeting = meetingAtCursor(tt.meetings, week, cursor);
+        const meeting = createTimetableSchedule(tt).meetingAt(week, cursor.weekday, cursor.period);
         return meeting ? { kind: 'openDetail', meeting } : { kind: 'none' };
     }
     return { kind: 'none' };

package/dist/app/views/schedule-render.js

@@ -1,11 +1,12 @@
+import { createTimetableSchedule, } from '@nbtca/nbtcal/timetable';
 import { c, type, space, glyph } from '../../core/theme.js';
 import { pickIcon } from '../../core/icons.js';
 import { t, fmt } from '../../i18n/index.js';
 import { renderListFieldWithContext } from '../fields/list-field.js';
-import { currentWeekNumber, campusWeekday, meetingsOnDay, nextMeeting } from '../../features/schedule-query.js';
 import { renderNextClassBanner, renderWeekGrid, renderUnresolvedItems, renderTodayTimeline, weekdayShortLabel, renderTermDensity, renderMeetingDetail, renderDayTimeline, renderDaySwitcher, } from '../../features/schedule-render.js';
 import { renderEventBrief } from '../../features/calendar.js';
-import { visualWidth, wrapAnsiToVisualWidth } from '../../core/text.js';
+import { sanitizeTerminalLine, visualWidth, wrapAnsiWithIndent } from '../../core/text.js';
+import { localDayDifference, parseLocalDate, parseLocalMonday } from '../../core/calendar-day.js';
 function heading(label) {
     return `${space.indent}${type.heading(label)}`;
 }
@@ -13,10 +14,7 @@ function hint(label) {
     return `${space.indent}${type.hint(label)}`;
 }
 function wrappedIndentedLines(label, cols, style) {
-    const width = Number.isFinite(cols) ? Math.max(1, Math.floor(cols)) : Number.POSITIVE_INFINITY;
-    const indent = visualWidth(space.indent) < width ? space.indent : '';
-    const contentWidth = Math.max(1, width - visualWidth(indent));
-    return wrapAnsiToVisualWidth(style(label), contentWidth).map((part) => `${indent}${part}`);
+    return wrapAnsiWithIndent(style(label), cols, space.indent);
 }
 function headingLines(label, cols) {
     return wrappedIndentedLines(label, cols, type.heading);
@@ -51,8 +49,12 @@ function renderShortcutLines(shortcuts, cols, compact = false) {
     const available = Math.max(1, cols - visualWidth(space.indent));
     const parts = shortcuts.map((shortcut) => {
         const text = compact
-            ? shortcut.showKey === false ? `[${shortcut.key}] ${shortcut.label}` : `[${shortcut.key}]`
-            : shortcut.showKey === false ? `[${shortcut.label}]` : `[${shortcut.key}] ${shortcut.label}`;
+            ? shortcut.showKey === false
+                ? `[${shortcut.key}] ${shortcut.label}`
+                : `[${shortcut.key}]`
+            : shortcut.showKey === false
+                ? `[${shortcut.label}]`
+                : `[${shortcut.key}] ${shortcut.label}`;
         return shortcut.warn ? c.warn(text) : type.hint(text);
     });
     const lines = [];
@@ -76,20 +78,19 @@ function hubPreGridLines(state, now, cols) {
     const tt = state.timetable;
     if (!tt || !state.weekOne)
         return null;
-    const week = currentWeekNumber(state.weekOne, now);
+    const schedule = createTimetableSchedule(tt, { weekOneMonday: state.weekOne });
+    const week = schedule.weekAt(now);
     const lines = [];
-    const banner = renderNextClassBanner(nextMeeting(tt.meetings, tt.periods, state.weekOne, now), now, cols);
-    lines.push(banner || hint(trans.timetable.noNextClass));
+    let next = null;
+    try {
+        next = schedule.next(now);
+    }
+    catch { }
+    const banner = renderNextClassBanner(next, now, cols);
+    lines.push(...(banner ? [banner] : hintLines(trans.timetable.noNextClass, cols)));
     lines.push('');
-    const todayWd = campusWeekday(now);
+    const todayWd = schedule.weekdayAt(now);
     if (week < 1) {
-        // weekOne can be a *future* date -- auto-inferred while on break, it
-        // deliberately points at the upcoming term (see academic-calendar.ts)
-        // so it's ready the moment classes start. There is no "today" to show
-        // yet, but the timetable's real week-1 data is already fetched -- show
-        // it as an explicit preview rather than showing no grid at all
-        // regardless of terminal height. The "Week 1 preview" heading keeps it
-        // unambiguous that this isn't "happening right now".
         lines.push(heading(trans.timetable.termNotStarted));
         lines.push(hint(fmt(trans.timetable.termStartsIn, {
             date: state.weekOne,
@@ -99,49 +100,32 @@ function hubPreGridLines(state, now, cols) {
         lines.push(heading(trans.timetable.termPreviewWeek));
         return { inlineLines: lines, fallbackLines: [...lines], week: 1, tt };
     }
-    const today = meetingsOnDay(tt.meetings, todayWd, week);
+    const today = schedule.meetingsOnDay(week, todayWd);
     const weekHeading = heading(trans.timetable.hubWeek);
     const inlineLines = [
         ...lines,
-        heading(fmt(trans.timetable.todayHeading, { weekday: weekdayShortLabel(todayWd), week: String(week) })),
+        heading(fmt(trans.timetable.todayHeading, {
+            weekday: weekdayShortLabel(todayWd),
+            week: String(week),
+        })),
         ...renderTodayTimeline(today, tt.periods, now, cols).split('\n'),
         weekHeading,
     ];
     return { inlineLines, fallbackLines: [...lines, weekHeading], week, tt };
 }
-// Below this width, even an all-empty grid's own per-column floor (3, plus
-// row-head and separator overhead) leaves each of the 7 columns too cramped
-// to show real content -- a technically-fitting but practically unreadable
-// grid isn't better than the single-day view, so width gates the decision
-// just as much as height does.
 const MIN_GRID_COLS = 100;
-/** The one place that decides "does the real week grid fit inline (plus a
- * floor reserved for the shortcut bar), or does the hub fall back to the
- * single-day view." Both branches represent the exact same gridCursor, just
- * rendered differently, so unlike the old non-interactive strip fallback
- * this decision no longer needs to be exposed to key handling -- arrow
- * keys/Enter are always meaningful in hub mode regardless of which branch is
- * currently on screen. */
 function gridFitsInline(precedingLineCount, tt, week, now, bodyRows, cols, cursor, reservedRows) {
     if (cols < MIN_GRID_COLS)
         return false;
-    const gridLines = renderWeekGrid(tt.meetings, tt.periods, week, now, cols, cursor).split('\n');
+    const gridLines = renderWeekGrid(tt, week, now, cols, cursor).split('\n');
     return precedingLineCount + gridLines.length <= bodyRows - reservedRows;
 }
-/** Renders the full weekday x period grid if it (plus a floor reserved for
- * the shortcut bar) fits within bodyRows and cols, otherwise a single day's
- * detailed timeline -- the day the cursor's own weekday points at (today, by
- * default). A large terminal genuinely has no excuse to not show the whole
- * week; a small one is better served by one day shown properly than seven
- * days crammed into unreadable slivers. Shared by the "this week" and "term
- * hasn't started yet, preview week 1" branches of renderHubBody -- the same
- * measure-and-fallback decision, just against a different week number. */
 function renderAdaptiveWeekGrid(inlineLines, fallbackLines, tt, week, todayWd, now, bodyRows, cols, cursor, reservedRows) {
     if (gridFitsInline(inlineLines.length, tt, week, now, bodyRows, cols, cursor, reservedRows)) {
-        return [...inlineLines, ...renderWeekGrid(tt.meetings, tt.periods, week, now, cols, cursor).split('\n')];
+        return [...inlineLines, ...renderWeekGrid(tt, week, now, cols, cursor).split('\n')];
     }
     const selectedWd = cursor?.weekday ?? todayWd;
-    const dayMeetings = meetingsOnDay(tt.meetings, selectedWd, week);
+    const dayMeetings = createTimetableSchedule(tt).meetingsOnDay(week, selectedWd);
     return [
         ...fallbackLines,
         renderDaySwitcher(selectedWd, todayWd, cols),
@@ -164,7 +148,7 @@ function renderHubBody(state, now, bodyRows, cols) {
         }
         tail.push(...shortcutLines);
         const content = pre
-            ? renderAdaptiveWeekGrid(pre.inlineLines, pre.fallbackLines, pre.tt, pre.week, campusWeekday(now), now, rows, cols, state.gridCursor, tail.length)
+            ? renderAdaptiveWeekGrid(pre.inlineLines, pre.fallbackLines, pre.tt, pre.week, createTimetableSchedule(pre.tt).weekdayAt(now), now, rows, cols, state.gridCursor, tail.length)
             : [];
         return { content, tail };
     };
@@ -174,19 +158,14 @@ function renderHubBody(state, now, bodyRows, cols) {
     const compact = build(renderShortcutLines(shortcuts, cols, true));
     if (compact.tail.length >= rows)
         return rows > 0 ? compact.tail.slice(-rows) : [];
-    return [
-        ...compact.content.slice(0, rows - compact.tail.length),
-        ...compact.tail,
-    ];
+    return [...compact.content.slice(0, rows - compact.tail.length), ...compact.tail];
 }
 const TERM_PROGRESS_WIDTH = 20;
-function renderTermProgressBar(w, now, cols) {
+function renderTermProgressBar(w, cols) {
     if (!w.nextBreakStart)
         return null;
-    const weekOneMs = new Date(`${w.weekOneMonday}T00:00:00`).getTime();
-    const nextBreakMs = new Date(`${w.nextBreakStart}T00:00:00`).getTime();
-    const totalWeeks = Math.max(1, Math.round((nextBreakMs - weekOneMs) / (7 * 86400000)));
-    const currentWeek = currentWeekNumber(w.weekOneMonday, now);
+    const totalWeeks = Math.max(1, Math.round(localDayDifference(parseLocalMonday(w.weekOneMonday), parseLocalDate(w.nextBreakStart)) / 7));
+    const currentWeek = w.currentWeek;
     const labelText = fmt(t().timetable.weekLabel2, { week: `${currentWeek}/${totalWeeks}` });
     const label = type.hint(labelText);
     const width = Number.isFinite(cols) ? Math.max(1, Math.floor(cols)) : Number.POSITIVE_INFINITY;
@@ -203,7 +182,7 @@ function renderTermProgressBar(w, now, cols) {
         : [`${indent}${bar}`, ...hintLines(labelText, cols)];
 }
 function daysBetween(a, b) {
-    return Math.max(0, Math.ceil((b.getTime() - a.getTime()) / 86400000));
+    return Math.max(0, localDayDifference(a, b));
 }
 function renderPublicBody(state, now, bodyRows, cols) {
     const trans = t();
@@ -216,18 +195,18 @@ function renderPublicBody(state, now, bodyRows, cols) {
         lines.push(...hintLines(trans.timetable.publicUnavailable, cols));
     }
     else if (w.status === 'onBreak') {
-        lines.push(...headingLines(fmt(trans.timetable.onBreak, { title: w.breakTitle }), cols));
+        lines.push(...headingLines(fmt(trans.timetable.onBreak, { title: sanitizeTerminalLine(w.breakTitle) }), cols));
     }
     else {
         const semesterLabel = w.semester === '1' ? trans.timetable.semester1 : trans.timetable.semester2;
-        lines.push(...headingLines(`${fmt(trans.timetable.academicYearSuffix, { year: w.academicYear })} · ${semesterLabel} · ${fmt(trans.timetable.weekLabel2, { week: String(w.currentWeek) })}`, cols));
-        const bar = renderTermProgressBar(w, now, cols);
+        lines.push(...headingLines(`${fmt(trans.timetable.academicYearSuffix, { year: sanitizeTerminalLine(w.academicYear) })} · ${semesterLabel} · ${fmt(trans.timetable.weekLabel2, { week: String(w.currentWeek) })}`, cols));
+        const bar = renderTermProgressBar(w, cols);
         if (bar)
             lines.push(...bar);
         if (w.nextBreakStart && w.nextBreakTitle) {
             lines.push(...hintLines(fmt(trans.timetable.daysUntilBreak, {
-                title: w.nextBreakTitle,
-                days: String(daysBetween(now, new Date(`${w.nextBreakStart}T00:00:00`))),
+                title: sanitizeTerminalLine(w.nextBreakTitle),
+                days: String(daysBetween(now, parseLocalDate(w.nextBreakStart))),
             }), cols));
         }
     }
@@ -283,20 +262,17 @@ export function renderSchedule(state, now, bodyRows = 100, cols = 80) {
         case 'week': {
             if (!state.timetable || !state.weekOne)
                 return [hint(trans.timetable.genericError)];
-            const week = currentWeekNumber(state.weekOne, now);
+            const schedule = createTimetableSchedule(state.timetable, {
+                weekOneMonday: state.weekOne,
+            });
+            const week = Math.max(1, schedule.weekAt(now));
             const weekLines = [heading(trans.timetable.hubWeek), ''];
-            // Standalone week mode gets the *whole* bodyRows to itself (no
-            // banner/today-section eating into it first, unlike the hub's own
-            // inline area) -- reached via the `w` shortcut specifically so a
-            // marginal terminal that couldn't fit the grid inline the hub still
-            // gets a real shot at it here, falling back to the single-day view
-            // only if even the full screen isn't enough.
-            return renderAdaptiveWeekGrid(weekLines, weekLines, state.timetable, week, campusWeekday(now), now, bodyRows, cols, state.gridCursor, 2);
+            return renderAdaptiveWeekGrid(weekLines, weekLines, state.timetable, week, schedule.weekdayAt(now), now, bodyRows, cols, state.gridCursor, 2);
         }
         case 'termDensity':
-            return state.timetable && state.weekOne
-                ? renderTermDensity(state.timetable.meetings, state.weekOne, currentWeekNumber(state.weekOne, now), cols).split('\n')
-                : [hint(trans.timetable.genericError)];
+            if (!state.timetable || !state.weekOne)
+                return [hint(trans.timetable.genericError)];
+            return renderTermDensity(state.timetable.meetings, state.weekOne, createTimetableSchedule(state.timetable, { weekOneMonday: state.weekOne }).weekAt(now), cols).split('\n');
         case 'termPicker':
             return state.termField?.render(bodyRows, cols) ?? [];
         case 'unresolved':