Michael Freno b0ac78c9fc FRE-605: Wire ChangeTracker, MergeLogic and ConflictDetectionAlerts together ...

- Add event emitter to MergeLogic for conflict-detected, conflict-resolved, merge-complete events
- Connect MergeLogic.getLastLocalChange() to ChangeTracker for conflict detection
- Wire ConflictDetectionAlerts component to MergeLogic conflict events
- Add integration tests for full change tracking + merge workflow (8 new tests)
- All 89 tests pass

Co-Authored-By: Paperclip <noreply@paperclip.ing>

2026-04-28 05:17:16 -04:00

agents

Auto-commit 2026-04-27 19:13

2026-04-27 19:13:03 -04:00

analysis

FRE-587 Phase 5: Add offline persistence + UI components

2026-04-25 02:24:22 -04:00

brand

FRE-600: Fix code review blockers

2026-04-25 00:08:01 -04:00

dist

FRE-709: Final state - DONE, awaiting API sync

2026-04-26 20:58:07 -04:00

marketing

Auto-commit 2026-04-27 12:34

2026-04-27 12:34:30 -04:00

memory

Auto-commit 2026-04-27 12:34

2026-04-27 12:34:30 -04:00

node_modules

Auto-commit 2026-04-27 19:13

2026-04-27 19:13:03 -04:00

plans

FRE-4441: Review silent active run for CMO - false positive

2026-04-27 15:12:39 -04:00

public

feat(FRE-596): add PWA setup and responsive design

2026-04-28 01:48:48 -04:00

scripts

FRE-709: COMPLETE - simple text marker

2026-04-26 20:43:40 -04:00

server

FRE-622: Wire analytics services to tRPC API layer with comprehensive router

2026-04-27 22:55:15 -04:00

src

FRE-605: Wire ChangeTracker, MergeLogic and ConflictDetectionAlerts together

2026-04-28 05:17:16 -04:00

src-tauri

FRE-600: Fix code review blockers

2026-04-25 00:08:01 -04:00

.env.example

FRE-608: Add Turso database setup with Drizzle ORM

2026-04-24 15:41:03 -04:00

.gitignore

FRE-600: Fix code review blockers

2026-04-25 00:08:01 -04:00

check-identity.js

drop skills from here

2026-03-31 14:06:06 -04:00

drizzle.config.ts

FRE-608: Add Turso database setup with Drizzle ORM

2026-04-24 15:41:03 -04:00

index.html

feat(FRE-596): add PWA setup and responsive design

2026-04-28 01:48:48 -04:00

package-lock.json

FRE-709: Document duplicate recovery wake - FRE-635 already recovered via FRE-708

2026-04-26 20:23:14 -04:00

package.json

FRE-709: Document duplicate recovery wake - FRE-635 already recovered via FRE-708

2026-04-26 20:23:14 -04:00

test.db

Add waitlist schema for marketing (FRE-635)

2026-04-26 06:21:20 -04:00

tsconfig.json

FRE-600: Implement Phase 1 WebSocket + Yjs CRDT foundation

2026-04-22 23:08:27 -04:00

vite.config.ts

FRE-592: Fix remaining code review blockers and add tests

2026-04-24 08:31:42 -04:00

vitest.config.ts

FRE-592: Fix remaining code review blockers and add tests

2026-04-24 08:31:42 -04:00

Description

No description provided

480 MiB

Languages

Markdown 100%