@rootzero/contracts 0.9.1 → 0.9.3

package/commands/Base.sol

@@ -18,25 +18,6 @@ struct CommandContext {
     bytes request;
 }
 
-/// @notice ABI-encode a command call from a command ID and execution context.
-/// @dev Derives the function selector from `cid` via `Ids.commandSelector(cid)`.
-/// Reverts if `cid` is not a valid command ID.
-/// @param cid Command node ID embedding the target selector.
-/// @param account Caller account identifier for the command context.
-/// @param state Current state block stream passed to the command.
-/// @param request Input block stream for the command invocation.
-/// @return ABI-encoded calldata for the command entry point.
-function encodeCommandCall(
-    uint cid,
-    bytes32 account,
-    bytes memory state,
-    bytes calldata request
-) pure returns (bytes memory) {
-    bytes4 selector = Ids.commandSelector(cid);
-    CommandContext memory ctx = CommandContext(account, state, request);
-    return abi.encodeWithSelector(selector, ctx);
-}
-
 /// @title CommandBase
 /// @notice Abstract base for all rootzero command contracts.
 /// Provides access control modifiers, event emission, and the `commandId`

package/commands/Burn.sol

@@ -25,11 +25,11 @@ abstract contract Burn is CommandBase, BurnHook {
     uint internal immutable burnId = commandId(NAME);
 
     constructor() {
-        emit Command(host, burnId, NAME, "", Keys.Balance, Keys.Empty, false);
+        emit Command(host, burnId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false);
     }
 
     function burn(CommandContext calldata c) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory state, , ) = cursor(c.state, 1);
