@rootzero/contracts 1.1.0 → 1.3.0

package/blocks/Schema.sol

@@ -11,26 +11,30 @@ pragma solidity ^0.8.33;
 // - a block without braces has no payload, e.g. `#unit`
 // - commas separate siblings at every level
 // - braces define parent-child boundaries
-// - command requests start with the input run when the request schema is non-empty
-// - postcheck command requests include a constraint run after the input run; if the
-//   request schema is empty, the constraint run starts the request
-// - command state starts with the active state run; trailing state globals may follow
+// - command requests are a single run when the request schema is non-empty
+// - command state is a single active state run without trailing globals
 // - run items may repeat at top level for batching
 // - `maybe #x { ... }` marks an optional block item
 // - `many #x { ... }` emits one generic list block containing repeated `#x` items
 // - `resources` fields are chain-specific resource words; one chain type may
 //   pack them differently from another, but a given chain type must use one
 //   stable format everywhere. EVM resources use the low 128 bits as native value.
+// - dotted field names and aliases, e.g. `dst.chain` or `#bytes as dst.payload`,
+//   are offchain projection metadata only and do not change runtime encoding
 // - fixed fields are packed in declaration order
 // - blocks have fixed fields followed by a dynamic child-block tail
 // - child block tails are embedded directly, without an extra stream wrapper
 // - `#bytes` is a reserved child block that stores raw bytes and has no body
+// - `#string` is a reserved child block that stores UTF-8 string bytes and has no body
 // - generic `#data` uses the stable key derived from `#data`
 // - generic lists use the stable key derived from `#list`
 // - keys are derived from block names, e.g. bytes4(keccak256("#amount"))
 // - see `docs/Schema.md` for the full working spec
 //
 // Pipeline state:
+// - command request and state streams are each a single run of blocks under the
+//   current protocol convention; the block format may support other shapes in
+//   future protocol surfaces
 // - `balance(...)` and `custody(...)` are live, linear state in the active command pipeline
 // - pipeline state belongs to the active account while the pipeline is executing
 // - while a balance or custody is in-flight as pipeline state, it is not simultaneously persisted
