Commit `ab6ccec56e`

ab6ccec56eca03d0dadf2c9332aab10c4490eb62

parent: 469ca131b7

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-09 06:15 UTC

Fix agenda log details and make the iOS and Mac agendas match

- Log mode shows the time clocked again (AgendaRow.detail).
- iOS keeps the last calendar checked instead of saving an empty list.
- iOS weeks start on Monday; day headers name Tomorrow and Yesterday
  and grey past days.
- The Mac remembers whether Overdue is collapsed.
- iOS calendar events open Calendar on their day.
- iOS Next Week moves to next Monday.
- iOS Settings has Show days without entries.
- The Mac editor colors TODO keywords by class.

Layout: unified · split

Sources/OrgEditorAppKit/Theme.swift +1 −1

	@@ -89,7 +89,7 @@ struct Theme {
89	if let custom = spec.todo[keyword] {	89	if let custom = spec.todo[keyword] {
90	storage.addAttribute(.foregroundColor, value: Self.dynamic(custom, custom), range: range)	90	storage.addAttribute(.foregroundColor, value: Self.dynamic(custom, custom), range: range)
91	} else {	91	} else {
92	fg(role == .todo ? "todo" : "done")	92	fg(ThemeSpec.TodoClass.of(keyword, isDone: role == .done).key)
93	}	93	}
94	case .priority: fg("priority")	94	case .priority: fg("priority")
95	case .tags: fg("tags")	95	case .tags: fg("tags")

Sources/OrgPresentation/AgendaRows.swift +23

     public let priority: String?
     /// The statistics cookie: `1/3`, `50%`.
     public let progress: String?
+    /// Log mode: the time clocked (`1:30`) or the state set (`DONE`).
+    public let detail: String?
     /// `HHMM` of the start and the end, when timed.
     public let start: Int?
     public let end: Int?
         self.isDone = item.isDone
         self.priority = item.priorityLetter
         self.progress = item.progress
+        self.detail = item.kind == .clock || item.kind == .state ? Self.logDetail(item.extra) : nil
         self.start = timed?.0
         self.end = timed?.1
         self.planningDay = planning
         self.isDone = false
         self.priority = nil
         self.progress = nil
+        self.detail = nil
         self.start = start
         self.end = end
         self.planningDay = nil
     }
     static let rangeDay = try! NSRegularExpression(pattern: "^\\(([0-9]+/[0-9]+)\\)")
+    static let logParen = try! NSRegularExpression(pattern: "\\(([^)]+)\\)")
     static let rangeEnd = try! NSRegularExpression(pattern: "-\\+?([0-9]{1,2}):([0-9]{2})")
