Skip to content

Rebase performance onto latest upstream/dev (for #2271) - #26

Draft
joei4cm wants to merge 6 commits into
mainfrom
cursor/rebase-perf-dev-7840
Draft

joei4cm wants to merge 6 commits into
mainfrom
cursor/rebase-perf-dev-7840

Conversation

@joei4cm

@joei4cm joei4cm commented Aug 3, 2026

Copy link
Copy Markdown
Owner

Rebases the performance work onto the latest chen08209/FlClash dev tip and force-updates feat/performance so upstream PR chen08209#2271 is no longer conflicting.

Result

  • Upstream #2271: MERGEABLE / CLEAN
  • Compare vs dev: 1 ahead, 0 behind, 41 files

What changed

  • Cherry-picked the perf commits onto current upstream dev (e673b1e)
  • Dropped diverged android-process / cache history that caused conflicts
  • Kept upstream AnimatedVisibility.sidebar layout; applied selective showLabel watch
  • Included MethodCall decodeMethodArguments adaptation for getTrafficSnapshot
  • Regenerated ConnectionsSnapshot Riverpod output (WhenComplete runBuild)
  • Force-pushed feat/performancec62ffc2

Verification

  • flutter analyze --no-fatal-infos — clean
  • flutter test test/common/ test/core/controller_test.dart test/models/ test/providers/ — all passed (444)
Open in Web Open in Cursor 

chen08209 and others added 6 commits August 2, 2026 11:23
Optimize core service

Fix some issues

Optimize more details
Coalesce traffic IPC via getTrafficSnapshot, lighten connections/proxies
rebuilds, prefer selective provider watches, and adapt the new core method
to upstream MethodCall decode. Regenerates ConnectionsSnapshot Riverpod
output for the current generator.

Co-authored-by: MichaelZ <joei4cm@users.noreply.github.com>
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.

2 participants