Merges the wip/local-snapshot-20260901 safety commit (94 uncommitted files:
in-flight Account/Mac/Tip work, clipboard-semantics improvements, and the
feature-preview recording tooling) into the newer cloud-agent line.
Conflict resolutions:
- docs/*: honour the branch's deliberate removal in eac44da; drop the now
dangling docs/archive/README.md that only pointed at the deleted files.
- CHANGELOG: both sides describe separate [Unreleased] features; keep both.
- ClipboardSkillSemanticRanker: take the branch's reply routing, which retires
ranking playfulReply/acceptInvitation/... as separate skills in favour of
ordinary/formal/playful variants inside one reply action. Keep the local
link/phone/CJK-density work, which is orthogonal and still referenced.
- OfficialSkillCatalogTests: keep the local "installed exactly once" assertion;
it matches the test's own comment and does not hardcode the default set.
- ClipboardSkillSemanticRankerTests: keep both sides' disjoint test functions;
retarget the two link/phone cases at the branch's row, which no longer
surfaces the retired specialised reply skills.
Verified: xcodebuild build succeeds and the 77 ranker/catalog/analyzer tests
pass.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
rockyandClaude Opus 5
628e983794