+    /// The text in parentheses of a log row's `extra`: `Clocked:   (1:30)`.
+    static func logDetail(_ extra: String) -> String? {
+        let ns = extra as NSString
+        guard let m = logParen.firstMatch(in: extra, range: NSRange(location: 0, length: ns.length)) else { return nil }
+        let text = ns.substring(with: m.range(at: 1)).trimmingCharacters(in: .whitespaces)
+        return text.isEmpty ? nil : text
+    }
     /// The end of a `%t` time range (` 9:00-10:30`), as `HHMM`; past midnight (`+1:00`) adds 24 hours.
     static func endTime(_ time: String) -> Int? {
         let ns = time as NSString
     public var id: Int { day }
     public var isEmpty: Bool { overdue.isEmpty && rows.isEmpty }
+    /// `Today`, `Tomorrow`, `Yesterday`, or nil.
+    public func relativeName(today: Int) -> String? {
+        switch day - today {
+        case 0: "Today"
+        case 1: "Tomorrow"
+        case -1: "Yesterday"
+        default: nil
+        }
+    }
     /// Midnight starting the day.
     public func date(calendar: Calendar) -> Date {
         let d = Days.date(day)

Sources/Orgstar/AgendaView.swift +3 −12

     @State private var spanKind: AgendaSpan?
     @State private var showingDatePicker = false
     @State private var pickedDate = Date()
-    @State private var overdueShown = true
+    @AppStorage("agendaOverdueExpanded") private var overdueShown = true
     @State private var hovered: String?
     @FocusState private var focused: Bool
     @AppStorage("agendaSpan") private var span = 10
         let past = group.day < agenda.today
         let color = group.isToday ? todayColor : past ? Color.secondary : theme.color("agenda-date") ?? .primary
         return header {
-            if let relative = Self.relativeName(group.day, today: agenda.today) {
+            if let relative = group.relativeName(today: agenda.today) {
                 Text(relative)
                     .font(.system(size: 13, weight: .bold))
                     .foregroundStyle(color)
         return formatter.string(from: date(day))
     }
-    static func relativeName(_ day: Int, today: Int) -> String? {
-        switch day - today {
-        case 0: "Today"
-        case 1: "Tomorrow"
-        case -1: "Yesterday"
-        default: nil
-        }
-    }
     static func hhmm(_ date: Date) -> Int {
         let c = Calendar.current.dateComponents([.hour, .minute], from: date)
         return (c.hour ?? 0) * 100 + (c.minute ?? 0)
                 .foregroundStyle(row.isDone ? AnyShapeStyle(.secondary) : AnyShapeStyle(theme.color("foreground") ?? .primary))
                 .lineLimit(1)
                 .truncationMode(.tail)
-            if let progress = row.progress {
+            ForEach([row.progress, row.detail].compactMap { $0 }, id: \.self) { progress in
                 Text(progress)
                     .font(.system(size: 10, weight: .semibold).monospacedDigit())
                     .foregroundStyle(.secondary)

Sources/OrgstarMobile/AgendaScreen.swift +16 −6

     @Environment(ClockModel.self) private var clock
     @Environment(MobileModel.self) private var model
     @Environment(\.colorScheme) private var colorScheme
+    @Environment(\.openURL) private var openURL
     @State private var tick = 0
     /// The time the now line shows, kept to the minute while the agenda is open.
     @State private var now = Date()
     private func header(_ group: AgendaDayGroup) -> some View {
         let day = date(group.day).formatted(.dateTime.weekday(.abbreviated).day().month(.abbreviated))
+        let color = group.isToday ? todayColor : group.day < agenda.today ? Color.secondary : themed(theme.color("agenda-date", dark: isDark), .primary)
         return HStack(alignment: .firstTextBaseline) {
-            Text(group.isToday ? "Today · " + day : day)
+            Text(group.relativeName(today: agenda.today).map { $0 + " · " + day } ?? day)
                 .font(.subheadline.weight(group.isToday ? .bold : .semibold))
-                .foregroundStyle(group.isToday ? todayColor : .primary)
+                .foregroundStyle(color)
             Spacer()
             Button("Add to \(day)", systemImage: "plus.circle") { model.captureRequest = CaptureRequest(day: group.day) }
                 .labelStyle(.iconOnly)
     }
     private func weekStart(_ day: Int) -> Int {
-        day - (Days.weekday(day) - (Calendar.current.firstWeekday - 1) + 7) % 7
+        day - (Days.weekday(day) + 6) % 7
     }
     /// Shows `range` around `day`; nil returns to the configured span.
         Group {
             if let item = row.item, let path = item.path, let offset = item.headingOffset ?? item.markerOffset {
                 NavigationLink(value: ReaderRoute.offset(path, offset)) { AgendaRowView(row: row, day: day, theme: theme, dark: isDark) }
+            } else if let event = row.event {
+                // Calendar can't be asked for one event by URL; it opens on the event's day.
+                Button {
+                    if let url = URL(string: "calshow:\(event.start.timeIntervalSinceReferenceDate)") { openURL(url) }
+                } label: {
+                    AgendaRowView(row: row, day: day, theme: theme, dark: isDark)
+                }
+                .tint(.primary)
             } else {
                 AgendaRowView(row: row, day: day, theme: theme, dark: isDark)
             }
         .swipeActions(edge: .leading) {
             if canReschedule(row), let item = row.item {
                 Button("Tomorrow", systemImage: "sunrise") { reschedule(row, item, to: agenda.today + 1) }.tint(.orange)
-                Button("Next Week", systemImage: "calendar.badge.plus") { reschedule(row, item, to: agenda.today + 7) }.tint(.indigo)
+                Button("Next Week", systemImage: "calendar.badge.plus") { reschedule(row, item, to: weekStart(agenda.today) + 7) }.tint(.indigo)
                 Button("Pick Date", systemImage: "calendar") { rescheduling = row }.tint(.gray)
             }
         }
                 if canReschedule(row) {
                     Menu("Reschedule", systemImage: "calendar.badge.clock") {
                         Button("Tomorrow") { reschedule(row, item, to: agenda.today + 1) }
-                        Button("Next Week") { reschedule(row, item, to: agenda.today + 7) }
+                        Button("Next Week") { reschedule(row, item, to: weekStart(agenda.today) + 7) }
                         Button("Pick Date…") { rescheduling = row }
                     }
                 }
                         Circle().fill(categoryColor).frame(width: 7, height: 7)
                         Text(row.category).lineLimit(1).layoutPriority(1)
                     }
-                    if let progress = row.progress {
+                    ForEach([row.progress, row.detail].compactMap { $0 }, id: \.self) { progress in
                         Text(progress).monospacedDigit()
                             .padding(.horizontal, 5)
                             .background(.quaternary.opacity(0.7), in: Capsule())

Sources/OrgstarMobile/SettingsScreen.swift +11 −2

             } footer: {
                 Text("A folder with config.toml and capture.toml, such as a synced copy of ~/.config/orgstar from your Mac. Changes to them apply as they sync.")
             }
+            Section("Agenda") {
+                let _ = model.settingsVersion
+                Toggle("Show days without entries", isOn: Binding {
+                    OrgPreferences.agendaShowAllDates()
+                } set: { model.set("agendaShowAllDates", to: .bool($0)) })
+            }
             calendarSection
             Section("In use") {
                 let _ = model.settingsVersion
     }
     /// Shows or hides a calendar's events; with every calendar checked the setting is empty.
+    /// The last checked calendar stays checked, as an empty list means every calendar.
     private func toggle(_ title: String, shown: Bool, chosen: [String]) {
-        var titles = chosen.isEmpty ? calendars.map(\.title) : chosen
+        var titles = calendars.filter { CalendarEvents.chooses(id: $0.id, title: $0.title, chosen: chosen) }.map(\.title)
-        if shown { titles.removeAll { $0 == title } } else { titles.append(title) }
+        titles.removeAll { $0 == title }
+        if !shown { titles.append(title) }
+        guard !titles.isEmpty else { return }
         let value = Set(titles) == Set(calendars.map(\.title)) ? "" : titles.joined(separator: ", ")
         model.set("calendarEventCalendars", to: .string(value))
     }

Tests/OrgPresentationTests/AgendaRowsTests.swift +20

	@@ -86,6 +86,26 @@ struct AgendaRowsTests {
86	#expect(!rent.isEvent && rent.item != nil)	86	#expect(!rent.isEvent && rent.item != nil)
87	}	87	}
88		88
		89	@Test func logRowsKeepTheDurationAndState() {
		90	let text = """
		91	* DONE Write report
		92	CLOSED: [2026-10-05 Mon 11:00]
		93	:LOGBOOK:
		94	- State "DONE" from "TODO" [2026-10-05 Mon 11:00]
		95	CLOCK: [2026-10-05 Mon 09:00]--[2026-10-05 Mon 10:30] => 1:30
		96	:END:
		97	"""
		98	var options = AgendaOptions()
		99	options.logMode = true
		100	options.logItems = ["closed", "clock", "state"]
		101	let source = AgendaSource(path: "w.org", text: text, defaults: OrgSettings.default.withTodoKeywords("TODO \| DONE")!)
		102	let items = Agenda.list([source], start: Self.today, days: 1, today: Self.today, now: (12, 0), options: options)[0].items
		103	let rows = items.compactMap { AgendaRow(item: $0, day: Self.today, today: Self.today) }
		104	#expect(rows.first { $0.item?.kind == .clock }?.detail == "1:30")
		105	#expect(rows.first { $0.item?.kind == .state }?.detail == "DONE")
		106	#expect(rows.first { $0.item?.kind == .closed }?.detail == nil)
		107	}
		108
89	@Test func guttersOnOtherDays() {	109	@Test func guttersOnOtherDays() {
90	let later = Self.rows(day: Self.today + 4)	110	let later = Self.rows(day: Self.today + 4)
91	#expect(later["Renew passport"]?.gutter == "Due" && later["Renew passport"]?.status == .normal)	111	#expect(later["Renew passport"]?.gutter == "Due" && later["Renew passport"]?.status == .normal)

docs/manual/guide/07-agenda.org +7 −7

docs/manual/guide/13-configuration.org +1 −1

	@@ -493,7 +493,7 @@ A keyword without its own color takes its class's color. Case doesn't matter in
493	\| Other open \| =todo= \| Any other keyword that isn't done \|	493	\| Other open \| =todo= \| Any other keyword that isn't done \|
494	\| Other done \| =done= \| Any other done keyword \|	494	\| Other done \| =done= \| Any other done keyword \|
495		495
496	The classes color keywords in the agenda and its widgets on both platforms, and in the iOS editor and reader. The Mac editor colors keywords with =todo= and =done= only.	496	The classes color keywords in the editors, the iOS reader, the agenda and its widgets.
497		497
498	A category without its own color gets a hue worked out from its name, the same on every run and device, at a lightness that reads on the appearance's background.	498	A category without its own color gets a hue worked out from its name, the same on every run and device, at a lightness that reads on the appearance's background.
499		499

docs/manual/guide/14-ios.org +3 −2

 - + on a day's header :: captures an entry scheduled on that day (see [[file:08-capture.org][Capture]]).
 - Tap :: an entry to read it, at its heading.
 - Swipe left :: on a TODO entry for Done, which sets the first done keyword of its sequence, or Next State.
-- Swipe right :: for Tomorrow, Next Week or Pick Date, which move the entry's scheduled date, or its deadline on a deadline row.
+- Swipe right :: for Tomorrow, Next Week (next Monday) or Pick Date, which move the entry's scheduled date, or its deadline on a deadline row.
 - Touch and hold :: an entry for TODO State…, Reschedule, Schedule…, Deadline…, Tags…, Priority…, Clock In, Refile…, and Archive….
 Commands from the agenda change the file directly when it isn't open, and through the editor when it is. If the heading changed since the agenda was built, nothing runs.
 Stop Using This Folder returns every setting to its default.
-The Calendar section is the one place the app changes a setting itself:
+The Agenda and Calendar sections are the only places the app changes a setting itself:
+- Show days without entries :: turns =org-agenda-show-all-dates= on or off.
 - Show Calendar Events :: turns on =calendar-events=, and asks for access to your calendars. iOS asks for full access, as Calendar has no read-only level; Orgstar only reads. While access is missing the section shows Allow Access to Calendars…; if you declined, allow it in the Settings app under Privacy & Security ▸ Calendars.
 - The calendars :: tap one to show or hide its events (=calendar-event-calendars=). With every calendar checked the setting is empty, so calendars added later show too.

	@@ -106,13 +106,13 @@ A time can come from the timestamp (=<2026-10-05 Mon 14:00-15:30>=) or from the
106		106
107	** Today, overdue entries and empty days	107	** Today, overdue entries and empty days
108		108
109	Days without entries are left out. Today always shows, with =Nothing scheduled= when it has no entries. To show every day of the span, as Org does by default, turn on Settings ▸ Agenda ▸ Show days without entries, or set this in =config.toml=:	109	Days without entries are left out. Today always shows, with =Nothing scheduled= when it has no entries. To show every day of the span, as Org does by default, turn on Settings ▸ Agenda ▸ Show days without entries (on iOS, Settings ▸ Agenda), or set this in =config.toml=:
110		110
111	#+BEGIN_SRC toml	111	#+BEGIN_SRC toml
112	org-agenda-show-all-dates = true	112	org-agenda-show-all-dates = true
113	#+END_SRC	113	#+END_SRC
114		114
115	Today's past deadlines and entries scheduled on earlier days, habits excepted, go in a group headed =Overdue= with their count, above today's other entries. The oldest date comes first; entries with the same date keep Org's order. Click or tap the header to collapse or expand the group.	115	Today's past deadlines and entries scheduled on earlier days, habits excepted, go in a group headed =Overdue= with their count, above today's other entries. The oldest date comes first; entries with the same date keep Org's order. Click or tap the header to collapse or expand the group; it stays as you left it.
116		116
117	On today, a line marked with the current time sits between the timed entries: before the first entry that starts later, or after the last one when all have started. It shows only when today has timed entries, as Org's =now= line does. Org's time grid (the lines at 8:00, 10:00 and so on) isn't shown.	117	On today, a line marked with the current time sits between the timed entries: before the first entry that starts later, or after the last one when all have started. It shows only when today has timed entries, as Org's =now= line does. Org's time grid (the lines at 8:00, 10:00 and so on) isn't shown.
118		118
	@@ -125,7 +125,7 @@ Days are sorted as =org-agenda-sorting-strategy= sorts them by default for the a
125	Press =l= to turn log mode (=org-agenda-log-mode=) on or off. Each day then also shows:	125	Press =l= to turn log mode (=org-agenda-log-mode=) on or off. Each day then also shows:
126		126
127	- =Closed= entries whose =CLOSED:= timestamp is on that day;	127	- =Closed= entries whose =CLOSED:= timestamp is on that day;
128	- =Clocked= entries for each =CLOCK:= line that starts on that day, with the clock's start and end times in the left column.	128	- =Clocked= entries for each =CLOCK:= line that starts on that day, with the clock's start and end times in the left column and the time clocked, such as =1:30=, after the title.
129		129
130	A note under a clock line (a list item directly below it) is added to the title after a =-=. These are the default =org-agenda-log-mode-items=, =(closed clock)=; state changes are not shown and there is no setting for that.	130	A note under a clock line (a list item directly below it) is added to the title after a =-=. These are the default =org-agenda-log-mode-items=, =(closed clock)=; state changes are not shown and there is no setting for that.
131		131
	@@ -530,14 +530,14 @@ The board is not available on iOS.
530	The Agenda tab shows the same views from the same files, using the settings in the synced =config.toml= and the views in =views.toml= (see [[file:14-ios.org][iOS]]). Differences from the Mac:	530	The Agenda tab shows the same views from the same files, using the settings in the synced =config.toml= and the views in =views.toml= (see [[file:14-ios.org][iOS]]). Differences from the Mac:
531		531
532	- The Views menu, at the top left, lists the built-in views, your saved views, and Tags and Properties…, which asks for a match string. There is no TODO-only match from the menu; use =/!= in the match or a =todo-match= view.	532	- The Views menu, at the top left, lists the built-in views, your saved views, and Tags and Properties…, which asks for a match string. There is no TODO-only match from the menu; use =/!= in the match or a =todo-match= view.
533	- A bar floats at the bottom of the screen with Earlier, Filter, Today, Go to Date, the span and Later. The span menu switches between Day, Week, Month and the configured span (=10 Days= by default). Weeks start on the first day of the week in the device's region settings. In the TODO list and match views the bar has Filter and Agenda, which returns to the day view. Messages show above the bar; tap one to dismiss it.	533	- A bar floats at the bottom of the screen with Earlier, Filter, Today, Go to Date, the span and Later. The span menu switches between Day, Week, Month and the configured span (=10 Days= by default). Weeks start on Monday, as on the Mac. In the TODO list and match views the bar has Filter and Agenda, which returns to the day view. Messages show above the bar; tap one to dismiss it.
534	- The title names the days shown: =Thu 8 Oct=, =Week of 5 Oct=, =October 2026=, or =5 Oct – 14 Oct=.	534	- The title names the days shown: =Thu 8 Oct=, =Week of 5 Oct=, =October 2026=, or =5 Oct – 14 Oct=.
535	- Day headers read =Today · Thu 8 Oct= or =Fri 9 Oct=, with a + that captures onto that day. The Overdue group stays collapsed or expanded as you left it.	535	- Day headers read =Today · Thu 8 Oct=, =Tomorrow · Fri 9 Oct= or =Mon 12 Oct=, with a + that captures onto that day. Days before today are grey.
536	- Pull down to refresh.	536	- Pull down to refresh.
537	- The Filter button opens a sheet: type a filter as for =/=, or tap a tag or category to cycle between Keep, Leave out and no filter.	537	- The Filter button opens a sheet: type a filter as for =/=, or tap a tag or category to cycle between Keep, Leave out and no filter.
538	- Tap an entry to open it. Calendar events don't open.	538	- Tap an entry to open it. Tap a calendar event to open Calendar on the event's day; iOS can't open Calendar at one event.
539	- Swipe left on an open TODO entry for Done, which sets the first done keyword of its sequence, and Next State, which moves to the next keyword. The sequence is the one the file defines: the default keywords from =config.toml=, the file's own =#+TODO= lines, and those of its setup files, with unsaved edits in an open buffer included.	539	- Swipe left on an open TODO entry for Done, which sets the first done keyword of its sequence, and Next State, which moves to the next keyword. The sequence is the one the file defines: the default keywords from =config.toml=, the file's own =#+TODO= lines, and those of its setup files, with unsaved edits in an open buffer included.
540	- Swipe right on a scheduled entry, a deadline, a habit or a TODO entry, when it isn't done, for Tomorrow, Next Week and Pick Date. Tomorrow and Next Week are one day and seven days after today. On a deadline row these move the deadline; on other rows they set the scheduled date. A timed row keeps its times.	540	- Swipe right on a scheduled entry, a deadline, a habit or a TODO entry, when it isn't done, for Tomorrow, Next Week and Pick Date. Tomorrow is the day after today and Next Week is next Monday. On a deadline row these move the deadline; on other rows they set the scheduled date. A timed row keeps its times.
541	- Touch and hold an entry for TODO State…, Reschedule (Tomorrow, Next Week, Pick Date…), Schedule…, Deadline…, Tags…, Priority…, Clock In, Refile… and Archive….	541	- Touch and hold an entry for TODO State…, Reschedule (Tomorrow, Next Week, Pick Date…), Schedule…, Deadline…, Tags…, Priority…, Clock In, Refile… and Archive….
542	- Marking an entry done and rescheduling one give haptic feedback.	542	- Marking an entry done and rescheduling one give haptic feedback.
543	- There are no keyboard commands, log mode or bulk marks.	543	- There are no keyboard commands, log mode or bulk marks.

Commit ab6ccec56e

Commit `ab6ccec56e`