an earlier directory's applied results stay claimed for later ones

1 files changed, 18 insertions, 2 deletions

diff --git a/cmd/krino/sort.go b/cmd/krino/sort.go
index 5a175a4..b516629 100644
--- a/cmd/krino/sort.go
+++ b/cmd/krino/sort.go
@@ -151,6 +151,7 @@ func cmdSort(g *globals, names []string, stdout, stderr io.Writer) int {
 			continue
 		}
 
+		var applied []string // where this directory's applied steps put files
 		quit := func() bool {
 			defer func() {
 				if rerr := l.Release(); rerr != nil {
@@ -262,6 +263,15 @@ func cmdSort(g *globals, names []string, stdout, stderr io.Writer) int {
 				notReviewed = len(actionable) - len(reviewedChains(actionable, approved))
 			}
 			res, aerr := e.Apply(ctx, toApply, approved, j, run)
+			if res != nil {
+				for _, fr := range res.Files {
+					for _, sr := range fr.Steps {
+						if sr.Status == "ok" && sr.Dst != "" {
+							applied = append(applied, sr.Dst)
+						}
+					}
+				}
+			}
 			if aerr != nil {
 				// Interrupted mid-apply (fix round 2026-09-12/item 2):
 				// treated exactly like the cancelled lock wait above - not
@@ -290,9 +300,15 @@ func cmdSort(g *globals, names []string, stdout, stderr io.Writer) int {
 			// This directory is applied (or skipped) now, so the disk is the
 			// truth for the next one: its claims - sources it moved away,
 			// destinations it planned but declined or failed - must not
-			// block a later directory (triage 28i). A dry run applies
-			// nothing, so there they carry over.
+			// block a later directory (triage 28i). What it did put
+			// somewhere stays claimed, so a later (on-conflict overwrite)
+			// takes a free name rather than trash this run's own result
+			// (plan 11 review M1). A dry run applies nothing, so there every
+			// claim carries over.
 			claims = plan.NewClaims()
+			for _, p := range applied {
+				claims.Claim(p)
+			}
 		}
 	}