fix(desktop): add missing OmiSupport import in FocusAssistant#10556
fix(desktop): add missing OmiSupport import in FocusAssistant#10556Git-on-my-level wants to merge 2 commits into
Conversation
1174367 to
4142949
Compare
BasedHardware#10523 added a DesktopLocalProfile.applicationSupportURL() reference to FocusAssistant.swift's goals-load error path, but the file only imported Foundation. DesktopLocalProfile lives in the separate OmiSupport SwiftPM target, so the build fails with "cannot find 'DesktopLocalProfile' in scope" on every PR whose Desktop Swift CI runs the build. Main's own CI stayed green because non-Swift commits path-filter the build step. Adds import OmiSupport — the exact pattern every other source file that references DesktopLocalProfile already follows (12 call sites). Failure-Class: none
The same SCA-103 diagnostics effort (commit d0215a4 + 7038f0c) left two further Swift compile errors that CI surfaces once the full build runs: - RewindIndexer.swift references DesktopLocalProfile.applicationSupportURL() but only imports Foundation. Add import OmiSupport, matching every other file that references DesktopLocalProfile (same root cause as FocusAssistant). - DesktopErrorDiagnosticContext holds [String: Any] and is returned across an actor boundary (AgentRuntimeProcess.consumePendingStartFailureDiagnostics), so it must conform to Sendable. Mark it @unchecked Sendable, the established codebase pattern for Any-bearing value types (RuntimeJSONPayloadBox, AnySendableBox, ConversationCacheWriteScope). These are the remaining two compile errors blocking Desktop Swift Build & Tests; without them the FocusAssistant import alone does not restore a green build. Failure-Class: none
4142949 to
ede7dd6
Compare
Monitor run — completed remaining SCA-103 compile-break fixesThe original PR fixed the missing
Both are in-scope: without them the FocusAssistant import alone does not restore a green build, which is this PR's stated goal. Verification: CI result after push: the three Swift compile errors are resolved — the build now compiles. The remaining check failures are pre-existing test assertion failures from SCA-103 feature code already on
These three test failures and the |
Summary
Fixes a Swift compile break on
mainintroduced by #10523 (SCA-103: add macOS failure diagnostic context):FocusAssistant.swiftreferencesDesktopLocalProfile.applicationSupportURL()but the file only importsFoundation.DesktopLocalProfilelives in the separateOmiSupportmodule, so the Swift build fails withcannot find 'DesktopLocalProfile' in scope.Adds the missing
import OmiSupport— the exact pattern every other source file underSources/follows when it referencesDesktopLocalProfile.Failure-Class: none
Root cause
Commit d0215a4 (merged via #10523) added this diagnostics call to
FocusAssistant.swift:StorageFailureDiagnosticsandRewindDatabaselive underSources/Rewind/Core/— sameOmi Computertarget asFocusAssistant, so no import is needed for them. ButDesktopLocalProfileis declared inSources/OmiSupport/DesktopLocalProfile.swift, a separate SwiftPM target (OmiSupport).FocusAssistant.swifthad onlyimport Foundation. Every other file that referencesDesktopLocalProfile(12 files:RewindDatabase.swift,RewindStorage.swift,AgentRuntimeProcess.swift,AuthService.swift,OmiApp.swift, etc.) includesimport OmiSupport.Why main's CI stayed green
The Desktop Swift CI workflow path-filters its build step on Swift file changes. Non-Swift commits to
main(recent backend/sync/users fixes) skip the build, so the break only surfaces on PRs whose diff or PR-head context triggers the full Swift build — currently blocking #10540, #10543, and any other PR whose Desktop Swift CI runs.Verification
xcrun swiftc -parse FocusAssistant.swift— passes (exit 0, no errors)Test plan