@@ -73,7 +77,9 @@ library Schemas {
     string constant Bounty = "#bounty { uint amount, bytes32 relayer }";
     string constant Fee = "#fee { uint amount }";
     string constant Auth = "#auth { uint cid, uint deadline, #bytes as proof }";
+    string constant Label = "#label { uint id, bytes32 namespace, #string as name }";
     string constant Bytes = "#bytes";
+    string constant String = "#string";
     string constant Data = "#data";
     string constant List = "#list";
     string constant Evm = "#evm";

package/blocks/Writers.sol

@@ -24,6 +24,7 @@ struct Writer {
 library Hints {
     uint constant Any = 128;
     uint constant Bytes = 128;
+    uint constant String = 128;
     uint constant Step = 256;
     uint constant Call = 256;
     uint constant Context = 512;
@@ -116,6 +117,14 @@ library Writers {
         return allocFromHint(count, Hints.Bytes);
     }
 
+    /// @notice Allocate a writer for `count` STRING blocks using a per-block capacity hint.
+    /// @dev The backing buffer expands automatically if encoded string blocks exceed the initial hint.
+    /// @param count Number of string blocks to allocate space for.
+    /// @return writer Allocated growable writer.
+    function allocStrings(uint count) internal pure returns (Writer memory writer) {
+        return allocFromHint(count, Hints.String);
+    }
+
     /// @notice Allocate a writer sized for exactly `count` 32-byte-payload blocks.
     /// @param count Number of blocks to allocate space for.
     /// @return writer Allocated writer.
@@ -862,6 +871,13 @@ library Writers {
         appendBlock(writer, Keys.Bytes, data);
     }
 
+    /// @notice Append a STRING block.
+    /// @param writer Destination writer; `i` is advanced by the encoded STRING block length.
+    /// @param data String payload.
+    function appendString(Writer memory writer, string memory data) internal pure {
+        appendBlock(writer, Keys.String, bytes(data));
+    }
+
     /// @notice Append a STEP block with a nested request BYTES payload.
     /// @param writer Destination writer; `i` is advanced by the encoded STEP block length.
     /// @param target Command target identifier.

package/commands/Base.sol

@@ -3,8 +3,9 @@ pragma solidity ^0.8.33;
 
 import {NodeCalls} from "../core/Calls.sol";
 import {CommandEvent} from "../events/Command.sol";
+import {LabeledEvent} from "../events/Labeled.sol";
 import {Keys} from "../blocks/Keys.sol";
-import {Ids, Selectors} from "../utils/Ids.sol";
+import {Ids} from "../utils/Ids.sol";
 
 /// @notice Execution context passed to every command invocation.
 struct CommandContext {
@@ -19,8 +20,8 @@ struct CommandContext {
 /// @title CommandBase
 /// @notice Abstract base for all rootzero command contracts.
 /// Provides access control modifiers, event emission, and the `commandId`
-/// helper used to derive stable identifiers for named commands.
-abstract contract CommandBase is NodeCalls, CommandEvent {
+/// helper used to derive stable identifiers for command selectors.
+abstract contract CommandBase is NodeCalls, CommandEvent, LabeledEvent {
     /// @dev Thrown when `onlyActive` finds that `deadline` has already passed.
     error Expired();
 
@@ -44,12 +45,12 @@ abstract contract CommandBase is NodeCalls, CommandEvent {
         _;
     }
 
-    /// @notice Derive the deterministic node ID for a named command on this contract.
-    /// The ID encodes the ABI selector of `name((bytes32,bytes,bytes))` and
-    /// `address(this)`, making it unique per (function name, contract address) pair.
-    /// @param name Command function name (without argument list).
+    /// @notice Derive the deterministic node ID for a command selector on this contract.
+    /// The ID encodes the ABI selector and `address(this)`, making it unique
+    /// per (function selector, contract address) pair.
+    /// @param selector Command entrypoint selector.
     /// @return Command node ID.
-    function commandId(string memory name) internal view returns (uint) {
-        return Ids.toCommand(Selectors.command(name), address(this));
+    function commandId(bytes4 selector) internal view returns (uint) {
+        return Ids.toCommand(selector, address(this));
     }
 }

package/commands/Burn.sol

@@ -20,19 +20,18 @@ abstract contract BurnHook {
 /// @notice Command that irreversibly destroys each BALANCE state block via a virtual hook.
 /// Produces no output state.
 abstract contract Burn is CommandBase, BurnHook {
-    string private constant NAME = "burn";
-
-    uint internal immutable burnId = commandId(NAME);
+    uint internal immutable burnId = commandId(this.burn.selector);
 
     constructor() {
-        emit Command(host, burnId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, burnId, "0:1:0", "", Keys.Balance, Keys.Empty, false);
+        emit Labeled(burnId, bytes32(0), "burn");
     }
 
     /// @notice Burn each BALANCE block from the command state.
     /// @param c Command context; `c.state` must contain BALANCE blocks.
     /// @return Empty output state.
     function burn(CommandContext calldata c) external onlyCommand returns (bytes memory) {
-        (Cur memory state, , ) = Cursors.init(c.state, 0, 1);
+        (Cur memory state, , ) = Cursors.init(c.state, 1);
 
         while (state.i < state.len) {
             (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();

package/commands/Credit.sol

@@ -20,12 +20,11 @@ abstract contract CreditAccountHook {
 /// @notice Command that delivers BALANCE state blocks to an account via a virtual hook.
 /// Use for internally recording credits that have already been settled externally.
 abstract contract CreditAccount is CommandBase, CreditAccountHook {
-    string private constant NAME = "creditAccount";
-
-    uint internal immutable creditAccountId = commandId(NAME);
+    uint internal immutable creditAccountId = commandId(this.creditAccount.selector);
 
     constructor() {
-        emit Command(host, creditAccountId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, creditAccountId, "0:1:0", "", Keys.Balance, Keys.Empty, false);
+        emit Labeled(creditAccountId, bytes32(0), "creditAccount");
     }
 
     /// @notice Credit each BALANCE block from the command state to the command account.
@@ -34,7 +33,7 @@ abstract contract CreditAccount is CommandBase, CreditAccountHook {
     function creditAccount(
         CommandContext calldata c
     ) external onlyCommand returns (bytes memory) {
-        (Cur memory state, , ) = Cursors.init(c.state, 0, 1);
+        (Cur memory state, , ) = Cursors.init(c.state, 1);
 
         while (state.i < state.len) {
             (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();

package/commands/Debit.sol

@@ -22,19 +22,18 @@ abstract contract DebitAccountHook {
 /// Use for internally recording debits. The virtual `debitAccount` hook is called once per
 /// AMOUNT block; the default batch implementation handles the full request loop.
 abstract contract DebitAccount is CommandBase, DebitAccountHook {
-    string private constant NAME = "debitAccount";
-
-    uint internal immutable debitAccountId = commandId(NAME);
+    uint internal immutable debitAccountId = commandId(this.debitAccount.selector);
 
     constructor() {
-        emit Command(host, debitAccountId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, false);
+        emit Command(host, debitAccountId, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false);
+        emit Labeled(debitAccountId, bytes32(0), "debitAccount");
     }
 
     /// @notice Override to customize request parsing or batching for debits.
     /// The default implementation iterates AMOUNT blocks, calls
     /// `debitAccount`, and emits matching BALANCE blocks.
     function debitAccount(bytes32 account, bytes calldata request) internal virtual returns (bytes memory) {
-        (Cur memory input, uint groups, ) = Cursors.init(request, 0, 1);
+        (Cur memory input, uint groups, ) = Cursors.init(request, 1);
         Writer memory writer = Writers.allocBalances(groups);
 
         while (input.i < input.len) {

package/commands/Deposit.sol

@@ -37,12 +37,11 @@ abstract contract DepositPayableHook {
 /// Use `deposit` for assets arriving from outside the protocol (e.g. ERC-20 transfers, ETH).
 /// For internal balance deductions, use `debitAccount` instead.
 abstract contract Deposit is CommandBase, DepositHook {
-    string private constant NAME = "deposit";
-
-    uint internal immutable depositId = commandId(NAME);
+    uint internal immutable depositId = commandId(this.deposit.selector);
 
     constructor() {
-        emit Command(host, depositId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, false);
+        emit Command(host, depositId, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false);
+        emit Labeled(depositId, bytes32(0), "deposit");
     }
 
     /// @notice Deposit AMOUNT request blocks into the command account and output matching BALANCE blocks.
@@ -51,7 +50,7 @@ abstract contract Deposit is CommandBase, DepositHook {
     function deposit(
         CommandContext calldata c
     ) external onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups, ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, uint groups, ) = Cursors.init(c.request, 1);
         Writer memory writer = Writers.allocBalances(groups);
 
         while (request.i < request.len) {
@@ -69,12 +68,11 @@ abstract contract Deposit is CommandBase, DepositHook {
 /// @notice Command that receives externally sourced assets and records them as BALANCE state.
 /// Use `depositPayable` when the hook needs tracked access to `msg.value` via a mutable budget.
 abstract contract DepositPayable is CommandBase, Payable, DepositPayableHook {
-    string private constant NAME = "depositPayable";
-
-    uint internal immutable depositPayableId = commandId(NAME);
+    uint internal immutable depositPayableId = commandId(this.depositPayable.selector);
 
     constructor() {
-        emit Command(host, depositPayableId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, true);
+        emit Command(host, depositPayableId, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, true);
+        emit Labeled(depositPayableId, bytes32(0), "depositPayable");
     }
 
     /// @notice Deposit AMOUNT request blocks with access to a mutable native-value budget.
@@ -83,7 +81,7 @@ abstract contract DepositPayable is CommandBase, Payable, DepositPayableHook {
     function depositPayable(
         CommandContext calldata c
     ) external payable onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups, ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, uint groups, ) = Cursors.init(c.request, 1);
         Writer memory writer = Writers.allocBalances(groups);
         Budget memory budget = valueBudget();
 

package/commands/Payout.sol

@@ -22,20 +22,19 @@ abstract contract PayoutHook {
 /// @notice Command that sinks BALANCE state blocks to matching ACCOUNT request blocks.
 /// Each BALANCE block is paired with one ACCOUNT block at the same position.
 abstract contract Payout is CommandBase, PayoutHook {
-    string private constant NAME = "payout";
-
-    uint internal immutable payoutId = commandId(NAME);
+    uint internal immutable payoutId = commandId(this.payout.selector);
 
     constructor() {
-        emit Command(host, payoutId, NAME, "1:1:0", Schemas.Account, Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, payoutId, "1:1:0", Schemas.Account, Keys.Balance, Keys.Empty, false);
+        emit Labeled(payoutId, bytes32(0), "payout");
     }
 
     /// @notice Pay out BALANCE state blocks to matching ACCOUNT request blocks.
     /// @param c Command context; `c.state` must contain BALANCE blocks and `c.request` matching ACCOUNT blocks.
     /// @return Empty output state.
     function payout(CommandContext calldata c) external onlyCommand returns (bytes memory) {
-        (Cur memory state, uint groups, ) = Cursors.init(c.state, 0, 1);
-        (Cur memory request, ) = Cursors.init(c.request, 0, 1, groups);
+        (Cur memory state, uint groups, ) = Cursors.init(c.state, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1, groups);
 
         while (state.i < state.len) {
             (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();

package/commands/Provision.sol

@@ -33,19 +33,18 @@ abstract contract ProvisionPayableHook {
 /// @notice Command that provisions assets to peer hosts from ALLOCATION request blocks.
 /// Each request block supplies the target host plus an asset amount; the output is a CUSTODY state stream.
 abstract contract Provision is CommandBase, ProvisionHook {
-    string private constant NAME = "provision";
-
-    uint internal immutable provisionId = commandId(NAME);
+    uint internal immutable provisionId = commandId(this.provision.selector);
 
     constructor() {
-        emit Command(host, provisionId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, false);
+        emit Command(host, provisionId, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false);
+        emit Labeled(provisionId, bytes32(0), "provision");
     }
 
     /// @notice Provision ALLOCATION request blocks and output matching CUSTODY state blocks.
     /// @param c Command context; `c.request` must contain ALLOCATION blocks.
     /// @return CUSTODY block stream matching the provisioned allocations.
     function provision(CommandContext calldata c) external onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups, ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, uint groups, ) = Cursors.init(c.request, 1);
         Writer memory writer = Writers.allocCustodies(groups);
 
         while (request.i < request.len) {
@@ -64,12 +63,11 @@ abstract contract Provision is CommandBase, ProvisionHook {
 /// Each request block supplies the target host plus an asset amount; the output is a CUSTODY state stream.
 /// The hook receives a mutable native-value budget drawn from `msg.value`.
 abstract contract ProvisionPayable is CommandBase, Payable, ProvisionPayableHook {
-    string private constant NAME = "provisionPayable";
-
-    uint internal immutable provisionPayableId = commandId(NAME);
+    uint internal immutable provisionPayableId = commandId(this.provisionPayable.selector);
 
     constructor() {
-        emit Command(host, provisionPayableId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, true);
+        emit Command(host, provisionPayableId, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, true);
+        emit Labeled(provisionPayableId, bytes32(0), "provisionPayable");
     }
 
     /// @notice Provision ALLOCATION request blocks with access to a mutable native-value budget.
@@ -78,7 +76,7 @@ abstract contract ProvisionPayable is CommandBase, Payable, ProvisionPayableHook
     function provisionPayable(
         CommandContext calldata c
     ) external payable onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups, ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, uint groups, ) = Cursors.init(c.request, 1);
         Writer memory writer = Writers.allocCustodies(groups);
         Budget memory budget = valueBudget();
 

package/commands/Relay.sol

@@ -25,19 +25,18 @@ abstract contract DispatchPayableHook {
 /// the same state from being duplicated across multiple relays.
 /// Produces no output state.
 abstract contract RelayPayable is CommandBase, Payable, DispatchPayableHook {
-    string private constant NAME = "relayPayable";
-
-    uint internal immutable relayPayableId = commandId(NAME);
+    uint internal immutable relayPayableId = commandId(this.relayPayable.selector);
 
     constructor() {
-        emit Command(host, relayPayableId, NAME, "1:0:0", Schemas.Relay, Keys.Any, Keys.Empty, false, true);
+        emit Command(host, relayPayableId, "1:0:0", Schemas.Relay, Keys.Any, Keys.Empty, true);
+        emit Labeled(relayPayableId, bytes32(0), "relayPayable");
     }
 
     /// @notice Relay one RELAY request block with the command account and current state.
     /// @param c Command context; `c.request` must contain exactly one RELAY block.
     /// @return output Empty output state.
     function relayPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory output) {
-        (Cur memory request, ) = Cursors.init(c.request, 0, 1, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1, 1);
         Budget memory budget = valueBudget();
 
         (uint chain, uint resources, bytes memory pipe) = request.relayToPipe(c.account, c.state);

package/commands/Withdraw.sol

@@ -20,12 +20,11 @@ abstract contract WithdrawHook {
 /// Use `withdraw` for assets being sent outside the protocol (e.g. ERC-20 transfers, ETH sends).
 /// For internal balance credits, use `creditAccount` instead.
 abstract contract Withdraw is CommandBase, WithdrawHook {
-    string private constant NAME = "withdraw";
-
-    uint internal immutable withdrawId = commandId(NAME);
+    uint internal immutable withdrawId = commandId(this.withdraw.selector);
 
     constructor() {
-        emit Command(host, withdrawId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, withdrawId, "0:1:0", "", Keys.Balance, Keys.Empty, false);
+        emit Labeled(withdrawId, bytes32(0), "withdraw");
     }
 
     /// @notice Withdraw each BALANCE block from the command state to the command account.
@@ -34,7 +33,7 @@ abstract contract Withdraw is CommandBase, WithdrawHook {
     function withdraw(
         CommandContext calldata c
     ) external onlyCommand returns (bytes memory) {
-        (Cur memory state, , ) = Cursors.init(c.state, 0, 1);
+        (Cur memory state, , ) = Cursors.init(c.state, 1);
 
         while (state.i < state.len) {
             (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();

package/commands/admin/AllowAssets.sol

@@ -18,12 +18,11 @@ abstract contract AllowAssetsHook {
 /// @notice Admin command that permits a list of (asset, meta) pairs via a virtual hook.
 /// Each ASSET block in the request calls `allowAsset`. Only callable by the admin account.
 abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
-    string private constant NAME = "allowAssets";
-
-    uint internal immutable allowAssetsId = commandId(NAME);
+    uint internal immutable allowAssetsId = commandId(this.allowAssets.selector);
 
     constructor() {
-        emit Admin(host, allowAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, allowAssetsId, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Labeled(allowAssetsId, bytes32(0), "allowAssets");
     }
 
     /// @notice Allow each ASSET block in the admin request.
@@ -32,7 +31,7 @@ abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
     function allowAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             (bytes32 asset, bytes32 meta) = request.unpackAsset();

package/commands/admin/Allowance.sol

@@ -22,18 +22,18 @@ abstract contract AllowanceHook {
 /// @notice Admin command that applies cross-host allowance entries via a virtual hook.
 /// Each ALLOWANCE block grants or updates a host-scoped asset cap. Only callable by the admin account.
 abstract contract Allowance is CommandBase, AdminEvent, AllowanceHook {
-    string private constant NAME = "allowance";
-    uint internal immutable allowanceId = commandId(NAME);
+    uint internal immutable allowanceId = commandId(this.allowance.selector);
 
     constructor() {
-        emit Admin(host, allowanceId, NAME, "1:0:0", Schemas.Allowance, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, allowanceId, "1:0:0", Schemas.Allowance, Keys.Empty, Keys.Empty, false);
+        emit Labeled(allowanceId, bytes32(0), "allowance");
     }
 
     /// @notice Apply each ALLOWANCE block in the admin request.
     /// @param c Admin command context; `c.request` must contain ALLOWANCE blocks.
     /// @return Empty output state.
     function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             (uint peer, bytes32 asset, bytes32 meta, uint amount) = request.unpackAllowance();

package/commands/admin/Appoint.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each ACCOUNT block in the request is enabled as a guardian on the host.
 /// Only callable by the admin account.
 abstract contract Appoint is CommandBase, AdminEvent {
-    string private constant NAME = "appoint";
-
-    uint internal immutable appointId = commandId(NAME);
+    uint internal immutable appointId = commandId(this.appoint.selector);
 
     constructor() {
-        emit Admin(host, appointId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, appointId, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false);
+        emit Labeled(appointId, bytes32(0), "appoint");
     }
 
     /// @notice Appoint each ACCOUNT block in the admin request as a guardian.
@@ -25,7 +24,7 @@ abstract contract Appoint is CommandBase, AdminEvent {
     function appoint(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             bytes32 account = request.unpackAccount();

package/commands/admin/Authorize.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each NODE block in the request is authorized on the host.
 /// Only callable by the admin account.
 abstract contract Authorize is CommandBase, AdminEvent {
-    string private constant NAME = "authorize";
-
-    uint internal immutable authorizeId = commandId(NAME);
+    uint internal immutable authorizeId = commandId(this.authorize.selector);
 
     constructor() {
-        emit Admin(host, authorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, authorizeId, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false);
+        emit Labeled(authorizeId, bytes32(0), "authorize");
     }
 
     /// @notice Authorize each NODE block in the admin request.
@@ -25,7 +24,7 @@ abstract contract Authorize is CommandBase, AdminEvent {
     function authorize(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             uint node = request.unpackNode();

package/commands/admin/DenyAssets.sol

@@ -18,12 +18,11 @@ abstract contract DenyAssetsHook {
 /// @notice Admin command that blocks a list of (asset, meta) pairs via a virtual hook.
 /// Each ASSET block in the request calls `denyAsset`. Only callable by the admin account.
 abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
-    string private constant NAME = "denyAssets";
-
-    uint internal immutable denyAssetsId = commandId(NAME);
+    uint internal immutable denyAssetsId = commandId(this.denyAssets.selector);
 
     constructor() {
-        emit Admin(host, denyAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, denyAssetsId, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Labeled(denyAssetsId, bytes32(0), "denyAssets");
     }
 
     /// @notice Deny each ASSET block in the admin request.
@@ -32,7 +31,7 @@ abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
     function denyAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             (bytes32 asset, bytes32 meta) = request.unpackAsset();

package/commands/admin/Destroy.sol

@@ -17,12 +17,11 @@ abstract contract DestroyHook {
 /// @notice Admin command that runs host teardown logic via a virtual hook.
 /// The full request is passed to `destroy` as a cursor. Only callable by the admin account.
 abstract contract Destroy is CommandBase, AdminEvent, DestroyHook {
-    string private constant NAME = "destroy";
-
-    uint internal immutable destroyId = commandId(NAME);
+    uint internal immutable destroyId = commandId(this.destroy.selector);
 
     constructor(string memory input) {
-        emit Admin(host, destroyId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, destroyId, "1:0:0", input, Keys.Empty, Keys.Empty, false);
+        emit Labeled(destroyId, bytes32(0), "destroy");
     }
 
     /// @notice Run host teardown logic over the full admin request.

package/commands/admin/Dismiss.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each ACCOUNT block in the request is disabled as a guardian on the host.
 /// Only callable by the admin account.
 abstract contract Dismiss is CommandBase, AdminEvent {
-    string private constant NAME = "dismiss";
-
-    uint internal immutable dismissId = commandId(NAME);
+    uint internal immutable dismissId = commandId(this.dismiss.selector);
 
     constructor() {
-        emit Admin(host, dismissId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, dismissId, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false);
+        emit Labeled(dismissId, bytes32(0), "dismiss");
     }
 
     /// @notice Dismiss each ACCOUNT block in the admin request from guardian status.
@@ -25,7 +24,7 @@ abstract contract Dismiss is CommandBase, AdminEvent {
     function dismiss(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             bytes32 account = request.unpackAccount();

package/commands/admin/Execute.sol

@@ -16,19 +16,18 @@ using Cursors for Cur;
 /// Only callable by the admin account.
 /// Unspent top-level `msg.value` remains on this host.
 abstract contract ExecutePayable is CommandBase, Payable, AdminEvent {
-    string private constant NAME = "executePayable";
-
-    uint internal immutable executePayableId = commandId(NAME);
+    uint internal immutable executePayableId = commandId(this.executePayable.selector);
 
     constructor() {
-        emit Admin(host, executePayableId, NAME, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, false, true);
+        emit Admin(host, executePayableId, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, true);
+        emit Labeled(executePayableId, bytes32(0), "executePayable");
     }
 
     /// @notice Execute each CALL block in the admin request.
     /// @param c Admin command context; `c.request` must contain CALL blocks.
     /// @return Empty output state.
     function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
         Budget memory budget = valueBudget();
 
         while (request.i < request.len) {

package/commands/admin/Init.sol

@@ -17,12 +17,11 @@ abstract contract InitHook {
 /// @notice Admin command that runs host initialization logic via a virtual hook.
 /// The full request is passed to `init` as a cursor. Only callable by the admin account.
 abstract contract Init is CommandBase, AdminEvent, InitHook {
-    string private constant NAME = "init";
-
-    uint internal immutable initId = commandId(NAME);
+    uint internal immutable initId = commandId(this.init.selector);
 
     constructor(string memory input) {
-        emit Admin(host, initId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, initId, "1:0:0", input, Keys.Empty, Keys.Empty, false);
+        emit Labeled(initId, bytes32(0), "init");
     }
 
     /// @notice Run host initialization logic over the full admin request.

package/commands/admin/Label.sol

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {CommandBase, CommandContext, Keys} from "../Base.sol";
+import {Cursors, Cur, Schemas} from "../../Cursors.sol";
+import {AdminEvent} from "../../events/Admin.sol";
+using Cursors for Cur;
+
+/// @title Label
+/// @notice Admin command that publishes namespaced labels for node IDs.
+/// Each LABEL block in the request emits one `Labeled` event. Only callable by
+/// the admin account.
+abstract contract Label is CommandBase, AdminEvent {
+    uint internal immutable labelId = commandId(this.label.selector);
+
+    constructor() {
+        emit Admin(host, labelId, "1:0:0", Schemas.Label, Keys.Empty, Keys.Empty, false);
+        emit Labeled(labelId, bytes32(0), "label");
+    }
+
+    /// @notice Publish each LABEL block in the admin request.
+    /// @param c Admin command context; `c.request` must contain LABEL blocks.
+    /// @return Empty output state.
+    function label(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
+        (Cur memory request, , ) = Cursors.init(c.request, 1);
+
+        while (request.i < request.len) {
+            (uint id, bytes32 namespace, string memory name) = request.unpackLabel();
+            emit Labeled(id, namespace, name);
+        }
+
+        request.complete();
+        return "";
+    }
+}