fix(recovery): match write-set locks to repository plans

Author: rldyourmnd

core/app/recovery_operations.go

@@ -556,7 +556,7 @@ func decideRecovery(
 		if lock.Scope != "repository" {
 			decision.Blockers = append(decision.Blockers, "unexpected-lock-scope")
 		}
-		if _, allowed := allowedRepositories[lock.ScopeID]; !allowed {
+		if !repositoryLockBelongsToPlan(lock.ScopeID, allowedRepositories) {
 			decision.Blockers = append(decision.Blockers, "lock-scope-outside-plan")
 		}
 		if lock.DeviceID != deviceID {
@@ -655,6 +655,24 @@ func decideRecovery(
 	return decision
 }
 
+// repositoryLockBelongsToPlan accepts both the legacy bare repository scope
+// and the operation engine's write-set scope (`<repository-id>:<target>`).
+// Locks are keyed by the latter so independent write targets in one repository
+// do not collide, while recovery is scoped by the repository id in the plan.
+// Comparing only exact strings made every interrupted write-set operation look
+// foreign and left its expired lock unrecoverable.
+func repositoryLockBelongsToPlan(scopeID string, allowedRepositories map[string]struct{}) bool {
+	if _, allowed := allowedRepositories[scopeID]; allowed {
+		return true
+	}
+	for repositoryID := range allowedRepositories {
+		if strings.HasPrefix(scopeID, repositoryID+":") {
+			return true
+		}
+	}
+	return false
+}
+
 func processAlive(pid int) (bool, error) {
 	if pid <= 0 {
 		return false, fmt.Errorf("invalid process id %d", pid)

core/app/recovery_operations_test.go

@@ -73,6 +73,22 @@ func TestRecoveryDecisionReportsCompensationWithoutApplyingIt(t *testing.T) {
 	}
 }
 
+func TestRecoveryDecisionAcceptsWriteSetRepositoryLockScope(t *testing.T) {
+	now := time.Now().UTC()
+	snapshot := recoveryDecisionFixture(now)
+	snapshot.Locks[0].ScopeID = "repo_fixture:repository"
+	plan := operations.Plan{
+		Steps: []operations.Step{{
+			StepID: "step-1", Compensation: operations.Compensation{Mode: "manual"},
+		}},
+		Scope: operations.Scope{Repositories: []string{"repo_fixture"}},
+	}
+	decision := decideRecovery(snapshot, plan, now, "device:test")
+	if !decision.Automatable || decision.Classification != "safe-abort" {
+		t.Fatalf("decision=%#v", decision)
+	}
+}
+
 func containsString(values []string, expected string) bool {
 	for _, value := range values {
 		if value == expected {