Skip to content

refactor(desktop): SPM library targets and Sources layout (closes #8848)#9134

Merged
Git-on-my-level merged 2 commits into
mainfrom
agent/m4-mba-cursor-composer/56290212
Jul 6, 2026
Merged

refactor(desktop): SPM library targets and Sources layout (closes #8848)#9134
Git-on-my-level merged 2 commits into
mainfrom
agent/m4-mba-cursor-composer/56290212

Conversation

@Git-on-my-level

@Git-on-my-level Git-on-my-level commented Jul 6, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Carves three leaf SwiftPM library targets out of the monolithic Omi Computer executable: OmiTheme, OmiSupport (DesktopLocalProfile), and OmiWAL (WAL DTOs/models).
  • Moves 25 loose Onboarding*.swift files into Desktop/Sources/Onboarding/, reducing root-level Sources clutter (103 → 77 files).
  • Adds scripts/check-sources-root-layout.py and documents the no-new-root-Swift-files rule in desktop/macos/AGENTS.md.

Follow-up (not in this PR)

  • RewindCore extraction deferred: Rewind/Core/ still references main-app types (TaskActionItem, PowerMonitor, etc.) and needs a shared-models carve-out first.
  • CI wiring for the layout ratchet: add a gated step to .github/workflows/lint.yml (push was blocked here by missing workflow OAuth scope).

Test plan

  • xcrun swift build -c debug --package-path Desktop
  • python3 desktop/macos/scripts/check-sources-root-layout.py

Closes #8848

Made with Cursor

Review in cubic

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 143 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Re-trigger cubic

@Git-on-my-level Git-on-my-level force-pushed the agent/m4-mba-cursor-composer/56290212 branch 2 times, most recently from 717af8c to 6de79e8 Compare July 6, 2026 09:46
Git-on-my-level and others added 2 commits July 6, 2026 16:55
Split OmiTheme, OmiSupport, and OmiWAL out of the monolithic executable,
move onboarding files into Onboarding/, and add a Sources-root layout ratchet
script plus AGENTS.md guidance.

Closes #8848.

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: multica-agent <github@multica.ai>
@Git-on-my-level Git-on-my-level force-pushed the agent/m4-mba-cursor-composer/56290212 branch from 6de79e8 to a347034 Compare July 6, 2026 10:03
@Git-on-my-level

Copy link
Copy Markdown
Collaborator Author

Monitor update for PR #9134:

  • Fixed the rebased AgentBridge runtime query call to pass the new attachment/surface context arguments.
  • Kept the SPM Sources-root guard green after the upstream StartupWarmupPolicy addition by moving it under Sources/Startup/.
  • Restored desktop CI by aligning the desktop agent tool-surface generation and Swift source-invariant tests with the current runtime/tool APIs.
  • Added the required desktop changelog fragment.

Verification passed:

  • git diff --check
  • python3 .github/scripts/check-desktop-changelog.py --base origin/main --head HEAD
  • python3 desktop/macos/scripts/check-sources-root-layout.py
  • desktop/macos/scripts/test-tool-surfaces.sh
  • desktop/macos/scripts/swift-test-suites.sh
  • xcrun swift build -c debug --package-path desktop/macos/Desktop
  • GitHub checks: Lint & Format Check ✅, Desktop Swift Build & Tests ✅

No unresolved review threads were present on the final re-scan.

@Git-on-my-level Git-on-my-level merged commit baec38e into main Jul 6, 2026
3 checks passed
@Git-on-my-level Git-on-my-level deleted the agent/m4-mba-cursor-composer/56290212 branch July 6, 2026 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[desktop/macos] Module structure: one 466-file executable target, 98 loose files in Sources/ root

1 participant