@rootzero/contracts 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 Until the protocol reaches integration-stable status, minor versions may include
 breaking API changes. Breaking changes are called out explicitly.
 
+## 1.2.0
+
+### Breaking Changes
+
+- Removed human-readable names from Command, Admin, Peer, Query, Guard, and Chain discovery events.
+- Added the Labeled event and default labels for commands, admin commands, peers, queries, guards, and examples.
+- Added LABEL and STRING block schemas, plus cursor helpers for decoding labels supplied by callers.
+- Added the admin label command for publishing mutable namespaced labels.
+- Removed version and namespace fields from host Introduction events and host constructor introductions.
+
 ## 1.1.0
 
 ### Breaking Changes

package/Endpoints.sol

@@ -29,6 +29,7 @@ import { DenyAssets, DenyAssetsHook } from "./commands/admin/DenyAssets.sol";
 import { Dismiss } from "./commands/admin/Dismiss.sol";
 import { ExecutePayable } from "./commands/admin/Execute.sol";
 import { Init, InitHook } from "./commands/admin/Init.sol";
+import { Label } from "./commands/admin/Label.sol";
 import { Unauthorize } from "./commands/admin/Unauthorize.sol";
 
 // Peer endpoints

package/Events.sol

@@ -16,6 +16,7 @@ import { EventEmitter } from "./events/Emitter.sol";
 import { GuardEvent } from "./events/Guard.sol";
 import { GuardianEvent } from "./events/Guardian.sol";
 import { IntroductionEvent } from "./events/Introduction.sol";
+import { LabeledEvent } from "./events/Labeled.sol";
 import { LockedEvent } from "./events/Locked.sol";
 import { NodeEvent } from "./events/Node.sol";
 import { PeerEvent } from "./events/Peer.sol";

package/blocks/Cursors.sol

@@ -489,6 +489,13 @@ library Cursors {
         return createBlock(Keys.Bytes, data);
     }
 
+    /// @notice Encode a STRING block with a UTF-8 payload.
+    /// @param data String payload.
+    /// @return Encoded STRING block bytes.
+    function toStringBlock(string memory data) internal pure returns (bytes memory) {
+        return createBlock(Keys.String, bytes(data));
+    }
+
     /// @notice Encode a BOUNTY block.
     /// @param bounty Relayer reward amount.
     /// @param relayer Relayer account identifier.
@@ -610,6 +617,18 @@ library Cursors {
         cur.i += 4;
     }
 
+    /// @notice Read the next 8 bytes from the cursor and advance by 8 bytes.
+    /// @dev Performs no bounds, key, length, or cursor checks.
+    /// @param cur Cursor whose current position is advanced by 8 bytes.
+    /// @return value Loaded bytes8 value.
+    function read8(Cur memory cur) internal pure returns (bytes8 value) {
+        uint abs = cur.offset + cur.i;
+        assembly ("memory-safe") {
+            value := calldataload(abs)
+        }
+        cur.i += 8;
+    }
+
     /// @notice Read the next 16 bytes from the cursor and advance by 16 bytes.
     /// @dev Performs no bounds, key, length, or cursor checks.
     /// @param cur Cursor whose current position is advanced by 16 bytes.
@@ -708,6 +727,26 @@ library Cursors {
         return unpackRaw(cur, Keys.Bytes);
     }
 
+    /// @notice Consume a reserved STRING block and return its UTF-8 payload.
+    /// @param cur Cursor; advanced past the STRING block.
+    /// @return data Decoded STRING payload.
+    function unpackString(Cur memory cur) internal pure returns (string memory data) {
+        return string(unpackRaw(cur, Keys.String));
+    }
+
+    /// @notice Consume a LABEL block and return its fields.
+    /// @param cur Cursor; advanced past the LABEL block.
+    /// @return id Node ID being labelled.
+    /// @return namespace Label namespace.
+    /// @return name Label value.
+    function unpackLabel(Cur memory cur) internal pure returns (uint id, bytes32 namespace, string memory name) {
+        uint end = cur.enter(Keys.Label, 64 + Sizes.Header, 0);
+        id = cur.readUint();
+        namespace = cur.read32();
+        name = cur.unpackString();
+        cur.exit(end);
+    }
+
     /// @notice Consume a dynamic block with a single bytes32 payload.
     /// @param cur Cursor; advanced past the block.
     /// @param key Expected dynamic block key.

