Files
bookhoard/docs/developer/api/conflicts/bulk_resolve_conflicts.md
T
John O'Keefe eacc33bfac docs(conflicts,queue): Beam WO5 batch — 13 endpoints backfilled, registry pinned
Beam added frontmatter + provenance + labeled examples to the 7 conflict and
6 queue docs, fixing real field drift on the way (resolve response keys,
bulk result shape, dismiss-all deleted count, queue stats counts).

Claude registry verification found TWO Beam catches of Claude's own draft:
- queue routes use :device_id / :item_id params (registry first draft said :id)
- resolve_conflict DOES take a body (ConflictResolutionRequest) — registry
  first draft said nil
Both fixed; gate then surfaced one real Beam defect: example-request used a
nonexistent "resolution" field in resolve + bulk-resolve (real contract:
winner=<source|manual> with required manual_data for manual; strategy=
most_recent|highest_progress|manual). Fixed in the docs.

Pinned by type: ConflictListResponse, ConflictDetailResponse,
ConflictResolveResponse, BulkResolveRequest/Response, QueueStatsResponse,
ConflictResolutionRequest. dismiss-all deleted is an int count.
2026-10-24 15:37:45 -04:00

1.3 KiB

method, path, auth, area
method path auth area
POST /api/conflicts/bulk-resolve jwt conflicts

Bulk Resolve Conflicts

Resolve multiple conflicts at once using a specified strategy.

Endpoint: POST /api/conflicts/bulk-resolve Auth: Required Content-Type: application/json

Request Body

Field Type Required Description
conflict_ids array of UUID Yes Array of conflict UUIDs to resolve
resolution string Yes Resolution strategy: "device", "server", or "highest_progress"

Example Request

{
  "conflict_ids": [
    "550e8400-e29b-41d4-a716-446655440000",
    "660e8400-e29b-41d4-a716-446655440001"
  ],
  "strategy": "highest_progress"
}

Response (200 OK)

{
  "results": [],
  "total": 2,
  "success": 2,
  "failed": 0
}

Error Responses

Code Description
400 Invalid request body
401 Invalid or expired token
400 Invalid resolution strategy