Slice 2: wire macOS app to shared Rust core (NEEDS XCODE VALIDATION)#7
Merged
Conversation
…idge-swift) Adds RustPolicyBridge/RustSkillsBridge/RustRealtimeBridge.swift (dynamic FFI loaders with Swift fallback), SkillPromptComposer, and routes EntitlementManager + TrialTracker through the Rust policy bridge. CompanionManager/UsageTracker/ AdminAllowlist updated. All additive + // MARK: - Skilly. Conflict resolution: EntitlementManager.swift + TrialTracker.swift 3-way merged (kept develop's v1.6-v2.0 work, grafted the branch's Rust wiring) — no markers. New leanring-buddy/*.swift auto-compile via PBXFileSystemSynchronizedRootGroup (no pbxproj edits). Syntax-validated: swiftc -parse OK on all 8 files. NEEDS HUMAN XCODE VALIDATION (agents cannot run xcodebuild/TCC): build + smoke trial/active/capped/admin turn-start and the Rust-absent fallback path. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Slice 2 of the skills-bridge-swift -> develop merge plan. Wires the macOS app to the
core/Rust workspace landed in Slice 1.What's in it
RustPolicyBridge,RustSkillsBridge,RustRealtimeBridge(dynamic FFI loaders, Swift fallback when the dylib is absent),SkillPromptComposer.EntitlementManager.canStartTurn(),TrialTracker,UsageTracker.CompanionManager,AdminAllowlist. All additive +// MARK: - Skilly.Conflict resolution
EntitlementManager.swiftandTrialTracker.swiftwere 3-way merged (kept develop's v1.6–v2.0 work, grafted the branch's Rust wiring) — no conflict markers. The other 6 Swift files are net-new / branch-only and clean.Validation done (agent-safe)
swiftc -parseOK on all 8 changed Swift files (syntax gate).PBXFileSystemSynchronizedRootGroup(Xcode 16) — noproject.pbxprojedits required.⚠ REQUIRED before merge — human Xcode build
Agents cannot run
xcodebuild(TCC). Please build in Xcode and smoke-test:Depends on: Slice 1 (merged). Independent of Slices 3 (merged) / 4 / 5.