Resolved merge conflicts in chatStore.ts error handling:
- Combined better error handling from main branch with fallback error handling
- Maintains proper task state management during error scenarios
- Preserves comprehensive error reporting and cleanup functionality
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
- Successfully merged main branch into refactor/unify-integration-list
- Resolved conflict in src/pages/Setting/MCP.tsx by preserving the variant="manage" prop
- Cleaned up duplicate sections and maintained proper JSX structure
- Kept the enhanced IntegrationList component with manage variant functionality
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
Resolved conflicts:
- Combined useLayoutEffect and useMemo imports in HistorySidebar
- Removed conflicting Python cache files
- Preserved original PR functionality while integrating latest main branch changes
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
Deleted the old IntegrationList component and updated its imports in ToolSelect and MCP pages to use the new path. This change streamlines the codebase and ensures consistency in component usage.
Resolved conflicts in:
- server/app/controller/chat/history_controller.py: Combined status tracking logic from both branches, including failed task counting from main
- src/components/GroupedHistoryView/index.tsx: Kept all imports and features from project-history-ui branch
- src/pages/Dashboard/Project.tsx: Kept the new GroupedHistoryView implementation from project-history-ui branch
- Removed conflicted __pycache__ files (binary conflicts)
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
