feat: master/agent phase 5 — drift and merge, backend (#10) #30

2026-10-13T09:02:45Z

shcizo commented

2026-10-13 09:02:45 +00:00

Summary

Drift detection: model.Service.Drifted() compares desired and running version by digest (tag when the digest is unknown). services.awaiting_inventory hides drift between a job result and the next inventory write.
Poll and webhook jobs are refused for a drifted service; POST /services/{id}/restore (manual job to desired_ref) and POST /services/{id}/accept (running version becomes desired, guarded by actual = Service.RunningRef).
Move suggestions (store.MoveCandidates, Compose only) and POST /services/{id}/merge: the old row keeps its id, mode, desired_ref and history and takes the new location; the duplicate is deleted.
Backend only. The buttons and badges come with #28, on top of the Ledger UI (#18).

Closes #10

Test plan

gofmt -l ., go vet ./..., go test ./...
go test -race ./internal/agent/... ./internal/master/... ./internal/e2e/
go test -tags integration ./internal/master/store/ against postgres:17-alpine
On the server: migration 0005 applies; no drift shown after a normal update
On the server: manual docker compose up with another tag gives drift; webhook for an auto service is refused
On the server: restore and accept via POST; merge after moving a stack

## Summary - Drift detection: `model.Service.Drifted()` compares desired and running version by digest (tag when the digest is unknown). `services.awaiting_inventory` hides drift between a job result and the next inventory write. - Poll and webhook jobs are refused for a drifted service; `POST /services/{id}/restore` (manual job to `desired_ref`) and `POST /services/{id}/accept` (running version becomes desired, guarded by `actual` = `Service.RunningRef`). - Move suggestions (`store.MoveCandidates`, Compose only) and `POST /services/{id}/merge`: the old row keeps its id, mode, `desired_ref` and history and takes the new location; the duplicate is deleted. - Backend only. The buttons and badges come with #28, on top of the Ledger UI (#18). Closes #10 ## Test plan - [x] `gofmt -l .`, `go vet ./...`, `go test ./...` - [x] `go test -race ./internal/agent/... ./internal/master/... ./internal/e2e/` - [x] `go test -tags integration ./internal/master/store/` against postgres:17-alpine - [ ] On the server: migration 0005 applies; no drift shown after a normal update - [ ] On the server: manual `docker compose up` with another tag gives drift; webhook for an auto service is refused - [ ] On the server: restore and accept via POST; merge after moving a stack

shcizo added 5 commits 2026-10-13 09:02:47 +00:00

feat(store): drift state, move candidates and service merge (#10 ) 061243f5da

Adds services.awaiting_inventory, Service.Drifted/RunsRef/RunningRef, AcceptRunning, MoveCandidates, MergeSources and MergeService, and maps a job for a deleted service to ErrNotFound.

feat(jobs): refuse poll and webhook jobs for drifted services, add restore (#10 ) d0bf3e09d9

feat(web): restore, accept and merge endpoints for drifted and moved services (#10 ) 19a21da7bf

docs: phase 5 plan, drift and merge in README and CLAUDE.md (#10 ) b7d105e841

fix(master): review fixes for drift restore and accept (#10 ) df8f621683

shcizo merged commit 919ad91710 into main

2026-10-13 09:04:39 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: shcizo/package-updater#30