Replace schedule meetings with Google Classroom to-do.

Switch the schedule sections to load and render Classroom assignments/quizzes for the signed-in user, add required Classroom OAuth scopes, and handle re-consent when legacy tokens are missing new scopes.

Made-with: Cursor

classroom_app/Auth/GoogleOAuthService.swift

@@ -43,7 +43,10 @@ final class GoogleOAuthService: NSObject {
         "openid",
         "email",
         "profile",
-        "https://www.googleapis.com/auth/calendar.events"
+        "https://www.googleapis.com/auth/calendar.events",
+        // Classroom To-do (assignments/quizzes)
+        "https://www.googleapis.com/auth/classroom.courses.readonly",
+        "https://www.googleapis.com/auth/classroom.coursework.me.readonly"
     ]
 
     private let tokenStore = KeychainTokenStore()

classroom_app/Google/GoogleClassroomClient.swift

@@ -0,0 +1,210 @@
+import Foundation
+
+enum GoogleClassroomClientError: Error {
+    case invalidResponse
+    case httpStatus(Int, String)
+    case decodeFailed(String)
+}
+
+/// Minimal Google Classroom REST wrapper for a student's to-do list.
+final class GoogleClassroomClient {
+    struct Options: Sendable {
+        var maxCourses: Int
+        var maxCourseWorkPerCourse: Int
+
+        init(maxCourses: Int = 20, maxCourseWorkPerCourse: Int = 50) {
+            self.maxCourses = maxCourses
+            self.maxCourseWorkPerCourse = maxCourseWorkPerCourse
+        }
+    }
+
+    private let session: URLSession
+
+    init(session: URLSession = .shared) {
+        self.session = session
+    }
+
+    func fetchTodo(accessToken: String, options: Options? = nil) async throws -> [ClassroomTodoItem] {
+        let resolvedOptions = options ?? Options()
+        let courses = try await listActiveCourses(accessToken: accessToken, pageSize: resolvedOptions.maxCourses)
+        if courses.isEmpty { return [] }
+
+        var todos: [ClassroomTodoItem] = []
+        todos.reserveCapacity(courses.count * 8)
+
+        for course in courses.prefix(max(1, resolvedOptions.maxCourses)) {
+            let courseWork = try await listPublishedCourseWork(
+                accessToken: accessToken,
+                courseId: course.id,
+                pageSize: resolvedOptions.maxCourseWorkPerCourse
+            )
+            for work in courseWork {
+                let due = work.resolvedDueDate
+                let link = work.alternateLink.flatMap(URL.init(string:))
+                let workType = ClassroomTodoWorkType(rawValue: work.workType ?? "") ?? .unspecified
+                todos.append(
+                    ClassroomTodoItem(
+                        id: "\(course.id)::\(work.id ?? UUID().uuidString)",
+                        courseId: course.id,
+                        courseName: course.name ?? "Course",
+                        title: (work.title?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false) ? (work.title ?? "Untitled") : "Untitled",
+                        dueDate: due,
+                        alternateLink: link,
+                        workType: workType
+                    )
+                )
+            }
+        }
+
+        // Keep only items with a due date near-term first; undated items at end.
+        todos.sort {
+            switch ($0.dueDate, $1.dueDate) {
+            case let (a?, b?):
+                if a != b { return a < b }
+                return $0.courseName < $1.courseName
+            case (_?, nil):
+                return true
+            case (nil, _?):
+                return false
+            case (nil, nil):
+                if $0.courseName != $1.courseName { return $0.courseName < $1.courseName }
+                return $0.title < $1.title
+            }
+        }
+        return todos
+    }
+
+    // MARK: - Courses
+
+    private func listActiveCourses(accessToken: String, pageSize: Int) async throws -> [Course] {
+        var components = URLComponents(string: "https://classroom.googleapis.com/v1/courses")!
+        components.queryItems = [
+            URLQueryItem(name: "studentId", value: "me"),
+            URLQueryItem(name: "courseStates", value: "ACTIVE"),
+            URLQueryItem(name: "pageSize", value: String(max(1, min(100, pageSize))))
+        ]
+
+        var request = URLRequest(url: components.url!)
+        request.httpMethod = "GET"
+        request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
+
+        let (data, response) = try await session.data(for: request)
+        guard let http = response as? HTTPURLResponse else { throw GoogleClassroomClientError.invalidResponse }
+        guard (200..<300).contains(http.statusCode) else {
+            let body = String(data: data, encoding: .utf8) ?? "<no body>"
+            throw GoogleClassroomClientError.httpStatus(http.statusCode, body)
+        }
+
+        let decoded: CoursesList
+        do {
+            decoded = try JSONDecoder().decode(CoursesList.self, from: data)
+        } catch {
+            let raw = String(data: data, encoding: .utf8) ?? "<unreadable body>"
+            throw GoogleClassroomClientError.decodeFailed(raw)
+        }
+        return decoded.courses ?? []
+    }
+
+    // MARK: - CourseWork
+
+    private func listPublishedCourseWork(accessToken: String, courseId: String, pageSize: Int) async throws -> [CourseWork] {
+        var components = URLComponents(string: "https://classroom.googleapis.com/v1/courses/\(courseId)/courseWork")!
+        components.queryItems = [
+            URLQueryItem(name: "courseWorkStates", value: "PUBLISHED"),
+            URLQueryItem(name: "orderBy", value: "dueDate desc"),
+            URLQueryItem(name: "pageSize", value: String(max(1, min(100, pageSize))))
+        ]
+
+        var request = URLRequest(url: components.url!)
+        request.httpMethod = "GET"
+        request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
+
+        let (data, response) = try await session.data(for: request)
+        guard let http = response as? HTTPURLResponse else { throw GoogleClassroomClientError.invalidResponse }
+        guard (200..<300).contains(http.statusCode) else {
+            let body = String(data: data, encoding: .utf8) ?? "<no body>"
+            throw GoogleClassroomClientError.httpStatus(http.statusCode, body)
+        }
+
+        let decoded: CourseWorkList
+        do {
+            decoded = try JSONDecoder().decode(CourseWorkList.self, from: data)
+        } catch {
+            let raw = String(data: data, encoding: .utf8) ?? "<unreadable body>"
+            throw GoogleClassroomClientError.decodeFailed(raw)
+        }
+        return decoded.courseWork ?? []
+    }
+}
+
+extension GoogleClassroomClientError: LocalizedError {
+    var errorDescription: String? {
+        switch self {
+        case .invalidResponse:
+            return "Google Classroom returned an invalid response."
+        case let .httpStatus(status, body):
+            return "Google Classroom API error (\(status)): \(body)"
+        case let .decodeFailed(raw):
+            return "Failed to parse Google Classroom response: \(raw)"
+        }
+    }
+}
+
+// MARK: - REST models (minimal)
+
+private struct CoursesList: Decodable {
+    let courses: [Course]?
+    let nextPageToken: String?
+}
+
+private struct Course: Decodable {
+    let id: String
+    let name: String?
+}
+
+private struct CourseWorkList: Decodable {
+    let courseWork: [CourseWork]?
+    let nextPageToken: String?
+}
+
+private struct CourseWork: Decodable {
+    let id: String?
+    let title: String?
+    let alternateLink: String?
+    let workType: String?
+    let dueDate: DateParts?
+    let dueTime: TimeOfDay?
+
+    var resolvedDueDate: Date? {
+        guard let dueDate else { return nil }
+        var comps = DateComponents()
+        comps.calendar = Calendar.current
+        comps.timeZone = TimeZone.current
+        comps.year = dueDate.year
+        comps.month = dueDate.month
+        comps.day = dueDate.day
+        if let dueTime {
+            comps.hour = dueTime.hours
+            comps.minute = dueTime.minutes
+            comps.second = dueTime.seconds
+        } else {
+            comps.hour = 23
+            comps.minute = 59
+            comps.second = 0
+        }
+        return comps.date
+    }
+}
+
+private struct DateParts: Decodable {
+    let year: Int?
+    let month: Int?
+    let day: Int?
+}
+
+private struct TimeOfDay: Decodable {
+    let hours: Int?
+    let minutes: Int?
+    let seconds: Int?
+    let nanos: Int?
+}

