@rootzero/contracts 1.28.0 → 1.30.0

package/codec/Decoders.sol

@@ -22,7 +22,7 @@ library Decoders {
     /// @param source Calldata region to open.
     /// @return cur Cursor spanning the complete source.
     function open(bytes calldata source) internal pure returns (Cur memory cur) {
-        cur.state = Cursors.wrap(source, 0);
+        cur.state = Cursors.wrap(source);
     }
 
     /// @notice Return whether `cur` has unread bytes.
@@ -138,13 +138,15 @@ library Decoders {
         out.state = cur.state.slice(from, to, 0);
     }
 
-    /// @notice Return the complete calldata region represented by `cur`.
+    /// @notice Return the unread calldata region represented by `cur`.
     /// @param cur Cursor whose calldata is returned.
-    /// @return Complete cursor region.
-    function raw(Cur memory cur) internal pure returns (bytes calldata) {
-        (uint abs, uint end) = cur.state.bounds();
-        if (end > msg.data.length) revert Blocks.MalformedBlocks();
-        return msg.data[abs:end];
+    /// @return data Unread cursor region from its current position.
+    function raw(Cur memory cur) internal pure returns (bytes calldata data) {
+        (uint i, uint offset, uint len) = cur.state.decode();
+        if (len > msg.data.length || offset > msg.data.length - len) {
+            revert Blocks.MalformedBlocks();
+        }
+        data = msg.data[offset + i:offset + len];
     }
 
     /// @notice Return relative calldata range `[from, to)` from `cur`.
@@ -376,15 +378,6 @@ library Decoders {
         node = Blocks.unpackNode(abs);
     }
 
-    /// @notice Decode and consume one CASHOUT block.
-    /// @param cur Cursor advanced past the block.
-    /// @return amount Native-asset amount to withdraw.
-    function unpackCashout(Cur memory cur) internal pure returns (uint amount) {
-        uint abs;
-        (cur.state, abs) = cur.state.consume(Sizes.Cashout);
-        amount = Blocks.unpackCashout(abs);
-    }
-
     /// @notice Decode and consume one BOOTSTRAP block.
     /// @param cur Cursor advanced past the block.
     /// @return asset Decoded asset identifier.
@@ -749,15 +742,14 @@ library Decoders {
 
     /// @notice Decode and consume one RELAY block.
     /// @param cur Cursor advanced past the block.
-    /// @return portal Decoded destination portal.
-    /// @return resources Decoded packed resources.
     /// @return input Decoded relay input.
+    /// @return steps Decoded remaining pipeline steps.
     function unpackRelay(
         Cur memory cur
-    ) internal pure returns (uint portal, uint resources, bytes calldata input) {
+    ) internal pure returns (bytes calldata input, bytes calldata steps) {
         uint abs = cur.state.absolute();
         uint end;
-        (portal, resources, input, end) = Blocks.unpackRelay(abs);
+        (input, steps, end) = Blocks.unpackRelay(abs);
         cur.state = cur.state.seekAbs(end);
     }
 

package/codec/Descriptors.sol

@@ -5,18 +5,7 @@ import {Blocks} from "./Blocks.sol";
 import {Buffers} from "./Buffers.sol";
 import {Sizes, Specs} from "./Specs.sol";
 import {Lanes} from "../utils/Lanes.sol";
-
-/// @title Flags
-/// @notice Packed endpoint behavior flags.
-/// @dev Bits 6 and 7 are reserved for endpoint-defined custom flags.
-library Flags {
-    /// @dev Endpoint accepts nonzero native value.
-    uint8 internal constant Funded = 1 << 0;
-    /// @dev Endpoint is restricted to the admin account.
-    uint8 internal constant Admin = 1 << 1;
-    /// @dev Endpoint accepts nonzero native value and is restricted to the admin account.
-    uint8 internal constant AdminFunded = Admin | Funded;
-}
+import {Flags} from "../utils/Flags.sol";
 
 /// @title Descriptors
 /// @notice Packing and lane metadata helpers for endpoint descriptors.
@@ -26,8 +15,8 @@ library Descriptors {
     /// `[input key:4][stride:1]`
     /// `[output key:4][min:4][max:4][hint:3][stride:1]`
     /// `[reserved:5]`
-    /// `[flags:1]`. Flag bits: funded = 0, admin = 1; bits 6 and 7 are
-    /// reserved for endpoint-defined custom flags.
+    /// `[flags:1]`. Flag bits: funded = 0, admin = 1, handoff = 7;
+    /// bit 6 is reserved for endpoint-defined custom behavior.
     /// @dev TODO: Add per-lane cardinality metadata so off-chain consumers can
     /// distinguish exactly-one lanes from batches. Command decoding must remain
     /// the runtime source of truth; this metadata should not restore eager scans.

package/codec/Keys.sol

@@ -11,8 +11,6 @@ library Keys {
     bytes4 constant Empty = bytes4(0);
     /// @dev Input amount - (bytes32 asset, uint amount)
     bytes4 constant Amount = bytes4(keccak256("#amount"));
-    /// @dev Native-asset cashout request - (uint amount)
-    bytes4 constant Cashout = bytes4(keccak256("#cashout"));
     /// @dev Pipeline bootstrap request - (bytes32 asset, uint amount, uint budget)
     bytes4 constant Bootstrap = bytes4(keccak256("#bootstrap"));
     /// @dev Ledger balance - (bytes32 asset, uint amount)
@@ -41,7 +39,7 @@ library Keys {
     bytes4 constant Transaction = bytes4(keccak256("#transaction"));
     /// @dev Sub-command invocation - (uint cmd, uint value, #bytes as input)
     bytes4 constant Step = bytes4(keccak256("#step"));
-    /// @dev Portal relay input - (uint portal, uint resources, #bytes as input)
+    /// @dev Pipeline handoff envelope - (#bytes as input, #bytes as steps)
     bytes4 constant Relay = bytes4(keccak256("#relay"));
     /// @dev Command context transport - (bytes32 account, #bytes as state, #bytes as input)
     bytes4 constant Context = bytes4(keccak256("#context"));

package/codec/Schema.sol

@@ -89,8 +89,6 @@ library Schemas {
     string constant Account = "bytes32 account";
     string constant Asset = "bytes32 asset";
     string constant Status = "uint code";
-    string constant Cashout = "uint amount";
-
     // Two-word payloads
 
     string constant Amount = "bytes32 asset, uint amount";
@@ -119,7 +117,7 @@ library Schemas {
 
     string constant Step = "uint cmd, uint value, #bytes as input";
     string constant Call = "uint target, uint resources, #bytes as payload";
-    string constant Relay = "uint portal, uint resources, #bytes as input";
+    string constant Relay = "#bytes as input, #bytes as steps";
     string constant Dispatch = "uint portal, uint resources, #bytes as payload";
     string constant Context = "bytes32 account, #bytes as state, #bytes as input";
     string constant Recover = "uint handler, uint resources, bytes32 key, #bytes as witness";

package/codec/Specs.sol

@@ -25,8 +25,6 @@ library Sizes {
     uint constant Step = 2 * Header + 2 * Word;
     /// @dev STATUS block: 8 header + 32 status code = 40 bytes
     uint constant Status = B32;
-    /// @dev CASHOUT block: 8 header + 32 native-asset amount = 40 bytes
-    uint constant Cashout = B32;
     /// @dev BOOTSTRAP block: 8 header + 32 asset + 32 amount + 32 budget = 104 bytes
     uint constant Bootstrap = B96;
     /// @dev AMOUNT block: 8 header + 32 asset + 32 amount = 72 bytes
@@ -63,13 +61,13 @@ library Specs {
     uint private constant Exact96 = 96 * SizeFields;
     uint private constant Exact128 = 128 * SizeFields;
     uint private constant UnboundedHint128 = uint(128) << 136;
+    uint private constant UnboundedMin16Hint256 = (uint(16) << 192) | (uint(256) << 136);
     uint private constant UnboundedMin40Hint256 = (uint(40) << 192) | (uint(256) << 136);
     uint private constant UnboundedMin72Hint256 = (uint(72) << 192) | (uint(256) << 136);
     uint private constant UnboundedMin48Hint512 = (uint(48) << 192) | (uint(512) << 136);
     uint private constant UnboundedMin104Hint256 = (uint(104) << 192) | (uint(256) << 136);
 
     uint constant Empty = uint(bytes32(Keys.Empty));
-    uint constant Cashout = uint(bytes32(Keys.Cashout)) | Exact32;
     uint constant Bootstrap = uint(bytes32(Keys.Bootstrap)) | Exact96;
     uint constant Amount = uint(bytes32(Keys.Amount)) | Exact64;
     uint constant Balance = uint(bytes32(Keys.Balance)) | Exact64;
@@ -85,7 +83,7 @@ library Specs {
     uint constant Account = uint(bytes32(Keys.Account)) | Exact32;
     uint constant Transaction = uint(bytes32(Keys.Transaction)) | Exact128;
     uint constant Step = uint(bytes32(Keys.Step)) | UnboundedMin72Hint256;
-    uint constant Relay = uint(bytes32(Keys.Relay)) | UnboundedMin72Hint256;
+    uint constant Relay = uint(bytes32(Keys.Relay)) | UnboundedMin16Hint256;
     uint constant Context = uint(bytes32(Keys.Context)) | UnboundedMin48Hint512;
     uint constant Recover = uint(bytes32(Keys.Recover)) | UnboundedMin104Hint256;
     uint constant Dispatch = uint(bytes32(Keys.Dispatch)) | UnboundedMin72Hint256;

package/codec/Writers.sol

@@ -433,13 +433,12 @@ library Writers {
 
     /// @notice Append a RELAY block.
     /// @param writer Destination writer.
-    /// @param portal Destination portal to encode.
-    /// @param resources Packed resources to encode.
     /// @param input Relay input to encode.
-    function appendRelay(Writer memory writer, uint portal, uint resources, bytes memory input) internal pure {
-        uint size = Sizes.B64 + Sizes.Header + input.length;
+    /// @param steps Remaining steps to encode.
+    function appendRelay(Writer memory writer, bytes memory input, bytes memory steps) internal pure {
+        uint size = 3 * Sizes.Header + input.length + steps.length;
         uint i = reserve(writer, size);
-        Blocks.writeRelay(writer.dst, i, portal, resources, input);
+        Blocks.writeRelay(writer.dst, i, input, steps);
     }
 
     /// @notice Append a DISPATCH block.
@@ -574,11 +573,11 @@ library Writers {
         Blocks.copyCall(writer.dst, i, target, resources, payload);
     }
 
-    /// @notice Append a RELAY block by copying its nested input from calldata.
-    function copyRelay(Writer memory writer, uint portal, uint resources, bytes calldata input) internal pure {
-        uint size = Sizes.B64 + Sizes.Header + input.length;
+    /// @notice Append a RELAY block by copying its nested streams from calldata.
+    function copyRelay(Writer memory writer, bytes calldata input, bytes calldata steps) internal pure {
+        uint size = 3 * Sizes.Header + input.length + steps.length;
         uint i = reserve(writer, size);
-        Blocks.copyRelay(writer.dst, i, portal, resources, input);
+        Blocks.copyRelay(writer.dst, i, input, steps);
     }
 
     /// @notice Append a DISPATCH block by copying its nested payload from calldata.

package/commands/Base.sol

@@ -7,7 +7,8 @@ import {Blocks} from "../codec/Blocks.sol";
 import {Specs} from "../codec/Specs.sol";
 import {HostAmount, Position} from "../core/Types.sol";
 import {Execution, Executions} from "../execution/Execution.sol";
-import {Descriptors, Flags} from "../codec/Descriptors.sol";
+import {Descriptors} from "../codec/Descriptors.sol";
+import {Flags} from "../utils/Flags.sol";
 import {Nodes} from "../utils/Nodes.sol";
 
 using Executions for Execution;
@@ -62,7 +63,7 @@ abstract contract CommandBase is CallerAccess, EndpointBase {
     /// @return id Command node ID.
     /// @return published Published endpoint descriptor.
     function command(string memory name, uint descriptor) internal returns (uint id, uint published) {
-        id = Nodes.toCommand(name, address(this));
+        id = Nodes.toCommand(name, address(this), uint8(descriptor));
         published = endpoint(id, name, descriptor);
     }
 

package/commands/Bootstrap.sol

@@ -52,6 +52,7 @@ abstract contract Bootstrap is CommandBase, DebitAccountHook {
     /// @param state Empty pipeline state required by the command schema.
     /// @param input BOOTSTRAP block stream.
     /// @param value Native value available to fund native-asset balances.
+    /// @return handled Always true because this helper executed the command.
     /// @return output One BALANCE block per BOOTSTRAP input.
     /// @return credit Sourced budget contributions plus unused assigned value.
     function executeBootstrap(
@@ -59,7 +60,7 @@ abstract contract Bootstrap is CommandBase, DebitAccountHook {
         bytes memory state,
         bytes calldata input,
         uint value
-    ) internal returns (bytes memory output, uint credit) {
+    ) internal returns (bool handled, bytes memory output, uint credit) {
         if (state.length != 0) revert UnexpectedState();
         if (input.length % Sizes.Bootstrap != 0) revert Blocks.InvalidBlock();
 
@@ -77,5 +78,6 @@ abstract contract Bootstrap is CommandBase, DebitAccountHook {
                 i += Sizes.Balance;
             }
         }
+        handled = true;
     }
 }

package/commands/Cashout.sol

@@ -2,19 +2,18 @@
 pragma solidity ^0.8.33;
 
 import {Execution, Executions, CommandBase, Specs} from "./Base.sol";
-import {Blocks} from "../codec/Blocks.sol";
+import {Memory} from "../codec/Blocks.sol";
 import {Sizes} from "../codec/Specs.sol";
-import {Cursors} from "../utils/Cursors.sol";
 import {Action} from "../annotations/Action.sol";
 import {Actions} from "../utils/Actions.sol";
-import {UnexpectedState} from "../utils/Errors.sol";
+import {InvalidAsset, UnexpectedInput} from "../utils/Errors.sol";
 
 using Executions for Execution;
 
 /// @notice Hook implemented by hosts that withdraw native assets from accounts.
 abstract contract CashoutHook {
     /// @notice Withdraw an exact native-asset amount from `account`.
-    /// Called once per CASHOUT input block.
+    /// Called once per native BALANCE block in state.
     /// @dev Implementations must revert when the requested amount cannot be withdrawn.
     /// @param account Account whose native asset is withdrawn.
     /// @param amount Native-asset amount to withdraw.
@@ -28,7 +27,7 @@ abstract contract Cashout is CommandBase, CashoutHook, Action {
     uint private immutable id;
 
     constructor() {
-        (id, descriptor) = command("cashout", Specs.Empty, Specs.Cashout, Specs.Empty, 0);
+        (id, descriptor) = command("cashout", Specs.Balance, Specs.Empty, Specs.Empty, 0);
         action(id, Actions.Cashout);
     }
 
@@ -37,8 +36,8 @@ abstract contract Cashout is CommandBase, CashoutHook, Action {
         return id;
     }
 
-    /// @notice Withdraw native-asset amounts from the command account.
-    /// @param context Command context carrying a CASHOUT input stream.
+    /// @notice Withdraw native BALANCE state from the command account.
+    /// @param context Command context carrying a BALANCE state stream.
     /// @return output Empty output state.
     /// @return credit Zero native budget credit.
     function cashout(
@@ -47,21 +46,24 @@ abstract contract Cashout is CommandBase, CashoutHook, Action {
         Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            cashout(exec.account, exec.unpackCashout());
+            (bytes32 asset, uint amount) = exec.unpackBalance();
+            if (asset != nativeAsset) revert InvalidAsset();
+            cashout(exec.account, amount);
         }
 
         return exec.close();
     }
 }
 
-/// @title CashoutInternal
-/// @notice Extends cashout with optimized local pipeline dispatch.
-abstract contract CashoutInternal is Cashout {
-    /// @notice Execute cashout directly against a calldata CASHOUT stream.
+/// @title ExecuteCashout
+/// @notice Extends cashout with optimized local pipeline execution.
+abstract contract ExecuteCashout is Cashout {
+    /// @notice Execute cashout directly against native BALANCE state held in memory.
     /// @param account Account whose native asset is withdrawn.
-    /// @param state Empty pipeline state required by the command schema.
-    /// @param input CASHOUT block stream.
+    /// @param state BALANCE block stream held in pipeline memory.
+    /// @param input Empty input required by the command schema.
     /// @param value Native value assigned to this command; must be zero.
+    /// @return handled Always true because this helper executed the command.
     /// @return output Empty output state.
     /// @return credit Zero native budget credit.
     function executeCashout(
@@ -69,18 +71,19 @@ abstract contract CashoutInternal is Cashout {
         bytes memory state,
         bytes calldata input,
         uint value
-    ) internal returns (bytes memory, uint) {
+    ) internal returns (bool handled, bytes memory output, uint credit) {
         if (value != 0) revert ValueNotAllowed();
-        if (state.length != 0) revert UnexpectedState();
-        if (input.length % Sizes.Cashout != 0) revert Blocks.InvalidBlock();
+        if (input.length != 0) revert UnexpectedInput();
 
-        (uint abs, uint end) = Cursors.bounds(input);
+        (uint abs, uint end) = Memory.bounds(state, Sizes.Balance);
         while (abs < end) {
-            cashout(account, Blocks.unpackCashout(abs));
+            (bytes32 asset, uint amount) = Memory.unpackBalance(abs);
+            if (asset != nativeAsset) revert InvalidAsset();
+            cashout(account, amount);
             unchecked {
-                abs += Sizes.Cashout;
+                abs += Sizes.Balance;
             }
         }
-        return ("", 0);
+        return (true, "", 0);
     }
 }

package/commands/Credit.sol

@@ -43,16 +43,17 @@ abstract contract CreditAccount is CommandBase, CreditAccountHook {
     }
 }
 
-/// @title CreditAccountInternal
-/// @notice Extends the advertised credit-account command with memory-state pipeline dispatch.
+/// @title ExecuteCreditAccount
+/// @notice Extends the advertised credit-account command with memory-state pipeline execution.
 /// @dev This adapter is not a separate command. It uses the command ID and account hook
 /// inherited from `CreditAccount` while accepting the state location used by `Pipeline`.
-abstract contract CreditAccountInternal is CreditAccount {
+abstract contract ExecuteCreditAccount is CreditAccount {
     /// @notice Execute the inherited credit-account command from an internal pipeline.
     /// @param account Account credited by each balance.
     /// @param state BALANCE block stream held in pipeline memory.
     /// @param input Empty input required by the command schema.
     /// @param value Native value assigned to the command; must be zero.
+    /// @return handled Always true because this helper executed the command.
     /// @return output Empty output state.
     /// @return credit Zero native budget credit.
     function executeCreditAccount(
@@ -60,7 +61,7 @@ abstract contract CreditAccountInternal is CreditAccount {
         bytes memory state,
         bytes calldata input,
         uint value
-    ) internal returns (bytes memory, uint) {
+    ) internal returns (bool handled, bytes memory output, uint credit) {
         if (value != 0) revert ValueNotAllowed();
         if (input.length != 0) revert UnexpectedInput();
         if (state.length == 0) revert Blocks.EmptyRun();
@@ -74,6 +75,6 @@ abstract contract CreditAccountInternal is CreditAccount {
             }
         }
 
-        return ("", 0);
+        return (true, "", 0);
     }
 }

package/commands/Debit.sol

@@ -46,16 +46,17 @@ abstract contract DebitAccount is CommandBase, DebitAccountHook {
     }
 }
 
-/// @title DebitAccountInternal
-/// @notice Extends the advertised debit-account command with optimized pipeline dispatch.
+/// @title ExecuteDebitAccount
+/// @notice Extends the advertised debit-account command with optimized pipeline execution.
 /// @dev This adapter is not a separate command. It uses the command ID and account hook
 /// inherited from `DebitAccount` while decoding its fixed-stride input directly from calldata.
-abstract contract DebitAccountInternal is DebitAccount {
+abstract contract ExecuteDebitAccount is DebitAccount {
     /// @notice Execute the inherited debit-account command from an internal pipeline.
     /// @param account Account whose funds are debited.
     /// @param state Empty pipeline state required by the command schema.
     /// @param input AMOUNT block stream.
     /// @param value Native value assigned to the command; must be zero.
+    /// @return handled Always true because this helper executed the command.
     /// @return output BALANCE block stream matching the debited amounts.
     /// @return credit Zero native budget credit.
     function executeDebitAccount(
@@ -63,14 +64,14 @@ abstract contract DebitAccountInternal is DebitAccount {
         bytes memory state,
         bytes calldata input,
         uint value
-    ) internal returns (bytes memory, uint) {
+    ) internal returns (bool handled, bytes memory output, uint credit) {
         if (value != 0) revert ValueNotAllowed();
         if (state.length != 0) revert UnexpectedState();
         if (input.length == 0) revert Blocks.EmptyRun();
         if (input.length % Sizes.Amount != 0) revert Blocks.InvalidBlock();
 
         (uint abs, uint end) = Cursors.bounds(input);
-        bytes memory output = new bytes(input.length);
+        output = new bytes(input.length);
         uint i;
 
         while (abs < end) {
@@ -83,6 +84,6 @@ abstract contract DebitAccountInternal is DebitAccount {
             }
         }
 
-        return (output, 0);
+        return (true, output, 0);
     }
 }

package/commands/Relay.sol

@@ -7,26 +7,25 @@ using Executions for Execution;
 
 /// @notice Hook implemented by hosts that relay command contexts.
 abstract contract RelayPayableHook {
-    /// @notice Override to relay a command context to `portal`.
+    /// @notice Override to relay a command context and its pipeline continuation.
     /// @dev Relay hooks may forward only EMPTY or BALANCE state. They must not
     /// relay DEBT, POSITION, or other state whose destination handling can fail:
     /// the source state is consumed before destination success is known.
-    /// @param portal Destination portal implementation's host ID. Implementations
-    /// may validate or resolve it for their transport.
-    /// @param resources Opaque packed chain-specific destination resources, not
-    /// plain native value. EVM adapters extract the low 128-bit value lane with
-    /// `useResourceValue`; higher bits may encode execution gas or other data.
+    /// `funds` contains only this handoff STEP's assigned value, not the source
+    /// pipeline's complete remaining budget. Implementations must consume or
+    /// forward `state`; the command returns empty state when the hook completes.
     /// @param account Destination command account.
     /// @param state Complete state forwarded into the destination context.
-    /// @param input Input forwarded into the destination context.
+    /// @param input Command-specific input supplied by the handoff step.
+    /// Implementations define and decode this stream according to their transport.
+    /// @param steps Remaining STEP stream owned by the handoff.
     /// @param funds Execution carrying value available for transport fees and
     /// destination resource funding.
     function relay(
-        uint portal,
-        uint resources,
         bytes32 account,
         bytes calldata state,
         bytes calldata input,
+        bytes calldata steps,
         Execution memory funds
     ) internal virtual;
 }
@@ -37,14 +36,14 @@ abstract contract RelayPayable is CommandBase, RelayPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("relayPayable", Specs.Empty, Specs.Relay, Specs.Empty, Flags.Funded);
+        (, descriptor) = command("relayPayable", Specs.Empty, Specs.Relay, Specs.Empty, Flags.HandoffFunded);
     }
 
     /// @notice Relay one RELAY input block with the command account and empty state.
     function relayPayable(bytes calldata context) external payable onlyCommand returns (bytes memory, uint) {
         Execution memory exec = openCommand(context, descriptor);
-        (uint portal, uint resources, bytes calldata input) = exec.oninput().unpackRelay();
-        relay(portal, resources, exec.account, context[0:0], input, exec);
+        (bytes calldata input, bytes calldata steps) = exec.oninput().unpackRelay();
+        relay(exec.account, context[0:0], input, steps, exec);
         return exec.close();
     }
 }
@@ -58,7 +57,7 @@ abstract contract RelayBalancePayable is CommandBase, RelayPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("relayBalancePayable", Specs.Balance, Specs.Relay, Specs.Empty, Flags.Funded);
+        (, descriptor) = command("relayBalancePayable", Specs.Balance, Specs.Relay, Specs.Empty, Flags.HandoffFunded);
     }
 
     /// @notice Relay one RELAY input block with the command account and current state.
@@ -67,8 +66,8 @@ abstract contract RelayBalancePayable is CommandBase, RelayPayableHook {
     /// @return Native value to add to the caller's budget.
     function relayBalancePayable(bytes calldata context) external payable onlyCommand returns (bytes memory, uint) {
         Execution memory exec = openCommand(context, descriptor);
-        (uint portal, uint resources, bytes calldata input) = exec.oninput().unpackRelay();
-        relay(portal, resources, exec.account, exec.takeRawState(), input, exec);
+        (bytes calldata input, bytes calldata steps) = exec.oninput().unpackRelay();
+        relay(exec.account, exec.takeRawState(), input, steps, exec);
         return exec.close();
     }
 }

package/commands/Repay.sol

@@ -146,16 +146,17 @@ abstract contract RepayPositionPayable is CommandBase, RepayPayableHook, Action
     }
 }
 
-/// @title RepayInternal
-/// @notice Extends the advertised repay command with memory-state pipeline dispatch.
+/// @title ExecuteRepay
+/// @notice Extends the advertised repay command with memory-state pipeline execution.
 /// @dev This adapter is not a separate command. It uses the command ID and repayment hook
 /// inherited from `Repay` while accepting the state location used by `Pipeline`.
-abstract contract RepayInternal is Repay {
+abstract contract ExecuteRepay is Repay {
     /// @notice Execute the inherited repay command from an internal pipeline.
     /// @param account Account whose liabilities are repaid.
     /// @param state DEBT block stream held in pipeline memory.
     /// @param input Empty input required by the command schema.
     /// @param value Native value assigned to the command; must be zero.
+    /// @return handled Always true because this helper executed the command.
     /// @return output Empty output state.
     /// @return credit Zero native budget credit.
     function executeRepay(
@@ -163,7 +164,7 @@ abstract contract RepayInternal is Repay {
         bytes memory state,
         bytes calldata input,
         uint value
-    ) internal returns (bytes memory, uint) {
+    ) internal returns (bool handled, bytes memory output, uint credit) {
         if (value != 0) revert ValueNotAllowed();
         if (input.length != 0) revert UnexpectedInput();
         if (state.length == 0) revert Blocks.EmptyRun();
@@ -177,6 +178,6 @@ abstract contract RepayInternal is Repay {
             }
         }
 
-        return ("", 0);
+        return (true, "", 0);
     }
 }

package/commands/Settle.sol

@@ -93,16 +93,17 @@ abstract contract SettlePayable is CommandBase, SettlePayableHook, Action {
     }
 }
 
-/// @title SettleInternal
-/// @notice Extends the advertised settle command with memory-state pipeline dispatch.
+/// @title ExecuteSettle
+/// @notice Extends the advertised settle command with memory-state pipeline execution.
 /// @dev This adapter is not a separate command. It uses the command ID and settlement hook
 /// inherited from `Settle` while accepting the state location used by `Pipeline`.
-abstract contract SettleInternal is Settle {
+abstract contract ExecuteSettle is Settle {
     /// @notice Execute the inherited settle command from an internal pipeline.
     /// @param account Account for which each position is settled.
     /// @param state POSITION block stream held in pipeline memory.
     /// @param input Empty input required by the command schema.
     /// @param value Native value assigned to the command; must be zero.
+    /// @return handled Always true because this helper executed the command.
     /// @return output Empty output state.
     /// @return credit Zero native budget credit.
     function executeSettle(
@@ -110,7 +111,7 @@ abstract contract SettleInternal is Settle {
         bytes memory state,
         bytes calldata input,
         uint value
-    ) internal returns (bytes memory, uint) {
+    ) internal returns (bool handled, bytes memory output, uint credit) {
         if (value != 0) revert ValueNotAllowed();
         if (input.length != 0) revert UnexpectedInput();
         if (state.length == 0) revert Blocks.EmptyRun();
@@ -124,6 +125,6 @@ abstract contract SettleInternal is Settle {
             }
         }
 
-        return ("", 0);
+        return (true, "", 0);
     }
 }

package/commands/admin/Execute.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {AdminBase, Execution, Executions, Flags, Specs} from "./Base.sol";
-import {RawNodeCalls} from "../../core/Calls.sol";
+import {rawCall} from "../../core/Calls.sol";
 
 using Executions for Execution;
 
@@ -13,7 +13,7 @@ using Executions for Execution;
 /// through `useResourceValue`.
 /// Only callable by the admin account.
 /// Unspent top-level `msg.value` is returned as native budget credit.
-abstract contract ExecutePayable is RawNodeCalls, AdminBase {
+abstract contract ExecutePayable is AdminBase {
     uint private immutable descriptor;
 
     constructor() {