package/blocks/Keys.sol

@@ -33,6 +33,8 @@ library Keys {
     bytes4 constant Evm = bytes4(keccak256("#evm"));
     /// @dev Reserved raw bytes child block.
     bytes4 constant Bytes = bytes4(keccak256("#bytes"));
+    /// @dev Reserved UTF-8 string child block.
+    bytes4 constant String = bytes4(keccak256("#string"));
     /// @dev Account identifier - (bytes32 account)
     bytes4 constant Account = bytes4(keccak256("#account"));
     /// @dev Transfer record passed through the pipeline - (bytes32 from, bytes32 to, bytes32 asset, bytes32 meta, uint amount)
@@ -57,6 +59,8 @@ library Keys {
     bytes4 constant Node = bytes4(keccak256("#node"));
     /// @dev Relayer bounty - (uint amount, bytes32 relayer)
     bytes4 constant Bounty = bytes4(keccak256("#bounty"));
+    /// @dev Mutable node label - (uint id, bytes32 namespace, #string as name)
+    bytes4 constant Label = bytes4(keccak256("#label"));
 
     /// @dev Structural status form - (uint code)
     bytes4 constant Status = bytes4(keccak256("#status"));

package/blocks/Schema.sol

@@ -25,6 +25,7 @@ pragma solidity ^0.8.33;
 // - 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"))
@@ -73,7 +74,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,12 +20,11 @@ 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, false);
+        emit Labeled(burnId, bytes32(0), "burn");
     }
 
     /// @notice Burn each BALANCE block from the command state.

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, false);
+        emit Labeled(creditAccountId, bytes32(0), "creditAccount");
     }
 
     /// @notice Credit each BALANCE block from the command state to the command account.

package/commands/Debit.sol

@@ -22,12 +22,11 @@ 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, false);
+        emit Labeled(debitAccountId, bytes32(0), "debitAccount");
     }
 
     /// @notice Override to customize request parsing or batching for debits.

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, false);
+        emit Labeled(depositId, bytes32(0), "deposit");
     }
 
     /// @notice Deposit AMOUNT request blocks into the command account and output matching BALANCE blocks.
@@ -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, false, true);
+        emit Labeled(depositPayableId, bytes32(0), "depositPayable");
     }
 
     /// @notice Deposit AMOUNT request blocks with access to a mutable native-value budget.

package/commands/Payout.sol

@@ -22,12 +22,11 @@ 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, false);
+        emit Labeled(payoutId, bytes32(0), "payout");
     }
 
     /// @notice Pay out BALANCE state blocks to matching ACCOUNT request blocks.

package/commands/Provision.sol

@@ -33,12 +33,11 @@ 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, false);
+        emit Labeled(provisionId, bytes32(0), "provision");
     }
 
     /// @notice Provision ALLOCATION request blocks and output matching CUSTODY state blocks.
@@ -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, false, true);
+        emit Labeled(provisionPayableId, bytes32(0), "provisionPayable");
     }
 
     /// @notice Provision ALLOCATION request blocks with access to a mutable native-value budget.

package/commands/Relay.sol

@@ -25,12 +25,11 @@ 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, false, true);
+        emit Labeled(relayPayableId, bytes32(0), "relayPayable");
     }
 
     /// @notice Relay one RELAY request block with the command account and current 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, false);
+        emit Labeled(withdrawId, bytes32(0), "withdraw");
     }
 
     /// @notice Withdraw each BALANCE block from the command state to the command account.

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, false);
+        emit Labeled(allowAssetsId, bytes32(0), "allowAssets");
     }
 
     /// @notice Allow each ASSET block in the admin request.

package/commands/admin/Allowance.sol

@@ -22,11 +22,11 @@ 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, false);
+        emit Labeled(allowanceId, bytes32(0), "allowance");
     }
 
     /// @notice Apply each ALLOWANCE block in the admin request.

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, false);
+        emit Labeled(appointId, bytes32(0), "appoint");
     }
 
     /// @notice Appoint each ACCOUNT block in the admin request as a guardian.

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, false);
+        emit Labeled(authorizeId, bytes32(0), "authorize");
     }
 
     /// @notice Authorize each NODE block in the admin request.

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, false);
+        emit Labeled(denyAssetsId, bytes32(0), "denyAssets");
     }
 
     /// @notice Deny each ASSET block in the admin request.

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, 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, false);
+        emit Labeled(dismissId, bytes32(0), "dismiss");
     }
 
     /// @notice Dismiss each ACCOUNT block in the admin request from guardian status.

