refactor(capabilities): inline datamodel structs into parent packages

capabilities/access/claim.go

@@ -1,18 +1,13 @@
-package access
+//go:build !codegen
 
-import (
-	adm "github.com/fil-forge/libforge/capabilities/access/datamodel"
-	cdm "github.com/fil-forge/libforge/capabilities/datamodel"
-	"github.com/fil-forge/ucantone/validator/bindcap"
-)
+package access
 
-type (
-	ClaimArguments = cdm.UnitModel
-	ClaimOK        = adm.ClaimOKModel
-)
+import "github.com/fil-forge/libforge/capabilities"
 
 const ClaimCommand = "/access/claim"
 
+type ClaimArguments = capabilities.Unit
+
 // Claim can be invoked by an agent to claim a set of delegations from the
 // account.
-var Claim, _ = bindcap.New[*ClaimArguments](ClaimCommand)
+var Claim = capabilities.MustNew[*ClaimArguments](ClaimCommand)

capabilities/access/confirm.go

@@ -1,15 +1,15 @@
+//go:build !codegen
+
 package access
 
 import (
-	adm "github.com/fil-forge/libforge/capabilities/access/datamodel"
+	"github.com/fil-forge/libforge/capabilities"
 	"github.com/fil-forge/ucantone/errors"
-	"github.com/fil-forge/ucantone/validator/bindcap"
 )
 
-type (
-	ConfirmArguments = adm.ConfirmArgumentsModel
-	ConfirmOK        = adm.ConfirmOKModel
-)
+// ConfirmOK mirrors ClaimOK — confirming an access request grants the same
+// shape of delegations bundle as claiming them.
+type ConfirmOK = ClaimOK
 
 // ConfirmMetaKey is the key in metadata in any delegation created by a
 // successful access request. The value is a link back to the `/access/confirm`
@@ -19,7 +19,7 @@ const ConfirmMetaKey = "accessConfirm"
 const ConfirmCommand = "/access/confirm"
 
 // Confirm can be invoked by an agent to confirm an access request.
-var Confirm, _ = bindcap.New[*ConfirmArguments](ConfirmCommand)
+var Confirm = capabilities.MustNew[*ConfirmArguments](ConfirmCommand)
 
 const (
 	InvalidAccessConfirmSubjectErrorName = "InvalidAccessConfirmSubject"