Repository navigation
refactor(ui): native notices and status labels on every surface - #4007
Merged
Merged
Conversation
…ls, dots and chips
…h and Try Again in place
…sheet and the chat panel
…ep Copilot's known state
… labels with stock controls
…when the list loads
datlechin
enabled auto-merge (squash)
November 3, 2026 07:02
datlechin
added a commit
that referenced
this pull request
Nov 3, 2026
Brings main's 27 commits, among them one license and sync presentation (#4005), the Black Friday line (#3995), the update indicator and relaunch (#3993, #3997), running work (#4009), native notices (#4007) and the security merges for GHSA-3x6q-h487-r38w, GHSA-3xf7-86qj-4546, GHSA-6g2g-65r6-v5wh, GHSA-q2hp-vxv3-87fw, GHSA-6p9q-hc7v-cxmx and GHSA-vg8g-h6xp-6px5. - #4005: ported onto FeatureAccess. LicensePresentation.gate reads AccountState: signed out names a paid plan and offers Sign In beside Purchase License, an account without the feature gets Upgrade Plan, the device limit opens Settings > Account, and a lapsed or failed check reads as Settings > Account words it, with Try Again, so a paying customer is never sent to the pricing page. The pane's notice text moved to AccountSettingsContent.Notice so both read it. LicenseGateRow replaces ProBadge in the Sync, Linked Folders, Data Rewind and connection export rows, LicenseGateAlert serves Compare & Sync and Data Rewind, and the overlay renders the same notice. Try Again shows a spinner and the failed check's reason; Refresh in Settings > Account shows the reason too. Welcome shows the pane's first notice as a link (a plan being canceled stays in the pane), else Sign In. Dropped: the .suspended access, since an entitlement carries no suspended state, and LicenseManager's coalesced checks and stale-answer guard, since AccountServices already runs one check at a time and drops a refresh that lands after sign-out. - #3995: the Black Friday line shows when FeatureAccess.supportAudience is .prospect, the notion the day-30 ask reads. - #3989: ported before this merge, in e39c309. - #3993, #3997: merged as main has them; Welcome and the Sync pane keep UpdateCenter. - #4007: a Team Library publish that goes through shows no info alert on Welcome or in Favorites; the section shows the items. The queued and failed messages stay. - #4009: merged outside the Team Library. TeamLibraryStore's write generation, the shared in-flight pull, the refused second publish and the Team Library row in Settings > License are dropped: TeamLibrarySync runs syncs and publishes one at a time, bumps a generation on sign-out, and the Welcome and Favorites headers show the running sync, the last sync and a failure. - 726a167 (security): LicenseAPIClient and LiveTeamLibraryAPIClient follow redirects only on their own origin. Ported by giving the account URLSession SameOriginRedirects as its delegate, which covers token requests, /v2 calls and the team library. The pulled library keeps a connection's sign-in choice for the consent prompt: ported to TeamLibraryChange.connection, and its test moved to TeamLibrarySyncTests. Publishing needs nothing, since portableSettings keeps the choice by default. EnvVarReferenceConsent reads FeatureAccess. - DatabaseManager+Sessions: main's recovery guard and consent path, with Telemetry.connectionAttempted in place of MacAnalyticsProvider. - project.yml: PostHog stays and zstd goes, as main moved Kafka's codecs into TableProCore; the app links main's new products, without TableProAnalytics. - The storage rule, data-sync-storage.md: the paths main listed for the deleted TeamLibraryModels, TeamLibraryStore and MacAnalyticsProvider name TeamLibraryItem, TeamLibraryState and Telemetry, plus Account's stores. - Localizable.xcstrings: merged key by key in this branch's order; no key changed on both sides. 271 keys come from main; the three SSH host keys main removed are gone, as nothing uses them. - Tests deleted with the code this branch deleted: LicenseManagerDecisionTests, LicensePresentationTests and LicenseTierTests under Models, TeamLibraryModelsTests, TeamLibrarySyncCoordinatorTests, and the Macs link case in SupportLinksTests. New: LicensePresentationTests under Views/Settings, the sign-in choice case in TeamLibrarySyncTests and the redirect case in AccountConfigurationTests.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Views/Components, used wherever a notice was hand-drawn:PaneNoticeBar: the bar over a pane, shaped like the transaction and recovery bars. Tinted symbol, a semibold title over secondary text, small stock buttons, icon-only borderless dismiss,.paneBarBackground().NoticeLabel: a status line in a form, sheet or popover. The hue is on the symbol only; the words are secondary.PaneNoticeBars. No tinted fills.MCPServerState.failedcarries a typedMCPServerFailure. The Status row reads Couldn't start or Stopped unexpectedly, the cause under it, Try Again beside it. A kernel-picked port says the configured one was in use. Themessage.contains("48")match is gone.AIProviderStatusis the one status per provider. The Settings row and the provider sheet render it. A Copilot error now shows on the row, and OpenCode or a custom provider without its optional key reads as ready. The chat panel's two no-provider texts are one.Msg_text, SQLiteintegrity_check) still shows, now read from the rows, where it always was;writeSecretText.ConnectionTile, tag color as a tintedtag.fill. DeadColorDotViewand the sectionaccentColordeleted.NSTokenField: type to complete or create a tag, Delete to remove one. The pull-down beside it keeps colors, Create New Tag… and Manage Tags.NoticeLabelrows. Em dash placeholders are "-" or "None". Floating material buttons over inspector wells moved to a header row. Dashboard and Query Insights cards areGroupBox..buttontoggle; the insert form's Default, NULL or Value menu is a bordered button;MetadataBadge(types, index kinds, row counts) is secondary text; "Primary" is no longer an orange chip;/var/folders/48/MCPServerFailureAIProviderStatus.failedon the rowretryRejectedPluginRepairsNotificationPermissionMonitorMsg_textand SQLiteintegrity_checkrows (OPTIMIZE notes, CHECK errors) were never shown; the alert read the emptystatusMessageMaintenanceResultNoteNSPasteboarddirectly, so clipboard history apps kept themwriteSecretTextMCPPortAllocatorErrortext was shown for socket failures tooDecisions taken without a design review:
NSTokenFieldkeeps native typing, completion and Delete, but it cannot color a token through public API, so the colors stay in the pull-down beside it. A typed name that matches no tag creates a gray one.Deliberately not fixed here:
Tests changed on purpose, because they pinned the old shape:
FieldDrivenListEntryTests.headerIdentityFollowsItsAccentandConnectionSwitcherFilterTests.groupHeadersHaveNoDot: the section accent color is gone;MCPServerManagerIdleStateTests.testServerStatesAreDistinguishable: typed failure;FavoritesLinkedFolderTests.reportsAnAlreadyLinkedFolder: carries the folder id;ConnectionSignInRegistryTests.providersAreFullyDescribed:signedInMessageis gone.Test plan
PluginListSelectionTests(5),MCPServerStatusPresentationTests(5),AIProviderStatusTests(7),NotificationPermissionMonitorTests(2),ConnectionTagTokensTests(3),ConnectionTagTokenFieldTests(7, a realNSTokenFieldin a window: typing alone commits nothing, Return and ending editing commit, a repeat or a refused name never stays),MaintenanceResultNoteTests(6);PluginRegistryUpdatePassTests(Try Again repairs, reports a refused registry, needs updating on) andMCPServerOffContractTests(Try Again refused while MCP is off).ImageRendererdraws noGroupBox, fixed by moving the Activity section into the view; rerun 15 of 15.RowDetailViewModelTests52 of 52 on iPhone 17 Pro, iOS 26.scripts/check-banned-words.sh --base origin/main: clean.localization.py plugins: ok; 20 new keys added.Screenshots
States that need a failure are seeded by a temporary patch that is not in this PR: a server warning on connect, two plugins that could not load and a pending relaunch, an MCP bind failure, a changed language, three AI providers. The query error is a real failed query. Before is main at de5c918.
iOS 26 (iPhone 17 Pro simulator; the real views in a window)