package/commands/admin/Execute.sol

@@ -16,12 +16,11 @@ 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, false, true);
+        emit Labeled(executePayableId, bytes32(0), "executePayable");
     }
 
     /// @notice Execute each CALL block in the admin request.

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, 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, 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, 0, 1);
+
+        while (request.i < request.len) {
+            (uint id, bytes32 namespace, string memory name) = request.unpackLabel();
+            emit Labeled(id, namespace, name);
+        }
+
+        request.complete();
+        return "";
+    }
+}

package/commands/admin/Unauthorize.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each NODE block in the request is deauthorized on the host.
 /// Only callable by the admin account.
 abstract contract Unauthorize is CommandBase, AdminEvent {
-    string private constant NAME = "unauthorize";
-
-    uint internal immutable unauthorizeId = commandId(NAME);
+    uint internal immutable unauthorizeId = commandId(this.unauthorize.selector);
 
     constructor() {
-        emit Admin(host, unauthorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, unauthorizeId, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(unauthorizeId, bytes32(0), "unauthorize");
     }
 
     /// @notice Unauthorize each NODE block in the admin request.

package/core/Host.sol

@@ -7,6 +7,7 @@ import {Authorize} from "../commands/admin/Authorize.sol";
 import {Dismiss} from "../commands/admin/Dismiss.sol";
 import {Unauthorize} from "../commands/admin/Unauthorize.sol";
 import {ExecutePayable} from "../commands/admin/Execute.sol";
+import {Label} from "../commands/admin/Label.sol";
 import {Revoke} from "../guards/Revoke.sol";
 import {IntroductionEvent} from "../events/Introduction.sol";
 import {Ids} from "../utils/Ids.sol";
@@ -17,9 +18,7 @@ interface IHostIntroduction {
     /// @notice Record a host introduction claim.
     /// @param peer Host node ID being introduced.
     /// @param blocknum Block number at which the introduction was made.
-    /// @param version Protocol version the host is running.
-    /// @param namespace Human-readable namespace or label for the host.
-    function introduce(uint peer, uint blocknum, uint16 version, string calldata namespace) external;
+    function introduce(uint peer, uint blocknum) external;
 }
 
 /// @title Host
@@ -34,6 +33,7 @@ abstract contract Host is
     Revoke,
     Appoint,
     Dismiss,
+    Label,
     ExecutePayable,
     IntroductionEvent,
     IHostIntroduction
@@ -41,21 +41,17 @@ abstract contract Host is
     /// @param cmdr Commander address; passed to `AccessControl`.
     ///        If `cmdr` is a deployed contract, the host calls `introduce`
     ///        on it during construction.
-    /// @param version Protocol version number to publish in the announcement.
-    /// @param namespace Human-readable namespace string for the host.
-    constructor(address cmdr, uint16 version, string memory namespace) AccessControl(cmdr) {
+    constructor(address cmdr) AccessControl(cmdr) {
         if (cmdr == address(0) || cmdr == address(this) || cmdr.code.length == 0) return;
-        IHostIntroduction(cmdr).introduce(host, block.number, version, namespace);
+        IHostIntroduction(cmdr).introduce(host, block.number);
     }
 
     /// @notice Record a host introduction claim.
     /// @dev Validates that `peer` matches `msg.sender`; it does not authorize or trust the introduced host.
     /// @param peer Host node ID being introduced.
     /// @param blocknum Block number at which the host was deployed.
-    /// @param version Protocol version the host implements.
-    /// @param namespace Human-readable namespace string for the host.
-    function introduce(uint peer, uint blocknum, uint16 version, string calldata namespace) external {
-        emit Introduction(Ids.matchHost(peer, msg.sender), blocknum, version, namespace);
+    function introduce(uint peer, uint blocknum) external {
+        emit Introduction(Ids.matchHost(peer, msg.sender), blocknum);
     }
 
     /// @notice Accept native ETH transfers (e.g. from command value flows).

package/events/Admin.sol

@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { EventEmitter } from "./Emitter.sol";
+import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per admin command during host deployment to publish its request schema and state keys.
 abstract contract AdminEvent is EventEmitter {
     string private constant ABI =
-        "event Admin(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
+        "event Admin(uint indexed host, uint id, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
 
     /// @param host Host node ID that owns this admin command.
     /// @param id Command node ID.
-    /// @param name Human-readable command name.
     /// @param shape Per-operation block counts encoded as `request:state:output`.
     /// The request count covers only the input request run. If `postcheck` is true,
     /// a constraint run follows the input run, or starts the request when `request`
@@ -23,7 +22,6 @@ abstract contract AdminEvent is EventEmitter {
     event Admin(
         uint indexed host,
         uint id,
-        string name,
         bytes32 shape,
         string request,
         bytes4 state,

package/events/Chain.sol

@@ -5,14 +5,13 @@ import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted when a chain/domain node is announced.
 abstract contract ChainEvent is EventEmitter {
-    string private constant ABI = "event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin, string name)";
+    string private constant ABI = "event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin)";
 
     /// @param chain Chain node ID.
     /// @param native Native asset ID for the chain.
     /// @param commander Commander host node ID for the chain.
     /// @param admin Admin account for the commander host on the chain.
-    /// @param name Chain or domain name.
-    event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin, string name);
+    event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Command.sol

@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { EventEmitter } from "./Emitter.sol";
+import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per command during host deployment to publish its request schema and state keys.
 abstract contract CommandEvent is EventEmitter {
     string private constant ABI =
-        "event Command(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
+        "event Command(uint indexed host, uint id, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
 
     /// @param host Host node ID that owns this command.
     /// @param id Command node ID.
-    /// @param name Human-readable command name.
     /// @param shape Per-operation block counts encoded as `request:state:output`.
     /// The request count covers only the input request run. If `postcheck` is true,
     /// a constraint run follows the input run, or starts the request when `request`
@@ -23,7 +22,6 @@ abstract contract CommandEvent is EventEmitter {
     event Command(
         uint indexed host,
         uint id,
-        string name,
         bytes32 shape,
         string request,
         bytes4 state,

package/events/Guard.sol

@@ -5,13 +5,12 @@ import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per guard action during host deployment to publish its request schema.
 abstract contract GuardEvent is EventEmitter {
-    string private constant ABI = "event Guard(uint indexed host, uint id, string name, string request)";
+    string private constant ABI = "event Guard(uint indexed host, uint id, string request)";
 
     /// @param host Host node ID that owns this guard action.
     /// @param id Guard action node ID.
-    /// @param name Human-readable guard action name.
     /// @param request Schema DSL string describing the guard action request shape.
-    event Guard(uint indexed host, uint id, string name, string request);
+    event Guard(uint indexed host, uint id, string request);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Introduction.sol

@@ -5,13 +5,11 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when a host introduces itself to another host.
 abstract contract IntroductionEvent is EventEmitter {
-    string private constant ABI = "event Introduction(uint indexed host, uint blocknum, uint16 version, string namespace)";
+    string private constant ABI = "event Introduction(uint indexed host, uint blocknum)";
 
     /// @param host Host node ID of the introducing contract.
     /// @param blocknum Block number at which the host was deployed.
-    /// @param version Protocol version the host implements.
-    /// @param namespace Human-readable namespace string for the host.
-    event Introduction(uint indexed host, uint blocknum, uint16 version, string namespace);
+    event Introduction(uint indexed host, uint blocknum);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Labeled.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {EventEmitter} from "./Emitter.sol";
+
+/// @notice Emitted to attach a human-readable namespaced label to a node ID.
+abstract contract LabeledEvent is EventEmitter {
+    string private constant ABI = "event Labeled(uint indexed id, bytes32 namespace, string name)";
+
+    /// @param id Node or capability ID being labeled.
+    /// @param namespace Label namespace.
+    /// @param name Human-readable name within the namespace.
+    event Labeled(uint indexed id, bytes32 namespace, string name);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/events/Peer.sol

@@ -6,24 +6,15 @@ import {EventEmitter} from "./Emitter.sol";
 /// @notice Emitted once per peer during host deployment to publish its request and response schemas.
 abstract contract PeerEvent is EventEmitter {
     string private constant ABI =
-        "event Peer(uint indexed host, uint id, string name, bytes32 shape, string request, string response, bool funded)";
+        "event Peer(uint indexed host, uint id, bytes32 shape, string request, string response, bool funded)";
 
     /// @param host Host node ID that owns this peer.
     /// @param id Peer node ID.
-    /// @param name Human-readable peer name.
     /// @param shape Per-operation block counts encoded as `request:response`.
     /// @param request Schema DSL string describing the input request run, or empty if none.
     /// @param response Schema DSL string describing the peer response shape.
     /// @param funded Whether the peer entrypoint accepts nonzero `msg.value`.
-    event Peer(
-        uint indexed host,
-        uint id,
-        string name,
-        bytes32 shape,
-        string request,
-        string response,
-        bool funded
-    );
+    event Peer(uint indexed host, uint id, bytes32 shape, string request, string response, bool funded);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Query.sol

@@ -5,15 +5,14 @@ import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per query during host deployment to publish its request and response schemas.
 abstract contract QueryEvent is EventEmitter {
-    string private constant ABI = "event Query(uint indexed host, uint id, string name, bytes32 shape, string request, string response)";
+    string private constant ABI = "event Query(uint indexed host, uint id, bytes32 shape, string request, string response)";
 
     /// @param host Host node ID that owns this query.
     /// @param id Query node ID.
-    /// @param name Human-readable query name.
     /// @param shape Per-operation block counts encoded as `request:response`.
     /// @param request Schema DSL string describing the input request run, or empty if none.
     /// @param response Schema DSL string describing the query response shape.
-    event Query(uint indexed host, uint id, string name, bytes32 shape, string request, string response);
+    event Query(uint indexed host, uint id, bytes32 shape, string request, string response);
 
     constructor() {
         emit EventAbi(ABI);

package/guards/Base.sol

@@ -3,7 +3,8 @@ pragma solidity ^0.8.33;
 
 import {AccessControl} from "../core/Access.sol";
 import {GuardEvent} from "../events/Guard.sol";
-import {Ids, Selectors} from "../utils/Ids.sol";
+import {LabeledEvent} from "../events/Labeled.sol";
+import {Ids} from "../utils/Ids.sol";
 
 /// @notice ABI-encode a guard action call from a target guard ID and request block stream.
 /// @dev Derives the function selector from `target` via `Ids.guardSelector(target)`.
@@ -19,17 +20,17 @@ function encodeGuardCall(uint target, bytes calldata request) pure returns (byte
 /// @title GuardBase
 /// @notice Abstract base for guardian-only direct host actions.
 /// Guard actions are non-payable direct calls with no command context, state, or response.
-abstract contract GuardBase is AccessControl, GuardEvent {
+abstract contract GuardBase is AccessControl, GuardEvent, LabeledEvent {
     /// @dev Restrict execution to active guardian addresses.
     modifier onlyGuardian() {
         if (!isGuardian(msg.sender)) revert AccessDenied();
         _;
     }
 
-    /// @notice Derive the deterministic node ID for a named guard action on this contract.
-    /// @param name Guard action function name (without argument list).
+    /// @notice Derive the deterministic node ID for a guard action selector on this contract.
+    /// @param selector Guard action entrypoint selector.
     /// @return Guard action node ID.
-    function guardId(string memory name) internal view returns (uint) {
-        return Ids.toGuard(Selectors.guard(name), address(this));
+    function guardId(bytes4 selector) internal view returns (uint) {
+        return Ids.toGuard(selector, address(this));
     }
 }

package/guards/Revoke.sol

@@ -10,12 +10,11 @@ using Cursors for Cur;
 /// Each NODE block in the request is deauthorized on the host.
 /// Only callable by active guardian addresses.
 abstract contract Revoke is GuardBase {
-    string private constant NAME = "revoke";
-
-    uint internal immutable revokeId = guardId(NAME);
+    uint internal immutable revokeId = guardId(this.revoke.selector);
 
     constructor() {
-        emit Guard(host, revokeId, NAME, Schemas.Node);
+        emit Guard(host, revokeId, Schemas.Node);
+        emit Labeled(revokeId, bytes32(0), "revoke");
     }
 
     function revoke(bytes calldata request) external onlyGuardian {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rootzero/contracts",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Solidity contracts and protocol building blocks for rootzero hosts and commands.",
   "private": false,
   "license": "GPL-3.0-only",

package/peer/AllowAssets.sol

@@ -11,11 +11,11 @@ using Cursors for Cur;
 /// @notice Peer that permits a list of (asset, meta) pairs on behalf of a peer host.
 /// Each ASSET block in the request calls `allowAsset`. Restricted to trusted peers.
 abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook {
-    string private constant NAME = "peerAllowAssets";
-    uint internal immutable peerAllowAssetsId = peerId(NAME);
+    uint internal immutable peerAllowAssetsId = peerId(this.peerAllowAssets.selector);
 
     constructor() {
-        emit Peer(host, peerAllowAssetsId, NAME, "1:0", Schemas.Asset, "", false);
+        emit Peer(host, peerAllowAssetsId, "1:0", Schemas.Asset, "", false);
+        emit Labeled(peerAllowAssetsId, bytes32(0), "peerAllowAssets");
     }
 
     /// @notice Execute the allow-assets peer call.

package/peer/Allowance.sol

@@ -12,11 +12,11 @@ using Cursors for Cur;
 /// Each AMOUNT block in the request is scoped to the peer host and passed to the
 /// shared allowance hook as a host-scoped allowance. Restricted to trusted peers.
 abstract contract PeerAllowance is PeerBase, AllowanceHook {
-    string private constant NAME = "peerAllowance";
-    uint internal immutable peerAllowanceId = peerId(NAME);
+    uint internal immutable peerAllowanceId = peerId(this.peerAllowance.selector);
 
     constructor() {
-        emit Peer(host, peerAllowanceId, NAME, "1:0", Schemas.Amount, "", false);
+        emit Peer(host, peerAllowanceId, "1:0", Schemas.Amount, "", false);
+        emit Labeled(peerAllowanceId, bytes32(0), "peerAllowance");
     }
 
     /// @notice Execute the allowance peer call.

package/peer/BalancePull.sol

@@ -20,11 +20,11 @@ abstract contract BalancePullHook {
 /// Each BALANCE block in the request calls `balancePull(peer, asset, meta, amount)`.
 /// Restricted to trusted peers.
 abstract contract PeerBalancePull is PeerBase, BalancePullHook {
-    string private constant NAME = "peerBalancePull";
-    uint internal immutable peerBalancePullId = peerId(NAME);
+    uint internal immutable peerBalancePullId = peerId(this.peerBalancePull.selector);
 
     constructor() {
-        emit Peer(host, peerBalancePullId, NAME, "1:0", Schemas.Balance, "", false);
+        emit Peer(host, peerBalancePullId, "1:0", Schemas.Balance, "", false);
+        emit Labeled(peerBalancePullId, bytes32(0), "peerBalancePull");
     }
 
     /// @notice Execute the balance-pull peer call.

package/peer/Base.sol

@@ -3,7 +3,8 @@ pragma solidity ^0.8.33;
 
 import { NodeCalls } from "../core/Calls.sol";
 import { PeerEvent } from "../events/Peer.sol";
-import { Ids, Selectors } from "../utils/Ids.sol";
+import { LabeledEvent } from "../events/Labeled.sol";
+import { Ids } from "../utils/Ids.sol";
 
 /// @notice ABI-encode a peer call from a target peer ID and request block stream.
 /// @dev Derives the function selector from `target` via `Ids.peerSelector(target)`.
@@ -20,7 +21,7 @@ function encodePeerCall(uint target, bytes calldata request) pure returns (bytes
 /// @notice Abstract base for all rootzero peer contracts.
 /// Peers handle inter-host operations and asset allow/deny management
 /// between cooperating hosts. Access is restricted to trusted callers via `onlyPeer`.
-abstract contract PeerBase is NodeCalls, PeerEvent {
+abstract contract PeerBase is NodeCalls, PeerEvent, LabeledEvent {
     /// @dev Thrown when the commander attempts to call a peer entrypoint directly.
     error CommanderNotAllowed();
 
@@ -31,10 +32,10 @@ abstract contract PeerBase is NodeCalls, PeerEvent {
         _;
     }
 
-    /// @notice Derive the deterministic node ID for a named peer on this contract.
-    /// @param name Peer function name (without argument list).
+    /// @notice Derive the deterministic node ID for a peer selector on this contract.
+    /// @param selector Peer entrypoint selector.
     /// @return Peer node ID.
-    function peerId(string memory name) internal view returns (uint) {
-        return Ids.toPeer(Selectors.peer(name), address(this));
+    function peerId(bytes4 selector) internal view returns (uint) {
+        return Ids.toPeer(selector, address(this));
     }
 }

package/peer/DenyAssets.sol

@@ -11,11 +11,11 @@ using Cursors for Cur;
 /// @notice Peer that blocks a list of (asset, meta) pairs on behalf of a peer host.
 /// Each ASSET block in the request calls `denyAsset`. Restricted to trusted peers.
 abstract contract PeerDenyAssets is PeerBase, DenyAssetsHook {
-    string private constant NAME = "peerDenyAssets";
-    uint internal immutable peerDenyAssetsId = peerId(NAME);
+    uint internal immutable peerDenyAssetsId = peerId(this.peerDenyAssets.selector);
 
     constructor() {
-        emit Peer(host, peerDenyAssetsId, NAME, "1:0", Schemas.Asset, "", false);
+        emit Peer(host, peerDenyAssetsId, "1:0", Schemas.Asset, "", false);
+        emit Labeled(peerDenyAssetsId, bytes32(0), "peerDenyAssets");
     }
 
     /// @notice Execute the deny-assets peer call.

package/peer/Dispatch.sol

@@ -12,11 +12,11 @@ using Cursors for Cur;
 /// @title PeerDispatchPayable
 /// @notice Peer endpoint that forwards DISPATCH blocks to a host-defined dispatch hook.
 abstract contract PeerDispatchPayable is PeerBase, Payable, DispatchPayableHook {
-    string private constant NAME = "peerDispatchPayable";
-    uint internal immutable peerDispatchPayableId = peerId(NAME);
+    uint internal immutable peerDispatchPayableId = peerId(this.peerDispatchPayable.selector);
 
     constructor() {
-        emit Peer(host, peerDispatchPayableId, NAME, "1:0", Schemas.Dispatch, "", true);
+        emit Peer(host, peerDispatchPayableId, "1:0", Schemas.Dispatch, "", true);
+        emit Labeled(peerDispatchPayableId, bytes32(0), "peerDispatchPayable");
     }
 
     /// @notice Forward peer-supplied dispatches to the host-defined dispatch hook.

package/peer/Pipe.sol

@@ -13,11 +13,11 @@ using Cursors for Cur;
 /// Each PIPE block carries chain resources plus a CONTEXT block; the nested
 /// context steps are passed to the shared pipeline as the step stream.
 abstract contract PeerPipePayable is PeerBase, Pipeline {
-    string private constant NAME = "peerPipePayable";
-    uint internal immutable peerPipePayableId = peerId(NAME);
+    uint internal immutable peerPipePayableId = peerId(this.peerPipePayable.selector);
 
     constructor() {
-        emit Peer(host, peerPipePayableId, NAME, "1:0", Schemas.Pipe, "", true);
+        emit Peer(host, peerPipePayableId, "1:0", Schemas.Pipe, "", true);
+        emit Labeled(peerPipePayableId, bytes32(0), "peerPipePayable");
     }
 
     /// @notice Execute peer-supplied pipes through the shared payable pipe.

package/peer/Settle.sol

@@ -12,11 +12,11 @@ using Cursors for Cur;
 /// @notice Peer that consumes peer-supplied TRANSACTION blocks through debit and credit hooks.
 /// Each TRANSACTION block calls `debitAccount` for `from` and `creditAccount` for `to`.
 abstract contract PeerSettle is PeerBase, DebitAccountHook, CreditAccountHook {
-    string private constant NAME = "peerSettle";
-    uint internal immutable peerSettleId = peerId(NAME);
+    uint internal immutable peerSettleId = peerId(this.peerSettle.selector);
 
     constructor() {
-        emit Peer(host, peerSettleId, NAME, "1:0", Schemas.Transaction, "", false);
+        emit Peer(host, peerSettleId, "1:0", Schemas.Transaction, "", false);
+        emit Labeled(peerSettleId, bytes32(0), "peerSettle");
     }
 
     /// @notice Execute the peer-settle call.

package/queries/Assets.sol

@@ -22,11 +22,11 @@ abstract contract AssetStatusHook {
 /// The request is a run of `ASSET` blocks.
 /// The response returns one `STATUS` form block per query entry, preserving request order.
 abstract contract AssetStatus is QueryBase, AssetStatusHook {
-    string private constant NAME = "assetStatus";
-    uint public immutable assetStatusId = queryId(NAME);
+    uint public immutable assetStatusId = queryId(this.assetStatus.selector);
 
     constructor() {
-        emit Query(host, assetStatusId, NAME, "1:1", Schemas.Asset, Forms.Status);
+        emit Query(host, assetStatusId, "1:1", Schemas.Asset, Forms.Status);
+        emit Labeled(assetStatusId, bytes32(0), "assetStatus");
     }
 
     /// @notice Resolve asset support status for a run of requested `(asset, meta)` tuples.

package/queries/Balances.sol

@@ -22,11 +22,11 @@ abstract contract GetBalancesHook {
 /// The request is a run of `ACCOUNT_ASSET` form blocks.
 /// The response returns one `ACCOUNT_AMOUNT` form block per requested position, preserving request order.
 abstract contract GetBalances is QueryBase, GetBalancesHook {
-    string private constant NAME = "getBalances";
-    uint public immutable getBalancesId = queryId(NAME);
+    uint public immutable getBalancesId = queryId(this.getBalances.selector);
 
     constructor() {
-        emit Query(host, getBalancesId, NAME, "1:1", Forms.AccountAsset, Forms.AccountAmount);
+        emit Query(host, getBalancesId, "1:1", Forms.AccountAsset, Forms.AccountAmount);
+        emit Labeled(getBalancesId, bytes32(0), "getBalances");
     }
 
     /// @notice Resolve balances for a run of requested `(account, asset, meta)` tuples.

package/queries/Base.sol

@@ -2,8 +2,9 @@
 pragma solidity ^0.8.33;
 
 import { Runtime } from "../core/Runtime.sol";
+import { LabeledEvent } from "../events/Labeled.sol";
 import { QueryEvent } from "../events/Query.sol";
-import { Ids, Selectors } from "../utils/Ids.sol";
+import { Ids } from "../utils/Ids.sol";
 
 /// @notice ABI-encode a query call from a target query ID and request block stream.
 /// @dev Derives the function selector from `target` via `Ids.querySelector(target)`.
@@ -20,14 +21,14 @@ function encodeQueryCall(uint target, bytes calldata request) pure returns (byte
 /// @notice Abstract base for rootzero query contracts.
 /// Queries are view-only entry points that consume a block-stream request and
 /// return a block-stream response.
-abstract contract QueryBase is Runtime, QueryEvent {
+abstract contract QueryBase is Runtime, QueryEvent, LabeledEvent {
 
-    /// @notice Derive the deterministic node ID for a named query on this contract.
-    /// The ID encodes the ABI selector of `name(bytes)` and `address(this)`,
-    /// making it unique per (function name, contract address) pair.
-    /// @param name Query function name (without argument list).
+    /// @notice Derive the deterministic node ID for a query selector on this contract.
+    /// The ID encodes the ABI selector and `address(this)`, making it unique
+    /// per (function selector, contract address) pair.
+    /// @param selector Query entrypoint selector.
     /// @return Query node ID.
-    function queryId(string memory name) internal view returns (uint) {
-        return Ids.toQuery(Selectors.query(name), address(this));
+    function queryId(bytes4 selector) internal view returns (uint) {
+        return Ids.toQuery(selector, address(this));
     }
 }

package/queries/Positions.sol

@@ -29,12 +29,11 @@ abstract contract GetPositionHook {
 /// The request is a run of `ACCOUNT_ASSET` form blocks.
 /// The response returns one output-schema block per position entry, preserving request order.
 abstract contract GetPosition is QueryBase, GetPositionHook {
-    string private constant NAME = "getPosition";
-
-    uint public immutable getPositionId = queryId(NAME);
+    uint public immutable getPositionId = queryId(this.getPosition.selector);
 
     constructor(string memory output) {
-        emit Query(host, getPositionId, NAME, "1:1", Forms.AccountAsset, output);
+        emit Query(host, getPositionId, "1:1", Forms.AccountAsset, output);
+        emit Labeled(getPositionId, bytes32(0), "getPosition");
     }
 
     /// @notice Resolve positions for a run of requested `(account, asset, meta)` tuples.