Repository navigation
Conversation
…port # Conflicts: # Package.swift # README.md # Sources/OpenUsage/App/OpenUsageApp.swift # Sources/OpenUsage/Stores/LayoutStore.swift # Sources/OpenUsage/Views/DashboardView.swift # docs/architecture.md # script/build_and_run.sh # script/release.sh
The widget extension kept a hardcoded provider list, so providers added after it (Ollama, OpenCode) and extra Claude/Codex account cards could not be chosen. The picker now lists what the host app exports, and each record carries an iconID so account cards keep their provider mark. Selection rules live in OpenUsageWidgetSupport so they are unit-tested. A saved provider the app no longer exports still resolves, so the widget shows Provider Unavailable instead of silently switching to another provider.
WidgetKit keeps the extension process running after the app quits, so a rebuilt dev bundle kept rendering desktop widgets with the previous build's code. Kill the staged extension alongside the app; matching the dist path leaves an installed release untouched.
|
This pull request adds 2,430 lines. Pull requests with more than 1,000 added lines are rarely merged because they are difficult to review and often extend beyond the approved issue. Please consider breaking this into a smaller, more surgical contribution. |
![pullfrog[bot]](https://avatars.githubusercontent.com/in/1768019?s=60&v=4){kind=small}
There was a problem hiding this comment.
Important
Two widget recovery paths remain broken at 5ebc6ecb: recovery clicks for missing/removed providers do not open the popover, and unconfigured widgets hide corrupt/unsupported bridge errors. The fixes described in the PR body are not present in the fetched head.
Reviewed changes Reviewed the complete host-to-widget implementation and its integration.
- Shared data bridge: Adds versioned presentation records, atomic App Group persistence, observation and debounced WidgetKit reloads.
- Widget extension: Adds provider configuration, three widget sizes, health states and stale-data timelines.
- Navigation: Queues startup URLs and routes known providers to the dashboard or Customize.
- Packaging and tests: Builds and signs nested extensions in dev/release bundles, with bridge/navigation tests and documentation. Shell syntax validation passed; macOS builds and runtime tests could not run on Linux.
gpt-6.1-sol ｜ 𝕏
There was a problem hiding this comment.
✅ No new issues found.
Reviewed changes Reviewed the recovery fixes in d65732dd against the previous reviewed head, 5ebc6ecb.
- Fixed recovery navigation: Routed widgets with missing or removed providers to the dashboard while retaining validation of unsupported URL shapes.
- Prioritized bridge errors: Extracted shared entry selection so corrupt and unsupported bridge states display correctly before a provider is configured, while preserving configured IDs and existing default selection.
- Added regression coverage: Covered recovery URLs, unconfigured bridge errors, configured IDs and loaded-bridge selection, and updated the widget behavior documentation.
Swift 6 strict-concurrency type-checking passed for the shared widget support sources. Full macOS tests, Xcode builds and WidgetKit runtime checks could not be run in this Linux environment.
gpt-6.1-sol ｜ 𝕏
There was a problem hiding this comment.
✅ No new issues found.
Reviewed changes Reviewed the welcome-screen and widget-launch integration in 7cf37f14 against the previously reviewed head, d65732dd.
- Preserved queued destinations: Opened the welcome flow's default dashboard before routing queued widget links, so a disabled provider's Customize destination remains selected.
- Integrated startup sequencing: Retained incoming links while welcome setup is pending, surfaced the welcome window on widget clicks, and started periodic refresh when the dashboard becomes ready.
- Added regression coverage: Covered welcome completion with a queued disabled-provider link and without queued links, and documented first-launch widget routing and refresh timing.
Validation was static: traced the startup flow through controller initialization, the dashboard handler and deep-link navigation. macOS/AppKit tests and WidgetKit runtime checks could not run on this Linux runner.
gpt-6.1-sol ｜ 𝕏
There was a problem hiding this comment.
✅ No new issues found.
Reviewed changes Reviewed 5d60b112 against the previously reviewed head, 7cf37f14, focusing on behavior preserved by the widget model refactor.
- Unified shared models: Removed duplicate extension presentation types and the generic selection protocol; the reader, picker, timeline and views now use shared bridge records directly.
- Simplified timeline state: Carried the shared selection and freshness flag through timeline entries, preserving bridge-error precedence, stale transitions and provider click-through destinations.
- Consolidated presentation: Extracted common header titles and health labels, retained host-side chart exclusion, removed unused dependencies and simplified test setup.
- Updated documentation: Described the extension's direct rendering of shared display-ready records.
Swift 6 strict-concurrency type-checking passed for the shared support sources. macOS tests, WidgetKit target compilation and runtime rendering could not be verified on this Linux runner.
gpt-6.1-sol ｜ 𝕏
There was a problem hiding this comment.
✅ No new issues found.
Reviewed changes Reviewed the merge in 0fb7e316 against the previously reviewed head, 5d60b112, focusing on integration with the incoming dashboard changes from main.
- Integrated dashboard expansion: Moved the expanded card's caret below On Demand metrics and quick links, retaining the separate metric-reorder boundary and provider scroll targets used by widget links.
- Updated drag previews: Carried separator position, links and expansion state into lifted provider cards.
- Preserved widget behavior: Retained deep-link expansion and saved metric placement as the source of widget primary/secondary rows; the bridge and extension sources are unchanged.
Validation was static. macOS builds, tests and runtime rendering could not be verified on this Linux runner.
gpt-6.1-sol ｜ 𝕏
swift build only compiles the shared support library. Add an unsigned universal xcodebuild of the OpenUsageWidgets scheme.
The widget project points at the root package, so Xcode resolves Sparkle, KeyboardShortcuts and PostHog, but the extension builds only OpenUsageWidgetSupport, which uses none of them. Its lockfile pinned versions it never builds and drifted from the root one.
Small and medium widgets truncated the reset countdown ("49 min, 26 se…").
Small widgets now show the leading unit, medium widgets switch to minutes
near the reset, and hidden static copies reserve the countdown's width so
the headline scales down instead. A small widget's header truncates the
plan before the provider name.
The progress bar's fill is now accentable, so tinted widgets keep fill and
track apart.
Compact countdowns reserve width for the text they show until the next timeline entry, assuming entries 30 minutes apart. WidgetKit can postpone the requested reload, so the timeline now carries entries every 30 minutes for four hours, built from one bridge read. The relative countdown's sizing text comes from the localized abbreviated components style instead of hand-built English units.
There was a problem hiding this comment.
✅ No new issues found.
Reviewed changes Reviewed the four new commits since 0fb7e316, focusing on compact countdown layout, timeline scheduling and extension build coverage.
- Added extension CI: Built the separate WidgetKit scheme unsigned in Release for both architectures.
- Removed stale dependency pins: Deleted and ignored the widget project's nested lockfile.
- Adjusted compact presentation: Reserved countdown width, used a leading unit on small widgets and minutes near reset on medium widgets, prioritized provider names over plans, and separated accented progress fills from their tracks.
- Extended timeline coverage: Generated 30-minute entries through four hours from one bridge read, retained the stale transition, and added schedule regression coverage.
Swift 6 strict-concurrency type-checking passed for all four shared support sources. Full macOS tests, Xcode builds and runtime rendering could not be run on this Linux runner.
gpt-6.1-sol ｜ 𝕏
There was a problem hiding this comment.
✅ No new issues found.
Reviewed changes Reviewed the merge in 59b1f8fc against the previously reviewed head, b38c33c6, focusing on integration with widget startup routing.
- Integrated startup timing: Retained the monotonic launch-duration measurement and lifecycle log after status item creation, without changing queued widget URL delivery or welcome-screen destinations.
- Preserved widget behavior: Kept the bridge, extension rendering, countdown scheduling and packaging unchanged; the remaining range-diff change is documentation attribution context from
main.
Validation was static. macOS builds, tests and WidgetKit runtime checks could not be run on this Linux runner.
gpt-6.1-sol ｜ 𝕏
|
Hi @validatedev! The CI workflow for this PR is waiting on approval ( |
|
@ostiums sure! |
|
@codex review |
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
Codex Review: Something went wrong. Try again later by commenting “@codex review”. ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
|
@codex review |
|
Codex Review: Something went wrong. Try again later by commenting “@codex review”. ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
This branch has not been deployed
2 participants
Approved issue
Fixes #1301
TL;DR
This brings the macOS desktop widgets from #859 to
main, with @validatedev's commits kept as they are, including 4e5444a. @validatedev fixed review items 1 and 2 in d65732d and simplified the shared models in 5d60b11. My four commits on top cover the rest: CI builds the widget extension, the stale widget lockfile is gone, and compact countdowns no longer truncate.What was happening
swift buildandswift test, which never compile the WidgetKit target inOpenUsageWidgets.xcodeproj.Text(resetAt, style: .relative)next to the headline in anHStack. That text takes whatever width it's offered and has no usable ideal width, so it got cut off ("39 min, 30 se…"). In tinted mode,ProgressViewdrew the fill and the track in the same tint.Package.resolvedpinned Sparkle 2.9.4, KeyboardShortcuts 3.0.1 and PostHog 3.64.1, while the root lockfile has 2.10.0, 3.1.0 and 3.90.2.What this changes
ci.ymlbuilds theOpenUsageWidgetsscheme in Release, unsigned, forarm64andx86_64.Package.resolvedand gitignored it. The extension only buildsOpenUsageWidgetSupport, which uses none of those packages.widgetAccentable()over a.quaternarytrack. In a small widget's header, the plan truncates before the provider name.Heads-up
from:ranges allow. They're resolved but not built for the extension.Tests
swift test: 1626 tests, 3 skipped, 0 failures, plus the 4 CLI tests. My new test isWidgetTimelineScheduleTests.testEntriesStayEvenlySpacedPastTheRequestedReload.xcodebuild -project OpenUsageWidgets.xcodeproj -scheme OpenUsageWidgets -configuration Release -destination 'generic/platform=macOS' CODE_SIGNING_ALLOWED=NO ARCHS='arm64 x86_64' ONLY_ACTIVE_ARCH=NO buildpasses, andlipo -archson the built extension printsx86_64 arm64.Screenshots
Before, from the #859 comment:
After: