|
|
b89575fb6e
|
FRE-605: Implement Phase 4 Change Tracking & Merge Logic
- Create ChangeTracker class with full version history support
- Document change recording with metadata
- Snapshot creation and restoration
- Change acceptance/rejection workflow
- Change diff generation between snapshots
- Event-based change notifications
- Implement MergeLogic with screenplay-specific rules
- Server change application with conflict detection
- Auto-resolution for non-overlapping edits
- Scene-aware merge rules (same-scene vs different-scene)
- Manual conflict resolution workflow
- Merge validation
- Write comprehensive unit tests
- Change recording and tracking tests
- Snapshot management tests
- Conflict resolution tests
- Screenplay-specific merge rule tests
- Document implementation in analysis/fre605_change_tracking_implementation.md
Architecture: ChangeTracker integrates with Yjs document updates.
MergeLogic applies screenplay-specific rules for concurrent edits.
Co-Authored-By: Paperclip <noreply@paperclip.ing>
|
2026-04-25 02:14:54 -04:00 |
|
|
|
7c684a42cc
|
FRE-600: Fix code review blockers
- Consolidated duplicate UndoManagers to single instance
- Fixed connection promise to only resolve on 'connected' status
- Fixed WebSocketProvider import (WebsocketProvider)
- Added proper doc.destroy() cleanup
- Renamed isPresenceInitialized property to avoid conflict
Co-Authored-By: Paperclip <noreply@paperclip.ing>
|
2026-04-25 00:08:01 -04:00 |
|
|
|
1c74a082e5
|
FRE-603: Add Presence & Visibility Layer UI components
- CollaboratorList: Display connected users with presence state
- RemoteCursorOverlay: Render remote cursors in editor
- EditingIndicator: Show active editors and their context
- Component index for clean imports
- Tests for CollaboratorList
Architecture:
- Polling-based presence updates (100ms for cursors, 500ms for editors)
- Color-coded user indicators
- Line:column cursor positioning
- Selection highlighting with transparency
Files:
- src/components/collaboration/collaborator-list.tsx
- src/components/collaboration/remote-cursor-overlay.tsx
- src/components/collaboration/editing-indicator.tsx
- src/components/collaboration/index.ts
- src/components/collaboration/collaborator-list.test.tsx
Co-Authored-By: Paperclip <noreply@paperclip.ing>
|
2026-04-23 06:37:21 -04:00 |
|
