Repository navigation
Merge upstream Maccy (58 commits, Swift 6) - #7
Merged
Merged
Conversation
Avoid potential expensive view creation if the view is not visible.
… (#1543) Co-authored-by: Alex Rodionov <p0deje@gmail.com>
The app picker in the Ignore settings read the selected bundle with Bundle(path:) without starting access to the security-scoped URL. The sandbox allows reading /Applications, so those apps worked, but apps elsewhere (e.g. ~/Applications) returned no bundle and were silently dropped. Fixes #991
.fast garbles small text and only supports a few Latin-script languages. .accurate alone still drops Chinese, Japanese, etc. because recognitionLanguages defaults to English only, so also enable automaticallyDetectsLanguage. Fixes #1514
The preview already shows the pixel dimensions of image items, but not how large the image actually is. Knowing the size helps before pasting into places with upload limits.
Settings.Section offers its content the full container width even though the content starts after the label column, so the warning never wraps and runs past the window edge in French, Russian and other long translations. Cap its width so it wraps. Fixes #1327
The app icon file watcher ran its handler on a global queue, but the closure is implicitly @mainactor, so Swift 6's isolation check crashed whenever an app with a displayed icon was modified or deleted.
58 upstream commits: Swift 6 + default MainActor isolation, Swift Testing migration, PinManager refactor, macOS 27 fixes, Xcode 26.5 build fix, accurate OCR, image size in preview, crash fix for watched app bundles. Conflict resolutions: - pbxproj: take upstream Swift 6 test settings, keep MaccyPlus TEST_HOST - Info.plist: keep our appcast + no auto-checks, add upstream pin-reorder UTType - KeyboardShortcuts: our defaults on upstream's `initial:` API - Settings panes: drop upstream-removed `pins`, keep `plugins` - HistoryItemDecorator: keep cached resolvedActions + hasImageData, add upstream has* flags - History.load: keep agent-API uid backfill on upstream PinManager flow; add unfiltered `all` for HistoryAPI/ActionEngine (upstream removed it) - HistoryTests: upstream Swift Testing file + our two agent-field tests ported - README: ours Swift 6 adaptations for fork code: plugin/rule value types and KeyboardLayoutFixer marked nonisolated (upstream idiom), JSPluginRuntime nonisolated again, ActionsCLI drops redundant MainActor.assumeIsolated, AX prompt option as a string literal. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XTuA3qbV1J8eNeXceEW8oN
…boardTests suite on CI Swift 6.3 crashes in EarlyPerfInliner on FloatingPanel's implicit deinit when optimizing (upstream code, exposed by the Swift 6 migration). An explicit @_optimize(none) deinit avoids the pass. Xcode 27 is unaffected. Upstream moved ClipboardTests under SharedStateTests (Swift Testing). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XTuA3qbV1J8eNeXceEW8oN
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.
Merges upstream
p0deje/Maccymaster (54fb9f0, 58 commits since the 2026-09-04 sync).Merge with a merge commit, not squash, so upstream ancestry stays and the next sync stays small.
Upstream brings: Swift 6 + default MainActor isolation, XCTest → Swift Testing migration, PinManager refactor, macOS 27 fixes, Xcode 26.5 build fix, accurate OCR with language detection, image size in preview, crash fix when a watched app bundle changes.
Conflict resolutions:
TEST_HOSTinitial:APIpins, keeppluginsresolvedActions+hasImageData, add upstreamhas*flagsuidbackfill on the PinManager flow; unfilteredallre-added for HistoryAPI/ActionEngineSwift 6 fixes in fork code: plugin/rule value types and
KeyboardLayoutFixermarkednonisolated(upstream idiom),JSPluginRuntimenonisolated again, ActionsCLI drops redundantMainActor.assumeIsolated, AX prompt option as a string literal.Local run before the push: all 230 XCTest unit tests passed. Swift Testing:
ClipboardTests.ignoreCopiesWithUnknownTypes(known live-pasteboard contention) and upstream's new OCR testimageTitleBecomesRecognizedTextfailed locally.🤖 Generated with Claude Code
https://claude.ai/code/session_01XTuA3qbV1J8eNeXceEW8oN