@twin.org/node 0.0.3-next.53 → 0.0.3-next.54

package/dist/locales/en.json

@@ -18,10 +18,11 @@
 		},
 		"bootstrapLegacy": {
 			"noFeaturesEnabled": "No features are enabled in legacy bootstrap mode, at least one feature must be enabled.",
-			"organizationNotSet": "The organisation identity has not been set. Run bootstrap with the \"node-identity\" feature first."
+			"organizationNotSet": "The organisation identity has not been set. Run \"set-node-org-id\"."
 		},
 		"identityCreate": {
 			"invalidMnemonic": "The mnemonic is invalid, it should be 24 words from the standard wordlist.",
+			"onlyOneAssignmentOptionAllowed": "Only one of node-id, node-organization-id, or tenant-organization-id can be set at the same time.",
 			"nodeOrganizationIdNotAvailableInMultiTenantMode": "The node-organization-id option is not available in multi-tenant mode, use tenant-organization-id instead."
 		},
 		"identityImport": {
@@ -1376,14 +1377,12 @@
 						"nodeIdentityCreate": "Creating node identity",
 						"nodeAuthKeyCreate": "Creating node auth key",
 						"trustVerificationMethodCreate": "Creating trust verification method for organisation identity",
-						"nodeIdentitySet": "Setting node identity",
 						"nodeTenantCreate": "Creating node tenant",
 						"organisationCreate": "Creating organisation identity",
 						"blobStorageKeyCreate": "Creating blob storage encryption key for organisation identity",
 						"attestationMethodCreate": "Creating attestation method for organisation identity",
 						"immutableProofMethodCreate": "Creating immutable proof method for organisation identity",
 						"nodeOrganizationIdSet": "Setting node organisation ID",
-						"tenantOrganizationIdSet": "Setting tenant organisation ID",
 						"adminIdentityCreate": "Creating admin user identity",
 						"adminUserCreate": "Creating admin user",
 						"tenantFallback": "No Node-labelled tenant found; using first available tenant"
@@ -1420,6 +1419,9 @@
 						"output-env-prefix": {
 							"description": "Prefix to use for variables in the output .env file."
 						},
+						"node-id": {
+							"description": "If true, set the created identity DID as the node identity."
+						},
 						"node-organization-id": {
 							"description": "If true, set the created identity DID as the node organization ID (not available in multi-tenant mode)."
 						},
@@ -1432,12 +1434,12 @@
 						"processingMnemonic": "Processing mnemonic",
 						"readingMnemonic": "Reading mnemonic",
 						"storingMnemonic": "Storing mnemonic",
-						"existingMnemonic": "Mnemonic already exists",
+						"existingMnemonic": "Mnemonic already exists, skipping creation",
 						"noExistingMnemonic": "No existing mnemonic found",
 						"generatingMnemonic": "Generating mnemonic",
 						"processingIdentity": "Processing identity",
 						"resolvingIdentity": "Resolving identity",
-						"existingIdentity": "Identity already exists",
+						"existingIdentity": "Identity already exists, skipping creation",
 						"noIdentityFound": "No identity found",
 						"creatingIdentity": "Creating identity",
 						"createdIdentity": "Created identity",
@@ -1614,7 +1616,8 @@
 					},
 					"labels": {
 						"resolvingIdentity": "Resolving identity",
-						"stored": "The node identity has been stored"
+						"stored": "The node identity has been stored",
+						"skipping": "The node identity has not changed, skipping"
 					}
 				},
 				"tenant-create": {

package/docs/changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.0.3-next.54](https://github.com/iotaledger/twin-node/compare/node-v0.0.3-next.53...node-v0.0.3-next.54) (2026-06-12)
+
+
+### Features
+
+* improved cli commands ([#206](https://github.com/iotaledger/twin-node/issues/206)) ([cf00850](https://github.com/iotaledger/twin-node/commit/cf0085023a66e187aaaaf3889128c845c73a1faf))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/node-core bumped from 0.0.3-next.53 to 0.0.3-next.54
+
 ## [0.0.3-next.53](https://github.com/iotaledger/twin-node/compare/node-v0.0.3-next.52...node-v0.0.3-next.53) (2026-06-11)
 
 

package/docs/open-api/spec.json

@@ -18243,9 +18243,17 @@
 									"papQueryResponseExample": {
 										"value": [
 											{
-												"@context": "http://www.w3.org/ns/odrl.jsonld",
+												"@context": [
+													"http://www.w3.org/ns/odrl.jsonld",
+													{
+														"dateCreated": "https://schema.org/dateCreated",
+														"dateModified": "https://schema.org/dateModified"
+													}
+												],
 												"@type": "Set",
 												"@id": "urn:rights-management:abc123def456",
+												"dateCreated": "2025-09-03T00:00:00.000Z",
+												"dateModified": "2025-09-03T00:00:00.000Z",
 												"permission": [
 													{
 														"target": "http://example.com/asset/1",
@@ -18468,9 +18476,17 @@
 								"examples": {
 									"papGetResponseExample": {
 										"value": {
-											"@context": "http://www.w3.org/ns/odrl.jsonld",
+											"@context": [
+												"http://www.w3.org/ns/odrl.jsonld",
+												{
+													"dateCreated": "https://schema.org/dateCreated",
+													"dateModified": "https://schema.org/dateModified"
+												}
+											],
 											"@type": "Set",
 											"@id": "urn:rights-management:abc123def456",
+											"dateCreated": "2025-09-03T00:00:00.000Z",
+											"dateModified": "2025-09-03T00:00:00.000Z",
 											"permission": [
 												{
 													"target": "http://example.com/asset/1",
@@ -18661,14 +18677,22 @@
 						"content": {
 							"application/json": {
 								"schema": {
-									"$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolAgreement"
+									"$ref": "#/components/schemas/RightsManagementAgreement"
 								},
 								"examples": {
 									"papGetResponseExample": {
 										"value": {
-											"@context": "http://www.w3.org/ns/odrl.jsonld",
+											"@context": [
+												"http://www.w3.org/ns/odrl.jsonld",
+												{
+													"dateCreated": "https://schema.org/dateCreated",
+													"dateModified": "https://schema.org/dateModified"
+												}
+											],
 											"@type": "Agreement",
 											"@id": "urn:rights-management:abc123def456",
+											"dateCreated": "2025-09-03T00:00:00.000Z",
+											"dateModified": "2025-09-03T00:00:00.000Z",
 											"permission": [
 												{
 													"target": "http://example.com/asset/1",
@@ -18774,14 +18798,22 @@
 						"content": {
 							"application/json": {
 								"schema": {
-									"$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolOffer"
+									"$ref": "#/components/schemas/RightsManagementOffer"
 								},
 								"examples": {
 									"papGetResponseExample": {
 										"value": {
-											"@context": "http://www.w3.org/ns/odrl.jsonld",
+											"@context": [
+												"http://www.w3.org/ns/odrl.jsonld",
+												{
+													"dateCreated": "https://schema.org/dateCreated",
+													"dateModified": "https://schema.org/dateModified"
+												}
+											],
 											"@type": "Offer",
 											"@id": "urn:rights-management:abc123def456",
+											"dateCreated": "2025-09-03T00:00:00.000Z",
+											"dateModified": "2025-09-03T00:00:00.000Z",
 											"permission": [
 												{
 													"target": "http://example.com/asset/1",
@@ -18887,14 +18919,22 @@
 						"content": {
 							"application/json": {
 								"schema": {
-									"$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolSet"
+									"$ref": "#/components/schemas/RightsManagementSet"
 								},
 								"examples": {
 									"papGetResponseExample": {
 										"value": {
-											"@context": "http://www.w3.org/ns/odrl.jsonld",
+											"@context": [
+												"http://www.w3.org/ns/odrl.jsonld",
+												{
+													"dateCreated": "https://schema.org/dateCreated",
+													"dateModified": "https://schema.org/dateModified"
+												}
+											],
 											"@type": "Set",
 											"@id": "urn:rights-management:abc123def456",
+											"dateCreated": "2025-09-03T00:00:00.000Z",
+											"dateModified": "2025-09-03T00:00:00.000Z",
 											"permission": [
 												{
 													"target": "http://example.com/asset/1",
@@ -22595,6 +22635,14 @@
 				"description": "The body of the request - the policy to create (id will be auto-generated if not provided).",
 				"type": "object",
 				"properties": {
+					"dateCreated": {
+						"type": "string",
+						"description": "schema.org dateCreated — ISO 8601 date-time set by PAP on create."
+					},
+					"dateModified": {
+						"type": "string",
+						"description": "schema.org dateModified — ISO 8601 date-time set by PAP on create and update."
+					},
 					"@context": {
 						"$ref": "https://schema.twindev.org/w3c-odrl/OdrlContextType"
 					},
@@ -22971,6 +23019,30 @@
 				],
 				"description": "Transfer Process (DSP compliant) with state REQUESTED, or error."
 			},
+			"RightsManagementAgreement": {
+				"description": "Agreement policy returned by PAP, including optional PAP-managed lifecycle metadata.",
+				"type": "object",
+				"allOf": [
+					{
+						"$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolAgreement"
+					},
+					{
+						"$ref": "#/components/schemas/RightsManagementPolicyMetadata"
+					}
+				]
+			},
+			"RightsManagementOffer": {
+				"description": "Offer policy returned by PAP, including optional PAP-managed lifecycle metadata.",
+				"type": "object",
+				"allOf": [
+					{
+						"$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolOffer"
+					},
+					{
+						"$ref": "#/components/schemas/RightsManagementPolicyMetadata"
+					}
+				]
+			},
 			"RightsManagementPolicy": {
 				"description": "Base type for any ODRL policy stored and managed by the TWIN rights-management PAP.",
 				"type": "object",
@@ -23183,6 +23255,37 @@
 					"@context",
 					"@id",
 					"@type"
+				],
+				"allOf": [
+					{
+						"$ref": "#/components/schemas/RightsManagementPolicyMetadata"
+					}
+				]
+			},
+			"RightsManagementPolicyMetadata": {
+				"description": "PAP-managed metadata attached to stored and returned ODRL policies.",
+				"type": "object",
+				"properties": {
+					"dateCreated": {
+						"type": "string",
+						"description": "schema.org dateCreated — ISO 8601 date-time set by PAP on create."
+					},
+					"dateModified": {
+						"type": "string",
+						"description": "schema.org dateModified — ISO 8601 date-time set by PAP on create and update."
+					}
+				}
+			},
+			"RightsManagementSet": {
+				"description": "Set policy returned by PAP, including optional PAP-managed lifecycle metadata.",
+				"type": "object",
+				"allOf": [
+					{
+						"$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolSet"
+					},
+					{
+						"$ref": "#/components/schemas/RightsManagementPolicyMetadata"
+					}
 				]
 			},
 			"Rule": {

package/docs/usage.md

@@ -44,6 +44,45 @@ vault-key-create: Create a vault key for an identity
 vault-key-import: Import a vault key for an identity
 ```
 
+## Server Configuration
+
+Key environment variables that control how the node server handles authentication. A full reference is in the `.env` example files.
+
+| Variable                   | Default        | Description                                    |
+| -------------------------- | -------------- | ---------------------------------------------- |
+| `TWIN_AUTH_API_KEY_HEADER` | `x-api-key`    | HTTP header name for the API key on requests.  |
+| `TWIN_AUTH_SIGNING_KEY_ID` | `auth-signing` | Vault key ID used to sign authentication JWTs. |
+
+## bootstrap-legacy --help
+
+```text
+bootstrap-legacy: Bootstrap in legacy mode for backwards compatibility, **will be deprecated in future versions**
+
+env-prefix: (string, optional)
+Prefix to use for standard .env files e.g. TWIN_.
+
+load-env: (string, optional)
+Comma separated list of paths to .env files to read input parameters from.
+
+Example: bootstrap-legacy --load-env=".env.bootstrap-legacy"
+```
+
+The command reads the following environment variables (use `load-env` to supply them from a file):
+
+| Variable                     | Default                        | Description                                                                 |
+| ---------------------------- | ------------------------------ | --------------------------------------------------------------------------- |
+| `TWIN_NODE_IDENTITY`         | generated                      | The DID of the node identity.                                               |
+| `TWIN_NODE_MNEMONIC`         | randomly generated             | The Bip39 mnemonic for the node identity seed.                              |
+| `TWIN_FEATURES`              | `admin-user,wallet`            | Comma-separated feature flags: `admin-user`, `wallet`.                      |
+| `TWIN_ORGANIZATION_IDENTITY` | generated                      | The DID to use for the organisation identity.                               |
+| `TWIN_ORGANIZATION_MNEMONIC` | randomly generated             | The Bip39 mnemonic for the organisation identity seed.                      |
+| `TWIN_TENANT_ID`             | generated                      | The tenant ID for the node tenant (multi-tenant only).                      |
+| `TWIN_TENANT_API_KEY`        | generated                      | The API key for the node tenant (multi-tenant only).                        |
+| `TWIN_ADMIN_USER_IDENTITY`   | generated                      | The DID for the admin user identity (`admin-user` feature).                 |
+| `TWIN_ADMIN_USER_MNEMONIC`   | randomly generated             | The Bip39 mnemonic for the admin user identity seed (`admin-user` feature). |
+| `TWIN_ADMIN_USER_NAME`       | `admin@node` or `admin@tenant` | The email/username for the admin user (`admin-user` feature).               |
+| `TWIN_ADMIN_USER_PASSWORD`   | randomly generated             | The password for the admin user (`admin-user` feature).                     |
+
 ## identity-create --help
 
 ```text
@@ -76,145 +115,146 @@ Path to a .env file to store the command output.
 output-env-prefix: (string, optional)
 Prefix to use for variables in the output .env file.
 
+node-id: (boolean, default: 'false', optional)
+If true, set the created identity DID as the node identity.
+
+node-organization-id: (boolean, default: 'false', optional)
+If true, set the created identity DID as the node organization ID (not available in multi-tenant mode).
+
+tenant-organization-id: (string, hex(32), optional)
+The tenant ID to set the created identity DID as the organization ID for (requires multi-tenant mode).
+
 Example: identity-create --mnemonic="..." --fund-wallet=true
 ```
 
 ## Example
 
-### Bootstrap legacy mode will be deprecated in future versions
+### Bootstrap legacy (single command)
+
+Runs the complete bootstrap sequence in one step using values from `.env.bootstrap-legacy`:
 
 ```shell
 twin-node bootstrap-legacy --load-env=".env.bootstrap-legacy"
 ```
 
-### Create the identity for the node
+The sections below show the equivalent step-by-step commands that replicate the bootstrap-legacy process.
 
-```shell
-twin-node identity-create --fund-wallet=true --output-json="node-identity.json" --output-env="node-identity.env" --output-env-prefix=node
-```
-
-### Import existing identity details
+---
 
-```shell
-twin-node identity-import --load-env="my-identity.env" --identity=!MY_DID --mnemonic=!MY_MNEMONIC
-```
+### Step 1 - Create the node identity and associate it with the node
 
-### Associate the identity with the node
+Supply `--fund-wallet=true` when the `wallet` feature is enabled. `--node-id=true` sets the created identity as the node identity in the same step.
 
 ```shell
-twin-node node-set-identity --load-env="node-identity.env" --identity=!NODE_DID
+twin-node identity-create --node-id=true --fund-wallet=true --output-json="node-identity.json" --output-env="node-identity.env" --output-env-prefix=node
 ```
 
-### Add a key associated with the node identity for use in authentication signing
+### Step 2 - Create the authentication signing key for the node
 
 ```shell
-twin-node vault-key-create --load-env="node-identity.env" --identity=!NODE_DID --key-id=!TWIN_AUTH_SIGNING_KEY_ID --output-json="node-auth-key.json" --output-env="node-auth-key.env"
+twin-node vault-key-create --load-env="node-identity.env" --identity=!NODE_DID --key-type=Ed25519 --key-id=!TWIN_AUTH_SIGNING_KEY_ID --overwrite-mode=skip --output-json="node-auth-key.json" --output-env="node-auth-key.env"
 ```
 
-### Import existing authentication signing key details
+To import an existing authentication signing key instead:
 
 ```shell
 twin-node vault-key-import --load-env="node-identity.env,node-auth-key.json" --identity=!NODE_DID --key-id=!TWIN_AUTH_SIGNING_KEY_ID --key-type=!KEY_TYPE --private-key-hex=!PRIVATE_KEY_HEX
 ```
 
-### Import an existing key associated with the node identity for use in authentication signing
+### Step 3 - Create the organisation identity
 
 ```shell
-twin-node vault-key-import --load-env="node-identity.env,my-key.json" --identity=!NODE_DID --key-id=!TWIN_AUTH_SIGNING_KEY_ID --key-type=!KEY_TYPE --private-key-hex=!PRIVATE_KEY_HEX
+twin-node identity-create --load-env="node-identity.env" --fund-wallet=true --output-json="organization-identity.json" --output-env="organization-identity.env" --output-env-prefix=organization
 ```
 
-### Create an organisation identity
+### Step 4 - Add the trust verification method to the organisation identity
 
 ```shell
-twin-node identity-create --load-env="node-identity.env" --fund-wallet=true --output-json="organization-identity.json" --output-env="organization-identity.env" --output-env-prefix=organization
+twin-node identity-verification-method-create --load-env="node-identity.env,organization-identity.env" --identity=!ORGANIZATION_DID --verification-method-type=assertionMethod --verification-method-id=!TWIN_TRUST_VERIFICATION_METHOD_ID --overwrite-mode=skip --output-json="organization-trust.json" --output-env="organization-trust.env"
 ```
 
-### Create a tenant to be used by the node
+### Step 5 - Set the organisation identity on the node (single-tenant)
 
 ```shell
-twin-node tenant-create --load-env="organization-identity.env" --label="node" --public-origin="https://api.example.com" --organization-id=!ORGANIZATION_DID --output-env-prefix=node --output-json="node-tenant.json" --output-env="node-tenant.env"
+twin-node set-node-org-id --load-env="organization-identity.env" --organization-id=!ORGANIZATION_DID
 ```
 
-### Import a tenant to be used by the node
+### Step 6 - Create the node tenant and associate the organisation (multi-tenant only)
 
 ```shell
-twin-node tenant-import --load-env="node-tenant.json" --tenant-id=!NODE_TENANT_ID --api-key=!NODE_API_KEY --label=!NODE_LABEL --public-origin="https://api.example.com"
+twin-node tenant-create --load-env="node-identity.env" --label="Node" --output-json="node-tenant.json" --output-env="node-tenant.env" --output-env-prefix=node
 ```
 
-### Update a tenant to be used by the node
-
 ```shell
-twin-node tenant-update --load-env="node-tenant.json" --tenant-id=!NODE_TENANT_ID --label="New Label"
+twin-node set-tenant-org-id --load-env="node-tenant.env,organization-identity.env" --tenant-id=!NODE_TENANT_ID --organization-id=!ORGANIZATION_DID
 ```
 
-### Set the organization ID on the node
+To import an existing tenant instead:
 
 ```shell
-twin-node set-node-org-id --load-env="organization-identity.env" --organization-id=!ORGANIZATION_DID
+twin-node tenant-import --load-env="node-tenant.json" --tenant-id=!NODE_TENANT_ID --api-key=!NODE_API_KEY --label=!NODE_LABEL --public-origin="https://api.example.com"
 ```
 
-### Set the organization ID on a tenant
+To update an existing tenant:
 
 ```shell
-twin-node set-tenant-org-id --load-env="node-tenant.env,organization-identity.env" --tenant-id=!NODE_TENANT_ID --organization-id=!ORGANIZATION_DID
+twin-node tenant-update --load-env="node-tenant.json" --tenant-id=!NODE_TENANT_ID --label="New Label"
 ```
 
-### Remove an alias from the tenant organization ID legacy list
+To remove a stale organisation alias from a tenant:
 
 ```shell
 twin-node remove-tenant-org-alias --load-env="node-tenant.env" --tenant-id=!NODE_TENANT_ID --alias=!OLD_ORGANIZATION_DID
 ```
 
-### Add a verification method to the organisation identity for attestation
+---
 
-```shell
-twin-node identity-verification-method-create --load-env="node-identity.env,organization-identity.env" --identity=!ORGANIZATION_DID --controller=!NODE_DID --verification-method-id=!TWIN_ATTESTATION_VERIFICATION_METHOD_ID --output-json="organization-attestation.json" --output-env="organization-attestation.env"
-```
+The following steps run when the `admin-user` feature is enabled.
 
-### Import an attestation verification method for the organisation identity
+### Step 7 - Add the blob encryption key to the organisation (if blob encryption is enabled)
 
 ```shell
-twin-node identity-verification-method-import --load-env="node-identity.env,organization-identity.env,organization-attestation.env" --identity=!ORGANIZATION_DID --controller=!NODE_DID --verification-method-id=!DID_VERIFICATION_METHOD_ID --private-key-hex=!DID_VERIFICATION_METHOD_PRIVATE_KEY_HEX
+twin-node vault-key-create --load-env="organization-identity.env" --identity=!ORGANIZATION_DID --key-type=ChaCha20Poly1305 --key-id=!TWIN_BLOB_STORAGE_ENCRYPTION_KEY_ID --overwrite-mode=skip --output-json="organization-blob-encryption.json" --output-env="organization-blob-encryption.env"
 ```
 
-### Create a verifiable credential based on the organisation attestation verification method
+### Step 8 - Add the attestation verification method to the organisation (if attestation is enabled)
 
 ```shell
-twin-node identity-verifiable-credential-create --load-env="organization-identity.env,organization-attestation.env" --identity=!ORGANIZATION_DID --verification-method-id=!TWIN_ATTESTATION_VERIFICATION_METHOD_ID --subject-json="subject.json" --output-json="organization-attestation-credential.json" --output-env="organization-attestation-credential.env"
+twin-node identity-verification-method-create --load-env="node-identity.env,organization-identity.env" --identity=!ORGANIZATION_DID --verification-method-type=assertionMethod --verification-method-id=!TWIN_ATTESTATION_VERIFICATION_METHOD_ID --overwrite-mode=skip --output-json="organization-attestation.json" --output-env="organization-attestation.env"
 ```
 
-### Add a verification method to the organisation identity for immutable proofs
+To import an existing attestation verification method:
 
 ```shell
-twin-node identity-verification-method-create --load-env="node-identity.env,organization-identity.env" --identity=!ORGANIZATION_DID --controller=!NODE_DID --verification-method-id=!TWIN_IMMUTABLE_PROOF_VERIFICATION_METHOD_ID --output-json="organization-immutable-proof.json" --output-env="organization-immutable-proof.env"
+twin-node identity-verification-method-import --load-env="node-identity.env,organization-identity.env,organization-attestation.env" --identity=!ORGANIZATION_DID --verification-method-id=!DID_VERIFICATION_METHOD_ID --private-key-hex=!DID_VERIFICATION_METHOD_PRIVATE_KEY_HEX
 ```
 
-### Add a verification method to the organisation identity for trust verification
+To create a verifiable credential using the attestation verification method:
 
 ```shell
-twin-node identity-verification-method-create --load-env="node-identity.env,organization-identity.env" --identity=!ORGANIZATION_DID --controller=!NODE_DID --verification-method-id=!TWIN_TRUST_VERIFICATION_METHOD_ID --output-json="organization-trust.json" --output-env="organization-trust.env"
+twin-node identity-verifiable-credential-create --load-env="organization-identity.env,organization-attestation.env" --identity=!ORGANIZATION_DID --verification-method-id=!TWIN_ATTESTATION_VERIFICATION_METHOD_ID --subject-json="subject.json" --output-json="organization-attestation-credential.json" --output-env="organization-attestation-credential.env"
 ```
 
-### Add a key associated with the organisation to be used for blob encryption
+### Step 9 - Add the immutable proof verification method to the organisation (if immutable proofs are enabled)
 
 ```shell
-twin-node vault-key-create --load-env="organization-identity.env" --identity=!ORGANIZATION_DID --key-id=!TWIN_BLOB_STORAGE_ENCRYPTION_KEY_ID --key-type=ChaCha20Poly1305 --output-json="organization-blob-encryption.json" --output-env="organization-blob-encryption.env"
+twin-node identity-verification-method-create --load-env="node-identity.env,organization-identity.env" --identity=!ORGANIZATION_DID --verification-method-type=assertionMethod --verification-method-id=!TWIN_IMMUTABLE_PROOF_VERIFICATION_METHOD_ID --overwrite-mode=skip --output-json="organization-immutable-proof.json" --output-env="organization-immutable-proof.env"
 ```
 
-### Create an identity associated with the organisation
+### Step 10 - Create the admin user identity
 
 ```shell
-twin-node identity-create --load-env="organization-identity.env" --controller=!ORGANIZATION_DID --output-json="user-identity.json" --output-env="user-identity.env" --output-env-prefix=user
+twin-node identity-create --load-env="organization-identity.env" --controller=!ORGANIZATION_DID --output-json="admin-user-identity.json" --output-env="admin-user-identity.env" --output-env-prefix=admin_user
 ```
 
-### Create a user login associated with the user identity
+### Step 11 - Create the admin user account
 
 ```shell
-twin-node user-create --load-env="organization-identity.env,user-identity.env,node-tenant.env" --user-identity=!USER_DID --organization-identity=!ORGANIZATION_DID --email="admin@node" --scope="tenant-admin" --output-json="user-account-admin.json" --output-env="user-account-admin.env" --output-env-prefix=admin
+twin-node user-create --load-env="organization-identity.env,admin-user-identity.env,node-tenant.env" --user-identity=!ADMIN_USER_DID --organization-identity=!ORGANIZATION_DID --email="admin@node" --given-name="Node" --family-name="Admin" --scope="tenant-admin,user-admin" --output-json="user-account-admin.json" --output-env="user-account-admin.env" --output-env-prefix=admin
 ```
 
-### Update a user login associated with the user identity
+To update an existing user:
 
 ```shell
-twin-node user-update --load-env="organization-identity.env,user-identity.env,node-tenant.env" --email="admin@node" --scope="tenant-admin,foo"
+twin-node user-update --load-env="organization-identity.env,admin-user-identity.env,node-tenant.env" --email="admin@node" --scope="tenant-admin,user-admin,foo"
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/node",
-	"version": "0.0.3-next.53",
+	"version": "0.0.3-next.54",
 	"description": "TWIN Node serving APIs using the specified configuration",
 	"repository": {
 		"type": "git",
@@ -14,7 +14,7 @@
 		"node": ">=20.0.0"
 	},
 	"dependencies": {
-		"@twin.org/node-core": "0.0.3-next.53"
+		"@twin.org/node-core": "0.0.3-next.54"
 	},
 	"bugs": {
 		"url": "git+https://github.com/iotaledger/twin-node/issues"