mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-16 13:03:31 +08:00
8ee4bf682a
Bring back the narrow, previously validated sidebar recovery and Windows x64 sidecar compatibility fixes that were present on worktree branches but absent from the canonical local main checkout. The broader worktree branch is intentionally not merged because it would replay unrelated history and risk dropping current main work. Constraint: The local main worktree already contains unrelated Settings and portable storage edits, so only the recovery hunks are staged. Rejected: Merge 1506086927/main wholesale | its history includes broad rollback/replay commits that would remove current main changes. Confidence: high Scope-risk: narrow Directive: Recover future worktree fixes by cherry-picking or staging narrow hunks; do not merge drifted worktree branches wholesale. Tested: cd desktop && bun run test -- --run src/components/layout/Sidebar.test.tsx scripts/build-sidecars.test.ts Not-tested: Full bun run verify due unrelated dirty Settings/portable-storage worktree changes.