fix(config): preserve catalog adoption in key transaction

Carry the catalog ownership state introduced by the lower stack through CommitCatalogProviderKey, including legacy-row adoption, and update the serialized repair regression for the stacked return contract.

Amp-Thread-ID: https://ampcode.com/threads/T-01a043da-1703-70c5-9d8d-904cd8fd964b
Co-authored-by: Pierre Bruno <pierrebruno@hotmail.ch>

Author: ampagent

internal/config/writer.go

@@ -895,11 +895,18 @@ func CommitCatalogProviderKey(path, catalogID, key string) (EnsuredProvider, err
 	}
 	result := EnsuredProvider{}
 	_, err = runProviderProfileOperation(path, true, false, func(op *providerProfileOperation) error {
-		owner, owned, err := catalogProviderOwner(op.config.Providers, descriptor.ID)
+		ownerIndex, ownership, err := catalogProviderOwner(op.config.Providers, descriptor.ID)
 		if err != nil {
 			return err
 		}
-		if !owned {
+		owner := ProviderProfile{}
+		switch ownership {
+		case catalogOwnershipOwned:
+			owner = op.config.Providers[ownerIndex]
+		case catalogOwnershipAdoptable:
+			op.config.Providers[ownerIndex].CatalogID = descriptor.ID
+			owner = op.config.Providers[ownerIndex]
+		case catalogOwnershipNone:
 			owner = ProviderProfile{Name: descriptor.ID, ProviderKind: providerKindForCatalogTransport(descriptor.Transport), CatalogID: descriptor.ID, BaseURL: descriptor.DefaultBaseURL, Model: descriptor.DefaultModel}
 			if err := upsertProviderConfig(&op.config, owner, false); err != nil {
 				return err

internal/config/writer_test.go

@@ -1452,7 +1452,7 @@ func TestRepairUnnamedProviderSerializesWithConcurrentMutation(t *testing.T) {
 
 	repairDone := make(chan error, 1)
 	go func() {
-		_, err := RepairUnnamedProvider(path, "work")
+		_, _, err := RepairUnnamedProvider(path, "work")
 		repairDone <- err
 	}()
 	<-acquired