Claude/resolve merge conflicts mb97 m#41
Merged
agenticassets merged 2 commits intomainfrom Jan 27, 2026
Merged
Conversation
This commit merges approved optimizations from: - cursor/AGENTIC-18-request-waterfalls-agent-c76b - cursor/AGENTIC-19-editor-re-render-optimization-537c Changes include: **API Route Optimizations (Branch 18):** - Use Promise.all for parallel fetching of user data in tasks/route.ts - Use Promise.all for parallel fetching in continue/route.ts - Extract getMcpServersForUser helper for cleaner code **Page-Level Optimizations (Branch 18):** - Parallel fetch session and GitHub stars in app/page.tsx - Parallel fetch in app/[owner]/[repo]/page.tsx - Parallel fetch in app/new/[owner]/[repo]/page.tsx - Parallel fetch in app/tasks/page.tsx - Parallel fetch in app/repos/[owner]/[repo]/layout.tsx **React Component Optimizations (Branch 19):** - Wrap FileDiffViewer with memo() for render optimization - Hoist constants (DIFF_VIEW_MODE, IMAGE_MIME_TYPES) outside component - Add memoized derived state (isFilesMode, isChangesMode, diffViewTheme) - Memoize editor options, language, and theme in FileEditor - Use static strings in console.error calls per security guidelines Rejected patterns (per code review): - NDJSON streaming (adds complexity without real benefit) - startTransition (minimal benefit for sync state updates) - Nested callback ref patterns (creates stale closure risk)
Conflicts resolved in 3 files: - app/api/tasks/route.ts: Keep Promise.all() with getMcpServersForUser helper for parallel data fetching (better performance and DRY principles) - components/file-diff-viewer.tsx: Use React 19 startTransition for state updates, cachedDiffData memoization for proper deps, static logging - components/file-editor.tsx: Add startTransition import, remove duplicate editorLanguage/editorTheme/editorOptions declarations Merged features from main: - MCP guide documentation - Rate limit indexes migration - Code review improvements - Editor re-render optimizations https://claude.ai/code/session_01LAxLpTMGTZrU4sqvwxRkK3
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
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
2 participants
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.
No description provided.