steveandClaude Opus 4.8
2dd9f2f04f
Build image / build-and-push (push) Successful in 5s
Six real bugs, three of which would have broken the feature's central promise. The worst was that a failed operation threw away the history for changes that had already committed. WithChangeSet buffers HISTORY, not data — the store writes inside fn commit as they go — so discarding the buffer on error left real mutations with no change set and no way to undo them. That is exactly the situation undo exists for: an agent turn that did half a thing and then failed. Now the buffer is written, the summary says the operation failed partway, and the error is still returned. RevertChangeSet does the same for a revert that fails mid-loop. The partial state is still partial, but it is visible and undoable instead of orphaned. versionGuard falsely conflicted whenever one change set held more than one revision for the same entity — an agent turn that moves a bed and then renames it. Each inverse bumps the row's version, so from the second one on the snapshot's version no longer matched the live row and the revert flagged its own work as somebody else's edit. RevertChangeSet now tracks what it has written and the guard compares against that. ListChangeSets found "was this reverted?" with a LEFT JOIN, which emits one duplicate row per revert once a change set has been reverted more than once (undo, redo, undo again). Now a scalar subquery. Reverting an object creation cascade-deleted anything planted in that bed since, quietly. The plops were snapshotted so it was recoverable, but deleting someone's plants as a side effect of an unrelated undo should be reported. It now conflicts and leaves the bed alone. ClearObject cleared by predicate and snapshotted by a separate read, so a plop created between the two was removed with no revision to undo it by. It now clears exactly the ids it read. It also returned an error when only the post-clear re-read failed, which told the caller a clear had failed after it had already applied — inviting a retry of an applied operation. That path now logs the history gap and reports success, matching how record() treats its own write failures. RestoreObject/RestorePlanting could lose the race between the existence check and the insert and surface a raw constraint error. The revert now re-checks and reports ConflictExists, which is what that condition means. RevertChangeSet takes a source, so an agent undoing its own work is distinguishable from a person clicking undo — the whole point of the badge. Refactoring: the three revert bodies repeated a load/guard/unsnapshot/update skeleton (flagged by 3 of 5 models). They are now one generic revertEntity over a small per-type op table, so the ordering, guards and conflict reporting cannot drift apart. The API's view structs duplicated domain types that already carried every field, against the package's direct-JSON convention — dropped. intQuery moved next to the other request helpers. planRevert's comment said three passes where the code runs five. A revert where every revision is already a no-op now answers 200 rather than 201 with a null change set. Six new tests, one per bug. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_01H3zbym8Doka2d7D48maSgZ
81 lines
2.8 KiB
Go
81 lines
2.8 KiB
Go
package api
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
"gitea.stevedudenhoeffer.com/steve/pansy/internal/domain"
|
|
)
|
|
|
|
// Change history and undo (#48). Two endpoints: read a garden's change sets, and
|
|
// revert one. Both encode domain types directly, like the rest of the package —
|
|
// domain.ChangeSet already carries the actor name, revert linkage and per-op
|
|
// counts the history list renders, and its Revisions field is omitempty so the
|
|
// JSON snapshots never ride along on a list response.
|
|
|
|
// historyResponse is the body of GET /gardens/:id/history. hasMore lets the
|
|
// client page without a separate count query over a table that only grows.
|
|
type historyResponse struct {
|
|
ChangeSets []domain.ChangeSet `json:"changeSets"`
|
|
HasMore bool `json:"hasMore"`
|
|
}
|
|
|
|
// revertResponse is the body of POST /change-sets/:id/revert on every path.
|
|
// Carrying both fields regardless is what lets the UI say "2 of 3 changes undone;
|
|
// the north bed was edited since and was left alone" instead of a generic
|
|
// failure — a partial revert really did change things, and pretending otherwise
|
|
// would be a lie. ChangeSet is null when nothing needed reverting.
|
|
type revertResponse struct {
|
|
ChangeSet *domain.ChangeSet `json:"changeSet"`
|
|
Conflicts []domain.RevertConflict `json:"conflicts"`
|
|
}
|
|
|
|
func (h *handlers) getGardenHistory(c *gin.Context) {
|
|
gardenID, ok := parseIDParam(c, "id")
|
|
if !ok {
|
|
return
|
|
}
|
|
// 0 means "the service's default"; it clamps the upper bound too.
|
|
limit := intQuery(c, "limit", 0)
|
|
offset := intQuery(c, "offset", 0)
|
|
|
|
sets, hasMore, err := h.svc.GardenHistory(c.Request.Context(), mustActor(c).ID, gardenID, limit, offset)
|
|
if err != nil {
|
|
writeServiceError(c, err)
|
|
return
|
|
}
|
|
c.JSON(http.StatusOK, historyResponse{ChangeSets: sets, HasMore: hasMore})
|
|
}
|
|
|
|
func (h *handlers) revertChangeSet(c *gin.Context) {
|
|
id, ok := parseIDParam(c, "id")
|
|
if !ok {
|
|
return
|
|
}
|
|
// A revert through the REST API is a person clicking undo. The agent reverts
|
|
// its own work through the service directly and stamps SourceAgent, so the
|
|
// history badge can tell the two apart.
|
|
cs, conflicts, err := h.svc.RevertChangeSet(c.Request.Context(), mustActor(c).ID, id, domain.SourceUI)
|
|
if err != nil {
|
|
writeServiceError(c, err)
|
|
return
|
|
}
|
|
if conflicts == nil {
|
|
conflicts = []domain.RevertConflict{}
|
|
}
|
|
body := revertResponse{ChangeSet: cs, Conflicts: conflicts}
|
|
switch {
|
|
case len(conflicts) > 0:
|
|
// 409 even when part of the revert applied: something the caller asked for
|
|
// did not happen, and the body says exactly what.
|
|
c.JSON(http.StatusConflict, body)
|
|
case cs == nil:
|
|
// Every revision resolved to a no-op (already undone by hand, say). Nothing
|
|
// was created, so 200 rather than a 201 pointing at nothing.
|
|
c.JSON(http.StatusOK, body)
|
|
default:
|
|
c.JSON(http.StatusCreated, body)
|
|
}
|
|
}
|