mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-16 13:03:31 +08:00
921a352517
This merges the detached-worktree desktop fixes back into main, preserving the existing Computer Use modal changes on main while bringing over the project skill discovery fallback, skills settings cwd-awareness, sidebar tab cleanup, and the empty-session hero composer styling. Constraint: Main already carried newer desktop session UI changes that had to be preserved during merge resolution Rejected: Abort the merge and cherry-pick individual files | unnecessary once the only conflict was isolated to ActiveSession.tsx Confidence: high Scope-risk: moderate Reversibility: clean Directive: When merging detached-worktree desktop branches into main, keep ActiveSession conflict resolution additive so session overlays and composer variants survive together Tested: bun test src/server/__tests__/sessions.test.ts; cd desktop && bun run test -- --run src/__tests__/skillsSettings.test.tsx src/components/layout/Sidebar.test.tsx src/__tests__/pages.test.tsx src/pages/ActiveSession.test.tsx; cd desktop && bun run lint Not-tested: Manual post-merge GUI verification in the local main worktree app bundle