fix(islo): keep explicit lease ids authoritative

steipete · steipete · commit b3e1e01f16b8 · 2026-05-29T01:56:55.000+01:00
diff --git a/internal/providers/islo/backend.go b/internal/providers/islo/backend.go
@@ -412,6 +412,18 @@ func resolveIsloLeaseID(id, repoRoot string, reclaim bool) (string, string, stri
 	if id == "" {
 		return "", "", "", exit(2, "provider=islo requires a Crabbox-created sandbox name, lease id, or slug")
 	}
+	if strings.HasPrefix(id, isloLeasePrefix) {
+		name := strings.TrimPrefix(id, isloLeasePrefix)
+		if !isCrabboxIsloSandboxName(name) {
+			return "", "", "", exit(4, "islo lease %q is not a Crabbox-owned sandbox", id)
+		}
+		if claim, ok, err := resolveExactIsloLeaseClaim(id); err != nil {
+			return "", "", "", err
+		} else if ok {
+			return claim.LeaseID, name, blank(claim.Slug, newLeaseSlug(claim.LeaseID)), nil
+		}
+		return id, name, newLeaseSlug(id), nil
+	}
 	if claim, ok, err := resolveIsloClaim(id); err != nil {
 		return "", "", "", err
 	} else if ok {
@@ -422,20 +434,24 @@ func resolveIsloLeaseID(id, repoRoot string, reclaim bool) (string, string, stri
 		}
 		return claim.LeaseID, strings.TrimPrefix(claim.LeaseID, isloLeasePrefix), blank(claim.Slug, newLeaseSlug(claim.LeaseID)), nil
 	}
-	if strings.HasPrefix(id, isloLeasePrefix) {
-		name := strings.TrimPrefix(id, isloLeasePrefix)
-		if !isCrabboxIsloSandboxName(name) {
-			return "", "", "", exit(4, "islo lease %q is not a Crabbox-owned sandbox", id)
-		}
-		return id, name, newLeaseSlug(id), nil
-	}
 	if !isCrabboxIsloSandboxName(id) {
 		return "", "", "", exit(4, "islo sandbox %q is not claimed by Crabbox; use a Crabbox slug or %s<crabbox-sandbox-name>", id, isloLeasePrefix)
 	}
 	leaseID := isloLeasePrefix + id
 	return leaseID, id, newLeaseSlug(leaseID), nil
 }
 
+func resolveExactIsloLeaseClaim(leaseID string) (core.LeaseClaim, bool, error) {
+	claim, ok, err := resolveLeaseClaim(leaseID)
+	if err != nil {
+		return claim, ok, err
+	}
+	if ok && claim.Provider == isloProvider && claim.LeaseID == leaseID {
+		return claim, true, nil
+	}
+	return core.LeaseClaim{}, false, nil
+}
+
 func isloCleanupCommand(leaseID string) string {
 	return fmt.Sprintf("crabbox stop --provider %s %s", isloProvider, shellQuote(leaseID))
 }
diff --git a/internal/providers/islo/backend_test.go b/internal/providers/islo/backend_test.go
@@ -157,6 +157,13 @@ func TestResolveIsloLeaseIDIgnoresSyntheticSlugCollision(t *testing.T) {
 	if leaseID != "isb_crabbox-repo-abcdef" || name != "crabbox-repo-abcdef" || slug == "isb-crabbox-repo-abcdef" {
 		t.Fatalf("lease=%q name=%q slug=%q", leaseID, name, slug)
 	}
+	leaseID, name, slug, err = resolveIsloLeaseID("isb_crabbox-repo-abcdef", root, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if leaseID != "isb_crabbox-repo-abcdef" || name != "crabbox-repo-abcdef" || slug == "isb-crabbox-repo-abcdef" {
+		t.Fatalf("explicit lease=%q name=%q slug=%q", leaseID, name, slug)
+	}
 }
 
 func TestIsloCleanupCommandQuotesLeaseID(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,13 @@ func TestResolveIsloLeaseIDIgnoresSyntheticSlugCollision(t *testing.T) {`
`157`	`157`	`if leaseID != "isb_crabbox-repo-abcdef" \|\| name != "crabbox-repo-abcdef" \|\| slug == "isb-crabbox-repo-abcdef" {`
`158`	`158`	`t.Fatalf("lease=%q name=%q slug=%q", leaseID, name, slug)`
`159`	`159`	`}`
	`160`	`+ leaseID, name, slug, err = resolveIsloLeaseID("isb_crabbox-repo-abcdef", root, false)`
	`161`	`+ if err != nil {`
	`162`	`+ t.Fatal(err)`
	`163`	`+ }`
	`164`	`+ if leaseID != "isb_crabbox-repo-abcdef" \|\| name != "crabbox-repo-abcdef" \|\| slug == "isb-crabbox-repo-abcdef" {`
	`165`	`+ t.Fatalf("explicit lease=%q name=%q slug=%q", leaseID, name, slug)`
	`166`	`+ }`
`160`	`167`	`}`
`161`	`168`
`162`	`169`	`func TestIsloCleanupCommandQuotesLeaseID(t *testing.T) {`