classroom_app/Models/ClassroomTodoItem.swift

@@ -0,0 +1,30 @@
+import Foundation
+
+enum ClassroomTodoWorkType: String, Codable, Equatable {
+    case assignment = "ASSIGNMENT"
+    case shortAnswerQuestion = "SHORT_ANSWER_QUESTION"
+    case multipleChoiceQuestion = "MULTIPLE_CHOICE_QUESTION"
+    case unspecified = "COURSE_WORK_TYPE_UNSPECIFIED"
+
+    var displayName: String {
+        switch self {
+        case .assignment:
+            return "Assignment"
+        case .shortAnswerQuestion, .multipleChoiceQuestion:
+            return "Quiz"
+        case .unspecified:
+            return "Coursework"
+        }
+    }
+}
+
+struct ClassroomTodoItem: Identifiable, Equatable {
+    let id: String
+    let courseId: String
+    let courseName: String
+    let title: String
+    let dueDate: Date?
+    let alternateLink: URL?
+    let workType: ClassroomTodoWorkType
+}
+

classroom_app/ViewController.swift

@@ -272,6 +272,7 @@ final class ViewController: NSViewController {
     private var inAppBrowserWindowController: InAppBrowserWindowController?
     private let googleOAuth = GoogleOAuthService.shared
     private let calendarClient = GoogleCalendarClient()
+    private let classroomClient = GoogleClassroomClient()
     private let storeKitCoordinator = StoreKitCoordinator()
     private var storeKitStartupTask: Task<Void, Never>?
     private var paywallPurchaseTask: Task<Void, Never>?
@@ -285,7 +286,7 @@ final class ViewController: NSViewController {
     private var launchPaywallWorkItem: DispatchWorkItem?
     private var hasViewAppearedOnce = false
     private var lastKnownPremiumAccess = false
-    private var displayedScheduleMeetings: [ScheduledMeeting] = []
+    private var displayedScheduleTodos: [ClassroomTodoItem] = []
     private var appUsageSessionStartDate: Date?
     private var hasObservedAppLifecycleForUsage = false
     private var premiumUpgradeRatingPromptWorkItem: DispatchWorkItem?
@@ -326,11 +327,12 @@ final class ViewController: NSViewController {
     private var scheduleProfileImageTask: Task<Void, Never>?
     private var googleAccountPopover: NSPopover?
     private var scheduleCachedMeetings: [ScheduledMeeting] = []
+    private var scheduleCachedTodos: [ClassroomTodoItem] = []
 
     private var schedulePageFilter: SchedulePageFilter = .all
     private var schedulePageFromDate: Date = Calendar.current.startOfDay(for: Date())
     private var schedulePageToDate: Date = Calendar.current.startOfDay(for: Date())
-    private var schedulePageFilteredMeetings: [ScheduledMeeting] = []
+    private var schedulePageFilteredTodos: [ClassroomTodoItem] = []
     private var schedulePageVisibleCount: Int = 0
     private let schedulePageBatchSize: Int = 6
     private let schedulePageCardsPerRow: Int = 3
@@ -1371,7 +1373,7 @@ private extension ViewController {
 
     private func refreshScheduleCardsForPremiumStateChange() {
         if let stack = scheduleCardsStack {
-            renderScheduleCards(into: stack, meetings: displayedScheduleMeetings)
+            renderScheduleCards(into: stack, todos: displayedScheduleTodos)
         }
         applySchedulePageFiltersAndRender()
     }
@@ -2123,7 +2125,7 @@ private extension ViewController {
         contentStack.addArrangedSubview(dateHeading)
         contentStack.setCustomSpacing(joinPageDateToMeetingCardsSpacing, after: dateHeading)
 
-        let cardsRow = scheduleCardsRow(meetings: [])
+        let cardsRow = scheduleCardsRow(todos: [])
         contentStack.addArrangedSubview(cardsRow)
 
         panel.addSubview(contentStack)
@@ -3265,7 +3267,7 @@ private extension ViewController {
         row.distribution = .fill
         row.spacing = 12
 
-        row.addArrangedSubview(textLabel("Schedule", font: typography.sectionTitleBold, color: palette.textPrimary))
+        row.addArrangedSubview(textLabel("To-do", font: typography.sectionTitleBold, color: palette.textPrimary))
 
         let spacer = NSView()
         spacer.translatesAutoresizingMaskIntoConstraints = false
@@ -3295,7 +3297,7 @@ private extension ViewController {
         titleRow.distribution = .fill
         titleRow.spacing = 0
 
-        let titleLabel = textLabel("Schedule", font: typography.pageTitle, color: palette.textPrimary)
+        let titleLabel = textLabel("To-do", font: typography.pageTitle, color: palette.textPrimary)
         titleLabel.alignment = .left
         titleLabel.userInterfaceLayoutDirection = .leftToRight
         titleLabel.maximumNumberOfLines = 1
@@ -3309,10 +3311,7 @@ private extension ViewController {
         titleRowSpacer.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
 
         titleRow.addArrangedSubview(titleLabel)
-        if googleOAuth.loadTokens() != nil && storeKitCoordinator.hasPremiumAccess {
-            titleRow.addArrangedSubview(makeSchedulePageAddButton())
-            titleRow.setCustomSpacing(12, after: titleLabel)
-        }
+        // To-do items are read-only from Classroom.
         titleRow.addArrangedSubview(titleRowSpacer)
         container.addArrangedSubview(titleRow)
 
@@ -3725,7 +3724,7 @@ private extension ViewController {
         return button
     }
 
-    func scheduleCardsRow(meetings: [ScheduledMeeting]) -> NSView {
+    func scheduleCardsRow(todos: [ClassroomTodoItem]) -> NSView {
         let cardWidth: CGFloat = 240
         let cardsPerViewport: CGFloat = 3
         let viewportWidth = (cardWidth * cardsPerViewport) + (12 * (cardsPerViewport - 1))
@@ -3774,7 +3773,7 @@ private extension ViewController {
             row.heightAnchor.constraint(equalToConstant: 150)
         ])
 
-        renderScheduleCards(into: row, meetings: meetings)
+        renderScheduleCards(into: row, todos: todos)
         wrapper.addArrangedSubview(scroll)
         let rightButton = makeScheduleScrollButton(systemSymbol: "chevron.right", action: #selector(scheduleScrollRightPressed(_:)))
         scheduleScrollRightButton = rightButton
@@ -3785,7 +3784,7 @@ private extension ViewController {
         return wrapper
     }
 
-    func scheduleCard(meeting: ScheduledMeeting, useFlexibleWidth: Bool = false, contentHeight: CGFloat = 150) -> NSView {
+    func scheduleCard(todo: ClassroomTodoItem, useFlexibleWidth: Bool = false, contentHeight: CGFloat = 150) -> NSView {
         let cardWidth: CGFloat = 240
 
         let card = roundedContainer(cornerRadius: 12, color: palette.sectionCard)
@@ -3807,7 +3806,17 @@ private extension ViewController {
         icon.heightAnchor.constraint(equalToConstant: 28).isActive = true
         let iconView = NSImageView()
         iconView.translatesAutoresizingMaskIntoConstraints = false
-        iconView.image = NSImage(systemSymbolName: "book.closed.fill", accessibilityDescription: "Class event")
+        let iconSymbolName: String = {
+            switch todo.workType {
+            case .assignment:
+                return "doc.text.fill"
+            case .shortAnswerQuestion, .multipleChoiceQuestion:
+                return "checkmark.seal.fill"
+            case .unspecified:
+                return "book.closed.fill"
+            }
+        }()
+        iconView.image = NSImage(systemSymbolName: iconSymbolName, accessibilityDescription: "Classroom to-do")
         iconView.symbolConfiguration = NSImage.SymbolConfiguration(pointSize: 18, weight: .semibold)
         iconView.contentTintColor = .white
         icon.addSubview(iconView)
@@ -3816,18 +3825,18 @@ private extension ViewController {
             iconView.centerYAnchor.constraint(equalTo: icon.centerYAnchor)
         ])
 
-        let title = textLabel(meeting.title, font: typography.cardTitle, color: palette.textPrimary)
+        let title = textLabel(todo.title, font: typography.cardTitle, color: palette.textPrimary)
         title.lineBreakMode = .byTruncatingTail
         title.maximumNumberOfLines = 1
         title.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-        let subtitle = textLabel(meeting.subtitle ?? "Google Calendar", font: typography.cardSubtitle, color: palette.textPrimary)
-        let time = textLabel(scheduleTimeText(for: meeting), font: typography.cardTime, color: palette.textSecondary)
-        let duration = textLabel(scheduleDurationText(for: meeting), font: NSFont.systemFont(ofSize: 11, weight: .medium), color: palette.textMuted)
+        let subtitle = textLabel(todo.courseName, font: typography.cardSubtitle, color: palette.textPrimary)
+        let time = textLabel(todoDueText(for: todo), font: typography.cardTime, color: palette.textSecondary)
+        let duration = textLabel(todo.workType.displayName, font: NSFont.systemFont(ofSize: 11, weight: .medium), color: palette.textMuted)
         let dayChip = roundedContainer(cornerRadius: 7, color: palette.inputBackground)
         dayChip.translatesAutoresizingMaskIntoConstraints = false
         dayChip.layer?.borderWidth = 1
         dayChip.layer?.borderColor = palette.inputBorder.withAlphaComponent(0.8).cgColor
-        let dayText = textLabel(scheduleDayText(for: meeting), font: NSFont.systemFont(ofSize: 11, weight: .semibold), color: palette.textSecondary)
+        let dayText = textLabel(todoDayText(for: todo), font: NSFont.systemFont(ofSize: 11, weight: .semibold), color: palette.textSecondary)
         dayText.translatesAutoresizingMaskIntoConstraints = false
         dayChip.addSubview(dayText)
         NSLayoutConstraint.activate([
@@ -3876,7 +3885,9 @@ private extension ViewController {
         hit.translatesAutoresizingMaskIntoConstraints = false
         hit.isBordered = false
         hit.bezelStyle = .regularSquare
-        hit.identifier = NSUserInterfaceItemIdentifier(meeting.meetURL.absoluteString)
+        if let url = todo.alternateLink {
+            hit.identifier = NSUserInterfaceItemIdentifier(url.absoluteString)
+        }
         hit.heightAnchor.constraint(equalToConstant: contentHeight).isActive = true
         if useFlexibleWidth {
             hit.setContentHuggingPriority(.defaultLow, for: .horizontal)
@@ -5815,7 +5826,7 @@ private extension ViewController {
         }
         guard let raw = sender.identifier?.rawValue,
               let url = URL(string: raw) else { return }
-        openMeetingURL(url)
+        openURL(url)
     }
 
     @objc func scheduleConnectButtonPressed(_ sender: NSButton) {
@@ -5827,11 +5838,11 @@ private extension ViewController {
     }
 
     private func scheduleInitialHeadingText() -> String {
-        googleOAuth.loadTokens() == nil ? "Connect Google to see your calendar" : "Loading…"
+        googleOAuth.loadTokens() == nil ? "Connect Google to see your to-do" : "Loading…"
     }
 
     private func schedulePageInitialHeadingText() -> String {
-        googleOAuth.loadTokens() == nil ? "Connect Google to see your calendar" : "Loading schedule…"
+        googleOAuth.loadTokens() == nil ? "Connect Google to see your to-do" : "Loading to-do…"
     }
 
     @objc func scheduleFilterDropdownChanged(_ sender: NSPopUpButton) {
@@ -5907,41 +5918,31 @@ private extension ViewController {
         presentCreateMeetingPopover(relativeTo: sender)
     }
 
-    private func scheduleTimeText(for meeting: ScheduledMeeting) -> String {
-        if meeting.isAllDay { return "All day" }
+    private func todoDueText(for todo: ClassroomTodoItem) -> String {
+        guard let due = todo.dueDate else { return "No due date" }
         let f = DateFormatter()
         f.locale = Locale.current
         f.timeZone = TimeZone.current
         f.dateStyle = .none
         f.timeStyle = .short
-        return "\(f.string(from: meeting.startDate)) - \(f.string(from: meeting.endDate))"
+        return "Due \(f.string(from: due))"
     }
 
-    private func scheduleDayText(for meeting: ScheduledMeeting) -> String {
+    private func todoDayText(for todo: ClassroomTodoItem) -> String {
+        guard let due = todo.dueDate else { return "Anytime" }
         let f = DateFormatter()
         f.locale = Locale.current
         f.timeZone = TimeZone.current
         f.dateFormat = "EEE, d MMM"
-        return f.string(from: meeting.startDate)
-    }
-
-    private func scheduleDurationText(for meeting: ScheduledMeeting) -> String {
-        if meeting.isAllDay { return "Duration: all day" }
-        let duration = max(0, meeting.endDate.timeIntervalSince(meeting.startDate))
-        let totalMinutes = Int(duration / 60)
-        let hours = totalMinutes / 60
-        let minutes = totalMinutes % 60
-        if hours > 0, minutes > 0 { return "Duration: \(hours)h \(minutes)m" }
-        if hours > 0 { return "Duration: \(hours)h" }
-        return "Duration: \(minutes)m"
+        return f.string(from: due)
     }
 
-    private func scheduleHeadingText(for meetings: [ScheduledMeeting]) -> String {
-        guard let first = meetings.first else {
-            return googleOAuth.loadTokens() == nil ? "Connect Google to see meetings" : "No upcoming meetings"
+    private func scheduleHeadingText(for todos: [ClassroomTodoItem]) -> String {
+        guard let first = todos.first else {
+            return googleOAuth.loadTokens() == nil ? "Connect Google to see to-do" : "No upcoming work"
         }
-
-        let day = Calendar.current.startOfDay(for: first.startDate)
+        guard let due = first.dueDate else { return "No due dates" }
+        let day = Calendar.current.startOfDay(for: due)
         let f = DateFormatter()
         f.locale = Locale.current
         f.timeZone = TimeZone.current
@@ -5949,13 +5950,13 @@ private extension ViewController {
         return f.string(from: day)
     }
 
-    private func openMeetingURL(_ url: URL) {
+    private func openURL(_ url: URL) {
         NSWorkspace.shared.open(url)
     }
 
-    private func renderScheduleCards(into stack: NSStackView, meetings: [ScheduledMeeting]) {
-        displayedScheduleMeetings = meetings
-        let shouldShowScrollControls = meetings.count > 3
+    private func renderScheduleCards(into stack: NSStackView, todos: [ClassroomTodoItem]) {
+        displayedScheduleTodos = todos
+        let shouldShowScrollControls = todos.count > 3
         scheduleScrollLeftButton?.isHidden = !shouldShowScrollControls
         scheduleScrollRightButton?.isHidden = !shouldShowScrollControls
         scheduleCardsScrollView?.contentView.setBoundsOrigin(.zero)
@@ -5968,14 +5969,14 @@ private extension ViewController {
             v.removeFromSuperview()
         }
 
-        if meetings.isEmpty {
+        if todos.isEmpty {
             let empty = roundedContainer(cornerRadius: 10, color: palette.sectionCard)
             empty.translatesAutoresizingMaskIntoConstraints = false
             empty.widthAnchor.constraint(equalToConstant: 240).isActive = true
             empty.heightAnchor.constraint(equalToConstant: 150).isActive = true
             styleSurface(empty, borderColor: palette.inputBorder, borderWidth: 1, shadow: false)
 
-            let label = textLabel(googleOAuth.loadTokens() == nil ? "Connect to load schedule" : "No meetings", font: typography.cardSubtitle, color: palette.textSecondary)
+            let label = textLabel(googleOAuth.loadTokens() == nil ? "Connect to load to-do" : "No work due", font: typography.cardSubtitle, color: palette.textSecondary)
             label.translatesAutoresizingMaskIntoConstraints = false
             empty.addSubview(label)
             NSLayoutConstraint.activate([
@@ -5986,50 +5987,65 @@ private extension ViewController {
             return
         }
 
-        for meeting in meetings {
-            stack.addArrangedSubview(scheduleCard(meeting: meeting))
+        for todo in todos {
+            stack.addArrangedSubview(scheduleCard(todo: todo))
         }
     }
 
-    private func filteredMeetings(_ meetings: [ScheduledMeeting]) -> [ScheduledMeeting] {
+    private func filteredTodos(_ todos: [ClassroomTodoItem]) -> [ClassroomTodoItem] {
         switch scheduleFilter {
         case .all:
-            return meetings
+            return todos
         case .today:
             let start = Calendar.current.startOfDay(for: Date())
             let end = Calendar.current.date(byAdding: .day, value: 1, to: start) ?? start.addingTimeInterval(86400)
-            return meetings.filter { $0.startDate >= start && $0.startDate < end }
+            return todos.filter { ($0.dueDate ?? .distantPast) >= start && ($0.dueDate ?? .distantPast) < end }
         case .week:
             let now = Date()
             let end = Calendar.current.date(byAdding: .day, value: 7, to: now) ?? now.addingTimeInterval(7 * 86400)
-            return meetings.filter { $0.startDate >= now && $0.startDate <= end }
+            return todos.filter {
+                guard let due = $0.dueDate else { return false }
+                return due >= now && due <= end
+            }
         }
     }
 
-    private func filteredMeetingsForSchedulePage(_ meetings: [ScheduledMeeting]) -> [ScheduledMeeting] {
+    private func filteredTodosForSchedulePage(_ todos: [ClassroomTodoItem]) -> [ClassroomTodoItem] {
         let calendar = Calendar.current
         switch schedulePageFilter {
         case .all:
-            return meetings
+            return todos
         case .today:
             let start = calendar.startOfDay(for: Date())
             let end = calendar.date(byAdding: .day, value: 1, to: start) ?? start.addingTimeInterval(86400)
-            return meetings.filter { $0.startDate >= start && $0.startDate < end }
+            return todos.filter {
+                guard let due = $0.dueDate else { return false }
+                return due >= start && due < end
+            }
         case .week:
             let now = Date()
             let end = calendar.date(byAdding: .day, value: 7, to: now) ?? now.addingTimeInterval(7 * 86400)
-            return meetings.filter { $0.startDate >= now && $0.startDate <= end }
+            return todos.filter {
+                guard let due = $0.dueDate else { return false }
+                return due >= now && due <= end
+            }
         case .month:
             let now = Date()
             let end = calendar.date(byAdding: .month, value: 1, to: now) ?? now.addingTimeInterval(30 * 86400)
-            return meetings.filter { $0.startDate >= now && $0.startDate <= end }
+            return todos.filter {
+                guard let due = $0.dueDate else { return false }
+                return due >= now && due <= end
+            }
         case .customRange:
             let start = calendar.startOfDay(for: schedulePageFromDate)
             let inclusiveEndDay = calendar.startOfDay(for: schedulePageToDate)
             guard let end = calendar.date(byAdding: .day, value: 1, to: inclusiveEndDay) else {
-                return meetings
+                return todos
+            }
+            return todos.filter {
+                guard let due = $0.dueDate else { return false }
+                return due >= start && due < end
             }
-            return meetings.filter { $0.startDate >= start && $0.startDate < end }
         }
     }
 
@@ -6061,7 +6077,7 @@ private extension ViewController {
         schedulePageToDate = schedulePageToDatePicker?.dateValue ?? schedulePageToDate
         if schedulePageFilter == .customRange && !schedulePageHasValidCustomRange() {
             setSchedulePageRangeError("Start date must be on or before end date.")
-            schedulePageFilteredMeetings = []
+            schedulePageFilteredTodos = []
             schedulePageVisibleCount = 0
             renderSchedulePageCards()
             schedulePageDateHeadingLabel?.stringValue = "Invalid custom date range"
@@ -6069,15 +6085,15 @@ private extension ViewController {
         }
 
         setSchedulePageRangeError(nil)
-        schedulePageFilteredMeetings = filteredMeetingsForSchedulePage(scheduleCachedMeetings)
-        schedulePageVisibleCount = min(schedulePageBatchSize, schedulePageFilteredMeetings.count)
+        schedulePageFilteredTodos = filteredTodosForSchedulePage(scheduleCachedTodos)
+        schedulePageVisibleCount = min(schedulePageBatchSize, schedulePageFilteredTodos.count)
         renderSchedulePageCards()
-        schedulePageDateHeadingLabel?.stringValue = scheduleHeadingText(for: schedulePageFilteredMeetings)
+        schedulePageDateHeadingLabel?.stringValue = scheduleHeadingText(for: schedulePageFilteredTodos)
     }
 
     private func appendSchedulePageBatchIfNeeded() {
-        guard schedulePageVisibleCount < schedulePageFilteredMeetings.count else { return }
-        let nextCount = min(schedulePageVisibleCount + schedulePageBatchSize, schedulePageFilteredMeetings.count)
+        guard schedulePageVisibleCount < schedulePageFilteredTodos.count else { return }
+        let nextCount = min(schedulePageVisibleCount + schedulePageBatchSize, schedulePageFilteredTodos.count)
         guard nextCount > schedulePageVisibleCount else { return }
         schedulePageVisibleCount = nextCount
         renderSchedulePageCards()
@@ -6106,13 +6122,13 @@ private extension ViewController {
             v.removeFromSuperview()
         }
 
-        let visibleMeetings = Array(schedulePageFilteredMeetings.prefix(schedulePageVisibleCount))
-        if visibleMeetings.isEmpty {
+        let visibleTodos = Array(schedulePageFilteredTodos.prefix(schedulePageVisibleCount))
+        if visibleTodos.isEmpty {
             let empty = roundedContainer(cornerRadius: 10, color: palette.sectionCard)
             empty.translatesAutoresizingMaskIntoConstraints = false
             empty.heightAnchor.constraint(equalToConstant: 140).isActive = true
             styleSurface(empty, borderColor: palette.inputBorder, borderWidth: 1, shadow: false)
-            let label = textLabel(googleOAuth.loadTokens() == nil ? "Connect to load schedule" : "No meetings for selected filters", font: typography.cardSubtitle, color: palette.textSecondary)
+            let label = textLabel(googleOAuth.loadTokens() == nil ? "Connect to load to-do" : "No work for selected filters", font: typography.cardSubtitle, color: palette.textSecondary)
             label.translatesAutoresizingMaskIntoConstraints = false
             empty.addSubview(label)
             NSLayoutConstraint.activate([
@@ -6125,7 +6141,7 @@ private extension ViewController {
         }
 
         var index = 0
-        while index < visibleMeetings.count {
+        while index < visibleTodos.count {
             let row = NSStackView()
             row.translatesAutoresizingMaskIntoConstraints = false
             row.userInterfaceLayoutDirection = .leftToRight
@@ -6133,16 +6149,16 @@ private extension ViewController {
             row.alignment = .top
             row.spacing = schedulePageCardSpacing
             row.distribution = .fillEqually
-            let rowEnd = min(index + schedulePageCardsPerRow, visibleMeetings.count)
-            for meeting in visibleMeetings[index..<rowEnd] {
-                row.addArrangedSubview(scheduleCard(meeting: meeting, useFlexibleWidth: true, contentHeight: schedulePageCardHeight))
+            let rowEnd = min(index + schedulePageCardsPerRow, visibleTodos.count)
+            for todo in visibleTodos[index..<rowEnd] {
+                row.addArrangedSubview(scheduleCard(todo: todo, useFlexibleWidth: true, contentHeight: schedulePageCardHeight))
             }
             stack.addArrangedSubview(row)
             row.widthAnchor.constraint(equalTo: stack.widthAnchor).isActive = true
             index = rowEnd
         }
 
-        if schedulePageVisibleCount < schedulePageFilteredMeetings.count {
+        if schedulePageVisibleCount < schedulePageFilteredTodos.count {
             let pagination = NSStackView()
             pagination.translatesAutoresizingMaskIntoConstraints = false
             pagination.orientation = .horizontal
@@ -6150,7 +6166,7 @@ private extension ViewController {
             pagination.spacing = 10
 
             let moreLabel = textLabel(
-                "Showing \(schedulePageVisibleCount) of \(schedulePageFilteredMeetings.count)",
+                "Showing \(schedulePageVisibleCount) of \(schedulePageFilteredTodos.count)",
                 font: NSFont.systemFont(ofSize: 12, weight: .medium),
                 color: palette.textMuted
             )
@@ -6177,18 +6193,27 @@ private extension ViewController {
         scroll.reflectScrolledClipView(scroll.contentView)
     }
 
+    private func errorRequiresReconsentForClassroomScopes(_ error: Error) -> Bool {
+        if case let GoogleClassroomClientError.httpStatus(status, body) = error {
+            guard status == 403 else { return false }
+            return body.contains("ACCESS_TOKEN_SCOPE_INSUFFICIENT") || body.contains("insufficient authentication scopes")
+        }
+        return false
+    }
+
     private func loadSchedule() async {
         do {
             if googleOAuth.loadTokens() == nil {
                 await MainActor.run {
                     updateGoogleAuthButtonTitle()
                     applyGoogleProfile(nil)
-                    scheduleDateHeadingLabel?.stringValue = "Connect Google to see meetings"
-                    schedulePageDateHeadingLabel?.stringValue = "Connect Google to see meetings"
+                    scheduleDateHeadingLabel?.stringValue = "Connect Google to see your to-do"
+                    schedulePageDateHeadingLabel?.stringValue = "Connect Google to see your to-do"
                     if let stack = scheduleCardsStack {
-                        renderScheduleCards(into: stack, meetings: [])
+                        renderScheduleCards(into: stack, todos: [])
                     }
                     scheduleCachedMeetings = []
+                    scheduleCachedTodos = []
                     applySchedulePageFiltersAndRender()
                     if calendarPageGridStack != nil {
                         calendarPageMonthLabel?.stringValue = calendarMonthTitleText(for: calendarPageMonthAnchor)
@@ -6201,17 +6226,19 @@ private extension ViewController {
 
             let token = try await googleOAuth.validAccessToken(presentingWindow: view.window)
             let profile = try? await googleOAuth.fetchUserProfile(accessToken: token)
+            let todos = try await classroomClient.fetchTodo(accessToken: token)
+            let filtered = filteredTodos(todos)
             let meetings = try await calendarClient.fetchUpcomingMeetings(accessToken: token)
-            let filtered = filteredMeetings(meetings)
 
             await MainActor.run {
                 updateGoogleAuthButtonTitle()
                 applyGoogleProfile(profile.map { self.makeGoogleProfileDisplay(from: $0) })
                 scheduleDateHeadingLabel?.stringValue = scheduleHeadingText(for: filtered)
                 if let stack = scheduleCardsStack {
-                    renderScheduleCards(into: stack, meetings: filtered)
+                    renderScheduleCards(into: stack, todos: filtered)
                 }
                 scheduleCachedMeetings = meetings
+                scheduleCachedTodos = todos
                 applySchedulePageFiltersAndRender()
                 if calendarPageGridStack != nil {
                     calendarPageMonthLabel?.stringValue = calendarMonthTitleText(for: calendarPageMonthAnchor)
@@ -6221,31 +6248,55 @@ private extension ViewController {
             }
         } catch {
             await MainActor.run {
+                if errorRequiresReconsentForClassroomScopes(error) {
+                    _ = try? googleOAuth.signOut()
+                    applyGoogleProfile(nil)
+                    updateGoogleAuthButtonTitle()
+                    scheduleDateHeadingLabel?.stringValue = "Reconnect Google to enable Classroom permissions"
+                    schedulePageDateHeadingLabel?.stringValue = "Reconnect Google to enable Classroom permissions"
+                    if let stack = scheduleCardsStack {
+                        renderScheduleCards(into: stack, todos: [])
+                    }
+                    scheduleCachedMeetings = []
+                    scheduleCachedTodos = []
+                    applySchedulePageFiltersAndRender()
+                    if calendarPageGridStack != nil {
+                        calendarPageMonthLabel?.stringValue = calendarMonthTitleText(for: calendarPageMonthAnchor)
+                        renderCalendarMonthGrid()
+                        renderCalendarSelectedDay()
+                    }
+                    showSimpleAlert(
+                        title: "Reconnect Google",
+                        message: "We added Google Classroom permissions. Please connect your Google account again so Google can grant access to assignments and quizzes."
+                    )
+                    return
+                }
                 updateGoogleAuthButtonTitle()
                 if googleOAuth.loadTokens() == nil {
                     applyGoogleProfile(nil)
                 }
-                scheduleDateHeadingLabel?.stringValue = "Couldn’t load schedule"
-                schedulePageDateHeadingLabel?.stringValue = "Couldn’t load schedule"
+                scheduleDateHeadingLabel?.stringValue = "Couldn’t load to-do"
+                schedulePageDateHeadingLabel?.stringValue = "Couldn’t load to-do"
                 if let stack = scheduleCardsStack {
-                    renderScheduleCards(into: stack, meetings: [])
+                    renderScheduleCards(into: stack, todos: [])
                 }
                 scheduleCachedMeetings = []
+                scheduleCachedTodos = []
                 applySchedulePageFiltersAndRender()
                 if calendarPageGridStack != nil {
                     calendarPageMonthLabel?.stringValue = calendarMonthTitleText(for: calendarPageMonthAnchor)
                     renderCalendarMonthGrid()
                     renderCalendarSelectedDay()
                 }
-                showSimpleError("Couldn’t load schedule.", error: error)
+                showSimpleError("Couldn’t load to-do.", error: error)
             }
         }
     }
 
     func showScheduleHelp() {
         let alert = NSAlert()
-        alert.messageText = "Google schedule"
-        alert.informativeText = "To show scheduled meetings, connect your Google account. You’ll need a Google OAuth client ID (Desktop) and a redirect URI matching the app’s callback scheme."
+        alert.messageText = "Google Classroom to-do"
+        alert.informativeText = "To show assignments and quizzes, connect your Google account. You’ll need a Google OAuth client ID (Desktop) and a redirect URI matching the app’s callback scheme."
         alert.addButton(withTitle: "OK")
         alert.runModal()
     }