+        (Cur memory state, ) = cursor(c.state, 1);
 
         while (state.i < state.bound) {
             (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();

package/commands/Credit.sol

@@ -22,17 +22,18 @@ abstract contract CreditAccountHook {
 /// An optional ACCOUNT block in the request overrides the default `c.account` destination.
 abstract contract CreditAccount is CommandBase, CreditAccountHook {
     string private constant NAME = "creditAccount";
+    string private constant REQUEST = string.concat(Schemas.Empty, ";", Schemas.Account, "?");
 
     uint internal immutable creditAccountId = commandId(NAME);
 
     constructor() {
-        emit Command(host, creditAccountId, NAME, Schemas.Account, Keys.Balance, Keys.Empty, false);
+        emit Command(host, creditAccountId, NAME, "0:1:0", REQUEST, Keys.Balance, Keys.Empty, false);
     }
 
     function creditAccount(
         CommandContext calldata c
     ) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory state, , ) = cursor(c.state, 1);
+        (Cur memory state, ) = cursor(c.state, 1);
         bytes32 to = Cursors.resolveAccount(c.request, c.account);
 
         while (state.i < state.bound) {

package/commands/Debit.sol

@@ -27,15 +27,15 @@ abstract contract DebitAccount is CommandBase, DebitAccountHook {
     uint internal immutable debitAccountId = commandId(NAME);
 
     constructor() {
-        emit Command(host, debitAccountId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, false);
+        emit Command(host, debitAccountId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false);
     }
 
     /// @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 count, ) = cursor(request, 1);
-        Writer memory writer = Writers.allocBalances(count);
+        (Cur memory input, uint groups) = cursor(request, 1);
+        Writer memory writer = Writers.allocBalances(groups);
 
         while (input.i < input.bound) {
             (bytes32 asset, bytes32 meta, uint amount) = input.unpackAmount();

package/commands/Deposit.sol

@@ -41,14 +41,14 @@ abstract contract Deposit is CommandBase, DepositHook {
     uint internal immutable depositId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, false);
+        emit Command(host, depositId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false);
     }
 
     function deposit(
         CommandContext calldata c
     ) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocBalances(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocBalances(groups);
 
         while (request.i < request.bound) {
             (bytes32 asset, bytes32 meta, uint amount) = request.unpackAmount();
@@ -69,14 +69,14 @@ abstract contract DepositPayable is CommandPayable, DepositPayableHook {
     uint internal immutable depositPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositPayableId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, true);
+        emit Command(host, depositPayableId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, true);
     }
 
     function depositPayable(
         CommandContext calldata c
     ) external payable onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocBalances(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocBalances(groups);
         Budget memory budget = Values.fromMsg();
 
         while (request.i < request.bound) {

package/commands/Pipe.sol

@@ -9,8 +9,17 @@ import {Budget, Values} from "../utils/Value.sol";
 using Cursors for Cur;
 
 abstract contract PipePayableHook {
-    function dispatchStep(
-        uint target,
+    /// @notice Override to dispatch one piped command step.
+    /// Called once per STEP block. The returned bytes become the state passed to
+    /// the next step.
+    /// @param id Command node ID to invoke or handle.
+    /// @param account Account identifier for the piped command context.
+    /// @param state Current threaded state block stream.
+    /// @param request Step request block stream.
+    /// @param value Native value assigned to this step.
+    /// @return Updated state block stream for the next step.
+    function dispatchCommand(
+        uint id,
         bytes32 account,
         bytes memory state,
         bytes calldata request,
@@ -20,7 +29,7 @@ abstract contract PipePayableHook {
 
 /// @title PipePayable
 /// @notice Command that sequences multiple sub-command STEP invocations in a single transaction.
-/// Each STEP block carries a target node, native value to forward, and an embedded request.
+/// Each STEP block carries a command node, native value to forward, and an embedded request.
 /// State threads through the steps: each step's output becomes the next step's state.
 /// Admin accounts are not permitted to use `pipePayable`.
 abstract contract PipePayable is CommandPayable, PipePayableHook {
@@ -29,7 +38,7 @@ abstract contract PipePayable is CommandPayable, PipePayableHook {
     uint internal immutable pipePayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, pipePayableId, NAME, Schemas.Step, Keys.Empty, Keys.Empty, true);
+        emit Command(host, pipePayableId, NAME, "1:0:0", Schemas.Step, Keys.Empty, Keys.Empty, true);
     }
 
     function pipe(
@@ -38,12 +47,12 @@ abstract contract PipePayable is CommandPayable, PipePayableHook {
         bytes calldata steps,
         Budget memory budget
     ) internal returns (bytes memory) {
-        (Cur memory input, , ) = cursor(steps, 1);
+        (Cur memory input, ) = cursor(steps, 1);
 
         while (input.i < input.bound) {
             (uint target, uint value, bytes calldata request) = input.unpackStep();
             uint spend = Values.use(budget, value);
-            state = dispatchStep(target, account, state, request, spend);
+            state = dispatchCommand(target, account, state, request, spend);
         }
 
         settleValue(account, budget);
@@ -52,11 +61,7 @@ abstract contract PipePayable is CommandPayable, PipePayableHook {
     }
 
     /// @notice Execute the pipePayable command.
-    function pipePayable(
-        CommandContext calldata c
-    ) external payable onlyCommand(c.account) returns (bytes memory) {
-        if (Accounts.isAdmin(c.account)) revert Accounts.InvalidAccount();
-        Budget memory budget = Values.fromMsg();
-        return pipe(c.account, c.state, c.request, budget);
+    function pipePayable(CommandContext calldata c) external payable onlyCommand(c.account) returns (bytes memory) {
+        return pipe(Accounts.ensureNotAdmin(c.account), c.state, c.request, Values.fromMsg());
     }
 }

package/commands/Provision.sol

@@ -29,7 +29,7 @@ abstract contract ProvisionPayableHook {
 }
 
 /// @title Provision
-/// @notice Command that provisions assets to remote hosts from ALLOCATION request blocks.
+/// @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";
@@ -37,12 +37,12 @@ abstract contract Provision is CommandBase, ProvisionHook {
     uint internal immutable provisionId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionId, NAME, Schemas.Allocation, Keys.Empty, Keys.Custody, false);
+        emit Command(host, provisionId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false);
     }
 
     function provision(CommandContext calldata c) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocCustodies(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocCustodies(groups);
 
         while (request.i < request.bound) {
             HostAmount memory allocation = request.unpackAllocationValue();
@@ -55,7 +55,7 @@ abstract contract Provision is CommandBase, ProvisionHook {
 }
 
 /// @title ProvisionPayable
-/// @notice Command that provisions assets to remote hosts from ALLOCATION request blocks.
+/// @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.
 /// The hook receives a mutable native-value budget drawn from `msg.value`.
 abstract contract ProvisionPayable is CommandPayable, ProvisionPayableHook {
@@ -64,14 +64,14 @@ abstract contract ProvisionPayable is CommandPayable, ProvisionPayableHook {
     uint internal immutable provisionPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionPayableId, NAME, Schemas.Allocation, Keys.Empty, Keys.Custody, true);
+        emit Command(host, provisionPayableId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, true);
     }
 
     function provisionPayable(
         CommandContext calldata c
     ) external payable onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocCustodies(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocCustodies(groups);
         Budget memory budget = Values.fromMsg();
 
         while (request.i < request.bound) {

package/commands/Transfer.sol

@@ -23,7 +23,7 @@ abstract contract Transfer is CommandBase, TransferHook {
     uint internal immutable transferId = commandId(NAME);
 
     constructor() {
-        emit Command(host, transferId, NAME, Schemas.Payout, Keys.Empty, Keys.Empty, false);
+        emit Command(host, transferId, NAME, "1:0:0", Schemas.Payout, Keys.Empty, Keys.Empty, false);
     }
 
     /// @notice Override to customize request parsing or batching for transfers.
@@ -32,7 +32,7 @@ abstract contract Transfer is CommandBase, TransferHook {
     /// @param request Full request bytes.
     /// @return Empty bytes (transfers produce no state output).
     function transfer(bytes32 from, bytes calldata request) internal virtual returns (bytes memory) {
-        (Cur memory input, , ) = cursor(request, 1);
+        (Cur memory input, ) = cursor(request, 1);
         Tx memory value;
         value.from = from;
 

package/commands/Withdraw.sol

@@ -21,17 +21,18 @@ abstract contract WithdrawHook {
 /// For internal balance credits, use `creditAccount` instead.
 abstract contract Withdraw is CommandBase, WithdrawHook {
     string private constant NAME = "withdraw";
+    string private constant REQUEST = string.concat(Schemas.Empty, ";", Schemas.Account, "?");
 
     uint internal immutable withdrawId = commandId(NAME);
 
     constructor() {
-        emit Command(host, withdrawId, NAME, Schemas.Account, Keys.Balance, Keys.Empty, false);
+        emit Command(host, withdrawId, NAME, "0:1:0", REQUEST, Keys.Balance, Keys.Empty, false);
     }
 
     function withdraw(
         CommandContext calldata c
     ) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory state, , ) = cursor(c.state, 1);
+        (Cur memory state, ) = cursor(c.state, 1);
         bytes32 to = Cursors.resolveAccount(c.request, c.account);
 
         while (state.i < state.bound) {

package/commands/{control → admin}/AllowAssets.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur, Schemas } from "../../Cursors.sol";
-import { ControlEvent } from "../../events/Control.sol";
+import { AdminEvent } from "../../events/Admin.sol";
 using Cursors for Cur;
 
 abstract contract AllowAssetsHook {
@@ -13,21 +13,21 @@ abstract contract AllowAssetsHook {
 }
 
 /// @title AllowAssets
-/// @notice Control command that permits a list of (asset, meta) pairs via a virtual hook.
+/// @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, ControlEvent, AllowAssetsHook {
+abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
     string private constant NAME = "allowAssets";
 
     uint internal immutable allowAssetsId = commandId(NAME);
 
     constructor() {
-        emit Control(host, allowAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, allowAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
     }
 
     function allowAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             (bytes32 asset, bytes32 meta) = request.unpackAsset();

package/commands/{control → admin}/Allowance.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {CommandBase, CommandContext, Keys} from "../Base.sol";
 import {Cursors, Cur, Schemas} from "../../Cursors.sol";
-import {ControlEvent} from "../../events/Control.sol";
+import {AdminEvent} from "../../events/Admin.sol";
 using Cursors for Cur;
 
 abstract contract AllowanceHook {
@@ -11,30 +11,30 @@ abstract contract AllowanceHook {
     /// Called once per ALLOWANCE block in the request. Implementations decide
     /// how the allowance is represented, e.g. ERC-20 approval, an internal cap,
     /// or another host-specific authorization record.
-    /// @param remote Host node receiving the allowed cap.
+    /// @param peer Host node receiving the allowed cap.
     /// @param asset Asset identifier.
     /// @param meta Asset metadata slot.
     /// @param amount Allowed cap amount.
-    function allowance(uint remote, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function allowance(uint peer, bytes32 asset, bytes32 meta, uint amount) internal virtual;
 }
 
 /// @title Allowance
-/// @notice Control command that applies cross-host allowance entries via a virtual hook.
+/// @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, ControlEvent, AllowanceHook {
+abstract contract Allowance is CommandBase, AdminEvent, AllowanceHook {
     string private constant NAME = "allowance";
     uint internal immutable allowanceId = commandId(NAME);
 
     constructor() {
-        emit Control(host, allowanceId, NAME, Schemas.Allowance, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, allowanceId, NAME, "1:0:0", Schemas.Allowance, Keys.Empty, Keys.Empty, false);
     }
 
     function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
-            (uint remote, bytes32 asset, bytes32 meta, uint amount) = request.unpackAllowance();
-            allowance(remote, asset, meta, amount);
+            (uint peer, bytes32 asset, bytes32 meta, uint amount) = request.unpackAllowance();
+            allowance(peer, asset, meta, amount);
         }
 
         request.complete();

package/commands/{control → admin}/Authorize.sol

@@ -3,26 +3,26 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur, Schemas } from "../../Cursors.sol";
-import { ControlEvent } from "../../events/Control.sol";
+import { AdminEvent } from "../../events/Admin.sol";
 using Cursors for Cur;
 
 /// @title Authorize
-/// @notice Control command that grants authorization to a list of node IDs.
+/// @notice Admin command that grants authorization to a list of node IDs.
 /// Each NODE block in the request is authorized on the host.
 /// Only callable by the admin account.
-abstract contract Authorize is CommandBase, ControlEvent {
+abstract contract Authorize is CommandBase, AdminEvent {
     string private constant NAME = "authorize";
 
     uint internal immutable authorizeId = commandId(NAME);
 
     constructor() {
-        emit Control(host, authorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, authorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false);
     }
 
     function authorize(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             uint node = request.unpackNode();

package/commands/{control → admin}/DenyAssets.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur, Schemas } from "../../Cursors.sol";
-import { ControlEvent } from "../../events/Control.sol";
+import { AdminEvent } from "../../events/Admin.sol";
 using Cursors for Cur;
 
 abstract contract DenyAssetsHook {
@@ -13,21 +13,21 @@ abstract contract DenyAssetsHook {
 }
 
 /// @title DenyAssets
-/// @notice Control command that blocks a list of (asset, meta) pairs via a virtual hook.
+/// @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, ControlEvent, DenyAssetsHook {
+abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
     string private constant NAME = "denyAssets";
 
     uint internal immutable denyAssetsId = commandId(NAME);
 
     constructor() {
-        emit Control(host, denyAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, denyAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
     }
 
     function denyAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             (bytes32 asset, bytes32 meta) = request.unpackAsset();

package/commands/{control → admin}/Destroy.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur } from "../../Cursors.sol";
-import { ControlEvent } from "../../events/Control.sol";
+import { AdminEvent } from "../../events/Admin.sol";
 
 using Cursors for Cur;
 
@@ -14,15 +14,15 @@ abstract contract DestroyHook {
 }
 
 /// @title Destroy
-/// @notice Control command that runs host teardown logic via a virtual hook.
+/// @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, ControlEvent, DestroyHook {
+abstract contract Destroy is CommandBase, AdminEvent, DestroyHook {
     string private constant NAME = "destroy";
 
     uint internal immutable destroyId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Control(host, destroyId, NAME, input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, destroyId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false);
     }
 
     function destroy(

package/commands/{control → admin}/Execute.sol

@@ -3,27 +3,27 @@ pragma solidity ^0.8.33;
 
 import {CommandContext, CommandPayable, Keys} from "../Base.sol";
 import {Cursors, Cur, Schemas} from "../../Cursors.sol";
-import {ControlEvent} from "../../events/Control.sol";
+import {AdminEvent} from "../../events/Admin.sol";
 import {Budget, Values} from "../../utils/Value.sol";
 import {Ids} from "../../utils/Ids.sol";
 
 using Cursors for Cur;
 
 /// @title ExecutePayable
-/// @notice Control command that forwards raw calldata to one or more target nodes.
+/// @notice Admin command that forwards raw calldata to one or more target nodes.
 /// Each CALL block specifies a target node ID, native value, and raw calldata payload.
 /// Only callable by the admin account.
-abstract contract ExecutePayable is CommandPayable, ControlEvent {
+abstract contract ExecutePayable is CommandPayable, AdminEvent {
     string private constant NAME = "executePayable";
 
     uint internal immutable executePayableId = commandId(NAME);
 
     constructor() {
-        emit Control(host, executePayableId, NAME, Schemas.Call, Keys.Empty, Keys.Empty, true);
+        emit Admin(host, executePayableId, NAME, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, true);
     }
 
     function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
         Budget memory budget = Values.fromMsg();
 
         while (request.i < request.bound) {

package/commands/{control → admin}/Init.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur } from "../../Cursors.sol";
-import { ControlEvent } from "../../events/Control.sol";
+import { AdminEvent } from "../../events/Admin.sol";
 
 using Cursors for Cur;
 
@@ -14,15 +14,15 @@ abstract contract InitHook {
 }
 
 /// @title Init
-/// @notice Control command that runs host initialization logic via a virtual hook.
+/// @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, ControlEvent, InitHook {
+abstract contract Init is CommandBase, AdminEvent, InitHook {
     string private constant NAME = "init";
 
     uint internal immutable initId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Control(host, initId, NAME, input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, initId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false);
     }
 
     function init(

package/commands/{control → admin}/Unauthorize.sol

@@ -3,26 +3,26 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur, Schemas } from "../../Cursors.sol";
-import { ControlEvent } from "../../events/Control.sol";
+import { AdminEvent } from "../../events/Admin.sol";
 using Cursors for Cur;
 
 /// @title Unauthorize
-/// @notice Control command that revokes authorization from a list of node IDs.
+/// @notice Admin command that revokes authorization from a list of node IDs.
 /// Each NODE block in the request is deauthorized on the host.
 /// Only callable by the admin account.
-abstract contract Unauthorize is CommandBase, ControlEvent {
+abstract contract Unauthorize is CommandBase, AdminEvent {
     string private constant NAME = "unauthorize";
 
     uint internal immutable unauthorizeId = commandId(NAME);
 
     constructor() {
-        emit Control(host, unauthorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, unauthorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false);
     }
 
     function unauthorize(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             uint node = request.unpackNode();

package/core/Access.sol

@@ -12,7 +12,7 @@ import {addrOr} from "../utils/Utils.sol";
 /// Tracks an immutable trusted commander, the host's own node ID, and a
 /// mapping of externally trusted node IDs. Inbound trust is host-based:
 /// trusted hosts, the commander, and this contract itself may interact
-/// with the host through the guarded command and remote entrypoints.
+/// with the host through the guarded command and peer entrypoints.
 abstract contract AccessControl is RootZeroContext, AccessEvent {
     /// @dev Trusted commander address. All calls from this address are implicitly trusted.
     /// Defaults to `address(this)` when no external commander is provided.
@@ -69,7 +69,7 @@ abstract contract AccessControl is RootZeroContext, AccessEvent {
     }
 
     /// @notice Assert that `caller` is trusted and return it.
-    /// Used by command and remote modifiers to gate execution to authorized senders.
+    /// Used by command and peer modifiers to gate execution to authorized senders.
     /// @param caller Address to validate.
     /// @return The same `caller` value if trusted.
     function enforceCaller(address caller) internal view returns (address) {

package/core/Calls.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {AccessControl} from "./Access.sol";
+import {CommandContext} from "../commands/Base.sol";
 import {Ids} from "../utils/Ids.sol";
 
 /// @dev Emitted when a trusted inter-node call fails.
@@ -53,7 +54,8 @@ abstract contract NodeCalls is AccessControl {
     /// @param data Encoded calldata to send.
     /// @return out Return data from the successful call.
     function callTo(uint node, uint value, bytes memory data) internal returns (bytes memory out) {
-        address addr = Ids.nodeAddr(ensureTrusted(node));
+        ensureTrusted(node);
+        address addr = Ids.nodeAddr(node);
         return callAddr(addr, value, data);
     }
 
@@ -64,7 +66,19 @@ abstract contract NodeCalls is AccessControl {
     /// @param data Encoded calldata to send.
     /// @return out Return data from the successful query.
     function queryTo(uint node, bytes memory data) internal view returns (bytes memory out) {
-        address addr = Ids.nodeAddr(ensureTrusted(node));
+        ensureTrusted(node);
+        address addr = Ids.nodeAddr(node);
         return queryAddr(addr, data);
     }
+
+    /// @notice Encode and call a trusted command node.
+    /// @param ctx Command execution context.
+    /// @param cid Command node ID embedding the target selector.
+    /// @param value Native value to forward in wei.
+    /// @return Decoded command output block stream.
+    function callCommand(CommandContext memory ctx, uint cid, uint value) internal returns (bytes memory) {
+        bytes4 selector = Ids.commandSelector(cid);
+        bytes memory data = abi.encodeWithSelector(selector, ctx);
+        return abi.decode(callTo(cid, value, data), (bytes));
+    }
 }