Collab Phase 7: Conflict Resolution UX and Collaboration Observability Dashboards

[cubap]

Summary

Deliver conflict recovery UX and visibility into collaborative system health.

Scope

• Handle durable conflict events in client queue.
• Add reconciliation flow using latest durable state and pending local ops.
• Expose conflict banner and recovery actions to users.
• Add dashboard instrumentation for queue depth, flush success ratio, conflict ratio, commit latency.

Acceptance Criteria

• Conflict paths are user-actionable and recoverable.
• Local pending operations are preserved during reconciliation.
• Telemetry can distinguish intake, queue, flush, and conflict failures.

Dependencies

• Depends on TPEN-services durable flush worker issue.
• Depends on RERUM idempotent overwrite enhancements issue.

[cubap]

Dependency map for execution planning:

Depends on:

• Collab Phase 4: Deferred Commit Engine with Important-Moment and Long-Debounce Flush #556
• Collab Phase 5: Durable Flush Worker from Drafts to RERUM with Conflict Acks TPEN-services#511
• Collab Phase 6: Idempotent Overwrite and Conflict Payload Enhancements for Deferred Commit Clients rerum_server_nodejs#266

Blocks:

• Cross-repo rollout completion milestone for collaboration GA

Related to:

• Collaboration Contract v1.0 Ratification for Services, Interfaces, and RERUM TPEN-services#512

[cubap]

Phase Documentation Addendum

• This phase delivers user-facing conflict handling and observability aligned to Contract sections 9 and 13.
• Required validation: reconciliation from conflict payload, preservation of pending local changes, surfaced telemetry.
• Exit artifacts: conflict UX runbook and dashboard panel definitions.

[cubap]

Opening a new page should also have a stage where the existing pending changes that may be staged are compared and any conflicts are presented before beginning work.