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.
This commit is contained in:
1 parent
fa00d6d3cb
commit
eacc33bfac
14 files changed
+224
-98
No files matched your search
@@ -1,3 +1,11 @@
|
||||
---
|
||||
method: POST
|
||||
path: /api/conflicts/:id/resolve
|
||||
auth: jwt
|
||||
area: conflicts
|
||||
---
|
||||
<!-- source: internal/handlers/conflicts.go:208 ConflictHandler.ResolveConflict -->
|
||||
|
||||
# Resolve Conflict
|
||||
|
||||
Resolve a specific conflict by choosing which version to keep.
|
||||
@@ -20,19 +28,22 @@ Resolve a specific conflict by choosing which version to keep.
|
||||
|
||||
### Example Request
|
||||
|
||||
```json
|
||||
```json example-request
|
||||
{
|
||||
"resolution": "device"
|
||||
"winner": "kobo"
|
||||
}
|
||||
```
|
||||
|
||||
`winner` is one of the conflict's source keys (e.g. `"kobo"`, `"koreader"`,
|
||||
`"web"`) or `"manual"` — the latter requires `manual_data`.
|
||||
|
||||
## Response (200 OK)
|
||||
|
||||
```json
|
||||
```json example-response
|
||||
{
|
||||
"message": "Conflict resolved successfully",
|
||||
"conflict_id": "uuid",
|
||||
"resolution": "device"
|
||||
"conflict_resolved": true,
|
||||
"applied_to": {},
|
||||
"devices_synced": []
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
Reference in new issue
Block a user