Fix change output and default locking script function

.gitignore

@@ -3,8 +3,13 @@ Electrum.sqlite
 XO.sqlite
 node_modules/
 dist/
+coverage/
 *.db
 *.db-shm
 *.db-wal
 *.sqlite
+*.sqlite-journal
 resolvedTemplate.json
+mnemonic-*
+inv-*.json
+.xo-cli-wallet

p2pkh-template.json

@@ -0,0 +1,904 @@
+{
+  "$schema": "https://libauth.org/schemas/wallet-template-v0.schema.json",
+  "name": "Wallet (P2PKH)",
+  "description": "A standard single-factor wallet template that uses Pay-to-Public-Key-Hash (P2PKH) locking scripts.",
+  "icon": "wallet",
+  "version": 0,
+  "supported": ["BCH_2023_05", "BCH_2024_05", "BCH_2025_05", "BCH_2026_05"],
+  "roles": {
+    "owner": {
+      "name": "Wallet Owner",
+      "description": "The party who can spend from this wallet.",
+      "icon": "owner"
+    },
+    "receiver": {
+      "name": "Receiver",
+      "description": "A party that is receiving value.",
+      "icon": "receiver"
+    },
+    "sender": {
+      "name": "Sender",
+      "description": "A party that is sending value.",
+      "icon": "sender"
+    }
+  },
+  "start": [
+    { "action": "receive", "role": "receiver" },
+    { "action": "requestSatoshis", "role": "receiver" },
+    { "action": "requestFungibleTokens", "role": "receiver" },
+    { "action": "requestNonfungibleTokens", "role": "receiver" }
+  ],
+  "actions": {
+    "receive": {
+      "name": "Receive",
+      "description": "Receive an unspecified amount of cash and/or tokens from one or more senders.",
+      "icon": "receive",
+      "roles": {
+        "receiver": {
+          "name": "Receive",
+          "description": "Receive an unspecified amount of cash and/or tokens from one or more senders.",
+          "icon": "receive",
+          "requirements": { "generate": ["ownerKey"] }
+        },
+        "sender": {
+          "name": "Send",
+          "description": "Send an unspecified amount of cash and/or tokens to the provided receiver.",
+          "icon": "send"
+        }
+      },
+      "requirements": {
+        "roles": [
+          { "role": "receiver", "slots": { "min": 1, "max": 1 } },
+          { "role": "sender", "slots": { "min": 1 } }
+        ],
+        "variables": ["requestedSatoshis"]
+      },
+      "transaction": "receiveTransaction"
+    },
+    "requestSatoshis": {
+      "name": "Request Satoshis",
+      "description": "Requests a specific amount of Bitcoin Cash from one or more senders.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Request Satoshis",
+          "description": "Requests a specific amount of Bitcoin Cash from one or more senders.",
+          "icon": "request",
+          "requirements": {
+            "generate": ["ownerKey"],
+            "variables": ["requestedSatoshis"]
+          }
+        },
+        "sender": {
+          "name": "Send",
+          "description": "Send a specific amount of Bitcoin Cash to the provided receiver.",
+          "icon": "send"
+        }
+      },
+      "requirements": {
+        "roles": [
+          { "role": "receiver", "slots": { "min": 1, "max": 1 } },
+          { "role": "sender", "slots": { "min": 1 } }
+        ]
+      },
+      "transaction": "requestSatoshisTransaction"
+    },
+    "requestFungibleTokens": {
+      "name": "Request Fungible Tokens",
+      "description": "Requests a specific amount of a fungible tokens from one or more senders.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Request Fungible Tokens",
+          "description": "Requests a specific amount of a fungible tokens from one or more senders.",
+          "icon": "request",
+          "requirements": {
+            "generate": ["ownerKey"],
+            "variables": ["requestedTokenCategory", "requestedTokenAmount"]
+          }
+        },
+        "sender": {
+          "name": "Send",
+          "description": "Send a specific amount of fungible tokens to the provided receiver.",
+          "icon": "send"
+        }
+      },
+      "requirements": {
+        "roles": [
+          { "role": "receiver", "slots": { "min": 1, "max": 1 } },
+          { "role": "sender", "slots": { "min": 1 } }
+        ]
+      },
+      "transaction": "requestFungibleTokensTransaction"
+    },
+    "requestNonfungibleTokens": {
+      "name": "Request a Non-fungible Token",
+      "description": "Requests a non-fungible token from one or more senders.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Request a Non-fungible Token",
+          "description": "Requests a non-fungible token from one or more senders.",
+          "icon": "request",
+          "requirements": {
+            "generate": ["ownerKey"],
+            "variables": [
+              "requestedTokenCategory",
+              "requestedTokenCapability",
+              "requestedTokenCommitment"
+            ]
+          }
+        },
+        "sender": {
+          "name": "Send",
+          "description": "Send a non-fungible token to the provided receiver.",
+          "icon": "send"
+        }
+      },
+      "requirements": {
+        "roles": [
+          { "role": "receiver", "slots": { "min": 1, "max": 1 } },
+          { "role": "sender", "slots": { "min": 1 } }
+        ]
+      },
+      "transaction": "requestNonfungibleTokensTransaction"
+    },
+    "sendSatoshis": {
+      "name": "Send Satoshis",
+      "description": "Sends a specific amount of Bitcoin Cash to a given recipient.",
+      "icon": "send",
+      "roles": {
+        "sender": {
+          "requirements": {
+            "variables": ["transferredSatoshis", "recipientLockingscript"],
+            "secrets": ["ownerKey"]
+          }
+        }
+      },
+      "requirements": {
+        "roles": [{ "role": "sender", "slots": { "min": 1, "max": 1 } }]
+      },
+      "condition": "$(OP_INPUTINDEX OP_UTXOVALUE <dustLimit> OP_GREATERTHAN)",
+      "transaction": "transferSatoshisTransaction"
+    },
+    "sendFungibleTokens": {
+      "name": "Send Fungible Tokens",
+      "description": "Send a specific amount of a fungible token to a given recipient.",
+      "icon": "send",
+      "roles": {
+        "sender": {
+          "requirements": {
+            "variables": [
+              "transferredTokenCategory",
+              "transferredTokenAmount",
+              "recipientLockingscript"
+            ],
+            "secrets": ["ownerKey"]
+          }
+        }
+      },
+      "requirements": {
+        "roles": [{ "role": "sender", "slots": { "min": 1, "max": 1 } }]
+      },
+      "condition": "$(OP_INPUTINDEX OP_UTXOTOKENAMOUNT <0> OP_GREATERTHAN)",
+      "transaction": "transferFungibleTokensTransaction"
+    },
+    "sendNonfungibleTokens": {
+      "name": "Send a Non-fungible Token",
+      "description": "Send a non-fungible token to a given recipient.",
+      "icon": "send",
+      "roles": {
+        "sender": {
+          "requirements": {
+            "variables": [
+              "transferredTokenCategory",
+              "transferredTokenCapability",
+              "transferredTokenCommitment",
+              "recipientLockingscript"
+            ],
+            "secrets": ["ownerKey"]
+          }
+        }
+      },
+      "requirements": {
+        "roles": [{ "role": "sender", "slots": { "min": 1, "max": 1 } }]
+      },
+      "condition": "$(OP_INPUTINDEX OP_UTXOTOKENCATEGORY OP_SIZE OP_NIP <32> OP_GREATERTHAN)",
+      "transaction": "transferNonfungibleTokensTransaction"
+    },
+    "burnFungibleTokens": {
+      "name": "Delete Fungible Tokens",
+      "description": "Permanently and irreversibly deletes one or more fungible tokens.",
+      "icon": "burn",
+      "roles": {
+        "owner": {
+          "requirements": {
+            "variables": ["burnedTokenCategory", "burnedTokenAmount"],
+            "secrets": ["ownerKey"]
+          }
+        }
+      },
+      "requirements": {
+        "roles": [{ "role": "owner", "slots": { "min": 1, "max": 1 } }]
+      },
+      "condition": "$(OP_INPUTINDEX OP_UTXOTOKENAMOUNT <0> OP_GREATERTHAN)",
+      "transaction": "burnFungibleTokensTransaction"
+    },
+    "burnNonfungibleTokens": {
+      "name": "Delete a Non-fungible Token",
+      "description": "Permanently and irreversibly deletes one non-fungible token.",
+      "icon": "burn",
+      "roles": {
+        "owner": {
+          "requirements": {
+            "variables": [
+              "burnedTokenCategory",
+              "burnedTokenCapability",
+              "burnedTokenCommitment"
+            ],
+            "secrets": ["ownerKey"]
+          }
+        }
+      },
+      "requirements": {
+        "roles": [{ "role": "owner", "slots": { "min": 1, "max": 1 } }]
+      },
+      "condition": "$(OP_INPUTINDEX OP_UTXOTOKENCATEGORY OP_SIZE OP_NIP <32> OP_GREATERTHAN)",
+      "transaction": "burnNonfungibleTokenTransaction"
+    },
+    "sign": {
+      "name": "Sign Message",
+      "description": "Signs a provided message using the Bitcoin message signing protocol.",
+      "icon": "sign",
+      "roles": {
+        "owner": {
+          "requirements": {
+            "variables": ["messageToSign"],
+            "secrets": ["ownerKey"]
+          }
+        }
+      },
+      "requirements": {
+        "roles": [{ "role": "owner", "slots": { "min": 1, "max": 1 } }]
+      },
+      "data": ["messageSignature"]
+    },
+    "verify": {
+      "name": "Verify Message Signature",
+      "description": "Verifies a provided message signature according to the Bitcoin message signing protocol.",
+      "icon": "verify",
+      "roles": {
+        "owner": {
+          "requirements": {
+            "variables": ["messageSignature", "messageToVerify"],
+            "secrets": ["ownerKey"]
+          }
+        }
+      },
+      "requirements": {
+        "roles": [{ "role": "owner", "slots": { "min": 1, "max": 1 } }]
+      },
+      "data": ["messageSignatureValidity"]
+    }
+  },
+  "data": {
+    "messageSignature": {
+      "value": "$(<messagePrefix> <message> OP_CAT <ownerKey.data_signature.top_stack_element>)",
+      "type": "bytes",
+      "hint": "signature"
+    },
+    "messageSignatureValidity": {
+      "value": "$(<messageSignature> <messagePrefix> <message> OP_CAT <ownerKey.public_key> OP_CHECKDATASIG)",
+      "type": "integer",
+      "hint": "script_boolean"
+    }
+  },
+  "transactions": {
+    "receiveTransaction": {
+      "name": "Transfer request",
+      "description": "Transfer request for an unspecified amount of cash and/or tokens.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received an unspecified amount of cash and/or tokens.",
+          "icon": "receive"
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent an unspecified amount of cash and/or tokens.",
+          "icon": "send"
+        }
+      },
+      "inputs": [],
+      "outputs": [{ "output": "receiveOutput" }],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "requestSatoshisTransaction": {
+      "name": "Transfer request",
+      "description": "Transfer request for $(<requestedSatoshis>) satoshis.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<requestedSatoshis>) satoshis.",
+          "icon": "receive"
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<requestedSatoshis>) satoshis.",
+          "icon": "send"
+        }
+      },
+      "inputs": [],
+      "outputs": [{ "output": "requestSatoshisOutput" }],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "requestFungibleTokensTransaction": {
+      "name": "Transfer request",
+      "description": "Transfer request for $(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_DIV).$(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_MOD) $(<requestedTokenCategory.symbol>) tokens.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_DIV).$(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_MOD) $(<requestedTokenCategory.symbol>) tokens.",
+          "icon": "receive"
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_DIV).$(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_MOD) $(<requestedTokenCategory.symbol>) tokens.",
+          "icon": "send"
+        }
+      },
+      "inputs": [],
+      "outputs": [{ "output": "requestFungibleTokensOutput" }],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "requestNonfungibleTokensTransaction": {
+      "name": "Transfer request",
+      "description": "Transfer request for one non-fungible $(<requestedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <requestedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) (<requestedTokenCategory.symbol>) token, with $(<requestedTokenCommitment>) commitment.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received one non-fungible $(<requestedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <requestedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) (<requestedTokenCategory.symbol>) token, with $(<requestedTokenCommitment>) commitment.",
+          "icon": "receive"
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent the requested non-fungible $(<requestedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <requestedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) (<requestedTokenCategory.symbol>) token, with $(<requestedTokenCommitment>) commitment.",
+          "icon": "send"
+        }
+      },
+      "inputs": [],
+      "outputs": [{ "output": "requestNonfungibleTokensOutput" }],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "transferSatoshisTransaction": {
+      "name": "Satoshis Transferred",
+      "description": "$(<transferredSatoshis>) satoshis were transferred to a recipient.",
+      "icon": "send",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<transferredSatoshis>) satoshis.",
+          "icon": "receive"
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<transferredSatoshis>) satoshis.",
+          "icon": "send"
+        }
+      },
+      "inputs": [],
+      "outputs": [{ "output": "transferSatoshisOutput" }],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "transferFungibleTokensTransaction": {
+      "name": "Fungible Tokens Transferred",
+      "description": "$(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_DIV).$(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_MOD) $(<transferredTokenCategory.symbol>) tokens were transferred to a recipient.",
+      "icon": "send",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_DIV).$(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_MOD) $(<transferredTokenCategory.symbol>) tokens.",
+          "icon": "receive"
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_DIV).$(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_MOD) $(<transferredTokenCategory.symbol>) tokens.",
+          "icon": "send"
+        }
+      },
+      "inputs": [],
+      "outputs": [{ "output": "transferFungibleTokensOutput" }],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "transferNonfungibleTokensTransaction": {
+      "name": "Non-fungible Token Transferred",
+      "description": "One non-fungible $(<transferredTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <transferredTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) $(<transferredTokenCategory.symbol>) token was transferred to a recipient, with $(<transferredTokenCommitment>) commitment.",
+      "icon": "send",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received one non-fungible $(<transferredTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <transferredTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) (<transferredTokenCategory.symbol>) token, with $(<transferredTokenCommitment>) commitment.",
+          "icon": "receive"
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent one non-fungible $(<transferredTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <transferredTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) (<transferredTokenCategory.symbol>) token, with $(<transferredTokenCommitment>) commitment.",
+          "icon": "send"
+        }
+      },
+      "inputs": [],
+      "outputs": [{ "output": "transferNonfungibleTokenOutput" }],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "burnFungibleTokensTransaction": {
+      "name": "Deleted fungible tokens",
+      "description": "Permanently and irreversibly deleted $(<burnedTokenAmount> <burnedTokenCategory.decimalsFactor> OP_DIV).$(<burnedTokenAmount> <burnedTokenCategory.decimalsFactor> OP_MOD) $(<burnedTokenCategory.symbol>) tokens.",
+      "icon": "burn",
+      "inputs": [{ "input": "burnFungibleTokensInput" }],
+      "outputs": [],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    },
+    "burnNonfungibleTokenTransaction": {
+      "name": "Deleted non fungible token",
+      "description": "Permanently and irreversibly deleted a non-fungible $(<burnedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <burnedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) (<burnedTokenCategory.symbol>) token, with $(<burnedTokenCommitment>) commitment.",
+      "icon": "burn",
+      "inputs": [{ "input": "burnNonfungibleTokenInput" }],
+      "outputs": [],
+      "version": 2,
+      "locktime": 0,
+      "composable": true
+    }
+  },
+  "outputs": {
+    "receiveOutput": {
+      "name": "Recipient output",
+      "description": "Transferred an unspecified amount of cash and/or tokens to a recipient.",
+      "icon": "receive",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received an unspecified amount of cash and/or tokens."
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent an unspecified amount of cash and/or tokens."
+        }
+      },
+      "lockscript": "receivingLockingScript"
+    },
+    "requestSatoshisOutput": {
+      "name": "Recipient output",
+      "description": "Transferred $(<requestedSatoshis>) satoshis to a recipient.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<requestedSatoshis>) satoshis."
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<requestedSatoshis>) satoshis."
+        }
+      },
+      "lockscript": "receivingLockingScript",
+      "valueSatoshis": "$(<requestedSatoshis>)",
+      "token": null
+    },
+    "requestFungibleTokensOutput": {
+      "name": "Recipient output",
+      "description": "Transferred $(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_DIV).$(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_MOD) $(<requestedTokenCategory.symbol>) tokens to a recipient.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_DIV).$(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_MOD) $(<requestedTokenCategory.symbol>) tokens."
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_DIV).$(<requestedTokenAmount> <requestedTokenCategory.decimalsFactor> OP_MOD) $(<requestedTokenCategory.symbol>) tokens."
+        }
+      },
+      "lockscript": "receivingLockingScript",
+      "valueSatoshis": "1000",
+      "token": {
+        "category": "$(<requestedTokenCategory>)",
+        "amount": "$(<requestedTokenAmount>)",
+        "nft": null
+      }
+    },
+    "requestNonfungibleTokensOutput": {
+      "name": "Recipient output",
+      "description": "Transferred one non-fungible $(<requestedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <requestedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) $(<requestedTokenCategory.symbol>) token to a recipient, with $(<requestedTokenCommitment>) commitment.",
+      "icon": "request",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received one non-fungible $(<requestedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <requestedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) $(<requestedTokenCategory.symbol>) token, with $(<requestedTokenCommitment>) commitment."
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent the requested non-fungible $(<requestedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <requestedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) $(<requestedTokenCategory.symbol>) token, with $(<requestedTokenCommitment>) commitment."
+        }
+      },
+      "lockscript": "receivingLockingScript",
+      "valueSatoshis": "1000",
+      "token": {
+        "category": "$(<requestedTokenCategory>)",
+        "amount": null,
+        "nft": {
+          "capability": "$(<requestedTokenCapability>)",
+          "commitment": "$(<requestedTokenCommitment>)"
+        }
+      }
+    },
+    "transferSatoshisOutput": {
+      "name": "Recipient output",
+      "description": "Transferred $(<transferredSatoshis>) satoshis to a recipient.",
+      "icon": "send",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<transferredSatoshis>) satoshis."
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<transferredSatoshis>) satoshis."
+        }
+      },
+      "lockscript": "sendingLockingscript",
+      "valueSatoshis": "$(<transferredSatoshis>)"
+    },
+    "transferFungibleTokensOutput": {
+      "name": "Recipient output",
+      "description": "Transferred $(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_DIV).$(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_MOD) $(<transferredTokenCategory.symbol>) tokens to a recipient.",
+      "icon": "send",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received $(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_DIV).$(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_MOD) $(<transferredTokenCategory.symbol>) tokens."
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent $(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_DIV).$(<transferredTokenAmount> <transferredTokenCategory.decimalsFactor> OP_MOD) $(<transferredTokenCategory.symbol>) tokens."
+        }
+      },
+      "lockscript": "sendingLockingscript",
+      "token": {
+        "category": "$(<transferredTokenCategory>)",
+        "amount": "$(<transferredTokenAmount>)"
+      }
+    },
+    "transferNonfungibleTokenOutput": {
+      "name": "Recipient output",
+      "description": "Transferred one non-fungible $(<transferredTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <transferredTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) $(<transferredTokenCategory.symbol>) token to a recipient, with $(<transferredTokenCommitment>) commitment.",
+      "icon": "send",
+      "roles": {
+        "receiver": {
+          "name": "Received",
+          "description": "Received one non-fungible $(<transferredTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <transferredTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) $(<transferredTokenCategory.symbol>) token, with $(<transferredTokenCommitment>) commitment."
+        },
+        "sender": {
+          "name": "Sent",
+          "description": "Sent one non-fungible $(<transferredTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <transferredTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) $(<transferredTokenCategory.symbol>) token, with $(<transferredTokenCommitment>) commitment."
+        }
+      },
+      "lockscript": "sendingLockingscript",
+      "token": {
+        "category": "$(<transferredTokenCategory>)",
+        "nft": {
+          "capability": "$(<transferredTokenCapability>)",
+          "commitment": "$(<transferredTokenCommitment>)"
+        }
+      }
+    }
+  },
+  "inputs": {
+    "burnFungibleTokensInput": {
+      "name": "Deleted fungible tokens",
+      "description": "Permanently and irreversibly deleted $(<burnedTokenAmount>) $(<burnedTokenCategory>).",
+      "icon": "burn",
+      "unlockingScript": "unlockP2PKH",
+      "token": {
+        "category": "$(<burnedTokenCategory>)",
+        "amount": "$(<this.fungibleTokenAmount> <burnedTokenAmount> OP_GREATERTHANOREQUAL OP_IF <this.fungibleTokens> OP_ENDIF)"
+      },
+      "omitChangeAmounts": { "fungibleTokens": "${<burnedTokenAmount>}" }
+    },
+    "burnNonfungibleTokenInput": {
+      "name": "Deleted non-fungible token",
+      "description": "Permanently and irreversibly burned one non-fungible $(<burnedTokenCapability> <0x02> OP_EQUAL OP_IF <\"minting\"> OP_ELSE <burnedTokenCapability> <0x01> OP_EQUAL OP_IF <\"mutable\"> OP_ELSE <\"immutable\"> OP_ENDIF OP_ENDIF) token of category $(<burnedTokenCategory>), with a $(<burnedTokenCommitment>) commitment.",
+      "icon": "burn",
+      "unlockingScript": "unlockP2PKH",
+      "token": {
+        "category": "$(<burnedTokenCategory>)",
+        "nft": {
+          "capability": "$(<burnedTokenCapability>)",
+          "commitment": "$(<burnedTokenCommitment>)"
+        }
+      },
+      "omitChangeAmounts": { "nonfungibleTokens": 1 }
+    }
+  },
+  "lockingScripts": {
+    "sendingLockingscript": {
+      "name": "Sent",
+      "description": "Funds sent to an external recipient",
+      "icon": "address",
+      "lockingType": "standard",
+      "lockingScript": "lockToRecipient",
+      "actions": [],
+      "state": [],
+      "secrets": [],
+      "balance": false,
+      "selectable": false,
+      "privacy": false
+    },
+    "receivingLockingScript": {
+      "name": "Received",
+      "description": "Funds received without wallet coordination.",
+      "icon": "address",
+      "lockingType": "standard",
+      "lockingScript": "lockP2PKH",
+      "unlockingScript": "unlockP2PKH",
+      "roles": {
+        "receiver": {
+          "state": { "variables": [], "secrets": ["ownerKey"] },
+          "actions": [
+            { "action": "sign", "role": "owner", "secrets": ["ownerKey"] },
+            { "action": "verify", "role": "owner", "secrets": ["ownerKey"] },
+            {
+              "action": "sendSatoshis",
+              "role": "sender",
+              "secrets": ["ownerKey"]
+            },
+            {
+              "action": "sendFungibleTokens",
+              "role": "sender",
+              "secrets": ["ownerKey"]
+            },
+            {
+              "action": "sendNonfungibleTokens",
+              "role": "sender",
+              "secrets": ["ownerKey"]
+            },
+            {
+              "action": "burnFungibleTokens",
+              "role": "sender",
+              "secrets": ["ownerKey"]
+            },
+            {
+              "action": "burnNonfungibleTokens",
+              "role": "sender",
+              "secrets": ["ownerKey"]
+            }
+          ],
+          "balance": { "satoshis": true, "fungibleTokens": true },
+          "selectable": true,
+          "privacy": false
+        }
+      }
+    }
+  },
+  "scripts": {
+    "lockP2PKH": "OP_DUP OP_HASH160 <$(<ownerKey.public_key> OP_HASH160)> OP_EQUALVERIFY OP_CHECKSIG",
+    "unlockP2PKH": "<ownerKey.schnorr_signature.all_outputs> <ownerKey.public_key>",
+    "lockToRecipient": "<recipientLockingscript>"
+  },
+  "constants": {
+    "dustLimit": {
+      "name": "Dust Limit",
+      "description": "Standard required minimum satoshis for Pay to Public Key Hash outputs.",
+      "type": "integer",
+      "value": 546
+    },
+    "messagePrefix": {
+      "name": "Message Prefix",
+      "description": "Standard message prefix used in the bitcoin signed message protocol.",
+      "type": "bytes",
+      "value": "0x18426974636f696e205369676e6564204d6573736167653a0a"
+    }
+  },
+  "variables": {
+    "ownerKey": {
+      "name": "Owners Private Key",
+      "description": "The private key used to authorize spending of received funds.",
+      "type": "bytes",
+      "hint": "private_key"
+    },
+    "messageToSign": {
+      "name": "Message",
+      "description": "The text message to sign.",
+      "type": "string"
+    },
+    "messageToVerify": {
+      "name": "Message",
+      "description": "The text message to verify.",
+      "type": "string"
+    },
+    "messageSignature": {
+      "name": "Message Signature",
+      "description": "The signature for the message.",
+      "type": "bytes",
+      "hint": "signature"
+    },
+    "requestedSatoshis": {
+      "name": "Requested Amount",
+      "description": "The Bitcoin Cash amount requested",
+      "type": "integer",
+      "hint": "satoshis"
+    },
+    "requestedTokenCategory": {
+      "name": "Requested Token Category",
+      "description": "The token category requested",
+      "type": "bytes",
+      "hint": "token_category"
+    },
+    "requestedTokenAmount": {
+      "name": "Requested Token Amount",
+      "description": "The fungible token amount requested",
+      "type": "integer",
+      "hint": "token_amount"
+    },
+    "requestedTokenCapability": {
+      "name": "Requested Token Capability",
+      "description": "The non-fungible token capability requested",
+      "type": "bytes",
+      "hint": "token_capability"
+    },
+    "requestedTokenCommitment": {
+      "name": "Requested Token Commitment",
+      "description": "The non-fungible token commitment requested",
+      "type": "bytes",
+      "hint": "token_commitment"
+    },
+    "transferredTokenCategory": {
+      "name": "Sending Token Category",
+      "description": "The token category of the token(s) to send",
+      "type": "bytes",
+      "hint": "token_category"
+    },
+    "transferredTokenAmount": {
+      "name": "Sending Token Amount",
+      "description": "The fungible token amount to send",
+      "type": "integer",
+      "hint": "token_amount"
+    },
+    "transferredTokenCapability": {
+      "name": "Sending Token Capability",
+      "description": "The token capability for the non-fungible token to send",
+      "type": "bytes",
+      "hint": "token_capability"
+    },
+    "transferredTokenCommitment": {
+      "name": "Sending Token Commitment",
+      "description": "The token commitment for the non-fungible token to send",
+      "type": "bytes",
+      "hint": "token_commitment"
+    },
+    "burnedTokenCategory": {
+      "name": "Deleted Token Category",
+      "description": "The token category of the token(s) to delete",
+      "type": "bytes",
+      "hint": "token_category"
+    },
+    "burnedTokenAmount": {
+      "name": "Deleted Token Amount",
+      "description": "The fungible token amount to delete",
+      "type": "integer",
+      "hint": "token_amount"
+    },
+    "burnedTokenCapability": {
+      "name": "Deleted Token Capability",
+      "description": "The token capability for the non-fungible token to delete",
+      "type": "bytes",
+      "hint": "token_capability"
+    },
+    "burnedTokenCommitment": {
+      "name": "Deleted Token Commitment",
+      "description": "The token commitment for the non-fungible token to delete",
+      "type": "bytes",
+      "hint": "token_commitment"
+    }
+  },
+  "icons": [
+    { "name": "wallet", "hash": "0000000000000000000000" },
+    { "name": "owner", "hash": "0000000000000000000000" },
+    { "name": "sender", "hash": "0000000000000000000000" },
+    { "name": "address", "hash": "0000000000000000000000" },
+    { "name": "receive", "hash": "0000000000000000000000" },
+    { "name": "request", "hash": "0000000000000000000000" },
+    { "name": "send", "hash": "0000000000000000000000" },
+    { "name": "burn", "hash": "0000000000000000000000" },
+    { "name": "sign", "hash": "0000000000000000000000" },
+    { "name": "verify", "hash": "0000000000000000000000" }
+  ],
+  "scenarios": [
+    {
+      "name": "requesting satoshis",
+      "description": "happy-path evaluation for requesting satoshis.",
+      "action": "requestSatoshis",
+      "roles": [
+        {
+          "role": "receiver",
+          "values": {
+            "generated": {
+              "ownerKey": "KyRQa5pEXuzVcDwnXRLpYAascjchQW5DoxVRMbj4DTxS83573mz8"
+            },
+            "variables": { "requestedSatoshis": 2000 },
+            "secrets": {},
+            "inputs": [],
+            "outputs": [
+              {
+                "lockingBytecode": "76a91475c715ecb74178fe87933e57e947e5e92d904b8188ac",
+                "valueSatoshis": 2000
+              }
+            ]
+          }
+        },
+        {
+          "role": "sender",
+          "values": {
+            "generated": {},
+            "variables": {},
+            "secrets": {},
+            "inputs": [
+              {
+                "outpointTransactionHash": "4ef28553a31a266719e66ba97fee3aeecd6d1788f7ff6ab12f8ebceda49660c0",
+                "outpointIndex": 0,
+                "sequenceNumber": 0,
+                "unlockingBytecode": "41226b2be7c2890c8bbde2f79e79640e56d866843f2e822ec51c469019d13db04a422c9ee49f5eefd26fee24e91910edbbb032b90cc54c34da80a61e69b0ee3d22412103e7ab26c36a7c7f45b2c26f33c08b0fa43a633268700f47216646d4cb37ae5696"
+              }
+            ],
+            "outputs": [
+              {
+                "lockingBytecode": "76a91475c715ecb74178fe87933e57e947e5e92d904b8188ac",
+                "valueSatoshis": 2000
+              }
+            ]
+          }
+        }
+      ],
+      "values": { "generated": {}, "variables": {}, "secrets": {} },
+      "outcome": {
+        "roles": {
+          "receiver": {
+            "name": "Request",
+            "description": "Requested a specific amount of satoshis from one or more senders.",
+            "icon": "request"
+          },
+          "sender": {
+            "name": "Send",
+            "description": "Sent a specific amount of satoshis to the provided receiver.",
+            "icon": "send"
+          }
+        },
+        "transactions": [
+          {
+            "transaction": "0200000001c06096a4edbc8e2fb16afff788176dcdee3aee7fa96be61967261aa35385f24e000000006441226b2be7c2890c8bbde2f79e79640e56d866843f2e822ec51c469019d13db04a422c9ee49f5eefd26fee24e91910edbbb032b90cc54c34da80a61e69b0ee3d22412103e7ab26c36a7c7f45b2c26f33c08b0fa43a633268700f47216646d4cb37ae5696000000000267530300000000001976a91475c715ecb74178fe87933e57e947e5e92d904b8188acd0070000000000001976a91475c715ecb74178fe87933e57e947e5e92d904b8188ac00000000",
+            "value": ""
+          }
+        ]
+      }
+    }
+  ]
+}

package.json

@@ -3,11 +3,27 @@
   "version": "1.0.0",
   "main": "dist/index.js",
   "type": "module",
+  "bin": {
+    "xo-cli": "./dist/cli/index.js",
+    "xo-tui": "./dist/index.js",
+    "xo-complete": "./dist/cli/autocomplete/complete.js"
+  },
   "scripts": {
     "dev": "SYNC_SERVER_URL=https://sync.xo.harvmaster.com tsx src/index.ts",
-    "build": "tsc",
+    "build": "tsc && npm run build:copy-scripts",
+    "build:copy-scripts": "cp -r src/cli/autocomplete/scripts dist/cli/autocomplete/",
     "start": "SYNC_SERVER_URL=https://sync.xo.harvmaster.com node dist/index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "vitest --run --passWithNoTests",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage --passWithNoTests",
+    "nuke": "tsx scripts/rm-dbs.ts",
+    "nuke:dry": "tsx scripts/rm-dbs.ts --dry",
+    "format": "prettier --write \"**/*.{js,ts,md,json}\" --ignore-path .gitignore",
+    "format:check": "prettier --check .",
+    "autocomplete:install": "node dist/cli/index.js completions bash --install",
+    "autocomplete:install:bash": "node dist/cli/index.js completions bash --install",
+    "autocomplete:install:zsh": "node dist/cli/index.js completions zsh --install",
+    "autocomplete:install:fish": "node dist/cli/index.js completions fish --install"
   },
   "keywords": [
     "crypto",
@@ -20,23 +36,29 @@
   "description": "XO Wallet CLI - Terminal User Interface for XO crypto wallet",
   "dependencies": {
     "@bitauth/libauth": "^3.0.0",
+    "@electrum-cash/protocol": "^2.3.1",
+    "@generalprotocols/oracle-client": "^0.0.1-development.11945476152",
+    "@xo-cash/crypto": "^0.0.1",
     "@xo-cash/engine": "file:../engine",
     "@xo-cash/state": "file:../state",
-    "@xo-cash/templates": "file:../templates",
-    "@xo-cash/types": "file:../types",
+    "@xo-cash/templates": "^0.0.1",
+    "@xo-cash/types": "^0.0.1",
     "better-sqlite3": "^12.6.2",
     "clipboardy": "^5.1.0",
     "ink": "^6.6.0",
-    "ink-select-input": "^6.0.0",
-    "ink-spinner": "^5.0.0",
-    "ink-text-input": "^6.0.0",
-    "react": "^19.2.4"
+    "prettier": "^3.8.1",
+    "qrcode": "^1.5.4",
+    "react": "^19.2.4",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^25.0.10",
-    "@types/react": "^18.3.18",
+    "@types/qrcode": "^1.5.6",
+    "@types/react": "^19.2.14",
+    "@vitest/coverage-v8": "^4.1.2",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.2"
   }
 }

readme.md

@@ -0,0 +1,107 @@
+# XO-CLI & XO-TUI
+
+## Installation
+
+### Full Installation
+```bash
+# Create a new directory since we are going to be pulling in engine too
+mkdir xo-terminal && cd xo-terminal
+
+# ----- Start Engine Setup -----
+# Clone the Engine Repo (Note, this uses harvey's fork of the engine repo to access the cli-test branch)
+git clone git@gitlab.com:Harvmaster/engine.git
+
+# Move into teh engine directory
+cd engine
+
+# Checkout the cli-test branch
+git checkout cli-test
+
+# Install the dependencies
+npm ci
+
+# Build the engine
+npm run build
+# ----- End Engine Setup -----
+
+# Move back to the top level directory
+cd ..
+
+# ----- Start State Setup -----
+# Clone the State Repo
+git clone git@gitlab.com:Harvmaster/state.git
+
+# Move into the state directory
+cd state
+
+git checkout in-memory-adapter
+
+# Install the dependencies
+npm ci
+
+# Build the state
+npm run build
+# ----- End State Setup -----
+
+# Move back to the top level directory
+cd ..
+
+# ----- Start CLI Setup -----
+# Clone the CLI Repo
+git clone git@git.harvmaster.com:Harvmaster/xo-cli.git 
+
+# Move into the cli directory
+cd xo-cli
+
+# Install the dependencies
+npm ci
+
+# Build the cli
+npm run build
+# ----- End CLI Setup -----
+```
+
+### Run TUI in dev mode
+
+```bash
+npm run dev
+```
+
+### Install globally
+
+```bash
+# (From the xo-cli directory)
+npm install -g .
+```
+
+### Install autocomplete completions (From the xo-cli directory)
+
+#### Install for bash
+```bash
+npm run autocomplete:install:bash
+```
+
+#### Install for zsh
+```bash
+npm run autocomplete:install:zsh
+```
+
+#### Install for fish
+```bash
+npm run autocomplete:install:fish
+```
+
+### Run the CLI
+```bash
+# If globally installed (Not really usable if not globally installed)
+xo-cli
+```
+
+### Run the TUI
+```bash
+# If globally installed
+xo-tui
+
+# If not globally installed
+npm run dev
+```

scripts/rm-dbs.ts

@@ -0,0 +1,40 @@
+import fs from "fs/promises";
+
+/**
+ * Remove all the databases without the use of external tools
+ * TODO: Fix the ts linking issue here. Should just be adding this as a dir in tsconfig.json
+ */
+const rmDbs = async (dry = false) => {
+  // First, we need to find all the database base files
+  // These end in either .db.sqlite, .sqlite, .db
+  // Get all the files in the current directory
+  const files = await fs.readdir("./");
+
+  // Filter out the files that end in .db.sqlite, .sqlite, .db
+  const dbFiles = files.filter(
+    (file) =>
+      file.endsWith(".db.sqlite") ||
+      file.endsWith(".sqlite") ||
+      file.endsWith(".db"),
+  );
+
+  // We need to remove all the files
+  await deleteFiles(dbFiles, dry);
+};
+
+const deleteFiles = async (files: string[], dry = false) => {
+  if (dry) {
+    console.log("Dry run, would delete:", files);
+    return;
+  }
+
+  await Promise.all(files.map((file) => fs.rm(file)));
+  console.log("All databases removed");
+};
+
+// Read args
+const args = process.argv.slice(2);
+const dry = args.includes("--dry");
+
+// Delete the files
+await rmDbs(dry);

scripts/template-to-json.ts

@@ -0,0 +1,104 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+
+/**
+ * This just convers the <template>.ts file to a <template>.json file.
+ * Im fairly sure there is a util in the engine or engine-packages for this, but I decided to just keep it as simple as possible because I didn't feel like digging around for it.
+ *
+ * Usage:
+ * tsx scripts/template-to-json.ts ../templates/source/p2pkh.ts ./p2pkh.json p2pkhTemplate
+ */
+
+/**
+ * Prints usage to stderr and exits with a non-zero code.
+ */
+function printUsageAndExit(): never {
+  console.error(
+    [
+      "Usage: tsx scripts/template-to-json.ts <input.ts> <output.json> [exportName]",
+      "",
+      "Loads a TypeScript module, picks one exported value, and writes JSON.stringify to the output path.",
+      "If exportName is omitted: uses default export, or the only non-function export if there is exactly one.",
+      "",
+      "Example:",
+      "  tsx scripts/template-to-json.ts ../templates/source/p2pkh.ts ./p2pkh.json p2pkhTemplate",
+    ].join("\n"),
+  );
+  process.exit(1);
+}
+
+/**
+ * Collects runtime export keys whose values are not functions (typical for data/template objects).
+ */
+function listDataExportKeys(mod: Record<string, unknown>): string[] {
+  return Object.keys(mod).filter((key) => {
+    if (key === "__esModule") {
+      return false;
+    }
+    const value = mod[key];
+    return typeof value !== "function";
+  });
+}
+
+/**
+ * Resolves which export to serialize: explicit name, default, or a single unambiguous data export.
+ */
+function resolveExportedValue(
+  mod: Record<string, unknown>,
+  exportName: string | undefined,
+): unknown {
+  if (exportName !== undefined) {
+    if (!(exportName in mod)) {
+      const keys = listDataExportKeys(mod);
+      console.error(
+        `Export "${exportName}" not found. Available data exports: ${keys.length ? keys.join(", ") : "(none)"}`,
+      );
+      process.exit(1);
+    }
+    return mod[exportName];
+  }
+
+  if ("default" in mod && mod.default !== undefined) {
+    return mod.default;
+  }
+
+  const keys = listDataExportKeys(mod);
+  if (keys.length === 1) {
+    return mod[keys[0]!];
+  }
+
+  if (keys.length === 0) {
+    console.error(
+      "No suitable exports found (need default or a non-function export).",
+    );
+  } else {
+    console.error(
+      `Multiple data exports found; pass exportName. Candidates: ${keys.join(", ")}`,
+    );
+  }
+  process.exit(1);
+}
+
+async function main(): Promise<void> {
+  const args = process.argv.slice(2);
+  if (args.length < 2) {
+    printUsageAndExit();
+  }
+
+  const [inputRel, outputRel, exportName] = args;
+  const inputPath = path.resolve(process.cwd(), inputRel!);
+  const outputPath = path.resolve(process.cwd(), outputRel!);
+
+  /** Dynamic import needs a file URL so Windows paths and ESM resolution behave. */
+  const fileUrl = pathToFileURL(inputPath).href;
+  const mod = (await import(fileUrl)) as Record<string, unknown>;
+  const value = resolveExportedValue(mod, exportName);
+
+  const json = `${JSON.stringify(value, null, 2)}\n`;
+  await fs.mkdir(path.dirname(outputPath), { recursive: true });
+  await fs.writeFile(outputPath, json, "utf8");
+  console.log(`Wrote ${outputPath}`);
+}
+
+await main();

src/app.ts

@@ -3,9 +3,11 @@
  * Simplified to render TUI immediately and let it handle AppService creation.
  */
 
-import React from 'react';
-import { render, type Instance } from 'ink';
-import { App as AppComponent } from './tui/App.js';
+import { join } from "node:path";
+import React from "react";
+import { render, type Instance } from "ink";
+import { App as AppComponent } from "./tui/App.js";
+import { getDataDir } from "./utils/paths.js";
 
 /**
  * Configuration options for the CLI application.
@@ -46,15 +48,17 @@ export class App {
    * @returns Running App instance
    */
   static async create(config: Partial<AppConfig> = {}): Promise<App> {
+    const dataDir = getDataDir();
     // Set default configuration
     const fullConfig: AppConfig = {
-      syncServerUrl: config.syncServerUrl ?? 'http://localhost:3000',
-      databasePath: config.databasePath ?? './',
-      databaseFilename: config.databaseFilename ?? 'xo-wallet.db',
-      invitationStoragePath: config.invitationStoragePath ?? './xo-invitations.db',
+      syncServerUrl: config.syncServerUrl ?? "http://localhost:3000",
+      databasePath: config.databasePath ?? dataDir,
+      databaseFilename: config.databaseFilename ?? "xo-wallet.db",
+      invitationStoragePath:
+        config.invitationStoragePath ?? join(dataDir, "xo-invitations.db"),
     };
 
-    console.log('Full config:', fullConfig);
+    console.log("Full config:", fullConfig);
 
     const app = new App(fullConfig);
     await app.start();
@@ -71,11 +75,13 @@ export class App {
     this.inkInstance = render(
       React.createElement(AppComponent, {
         config: this.config,
-      })
+      }),
     );
 
     // Wait for the app to exit
     await this.inkInstance.waitUntilExit();
+
+    process.exit(0);
   }
 
   /**

src/cli/README.md

@@ -0,0 +1,195 @@
+# XO CLI
+
+Command-line interface for the XO Engine. Create wallets, manage templates, build invitations, sign transactions, and broadcast them to the Bitcoin Cash network.
+
+There are two global commands after install:
+
+- **`xo-cli`** — non-interactive commands (this document).
+- **`xo-tui`** — interactive terminal wallet UI (Ink/React).
+
+## Global config directory
+
+Wallet state lives under **`~/.config/xo-cli/`** (XDG-style), so you can run commands from any directory:
+
+| Path                          | Purpose                                                                 |
+| ----------------------------- | ----------------------------------------------------------------------- |
+| `~/.config/xo-cli/mnemonics/` | Mnemonic files (`mnemonic-*`)                                           |
+| `~/.config/xo-cli/data/`      | Engine DB (`xo-wallet.db`) and invitation storage (`xo-invitations.db`) |
+| `~/.config/xo-cli/.wallet`    | Last-used mnemonic reference (so `-m` can be omitted)                   |
+
+**Local to your shell’s current directory:** template JSON paths, invitation JSON you create/import, and any path you pass explicitly (e.g. `-m /abs/path/to/file`).
+
+## Install (global, from this repo)
+
+`@xo-cash/*` dependencies use `file:` paths, so publish to npm is a separate step. For local development:
+
+```bash
+cd engine/cli
+npm install
+npm run build
+npm link
+# xo-cli and xo-tui are now on your PATH
+```
+
+Development without linking:
+
+```bash
+cd engine/cli
+npx tsx src/cli/index.ts <command> [options]
+npx tsx src/index.ts   # TUI
+```
+
+### Environment variables (TUI / `xo-tui`)
+
+| Variable                  | Default                                   |
+| ------------------------- | ----------------------------------------- |
+| `SYNC_SERVER_URL`         | `http://localhost:3000`                   |
+| `DB_PATH`                 | `~/.config/xo-cli/data`                   |
+| `DB_FILENAME`             | `xo-wallet.db`                            |
+| `INVITATION_STORAGE_PATH` | `~/.config/xo-cli/data/xo-invitations.db` |
+
+## Getting Started
+
+### Wallet Setup
+
+```bash
+# Generate a new mnemonic (saved under ~/.config/xo-cli/mnemonics/)
+xo-cli mnemonic create
+
+# Import an existing mnemonic seed phrase
+xo-cli mnemonic import page pencil stock planet limb cluster assault speak off joke private pioneer
+
+# List mnemonic basenames (use with -m)
+xo-cli mnemonic list
+```
+
+**Options:** `-o <filename>` — basename only; file is written under the global mnemonics directory.
+
+### Wallet Persistence
+
+The first time you pass `-m <name>`, that reference is saved to `~/.config/xo-cli/.wallet`. Later runs can omit `-m`.
+
+Mnemonic resolution order:
+
+1. Absolute path, if the file exists
+2. Path relative to the current working directory
+3. `~/.config/xo-cli/mnemonics/<basename>`
+
+```bash
+xo-cli resource list -m mnemonic-nuclear
+xo-cli resource list
+```
+
+## Global Options (`xo-cli`)
+
+| Flag                           | Description                                         |
+| ------------------------------ | --------------------------------------------------- |
+| `-m`, `--mnemonic-file <file>` | Mnemonic file (basename, cwd-relative, or absolute) |
+| `-o`, `--output <filename>`    | Output filename (used by `mnemonic create`/`import`) |
+| `-v`, `--verbose`              | Verbose output                                      |
+| `-h`, `--help`                 | Help                                                |
+
+Advanced: you can pass `--database-path`, `--database-filename`, and `--invitation-storage-path` to override the defaults under `~/.config/xo-cli/data/` (see `src/cli/index.ts`).
+
+## Commands
+
+### `mnemonic` — Manage Wallet Files
+
+```bash
+xo-cli mnemonic create
+xo-cli mnemonic import <seed words...>
+xo-cli mnemonic list
+xo-cli mnemonic expose <mnemonic-file>
+```
+
+### `template` — Manage Templates
+
+```bash
+xo-cli template import <template-file>
+xo-cli template list
+xo-cli template list <category> <template-id>
+xo-cli template inspect <category> <template-id> <field>
+xo-cli template set-default <template-file> <output-id> <role>
+```
+
+**Categories:** `action`, `transaction`, `output`, `lockingscript`, `variable`
+
+Template paths are resolved relative to the **current working directory**.
+
+### `resource` — Manage UTXOs
+
+```bash
+xo-cli resource list
+xo-cli resource list reserved
+xo-cli resource list all
+xo-cli resource unreserve <txhash:vout>
+xo-cli resource unreserve-all
+```
+
+### `receive` — Generate a Receiving Address
+
+```bash
+xo-cli receive <template-file> <output-identifier> [role-identifier]
+```
+
+### `invitation` — Build, Sign & Broadcast
+
+```bash
+xo-cli invitation create <template-file> <action-id> [options]
+xo-cli invitation append <invitation-id> [options]
+xo-cli invitation sign <invitation-id>
+xo-cli invitation broadcast <invitation-id>
+xo-cli invitation requirements <invitation-id>
+xo-cli invitation import <invitation-file>
+xo-cli invitation inspect <invitation-file>
+xo-cli invitation list
+```
+
+**Create / append options:**
+
+| Flag                        | Description                              |
+| --------------------------- | ---------------------------------------- |
+| `-var-<name> <value>`       | Template variable                        |
+| `--add-input <txhash:vout>` | Inputs (comma-separated)                 |
+| `--add-output <id>`         | Override outputs (omit to auto-discover) |
+| `--auto-inputs`             | Auto-select UTXOs                        |
+| `-role <role>`              | Role for variables / bytecode            |
+| `--sign`                    | Auto-sign when complete                  |
+| `--broadcast`               | Auto-broadcast (implies `--sign`)        |
+
+Invitation JSON files from `create` / `append` are written to the **current working directory**.
+
+### One-command send
+
+```bash
+xo-cli resource list
+xo-cli invitation create p2pkh-template.json sendSatoshis \
+  -var-transferred-satoshis 4678 \
+  -var-recipient-lockingscript "bitcoincash:qz..." \
+  --add-input <txhash>:<vout> \
+  -role sender \
+  --broadcast
+```
+
+### `xo-tui`
+
+```bash
+xo-tui
+```
+
+Launches the full-screen wallet UI; uses the same global data directory unless overridden by env vars.
+
+## Shell Completions
+
+```bash
+eval "$(xo-cli completions bash)"
+eval "$(xo-cli completions zsh)"
+xo-cli completions fish | source
+```
+
+## File Conventions
+
+| Location            | Purpose                                    |
+| ------------------- | ------------------------------------------ |
+| `~/.config/xo-cli/` | Global wallet state                        |
+| `./` (cwd)          | Templates, invitation JSON, explicit paths |

src/cli/arguments.ts

@@ -0,0 +1,86 @@
+/**
+ * CLI Argument extraction and validation.
+ *
+ * Converts `-${key}` or `--${key}` to `key` in the args object.
+ */
+import { z } from "zod";
+
+/**
+ * Converts the CLI args to a key-value object and return the options object along with the other arguments still in the array.\
+ * eg: `xo-cli mnemonic create page pencil stock planet limb cluster assault speak off joke private pioneer -v -o mnemonic.txt` will return:
+ * {
+ *   args: ["mnemonic", "create", "page", "pencil", "stock", "planet", "limb", "cluster", "assault", "speak", "off", "joke", "private", "pioneer"],
+ *   options: {
+ *     output: "mnemonic.txt",
+ *     verbose: "true",
+ *   },
+ * }
+ *
+ * @param args - The CLI args to convert.
+ * @returns The key-value object.
+ */
+export function convertArgsToObject(args: string[]): {
+  args: string[];
+  options: Record<string, string>;
+} {
+  // Map of single-character short flags to their canonical long names
+  const shortToFull: Record<string, string> = {
+    m: "mnemonicFile",
+    o: "output",
+    v: "verbose",
+    h: "help",
+  };
+
+  // Flags that are always boolean and never consume the next argument as a value.
+  // Uses the canonical (expanded) names so the check works after short-form resolution.
+  const booleanFlags = new Set<string>([
+    "verbose",
+    "help",
+    "autoInputs",
+    "sign",
+    "broadcast",
+    "install",
+  ]);
+
+  const positionalArgs: string[] = [];
+  const optionsObject: Record<string, string> = {};
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+
+    // Collect non-option arguments as positional args
+    if (!arg || !arg.startsWith("-")) {
+      if (arg) positionalArgs.push(arg);
+      continue;
+    }
+
+    // Format the option key:
+    // - Remove the leading `-`s
+    // - Convert kebab-case to camelCase
+    // - Expand known short forms to their full names
+    let key = arg
+      .replace(/^-+/, "")
+      .replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
+    key = shortToFull[key] ?? key;
+
+    // Known boolean flags never take a value
+    if (booleanFlags.has(key)) {
+      optionsObject[key] = "true";
+      continue;
+    }
+
+    const nextArg = args[i + 1];
+
+    // If there's no next arg or it starts with `-`, treat this as a boolean flag
+    if (!nextArg || nextArg.startsWith("-")) {
+      optionsObject[key] = "true";
+      continue;
+    }
+
+    // Consume the next arg as the value and skip it in the next iteration
+    optionsObject[key] = nextArg;
+    i++;
+  }
+
+  return { args: positionalArgs, options: optionsObject };
+}

src/cli/autocomplete/complete.ts

@@ -0,0 +1,393 @@
+#!/usr/bin/env node
+/**
+ * Lightweight shell completion helper for xo-cli.
+ *
+ * This script reads from local SQLite only - no network connections.
+ * It's designed to be fast enough for interactive tab completion.
+ *
+ * Usage: xo-complete <context> [args...]
+ *
+ * Contexts:
+ *   mnemonics                         - List mnemonic file names
+ *   templates                         - List template names/IDs
+ *   actions <template>                - List actions for a template
+ *   fields <category> <template>      - List fields for a template category
+ *   invitations                       - List invitation IDs
+ *   resources                         - List UTXO outpoints (txhash:vout)
+ *   subcommands <command>             - List subcommands for a top-level command
+ *
+ * Output: One completion suggestion per line, suitable for shell completion.
+ *
+ * Exit codes:
+ *   0 - Success (may output zero or more completions)
+ *   1 - Error (no output, fails silently for shell integration)
+ */
+
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { createHash } from "node:crypto";
+
+import {
+  getDataDir,
+  getMnemonicsDir,
+  getWalletConfigPath,
+} from "../../utils/paths.js";
+import { loadMnemonic } from "../mnemonic.js";
+import { Storage } from "../../services/storage.js";
+import { COMMAND_TREE } from "./completions.js";
+
+// Lazy-loaded modules (only loaded when needed for dynamic completions)
+let _offlineEngineModule: typeof import("./offline-engine.js") | null = null;
+let _engineModule: typeof import("@xo-cash/engine") | null = null;
+
+async function getOfflineEngineModule() {
+  if (!_offlineEngineModule) {
+    _offlineEngineModule = await import("./offline-engine.js");
+  }
+  return _offlineEngineModule;
+}
+
+async function getEngineModule() {
+  if (!_engineModule) {
+    _engineModule = await import("@xo-cash/engine");
+  }
+  return _engineModule;
+}
+
+/**
+ * Outputs completions to stdout, one per line.
+ * Optionally filters by a prefix (for partial word completion).
+ */
+function outputCompletions(items: readonly string[], prefix?: string): void {
+  const filtered = prefix
+    ? items.filter((item) =>
+        item.toLowerCase().startsWith(prefix.toLowerCase()),
+      )
+    : items;
+
+  for (const item of filtered) {
+    console.log(item);
+  }
+}
+
+/**
+ * Lists mnemonic file names from the mnemonics directory.
+ * Fast path: no engine needed, just filesystem.
+ */
+function listMnemonics(prefix?: string): void {
+  try {
+    const mnemonicsDir = getMnemonicsDir();
+    const files = readdirSync(mnemonicsDir).filter((f) =>
+      f.startsWith("mnemonic-"),
+    );
+    outputCompletions(files, prefix);
+  } catch {
+    // Silently fail - no completions available
+  }
+}
+
+/**
+ * Lists subcommands for a given top-level command.
+ * Uses the static COMMAND_TREE.
+ */
+function listSubcommands(command: string, prefix?: string): void {
+  if (command in COMMAND_TREE) {
+    const subcommands = COMMAND_TREE[command as keyof typeof COMMAND_TREE];
+    outputCompletions(subcommands, prefix);
+  }
+}
+
+/**
+ * Gets the current wallet's mnemonic seed from the saved config.
+ * Returns null if no wallet is configured.
+ */
+function getCurrentMnemonic(): string | null {
+  try {
+    const walletConfigPath = getWalletConfigPath();
+    if (!existsSync(walletConfigPath)) {
+      return null;
+    }
+
+    const mnemonicFile = readFileSync(walletConfigPath, "utf8").trim();
+    if (!mnemonicFile) {
+      return null;
+    }
+
+    const mnemonicsDir = getMnemonicsDir();
+    return loadMnemonic(mnemonicsDir, mnemonicFile);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Lists templates from the engine.
+ */
+async function listTemplates(prefix?: string): Promise<void> {
+  const mnemonic = getCurrentMnemonic();
+  if (!mnemonic) return;
+
+  const { tryCreateOfflineEngine } = await getOfflineEngineModule();
+  const { generateTemplateIdentifier } = await getEngineModule();
+
+  const engine = await tryCreateOfflineEngine(mnemonic, {
+    databasePath: getDataDir(),
+    databaseFilename: "xo-wallet.db",
+  });
+
+  if (!engine) return;
+
+  try {
+    const templates = await engine.listImportedTemplates();
+    const completions: string[] = [];
+
+    for (const template of templates) {
+      // Add template name (for user-friendly completion)
+      if (template.name) {
+        completions.push(template.name);
+      }
+      // Also add template identifier (for precise matching)
+      const id = generateTemplateIdentifier(template);
+      if (id && !completions.includes(id)) {
+        completions.push(id);
+      }
+    }
+
+    outputCompletions(completions, prefix);
+  } finally {
+    await engine.stop();
+  }
+}
+
+/**
+ * Resolves a template by name or ID.
+ */
+async function resolveTemplate(
+  engine: Awaited<
+    ReturnType<
+      Awaited<
+        ReturnType<typeof getOfflineEngineModule>
+      >["tryCreateOfflineEngine"]
+    >
+  >,
+  templateQuery: string,
+) {
+  if (!engine) return null;
+
+  const { generateTemplateIdentifier } = await getEngineModule();
+  const templates = await engine.listImportedTemplates();
+
+  // Try exact match on name or ID
+  let template = templates.find(
+    (t) =>
+      t.name === templateQuery ||
+      generateTemplateIdentifier(t) === templateQuery,
+  );
+
+  // Try partial match on name
+  if (!template) {
+    template = templates.find((t) =>
+      t.name?.toLowerCase().includes(templateQuery.toLowerCase()),
+    );
+  }
+
+  return template ?? null;
+}
+
+/**
+ * Lists actions for a specific template.
+ */
+async function listActions(
+  templateQuery: string,
+  prefix?: string,
+): Promise<void> {
+  const mnemonic = getCurrentMnemonic();
+  if (!mnemonic) return;
+
+  const { tryCreateOfflineEngine } = await getOfflineEngineModule();
+
+  const engine = await tryCreateOfflineEngine(mnemonic, {
+    databasePath: getDataDir(),
+    databaseFilename: "xo-wallet.db",
+  });
+
+  if (!engine) return;
+
+  try {
+    const template = await resolveTemplate(engine, templateQuery);
+
+    if (template && template.actions) {
+      const actions = Object.keys(template.actions);
+      outputCompletions(actions, prefix);
+    }
+  } finally {
+    await engine.stop();
+  }
+}
+
+/**
+ * Lists fields (actions, transactions, outputs, etc.) for a specific template category.
+ * Used for completing the 3rd argument of `template inspect <category> <template> <field>`.
+ */
+async function listFields(
+  category: string,
+  templateQuery: string,
+  prefix?: string,
+): Promise<void> {
+  const mnemonic = getCurrentMnemonic();
+  if (!mnemonic) return;
+
+  const { tryCreateOfflineEngine } = await getOfflineEngineModule();
+
+  const engine = await tryCreateOfflineEngine(mnemonic, {
+    databasePath: getDataDir(),
+    databaseFilename: "xo-wallet.db",
+  });
+
+  if (!engine) return;
+
+  try {
+    const template = await resolveTemplate(engine, templateQuery);
+    if (!template) return;
+
+    let fields: string[] = [];
+
+    switch (category) {
+      case "action":
+        fields = Object.keys(template.actions || {});
+        break;
+      case "transaction":
+        fields = Object.keys(template.transactions || {});
+        break;
+      case "output":
+        fields = Object.keys(template.outputs || {});
+        break;
+      case "lockingscript":
+        fields = Object.keys(template.lockingScripts || {});
+        break;
+      case "variable":
+        fields = Object.keys(template.variables || {});
+        break;
+    }
+
+    outputCompletions(fields, prefix);
+  } finally {
+    await engine.stop();
+  }
+}
+
+/**
+ * Lists invitation IDs from the invitation storage.
+ */
+async function listInvitations(prefix?: string): Promise<void> {
+  const mnemonic = getCurrentMnemonic();
+  if (!mnemonic) return;
+
+  try {
+    // Compute seed hash to find the right storage namespace
+    const seedHash = createHash("sha256").update(mnemonic).digest("hex");
+    const invitationsDbPath = join(getDataDir(), "xo-invitations.db");
+
+    if (!existsSync(invitationsDbPath)) {
+      return;
+    }
+
+    const storage = await Storage.create(invitationsDbPath);
+    const walletStorage = storage.child(seedHash.slice(0, 8));
+    const invitationsStorage = walletStorage.child("invitations");
+
+    const invitations = await invitationsStorage.all();
+    const ids = invitations.map((inv) => inv.key);
+
+    outputCompletions(ids, prefix);
+  } catch {
+    // Silently fail - no completions available
+  }
+}
+
+/**
+ * Lists UTXO outpoints (resources) from the engine.
+ */
+async function listResources(prefix?: string): Promise<void> {
+  const mnemonic = getCurrentMnemonic();
+  if (!mnemonic) return;
+
+  const { tryCreateOfflineEngine } = await getOfflineEngineModule();
+
+  const engine = await tryCreateOfflineEngine(mnemonic, {
+    databasePath: getDataDir(),
+    databaseFilename: "xo-wallet.db",
+  });
+
+  if (!engine) return;
+
+  try {
+    const utxos = await engine.listUnspentOutputsData();
+    const outpoints = utxos.map(
+      (u) => `${u.outpointTransactionHash}:${u.outpointIndex}`,
+    );
+    outputCompletions(outpoints, prefix);
+  } finally {
+    await engine.stop();
+  }
+}
+
+/**
+ * Main entry point.
+ */
+async function main(): Promise<void> {
+  const context = process.argv[2];
+  const arg1 = process.argv[3];
+  const arg2 = process.argv[4];
+
+  if (!context) {
+    // No context provided - output nothing
+    process.exit(0);
+  }
+
+  switch (context) {
+    case "mnemonics":
+      listMnemonics(arg1);
+      break;
+
+    case "subcommands":
+      if (arg1) {
+        listSubcommands(arg1, arg2);
+      }
+      break;
+
+    case "templates":
+      await listTemplates(arg1);
+      break;
+
+    case "actions":
+      if (arg1) {
+        await listActions(arg1, arg2);
+      }
+      break;
+
+    case "fields":
+      // fields <category> <template> [prefix]
+      if (arg1 && arg2) {
+        await listFields(arg1, arg2, process.argv[5]);
+      }
+      break;
+
+    case "invitations":
+      await listInvitations(arg1);
+      break;
+
+    case "resources":
+      await listResources(arg1);
+      break;
+
+    default:
+      // Unknown context - output nothing
+      break;
+  }
+}
+
+main().catch(() => {
+  // Silently fail for shell integration
+  process.exit(1);
+});

src/cli/autocomplete/completions.ts

@@ -0,0 +1,307 @@
+/**
+ * Shell completion script generation.
+ *
+ * Loads shell-native template files and replaces placeholders with
+ * dynamic values. This approach keeps the shell scripts readable
+ * and auditable in their native format.
+ *
+ * The generated scripts use the `xo-complete` helper binary for dynamic
+ * completions (invitation IDs, template names, resources, etc.).
+ *
+ * Usage:
+ *   eval "$(xo-cli completions bash)"
+ *   eval "$(xo-cli completions zsh)"
+ *   xo-cli completions fish | source
+ *
+ * Install to shell config:
+ *   xo-cli completions bash --install
+ *   xo-cli completions zsh --install
+ *   xo-cli completions fish --install
+ */
+
+import {
+  existsSync,
+  readFileSync,
+  appendFileSync,
+  writeFileSync,
+} from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { homedir } from "node:os";
+
+/**
+ * Single source of truth for the CLI command tree.
+ * Each top-level key is a command, and its value is an array of sub-commands.
+ *
+ * IMPORTANT: Keep this in sync with actual switch statements in command handlers:
+ * - mnemonic.ts: create, import, list, expose
+ * - template.ts: import, list, inspect, set-default
+ * - invitation.ts: create, append, sign, broadcast, requirements, import, inspect, list
+ * - resource.ts: list, unreserve, unreserve-all
+ */
+
+/** Subcommands for the mnemonic command */
+const MNEMONIC_SUBS = ["create", "import", "list", "expose"];
+/** Subcommands for the template command */
+const TEMPLATE_SUBS = ["import", "list", "inspect", "set-default"];
+/** Subcommands for the invitation command */
+const INVITATION_SUBS = [
+  "create",
+  "append",
+  "sign",
+  "broadcast",
+  "requirements",
+  "import",
+  "inspect",
+  "list",
+];
+/** Subcommands for the resource command */
+const RESOURCE_SUBS = ["list", "unreserve", "unreserve-all"];
+/** Subcommands for the completions command */
+const COMPLETIONS_SUBS = ["bash", "zsh", "fish"];
+
+export const COMMAND_TREE = {
+  mnemonic: MNEMONIC_SUBS,
+  template: TEMPLATE_SUBS,
+  invitation: INVITATION_SUBS,
+  receive: [],
+  resource: RESOURCE_SUBS,
+  help: [],
+  completions: COMPLETIONS_SUBS,
+} as const;
+
+/** Global option flags available on every command. */
+const GLOBAL_OPTIONS = [
+  "-h",
+  "--help",
+  "-v",
+  "--verbose",
+  "-m",
+  "--mnemonic-file",
+  "-o",
+  "--output",
+];
+
+/**
+ * Gets the path to the scripts directory containing shell templates.
+ */
+function getScriptsDir(): string {
+  const currentFile = fileURLToPath(import.meta.url);
+  return join(dirname(currentFile), "scripts");
+}
+
+/**
+ * Loads a shell template file and replaces placeholders.
+ * @param templateName - The template file name (e.g., "bash.sh")
+ * @param binName - The CLI binary name
+ */
+function loadAndProcessTemplate(templateName: string, binName: string): string {
+  const scriptsDir = getScriptsDir();
+  const templatePath = join(scriptsDir, templateName);
+
+  if (!existsSync(templatePath)) {
+    throw new Error(`Template file not found: ${templatePath}`);
+  }
+
+  let content = readFileSync(templatePath, "utf8");
+  const funcName = binName.replace(/-/g, "_");
+  const commands = Object.keys(COMMAND_TREE).join(" ");
+  const options = GLOBAL_OPTIONS.join(" ");
+
+  // Replace all placeholders
+  content = content.replace(/\{\{BIN_NAME\}\}/g, binName);
+  content = content.replace(/\{\{FUNC_NAME\}\}/g, funcName);
+  content = content.replace(/\{\{COMMANDS\}\}/g, commands);
+  content = content.replace(/\{\{OPTIONS\}\}/g, options);
+  content = content.replace(/\{\{MNEMONIC_SUBS\}\}/g, MNEMONIC_SUBS.join(" "));
+  content = content.replace(/\{\{TEMPLATE_SUBS\}\}/g, TEMPLATE_SUBS.join(" "));
+  content = content.replace(
+    /\{\{INVITATION_SUBS\}\}/g,
+    INVITATION_SUBS.join(" "),
+  );
+  content = content.replace(/\{\{RESOURCE_SUBS\}\}/g, RESOURCE_SUBS.join(" "));
+
+  // Fish-specific placeholders
+  if (templateName.endsWith(".fish")) {
+    content = content.replace(
+      /\{\{TOP_LEVEL_COMMANDS\}\}/g,
+      generateFishTopLevelCommands(binName),
+    );
+    content = content.replace(
+      /\{\{STATIC_SUBCOMMANDS\}\}/g,
+      generateFishStaticSubcommands(binName),
+    );
+  }
+
+  return content;
+}
+
+/**
+ * Generates fish top-level command completions.
+ */
+function generateFishTopLevelCommands(binName: string): string {
+  const lines: string[] = [];
+  for (const cmd of Object.keys(COMMAND_TREE)) {
+    lines.push(
+      `complete -c ${binName} -n "__fish_use_subcommand" -a "${cmd}" -d "${cmd} command"`,
+    );
+  }
+  return lines.join("\n");
+}
+
+/**
+ * Generates fish static subcommand completions.
+ */
+function generateFishStaticSubcommands(binName: string): string {
+  const lines: string[] = [];
+  for (const [cmd, subs] of Object.entries(COMMAND_TREE)) {
+    for (const sub of subs) {
+      lines.push(
+        `complete -c ${binName} -n "__fish_seen_subcommand_from ${cmd}; and not __fish_seen_subcommand_from ${subs.join(" ")}" -a "${sub}" -d "${cmd} ${sub}"`,
+      );
+    }
+  }
+  return lines.join("\n");
+}
+
+/**
+ * Generates a bash completion script.
+ * @param binName - The name of the CLI binary.
+ */
+export function generateBashCompletions(binName: string): string {
+  return loadAndProcessTemplate("bash.sh", binName);
+}
+
+/**
+ * Generates a zsh completion script.
+ * @param binName - The name of the CLI binary.
+ */
+export function generateZshCompletions(binName: string): string {
+  return loadAndProcessTemplate("zsh.zsh", binName);
+}
+
+/**
+ * Generates a fish completion script.
+ * @param binName - The name of the CLI binary.
+ */
+export function generateFishCompletions(binName: string): string {
+  return loadAndProcessTemplate("fish.fish", binName);
+}
+
+type ShellType = "bash" | "zsh" | "fish";
+
+const generators: Record<ShellType, (binName: string) => string> = {
+  bash: generateBashCompletions,
+  zsh: generateZshCompletions,
+  fish: generateFishCompletions,
+};
+
+/**
+ * Shell config file paths and eval commands for each shell type.
+ */
+const shellConfigs: Record<
+  ShellType,
+  { configFile: string; evalCommand: (binName: string) => string }
+> = {
+  bash: {
+    configFile: join(homedir(), ".bashrc"),
+    evalCommand: (binName) => `eval "$(${binName} completions bash)"`,
+  },
+  zsh: {
+    configFile: join(homedir(), ".zshrc"),
+    evalCommand: (binName) => `eval "$(${binName} completions zsh)"`,
+  },
+  fish: {
+    configFile: join(homedir(), ".config", "fish", "config.fish"),
+    evalCommand: (binName) => `${binName} completions fish | source`,
+  },
+};
+
+/**
+ * Installs completions to the user's shell config file.
+ * Adds the eval command if not already present.
+ * @param shell - The shell type
+ * @param binName - The CLI binary name
+ * @returns true if installed, false if already present
+ */
+function installCompletions(shell: ShellType, binName: string): boolean {
+  const config = shellConfigs[shell];
+  const evalCommand = config.evalCommand(binName);
+
+  // Check if config file exists and already has the completion line
+  let existingContent = "";
+  if (existsSync(config.configFile)) {
+    existingContent = readFileSync(config.configFile, "utf8");
+    if (existingContent.includes(evalCommand)) {
+      return false; // Already installed
+    }
+  }
+
+  // Append the completion line
+  const newLine =
+    existingContent.endsWith("\n") || existingContent === "" ? "" : "\n";
+  const completionBlock = `${newLine}\n# ${binName} shell completions\n${evalCommand}\n`;
+
+  appendFileSync(config.configFile, completionBlock);
+  return true;
+}
+
+/**
+ * Handles the `completions` command.
+ * Prints the generated completion script for the given shell to stdout,
+ * or installs it to the shell config file with --install.
+ * @param args - Positional args after "completions", e.g. ["bash"].
+ * @param options - Parsed command options (may include "install").
+ * @param binName - The CLI binary name to use in the completion script.
+ */
+export function handleCompletionsCommand(
+  args: string[],
+  options: Record<string, string> = {},
+  binName: string = "xo-cli",
+): void {
+  const shell = args[0] as ShellType | undefined;
+  const installFlag = options["install"] === "true";
+
+  if (!shell || !generators[shell]) {
+    const supported = Object.keys(generators).join(", ");
+    console.error(`Usage: ${binName} completions <${supported}> [--install]`);
+    console.error("");
+    console.error("Examples:");
+    console.error(
+      `  eval "$(${binName} completions bash)"   # Output to stdout (add to ~/.bashrc)`,
+    );
+    console.error(
+      `  eval "$(${binName} completions zsh)"    # Output to stdout (add to ~/.zshrc)`,
+    );
+    console.error(
+      `  ${binName} completions fish | source    # Output to stdout (add to fish config)`,
+    );
+    console.error("");
+    console.error("Install directly to shell config:");
+    console.error(
+      `  ${binName} completions bash --install   # Appends to ~/.bashrc`,
+    );
+    console.error(
+      `  ${binName} completions zsh --install    # Appends to ~/.zshrc`,
+    );
+    console.error(
+      `  ${binName} completions fish --install   # Appends to ~/.config/fish/config.fish`,
+    );
+    process.exit(1);
+  }
+
+  if (installFlag) {
+    const config = shellConfigs[shell];
+    const installed = installCompletions(shell, binName);
+
+    if (installed) {
+      console.log(`Completions installed to ${config.configFile}`);
+      console.log(`Restart your shell or run: source ${config.configFile}`);
+    } else {
+      console.log(`Completions already installed in ${config.configFile}`);
+    }
+    return;
+  }
+
+  process.stdout.write(generators[shell](binName));
+}

src/cli/autocomplete/offline-engine.ts

@@ -0,0 +1,103 @@
+/**
+ * Offline Engine Factory
+ *
+ * Creates a lightweight engine instance that reads from SQLite without any
+ * network connections. Used for fast shell completion queries.
+ *
+ * This bypasses the normal Engine.create() which initializes electrum connections,
+ * and instead constructs the engine directly with an in-memory blockchain provider.
+ */
+
+import {
+  BlockchainMonitor,
+  Engine,
+  InMemoryBlockchainProvider,
+} from "@xo-cash/engine";
+import { createStorageAdapter, State, StorageType } from "@xo-cash/state";
+import { convertMnemonicToSeedBytes } from "@xo-cash/crypto";
+import { binToHex, hash256 } from "@bitauth/libauth";
+import { createHash } from "crypto";
+
+/**
+ * Options for creating an offline engine.
+ */
+export interface OfflineEngineOptions {
+  /** Path to the directory containing SQLite database files. */
+  databasePath: string;
+  /** Filename of the SQLite database (will be prefixed with seed hash). */
+  databaseFilename: string;
+}
+
+/**
+ * Creates an engine instance in offline mode - SQLite only, no network.
+ * Used for fast completion queries where we only need to read local data.
+ *
+ * This is significantly faster than Engine.create() because it:
+ * - Skips electrum application initialization
+ * - Uses an in-memory blockchain provider (no network)
+ * - Skips state sync initialization
+ *
+ * @param seed - The wallet seed phrase
+ * @param options - Database configuration options
+ * @returns An engine instance configured for offline/read-only use
+ */
+export async function createOfflineEngine(
+  seed: string,
+  options: OfflineEngineOptions,
+): Promise<Engine> {
+  // Compute the seed hash (same logic as AppService.create)
+  const seedHash = createHash("sha256").update(seed).digest("hex");
+  const prefixedDatabaseFilename = `${seedHash.slice(0, 8)}-${options.databaseFilename}`;
+
+  // Generate account hash for storage namespace (must match Engine.create which uses hash256)
+  const seedAccountHash = hash256(convertMnemonicToSeedBytes(seed));
+
+  // Create the IndexedDB storage adapter (matches Engine.create default)
+  // Note: IndexedDB in Node uses a shim that stores data in SQLite files with .sqlite extension
+  const storageAdapter = await createStorageAdapter({
+    storageType: StorageType.INDEXEDDB,
+    databasePath: options.databasePath,
+    databaseFilename: prefixedDatabaseFilename,
+    accountHash: binToHex(seedAccountHash),
+  });
+
+  // Initialize the storage adapter
+  await storageAdapter.initialize();
+
+  // Create the state instance
+  const state = new State(storageAdapter);
+
+  // Use in-memory blockchain provider (no network connections)
+  const blockchainProvider = new InMemoryBlockchainProvider();
+  await blockchainProvider.initialize({
+    applicationIdentifier: "xo-cli-completions",
+    electrumOptions: {},
+  });
+
+  // Create a minimal blockchain monitor
+  const blockchainMonitor = new BlockchainMonitor(state, blockchainProvider);
+
+  // Construct engine directly without state sync
+  const engine = new Engine(seed, state, blockchainMonitor, blockchainProvider);
+
+  return engine;
+}
+
+/**
+ * Attempts to create an offline engine, returning null on failure.
+ * Useful for completion scripts where we don't want to crash on errors.
+ *
+ * @param seed - The wallet seed phrase
+ * @param options - Database configuration options
+ * @returns An engine instance or null if creation failed
+ */
+export async function tryCreateOfflineEngine(
+  seed: string,
+  options: OfflineEngineOptions,
+): Promise<Engine | null> {
+  try {
+    return await createOfflineEngine(seed, options);
+  } catch {
+    return null;
+  }
+}

src/cli/autocomplete/scripts/bash.sh

@@ -0,0 +1,199 @@
+# bash completion for {{BIN_NAME}}
+# Add to ~/.bashrc:  eval "$({{BIN_NAME}} completions bash)"
+
+# Find xo-complete in the same directory as xo-cli
+__xo_complete_bin=""
+if command -v xo-complete &>/dev/null; then
+  __xo_complete_bin="xo-complete"
+elif command -v {{BIN_NAME}} &>/dev/null; then
+  __xo_complete_bin="$(dirname "$(command -v {{BIN_NAME}})")/xo-complete"
+fi
+
+# Wrapper to call xo-complete helper
+__xo_complete() {
+  [[ -n "${__xo_complete_bin}" ]] && "${__xo_complete_bin}" "$@" 2>/dev/null
+}
+
+_{{FUNC_NAME}}_completions() {
+  local cur prev words cword
+  _init_completion || return
+
+  # Handle -m/--mnemonic-file argument (previous word was -m)
+  if [[ "${prev}" == "-m" || "${prev}" == "--mnemonic-file" ]]; then
+    local mnemonics
+    mnemonics=$(__xo_complete mnemonics "${cur}")
+    if [[ -n "${mnemonics}" ]]; then
+      while IFS= read -r line; do
+        COMPREPLY+=("$line")
+      done <<< "${mnemonics}"
+      return 0
+    fi
+  fi
+
+  # If the current word starts with "-", offer option flags
+  if [[ "${cur}" == -* ]]; then
+    COMPREPLY=($(compgen -W "{{OPTIONS}}" -- "${cur}"))
+    return 0
+  fi
+
+  # Find the command and subcommand positions
+  local cmd="" subcmd="" cmd_idx=0 subcmd_idx=0
+  for ((i=1; i < cword; i++)); do
+    if [[ "${words[i]}" != -* ]]; then
+      if [[ -z "${cmd}" ]]; then
+        cmd="${words[i]}"
+        cmd_idx=$i
+      else
+        subcmd="${words[i]}"
+        subcmd_idx=$i
+        break
+      fi
+    fi
+  done
+
+  # No command yet — offer the top-level commands
+  if [[ -z "${cmd}" ]]; then
+    COMPREPLY=($(compgen -W "{{COMMANDS}}" -- "${cur}"))
+    return 0
+  fi
+
+  # Handle each command's completion
+  case "${cmd}" in
+    mnemonic)
+      if [[ -z "${subcmd}" ]]; then
+        COMPREPLY=($(compgen -W "{{MNEMONIC_SUBS}}" -- "${cur}"))
+      fi
+      ;;
+
+    template)
+      if [[ -z "${subcmd}" ]]; then
+        COMPREPLY=($(compgen -W "{{TEMPLATE_SUBS}}" -- "${cur}"))
+      elif [[ "${subcmd}" == "list" || "${subcmd}" == "inspect" ]]; then
+        # template list/inspect <category> <template> [field] - category first, then template, then field
+        local pos=$((cword - subcmd_idx))
+        if [[ $pos -eq 1 ]]; then
+          COMPREPLY=($(compgen -W "action transaction output lockingscript variable" -- "${cur}"))
+        elif [[ $pos -eq 2 ]]; then
+          local templates
+          templates=$(__xo_complete templates "${cur}")
+          if [[ -n "${templates}" ]]; then
+            while IFS= read -r line; do
+              COMPREPLY+=("$line")
+            done <<< "${templates}"
+          fi
+        elif [[ $pos -eq 3 && "${subcmd}" == "inspect" ]]; then
+          # Get the category and template from previous args
+          local category="${words[subcmd_idx + 1]}"
+          local template_arg="${words[subcmd_idx + 2]}"
+          local fields
+          fields=$(__xo_complete fields "${category}" "${template_arg}" "${cur}")
+          if [[ -n "${fields}" ]]; then
+            while IFS= read -r line; do
+              COMPREPLY+=("$line")
+            done <<< "${fields}"
+          fi
+        fi
+      elif [[ "${subcmd}" == "set-default" ]]; then
+        # template set-default <template> <output> <role> - template first
+        local pos=$((cword - subcmd_idx))
+        if [[ $pos -eq 1 ]]; then
+          local templates
+          templates=$(__xo_complete templates "${cur}")
+          if [[ -n "${templates}" ]]; then
+            while IFS= read -r line; do
+              COMPREPLY+=("$line")
+            done <<< "${templates}"
+          fi
+        fi
+      fi
+      ;;
+
+    invitation)
+      if [[ -z "${subcmd}" ]]; then
+        COMPREPLY=($(compgen -W "{{INVITATION_SUBS}}" -- "${cur}"))
+      else
+        case "${subcmd}" in
+          create)
+            # invitation create <template> <action> - offer templates then actions
+            local pos=$((cword - subcmd_idx))
+            if [[ $pos -eq 1 ]]; then
+              local templates
+              templates=$(__xo_complete templates "${cur}")
+              if [[ -n "${templates}" ]]; then
+                while IFS= read -r line; do
+                  COMPREPLY+=("$line")
+                done <<< "${templates}"
+              fi
+            elif [[ $pos -eq 2 ]]; then
+              local template_arg="${words[subcmd_idx + 1]}"
+              local actions
+              actions=$(__xo_complete actions "${template_arg}" "${cur}")
+              if [[ -n "${actions}" ]]; then
+                while IFS= read -r line; do
+                  COMPREPLY+=("$line")
+                done <<< "${actions}"
+              fi
+            fi
+            ;;
+          append|sign|broadcast|requirements|inspect)
+            # These take an invitation ID
+            local pos=$((cword - subcmd_idx))
+            if [[ $pos -eq 1 ]]; then
+              local invitations
+              invitations=$(__xo_complete invitations "${cur}")
+              if [[ -n "${invitations}" ]]; then
+                while IFS= read -r line; do
+                  COMPREPLY+=("$line")
+                done <<< "${invitations}"
+              fi
+            fi
+            ;;
+          import)
+            # import takes a file path - use default file completion
+            COMPREPLY=($(compgen -f -- "${cur}"))
+            ;;
+        esac
+      fi
+      ;;
+
+    resource)
+      if [[ -z "${subcmd}" ]]; then
+        COMPREPLY=($(compgen -W "{{RESOURCE_SUBS}}" -- "${cur}"))
+      elif [[ "${subcmd}" == "unreserve" ]]; then
+        # resource unreserve <txhash:vout> - offer resources
+        local pos=$((cword - subcmd_idx))
+        if [[ $pos -eq 1 ]]; then
+          local resources
+          resources=$(__xo_complete resources "${cur}")
+          if [[ -n "${resources}" ]]; then
+            while IFS= read -r line; do
+              COMPREPLY+=("$line")
+            done <<< "${resources}"
+          fi
+        fi
+      fi
+      ;;
+
+    receive)
+      # receive <template> [output] - offer templates
+      local pos=$((cword - cmd_idx))
+      if [[ $pos -eq 1 ]]; then
+        local templates
+        templates=$(__xo_complete templates "${cur}")
+        if [[ -n "${templates}" ]]; then
+          while IFS= read -r line; do
+            COMPREPLY+=("$line")
+          done <<< "${templates}"
+        fi
+      fi
+      ;;
+
+    completions)
+      if [[ -z "${subcmd}" ]]; then
+        COMPREPLY=($(compgen -W "bash zsh fish" -- "${cur}"))
+      fi
+      ;;
+  esac
+}
+
+complete -F _{{FUNC_NAME}}_completions {{BIN_NAME}}

src/cli/autocomplete/scripts/fish.fish

@@ -0,0 +1,70 @@
+# fish completion for {{BIN_NAME}}
+# Add to fish config:  {{BIN_NAME}} completions fish | source
+
+# Disable file completions by default
+complete -c {{BIN_NAME}} -f
+
+# Helper function to get dynamic completions
+# Finds xo-complete in the same directory as {{BIN_NAME}}
+function __{{FUNC_NAME}}_complete_dynamic
+  set -l xo_complete_bin ""
+  if command -q xo-complete
+    set xo_complete_bin xo-complete
+  else if command -q {{BIN_NAME}}
+    set xo_complete_bin (dirname (command -s {{BIN_NAME}}))/xo-complete
+  end
+  if test -n "$xo_complete_bin"
+    $xo_complete_bin $argv 2>/dev/null
+  end
+end
+
+# Global options
+complete -c {{BIN_NAME}} -s h -d "Show help"
+complete -c {{BIN_NAME}} -l help -d "Show help"
+complete -c {{BIN_NAME}} -s v -d "Verbose output"
+complete -c {{BIN_NAME}} -l verbose -d "Verbose output"
+complete -c {{BIN_NAME}} -s o -d "Output file"
+complete -c {{BIN_NAME}} -l output -d "Output file"
+
+# Dynamic mnemonic file completion for -m
+complete -c {{BIN_NAME}} -s m -l mnemonic-file -xa '(__{{FUNC_NAME}}_complete_dynamic mnemonics)'
+
+# Top-level commands
+{{TOP_LEVEL_COMMANDS}}
+
+# Static sub-commands
+{{STATIC_SUBCOMMANDS}}
+
+# Dynamic completions
+
+# invitation create: template names
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from create; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic templates)'
+
+# invitation create: action names (2nd arg)
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from create; and test (count (commandline -opc)) -eq 4" -xa '(__{{FUNC_NAME}}_complete_dynamic actions (commandline -opc)[4])'
+
+# invitation append/sign/broadcast/requirements/inspect: invitation IDs
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from append; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic invitations)'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from sign; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic invitations)'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from broadcast; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic invitations)'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from requirements; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic invitations)'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from inspect; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic invitations)'
+
+# invitation import: file completion
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from import" -F
+
+# template list/inspect: category first (pos 3), then template (pos 4), then field (pos 5 for inspect)
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from list; and test (count (commandline -opc)) -eq 3" -xa 'action transaction output lockingscript variable'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from list; and test (count (commandline -opc)) -eq 4" -xa '(__{{FUNC_NAME}}_complete_dynamic templates)'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from inspect; and test (count (commandline -opc)) -eq 3" -xa 'action transaction output lockingscript variable'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from inspect; and test (count (commandline -opc)) -eq 4" -xa '(__{{FUNC_NAME}}_complete_dynamic templates)'
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from inspect; and test (count (commandline -opc)) -eq 5" -xa '(__{{FUNC_NAME}}_complete_dynamic fields (commandline -opc)[4] (commandline -opc)[5])'
+
+# template set-default: template first
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from set-default; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic templates)'
+
+# resource unreserve: UTXO outpoints
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from resource; and __fish_seen_subcommand_from unreserve; and test (count (commandline -opc)) -eq 3" -xa '(__{{FUNC_NAME}}_complete_dynamic resources)'
+
+# receive: template names
+complete -c {{BIN_NAME}} -n "__fish_seen_subcommand_from receive; and test (count (commandline -opc)) -eq 2" -xa '(__{{FUNC_NAME}}_complete_dynamic templates)'

src/cli/autocomplete/scripts/zsh.zsh

@@ -0,0 +1,176 @@
+# zsh completion for {{BIN_NAME}}
+# Add to ~/.zshrc:  eval "$({{BIN_NAME}} completions zsh)"
+
+# Find xo-complete in the same directory as xo-cli
+__xo_complete_bin=""
+if (( $+commands[xo-complete] )); then
+  __xo_complete_bin="xo-complete"
+elif (( $+commands[{{BIN_NAME}}] )); then
+  __xo_complete_bin="${commands[{{BIN_NAME}}]:h}/xo-complete"
+fi
+
+# Wrapper to call xo-complete helper
+__xo_complete() {
+  [[ -n "${__xo_complete_bin}" ]] && "${__xo_complete_bin}" "$@" 2>/dev/null
+}
+
+_{{FUNC_NAME}}_completions() {
+  local -a commands
+  commands=({{COMMANDS}})
+
+  # Handle -m/--mnemonic-file argument (previous word was -m)
+  if [[ "${words[CURRENT-1]}" == "-m" || "${words[CURRENT-1]}" == "--mnemonic-file" ]]; then
+    local mnemonics
+    mnemonics=("${(@f)$(__xo_complete mnemonics "${words[CURRENT]}")}")
+    if [[ ${#mnemonics[@]} -gt 0 ]]; then
+      compadd -- "${mnemonics[@]}"
+      return
+    fi
+  fi
+
+  # If typing an option flag, complete options
+  if [[ "${words[${CURRENT}]}" == -* ]]; then
+    compadd -- {{OPTIONS}}
+    return
+  fi
+
+  # Find the command and subcommand
+  local cmd="" subcmd="" cmd_idx=0 subcmd_idx=0
+  for ((i=2; i < CURRENT; i++)); do
+    if [[ "${words[i]}" != -* ]]; then
+      if [[ -z "${cmd}" ]]; then
+        cmd="${words[i]}"
+        cmd_idx=$i
+      else
+        subcmd="${words[i]}"
+        subcmd_idx=$i
+        break
+      fi
+    fi
+  done
+
+  # No command yet — offer top-level commands
+  if [[ -z "${cmd}" ]]; then
+    compadd -- ${commands[@]}
+    return
+  fi
+
+  # Handle each command's completion
+  case "${cmd}" in
+    mnemonic)
+      if [[ -z "${subcmd}" ]]; then
+        compadd -- {{MNEMONIC_SUBS}}
+      fi
+      ;;
+
+    template)
+      if [[ -z "${subcmd}" ]]; then
+        compadd -- {{TEMPLATE_SUBS}}
+      elif [[ "${subcmd}" == "list" || "${subcmd}" == "inspect" ]]; then
+        # template list/inspect <category> <template> [field] - category first, then template, then field
+        local pos=$((CURRENT - subcmd_idx))
+        if [[ $pos -eq 1 ]]; then
+          compadd -- action transaction output lockingscript variable
+        elif [[ $pos -eq 2 ]]; then
+          local templates
+          templates=("${(@f)$(__xo_complete templates "${words[CURRENT]}")}")
+          if [[ ${#templates[@]} -gt 0 ]]; then
+            compadd -- "${templates[@]}"
+          fi
+        elif [[ $pos -eq 3 && "${subcmd}" == "inspect" ]]; then
+          # Get the category and template from previous args
+          local category="${words[subcmd_idx + 1]}"
+          local template_arg="${words[subcmd_idx + 2]}"
+          local fields
+          fields=("${(@f)$(__xo_complete fields "${category}" "${template_arg}" "${words[CURRENT]}")}")
+          if [[ ${#fields[@]} -gt 0 ]]; then
+            compadd -- "${fields[@]}"
+          fi
+        fi
+      elif [[ "${subcmd}" == "set-default" ]]; then
+        # template set-default <template> <output> <role> - template first
+        local pos=$((CURRENT - subcmd_idx))
+        if [[ $pos -eq 1 ]]; then
+          local templates
+          templates=("${(@f)$(__xo_complete templates "${words[CURRENT]}")}")
+          if [[ ${#templates[@]} -gt 0 ]]; then
+            compadd -- "${templates[@]}"
+          fi
+        fi
+      fi
+      ;;
+
+    invitation)
+      if [[ -z "${subcmd}" ]]; then
+        compadd -- {{INVITATION_SUBS}}
+      else
+        case "${subcmd}" in
+          create)
+            local pos=$((CURRENT - subcmd_idx))
+            if [[ $pos -eq 1 ]]; then
+              local templates
+              templates=("${(@f)$(__xo_complete templates "${words[CURRENT]}")}")
+              if [[ ${#templates[@]} -gt 0 ]]; then
+                compadd -- "${templates[@]}"
+              fi
+            elif [[ $pos -eq 2 ]]; then
+              local template_arg="${words[subcmd_idx + 1]}"
+              local actions
+              actions=("${(@f)$(__xo_complete actions "${template_arg}" "${words[CURRENT]}")}")
+              if [[ ${#actions[@]} -gt 0 ]]; then
+                compadd -- "${actions[@]}"
+              fi
+            fi
+            ;;
+          append|sign|broadcast|requirements|inspect)
+            local pos=$((CURRENT - subcmd_idx))
+            if [[ $pos -eq 1 ]]; then
+              local invitations
+              invitations=("${(@f)$(__xo_complete invitations "${words[CURRENT]}")}")
+              if [[ ${#invitations[@]} -gt 0 ]]; then
+                compadd -- "${invitations[@]}"
+              fi
+            fi
+            ;;
+          import)
+            _files
+            ;;
+        esac
+      fi
+      ;;
+
+    resource)
+      if [[ -z "${subcmd}" ]]; then
+        compadd -- {{RESOURCE_SUBS}}
+      elif [[ "${subcmd}" == "unreserve" ]]; then
+        local pos=$((CURRENT - subcmd_idx))
+        if [[ $pos -eq 1 ]]; then
+          local resources
+          resources=("${(@f)$(__xo_complete resources "${words[CURRENT]}")}")
+          if [[ ${#resources[@]} -gt 0 ]]; then
+            compadd -- "${resources[@]}"
+          fi
+        fi
+      fi
+      ;;
+
+    receive)
+      local pos=$((CURRENT - cmd_idx))
+      if [[ $pos -eq 1 ]]; then
+        local templates
+        templates=("${(@f)$(__xo_complete templates "${words[CURRENT]}")}")
+        if [[ ${#templates[@]} -gt 0 ]]; then
+          compadd -- "${templates[@]}"
+        fi
+      fi
+      ;;
+
+    completions)
+      if [[ -z "${subcmd}" ]]; then
+        compadd -- bash zsh fish
+      fi
+      ;;
+  esac
+}
+
+compdef _{{FUNC_NAME}}_completions {{BIN_NAME}}

src/cli/commands/index.ts

@@ -0,0 +1,7 @@
+export { handleMnemonicCommand, printMnemonicHelp } from "./mnemonic.js";
+export { handleTemplateCommand, printTemplateHelp } from "./template.js";
+export { handleInvitationCommand, printInvitationHelp } from "./invitation.js";
+export { handleReceiveCommand, printReceiveHelp } from "./receive.js";
+export { handleResourceCommand, printResourceHelp } from "./resource.js";
+
+export * from "./types.js";

src/cli/commands/invitation.ts

@@ -0,0 +1,774 @@
+import { readFileSync, writeFileSync } from "fs";
+import path from "path";
+import { generateTemplateIdentifier } from "@xo-cash/engine";
+import { binToHex, hexToBin } from "@bitauth/libauth";
+
+import { bold, dim, formatObject } from "../utils.js";
+import type { CommandDependencies, CommandIO } from "./types.js";
+import { CommandError } from "./types.js";
+import type { Invitation } from "../../services/invitation.js";
+import {
+  resolveProvidedLockingBytecodeHex,
+  mapUnspentOutputsToSelectable,
+  autoSelectGreedyUtxos,
+} from "../../utils/invitation-flow.js";
+import { encodeExtendedJson } from "../../utils/ext-json.js";
+import { resolveTemplate } from "../utils.js";
+
+const DEFAULT_FEE = 500n;
+const DUST_THRESHOLD = 546n;
+
+/**
+ * Result of parsing CLI options into inputs and outputs for an append call.
+ * A `null` return signals a fatal error that was already logged to stderr.
+ */
+interface BuildAppendResult {
+  inputs: { outpointTransactionHash: Uint8Array; outpointIndex: number }[];
+  outputs: any[];
+}
+
+/**
+ * Extracts invitation variables from CLI option flags.
+ * Keys starting with "var" are treated as variables — the prefix is stripped
+ * and the next character is lowercased to reconstruct the camelCase identifier.
+ *
+ * When a `-role` flag is present the role identifier is attached to every
+ * variable so the engine stores them under the correct role-level requirements.
+ *
+ * @example `-var-requested-satoshis 1000 -role sender` → `{ variableIdentifier: "requestedSatoshis", value: "1000", roleIdentifier: "sender" }`
+ */
+function parseVariablesFromOptions(
+  options: Record<string, string>,
+): { variableIdentifier: string; value: string; roleIdentifier?: string }[] {
+  const roleIdentifier = options["role"];
+
+  return Object.entries(options)
+    .filter(([key]) => key.startsWith("var"))
+    .map(([key, value]) => ({
+      variableIdentifier: key.substring(3, 4).toLowerCase() + key.substring(4),
+      value,
+      ...(roleIdentifier ? { roleIdentifier } : {}),
+    }));
+}
+
+/**
+ * Parses CLI options into the inputs and outputs needed for an invitation
+ * append call. Shared by both `create` and `append` so the same flags
+ * (`--add-input`, `--add-output`, `--auto-inputs`, `-role`) work in either.
+ *
+ * Variables should already be committed to the invitation before calling this
+ * so that `getSatsOut()` can resolve variable-dependent output values for the
+ * automatic change calculation.
+ *
+ * @param deps - Command dependencies (engine, logger, etc.)
+ * @param invitation - The invitation instance (variables should already be committed).
+ * @param options - Parsed CLI option flags.
+ * @returns The structured params, or `null` when a fatal error was printed.
+ */
+async function buildAppendParams(
+  deps: CommandDependencies,
+  invitation: Invitation,
+  options: Record<string, string>,
+): Promise<BuildAppendResult | null> {
+  // --- Inputs ---
+  // Accepts comma-separated <txhash>:<vout> pairs via --add-input,
+  // OR automatic selection via --auto-inputs.
+  let inputs: { outpointTransactionHash: Uint8Array; outpointIndex: number }[] =
+    [];
+
+  if (options["autoInputs"] === "true") {
+    // Auto-select UTXOs using the greedy algorithm from invitation-flow.
+    const suitableResources = await invitation.findSuitableResources();
+    const selectable = mapUnspentOutputsToSelectable(suitableResources);
+
+    const requiredWithFee =
+      (await invitation.getSatsOut().catch(() => 0n)) + DEFAULT_FEE;
+    autoSelectGreedyUtxos(selectable, requiredWithFee);
+
+    inputs = selectable
+      .filter((u) => u.selected)
+      .map((u) => ({
+        outpointTransactionHash: hexToBin(u.outpointTransactionHash),
+        outpointIndex: u.outpointIndex,
+      }));
+
+    if (inputs.length === 0) {
+      deps.io.err("No suitable UTXOs found for auto-input selection.");
+      return null;
+    }
+    deps.io.verbose(`Auto-selected ${inputs.length} input(s)`);
+  } else if (options["addInput"]) {
+    inputs = options["addInput"].split(",").map((entry) => {
+      const separatorIndex = entry.lastIndexOf(":");
+      if (separatorIndex === -1) {
+        throw new Error(
+          `Invalid input format "${entry}". Expected <txhash>:<vout> (e.g. abc123:0)`,
+        );
+      }
+      const txHash = entry.substring(0, separatorIndex);
+      const vout = parseInt(entry.substring(separatorIndex + 1), 10);
+      if (!txHash || isNaN(vout)) {
+        throw new Error(
+          `Invalid input format "${entry}". Expected <txhash>:<vout> (e.g. abc123:0)`,
+        );
+      }
+      return {
+        outpointTransactionHash: hexToBin(txHash),
+        outpointIndex: vout,
+      };
+    });
+  }
+  deps.io.verbose(
+    `Inputs: ${formatObject(inputs.map((i) => ({ txHash: binToHex(i.outpointTransactionHash), vout: i.outpointIndex })))}`,
+  );
+
+  // --- Outputs ---
+  // When --add-output is provided, use those identifiers explicitly.
+  // Otherwise, auto-discover all required outputs from the template so the
+  // user doesn't have to name them manually.
+  const roleIdentifier = options["role"];
+  let outputIdentifiers: string[] = [];
+
+  if (options["addOutput"]) {
+    outputIdentifiers = options["addOutput"].split(",");
+  } else {
+    // Pull every output identifier the template requires (top-level + role-specific).
+    const requirements = await invitation.getRequirements();
+    const discovered = new Set<string>();
+    for (const id of requirements.outputs ?? []) discovered.add(id);
+    if (requirements.roles) {
+      for (const role of Object.values(requirements.roles)) {
+        for (const id of role.outputs ?? []) discovered.add(id);
+      }
+    }
+    outputIdentifiers = [...discovered];
+    if (outputIdentifiers.length > 0) {
+      deps.io.verbose(
+        `Auto-discovered output(s) from template: ${outputIdentifiers.join(", ")}`,
+      );
+    }
+  }
+
+  // Build a variable-values map from all committed variables so
+  // resolveProvidedLockingBytecodeHex can resolve outputs whose locking
+  // script depends on a variable (e.g. <recipientLockingscript>).
+  const variableValuesByIdentifier: Record<string, string> = {};
+  for (const commit of invitation.data.commits) {
+    for (const v of commit.data?.variables ?? []) {
+      if (v.variableIdentifier && typeof v.value === "string") {
+        variableValuesByIdentifier[v.variableIdentifier] = v.value;
+      }
+    }
+  }
+
+  const template = await deps.app.engine.getTemplate(
+    invitation.data.templateIdentifier,
+  );
+
+  const outputs: any[] = await Promise.all(
+    outputIdentifiers.map(async (outputId) => {
+      // Try variable-based resolution first (e.g. sendSatoshis → recipientLockingscript)
+      const providedHex = template
+        ? resolveProvidedLockingBytecodeHex(
+            template,
+            outputId,
+            variableValuesByIdentifier,
+          )
+        : undefined;
+
+      const lockingBytecodeHex =
+        providedHex ??
+        (await invitation.generateLockingBytecode(outputId, roleIdentifier));
+
+      deps.io.verbose(
+        `Locking bytecode for output "${outputId}": ${lockingBytecodeHex}`,
+      );
+      return {
+        outputIdentifier: outputId,
+        lockingBytecode: new Uint8Array(Buffer.from(lockingBytecodeHex, "hex")),
+      };
+    }),
+  );
+  deps.io.verbose(
+    `Outputs: ${formatObject(outputs.map((o) => o.outputIdentifier))}`,
+  );
+
+  // --- Auto change output ---
+  // When inputs are provided, look up each UTXO's value, compute the
+  // required sats, and return the excess minus fees back to the user.
+  if (inputs.length > 0) {
+    const allUtxos = await deps.app.engine.listUnspentOutputsData();
+    const utxoMap = new Map(
+      allUtxos.map((u) => [
+        `${u.outpointTransactionHash}:${u.outpointIndex}`,
+        u,
+      ]),
+    );
+
+    let totalInputSats = 0n;
+    for (const input of inputs) {
+      const txHashHex = binToHex(input.outpointTransactionHash);
+      const utxo = utxoMap.get(`${txHashHex}:${input.outpointIndex}`);
+      if (!utxo) {
+        deps.io.err(
+          `UTXO not found: ${txHashHex}:${input.outpointIndex}. Make sure it exists in your wallet.`,
+        );
+        return null;
+      }
+      totalInputSats += BigInt(utxo.valueSatoshis);
+    }
+    deps.io.verbose(`Total input value: ${totalInputSats} satoshis`);
+
+    const requiredSats = await invitation.getSatsOut();
+    deps.io.verbose(`Required output value: ${requiredSats} satoshis`);
+
+    const changeAmount = totalInputSats - requiredSats - DEFAULT_FEE;
+    deps.io.verbose(
+      `Change amount: ${changeAmount} satoshis (fee: ${DEFAULT_FEE})`,
+    );
+
+    if (changeAmount < 0n) {
+      deps.io.err(
+        `Insufficient funds. Inputs total ${totalInputSats} sats, but need ${requiredSats + DEFAULT_FEE} sats (${requiredSats} required + ${DEFAULT_FEE} fee).`,
+      );
+      return null;
+    }
+
+    if (changeAmount >= DUST_THRESHOLD) {
+      outputs.push({ valueSatoshis: changeAmount });
+      deps.io.out(`Auto-adding change output: ${changeAmount} satoshis`);
+    } else if (changeAmount > 0n) {
+      deps.io.out(
+        `Change ${changeAmount} sats is below dust threshold (${DUST_THRESHOLD} sats), donating to miners as fee.`,
+      );
+    }
+  }
+
+  return { inputs, outputs };
+}
+
+/**
+ * Prints the help message for the invitation command
+ */
+export const printInvitationHelp = (io: CommandIO): void => {
+  io.out(
+    `
+${bold("Usage:")} xo-cli invitation <sub-command>
+
+${bold("Sub-commands:")}
+    - create <template-file> <action-id> ${dim("Create a new invitation")}
+    - append <invitation-id> ${dim("Add variables/outputs to an invitation")}
+    - sign <invitation-id> ${dim("Sign an invitation")}
+    - broadcast <invitation-id> ${dim("Broadcast an invitation")}
+    - requirements <invitation-id> ${dim("Show requirements for an invitation")}
+    - import <invitation-file> ${dim("Import an invitation from a file")}
+    - inspect <invitation-id | invitation-file> ${dim("Inspect an invitation")}
+    - list ${dim("List all invitations")}
+
+${bold("Create / Append options:")}
+    -var-<name> <value>       ${dim("Set a variable (e.g. -var-requested-satoshis 1000)")}
+    --add-input <txhash:vout> ${dim("Add UTXO input(s), comma-separated (e.g. abc123:0,def456:1)")}
+    --add-output <id>         ${dim("Override output(s) — omit to auto-discover from template")}
+    --auto-inputs             ${dim("Automatically select UTXOs as inputs")}
+    -role <role>              ${dim("Role for output bytecode generation (fallback)")}
+    --sign                    ${dim("Auto-sign after all requirements are satisfied")}
+    --broadcast               ${dim("Auto-broadcast after signing (implies --sign)")}
+
+    ${dim("When inputs are provided, a change output is automatically added if the")}
+    ${dim("input total exceeds the required amount + fee.")}
+  `,
+  );
+};
+
+/**
+ * Result data returned by invitation commands on success.
+ */
+export type InvitationCommandResult = {
+  invitationIdentifier?: string;
+  txHash?: string;
+  count?: number;
+  templateName?: string;
+  actionIdentifier?: string;
+  status?: string;
+  entities?: { entityIdentifier: string; roles: (string | undefined)[] }[];
+  inputs?: unknown[];
+  outputs?: unknown[];
+  variables?: unknown[];
+};
+
+/**
+ * Handles the invitation command.
+ * Throws CommandError on failure, returns result data on success.
+ * @param deps - The command dependencies.
+ * @param args - Positional args after the command name, e.g. ["create", "template.json", "action-id"].
+ * @param options - Parsed option flags, e.g. { varRequestedSatohis: "1000", role: "receiver" }.
+ */
+export const handleInvitationCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+  options: Record<string, string>,
+): Promise<InvitationCommandResult> => {
+  const subCommand = args[0];
+  deps.io.verbose(`Invitation sub-command: ${subCommand}`);
+
+  if (!subCommand) {
+    deps.io.verbose("No sub-command provided");
+    printInvitationHelp(deps.io);
+    throw new CommandError(
+      "invitation.subcommand.missing",
+      "No sub-command provided",
+    );
+  }
+
+  switch (subCommand) {
+    case "create": {
+      const templateQuery = args[1];
+      const actionIdentifier = args[2];
+      deps.io.verbose(
+        `Template query: ${templateQuery}, action identifier: ${actionIdentifier}`,
+      );
+
+      if (!templateQuery || !actionIdentifier) {
+        deps.io.verbose("No template file or action identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError(
+          "invitation.create.arguments_missing",
+          "No template file or action identifier provided",
+        );
+      }
+
+      const template = await resolveTemplate(deps, templateQuery);
+      const templateIdentifier = generateTemplateIdentifier(template);
+      const rawInvitation = await deps.app.engine.createInvitation({
+        templateIdentifier,
+        actionIdentifier,
+      });
+      deps.io.verbose(`XOInvitation created: ${formatObject(rawInvitation)}`);
+
+      const invitationInstance = await deps.app.createInvitation(rawInvitation);
+      deps.io.verbose(
+        `Invitation created: ${formatObject(invitationInstance.data)}`,
+      );
+
+      const variables = parseVariablesFromOptions(options);
+      deps.io.verbose(`Variables: ${formatObject(variables)}`);
+      if (variables.length > 0) {
+        await invitationInstance.addVariables(variables);
+      }
+
+      const params = await buildAppendParams(deps, invitationInstance, options);
+      if (!params) {
+        throw new CommandError(
+          "invitation.create.append_params_failed",
+          "Failed to build append parameters",
+        );
+      }
+
+      const { inputs, outputs } = params;
+      if (inputs.length > 0 || outputs.length > 0) {
+        await invitationInstance.append({ inputs, outputs });
+      }
+
+      const invitationFilePath = `${deps.paths.workingDir}/inv-${invitationInstance.data.invitationIdentifier}.json`;
+      deps.io.verbose(`Invitation file path: ${invitationFilePath}`);
+      writeFileSync(
+        invitationFilePath,
+        encodeExtendedJson(invitationInstance.data, 2),
+      );
+      deps.io.out(
+        `Invitation created: ${path.basename(invitationFilePath)} (${invitationInstance.data.invitationIdentifier})`,
+      );
+
+      const missingRequirements =
+        await invitationInstance.getMissingRequirements();
+      const hasMissing =
+        (missingRequirements.variables?.length ?? 0) > 0 ||
+        (missingRequirements.inputs?.length ?? 0) > 0 ||
+        (missingRequirements.outputs?.length ?? 0) > 0 ||
+        (missingRequirements.roles !== undefined &&
+          Object.keys(missingRequirements.roles).length > 0);
+
+      if (hasMissing) {
+        deps.io.out(`\n${bold("Remaining requirements:")}`);
+        deps.io.out(formatObject(missingRequirements));
+      } else {
+        const shouldSign =
+          options["sign"] === "true" || options["broadcast"] === "true";
+        const shouldBroadcast = options["broadcast"] === "true";
+
+        if (shouldSign) {
+          await invitationInstance.sign();
+          deps.io.out(
+            `Invitation signed: ${invitationInstance.data.invitationIdentifier}`,
+          );
+        }
+
+        if (shouldBroadcast) {
+          const txHash = await invitationInstance.broadcast();
+          deps.io.out(`Transaction broadcast: ${bold(txHash)}`);
+        } else if (!shouldSign) {
+          deps.io.out(
+            `\n${bold("All requirements satisfied.")} You can now sign with: xo-cli invitation sign ${invitationInstance.data.invitationIdentifier}`,
+          );
+        }
+      }
+      return {
+        invitationIdentifier: invitationInstance.data.invitationIdentifier,
+      };
+    }
+
+    case "append": {
+      const invitationIdentifier = args[1];
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
+
+      if (!invitationIdentifier) {
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError(
+          "invitation.append.identifier_missing",
+          "No invitation identifier provided",
+        );
+      }
+
+      const invitation = deps.app.invitations.find(
+        (inv) => inv.data.invitationIdentifier === invitationIdentifier,
+      );
+      if (!invitation) {
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError(
+          "invitation.append.not_found",
+          `Invitation not found: ${invitationIdentifier}`,
+        );
+      }
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
+
+      const variables = parseVariablesFromOptions(options);
+      deps.io.verbose(`Variables to append: ${formatObject(variables)}`);
+      if (variables.length > 0) {
+        await invitation.addVariables(variables);
+      }
+
+      const params = await buildAppendParams(deps, invitation, options);
+      if (!params) {
+        throw new CommandError(
+          "invitation.append.params_failed",
+          "Failed to build append parameters",
+        );
+      }
+
+      const { inputs, outputs } = params;
+      if (
+        variables.length === 0 &&
+        inputs.length === 0 &&
+        outputs.length === 0
+      ) {
+        const error =
+          "Nothing to append. Provide variables (-var-<name> <value>), inputs (--add-input <txhash>:<vout>), or outputs (--add-output <identifier>).";
+        deps.io.err(error);
+        throw new CommandError("invitation.append.empty", error);
+      }
+
+      if (inputs.length > 0 || outputs.length > 0) {
+        await invitation.append({ inputs, outputs });
+      }
+      deps.io.verbose(`Invitation appended: ${formatObject(invitation.data)}`);
+      deps.io.out(`Invitation appended: ${invitationIdentifier}`);
+
+      const invitationFilePath = `${deps.paths.workingDir}/inv-${invitation.data.invitationIdentifier}.json`;
+      writeFileSync(invitationFilePath, encodeExtendedJson(invitation.data, 2));
+      deps.io.out(
+        `Invitation updated: ${path.basename(invitationFilePath)} (${invitation.data.invitationIdentifier})`,
+      );
+
+      const missingRequirements = await invitation.getMissingRequirements();
+      const hasMissing =
+        (missingRequirements.variables?.length ?? 0) > 0 ||
+        (missingRequirements.inputs?.length ?? 0) > 0 ||
+        (missingRequirements.outputs?.length ?? 0) > 0 ||
+        (missingRequirements.roles !== undefined &&
+          Object.keys(missingRequirements.roles).length > 0);
+
+      if (hasMissing) {
+        deps.io.out(`\n${bold("Remaining requirements:")}`);
+        deps.io.out(formatObject(missingRequirements));
+      } else {
+        const shouldSign =
+          options["sign"] === "true" || options["broadcast"] === "true";
+        const shouldBroadcast = options["broadcast"] === "true";
+
+        if (shouldSign) {
+          await invitation.sign();
+          deps.io.out(`Invitation signed: ${invitationIdentifier}`);
+        }
+
+        if (shouldBroadcast) {
+          const txHash = await invitation.broadcast();
+          deps.io.out(`Transaction broadcast: ${bold(txHash)}`);
+        } else if (!shouldSign) {
+          deps.io.out(
+            `\n${bold("All requirements satisfied.")} You can now sign with: xo-cli invitation sign ${invitationIdentifier}`,
+          );
+        }
+      }
+      return { invitationIdentifier };
+    }
+
+    case "sign": {
+      const invitationIdentifier = args[1];
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
+      if (!invitationIdentifier) {
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError(
+          "invitation.sign.identifier_missing",
+          "No invitation identifier provided",
+        );
+      }
+
+      const invitation = deps.app.invitations.find(
+        (candidate) =>
+          candidate.data.invitationIdentifier === invitationIdentifier,
+      );
+      if (!invitation) {
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError(
+          "invitation.sign.not_found",
+          `Invitation not found: ${invitationIdentifier}`,
+        );
+      }
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
+
+      await invitation.sign();
+      deps.io.verbose(`Invitation signed: ${formatObject(invitation.data)}`);
+      deps.io.out(`Invitation signed: ${invitationIdentifier}`);
+      return { invitationIdentifier };
+    }
+
+    case "broadcast": {
+      const invitationIdentifier = args[1];
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
+      if (!invitationIdentifier) {
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError(
+          "invitation.broadcast.identifier_missing",
+          "No invitation identifier provided",
+        );
+      }
+
+      const invitation = deps.app.invitations.find(
+        (candidate) =>
+          candidate.data.invitationIdentifier === invitationIdentifier,
+      );
+      if (!invitation) {
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError(
+          "invitation.broadcast.not_found",
+          `Invitation not found: ${invitationIdentifier}`,
+        );
+      }
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
+
+      const txHash = await invitation.broadcast();
+      deps.io.verbose(
+        `Invitation broadcasted: ${formatObject(invitation.data)}`,
+      );
+      deps.io.out(`Transaction broadcast: ${bold(txHash)}`);
+      return { invitationIdentifier, txHash };
+    }
+
+    case "requirements": {
+      const invitationIdentifier = args[1];
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
+      if (!invitationIdentifier) {
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError(
+          "invitation.requirements.identifier_missing",
+          "No invitation identifier provided",
+        );
+      }
+
+      const invitation = deps.app.invitations.find(
+        (candidate) =>
+          candidate.data.invitationIdentifier === invitationIdentifier,
+      );
+      if (!invitation) {
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError(
+          "invitation.requirements.not_found",
+          `Invitation not found: ${invitationIdentifier}`,
+        );
+      }
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
+
+      const requirements = await deps.app.engine.listRequirements(
+        invitation.data,
+      );
+      deps.io.verbose(`Requirements: ${formatObject(requirements)}`);
+      deps.io.out(formatObject(requirements));
+      return { invitationIdentifier };
+    }
+
+    case "inspect": {
+      const invitationFilePath = args[1];
+      deps.io.verbose(`Invitation file path: ${invitationFilePath}`);
+
+      if (!invitationFilePath) {
+        deps.io.verbose("No invitation file provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError(
+          "invitation.inspect.file_missing",
+          "No invitation file provided",
+        );
+      }
+
+      const invitationFile = await readFileSync(invitationFilePath, "utf8");
+      deps.io.verbose(`Invitation file: ${invitationFile}`);
+
+      const invitation = JSON.parse(invitationFile);
+      deps.io.verbose(`Invitation: ${formatObject(invitation)}`);
+
+      const invitationInstance = await deps.app.createInvitation(invitation);
+      deps.io.verbose(
+        `Invitation created: ${formatObject(invitationInstance.data)}`,
+      );
+
+      const template = await deps.app.engine.getTemplate(
+        invitationInstance.data.templateIdentifier,
+      );
+
+      const action =
+        template?.actions[invitationInstance.data.actionIdentifier];
+      deps.io.verbose(`Action: ${formatObject(action)}`);
+      if (!action) {
+        deps.io.err(
+          `Action not found: ${invitationInstance.data.actionIdentifier}`,
+        );
+        throw new CommandError(
+          "invitation.inspect.action_not_found",
+          `Action not found: ${invitationInstance.data.actionIdentifier}`,
+        );
+      }
+
+      const status = invitationInstance.status;
+      deps.io.verbose(`Status: ${status}`);
+
+      const entities = Array.from(
+        new Set(
+          invitationInstance.data.commits.map(
+            (commit) => commit.entityIdentifier,
+          ),
+        ),
+      );
+      deps.io.verbose(`Entities: ${formatObject(entities)}`);
+
+      const entitiesWithRoles = entities.map((entity) => {
+        return {
+          entityIdentifier: entity,
+          roles: invitationInstance.data.commits
+            .filter((commit) => commit.entityIdentifier === entity)
+            .map((commit) => {
+              return [
+                ...(commit.data.inputs?.map((input) => input.roleIdentifier) ??
+                  []),
+                ...(commit.data.outputs?.map(
+                  (output) => output.roleIdentifier,
+                ) ?? []),
+                ...(commit.data.variables?.map(
+                  (variable) => variable.roleIdentifier,
+                ) ?? []),
+              ];
+            })
+            .flat()
+            .filter((role) => role !== undefined),
+        };
+      });
+
+      const inputs = invitationInstance.data.commits.flatMap(
+        (commit) => commit.data.inputs ?? [],
+      );
+      deps.io.verbose(`Inputs: ${formatObject(inputs)}`);
+
+      const outputs = invitationInstance.data.commits.flatMap(
+        (commit) => commit.data.outputs ?? [],
+      );
+      deps.io.verbose(`Outputs: ${formatObject(outputs)}`);
+
+      const variables = invitationInstance.data.commits.flatMap(
+        (commit) => commit.data.variables ?? [],
+      );
+      deps.io.verbose(`Variables: ${formatObject(variables)}`);
+
+      return {
+        templateName: template?.name ?? "Unknown",
+        actionIdentifier: invitationInstance.data.actionIdentifier,
+        status: status,
+        entities: entitiesWithRoles,
+        inputs: inputs,
+        outputs: outputs,
+        variables: variables,
+      };
+    }
+
+    case "import": {
+      const invitationFilePath = args[1];
+      deps.io.verbose(`Invitation file path: ${invitationFilePath}`);
+
+      if (!invitationFilePath) {
+        deps.io.verbose("No invitation file provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError(
+          "invitation.import.file_missing",
+          "No invitation file provided",
+        );
+      }
+
+      const invitationFile = await readFileSync(invitationFilePath, "utf8");
+      deps.io.verbose(`Invitation file: ${invitationFile}`);
+      const invitation = JSON.parse(invitationFile);
+      deps.io.verbose(`Invitation: ${formatObject(invitation)}`);
+      const xoInvitation = await deps.app.engine.createInvitation(invitation);
+      const invitationInstance = await deps.app.createInvitation(xoInvitation);
+      deps.io.verbose(
+        `Invitation created: ${formatObject(invitationInstance.data)}`,
+      );
+      return {
+        invitationIdentifier: invitationInstance.data.invitationIdentifier,
+      };
+    }
+
+    case "list": {
+      const invitations = await Promise.all(
+        deps.app.invitations.map(async (invitation) => {
+          const template = await deps.app.engine.getTemplate(
+            invitation.data.templateIdentifier,
+          );
+          return {
+            invitationIdentifier: invitation.data.invitationIdentifier,
+            templateIdentifier: invitation.data.templateIdentifier,
+            actionIdentifier: invitation.data.actionIdentifier,
+            templateName: template?.name ?? "Unknown",
+            status: invitation.status,
+            roleIdentifier: "TODO: Get role identifier",
+          };
+        }),
+      );
+      deps.io.verbose(`Invitations: ${formatObject(invitations)}`);
+      const formattedInvitations = invitations.map(
+        (invitation) =>
+          `${bold(invitation.templateName)} ${dim(invitation.status)} ${dim(invitation.invitationIdentifier)} ${dim(invitation.actionIdentifier)} (${dim(invitation.roleIdentifier)})`,
+      );
+      deps.io.out(formattedInvitations.join("\n"));
+      return { count: invitations.length };
+    }
+
+    default:
+      deps.io.verbose(`Unknown invitation sub-command: ${subCommand}`);
+      printInvitationHelp(deps.io);
+      throw new CommandError(
+        "invitation.subcommand.unknown",
+        `Unknown invitation sub-command: ${subCommand}`,
+      );
+  }
+};

src/cli/commands/mnemonic.ts

@@ -0,0 +1,129 @@
+import { bold, dim } from "../utils.js";
+import {
+  listMnemonicFiles,
+  createMnemonicFile,
+  createMnemonicSeed,
+  loadMnemonic,
+} from "../mnemonic.js";
+import type { BaseCommandDependencies, CommandIO } from "./types.js";
+import { CommandError } from "./types.js";
+
+/**
+ * Prints the help message for the mnemonic command
+ */
+export const printMnemonicHelp = (io: CommandIO): void => {
+  io.out(
+    `
+${bold("Usage:")} xo-cli mnemonic <sub-command>
+
+${bold("Sub-commands:")}
+    - create <mnemonic-seed> ${dim("Create a new mnemonic file")}
+    - list ${dim("List all mnemonic files")}
+    - import <mnemonic-seed> ${dim("Import a mnemonic seed from a file")}
+    - expose <mnemonic-file> ${dim("Expose a mnemonic file")}
+
+${bold("Options:")}
+    -o --output <output-filename> ${dim("Output filename for the mnemonic file")}
+    -h --help ${dim("Show this help message")}
+`,
+  );
+};
+
+/**
+ * Handles the mnemonic command.
+ * Throws CommandError on failure, returns result data on success.
+ * @param deps - The command dependencies.
+ * @param args - Positional args after the command name, e.g. ["create"] or ["import", "page", "pencil", ...].
+ * @param options - Parsed option flags, e.g. { output: "mnemonic.txt" }.
+ */
+export const handleMnemonicCommand = async (
+  deps: BaseCommandDependencies,
+  args: string[],
+  options: Record<string, string>,
+): Promise<{ savedAs?: string; count?: number; mnemonic?: string }> => {
+  const subCommand = args[0];
+  const { mnemonicsDir } = deps.paths;
+
+  if (!subCommand) {
+    deps.io.verbose("No sub-command provided");
+    printMnemonicHelp(deps.io);
+    throw new CommandError(
+      "mnemonic.subcommand.missing",
+      "No sub-command provided",
+    );
+  }
+
+  switch (subCommand) {
+    case "create": {
+      const mnemonicSeed = createMnemonicSeed();
+      const savedAs = createMnemonicFile(
+        mnemonicsDir,
+        mnemonicSeed,
+        options["output"],
+      );
+
+      deps.io.out(`Mnemonic file created: ${savedAs} (${mnemonicSeed})`);
+      return { savedAs };
+    }
+
+    case "import": {
+      const mnemonicSeed = args.slice(1).join(" ");
+
+      if (!mnemonicSeed) {
+        deps.io.verbose("No mnemonic seed provided");
+        printMnemonicHelp(deps.io);
+        throw new CommandError(
+          "mnemonic.import.seed_missing",
+          "No mnemonic seed provided",
+        );
+      }
+
+      deps.io.verbose(`Mnemonic seed: ${mnemonicSeed}`);
+      const savedAs = createMnemonicFile(
+        mnemonicsDir,
+        mnemonicSeed,
+        options["output"],
+      );
+      deps.io.out(`Mnemonic file created: ${savedAs}`);
+      return { savedAs };
+    }
+
+    case "list": {
+      const mnemonicFiles = listMnemonicFiles(mnemonicsDir);
+      deps.io.out(mnemonicFiles.join("\n"));
+      return { count: mnemonicFiles.length };
+    }
+
+    case "expose": {
+      const mnemonicFile = args[1];
+
+      if (!mnemonicFile) {
+        deps.io.verbose("No mnemonic file provided");
+        printMnemonicHelp(deps.io);
+        throw new CommandError(
+          "mnemonic.expose.file_missing",
+          "No mnemonic file provided",
+        );
+      }
+
+      try {
+        const mnemonic = loadMnemonic(mnemonicsDir, mnemonicFile);
+        deps.io.out(mnemonic);
+        return { mnemonic };
+      } catch (error) {
+        throw new CommandError(
+          "mnemonic.expose.file_not_found",
+          `Mnemonic file not found: ${mnemonicFile}`,
+        );
+      }
+    }
+
+    default:
+      deps.io.err(`Unknown sub-command: ${subCommand}`);
+      printMnemonicHelp(deps.io);
+      throw new CommandError(
+        "mnemonic.subcommand.unknown",
+        `Unknown sub-command: ${subCommand}`,
+      );
+  }
+};

src/cli/commands/receive.ts

@@ -0,0 +1,93 @@
+import { generateTemplateIdentifier } from "@xo-cash/engine";
+import { hexToBin, lockingBytecodeToCashAddress } from "@bitauth/libauth";
+
+import { bold, dim } from "../utils.js";
+import type { CommandDependencies, CommandIO } from "./types.js";
+import { CommandError } from "./types.js";
+
+import { resolveTemplate } from "../utils.js";
+
+/**
+ * Prints the help message for the receive command
+ */
+export const printReceiveHelp = (io: CommandIO): void => {
+  io.out(
+    `
+${bold("Usage:")} xo-cli receive <template-file> <output-identifier> [role-identifier]
+
+${bold("Description:")}
+    Generate a single-use receiving address from a template.
+
+${bold("Arguments:")}
+    <template-file>       ${dim("Path to the template JSON file")}
+    <output-identifier>   ${dim("The output identifier within the template (e.g. 'receiveOutput')")}
+    [role-identifier]     ${dim("The role identifier (e.g. 'receiver'). Auto-selects the first role if omitted.")}
+
+${bold("Options:")}
+    -h --help ${dim("Show this help message")}
+`,
+  );
+};
+
+/**
+ * Command which creates a single-use address/lockingScript for a given template and role.
+ * Throws CommandError on failure, returns address data on success.
+ *
+ * @param deps - The command dependencies.
+ * @param args - Positional args after the command name, e.g. ["template.json", "receiveOutput", "receiver"].
+ * @param options - Parsed option flags.
+ * @returns The address data.
+ * @throws CommandError if the command fails.
+ */
+export const handleReceiveCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+  _options: Record<string, string>,
+): Promise<{ address: string }> => {
+  const templateQuery = args[0];
+  const outputIdentifier = args[1];
+  const roleIdentifier = args[2];
+
+  deps.io.verbose(
+    `Receive args - template: ${templateQuery}, output: ${outputIdentifier}, role: ${roleIdentifier}`,
+  );
+
+  if (!templateQuery || !outputIdentifier) {
+    deps.io.verbose("Missing required arguments");
+    printReceiveHelp(deps.io);
+    throw new CommandError(
+      "receive.arguments.missing",
+      "Missing required arguments",
+    );
+  }
+
+  // Resolve and read the template file
+  const template = await resolveTemplate(deps, templateQuery);
+  const templateIdentifier = generateTemplateIdentifier(template);
+  deps.io.verbose(`Template identifier: ${templateIdentifier}`);
+
+  // Generate the locking bytecode (returned as a hex string)
+  const lockingBytecodeHex = await deps.app.engine.generateLockingBytecode(
+    templateIdentifier,
+    outputIdentifier,
+    roleIdentifier,
+  );
+  deps.io.verbose(`Locking bytecode hex: ${lockingBytecodeHex}`);
+
+  // Convert the locking bytecode to a BCH cash address
+  const result = lockingBytecodeToCashAddress({
+    bytecode: hexToBin(lockingBytecodeHex),
+    prefix: "bitcoincash",
+  });
+
+  if (typeof result === "string") {
+    deps.io.err(`Failed to encode address: ${result}`);
+    throw new CommandError(
+      "receive.address.encode_failed",
+      `Failed to encode address: ${result}`,
+    );
+  }
+
+  deps.io.out(result.address);
+  return { address: result.address };
+};

src/cli/commands/resource.ts

@@ -0,0 +1,184 @@
+import { hexToBin } from "@bitauth/libauth";
+
+import { bold, dim } from "../utils.js";
+import type { CommandDependencies, CommandIO } from "./types.js";
+import type { UnspentOutputData } from "@xo-cash/state";
+import { CommandError } from "./types.js";
+
+/**
+ * Prints the help message for the resource command.
+ */
+export const printResourceHelp = (io: CommandIO): void => {
+  io.out(
+    `
+${bold("Usage:")} xo-cli resource <sub-command>
+
+${bold("Sub-commands:")}
+    - list                  ${dim("List all unreserved resources")}
+    - list reserved         ${dim("List reserved resources")}
+    - list all              ${dim("List all resources (reserved + unreserved)")}
+    - unreserve <txhash:vout> ${dim("Unreserve a specific UTXO")}
+    - unreserve-all         ${dim("Unreserve all reserved UTXOs")}
+  `,
+  );
+};
+
+/**
+ * Formats a single UTXO for display, optionally including reservation info.
+ */
+function formatResource(
+  resource: UnspentOutputData,
+  showReserved = false,
+): string {
+  const outpoint = bold(
+    `${resource.outpointTransactionHash}:${resource.outpointIndex}`,
+  );
+  const value = dim(`${resource.valueSatoshis} sats`);
+  const output = dim(resource.outputIdentifier);
+  const height = dim(`(height ${resource.minedAtHeight})`);
+
+  if (showReserved && resource.reservedBy) {
+    const inv = dim(`reserved for ${resource.reservedBy}`);
+    return `${outpoint} ${value} ${output} ${height} ${inv}`;
+  }
+
+  return `${outpoint} ${value} ${output} ${height}`;
+}
+
+/**
+ * Handles the resource command.
+ * Throws CommandError on failure, returns result data on success.
+ * @param deps - The command dependencies.
+ * @param args - Positional args after the command name, e.g. ["list"].
+ * @param options - Parsed option flags.
+ */
+export const handleResourceCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+  _options: Record<string, string>,
+): Promise<{ count?: number }> => {
+  const subCommand = args[0];
+  deps.io.verbose(`Resource sub-command: ${subCommand}`);
+
+  if (!subCommand) {
+    deps.io.verbose("No sub-command provided");
+    printResourceHelp(deps.io);
+    throw new CommandError(
+      "resource.subcommand.missing",
+      "No sub-command provided",
+    );
+  }
+
+  switch (subCommand) {
+    case "list": {
+      const qualifier = args[1];
+      const allResources = await deps.app.engine.listUnspentOutputsData();
+
+      let filtered;
+      if (qualifier === "reserved") {
+        filtered = allResources.filter((r) => r.reservedBy);
+      } else if (qualifier === "all") {
+        filtered = allResources;
+      } else {
+        filtered = allResources.filter((r) => !r.reservedBy);
+      }
+
+      if (filtered.length === 0) {
+        deps.io.out(dim("No resources found."));
+        return { count: 0 };
+      }
+
+      const showReserved = qualifier === "all" || qualifier === "reserved";
+      const formattedResources = filtered.map((r) =>
+        formatResource(r, showReserved),
+      );
+      deps.io.out(formattedResources.join("\n"));
+      deps.io.out(
+        `Total satoshis: ${filtered.reduce((acc, r) => acc + r.valueSatoshis, 0)}`,
+      );
+      deps.io.out(`Total resources: ${filtered.length}`);
+      return { count: filtered.length };
+    }
+
+    case "unreserve": {
+      const outpointArg = args[1];
+      if (!outpointArg) {
+        deps.io.err("Please provide a UTXO in <txhash>:<vout> format.");
+        printResourceHelp(deps.io);
+        throw new CommandError(
+          "resource.unreserve.outpoint_missing",
+          "Please provide a UTXO in <txhash>:<vout> format.",
+        );
+      }
+
+      const separatorIndex = outpointArg.lastIndexOf(":");
+      if (separatorIndex === -1) {
+        deps.io.err(
+          `Invalid format "${outpointArg}". Expected <txhash>:<vout>.`,
+        );
+        throw new CommandError(
+          "resource.unreserve.outpoint_invalid",
+          `Invalid format "${outpointArg}". Expected <txhash>:<vout>.`,
+        );
+      }
+
+      const txHash = outpointArg.substring(0, separatorIndex);
+      const vout = parseInt(outpointArg.substring(separatorIndex + 1), 10);
+      if (!txHash || isNaN(vout)) {
+        deps.io.err(
+          `Invalid format "${outpointArg}". Expected <txhash>:<vout>.`,
+        );
+        throw new CommandError(
+          "resource.unreserve.outpoint_invalid",
+          `Invalid format "${outpointArg}". Expected <txhash>:<vout>.`,
+        );
+      }
+
+      const allResources = await deps.app.engine.listUnspentOutputsData();
+      const target = allResources.find(
+        (r) => r.outpointTransactionHash === txHash && r.outpointIndex === vout,
+      );
+
+      if (!target) {
+        deps.io.err(`UTXO not found: ${txHash}:${vout}`);
+        throw new CommandError(
+          "resource.unreserve.utxo_missing",
+          `UTXO not found: ${txHash}:${vout}`,
+        );
+      }
+
+      if (!target.reservedBy) {
+        deps.io.out(dim("UTXO is not reserved. Nothing to do."));
+        return {};
+      }
+
+      await deps.app.engine.unreserveResources(
+        [{ outpointTransactionHash: hexToBin(txHash), outpointIndex: vout }],
+        target.reservedBy,
+      );
+      deps.io.out(
+        `Unreserved ${bold(`${txHash}:${vout}`)} (was reserved for ${target.reservedBy})`,
+      );
+      return {};
+    }
+
+    case "unreserve-all": {
+      const count = await deps.app.unreserveAllResources();
+      if (count === 0) {
+        deps.io.out(dim("No reserved resources to unreserve."));
+      } else {
+        deps.io.out(`Unreserved ${bold(String(count))} resource(s).`);
+      }
+      return { count };
+    }
+
+    default: {
+      deps.io.verbose(`Unknown resource sub-command: ${subCommand}`);
+      printResourceHelp(deps.io);
+      throw new CommandError(
+        "resource.subcommand.unknown",
+        `Unknown resource sub-command: ${subCommand}`,
+      );
+    }
+  }
+};

src/cli/commands/template.ts

@@ -0,0 +1,353 @@
+import { existsSync, readFileSync } from "fs";
+import path from "path";
+import { generateTemplateIdentifier } from "@xo-cash/engine";
+import type { XOTemplate } from "@xo-cash/types";
+
+import { bold, dim, formatObject } from "../utils.js";
+import { resolveTemplateReferences } from "../../utils/templates.js";
+import type { CommandDependencies, CommandIO } from "./types.js";
+import { CommandError } from "./types.js";
+import { resolveTemplate } from "../utils.js";
+
+/**
+ * Prints the help message for the template command
+ */
+export const printTemplateHelp = (io: CommandIO): void => {
+  io.out(
+    `
+${bold("Usage:")} xo-cli template <sub-command>
+
+${bold("Sub-commands:")}
+    - import <template-file> ${dim("Import a template from a file")}
+    - list ${dim("List all templates")}
+    - list <category> <identifier> ${dim("List all options of the field type in a template")}
+    - inspect <category> <identifier> <field> ${dim("Inspect a field in a template")}
+    - set-default <template-file> <output-identifier> <role-identifier> ${dim("Set the default template")}
+  `,
+  );
+};
+
+/**
+ * Handles the template list command.
+ * Throws CommandError on failure, returns result data on success.
+ * @param deps - The command dependencies.
+ * @param args - Positional args after the command name, e.g. ["list", "action"] or ["list", "action", "1234567890"].
+ */
+export const handleTemplateListCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+): Promise<{ count?: number }> => {
+  const templateCategory = args[0];
+  deps.io.verbose(`Template list category: ${templateCategory}`);
+
+  if (!templateCategory) {
+    const templates = await deps.app.engine.listImportedTemplates();
+    const formattedTemplates = templates.map(
+      (template: XOTemplate) =>
+        `${bold(generateTemplateIdentifier(template))} - ${dim(template.name)} ${dim(template.description)}`,
+    );
+    deps.io.out(formattedTemplates.join("\n"));
+    return { count: templates.length };
+  }
+
+  const templateIdentifier = args[1];
+  deps.io.verbose(`Template identifier: ${templateIdentifier}`);
+
+  if (!templateIdentifier) {
+    deps.io.err("No template identifier provided");
+    throw new CommandError(
+      "template.list.identifier_missing",
+      "No template identifier provided",
+    );
+  }
+
+  const rawTemplate = await deps.app.engine.getTemplate(templateIdentifier);
+  if (!rawTemplate) {
+    deps.io.err(`No template found: ${templateIdentifier}`);
+    throw new CommandError(
+      "template.list.not_found",
+      `No template found: ${templateIdentifier}`,
+    );
+  }
+
+  const template = await resolveTemplateReferences(rawTemplate);
+  deps.io.verbose(`Template: ${formatObject(template)}`);
+
+  switch (templateCategory) {
+    case "action": {
+      const actions = template.actions;
+      const formattedActions = Object.entries(actions).map(
+        ([actionIdentifier, action]) =>
+          `${bold(actionIdentifier)} ${dim(action.name)} ${dim(action.description)}`,
+      );
+      deps.io.out(formattedActions.join("\n"));
+      return {};
+    }
+    case "transaction": {
+      const transactions = template.transactions;
+      const formattedTransactions = Object.entries(transactions).map(
+        ([transactionIdentifier, transaction]) =>
+          `${bold(transactionIdentifier)} ${dim(transaction.name)} ${dim(transaction.description)}`,
+      );
+      deps.io.out(formattedTransactions.join("\n"));
+      return {};
+    }
+    case "output": {
+      const outputs = template.outputs;
+      const formattedOutputs = Object.entries(outputs).map(
+        ([outputIdentifier, output]) =>
+          `${bold(outputIdentifier)} ${dim(output.name)} ${dim(output.description)}`,
+      );
+      deps.io.out(formattedOutputs.join("\n"));
+      return {};
+    }
+    case "lockingscript": {
+      const lockingscripts = template.lockingScripts;
+      const formattedLockingscripts = Object.entries(lockingscripts).map(
+        ([lockingScriptIdentifier, lockingScript]) =>
+          `${bold(lockingScriptIdentifier)} ${dim(lockingScript.name)} ${dim(lockingScript.description)}`,
+      );
+      deps.io.out(formattedLockingscripts.join("\n"));
+      return {};
+    }
+    case "variable": {
+      const variables = template.variables || {};
+      const formattedVariables = Object.entries(variables).map(
+        ([variableIdentifier, variable]) =>
+          `${bold(variableIdentifier)} ${dim(variable.name)} ${dim(variable.description)}`,
+      );
+      deps.io.out(formattedVariables.join("\n"));
+      return {};
+    }
+    default: {
+      deps.io.verbose(`Unknown template category: ${templateCategory}`);
+      throw new CommandError(
+        "template.list.category_unknown",
+        `Unknown template category: ${templateCategory}`,
+      );
+    }
+  }
+};
+
+/**
+ * Prints the help message for the template inspect command
+ */
+export const printTemplateInspectHelp = (io: CommandIO): void => {
+  io.out(
+    `
+${bold("Usage:")} xo-cli template inspect <category> <identifier> <field>
+
+${bold("Arguments:")}
+    <category> ${dim("The category of the template to inspect")}
+    <identifier> ${dim("The identifier of the template to inspect")}
+    <field> ${dim("The field of the template to inspect")}
+
+${bold("Categories:")}
+    - action <action-identifier> ${dim("Inspect an action")}
+    - transaction <transaction-identifier> ${dim("Inspect a transaction")}
+    - output <output-identifier> ${dim("Inspect an output")}
+    - lockingscript <lockingscript-identifier> ${dim("Inspect a lockingscript")}
+    - variable <variable-identifier> ${dim("Inspect a variable")}
+  `,
+  );
+};
+
+/**
+ * Handles the template inspect command.
+ * Throws CommandError on failure, returns empty object on success.
+ * @param deps - The command dependencies.
+ * @param args - Positional args after the command name, e.g. ["inspect", "transaction", "1234567890"].
+ */
+export const handleTemplateInspectCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+): Promise<Record<string, never>> => {
+  const templateCategory = args[0];
+  const templateQuery = args[1];
+  const templateField = args[2];
+
+  deps.io.verbose(
+    `Template inspect args - category: ${templateCategory}, identifier: ${templateQuery}, field: ${templateField}`,
+  );
+
+  if (!templateCategory || !templateQuery || !templateField) {
+    deps.io.err("No template category, identifier, or field provided");
+    printTemplateInspectHelp(deps.io);
+    throw new CommandError(
+      "template.inspect.arguments_missing",
+      "No template category, identifier, or field provided",
+    );
+  }
+
+  const originalTemplate = await resolveTemplate(deps, templateQuery);
+  deps.io.verbose(`Original Template: ${formatObject(originalTemplate)}`);
+
+  const template = await resolveTemplateReferences(originalTemplate);
+  deps.io.verbose(`Extended Template: ${formatObject(template)}`);
+
+  switch (templateCategory) {
+    case "action": {
+      const action = template.actions[templateField];
+      if (!action) {
+        deps.io.err(`No action found: ${templateField}`);
+        throw new CommandError(
+          "template.inspect.action_missing",
+          `No action found: ${templateField}`,
+        );
+      }
+      deps.io.out(formatObject(action));
+      return {};
+    }
+    case "transaction": {
+      const transaction = template.transactions?.[templateField];
+      if (!transaction) {
+        deps.io.err(`No transaction found: ${templateField}`);
+        throw new CommandError(
+          "template.inspect.transaction_missing",
+          `No transaction found: ${templateField}`,
+        );
+      }
+      deps.io.out(formatObject(transaction));
+      return {};
+    }
+    case "output": {
+      const output = template.outputs[templateField];
+      if (!output) {
+        deps.io.err(`No output found: ${templateField}`);
+        throw new CommandError(
+          "template.inspect.output_missing",
+          `No output found: ${templateField}`,
+        );
+      }
+      deps.io.out(formatObject(output));
+      return {};
+    }
+    case "lockingscript": {
+      const lockingscript = template.lockingScripts[templateField];
+      if (!lockingscript) {
+        deps.io.err(`No lockingscript found: ${templateField}`);
+        throw new CommandError(
+          "template.inspect.lockingscript_missing",
+          `No lockingscript found: ${templateField}`,
+        );
+      }
+      deps.io.out(formatObject(lockingscript));
+      return {};
+    }
+    case "variable": {
+      const variable = template.variables?.[templateField];
+      if (!variable) {
+        deps.io.err(`No variable found: ${templateField}`);
+        throw new CommandError(
+          "template.inspect.variable_missing",
+          `No variable found: ${templateField}`,
+        );
+      }
+      deps.io.out(formatObject(variable));
+      return {};
+    }
+    default: {
+      deps.io.verbose(`Unknown template category: ${templateCategory}`);
+      throw new CommandError(
+        "template.inspect.category_unknown",
+        `Unknown template category: ${templateCategory}`,
+      );
+    }
+  }
+};
+
+/**
+ * Handles the template command.
+ * Throws CommandError on failure, returns result data on success.
+ * @param deps - The command dependencies.
+ * @param args - Positional args after the command name, e.g. ["import", "template.json"] or ["set-default", "tpl", "out", "role"].
+ * @param options - Parsed option flags.
+ */
+export const handleTemplateCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+  _options: Record<string, string>,
+): Promise<{ templateFile?: string; count?: number }> => {
+  const subCommand = args[0];
+
+  if (!subCommand) {
+    deps.io.verbose("No sub-command provided");
+    printTemplateHelp(deps.io);
+    throw new CommandError(
+      "template.subcommand.missing",
+      "No sub-command provided",
+    );
+  }
+
+  switch (subCommand) {
+    case "import": {
+      const templateFile = args[1];
+      deps.io.verbose(`Template file: ${templateFile}`);
+
+      if (!templateFile) {
+        deps.io.verbose("No template file provided");
+        printTemplateHelp(deps.io);
+        throw new CommandError(
+          "template.import.file_missing",
+          "No template file provided",
+        );
+      }
+
+      const templatePath = path.resolve(`${process.cwd()}/${templateFile}`);
+      deps.io.verbose(`Template path: ${templatePath}`);
+
+      if (!existsSync(templatePath)) {
+        deps.io.err(`Template file does not exist: ${templatePath}`);
+        printTemplateHelp(deps.io);
+        throw new CommandError(
+          "template.import.file_not_found",
+          `Template file does not exist: ${templatePath}`,
+        );
+      }
+
+      const template = await readFileSync(templatePath, "utf8");
+
+      deps.io.verbose(`Importing template: ${templateFile}`);
+      await deps.app.engine.importTemplate(template);
+      deps.io.verbose(`Template imported: ${templateFile}`);
+      return { templateFile };
+    }
+    case "list": {
+      return handleTemplateListCommand(deps, args.slice(1));
+    }
+    case "inspect": {
+      return handleTemplateInspectCommand(deps, args.slice(1));
+    }
+    case "set-default": {
+      const templateFile = args[1];
+      const outputIdentifier = args[2];
+      const roleIdentifier = args[3];
+      if (!templateFile || !outputIdentifier || !roleIdentifier) {
+        deps.io.verbose(
+          "No template file, output identifier, or role identifier provided",
+        );
+        printTemplateHelp(deps.io);
+        throw new CommandError(
+          "template.default.arguments_missing",
+          "No template file, output identifier, or role identifier provided",
+        );
+      }
+      deps.io.verbose(
+        `Template file: ${templateFile}, output identifier: ${outputIdentifier}, role identifier: ${roleIdentifier}`,
+      );
+      await deps.app.engine.setDefaultLockingParameters(
+        templateFile,
+        outputIdentifier,
+        roleIdentifier,
+      );
+      return {};
+    }
+    default:
+      deps.io.verbose(`Unknown template sub-command: ${subCommand}`);
+      printTemplateHelp(deps.io);
+      throw new CommandError(
+        "template.subcommand.unknown",
+        `Unknown template sub-command: ${subCommand}`,
+      );
+  }
+};

src/cli/commands/types.ts

@@ -0,0 +1,59 @@
+import type { AppService } from "../../services/app.js";
+
+/**
+ * IO contract for CLI command handlers.
+ * Handlers write user-visible output through this abstraction so unit tests can
+ * assert behavior without spying on global console methods.
+ */
+export type CommandIO = {
+  out: (message: string) => void;
+  err: (message: string) => void;
+  verbose: (message: string) => void;
+};
+
+/**
+ * Paths configuration for CLI commands.
+ * Allows injection of custom paths for testing.
+ */
+export type CommandPaths = {
+  /** Directory for mnemonic wallet files */
+  mnemonicsDir: string;
+  /** Directory for engine DB and invitation storage files */
+  dataDir: string;
+  /** File storing the last-used mnemonic reference */
+  walletConfigPath: string;
+  /** Working directory for file output (invitation files, etc.) */
+  workingDir: string;
+};
+
+/**
+ * Base dependencies available to every command handler.
+ */
+export type BaseCommandDependencies = {
+  io: CommandIO;
+  paths: CommandPaths;
+};
+
+/**
+ * Dependencies for app-backed commands.
+ */
+export type CommandDependencies = BaseCommandDependencies & {
+  app: AppService;
+};
+
+/**
+ * Custom error class for command failures.
+ * Thrown by command handlers when an operation fails.
+ * The `event` property can be used for telemetry/testing to identify failure types.
+ */
+export class CommandError extends Error {
+  public readonly event: string;
+  public readonly code: number;
+
+  constructor(event: string, message: string, code = 1) {
+    super(message);
+    this.name = "CommandError";
+    this.event = event;
+    this.code = code;
+  }
+}

src/cli/index.ts

@@ -0,0 +1,272 @@
+#!/usr/bin/env node
+/**
+ * CLI entry point.
+ *
+ * TODO: Decide the best way to handle CLI arguments. We have the option of:
+ * - Handling it in the `bin` folder
+ * - Switch / if statements in here
+ * - Dedicated command parser
+ * - Separate files?
+ *
+ * What kind of commands do we want to support?
+ * Worth noting that we shouldn't need to list invitations? Maybe we will though? If we do, then we will need to reuse the storage + xo-invitations.db file. I think this is fine to do though?
+ * Nah, lets use the storage + xo-invitations.db file. Will allow us to persist invitations.
+ * How do we want to import invitations though? Should we just take in the ID still? Probably makes more sense to allow for reading from a file though...
+ * But thats an entirely different flow to what we have already. And how would we handle writing the invitation? Do we just overwrite the file? Probably... Just take in an -o option; default to overwrite?
+ *
+ * Commands:
+ * xo-cli mnemonic create [mnemonic seed]
+ * xo-cli mnemonic list
+ *
+ * xo-cli template import <template-file>
+ * xo-cli template list
+ * xo-cli template set-default <template-file> <output-identifier> <role-identifier>
+ *
+ * xo-cli invitation list
+ * xo-cli invitation create <template-file> <action-id> [-o Output file, var-${action-variable-name}=${value}, role=${value}]
+ * xo-cli invitation import <invitation-file>
+ * xo-cli invitation sign <invitation-file>
+ * xo-cli invitation broadcast <invitation-file>
+ *
+ * xo-cli resource list
+ *
+ * universal Args:
+ * -h --help
+ * -m --mnemonic-file <mnemonic-file>
+ */
+
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { join } from "path";
+
+import { AppService } from "../services/app.js";
+import { convertArgsToObject } from "./arguments.js";
+import { bold, dim, formatObject } from "./utils.js";
+import { listGlobalMnemonicFiles, loadMnemonic } from "./mnemonic.js";
+import {
+  getDataDir,
+  getMnemonicsDir,
+  getWalletConfigPath,
+} from "../utils/paths.js";
+
+import {
+  type CommandDependencies,
+  type CommandIO,
+  type CommandPaths,
+  CommandError,
+  handleMnemonicCommand,
+  handleTemplateCommand,
+  handleInvitationCommand,
+  handleReceiveCommand,
+  handleResourceCommand,
+} from "./commands/index.js";
+
+import { handleCompletionsCommand } from "./autocomplete/completions.js";
+
+const createCommandIO = (verbose: boolean): CommandIO => ({
+  out: (message: string) => {
+    console.log(message);
+  },
+  err: (message: string) => {
+    console.error(message);
+  },
+  verbose: (message: string) => {
+    if (verbose) console.log(message);
+  },
+});
+
+/**
+ * Main entry point.
+ * We will:
+ * - Initialize the app service?
+ * - Extract the command being called
+ * - Extract CLI Args (Depends on the command being called. Eww. But we can probably use Zod to validate the args in a decent way?)
+ * - Execute the command
+ * - Export if configured?
+ * - Exit with the appropriate code
+ */
+async function main(): Promise<void> {
+  // Initialize the app service
+  // NOTE: We are going to assume that they are using a mnemonic file for now
+  const { args, options } = convertArgsToObject(process.argv.slice(2));
+
+  // Create a verbose logger if the user set the verbose flag
+  const io = createCommandIO(options["verbose"] === "true");
+
+  // Log the parsed app args
+  io.verbose(`Parsed args: ${formatObject(args)}`);
+  io.verbose(`Parsed options: ${formatObject(options)}`);
+
+  // Handle the command
+  const command = args[0];
+  io.verbose(`Command: ${command}`);
+  if (!command) {
+    // TODO: Print help, probably...
+    io.err("No command provided");
+    process.exit(1);
+  }
+
+  // Positional args after the command name (sub-command, files, etc.)
+  const subArgs = args.slice(1);
+
+  // Build paths object from global path functions
+  const paths: CommandPaths = {
+    mnemonicsDir: getMnemonicsDir(),
+    dataDir: getDataDir(),
+    walletConfigPath: getWalletConfigPath(),
+    workingDir: process.cwd(),
+  };
+
+  // Early handling for completions command
+  if (command === "completions") {
+    handleCompletionsCommand(subArgs, options);
+    process.exit(0);
+  }
+
+  if (command === "mnemonic") {
+    try {
+      await handleMnemonicCommand({ io, paths }, subArgs, options);
+      process.exit(0);
+    } catch (error) {
+      if (error instanceof CommandError) {
+        process.exit(error.code);
+      }
+      throw error;
+    }
+  }
+
+  // Resolve mnemonic file: explicit flag > persisted config > error.
+  let mnemonicFile = options["mnemonicFile"];
+  if (!mnemonicFile && existsSync(paths.walletConfigPath)) {
+    mnemonicFile = readFileSync(paths.walletConfigPath, "utf8").trim();
+    io.verbose(`Using persisted wallet: ${mnemonicFile}`);
+  }
+  if (!mnemonicFile) {
+    io.err("No mnemonic file provided");
+    io.out(
+      `You can create a mnemonic file with the following command: xo-cli mnemonic create <mnemonic-seed> or use one of the following files: \n${listGlobalMnemonicFiles().join("\n")}`,
+    );
+    io.out(
+      `\nTip: pass -m <file> once and it will be remembered in ${paths.walletConfigPath}`,
+    );
+    process.exit(1);
+  }
+
+  // Persist the choice so subsequent commands can omit -m.
+  writeFileSync(paths.walletConfigPath, mnemonicFile);
+
+  const mnemonic = loadMnemonic(paths.mnemonicsDir, mnemonicFile);
+  io.verbose(`Loaded mnemonic from file: ${mnemonicFile} ${mnemonic}`);
+
+  // Create an App instance
+  io.verbose("Creating app instance...");
+  const app = await AppService.create(mnemonic, {
+    syncServerUrl: options["syncServerUrl"] ?? "http://localhost:3000",
+    engineConfig: {
+      databasePath: options["databasePath"] ?? paths.dataDir,
+      databaseFilename: options["databaseFilename"] ?? "xo-wallet.db",
+    },
+    invitationStoragePath:
+      options["invitationStoragePath"] ??
+      join(paths.dataDir, "xo-invitations.db"),
+  });
+  io.verbose("App instance created");
+
+  // Start the app
+  // TODO: Rethink this. Do we really want to start the app here? It just slows it down if we dont actually have to have it started for the command
+  io.verbose("Starting app...");
+  await app.start();
+  io.verbose("App started");
+
+  const commandDependencies: CommandDependencies = {
+    io,
+    paths,
+    app,
+  };
+
+  // Handle the command
+  try {
+    let result: unknown;
+    switch (command) {
+      case "template":
+        result = await handleTemplateCommand(
+          commandDependencies,
+          subArgs,
+          options,
+        );
+        break;
+      case "invitation":
+        result = await handleInvitationCommand(
+          commandDependencies,
+          subArgs,
+          options,
+        );
+        break;
+      case "receive":
+        result = await handleReceiveCommand(
+          commandDependencies,
+          subArgs,
+          options,
+        );
+        break;
+      case "resource":
+        result = await handleResourceCommand(
+          commandDependencies,
+          subArgs,
+          options,
+        );
+        break;
+      case "help":
+        result = await handleHelpCommand(commandDependencies, subArgs, options);
+        break;
+      default:
+        io.err(`Unknown command: ${command}`);
+        throw new CommandError(
+          "cli.command.unknown",
+          `Unknown command: ${command}`,
+        );
+    }
+
+    // console.log(result);
+
+    // objectPrint(result);
+    process.exit(0);
+  } catch (error) {
+    if (error instanceof CommandError) {
+      io.err(error.message);
+      process.exit(error.code);
+    }
+    throw error;
+  }
+}
+
+const handleHelpCommand = async (
+  deps: CommandDependencies,
+  _args: string[],
+  _options: Record<string, string>,
+): Promise<Record<string, never>> => {
+  deps.io.out(
+    `${bold("XO-CLI Help:")}
+
+${bold("Usage:")} xo-cli <command> [options]
+
+Commands:
+  mnemonic    ${dim("Manage mnemonic files")}
+  template    ${dim("Manage templates")}
+  invitation  ${dim("Manage invitations")}
+  receive     ${dim("Generate a single-use receiving address")}
+  resource    ${dim("Manage resources")}
+  completions ${dim("Generate shell completion scripts (bash, zsh, fish)")}
+  help        ${dim("Show this help message")}
+
+Options:
+  -h, --help    ${dim("Show this help message")}
+  -m, --mnemonic-file <mnemonic-file>  ${dim("Use a specific mnemonic file")}
+  -v, --verbose   ${dim("Show verbose output")}`,
+  );
+  return {};
+};
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});

src/cli/mnemonic.ts

@@ -0,0 +1,123 @@
+import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { basename, isAbsolute, join, resolve } from "node:path";
+import { encodeBip39Mnemonic, generateBip39Mnemonic } from "@bitauth/libauth";
+
+import { BCHMnemonicURL } from "../utils/bch-mnemonic-url.js";
+import { getMnemonicsDir as getGlobalMnemonicsDir } from "../utils/paths.js";
+
+/**
+ * Create a new mnemonic seed phrase
+ */
+export const createMnemonicSeed = (): string => {
+  return generateBip39Mnemonic();
+};
+
+/**
+ * Creates a mnemonic file from a mnemonic seed
+ * @param mnemonicsDir - Directory to store mnemonic files
+ * @param mnemonic - The mnemonic seed
+ * @param outputFilename - The filename to write the mnemonic to. If not provided, the first word from the mnemonic will be used as the filename
+ * @returns The filename of the created mnemonic file
+ */
+export const createMnemonicFile = (
+  mnemonicsDir: string,
+  mnemonic: string,
+  outputFilename?: string,
+): string => {
+  const mnemonicUrl = BCHMnemonicURL.fromSeed(mnemonic);
+
+  let fileName = outputFilename;
+  if (!fileName) {
+    const firstWord = mnemonic.split(" ")[0]?.toLowerCase();
+    if (!firstWord) {
+      throw new Error(
+        "Failed to create mnemonic file: Unable to extract first word from the mnemonic",
+      );
+    }
+    fileName = `mnemonic-${firstWord}`;
+  }
+
+  const safeName = basename(fileName);
+  const outPath = join(mnemonicsDir, safeName);
+  writeFileSync(outPath, mnemonicUrl.toURL());
+
+  return safeName;
+};
+
+/**
+ * Resolves a mnemonic reference to an absolute path.
+ * Order: absolute path if it exists → path relative to cwd → mnemonicsDir/<basename>.
+ *
+ * @param mnemonicsDir - Directory containing mnemonic files
+ * @param mnemonicRef - Path or basename (e.g. `mnemonic-nuclear`)
+ * @returns Absolute path to the mnemonic file
+ * @throws If no matching file exists
+ */
+export const resolveMnemonicFilePath = (
+  mnemonicsDir: string,
+  mnemonicRef: string,
+): string => {
+  if (isAbsolute(mnemonicRef) && existsSync(mnemonicRef)) {
+    return mnemonicRef;
+  }
+
+  const relativeToCwd = resolve(process.cwd(), mnemonicRef);
+  if (existsSync(relativeToCwd)) {
+    return relativeToCwd;
+  }
+
+  const inMnemonics = join(mnemonicsDir, basename(mnemonicRef));
+  if (existsSync(inMnemonics)) {
+    return inMnemonics;
+  }
+
+  throw new Error(
+    `Mnemonic file not found: ${mnemonicRef}. Run "xo-cli mnemonic list" to see available files.`,
+  );
+};
+
+/**
+ * Loads a mnemonic from a mnemonic file
+ * @param mnemonicsDir - Directory containing mnemonic files
+ * @param mnemonicFile - The filename of the mnemonic file
+ * @returns The mnemonic seed
+ */
+export const loadMnemonic = (
+  mnemonicsDir: string,
+  mnemonicFile: string,
+): string => {
+  const resolvedPath = resolveMnemonicFilePath(mnemonicsDir, mnemonicFile);
+  const mnemonicUrl = BCHMnemonicURL.fromURL(
+    readFileSync(resolvedPath, "utf8"),
+  );
+  const { entropy } = mnemonicUrl.toObject();
+
+  const mnemonic = encodeBip39Mnemonic(entropy);
+
+  if (typeof mnemonic === "string") {
+    throw new Error(`Failed to convert entropy to mnemonic: ${mnemonic}`);
+  }
+
+  return mnemonic.phrase;
+};
+
+/**
+ * Lists mnemonic files in the given directory.
+ * @param mnemonicsDir - Directory containing mnemonic files
+ * @returns Basenames suitable for `-m <name>`
+ */
+export const listMnemonicFiles = (mnemonicsDir: string): string[] => {
+  const filenames = readdirSync(mnemonicsDir).filter((f: string) =>
+    f.startsWith("mnemonic-"),
+  );
+  return filenames;
+};
+
+/**
+ * Lists mnemonic files using the global mnemonics directory.
+ * Convenience function for use in the CLI entry point before paths are resolved.
+ * @returns Basenames suitable for `-m <name>`
+ */
+export const listGlobalMnemonicFiles = (): string[] => {
+  return listMnemonicFiles(getGlobalMnemonicsDir());
+};

src/cli/utils.ts

@@ -0,0 +1,106 @@
+import util from "node:util";
+
+import type { XOTemplate } from "@xo-cash/types";
+import { generateTemplateIdentifier } from "@xo-cash/engine";
+
+import type { CommandDependencies } from "./commands/types.js";
+import { CommandError } from "./commands/types.js";
+
+/**
+ * Iterate through the templates, trying to match the id or the name with the given input.
+ * Use multiple for-loops.
+ * First, check the id of every template
+ * Then, check the name of every template. If multiple names match, throw an error.
+ * If no match is found, throw an error.
+ *
+ * @param deps - The command dependencies.
+ * @param query - The id or name of the template to resolve.
+ * @returns The template object.
+ * @throws CommandError if no template is found.
+ * @throws CommandError if multiple templates are found.
+ */
+export const resolveTemplate = async (
+  deps: CommandDependencies,
+  query: string,
+): Promise<XOTemplate> => {
+  const templates = await deps.app.engine.listImportedTemplates();
+
+  const matches = new Set<XOTemplate>();
+
+  for (const template of templates) {
+    if (generateTemplateIdentifier(template) === query) {
+      return template;
+    }
+  }
+
+  for (const template of templates) {
+    if (template.name === query) {
+      matches.add(template);
+    }
+  }
+
+  if (matches.size > 1) {
+    throw new CommandError(
+      "template.resolve.multiple_matches",
+      `Multiple templates found for "${query}": ${Array.from(matches)
+        .map(
+          (template) =>
+            `${template.name} (${generateTemplateIdentifier(template)})`,
+        )
+        .join(", ")}`,
+    );
+  }
+
+  if (matches.size === 1) {
+    return matches.values().next().value!;
+  }
+
+  throw new CommandError(
+    "template.resolve.not_found",
+    `Template not found: ${query}`,
+  );
+};
+
+/**
+ * Text formatting utilities for the CLI.
+ *
+ * Uses ANSI escape codes to format text.
+ *
+ * AI Generated links:
+ * @see https://en.wikipedia.org/wiki/ANSI_escape_code
+ * @see https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters
+ * @see https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
+ * @see https://en.wikipedia.org/wiki/ANSI_escape_code#Formatting
+ * @see https://en.wikipedia.org/wiki/ANSI_escape_code#Cursor_movement
+ * @see https://en.wikipedia.org/wiki/ANSI_escape_code#Screen_manipulation
+ */
+
+const BOLD = "\x1b[1m";
+export const bold = (text: string) => `${BOLD}${text}${RESET}`;
+
+const DIM = "\x1b[2m";
+export const dim = (text: string) => `${DIM}${text}${RESET}`;
+
+const UNDERLINE = "\x1b[4m";
+export const underline = (text: string) => `${UNDERLINE}${text}${RESET}`;
+
+const INVERSE = "\x1b[7m";
+export const inverse = (text: string) => `${INVERSE}${text}${RESET}`;
+
+const HIDDEN = "\x1b[8m";
+export const hidden = (text: string) => `${HIDDEN}${text}${RESET}`;
+
+const STRIKETHROUGH = "\x1b[9m";
+export const strikethrough = (text: string) =>
+  `${STRIKETHROUGH}${text}${RESET}`;
+
+const RESET = "\x1b[0m";
+export const reset = (text: string) => `${RESET}${text}${RESET}`;
+
+export const formatObject = (obj: unknown) => {
+  return util.inspect(obj, {
+    depth: null,
+    colors: true,
+    compact: false,
+  });
+};

src/index.ts

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /**
  * XO Wallet CLI - Terminal User Interface for XO crypto wallet.
  *
@@ -9,21 +10,28 @@
  * 5. Real-time updates via SSE
  */
 
-import { App } from './app.js';
+import { join } from "node:path";
+
+import { App } from "./app.js";
+import { getDataDir } from "./utils/paths.js";
 
 /**
  * Main entry point.
  */
 async function main(): Promise<void> {
   try {
+    const dataDir = getDataDir();
     // Create and start the application
     await App.create({
-      syncServerUrl: process.env['SYNC_SERVER_URL'] ?? 'http://localhost:3000',
-      databasePath: process.env['DB_PATH'] ?? './',
-      databaseFilename: process.env['DB_FILENAME'] ?? 'xo-wallet.db',
+      syncServerUrl: process.env["SYNC_SERVER_URL"] ?? "http://localhost:3000",
+      databasePath: process.env["DB_PATH"] ?? dataDir,
+      databaseFilename: process.env["DB_FILENAME"] ?? "xo-wallet.db",
+      invitationStoragePath:
+        process.env["INVITATION_STORAGE_PATH"] ??
+        join(dataDir, "xo-invitations.db"),
     });
   } catch (error) {
-    console.error('Failed to start XO Wallet CLI:', error);
+    console.error("Failed to start XO Wallet CLI:", error);
     process.exit(1);
   }
 }

src/services/app.ts

@@ -3,43 +3,66 @@ import {
   type XOEngineOptions,
   // This is temporary. Will likely be moved to where we import templates in the cli. I think that makes more sense as this is a library thing
   generateTemplateIdentifier,
-} from '@xo-cash/engine';
-import type { XOInvitation } from '@xo-cash/types';
+} from "@xo-cash/engine";
+import type { XOInvitation } from "@xo-cash/types";
 
-import { Invitation } from './invitation.js';
-import { Storage } from './storage.js';
-import { SyncServer } from '../utils/sync-server.js';
-import { HistoryService } from './history.js';
+import { Invitation } from "./invitation.js";
+import { BaseStorage, Storage } from "./storage.js";
+import { SyncServer } from "../utils/sync-server.js";
+import { HistoryService } from "./history.js";
+import { type BlockchainService, ElectrumService } from "./electrum.js";
+import { RatesService } from "./rates.js";
 
-import { EventEmitter } from '../utils/event-emitter.js';
+import { EventEmitter } from "../utils/event-emitter.js";
 
 // TODO: Remove this. Exists to hash the seed for database namespace.
-import { createHash } from 'crypto';
-import { p2pkhTemplate } from '@xo-cash/templates';
+import { createHash } from "crypto";
+import { p2pkhTemplate } from "@xo-cash/templates";
+import { hexToBin } from "@bitauth/libauth";
+import { parseTemplate } from "@xo-cash/engine";
 
 export type AppEventMap = {
-  'invitation-added': Invitation;
-  'invitation-removed': Invitation;
-}
+  "invitation-added": Invitation;
+  "invitation-removed": Invitation;
+  "wallet-state-changed": {
+    reason:
+      | "invitation-added"
+      | "invitation-removed"
+      | "invitation-updated"
+      | "invitation-status-changed";
+    invitationIdentifier: string;
+  };
+};
 
 export interface AppConfig {
   syncServerUrl: string;
   engineConfig: XOEngineOptions;
   invitationStoragePath: string;
+  electrumHost?: string;
+  electrumApplicationIdentifier?: string;
 }
 
 export class AppService extends EventEmitter<AppEventMap> {
   public engine: Engine;
-  public storage: Storage;
+  public storage: BaseStorage;
   public config: AppConfig;
   public history: HistoryService;
+  public electrum: BlockchainService;
+  public rates: RatesService;
 
   public invitations: Invitation[] = [];
+  private invitationEventCleanup = new Map<
+    string,
+    {
+      onUpdated: (invitation: XOInvitation) => void;
+      onStatusChanged: (status: string) => void;
+    }
+  >();
 
   static async create(seed: string, config: AppConfig): Promise<AppService> {
     // Because of a bug that lets wallets read the unspents of other wallets, we are going to manually namespace the storage paths for the app.
     // We are going to do this by computing a hash of the seed and prefixing the storage paths with it.
-    const seedHash = createHash('sha256').update(seed).digest('hex');
+    const seedHash = createHash("sha256").update(seed).digest("hex");
 
     // We want to only prefix the file name
     const prefixedStoragePath = `${seedHash.slice(0, 8)}-${config.engineConfig.databaseFilename}`;
@@ -52,40 +75,80 @@ export class AppService extends EventEmitter<AppEventMap> {
 
     // TODO: We *technically* dont want this here, but we also need some initial templates for the wallet, so im doing it here
     // Import the default P2PKH template
-    await engine.importTemplate(p2pkhTemplate);
+    const { templateIdentifier } = await engine.importTemplate(p2pkhTemplate);
+
+    engine
+      .subscribeToLockingBytecodesForTemplate(templateIdentifier)
+      .catch((err) =>
+        console.error(
+          `Error subscribing to locking bytecodes for template ${templateIdentifier}: ${err}`,
+        ),
+      );
+    engine
+      .updateUnspentOutputsForTemplate(templateIdentifier)
+      .catch((err) =>
+        console.error(
+          `Error updating unspent outputs for template ${templateIdentifier}: ${err}`,
+        ),
+      );
 
     // Set default locking parameters for P2PKH
+    // To my knowledge, this doesnt generate any lockscript, so discovery of funds will not work automatically.
+    // TODO: Add discovery for funds in the first index? Or until we return 0 TXs?
     await engine.setDefaultLockingParameters(
-      generateTemplateIdentifier(p2pkhTemplate),
-      'receiveOutput',
-      'receiver',
+      generateTemplateIdentifier(parseTemplate(p2pkhTemplate)),
+      "receiveOutput",
+      "receiver",
     );
 
     // Create our own storage for the invitations
     const storage = await Storage.create(config.invitationStoragePath);
+    const walletStorage = await storage.child(seedHash.slice(0, 8));
 
     // Create the app service
-    return new AppService(engine, storage, config);
+    const electrum = new ElectrumService({
+      host: config.electrumHost,
+      applicationIdentifier: config.electrumApplicationIdentifier,
+    });
+    const rates = await RatesService.create();
+
+    return new AppService(engine, walletStorage, config, electrum, rates);
   }
 
-  constructor(engine: Engine, storage: Storage, config: AppConfig) {
+  constructor(
+    engine: Engine,
+    storage: BaseStorage,
+    config: AppConfig,
+    electrum: BlockchainService,
+    rates: RatesService,
+  ) {
     super();
 
     this.engine = engine;
     this.storage = storage;
     this.config = config;
+    this.electrum = electrum;
+    this.rates = rates;
     this.history = new HistoryService(engine, this.invitations);
   }
 
-  async createInvitation(invitation: XOInvitation | string): Promise<Invitation> {
+  async createInvitation(
+    invitation: XOInvitation | string,
+  ): Promise<Invitation> {
     // Make sure the engine has the template imported
-    const invitationStorage = this.storage.child('invitations')
-    const invitationSyncServer = new SyncServer(this.config.syncServerUrl, typeof invitation === 'string' ? invitation : invitation.invitationIdentifier);
+    const invitationStorage = this.storage.child("invitations");
+    const invitationSyncServer = new SyncServer(
+      this.config.syncServerUrl,
+      typeof invitation === "string"
+        ? invitation
+        : invitation.invitationIdentifier,
+    );
 
     const deps = {
       engine: this.engine,
       syncServer: invitationSyncServer,
       storage: invitationStorage,
+      electrum: this.electrum,
     };
 
     // Create the invitation
@@ -98,30 +161,128 @@ export class AppService extends EventEmitter<AppEventMap> {
   }
 
   async addInvitation(invitation: Invitation): Promise<void> {
+    this.attachInvitationListeners(invitation);
+
     // Add the invitation to the invitations array
     this.invitations.push(invitation);
 
     // Emit the invitation-added event
-    this.emit('invitation-added', invitation);
+    this.emit("invitation-added", invitation);
+    this.emit("wallet-state-changed", {
+      reason: "invitation-added",
+      invitationIdentifier: invitation.data.invitationIdentifier,
+    });
   }
 
   async removeInvitation(invitation: Invitation): Promise<void> {
-    // Remove the invitation from the invitations array
-    this.invitations = this.invitations.filter(i => i !== invitation);
+    const invitationIdentifier = invitation.data.invitationIdentifier;
+    this.detachInvitationListeners(invitationIdentifier);
+
+    // Remove the invitation from the invitations array while preserving the array reference.
+    const invitationIndex = this.invitations.indexOf(invitation);
+    if (invitationIndex >= 0) {
+      this.invitations.splice(invitationIndex, 1);
+    }
 
     // Emit the invitation-removed event
-    this.emit('invitation-removed', invitation);
+    this.emit("invitation-removed", invitation);
+    this.emit("wallet-state-changed", {
+      reason: "invitation-removed",
+      invitationIdentifier,
+    });
+  }
+
+  private attachInvitationListeners(invitation: Invitation): void {
+    const invitationIdentifier = invitation.data.invitationIdentifier;
+    if (this.invitationEventCleanup.has(invitationIdentifier)) return;
+
+    const onUpdated = () => {
+      this.emit("wallet-state-changed", {
+        reason: "invitation-updated",
+        invitationIdentifier,
+      });
+    };
+    const onStatusChanged = () => {
+      this.emit("wallet-state-changed", {
+        reason: "invitation-status-changed",
+        invitationIdentifier,
+      });
+    };
+
+    invitation.on("invitation-updated", onUpdated);
+    invitation.on("invitation-status-changed", onStatusChanged);
+
+    this.invitationEventCleanup.set(invitationIdentifier, {
+      onUpdated,
+      onStatusChanged,
+    });
+  }
+
+  private detachInvitationListeners(invitationIdentifier: string): void {
+    const trackedInvitation = this.invitations.find(
+      (candidate) =>
+        candidate.data.invitationIdentifier === invitationIdentifier,
+    );
+    const cleanup = this.invitationEventCleanup.get(invitationIdentifier);
+    if (!trackedInvitation || !cleanup) return;
+
+    trackedInvitation.off("invitation-updated", cleanup.onUpdated);
+    trackedInvitation.off("invitation-status-changed", cleanup.onStatusChanged);
+    this.invitationEventCleanup.delete(invitationIdentifier);
+  }
+
+  /**
+   * Unreserves all reserved UTXOs across every invitation.
+   * Useful when stale reservations from previous sessions block spending.
+   *
+   * @returns The number of UTXOs that were unreserved.
+   */
+  async unreserveAllResources(): Promise<number> {
+    const allUnspentOutputs = await this.engine.listUnspentOutputsData();
+    const reserved = allUnspentOutputs.filter((o) => o.reservedBy);
+
+    // Group by invitation identifier so the engine can clear them properly.
+    const byInvitation = new Map<string, typeof reserved>();
+    for (const output of reserved) {
+      const existing = byInvitation.get(output.reservedBy!) ?? [];
+      existing.push(output);
+      byInvitation.set(output.reservedBy!, existing);
+    }
+
+    for (const [invitationIdentifier, outputs] of byInvitation) {
+      await this.engine.unreserveResources(
+        outputs.map((o) => ({
+          outpointTransactionHash: hexToBin(o.outpointTransactionHash),
+          outpointIndex: o.outpointIndex,
+        })),
+        invitationIdentifier,
+      );
+    }
+
+    return reserved.length;
   }
 
   async start(): Promise<void> {
+    // Start rates in the background so BCH -> fiat conversions become reactive in the TUI.
+    this.rates.start().catch((err) =>
+      console.error('Error starting rates service:', err),
+    );
+
     // Get the invitations db
-    const invitationsDb = this.storage.child('invitations');
+    const invitationsDb = this.storage.child("invitations");
 
     // Load invitations from storage
-    const invitations = await invitationsDb.all() as { key: string; value: XOInvitation }[];
+    const invitations = (await invitationsDb.all()) as {
+      key: string;
+      value: XOInvitation;
+    }[];
 
-    await Promise.all(invitations.map(async ({ key }) => {
-      await this.createInvitation(key);
-    }));
+    await Promise.all(
+      invitations.map(async ({ key }) => {
+        await this.createInvitation(key).catch((err) =>
+          console.error(`Error creating invitation ${key}: ${err}`),
+        );
+      }),
+    );
   }
 }

src/services/electrum.ts

@@ -0,0 +1,57 @@
+import {
+  fetchTransactionBlockHeight,
+  initializeElectrumClient,
+} from "@electrum-cash/protocol";
+
+export interface ElectrumServiceConfig {
+  host?: string;
+  applicationIdentifier?: string;
+}
+
+export abstract class BlockchainService {
+  abstract hasSeenTransaction(transactionHash: string): Promise<boolean>;
+}
+
+/**
+ * Small Electrum adapter used by CLI services.
+ * Keeps connection logic in one place and exposes a tiny API.
+ */
+export class ElectrumService {
+  private readonly host: string;
+  private readonly applicationIdentifier: string;
+  private clientPromise?: ReturnType<typeof initializeElectrumClient>;
+
+  constructor(config: ElectrumServiceConfig = {}) {
+    this.host =
+      config.host ?? process.env["ELECTRUM_HOST"] ?? "bch.imaginary.cash";
+    this.applicationIdentifier = "xo-cli";
+  }
+
+  private async getClient() {
+    if (!this.clientPromise) {
+      this.clientPromise = initializeElectrumClient(
+        this.applicationIdentifier,
+        this.host,
+      );
+    }
+
+    return this.clientPromise;
+  }
+
+  /**
+   * Returns true when the transaction is known by Electrum
+   * (confirmed or currently in mempool).
+   */
+  async hasSeenTransaction(transactionHash: string): Promise<boolean> {
+    try {
+      const client = await this.getClient();
+      const height = await fetchTransactionBlockHeight(client, transactionHash);
+
+      // Electrum returns numbers for known transactions
+      // (e.g. >0 confirmed, 0/-1 unconfirmed variants).
+      return typeof height === "number";
+    } catch {
+      return false;
+    }
+  }
+}

src/services/history.ts

@@ -1,252 +1,692 @@
-/**
- * History Service - Derives wallet history from invitations and UTXOs.
- * 
- * Provides a unified view of wallet activity including:
- * - UTXO reservations (from invitation commits that reference our UTXOs as inputs)
- * - UTXOs we own (with descriptions derived from template outputs)
- */
+import { binToHex } from "@bitauth/libauth";
+import {
+  compileCashAssemblyString,
+  type Engine,
+  listInvitationCommitsByEntity,
+} from "@xo-cash/engine";
+import type { UnspentOutputData } from "@xo-cash/state";
+import type {
+  XOInvitation,
+  XOInvitationCommit,
+  XOInvitationVariableValue,
+  XOTemplate,
+} from "@xo-cash/types";
+import type { Invitation } from "./invitation.js";
 
-import type { Engine } from '@xo-cash/engine';
-import type { XOInvitation, XOTemplate } from '@xo-cash/types';
-import type { UnspentOutputData } from '@xo-cash/state';
-import type { Invitation } from './invitation.js';
-import { binToHex } from '@bitauth/libauth';
+export type HistoryEntryKind = "invitation" | "utxo";
 
-/**
- * Types of history events.
- */
-export type HistoryItemType = 
-  | 'utxo_received'
-  | 'utxo_reserved'
-  | 'invitation_created';
-
-/**
- * A single item in the wallet history.
- */
-export interface HistoryItem {
-  /** Unique identifier for this history item. */
-  id: string;
-  
-  /** Unix timestamp of when the event occurred (if available). */
-  timestamp?: number;
-  
-  /** The type of history event. */
-  type: HistoryItemType;
-  
-  /** Human-readable description derived from the template. */
+export interface HistoryDescriptionParts {
+  template: string;
+  role: string;
+  outputIdentifier: string;
   description: string;
+  valueSatoshis?: number;
+}
 
-  /** The value in satoshis (for UTXO-related events). */
-  valueSatoshis?: bigint;
-  
-  /** The invitation identifier this event relates to (if applicable). */
+export interface HistoryUtxoItem {
+  kind: "utxo";
+  id: string;
   invitationIdentifier?: string;
-  
-  /** The template identifier for reference. */
-  templateIdentifier?: string;
-  
-  /** The UTXO outpoint (for UTXO-related events). */
-  outpoint?: {
+  templateIdentifier: string;
+  outputIdentifier: string;
+  outpoint: {
     txid: string;
     index: number;
   };
-  
-  /** Whether this UTXO is reserved. */
+  valueSatoshis?: bigint;
   reserved?: boolean;
+  direction: "input" | "output" | "standalone";
+  description: string;
+  descriptionParts: HistoryDescriptionParts;
+}
+
+export interface HistoryInvitationItem {
+  kind: "invitation";
+  id: string;
+  createdAtTimestamp: number;
+  templateIdentifier: string;
+  invitationIdentifier: string;
+  roles: string[];
+  description: string;
+  descriptionParts: {
+    template: string;
+    roles: string[];
+    description: string;
+  };
+  inputs: HistoryUtxoItem[];
+  outputs: HistoryUtxoItem[];
+}
+
+export type HistoryItem = HistoryInvitationItem | HistoryUtxoItem;
+
+interface InvitationContext {
+  invitation: Invitation;
+  template: XOTemplate | null;
+  variables: Record<string, XOInvitationVariableValue>;
+  walletCommits: XOInvitationCommit[];
+  walletEntityIdentifier?: string;
+}
+
+interface UtxoOriginContext {
+  invitationIdentifier: string;
+  roleIdentifier?: string;
 }
 
-/**
- * Service for deriving wallet history from invitations and UTXOs.
- * 
- * This service takes the engine and invitations array as dependencies
- * and derives history events from them. Since invitations is passed
- * by reference, getHistory() always sees the current data.
- */
 export class HistoryService {
-  /**
-   * Creates a new HistoryService.
-   * 
-   * @param engine - The XO engine instance for querying UTXOs and templates.
-   * @param invitations - The array of invitations to derive history from.
-   */
   constructor(
     private engine: Engine,
-    private invitations: Invitation[]
+    private invitations: Invitation[],
   ) {}
 
-  /**
-   * Gets the wallet history derived from invitations and UTXOs.
-   * 
-   * @returns Array of history items sorted by timestamp (newest first), then UTXOs without timestamps.
-   */
-  async getHistory(): Promise<HistoryItem[]> {
-    const items: HistoryItem[] = [];
-    
-    // 1. Get all our UTXOs
-    const allUtxos = await this.engine.listUnspentOutputsData();
-    
-    // Create a map for quick UTXO lookup by outpoint
-    const utxoMap = new Map<string, UnspentOutputData>();
-    for (const utxo of allUtxos) {
-      const key = `${utxo.outpointTransactionHash}:${utxo.outpointIndex}`;
-      utxoMap.set(key, utxo);
+  extractEntities(invitation: XOInvitation): Record<string, XOInvitationCommit[]> {
+    return listInvitationCommitsByEntity(invitation);
   }
 
-    // 2. Process invitations to find UTXO reservations from commits
+  // Entities are currently static per invitation. So, we can try to match the roles to entities by:
+  // Iterating through each commit, extract the entity into a Map<entityId: string, roles: string[]>.
+  // While we iterate through the commits, if we see a role declaration in the commit, we save that role onto the entity's roles array.
+  // After we have iterated through all the commits, we can return the Map<entityId: string, roles: string[]>.
+  async matchRolesToEntities(
+    invitation: XOInvitation,
+    entities: string[],
+  ): Promise<Record<string, string[]>> {
+    const entitiesMap = new Map<string, Set<string>>();
+    for (const entity of entities) {
+      entitiesMap.set(entity, new Set());
+    }
+
+    // First pass, we are just going to try and find roleIdentifer values in the inputs, outputs, and variables.
+    // TODO: Update this once the invitations use XPubs
+    for (const commit of invitation.commits) {
+      const entity = commit.entityIdentifier;
+      const roles = entitiesMap.get(entity) ?? new Set();
+
+      for (const input of commit.data.inputs ?? []) {
+        if (input.roleIdentifier) roles.add(input.roleIdentifier);
+      }
+      for (const output of commit.data.outputs ?? []) {
+        if (output.roleIdentifier) roles.add(output.roleIdentifier);
+      }
+      for (const variable of commit.data.variables ?? []) {
+        if (variable.roleIdentifier) roles.add(variable.roleIdentifier);
+      }
+    }
+
+    // TODO: We might be able to use the lockingBytecodes that we have generated to infer which role we are. But the templates dont tell us which role is responsible for a particular output.
+    // I.e, if we dont know what role an output was from, we cant match it using the lockingBytecode to a role.
+    // Example: 2 inputs to a TX for the same amount. We dont know whether we would be Sender1 or Sender2.
+    // So, for now we are just going to rely on the roleIdentifiers that we have found in the first pass.
+
+    // Format into a record for easier access.
+    const entitiesRecord: Record<string, string[]> = {};
+    for (const [entity, roles] of entitiesMap.entries()) {
+      entitiesRecord[entity] = Array.from(roles);
+    }
+
+    return entitiesRecord;
+  }
+
+  async getHistory(): Promise<HistoryItem[]> {
+    const allUtxos = await this.engine.listUnspentOutputsData();
+    const invitationByOrigin = new Map<string, UtxoOriginContext>();
+    const outpointValueSatoshis = new Map<string, bigint>();
+
+    for (const utxo of allUtxos) {
+      const outpointKey = this.getOutpointKey(
+        utxo.outpointTransactionHash,
+        utxo.outpointIndex,
+      );
+      outpointValueSatoshis.set(outpointKey, BigInt(utxo.valueSatoshis));
+    }
+
+    const contexts = new Map<string, InvitationContext>();
     for (const invitation of this.invitations) {
-      const invData = invitation.data;
-      
-      // Add invitation created event
-      const template = await this.engine.getTemplate(invData.templateIdentifier);
-      const invDescription = template 
-        ? this.deriveInvitationDescription(invData, template) 
-        : 'Unknown action';
-      
-      items.push({
-        id: `inv-${invData.invitationIdentifier}`,
-        timestamp: invData.createdAtTimestamp,
-        type: 'invitation_created',
-        description: invDescription,
-        invitationIdentifier: invData.invitationIdentifier,
-        templateIdentifier: invData.templateIdentifier,
+      const variables = this.extractInvitationVariables(invitation.data);
+      const template =
+        (await this.engine.getTemplate(invitation.data.templateIdentifier)) ??
+        null;
+      const walletCommits = await this.getWalletCommitsForInvitation(
+        invitation.data,
+      );
+      const walletEntityIdentifier = walletCommits[0]?.entityIdentifier;
+      contexts.set(invitation.data.invitationIdentifier, {
+        invitation,
+        template,
+        variables,
+        walletCommits,
+        walletEntityIdentifier,
       });
+      this.indexInvitationOutputsByUtxoOrigin(invitationByOrigin, invitation);
 
-      // Check each commit for inputs that reference our UTXOs
-      for (const commit of invData.commits) {
-        const commitInputs = commit.data.inputs ?? [];
+      // TODO: Remove or use this. Its a test for extracting the roles to entities.
+      // const entities = await this.extractEntities(invitation.data);
+      // const entitiesRecord = await this.matchRolesToEntities(invitation.data, entities);
+      // console.log(entitiesRecord);
+    }
 
-        for (const input of commitInputs) {
-          // Input's outpointTransactionHash could be Uint8Array or string
+    const usedUtxoIds = new Set<string>();
+    const invitationItems: HistoryInvitationItem[] = [];
+
+    for (const context of contexts.values()) {
+      const invitation = context.invitation.data;
+      const templateName = context.template?.name ?? "UnknownTemplate";
+      const invitationOutputs = this.buildWalletOutputItemsForInvitation(
+        context,
+        allUtxos,
+        invitationByOrigin,
+        usedUtxoIds,
+      );
+      const roles = this.deriveWalletRolesForInvitation(
+        context,
+        invitationOutputs,
+      );
+      const invitationInputs = this.buildWalletInputItemsForInvitation(
+        context,
+        roles[0],
+        outpointValueSatoshis,
+      );
+      const invitationDescription = this.deriveInvitationDescription(
+        invitation,
+        context.template,
+        context.variables,
+        roles[0],
+      );
+
+      invitationItems.push({
+        kind: "invitation",
+        id: `inv-${invitation.invitationIdentifier}`,
+        createdAtTimestamp: invitation.createdAtTimestamp,
+        templateIdentifier: invitation.templateIdentifier,
+        invitationIdentifier: invitation.invitationIdentifier,
+        roles,
+        description: invitationDescription,
+        descriptionParts: {
+          template: templateName,
+          roles,
+          description: invitationDescription,
+        },
+        inputs: invitationInputs,
+        outputs: invitationOutputs,
+      });
+    }
+
+    invitationItems.sort((a, b) => b.createdAtTimestamp - a.createdAtTimestamp);
+
+    const standaloneUtxos: HistoryUtxoItem[] = [];
+    for (const utxo of allUtxos) {
+      const utxoId = this.getUtxoId(utxo);
+      if (usedUtxoIds.has(utxoId)) continue;
+
+      const template =
+        (await this.engine.getTemplate(utxo.templateIdentifier)) ?? null;
+      const inferredRole = this.inferRoleFromOutputIdentifier(
+        utxo.outputIdentifier,
+      );
+      const description = this.deriveUtxoDescription(
+        utxo,
+        template,
+        {},
+        inferredRole,
+      );
+      standaloneUtxos.push(
+        this.buildUtxoHistoryItem(
+          utxo,
+          description,
+          template?.name ?? "UnknownTemplate",
+          inferredRole,
+          "standalone",
+        ),
+      );
+    }
+
+    return [...invitationItems, ...standaloneUtxos];
+  }
+
+  private buildWalletOutputItemsForInvitation(
+    context: InvitationContext,
+    allUtxos: UnspentOutputData[],
+    invitationByOrigin: Map<string, UtxoOriginContext>,
+    usedUtxoIds: Set<string>,
+  ): HistoryUtxoItem[] {
+    const invitationId = context.invitation.data.invitationIdentifier;
+    const outputs: HistoryUtxoItem[] = [];
+
+    for (const utxo of allUtxos) {
+      const resolvedInvitationId = this.resolveInvitationIdentifierForUtxo(
+        utxo,
+        invitationByOrigin,
+      );
+      if (resolvedInvitationId !== invitationId) continue;
+
+      const role =
+        this.resolveRoleIdentifierForUtxo(utxo, invitationByOrigin) ??
+        this.inferRoleFromOutputIdentifier(utxo.outputIdentifier) ??
+        "receiver";
+      const description = this.deriveUtxoDescription(
+        utxo,
+        context.template,
+        context.variables,
+        role,
+      );
+      outputs.push(
+        this.buildUtxoHistoryItem(
+          utxo,
+          description,
+          context.template?.name ?? "UnknownTemplate",
+          role,
+          "output",
+        ),
+      );
+      usedUtxoIds.add(this.getUtxoId(utxo));
+    }
+
+    return outputs;
+  }
+
+  private async getWalletCommitsForInvitation(
+    invitation: XOInvitation,
+  ): Promise<XOInvitationCommit[]> {
+    try {
+      return await this.engine.getOwnCommits(invitation);
+    } catch {
+      return [];
+    }
+  }
+
+  private buildWalletInputItemsForInvitation(
+    context: InvitationContext,
+    walletRole?: string,
+    outpointValueSatoshis: Map<string, bigint> = new Map(),
+  ): HistoryUtxoItem[] {
+    const invitation = context.invitation.data;
+    const relevantCommits = context.walletCommits.filter(
+      (commit) => (commit.data.inputs?.length ?? 0) > 0,
+    );
+    const txDescription = this.deriveTransactionActivityDescription(
+      invitation,
+      context.template,
+      context.variables,
+      walletRole,
+    );
+
+    const inputs: HistoryUtxoItem[] = [];
+    for (const commit of relevantCommits) {
+      for (const input of commit.data.inputs ?? []) {
         const txHash = input.outpointTransactionHash
-            ? (input.outpointTransactionHash instanceof Uint8Array 
+          ? input.outpointTransactionHash instanceof Uint8Array
             ? binToHex(input.outpointTransactionHash)
-                : String(input.outpointTransactionHash))
-            : undefined;
+            : String(input.outpointTransactionHash)
+          : "unknown-tx";
+        const inputIndex = input.outpointIndex ?? -1;
+        const inputIdentifier = input.inputIdentifier ?? "input";
+        const inputDescription = this.deriveInputDescription(
+          inputIdentifier,
+          context.template,
+          context.variables,
+        );
+        const templateName = context.template?.name ?? "UnknownTemplate";
+        const role =
+          this.deriveCommitRoleIdentifier(commit, invitation, context.template) ??
+          walletRole ??
+          "sender";
+        const inputValue = this.resolveInputSatoshis(
+          txHash,
+          inputIndex,
+          outpointValueSatoshis,
+          context.variables,
+        );
 
-          if (!txHash || input.outpointIndex === undefined) continue;
-          
-          const utxoKey = `${txHash}:${input.outpointIndex}`;
-          const matchingUtxo = utxoMap.get(utxoKey);
-          
-          // If this input references one of our UTXOs, it's a reservation event
-          if (matchingUtxo) {
-            const utxoTemplate = await this.engine.getTemplate(matchingUtxo.templateIdentifier);
-            const utxoDescription = utxoTemplate 
-              ? this.deriveUtxoDescription(matchingUtxo, utxoTemplate)
-              : 'Unknown UTXO';
-            
-            items.push({
-              id: `reserved-${commit.commitIdentifier}-${utxoKey}`,
-              timestamp: invData.createdAtTimestamp, // Use invitation timestamp as proxy
-              type: 'utxo_reserved',
-              description: `Reserved for: ${invDescription}`,
-              valueSatoshis: BigInt(matchingUtxo.valueSatoshis),
-              invitationIdentifier: invData.invitationIdentifier,
-              templateIdentifier: matchingUtxo.templateIdentifier,
+        inputs.push({
+          kind: "utxo",
+          id: `input-${invitation.invitationIdentifier}-${commit.commitIdentifier}-${txHash}:${inputIndex}-${inputIdentifier}`,
+          invitationIdentifier: invitation.invitationIdentifier,
+          templateIdentifier: invitation.templateIdentifier,
+          outputIdentifier: inputIdentifier,
           outpoint: {
             txid: txHash,
-                index: input.outpointIndex,
+            index: inputIndex,
+          },
+          direction: "input",
+          valueSatoshis: inputValue,
+          description: `${txDescription} - ${inputDescription}`,
+          descriptionParts: {
+            template: templateName,
+            role,
+            outputIdentifier: inputIdentifier,
+            description: `${txDescription} - ${inputDescription}`,
+            valueSatoshis:
+              inputValue !== undefined ? Number(inputValue) : undefined,
           },
-              reserved: true,
         });
       }
     }
-      }
+
+    return inputs;
   }
 
-    // 3. Add all UTXOs as "received" events (without timestamps)
-    for (const utxo of allUtxos) {
-      const template = await this.engine.getTemplate(utxo.templateIdentifier);
-      const description = template 
-        ? this.deriveUtxoDescription(utxo, template)
-        : 'Unknown output';
-      
-      items.push({
-        id: `utxo-${utxo.outpointTransactionHash}:${utxo.outpointIndex}`,
-        // No timestamp available for UTXOs
-        type: 'utxo_received',
-        description,
-        valueSatoshis: BigInt(utxo.valueSatoshis),
+  private buildUtxoHistoryItem(
+    utxo: UnspentOutputData,
+    description: string,
+    templateName: string,
+    roleIdentifier: string | undefined,
+    direction: HistoryUtxoItem["direction"],
+  ): HistoryUtxoItem {
+    return {
+      kind: "utxo",
+      id: this.getUtxoId(utxo),
+      invitationIdentifier: utxo.reservedBy || undefined,
       templateIdentifier: utxo.templateIdentifier,
+      outputIdentifier: utxo.outputIdentifier,
       outpoint: {
         txid: utxo.outpointTransactionHash,
         index: utxo.outpointIndex,
       },
-        reserved: utxo.reserved,
-        invitationIdentifier: utxo.invitationIdentifier || undefined,
+      valueSatoshis: BigInt(utxo.valueSatoshis),
+      reserved: utxo.reservedBy ? true : false,
+      direction,
+      description,
+      descriptionParts: {
+        template: templateName,
+        role: roleIdentifier ?? "unknown",
+        outputIdentifier: utxo.outputIdentifier,
+        description,
+        valueSatoshis: utxo.valueSatoshis,
+      },
+    };
+  }
+
+  private deriveWalletRolesForInvitation(
+    context: InvitationContext,
+    outputs: HistoryUtxoItem[],
+  ): string[] {
+    const roles = new Set<string>();
+    for (const output of outputs) {
+      const outputRole = output.descriptionParts.role;
+      if (outputRole && outputRole !== "unknown") {
+        roles.add(outputRole);
+      }
+    }
+    if (roles.size === 0 && outputs.length > 0) {
+      roles.add("receiver");
+    }
+
+    for (const commit of context.walletCommits) {
+      const role = this.deriveCommitRoleIdentifier(
+        commit,
+        context.invitation.data,
+        context.template,
+      );
+      if (role) roles.add(role);
+    }
+
+    const hasInputCommit = context.walletCommits.some(
+      (c) => (c.data.inputs?.length ?? 0) > 0,
+    );
+    if (hasInputCommit) roles.add("sender");
+
+    return roles.size > 0 ? Array.from(roles) : ["unknown"];
+  }
+
+  private extractInvitationVariables(
+    invitation: XOInvitation,
+  ): Record<string, XOInvitationVariableValue> {
+    const committedVariables = invitation.commits.flatMap(
+      (c) => c.data.variables ?? [],
+    );
+    return committedVariables.reduce(
+      (acc, variable) => {
+        if (!variable.variableIdentifier) return acc;
+        acc[variable.variableIdentifier] = variable.value;
+        return acc;
+      },
+      {} as Record<string, XOInvitationVariableValue>,
+    );
+  }
+
+  private indexInvitationOutputsByUtxoOrigin(
+    invitationByUtxoOrigin: Map<string, UtxoOriginContext>,
+    invitation: Invitation,
+  ): void {
+    for (const commit of invitation.data.commits) {
+      for (const output of commit.data.outputs ?? []) {
+        if (!output.outputIdentifier || !output.lockingBytecode) continue;
+        const lockingBytecodeHex = this.toLockingBytecodeHex(
+          output.lockingBytecode,
+        );
+        const key = this.getUtxoOriginKey(
+          invitation.data.templateIdentifier,
+          output.outputIdentifier,
+          lockingBytecodeHex,
+        );
+        invitationByUtxoOrigin.set(key, {
+          invitationIdentifier: invitation.data.invitationIdentifier,
+          roleIdentifier: output.roleIdentifier,
         });
       }
-    
-    // Sort: items with timestamps first (newest first), then items without timestamps
-    return items.sort((a, b) => {
-      // Both have timestamps: sort by timestamp descending
-      if (a.timestamp !== undefined && b.timestamp !== undefined) {
-        return b.timestamp - a.timestamp;
     }
-      // Only a has timestamp: a comes first
-      if (a.timestamp !== undefined) return -1;
-      // Only b has timestamp: b comes first
-      if (b.timestamp !== undefined) return 1;
-      // Neither has timestamp: maintain order
-      return 0;
-    });
   }
 
-  /**
-   * Derives a human-readable description for a UTXO from its template output definition.
-   * 
-   * @param utxo - The UTXO data.
-   * @param template - The template definition.
-   * @returns Human-readable description string.
-   */
-  private deriveUtxoDescription(utxo: UnspentOutputData, template: XOTemplate): string {
-    const outputDef = template.outputs?.[utxo.outputIdentifier];
-    
-    if (!outputDef) {
-      return `${utxo.outputIdentifier} output`;
+  private resolveInvitationIdentifierForUtxo(
+    utxo: UnspentOutputData,
+    invitationByUtxoOrigin: Map<string, UtxoOriginContext>,
+  ): string | undefined {
+    if (utxo.reservedBy) return utxo.reservedBy;
+    const originKey = this.getUtxoOriginKey(
+      utxo.templateIdentifier,
+      utxo.outputIdentifier,
+      utxo.scriptHash,
+    );
+    return invitationByUtxoOrigin.get(originKey)?.invitationIdentifier;
   }
 
-    // Start with the output name or identifier
-    let description = outputDef.name || utxo.outputIdentifier;
-    
-    // If there's a description, parse it and replace variable placeholders
-    if (outputDef.description) {
-      description = outputDef.description
-        // Replace <variableName> placeholders (we don't have variable values here, so just clean up)
-        .replace(/<([^>]+)>/g, (_, varId) => varId)
-        // Remove $() wrappers
-        .replace(/\$\(([^)]+)\)/g, '$1');
+  private resolveRoleIdentifierForUtxo(
+    utxo: UnspentOutputData,
+    invitationByUtxoOrigin: Map<string, UtxoOriginContext>,
+  ): string | undefined {
+    const originKey = this.getUtxoOriginKey(
+      utxo.templateIdentifier,
+      utxo.outputIdentifier,
+      utxo.scriptHash,
+    );
+    return invitationByUtxoOrigin.get(originKey)?.roleIdentifier;
   }
 
-    return description;
+  private deriveUtxoDescription(
+    utxo: UnspentOutputData,
+    template: XOTemplate | null,
+    variables: Record<string, XOInvitationVariableValue>,
+    roleIdentifier?: string,
+  ): string {
+    const templateName = template?.name ?? "UnknownTemplate";
+    const role = roleIdentifier ?? "unknown";
+    const outputDef = template?.outputs?.[utxo.outputIdentifier];
+    let detail = outputDef?.name ?? utxo.outputIdentifier;
+    if (outputDef?.description) {
+      try {
+        detail = compileCashAssemblyString(outputDef.description, variables);
+      } catch {
+        detail = this.interpolateSimpleCashAssemblyVariables(
+          outputDef.description,
+          variables,
+        );
+      }
+    }
+    return `[${templateName}:${role}] ${detail}`;
   }
 
-  /**
-   * Derives a human-readable description from an invitation and its template.
-   * Parses the transaction description and replaces variable placeholders.
-   * 
-   * @param invitation - The invitation data.
-   * @param template - The template definition.
-   * @returns Human-readable description string.
-   */
-  private deriveInvitationDescription(invitation: XOInvitation, template: XOTemplate): string {
+  private deriveInvitationDescription(
+    invitation: XOInvitation,
+    template: XOTemplate | null,
+    variables: Record<string, XOInvitationVariableValue>,
+    roleIdentifier?: string,
+  ): string {
+    if (!template) return invitation.actionIdentifier;
     const action = template.actions?.[invitation.actionIdentifier];
     const transactionName = action?.transaction;
-    const transaction = transactionName ? template.transactions?.[transactionName] : null;
-    
-    if (!transaction?.description) {
-      return action?.name ?? invitation.actionIdentifier;
+    const transaction = transactionName
+      ? template.transactions?.[transactionName]
+      : null;
+    const role = roleIdentifier ?? "unknown";
+    const baseTemplate =
+      transaction?.description ??
+      action?.description ??
+      action?.name ??
+      invitation.actionIdentifier;
+    let detail = baseTemplate;
+    try {
+      detail = compileCashAssemblyString(baseTemplate, variables);
+    } catch {
+      detail = this.interpolateSimpleCashAssemblyVariables(
+        baseTemplate,
+        variables,
+      );
+    }
+    return `[${template.name}:${role}] ${detail}`;
   }
 
-    const committedVariables = invitation.commits.flatMap(c => c.data.variables ?? []);
+  private deriveInputDescription(
+    inputIdentifier: string,
+    template: XOTemplate | null,
+    variables: Record<string, XOInvitationVariableValue>,
+  ): string {
+    if (inputIdentifier === "input") return "Funding input";
+    const inputDef = template?.inputs?.[inputIdentifier];
+    if (!inputDef) return inputIdentifier;
+    if (!inputDef.description) return inputDef.name ?? inputIdentifier;
+    try {
+      return compileCashAssemblyString(inputDef.description, variables);
+    } catch {
+      return this.interpolateSimpleCashAssemblyVariables(
+        inputDef.description,
+        variables,
+      );
+    }
+  }
 
-    return transaction.description
-      // Replace <variableName> with actual values
-      .replace(/<([^>]+)>/g, (match, varId) => {
-        const variable = committedVariables.find(v => v.variableIdentifier === varId);
-        return variable ? String(variable.value) : match;
-      })
-      // Remove the $() wrapper around variable expressions
-      .replace(/\$\(([^)]+)\)/g, '$1');
+  private deriveTransactionActivityDescription(
+    invitation: XOInvitation,
+    template: XOTemplate | null,
+    variables: Record<string, XOInvitationVariableValue>,
+    roleIdentifier?: string,
+  ): string {
+    if (!template) return invitation.actionIdentifier;
+    const action = template.actions?.[invitation.actionIdentifier];
+    const transactionName = action?.transaction;
+    const transaction = transactionName
+      ? template.transactions?.[transactionName]
+      : null;
+    const roleData = roleIdentifier
+      ? transaction?.roles?.[roleIdentifier]
+      : undefined;
+    const descriptionTemplate =
+      roleData?.description ??
+      transaction?.description ??
+      roleData?.name ??
+      transaction?.name ??
+      action?.name ??
+      invitation.actionIdentifier;
+    try {
+      return compileCashAssemblyString(descriptionTemplate, variables);
+    } catch {
+      return this.interpolateSimpleCashAssemblyVariables(
+        descriptionTemplate,
+        variables,
+      );
+    }
+  }
+
+  private deriveCommitRoleIdentifier(
+    commit: XOInvitationCommit,
+    invitation: XOInvitation,
+    template: XOTemplate | null,
+  ): string | undefined {
+    const explicitRoles = new Set<string>();
+    for (const input of commit.data.inputs ?? []) {
+      if (input.roleIdentifier) explicitRoles.add(input.roleIdentifier);
+    }
+    for (const output of commit.data.outputs ?? []) {
+      if (output.roleIdentifier) explicitRoles.add(output.roleIdentifier);
+    }
+    for (const variable of commit.data.variables ?? []) {
+      if (variable.roleIdentifier) explicitRoles.add(variable.roleIdentifier);
+    }
+    if (explicitRoles.size === 1) return Array.from(explicitRoles)[0];
+
+    const action = template?.actions?.[invitation.actionIdentifier];
+    if ((commit.data.inputs?.length ?? 0) > 0 && action?.roles?.sender)
+      return "sender";
+    if ((commit.data.variables?.length ?? 0) > 0 && action?.roles?.receiver)
+      return "receiver";
+    return undefined;
+  }
+
+  private inferRoleFromOutputIdentifier(
+    outputIdentifier: string,
+  ): string | undefined {
+    const normalized = outputIdentifier.toLowerCase();
+    if (normalized.includes("receive") || normalized.includes("request"))
+      return "receiver";
+    if (normalized.includes("change") || normalized.includes("send"))
+      return "sender";
+    return undefined;
+  }
+
+  private resolveInputSatoshis(
+    txHash: string,
+    index: number,
+    outpointValueSatoshis: Map<string, bigint>,
+    variables: Record<string, XOInvitationVariableValue>,
+  ): bigint | undefined {
+    const outpointKey = this.getOutpointKey(txHash, index);
+    const matchedValue = outpointValueSatoshis.get(outpointKey);
+    if (matchedValue !== undefined) return matchedValue;
+
+    const requestedSatoshis = variables.requestedSatoshis;
+    if (requestedSatoshis !== undefined) {
+      try {
+        return BigInt(String(requestedSatoshis));
+      } catch {
+        return undefined;
+      }
+    }
+
+    return undefined;
+  }
+
+  private getUtxoId(utxo: UnspentOutputData): string {
+    return `utxo-${utxo.outpointTransactionHash}:${utxo.outpointIndex}`;
+  }
+
+  private getOutpointKey(txid: string, index: number): string {
+    return `${txid}:${index}`;
+  }
+
+  private getUtxoOriginKey(
+    templateIdentifier: string,
+    outputIdentifier: string,
+    lockingBytecodeHex: string,
+  ): string {
+    return `${templateIdentifier}:${outputIdentifier}:${lockingBytecodeHex}`;
+  }
+
+  private toLockingBytecodeHex(lockingBytecode: string | Uint8Array): string {
+    if (typeof lockingBytecode === "string") return lockingBytecode;
+    return binToHex(lockingBytecode);
+  }
+
+  private interpolateSimpleCashAssemblyVariables(
+    text: string,
+    variables: Record<string, XOInvitationVariableValue>,
+  ): string {
+    return text.replace(
+      /\$\(<([^>]+)>\)/g,
+      (match, variableIdentifier: string) => {
+        if (
+          !Object.prototype.hasOwnProperty.call(variables, variableIdentifier)
+        )
+          return match;
+        return String(variables[variableIdentifier]);
+      },
+    );
   }
 }

src/services/invitation.ts

@@ -1,60 +1,95 @@
-import type { AcceptInvitationParameters, AppendInvitationParameters, Engine, FindSuitableResourcesParameters } from '@xo-cash/engine';
-import { hasInvitationExpired } from '@xo-cash/engine';
-import type { XOInvitation, XOInvitationCommit, XOInvitationInput, XOInvitationOutput, XOInvitationVariable } from '@xo-cash/types';
-import type { UnspentOutputData } from '@xo-cash/state';
+import type {
+  AcceptInvitationParameters,
+  AppendInvitationParameters,
+  Engine,
+  GetSpendableResourcesParameters,
+} from "@xo-cash/engine";
+import { hasInvitationExpired, mergeInvitationCommits } from "@xo-cash/engine";
+import type {
+  XOInvitation,
+  XOInvitationCommit,
+  XOInvitationInput,
+  XOInvitationOutput,
+  XOInvitationVariable,
+  XOInvitationVariableValue,
+} from "@xo-cash/types";
+import type { UnspentOutputData } from "@xo-cash/state";
+import {
+  binToHex,
+  encodeTransaction,
+  generateTransaction,
+  hashTransaction,
+  hexToBin,
+} from "@bitauth/libauth";
 
-import type { SSEvent } from '../utils/sse-client.js';
-import type { SyncServer } from '../utils/sync-server.js';
-import type { Storage } from './storage.js';
+import type { SSEvent } from "../utils/sse-client.js";
+import type { SyncServer } from "../utils/sync-server.js";
+import type { BaseStorage } from "./storage.js";
+import type { BlockchainService } from "./electrum.js";
 
-import { EventEmitter } from '../utils/event-emitter.js'
-import { decodeExtendedJsonObject } from '../utils/ext-json.js';
+import { EventEmitter } from "../utils/event-emitter.js";
+import { decodeExtendedJsonObject } from "../utils/ext-json.js";
+import { compileCashAssemblyString } from "@xo-cash/engine";
 
 export type InvitationEventMap = {
-  'invitation-updated': XOInvitation;
-  'invitation-status-changed': string;
-}
+  "invitation-updated": XOInvitation;
+  "invitation-status-changed": string;
+  error: Error;
+};
 
 export type InvitationDependencies = {
   syncServer: SyncServer;
-  storage: Storage;
+  storage: BaseStorage;
   engine: Engine;
-}
+  electrum: BlockchainService;
+};
 
 export class Invitation extends EventEmitter<InvitationEventMap> {
   /**
    * Create an invitation and start the SSE Session required for it.
    */
-  static async create(invitation: XOInvitation | string, dependencies: InvitationDependencies): Promise<Invitation> {
+  static async create(
+    invitation: XOInvitation | string,
+    dependencies: InvitationDependencies,
+  ): Promise<Invitation> {
     // If the invitation is a string, its probably an invitation identifier.
     // We will try to find the data then just call the create method again, but this time with the data.
-    if(typeof invitation === 'string') {
+    if (typeof invitation === "string") {
       // Try to get the invitation from the storage
       const invitationFromStorage = await dependencies.storage.get(invitation);
       if (invitationFromStorage) {
-        console.log(`Invitation found in storage: ${invitation}`);
         return this.create(invitationFromStorage, dependencies);
       }
 
       // Try to get the invitation from the sync server
-      const invitationFromSyncServer = await dependencies.syncServer.getInvitation(invitation);
-      if (invitationFromSyncServer && invitationFromSyncServer.invitationIdentifier === invitation) {
-        console.log(`Invitation found in sync server: ${invitation}`);
+      const invitationFromSyncServer =
+        await dependencies.syncServer.getInvitation(invitation);
+      if (
+        invitationFromSyncServer &&
+        invitationFromSyncServer.invitationIdentifier === invitation
+      ) {
         return this.create(invitationFromSyncServer, dependencies);
       }
 
       // We cant find it. Throw an error.
-      throw new Error(`Invitation not found in local or remote storage: ${invitation}`);
+      throw new Error(
+        `Invitation not found in local or remote storage: ${invitation}`,
+      );
     }
 
-    const template = await dependencies.engine.getTemplate(invitation.templateIdentifier);
+    const template = await dependencies.engine.getTemplate(
+      invitation.templateIdentifier,
+    );
 
     if (!template) {
       throw new Error(`Template not found: ${invitation.templateIdentifier}`);
     }
 
+    // engine invitation (I have no idea if this is required)
+    const engineInvitation = await dependencies.engine.acceptInvitation(invitation);
+
     // Create the invitation
-    const invitationInstance = new Invitation(invitation, dependencies);
+    const invitationInstance = new Invitation(engineInvitation, dependencies);
 
     // Start the invitation and its tracking
     await invitationInstance.start();
@@ -66,11 +101,11 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
    * The invitation data.
    */
   public data: XOInvitation = {
-    invitationIdentifier: '',
+    invitationIdentifier: "",
     commits: [],
     createdAtTimestamp: 0,
-    templateIdentifier: '',
-    actionIdentifier: '',
+    templateIdentifier: "",
+    actionIdentifier: "",
   };
 
   /**
@@ -87,44 +122,35 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
    * The storage instance.
    * TODO: This should be a composite with the sync server (probably. We currently double handle this work, which is stupid)
    */
-  private storage: Storage;
-
-  /**
-   * True after we have successfully called sign() on this invitation (session-only, not persisted).
-   */
-  private _weHaveSigned = false;
-
-  /**
-   * True after we have successfully called broadcast() on this invitation (session-only, not persisted).
-   */
-  private _broadcasted = false;
+  private storage: BaseStorage;
+  private electrum: BlockchainService;
 
   /**
    * The status of the invitation (last emitted word: pending, actionable, signed, ready, complete, expired, unknown).
    */
-  public status: string = 'unknown';
+  public status: string = "unknown";
 
   /**
    * Create an invitation and start the SSE Session required for it.
    */
-  constructor(
-    invitation: XOInvitation,
-    dependencies: InvitationDependencies
-  ) {
+  constructor(invitation: XOInvitation, dependencies: InvitationDependencies) {
     super();
 
     this.data = invitation;
     this.engine = dependencies.engine;
     this.syncServer = dependencies.syncServer;
     this.storage = dependencies.storage;
+    this.electrum = dependencies.electrum;
 
-    // I cannot express this enough, but the event handler does not need a clean up.
-    // There is this beautiful thing called a "garbage collector". Once this class is removed from scope (removed from the invitations array) all the references
-    // will be removed, including the SSE Session (and therefore this handler).
-    this.syncServer.on('message', this.handleSSEMessage.bind(this));
+    // Create a listerner for the messages from the SSE Session (sync server)
+    this.syncServer.on("message", this.handleSSEMessage.bind(this));
   }
 
+  /**
+   * Start the invitation - Connect sync server and download latest invitation data.
+   */
   async start(): Promise<void> {
+    try {
       // Connect to the sync server and get the invitation (in parallel)
       const [_, invitation] = await Promise.all([
         this.syncServer.connect(),
@@ -135,7 +161,10 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
       const sseCommits = this.data.commits;
 
       // Merge the commits
-    const combinedCommits = this.mergeCommits(sseCommits, invitation?.commits ?? []);
+      const combinedCommits = this.mergeCommits(
+        sseCommits,
+        invitation?.commits ?? [],
+      );
 
       // Set the invitation data with the combined commits
       this.data = { ...this.data, ...invitation, commits: combinedCommits };
@@ -144,23 +173,25 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
       await this.storage.set(this.data.invitationIdentifier, this.data);
 
       // Publish the invitation to the sync server
-    this.syncServer.publishInvitation(this.data);
+      this.publishInvitation(this.data);
 
       // Compute and emit initial status
       await this.updateStatus();
+    } catch (err) {
+      // console.error(`Error starting invitation, could not connect to sync server or get invitation`, err);
+      // Emit the error event. We might want to throw? but we need a better way of handling errors in the invitation system because we need the invitation to successfully initialize.
+      this.emit("error", err instanceof Error ? err : new Error(String(err)));
+    }
   }
 
   /**
    * Handle an SSE message.
    *
    * TODO: Invitation should sync up the initial data (top level) then everything after that should be the commits. This makes it easier to merge as we go instead of just having to overwrite the entire invitation.
-   * Why this level of thought is required is beyond me. We should be given a `mergeCommits` method or "something" that lets us take whole invitation and merge commits into it.
-   * NOTE: signInvitation does merge the commits... But we want to be able to add commits in *before* signing the invitation. So, we are just going to receive a single commit at a time, then just invitation.commits.push(commit); to get around this.
-   * I hope we dont end up with duplicate commits :/... We also dont have a way to list invitiations, which is an... interesting choice.
    */
   private handleSSEMessage(event: SSEvent): void {
     const data = JSON.parse(event.data) as { topic?: string; data?: unknown };
-    if (data.topic === 'invitation-updated') {
+    if (data.topic === "invitation-updated") {
       const invitation = decodeExtendedJsonObject(data.data) as XOInvitation;
 
       if (invitation.invitationIdentifier !== this.data.invitationIdentifier) {
@@ -168,7 +199,10 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
       }
 
       // Filter out commits that already exist (probably a faster way to do this. This is n^2)
-      const newCommits = this.mergeCommits(this.data.commits, invitation.commits);
+      const newCommits = this.mergeCommits(
+        this.data.commits,
+        invitation.commits,
+      );
 
       // Set the new commits
       this.data = { ...this.data, commits: newCommits };
@@ -177,7 +211,21 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
       this.updateStatus().catch(() => {});
 
       // Emit the updated event
-      this.emit('invitation-updated', this.data);
+      this.emit("invitation-updated", this.data);
+    }
+  }
+
+  /**
+   * Publish the invitation to the sync server
+   */
+  private async publishInvitation(
+    invitation: XOInvitation = this.data,
+  ): Promise<void> {
+    try {
+      await this.syncServer.publishInvitation(invitation);
+    } catch (err) {
+      // Emit the error event. We might want to throw? but we need a better way of handling errors in the invitation system because we need the invitation to successfully initialize.
+      this.emit("error", err instanceof Error ? err : new Error(String(err)));
     }
   }
 
@@ -187,7 +235,10 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
    * @param additional - The additional commits
    * @returns The merged commits
    */
-  private mergeCommits(initial: XOInvitationCommit[], additional: XOInvitationCommit[]): XOInvitationCommit[] {
+  private mergeCommits(
+    initial: XOInvitationCommit[],
+    additional: XOInvitationCommit[],
+  ): XOInvitationCommit[] {
     // Create a map of the initial commits
     const initialMap = new Map<string, XOInvitationCommit>();
     for (const commit of initial) {
@@ -218,41 +269,101 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
   /**
    * Internal status computation: returns a single word.
    * NOTE: This could be a Enum-like object as well. May be a nice improvement. - DO NOT USE TS ENUM, THEY ARENT NATIVELY SUPPORTED IN NODE.JS
-   * - expired: any commit has expired
    * - complete: we have broadcast this invitation
+   * - expired: any commit has expired
    * - ready: no missing requirements and we have signed (ready to broadcast)
    * - signed: we have signed but there are still missing parts (waiting for others)
    * - actionable: you can provide data (missing requirements and/or you can sign)
    * - unknown: template/action not found or error
    */
   private async computeStatusInternal(): Promise<string> {
-    if (hasInvitationExpired(this.data)) {
-      return 'expired';
-    }
-    if (this._broadcasted) {
-      return 'complete';
-    }
-
     let missingReqs;
     try {
       missingReqs = await this.engine.listMissingRequirements(this.data);
     } catch {
-      return 'unknown';
+      return "unknown";
     }
 
     const hasMissing =
       (missingReqs.variables?.length ?? 0) > 0 ||
       (missingReqs.inputs?.length ?? 0) > 0 ||
       (missingReqs.outputs?.length ?? 0) > 0 ||
-      (missingReqs.roles !== undefined && Object.keys(missingReqs.roles).length > 0);
+      (missingReqs.roles !== undefined &&
+        Object.keys(missingReqs.roles).length > 0);
 
-    if (!hasMissing && this._weHaveSigned) {
-      return 'ready';
+    const hasSignedCommit = this.hasSignedCommitInInvitation();
+
+    if (!hasMissing) {
+      const transactionHash = await this.deriveTransactionHash();
+      if (
+        transactionHash &&
+        (await this.electrum.hasSeenTransaction(transactionHash))
+      ) {
+        return "complete";
       }
-    if (hasMissing && this._weHaveSigned) {
-      return 'signed';
     }
-    return 'actionable';
+
+    if (hasInvitationExpired(this.data)) {
+      return "expired";
+    }
+
+    if (!hasMissing && hasSignedCommit) {
+      return "ready";
+    }
+    if (hasMissing && hasSignedCommit) {
+      return "signed";
+    }
+    return "actionable";
+  }
+
+  private hasSignedCommitInInvitation(): boolean {
+    for (const commit of this.data.commits) {
+      for (const input of commit.data.inputs ?? []) {
+        if (!input.mergesWith) continue;
+        if (input.unlockingBytecode === undefined) continue;
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Build the transaction to get the TX hash, this is so we can check its status on the blockchain.
+   * TODO: Remove this. This should be part of the engine. The code is virtually identical to `executeAction` except it doesnt throw if the invitation is expired
+   * @returns txHash or undefined if the transaction could not be built
+   */
+  private async deriveTransactionHash(): Promise<string | undefined> {
+    try {
+      const template = await this.engine.getTemplate(
+        this.data.templateIdentifier,
+      );
+      if (!template) return undefined;
+
+      const mergedCommit = mergeInvitationCommits(this.data, template);
+      if (!mergedCommit) return undefined;
+
+      const transactionResult = generateTransaction({
+        version: mergedCommit.transactionVersion,
+        locktime: mergedCommit.transactionLocktime,
+        // @ts-expect-error merged inputs include additional invitation metadata.
+        inputs: mergedCommit.inputs,
+        // @ts-expect-error merged outputs include additional invitation metadata.
+        outputs: mergedCommit.outputs,
+      });
+
+      if (!transactionResult.success) return undefined;
+
+      const transactionHex = binToHex(
+        encodeTransaction(transactionResult.transaction),
+      );
+      const rawHash: unknown = hashTransaction(hexToBin(transactionHex));
+      if (typeof rawHash === "string") return rawHash;
+      if (rawHash instanceof Uint8Array) return binToHex(rawHash);
+      return undefined;
+    } catch {
+      return undefined;
+    }
   }
 
   /**
@@ -261,7 +372,7 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
   private async updateStatus(): Promise<void> {
     const status = await this.computeStatus();
     this.status = status;
-    this.emit('invitation-status-changed', status);
+    this.emit("invitation-status-changed", status);
   }
 
   /**
@@ -272,7 +383,7 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
     this.data = await this.engine.acceptInvitation(this.data, acceptParams);
 
     // Sync the invitation to the sync server
-    this.syncServer.publishInvitation(this.data);
+    this.publishInvitation(this.data);
 
     // Update the status of the invitation
     await this.updateStatus();
@@ -286,31 +397,29 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
     const signedInvitation = await this.engine.signInvitation(this.data);
 
     // Publish the signed invitation to the sync server
-    this.syncServer.publishInvitation(signedInvitation);
+    this.publishInvitation(signedInvitation);
 
     // Store the signed invitation in the storage
     await this.storage.set(this.data.invitationIdentifier, signedInvitation);
 
     this.data = signedInvitation;
-    this._weHaveSigned = true;
 
     // Update the status of the invitation
     await this.updateStatus();
   }
 
   /**
-   * Broadcast the invitation
+   * Broadcast the invitation.
+   * @returns The transaction hash returned by the network after broadcast.
    */
-  async broadcast(): Promise<void> {
-    // Broadcast the transaction (executeAction returns transaction hash when broadcastTransaction: true)
-    await this.engine.executeAction(this.data, {
+  async broadcast(): Promise<string> {
+    const txHash = await this.engine.executeAction(this.data, {
       broadcastTransaction: true,
     });
 
-    this._broadcasted = true;
-
-    // Update the status of the invitation
     await this.updateStatus();
+
+    return String(txHash);
   }
 
   // ============================================================================
@@ -325,7 +434,7 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
     this.data = await this.engine.appendInvitation(this.data, data);
 
     // Sync the invitation to the sync server
-    await this.syncServer.publishInvitation(this.data);
+    await this.publishInvitation(this.data);
 
     // Store the invitation in the storage
     await this.storage.set(this.data.invitationIdentifier, this.data);
@@ -342,7 +451,22 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
     await this.append({ inputs });
 
     // Sync the invitation to the sync server
-    await this.syncServer.publishInvitation(this.data);
+    await this.publishInvitation(this.data);
+  }
+
+  /**
+   * Generate the locking bytecode for the invitation
+   * TODO: Find out if this has side-effects or needs special handling
+   */
+  async generateLockingBytecode(
+    outputIdentifier: string,
+    roleIdentifier?: string,
+  ): Promise<string> {
+    return this.engine.generateLockingBytecode(
+      this.data.templateIdentifier,
+      outputIdentifier,
+      roleIdentifier,
+    );
   }
 
   async addOutputs(outputs: XOInvitationOutput[]): Promise<void> {
@@ -350,7 +474,7 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
     await this.append({ outputs });
 
     // Sync the invitation to the sync server
-    await this.syncServer.publishInvitation(this.data);
+    await this.publishInvitation(this.data);
   }
 
   async addVariables(variables: XOInvitationVariable[]): Promise<void> {
@@ -358,12 +482,32 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
     await this.append({ variables });
 
     // Sync the invitation to the sync server
-    await this.syncServer.publishInvitation(this.data);
+    await this.publishInvitation(this.data);
   }
 
-  async findSuitableResources(options: FindSuitableResourcesParameters): Promise<UnspentOutputData[]> {
+  async findSuitableResources(
+    options: Partial<GetSpendableResourcesParameters> = {},
+  ): Promise<UnspentOutputData[]> {
+    const templateIdentifier =
+      options.templateIdentifier ?? this.data.templateIdentifier;
+    const template = await this.engine.getTemplate(templateIdentifier);
+    const fallbackOutputIdentifier = Object.keys(template?.outputs ?? {})[0];
+    if (!fallbackOutputIdentifier && !options.outputIdentifier) {
+      throw new Error(
+        `No output identifiers found for template: ${templateIdentifier}`,
+      );
+    }
+
+    const resolvedOptions: GetSpendableResourcesParameters = {
+      templateIdentifier,
+      outputIdentifier: options.outputIdentifier ?? fallbackOutputIdentifier ?? "",
+    };
+
     // Find the suitable resources
-    const { unspentOutputs } = await this.engine.findSuitableResources(this.data, options);
+    const { unspentOutputs } = await this.engine.getSpendableResources(
+      this.data,
+      resolvedOptions,
+    );
 
     // Update the status of the invitation
     await this.updateStatus();
@@ -407,7 +551,127 @@ export class Invitation extends EventEmitter<InvitationEventMap> {
   /**
    * Get the locking bytecode for the invitation
    */
-  async getLockingBytecode(outputIdentifier: string, roleIdentifier?: string): Promise<string> {
-    return this.engine.generateLockingBytecode(this.data.templateIdentifier, outputIdentifier, roleIdentifier);
+  async getLockingBytecode(
+    outputIdentifier: string,
+    roleIdentifier?: string,
+  ): Promise<string> {
+    return this.engine.generateLockingBytecode(
+      this.data.templateIdentifier,
+      outputIdentifier,
+      roleIdentifier,
+    );
+  }
+
+  /**
+   * Get the sats out for the invitation
+   * TODO: Clean up this function. Why is it so big? Can obviously make it 2 functions instead of recursive, but still...
+   */
+  async getSatsOut(outputIdentifier?: string): Promise<bigint> {
+    // If an output identifier is provided, find all outputs with that identifier, and its valueSatoshis identifier back to the variables
+    if (outputIdentifier) {
+      // Get the valueSatoshis identifier from the template
+      const template = await this.engine.getTemplate(
+        this.data.templateIdentifier,
+      );
+      if (!template) {
+        throw new Error(
+          `Template not found: ${this.data.templateIdentifier} when trying to get sats out for output: ${outputIdentifier}`,
+        );
+      }
+
+      const output = template.outputs[outputIdentifier];
+      if (!output) {
+        throw new Error(
+          `Output not found: ${outputIdentifier} in template: ${this.data.templateIdentifier}`,
+        );
+      }
+
+      const valueSatoshisIdentifier = output.valueSatoshis;
+      if (!valueSatoshisIdentifier) {
+        throw new Error(
+          `Value satoshis identifier not found: ${outputIdentifier} in template: ${this.data.templateIdentifier}`,
+        );
+      }
+
+      // Create a list of all the variables from the commits
+      const variables = this.data.commits.flatMap(
+        (c) => c.data?.variables ?? [],
+      );
+
+      // Create a dictionary of the variables
+      const formattedVariables = variables.reduce(
+        (acc, v) => {
+          acc[v.variableIdentifier ?? ""] = v.value;
+          return acc;
+        },
+        {} as Record<string, XOInvitationVariableValue>,
+      );
+
+      // Compile the CashAssembly expression to get the value satoshis (It handles the variable replacement for us)
+      const valueSatoshis = await compileCashAssemblyString(
+        String(valueSatoshisIdentifier),
+        formattedVariables,
+      );
+
+      // Return the value satoshis as a bigint
+      // TODO: Check this of a vulnerability or crash - I assume there might be one if someone made the `valueSatoshis` a malicious expression
+      return BigInt(valueSatoshis);
+    }
+
+    // If we didnt get an output identifier, go through the action outputs and sum the valueSatoshis
+    const action = this.data.actionIdentifier;
+    if (!action) {
+      throw new Error(
+        `Action not found: ${this.data.actionIdentifier} when trying to get sats out for output: ${outputIdentifier}`,
+      );
+    }
+
+    // Get the template
+    const template = await this.engine.getTemplate(
+      this.data.templateIdentifier,
+    );
+    if (!template) {
+      throw new Error(
+        `Template not found: ${this.data.templateIdentifier} when trying to get sats out for action: ${action}`,
+      );
+    }
+
+    // Get the transaction ID from the action
+    const transactionID = template.actions[action]?.transaction;
+    if (!transactionID) {
+      throw new Error(
+        `Transactions not found: ${action} in template: ${this.data.templateIdentifier}`,
+      );
+    }
+
+    // Get the transaction from the template
+    const transaction = template.transactions?.[transactionID];
+    if (!transaction) {
+      throw new Error(
+        `Transaction not found: ${transactionID} in template: ${this.data.templateIdentifier}`,
+      );
+    }
+
+    // Get the outputs from the transaction
+    const outputs = transaction.outputs;
+    if (!outputs) {
+      throw new Error(
+        `Outputs not found: ${transactionID} in template: ${this.data.templateIdentifier}`,
+      );
+    }
+
+    // Create a value to store the cummulative total of the outputs
+    let totalSats = 0n;
+
+    // Iterate through the outputs and sum the valueSatoshis
+    for (const output of outputs) {
+      if (typeof output === "string") {
+        totalSats += await this.getSatsOut(output);
+      } else {
+        totalSats += await this.getSatsOut(output.output);
+      }
+    }
+
+    return totalSats;
   }
 }

src/services/rates.ts

@@ -0,0 +1,197 @@
+import { EventEmitter } from '../utils/event-emitter.js';
+import {
+  type RatesEventMap,
+} from '../utils/rates/base-rates.js';
+import { RatesOracle } from '../utils/rates/rates-oracles.js';
+
+/**
+ * Event map emitted by {@link RatesService}.
+ */
+export type RatesServiceEventMap = {
+  'rate-updated': {
+    numeratorUnitCode: string;
+    denominatorUnitCode: string;
+    price: number;
+    pair: string;
+    updatedAt: number;
+  };
+};
+
+/**
+ * In-memory representation of a market rate.
+ */
+type CachedRate = {
+  price: number;
+  updatedAt: number;
+};
+
+/**
+ * Minimal adapter contract that RatesService depends on.
+ *
+ * Using a small interface keeps the service decoupled and avoids inheriting
+ * implementation-specific type constraints from concrete adapters.
+ */
+export interface RatesAdapter {
+  start(): Promise<void>;
+  stop(): Promise<void>;
+  listPairs(): Promise<Set<string>>;
+  formatCurrency(amount: number, targetCurrency: string): string;
+  on(
+    type: 'rateUpdated',
+    listener: (detail: RatesEventMap['rateUpdated']) => void,
+  ): () => void;
+}
+
+/**
+ * Orchestrates the rates adapter lifecycle and provides BCH -> fiat helpers
+ * for the TUI.
+ *
+ * This service keeps a small in-memory snapshot of the latest prices and emits
+ * a normalized event whenever a pair changes. React components can subscribe
+ * through `useSyncExternalStore` for clean and predictable reactivity.
+ */
+export class RatesService extends EventEmitter<RatesServiceEventMap> {
+  private readonly adapter: RatesAdapter;
+  private readonly ratesByPair = new Map<string, CachedRate>();
+  private unsubscribeFromAdapter: (() => void) | null = null;
+  private started = false;
+
+  constructor(adapter: RatesAdapter) {
+    super();
+    this.adapter = adapter;
+  }
+
+  /**
+   * Creates a rates service.
+   *
+   * If no adapter is passed, this defaults to the Oracle-backed adapter.
+   */
+  public static async create(adapter?: RatesAdapter): Promise<RatesService> {
+    const resolvedAdapter = adapter ?? (await RatesOracle.from());
+    return new RatesService(resolvedAdapter);
+  }
+
+  /**
+   * Starts the underlying adapter and begins collecting live updates.
+   */
+  public async start(): Promise<void> {
+    if (this.started) {
+      return;
+    }
+    this.started = true;
+
+    this.unsubscribeFromAdapter = this.adapter.on('rateUpdated', (event) => {
+      this.handleRateUpdated(event);
+    });
+
+    try {
+      await this.adapter.start();
+    } catch (error) {
+      this.unsubscribeFromAdapter?.();
+      this.unsubscribeFromAdapter = null;
+      this.started = false;
+      throw error;
+    }
+  }
+
+  /**
+   * Stops live rate collection.
+   */
+  public async stop(): Promise<void> {
+    if (!this.started) {
+      return;
+    }
+    this.started = false;
+
+    this.unsubscribeFromAdapter?.();
+    this.unsubscribeFromAdapter = null;
+
+    await this.adapter.stop();
+  }
+
+  /**
+   * Returns the latest price for a pair in NUMERATOR/DENOMINATOR form.
+   *
+   * Example: `getRate("USD", "BCH")`.
+   */
+  public getRate(
+    numeratorUnitCode: string,
+    denominatorUnitCode: string,
+  ): number | null {
+    const pair = this.getPairKey(numeratorUnitCode, denominatorUnitCode);
+    return this.ratesByPair.get(pair)?.price ?? null;
+  }
+
+  /**
+   * Converts satoshis to fiat using the latest BCH/fiat rate.
+   *
+   * Example: `convertBchToFiat(1234n, "USD")`.
+   */
+  public convertBchToFiat(
+    satoshis: bigint,
+    targetCurrency: string = 'USD',
+  ): number | null {
+    const rate = this.getRate(targetCurrency, 'BCH');
+    if (rate === null) {
+      return null;
+    }
+
+    const amountInBch = Number(satoshis) / 100_000_000;
+    return amountInBch * rate;
+  }
+
+  /**
+   * Formats a BCH -> fiat converted amount using the adapter formatter.
+   */
+  public formatBchToFiat(
+    satoshis: bigint,
+    targetCurrency: string = 'USD',
+  ): string | null {
+    const normalizedCurrency = targetCurrency.toUpperCase();
+    const amount = this.convertBchToFiat(satoshis, normalizedCurrency);
+    if (amount === null) {
+      return null;
+    }
+    return this.adapter.formatCurrency(amount, normalizedCurrency);
+  }
+
+  /**
+   * Formats an arbitrary fiat amount in a currency-aware way.
+   */
+  public formatCurrency(amount: number, currencyCode: string): string {
+    return this.adapter.formatCurrency(amount, currencyCode.toUpperCase());
+  }
+
+  /**
+   * Handles normalized updates from the underlying adapter.
+   */
+  private handleRateUpdated(event: RatesEventMap['rateUpdated']): void {
+    const numeratorUnitCode = event.numeratorUnitCode.toUpperCase();
+    const denominatorUnitCode = event.denominatorUnitCode.toUpperCase();
+    const pair = this.getPairKey(numeratorUnitCode, denominatorUnitCode);
+    const updatedAt = Date.now();
+
+    this.ratesByPair.set(pair, {
+      price: event.price,
+      updatedAt,
+    });
+
+    this.emit('rate-updated', {
+      numeratorUnitCode,
+      denominatorUnitCode,
+      price: event.price,
+      pair,
+      updatedAt,
+    });
+  }
+
+  /**
+   * Creates a stable key for pair lookups.
+   */
+  private getPairKey(
+    numeratorUnitCode: string,
+    denominatorUnitCode: string,
+  ): string {
+    return `${numeratorUnitCode.toUpperCase()}/${denominatorUnitCode.toUpperCase()}`;
+  }
+}

src/services/storage.ts

@@ -1,21 +1,36 @@
-import Database from 'better-sqlite3';
-import { decodeExtendedJson, encodeExtendedJson } from '../utils/ext-json.js';
+import Database from "better-sqlite3";
+import { decodeExtendedJson, encodeExtendedJson } from "../utils/ext-json.js";
 
-export class Storage {
+export abstract class BaseStorage {
+  abstract all(): Promise<{ key: string; value: any }[]>;
+  abstract set(key: string, value: any): Promise<void>;
+  abstract get(key: string): Promise<any>;
+  abstract remove(key: string): Promise<void>;
+  abstract clear(): Promise<void>;
+  abstract child(key: string): BaseStorage;
+}
+
+export class Storage extends BaseStorage {
   static async create(dbPath: string): Promise<Storage> {
     // Create the database
     const database = new Database(dbPath);
 
     // Create the storage table if it doesn't exist
-    database.prepare('CREATE TABLE IF NOT EXISTS storage (key TEXT PRIMARY KEY, value TEXT)').run();
+    database
+      .prepare(
+        "CREATE TABLE IF NOT EXISTS storage (key TEXT PRIMARY KEY, value TEXT)",
+      )
+      .run();
 
-    return new Storage(database, '');
+    return new Storage(database, "");
   }
 
   constructor(
     private readonly database: Database.Database,
     private readonly basePath: string,
-  ) {}
+  ) {
+    super();
+  }
 
   /**
    * Get the full key with basePath prefix
@@ -39,43 +54,50 @@ export class Storage {
 
     // Insert or replace the value into the database with full key (including basePath)
     const fullKey = this.getFullKey(key);
-    this.database.prepare('INSERT OR REPLACE INTO storage (key, value) VALUES (?, ?)').run(fullKey, encodedValue);
+    this.database
+      .prepare("INSERT OR REPLACE INTO storage (key, value) VALUES (?, ?)")
+      .run(fullKey, encodedValue);
   }
 
   /**
    * Get all key-value pairs from this storage namespace (shallow only - no nested children)
    */
   async all(): Promise<{ key: string; value: any }[]> {
-    let query = 'SELECT key, value FROM storage';
+    let query = "SELECT key, value FROM storage";
     const params: any[] = [];
 
     if (this.basePath) {
       // Filter by basePath prefix
-      query += ' WHERE key LIKE ?';
+      query += " WHERE key LIKE ?";
       params.push(`${this.basePath}.%`);
     }
 
     // Get all the rows from the database
-    const rows = await this.database.prepare(query).all(...params) as { key: string; value: any }[];
+    const rows = (await this.database.prepare(query).all(...params)) as {
+      key: string;
+      value: any;
+    }[];
 
     // Filter for shallow results (only direct children)
-    const filteredRows = rows.filter(row => {
+    const filteredRows = rows.filter((row) => {
       const strippedKey = this.stripBasePath(row.key);
       // Only include keys that don't have additional dots (no deeper nesting)
-      return !strippedKey.includes('.');
+      return !strippedKey.includes(".");
     });
 
     // Decode the extended json objects and strip basePath from keys
-    return filteredRows.map(row => ({ 
+    return filteredRows.map((row) => ({
       key: this.stripBasePath(row.key),
-      value: decodeExtendedJson(row.value) 
+      value: decodeExtendedJson(row.value),
     }));
   }
 
   async get(key: string): Promise<any> {
     // Get the row from the database using full key
     const fullKey = this.getFullKey(key);
-    const row = await this.database.prepare('SELECT value FROM storage WHERE key = ?').get(fullKey) as { value: any };
+    const row = (await this.database
+      .prepare("SELECT value FROM storage WHERE key = ?")
+      .get(fullKey)) as { value: any };
 
     // Return null if not found
     if (!row) return null;
@@ -87,16 +109,18 @@ export class Storage {
   async remove(key: string): Promise<void> {
     // Delete using full key
     const fullKey = this.getFullKey(key);
-    this.database.prepare('DELETE FROM storage WHERE key = ?').run(fullKey);
+    this.database.prepare("DELETE FROM storage WHERE key = ?").run(fullKey);
   }
 
   async clear(): Promise<void> {
     if (this.basePath) {
       // Clear only items under this namespace
-      this.database.prepare('DELETE FROM storage WHERE key LIKE ?').run(`${this.basePath}.%`);
+      this.database
+        .prepare("DELETE FROM storage WHERE key LIKE ?")
+        .run(`${this.basePath}.%`);
     } else {
       // Clear everything
-      this.database.prepare('DELETE FROM storage').run();
+      this.database.prepare("DELETE FROM storage").run();
     }
   }
 
@@ -104,3 +128,104 @@ export class Storage {
     return new Storage(this.database, this.getFullKey(key));
   }
 }
+
+/**
+ * In-memory storage adapter with the same namespaced API as {@link Storage}.
+ *
+ * This adapter is useful for tests and short-lived sessions where persisted
+ * SQLite state is not needed.
+ */
+export class InMemoryStorage extends BaseStorage {
+  static async create(): Promise<InMemoryStorage> {
+    return new InMemoryStorage(new Map<string, string>(), "");
+  }
+
+  constructor(
+    private readonly store: Map<string, string>,
+    private readonly basePath: string,
+  ) {
+    super();
+  }
+
+  /**
+   * Get the full key with basePath prefix.
+   */
+  private getFullKey(key: string): string {
+    return this.basePath ? `${this.basePath}.${key}` : key;
+  }
+
+  /**
+   * Strip the basePath prefix from a key.
+   */
+  private stripBasePath(fullKey: string): string {
+    if (!this.basePath) return fullKey;
+    const prefix = `${this.basePath}.`;
+    return fullKey.startsWith(prefix) ? fullKey.slice(prefix.length) : fullKey;
+  }
+
+  async set(key: string, value: any): Promise<void> {
+    const fullKey = this.getFullKey(key);
+    const encodedValue = encodeExtendedJson(value);
+    this.store.set(fullKey, encodedValue);
+  }
+
+  /**
+   * Get all key-value pairs from this storage namespace (shallow only).
+   */
+  async all(): Promise<{ key: string; value: any }[]> {
+    const rows: Array<{ key: string; value: string }> = [];
+    const prefix = this.basePath ? `${this.basePath}.` : "";
+
+    for (const [key, value] of this.store.entries()) {
+      if (this.basePath && !key.startsWith(prefix)) continue;
+      rows.push({ key, value });
+    }
+
+    const filteredRows = rows.filter((row) => {
+      const strippedKey = this.stripBasePath(row.key);
+      return !strippedKey.includes(".");
+    });
+
+    return filteredRows.map((row) => ({
+      key: this.stripBasePath(row.key),
+      value: decodeExtendedJson(row.value),
+    }));
+  }
+
+  async get(key: string): Promise<any> {
+    const fullKey = this.getFullKey(key);
+    const encodedValue = this.store.get(fullKey);
+    if (encodedValue === undefined) return null;
+
+    return decodeExtendedJson(encodedValue);
+  }
+
+  async remove(key: string): Promise<void> {
+    const fullKey = this.getFullKey(key);
+    this.store.delete(fullKey);
+  }
+
+  async clear(): Promise<void> {
+    if (!this.basePath) {
+      this.store.clear();
+      return;
+    }
+
+    const prefix = `${this.basePath}.`;
+    const keysToDelete: string[] = [];
+
+    for (const key of this.store.keys()) {
+      if (key.startsWith(prefix)) {
+        keysToDelete.push(key);
+      }
+    }
+
+    for (const key of keysToDelete) {
+      this.store.delete(key);
+    }
+  }
+
+  child(key: string): InMemoryStorage {
+    return new InMemoryStorage(this.store, this.getFullKey(key));
+  }
+}

src/tui/App.tsx

@@ -4,9 +4,10 @@
  */
 
 import React from 'react';
-import { Box, Text, useApp, useInput } from 'ink';
+import { Box, Text, useApp } from 'ink';
 import { NavigationProvider, useNavigation } from './hooks/useNavigation.js';
 import { AppProvider, useAppContext, useDialog, useStatus } from './hooks/useAppContext.js';
+import { InputLayerProvider, useBlockableInput } from './hooks/useInputLayer.js';
 import type { AppConfig } from '../app.js';
 import { colors, logoSmall } from './theme.js';
 
@@ -15,7 +16,7 @@ import { SeedInputScreen } from './screens/SeedInput.js';
 import { WalletStateScreen } from './screens/WalletState.js';
 import { TemplateListScreen } from './screens/TemplateList.js';
 import { ActionWizardScreen } from './screens/action-wizard/ActionWizardScreen.js';
-import { InvitationScreen } from './screens/Invitation.js';
+import { InvitationScreen } from './screens/invitations/InvitationScreen.js';
 import { TransactionScreen } from './screens/Transaction.js';
 
 import { MessageDialog } from './components/Dialog.js';
@@ -78,21 +79,7 @@ function StatusBar(): React.ReactElement {
  * Dialog overlay component for modals.
  */
 function DialogOverlay(): React.ReactElement | null {
-  const { dialog, setDialog } = useDialog();
-
-  useInput((input, key) => {
-    if (!dialog?.visible) return;
-
-    if (key.return || input === 'y' || input === 'Y') {
-      if (dialog.type === 'confirm' && dialog.onConfirm) {
-        dialog.onConfirm();
-      } else {
-        dialog.onCancel?.();
-      }
-    } else if (key.escape || input === 'n' || input === 'N') {
-      dialog.onCancel?.();
-    }
-  }, { isActive: dialog?.visible ?? false });
+  const { dialog } = useDialog();
 
   if (!dialog?.visible) return null;
 
@@ -128,16 +115,12 @@ function MainContent(): React.ReactElement {
   const { exit } = useApp();
   const { goBack, canGoBack } = useNavigation();
   const { screen } = useNavigation();
-  const { dialog } = useDialog();
   const appContext = useAppContext();
 
-  // Global keybindings (disabled when dialog is shown)
-  useInput((input, key) => {
-    // Don't handle global keys when dialog is shown
-    if (dialog?.visible) return;
-
-    // Quit on 'q' or Ctrl+C
-    if (input === 'q' || (key.ctrl && input === 'c')) {
+  // Global keybindings — auto-blocked when any dialog/overlay is capturing input.
+  useBlockableInput((input, key) => {
+    // Quit on Ctrl+C
+    if (key.ctrl && input === 'c') {
       appContext.exit();
       exit();
     }
@@ -179,8 +162,8 @@ function MainContent(): React.ReactElement {
 export function App({ config }: AppProps): React.ReactElement {
   const { exit } = useApp();
 
-  const handleExit = () => {
   // Cleanup will be handled by React when components unmount
+  const handleExit = () => {
     exit();
   };
 
@@ -189,9 +172,11 @@ export function App({ config }: AppProps): React.ReactElement {
       config={config}
       onExit={handleExit}
     >
+      <InputLayerProvider>
         <NavigationProvider initialScreen="seed-input">
           <MainContent />
         </NavigationProvider>
+      </InputLayerProvider>
     </AppProvider>
   );
 }

src/tui/components/Dialog.tsx

@@ -2,10 +2,11 @@
  * Dialog components for modals, confirmations, and input dialogs.
  */
 
-import React, { useRef, useState } from 'react';
-import { Box, Text, useInput, measureElement } from 'ink';
-import TextInput from 'ink-text-input';
+import React, { useId, useRef, useState } from 'react';
+import { Box, Text, measureElement } from 'ink';
+import TextInput from './TextInput.js';
 import { colors } from '../theme.js';
+import { useInputLayer, useLayeredInput } from '../hooks/useInputLayer.js';
 
 /**
  * Base dialog wrapper props.
@@ -24,11 +25,12 @@ interface DialogWrapperProps {
 }
 
 
-function DialogWrapper({
+export function DialogWrapper({
   title,
   borderColor = colors.primary,
   children,
   width = 60,
+  backgroundColor = colors.bg,
 }: DialogWrapperProps): React.ReactElement {
   const ref = useRef<any>(null);
   const [height, setHeight] = useState<number | null>(null);
@@ -51,9 +53,12 @@ function DialogWrapper({
           flexDirection="column"
           width={width}
           height={height}
+          backgroundColor={backgroundColor}
         >
           {Array.from({ length: height }).map((_, i) => (
-            <Text key={i}>{' '.repeat(width)}</Text>
+            <Text key={i} backgroundColor={backgroundColor}>
+              {' '.repeat(width)}
+            </Text>
           ))}
         </Box>
       )}
@@ -67,6 +72,7 @@ function DialogWrapper({
         paddingX={2}
         paddingY={1}
         width={width}
+        backgroundColor={backgroundColor}
       >
         <Text color={borderColor} bold>
           {title}
@@ -113,15 +119,17 @@ export function InputDialog({
   onCancel,
   isActive = true,
 }: InputDialogProps): React.ReactElement {
+  const layerId = useId();
   const [value, setValue] = useState(initialValue);
 
-  useInput((input, key) => {
-    if (!isActive) return;
+  // Auto-capture input when this dialog is mounted.
+  useInputLayer(layerId);
 
+  useLayeredInput(layerId, (_input, key) => {
     if (key.escape) {
       onCancel();
     }
-  }, { isActive });
+  });
 
   const handleSubmit = (val: string) => {
     onSubmit(val);
@@ -178,11 +186,13 @@ export function ConfirmDialog({
   confirmLabel = 'Yes',
   cancelLabel = 'No',
 }: ConfirmDialogProps): React.ReactElement {
+  const layerId = useId();
   const [selected, setSelected] = useState<'confirm' | 'cancel'>('confirm');
 
-  useInput((input, key) => {
-    if (!isActive) return;
+  // Auto-capture input when this dialog is mounted.
+  useInputLayer(layerId);
 
+  useLayeredInput(layerId, (input, key) => {
     if (key.leftArrow || key.rightArrow || key.tab) {
       setSelected(prev => prev === 'confirm' ? 'cancel' : 'confirm');
     } else if (key.return) {
@@ -196,7 +206,7 @@ export function ConfirmDialog({
     } else if (input === 'y' || input === 'Y') {
       onConfirm();
     }
-  }, { isActive });
+  });
 
   return (
     <DialogWrapper title={title} borderColor={colors.warning}>
@@ -250,13 +260,16 @@ export function MessageDialog({
   type = 'info',
   isActive = true,
 }: MessageDialogProps): React.ReactElement {
-  useInput((input, key) => {
-    if (!isActive) return;
+  const layerId = useId();
 
+  // Auto-capture input when this dialog is mounted.
+  useInputLayer(layerId);
+
+  useLayeredInput(layerId, (_input, key) => {
     if (key.return || key.escape) {
       onClose();
     }
-  }, { isActive });
+  });
 
   const borderColor = type === 'error' ? colors.error :
                       type === 'success' ? colors.success :

src/tui/components/Input.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 import { Box, Text } from 'ink';
-import TextInput from 'ink-text-input';
+import TextInput from './TextInput.js';
 import { colors } from '../theme.js';
 
 /**

src/tui/components/List.tsx

@@ -9,7 +9,7 @@
 
 import React, { useState, useMemo, useCallback } from 'react';
 import { Box, Text, useInput } from 'ink';
-import TextInput from 'ink-text-input';
+import TextInput from './TextInput.js';
 import { colors } from '../theme.js';
 
 // =============================================================================

src/tui/components/ProgressBar.tsx

@@ -116,8 +116,14 @@ interface LoadingProps {
 }
 
 export function Loading({ message = 'Loading...' }: LoadingProps): React.ReactElement {
-  // Simple spinner using Ink's spinner component
-  const Spinner = require('ink-spinner').default;
+
+  // Was using ink-spinner, but its not updated for react 19.
+  // Just putting nothing here for now
+  const Spinner = (props: any) => {
+    return (
+      <></>
+    );
+  };
 
   return (
     <Box>

src/tui/components/QRCode.tsx

@@ -0,0 +1,198 @@
+/**
+ * QR Code component for displaying scannable QR codes in the terminal.
+ *
+ * Uses the lower-half-block character (▄) exclusively for rendering. The top
+ * half of each cell is controlled via backgroundColor and the bottom half via
+ * the foreground color. This avoids the sub-pixel seams that occur when mixing
+ * different Unicode block characters (█, ▀, ▄, space) across adjacent rows.
+ */
+
+import React, { useMemo } from 'react';
+import { Box, Text } from 'ink';
+import QRCodeLib from 'qrcode';
+import { DialogWrapper } from './Dialog.js';
+import { colors } from '../theme.js';
+
+/** Color used for light (background) QR modules. */
+const LIGHT = 'white';
+
+/** Color used for dark (data) QR modules. Must match the dialog/terminal bg. */
+const DARK = colors.bg as string;
+
+/** Default quiet zone size in modules (QR spec recommends 4, 2 is usually sufficient). */
+const QUIET_ZONE = 2;
+
+/**
+ * A run of consecutive characters in a rendered QR row that share the
+ * same foreground/background color pair.
+ */
+interface ColorSpan {
+  /** The repeated ▄ characters for this span. */
+  chars: string;
+  /** Foreground color (controls the bottom half of each cell). */
+  fg: string;
+  /** Background color (controls the top half of each cell). */
+  bg: string;
+}
+
+/**
+ * Props for the QRCode component.
+ */
+interface QRCodeProps {
+  /** The data to encode in the QR code. */
+  value: string;
+  /** Whether to wrap the QR code in a DialogWrapper. */
+  dialog?: boolean;
+  /** Dialog title (only used when dialog is true). Defaults to "QR Code". */
+  dialogTitle?: string;
+  /** Whether to display the raw encoded value as copyable text above the QR code. */
+  showValue?: boolean;
+}
+
+/**
+ * Generates the QR code module matrix with a quiet zone border.
+ *
+ * @param value - The string to encode.
+ * @param quietZone - Number of light-module rows/columns to add around the QR data.
+ * @returns A 2D array where `true` means dark module and `false` means light module.
+ */
+function generateMatrix(value: string, quietZone: number = QUIET_ZONE): boolean[][] {
+  const qr = QRCodeLib.create(value, { errorCorrectionLevel: 'M' });
+  const { size, data } = qr.modules;
+  const totalSize = size + quietZone * 2;
+
+  const matrix: boolean[][] = [];
+
+  for (let row = 0; row < totalSize; row++) {
+    const matrixRow: boolean[] = [];
+
+    for (let col = 0; col < totalSize; col++) {
+      const qrRow = row - quietZone;
+      const qrCol = col - quietZone;
+      const insideData = qrRow >= 0 && qrRow < size && qrCol >= 0 && qrCol < size;
+
+      // Quiet zone modules are always light (false).
+      matrixRow.push(insideData ? data[qrRow * size + qrCol] === 1 : false);
+    }
+
+    matrix.push(matrixRow);
+  }
+
+  return matrix;
+}
+
+/**
+ * Converts a pair of module rows into an array of {@link ColorSpan}s.
+ *
+ * Every cell uses the `▄` (lower half block) character. The foreground color
+ * paints the bottom half and the backgroundColor paints the top half, giving
+ * us artifact-free rendering with a single glyph.
+ *
+ * Consecutive cells that share the same color pair are merged into one span
+ * to keep the element count low.
+ *
+ * @param matrix - The full module matrix.
+ * @param row - The index of the top row in the pair (the bottom row is row + 1).
+ * @returns An array of color spans for this terminal line.
+ */
+function buildRowSpans(matrix: boolean[][], row: number): ColorSpan[] {
+  const width = matrix[0]?.length ?? 0;
+  const spans: ColorSpan[] = [];
+
+  for (let col = 0; col < width; col++) {
+    const topDark = matrix[row]?.[col] ?? false;
+    const bottomDark = matrix[row + 1]?.[col] ?? false;
+
+    // ▄ lower-half block: foreground = bottom color, backgroundColor = top color
+    const fg = bottomDark ? DARK : LIGHT;
+    const bg = topDark ? DARK : LIGHT;
+
+    const last = spans[spans.length - 1];
+    if (last && last.fg === fg && last.bg === bg) {
+      last.chars += '▄';
+    } else {
+      spans.push({ chars: '▄', fg, bg });
+    }
+  }
+
+  return spans;
+}
+
+/**
+ * Renders the full module matrix into an array of span-arrays, one per
+ * terminal row (each covering two QR module rows).
+ *
+ * @param matrix - The 2D dark/light module matrix from {@link generateMatrix}.
+ */
+function renderMatrix(matrix: boolean[][]): ColorSpan[][] {
+  const rows: ColorSpan[][] = [];
+  const height = matrix.length;
+
+  for (let row = 0; row < height; row += 2) {
+    rows.push(buildRowSpans(matrix, row));
+  }
+
+  return rows;
+}
+
+/**
+ * Displays a scannable QR code in the terminal.
+ *
+ * Supports optional dialog wrapping via the `dialog` prop and an optional
+ * copyable text display of the encoded value via `showValue`.
+ *
+ * @example
+ * ```tsx
+ * // Minimal usage
+ * <QRCode value="bitcoincash:qr..." />
+ *
+ * // Inside a dialog with the raw value shown
+ * <QRCode value="bitcoincash:qr..." dialog dialogTitle="Receive Address" showValue />
+ * ```
+ */
+export function QRCode({
+  value,
+  dialog = false,
+  dialogTitle = 'QR Code',
+  showValue = false,
+}: QRCodeProps): React.ReactElement {
+  const { rows, moduleCount } = useMemo(() => {
+    const matrix = generateMatrix(value);
+    return {
+      rows: renderMatrix(matrix),
+      moduleCount: matrix[0]?.length ?? 0,
+    };
+  }, [value]);
+
+  const qrContent = (
+    <Box flexDirection="column" alignItems="center">
+      {showValue && (
+        <Box marginBottom={1} width={moduleCount}>
+          <Text color={colors.textMuted} wrap="wrap">{value}</Text>
+        </Box>
+      )}
+      <Box flexDirection="column">
+        {rows.map((spans, i) => (
+          <Text key={i}>
+            {spans.map((span, j) => (
+              <Text key={j} color={span.fg} backgroundColor={span.bg}>
+                {span.chars}
+              </Text>
+            ))}
+          </Text>
+        ))}
+      </Box>
+    </Box>
+  );
+
+  if (dialog) {
+    const dialogWidth = Math.max(moduleCount + 8, 40);
+    return (
+      <DialogWrapper title={dialogTitle} borderColor={colors.primary} width={dialogWidth}>
+        {qrContent}
+      </DialogWrapper>
+    );
+  }
+
+  return qrContent;
+}

src/tui/components/TextInput.tsx

@@ -0,0 +1,216 @@
+import React, {useState, useEffect} from 'react';
+import {Text, useInput} from 'ink';
+import chalk from 'chalk';
+import type {Except} from 'type-fest';
+
+export type Props = {
+	/**
+	 * Text to display when `value` is empty.
+	 */
+	readonly placeholder?: string;
+
+	/**
+	 * Listen to user's input. Useful in case there are multiple input components
+	 * at the same time and input must be "routed" to a specific component.
+	 */
+	readonly focus?: boolean; // eslint-disable-line react/boolean-prop-naming
+
+	/**
+	 * Replace all chars and mask the value. Useful for password inputs.
+	 */
+	readonly mask?: string;
+
+	/**
+	 * Whether to show cursor and allow navigation inside text input with arrow keys.
+	 */
+	readonly showCursor?: boolean; // eslint-disable-line react/boolean-prop-naming
+
+	/**
+	 * Highlight pasted text
+	 */
+	readonly highlightPastedText?: boolean; // eslint-disable-line react/boolean-prop-naming
+
+	/**
+	 * Value to display in a text input.
+	 */
+	readonly value: string;
+
+	/**
+	 * Function to call when value updates.
+	 */
+	readonly onChange: (value: string) => void;
+
+	/**
+	 * Function to call when `Enter` is pressed, where first argument is a value of the input.
+	 */
+	readonly onSubmit?: (value: string) => void;
+};
+
+function TextInput({
+	value: originalValue,
+	placeholder = '',
+	focus = true,
+	mask,
+	highlightPastedText = false,
+	showCursor = true,
+	onChange,
+	onSubmit,
+}: Props) {
+	const [state, setState] = useState({
+		cursorOffset: (originalValue || '').length,
+		cursorWidth: 0,
+	});
+
+	const {cursorOffset, cursorWidth} = state;
+
+	useEffect(() => {
+		setState(previousState => {
+			if (!focus || !showCursor) {
+				return previousState;
+			}
+
+			const newValue = originalValue || '';
+
+			if (previousState.cursorOffset > newValue.length - 1) {
+				return {
+					cursorOffset: newValue.length,
+					cursorWidth: 0,
+				};
+			}
+
+			return previousState;
+		});
+	}, [originalValue, focus, showCursor]);
+
+	const cursorActualWidth = highlightPastedText ? cursorWidth : 0;
+
+	const value = mask ? mask.repeat(originalValue.length) : originalValue;
+	let renderedValue = value;
+	let renderedPlaceholder = placeholder ? chalk.grey(placeholder) : undefined;
+
+	// Fake mouse cursor, because it's too inconvenient to deal with actual cursor and ansi escapes
+	if (showCursor && focus) {
+		renderedPlaceholder =
+			placeholder.length > 0
+				? chalk.inverse(placeholder[0]) + chalk.grey(placeholder.slice(1))
+				: chalk.inverse(' ');
+
+		renderedValue = value.length > 0 ? '' : chalk.inverse(' ');
+
+		let i = 0;
+
+		for (const char of value) {
+			renderedValue +=
+				i >= cursorOffset - cursorActualWidth && i <= cursorOffset
+					? chalk.inverse(char)
+					: char;
+
+			i++;
+		}
+
+		if (value.length > 0 && cursorOffset === value.length) {
+			renderedValue += chalk.inverse(' ');
+		}
+	}
+
+	useInput(
+		(input, key) => {
+			if (
+				key.upArrow ||
+				key.downArrow ||
+				(key.ctrl && input === 'c') ||
+				key.tab ||
+				(key.shift && key.tab)
+			) {
+				return;
+			}
+
+			if (key.return) {
+				if (onSubmit) {
+					onSubmit(originalValue);
+				}
+
+				return;
+			}
+
+			let nextCursorOffset = cursorOffset;
+			let nextValue = originalValue;
+			let nextCursorWidth = 0;
+
+			if (key.leftArrow) {
+				if (showCursor) {
+					nextCursorOffset--;
+				}
+			} else if (key.rightArrow) {
+				if (showCursor) {
+					nextCursorOffset++;
+				}
+			} else if (key.backspace || key.delete) {
+				if (cursorOffset > 0) {
+					nextValue =
+						originalValue.slice(0, cursorOffset - 1) +
+						originalValue.slice(cursorOffset, originalValue.length);
+
+					nextCursorOffset--;
+				}
+			} else {
+				nextValue =
+					originalValue.slice(0, cursorOffset) +
+					input +
+					originalValue.slice(cursorOffset, originalValue.length);
+
+				nextCursorOffset += input.length;
+
+				if (input.length > 1) {
+					nextCursorWidth = input.length;
+				}
+			}
+
+			if (cursorOffset < 0) {
+				nextCursorOffset = 0;
+			}
+
+			if (cursorOffset > originalValue.length) {
+				nextCursorOffset = originalValue.length;
+			}
+
+			setState({
+				cursorOffset: nextCursorOffset,
+				cursorWidth: nextCursorWidth,
+			});
+
+			if (nextValue !== originalValue) {
+				onChange(nextValue);
+			}
+		},
+		{isActive: focus},
+	);
+
+	return (
+		<Text>
+			{placeholder
+				? value.length > 0
+					? renderedValue
+					: renderedPlaceholder
+				: renderedValue}
+		</Text>
+	);
+}
+
+export default TextInput;
+
+type UncontrolledProps = {
+	/**
+	 * Initial value.
+	 */
+	readonly initialValue?: string;
+} & Except<Props, 'value' | 'onChange'>;
+
+export function UncontrolledTextInput({
+	initialValue = '',
+	...props
+}: UncontrolledProps) {
+	const [value, setValue] = useState(initialValue);
+
+	return <TextInput {...props} value={value} onChange={setValue} />;
+}

src/tui/components/VariableInputField.tsx

@@ -1,7 +1,7 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { Box, Text } from "ink";
-import TextInput from "ink-text-input";
-import { formatSatoshis } from "../theme.js";
+import TextInput from "./TextInput.js";
+import { useSatoshisConversion } from "../hooks/useSatoshisConversion.js";
 
 interface VariableInputFieldProps {
   variable: {
@@ -19,6 +19,45 @@ interface VariableInputFieldProps {
   focusColor: string;
 }
 
+const SATOSHIS_PER_BCH = 100_000_000n;
+
+/**
+ * Returns true when the variable is an integer satoshis field.
+ */
+function isSatoshisVariable(variable: VariableInputFieldProps["variable"]): boolean {
+  return (
+    variable.type === "integer" &&
+    variable.hint?.toLowerCase().includes("satoshi") === true
+  );
+}
+
+/**
+ * Parse a strict integer string into bigint.
+ */
+function parseSatoshis(value: string): bigint | null {
+  const trimmed = value.trim();
+  if (!/^[-]?\d+$/.test(trimmed)) {
+    return null;
+  }
+
+  try {
+    return BigInt(trimmed);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Format satoshis as BCH with fixed 8 decimals, preserving bigint precision.
+ */
+function formatBchFromSatoshis(satoshis: bigint): string {
+  const sign = satoshis < 0n ? "-" : "";
+  const absolute = satoshis < 0n ? satoshis * -1n : satoshis;
+  const whole = absolute / SATOSHIS_PER_BCH;
+  const fractional = absolute % SATOSHIS_PER_BCH;
+  return `${sign}${whole.toString()}.${fractional.toString().padStart(8, "0")} BCH`;
+}
+
 export function VariableInputField({
   variable,
   index,
@@ -28,6 +67,26 @@ export function VariableInputField({
   borderColor,
   focusColor,
 }: VariableInputFieldProps): React.ReactElement {
+  const { currencyCode, formattedFiatPerBchRate, formatSatoshisToFiat } =
+    useSatoshisConversion("USD");
+  const satoshisValue = useMemo(
+    () => parseSatoshis(variable.value),
+    [variable.value],
+  );
+  const formattedBch = useMemo(() => {
+    if (satoshisValue === null) {
+      return null;
+    }
+    return formatBchFromSatoshis(satoshisValue);
+  }, [satoshisValue]);
+  const formattedFiat = useMemo(() => {
+    if (satoshisValue === null) {
+      return null;
+    }
+    return formatSatoshisToFiat(satoshisValue);
+  }, [satoshisValue, formatSatoshisToFiat]);
+  const shouldShowSatoshisConversion = isSatoshisVariable(variable);
+
   return (
     <Box flexDirection="column" marginBottom={1}>
       <Text color={focusColor}>{variable.name}</Text>
@@ -55,12 +114,29 @@ export function VariableInputField({
         <Text color={borderColor} dimColor>{variable.hint}</Text>
         
       </Box>
-      {variable.type === 'integer' && variable.hint === 'satoshis' && (
-        <Box>
+      {shouldShowSatoshisConversion && (
+        <Box flexDirection="column">
+          {formattedBch ? (
+            <>
               <Text color={borderColor} dimColor>
-            {/* Convert from sats to bch. NOTE: we can't use the formatSatoshis function because it is too verbose and returns too many values in the string*/}
-            {(Number(variable.value) / 100_000_000).toFixed(8)} BCH
+                {formattedBch}
               </Text>
+              <Text color={borderColor} dimColor>
+                {formattedFiat
+                  ? `Approx. ${currencyCode}: ${formattedFiat}`
+                  : `Approx. ${currencyCode}: waiting for live rate...`}
+              </Text>
+              {formattedFiatPerBchRate && (
+                <Text color={borderColor} dimColor>
+                  1 BCH = {formattedFiatPerBchRate}
+                </Text>
+              )}
+            </>
+          ) : (
+            <Text color={borderColor} dimColor>
+              Enter a whole satoshi amount to preview BCH/{currencyCode} conversion.
+            </Text>
+          )}
         </Box>
       )}
     </Box>

src/tui/components/index.ts

@@ -2,9 +2,9 @@
  * Export all shared components.
  */
 
-export { Screen } from './Screen.js';
-export { Input, TextDisplay } from './Input.js';
-export { Button, ButtonRow } from './Button.js';
+export { Screen } from "./Screen.js";
+export { Input, TextDisplay } from "./Input.js";
+export { Button, ButtonRow } from "./Button.js";
 export {
   List,
   SimpleList,
@@ -13,6 +13,12 @@ export {
   type ListItemData,
   type ListGroup,
   type ScrollableListProps,
-} from './List.js';
-export { InputDialog, ConfirmDialog, MessageDialog } from './Dialog.js';
-export { ProgressBar, StepIndicator, Loading, type Step } from './ProgressBar.js';
+} from "./List.js";
+export { InputDialog, ConfirmDialog, MessageDialog } from "./Dialog.js";
+export {
+  ProgressBar,
+  StepIndicator,
+  Loading,
+  type Step,
+} from "./ProgressBar.js";
+export { QRCode } from "./QRCode.js";

src/tui/hooks/index.ts

@@ -2,12 +2,26 @@
  * Export all hooks.
  */
 
-export { NavigationProvider, useNavigation } from './useNavigation.js';
-export { AppProvider, useAppContext, useDialog, useStatus } from './useAppContext.js';
+export { NavigationProvider, useNavigation } from "./useNavigation.js";
+export {
+  AppProvider,
+  useAppContext,
+  useDialog,
+  useStatus,
+} from "./useAppContext.js";
 export {
   useInvitations,
   useInvitation,
   useInvitationData,
   useCreateInvitation,
   useInvitationIds,
-} from './useInvitations.js';
+} from "./useInvitations.js";
+export {
+  InputLayerProvider,
+  useInputLayer,
+  useLayeredInput,
+  useBlockableInput,
+  useIsInputCaptured,
+} from "./useInputLayer.js";
+export { useRate, useBchToFiatRate } from "./useRates.js";
+export { useSatoshisConversion } from "./useSatoshisConversion.js";

src/tui/hooks/useInputLayer.tsx

@@ -0,0 +1,169 @@
+/**
+ * Input Layer System — stack-based keyboard input capture for dialogs and overlays.
+ *
+ * Only "capturing" components (dialogs, overlays, import flows) register layers.
+ * When any layer exists on the stack, all non-capturing input handlers are blocked.
+ *
+ * Hooks:
+ * - `useInputLayer(id)`    — push a capturing layer (dialogs/overlays).
+ * - `useLayeredInput(id, …)` — handle input for a specific capturing layer.
+ * - `useBlockableInput(…)` — handle input for screens / global keys; auto-blocked
+ *                             when any capturing layer is on the stack.
+ * - `useIsInputCaptured()` — returns true when a capturing layer is present
+ *                             (useful for disabling `focus` on child components).
+ */
+
+import React, {
+  createContext,
+  useContext,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ReactNode,
+} from 'react';
+import { useInput } from 'ink';
+
+// ── Context ──────────────────────────────────────────────────────────────────
+
+interface InputLayerContextType {
+  /** Push a capturing layer. Returns a cleanup that pops it. */
+  push: (layerId: string) => () => void;
+  /** True when `layerId` is the topmost entry in the stack. */
+  isTop: (layerId: string) => boolean;
+  /** True when the stack has no entries (no dialog/overlay is capturing). */
+  isStackEmpty: () => boolean;
+  /** Monotonic counter — bumped on every push/pop so consumers re-render. */
+  version: number;
+}
+
+const InputLayerContext = createContext<InputLayerContextType | null>(null);
+
+// ── Provider ─────────────────────────────────────────────────────────────────
+
+interface InputLayerProviderProps {
+  children: ReactNode;
+}
+
+/**
+ * Wraps the component tree and provides the input-layer stack.
+ *
+ * Place this inside your outermost providers but above any component
+ * that calls the input-layer hooks.
+ */
+export function InputLayerProvider({ children }: InputLayerProviderProps): React.ReactElement {
+  const stackRef = useRef<string[]>([]);
+  const [version, setVersion] = useState(0);
+
+  const bump = useCallback(() => setVersion((v) => v + 1), []);
+
+  const push = useCallback(
+    (layerId: string): (() => void) => {
+      stackRef.current = [...stackRef.current, layerId];
+      bump();
+      return () => {
+        stackRef.current = stackRef.current.filter((id) => id !== layerId);
+        bump();
+      };
+    },
+    [bump],
+  );
+
+  const isTop = useCallback(
+    (layerId: string): boolean => {
+      const s = stackRef.current;
+      return s.length > 0 && s[s.length - 1] === layerId;
+    },
+    [],
+  );
+
+  const isStackEmpty = useCallback(
+    (): boolean => stackRef.current.length === 0,
+    [],
+  );
+
+  const value = useMemo<InputLayerContextType>(
+    () => ({ push, isTop, isStackEmpty, version }),
+    [push, isTop, isStackEmpty, version],
+  );
+
+  return (
+    <InputLayerContext.Provider value={value}>
+      {children}
+    </InputLayerContext.Provider>
+  );
+}
+
+// ── Hooks ────────────────────────────────────────────────────────────────────
+
+/**
+ * Register a **capturing** layer (dialog / overlay / import flow).
+ *
+ * Pushes on mount, pops on unmount. While this layer is present every
+ * `useBlockableInput` handler in the tree is automatically disabled.
+ *
+ * @returns `{ isActive }` — true only when this layer is the topmost.
+ */
+export function useInputLayer(layerId: string): { isActive: boolean } {
+  const ctx = useContext(InputLayerContext);
+  if (!ctx) {
+    throw new Error('useInputLayer must be used within an InputLayerProvider');
+  }
+
+  const { push } = ctx;
+  useEffect(() => {
+    const pop = push(layerId);
+    return pop;
+  }, [push, layerId]);
+
+  return { isActive: ctx.isTop(layerId) };
+}
+
+/**
+ * Input handler for a **capturing** layer.
+ *
+ * Only fires when `layerId` is the topmost entry in the stack.
+ */
+export function useLayeredInput(
+  layerId: string,
+  handler: (input: string, key: any) => void,
+  options?: { isActive?: boolean },
+): void {
+  const ctx = useContext(InputLayerContext);
+  if (!ctx) {
+    throw new Error('useLayeredInput must be used within an InputLayerProvider');
+  }
+
+  const isTopLayer = ctx.isTop(layerId);
+  const externalActive = options?.isActive !== false;
+  useInput(handler, { isActive: isTopLayer && externalActive });
+}
+
+/**
+ * Input handler for **non-capturing** components (screens, global keys).
+ *
+ * Fires only when the capture stack is empty (no dialog/overlay is open).
+ * This is the hook screens should use instead of raw `useInput`.
+ */
+export function useBlockableInput(
+  handler: (input: string, key: any) => void,
+  options?: { isActive?: boolean },
+): void {
+  const ctx = useContext(InputLayerContext);
+
+  const nothingCapturing = ctx ? ctx.isStackEmpty() : true;
+  const externalActive = options?.isActive !== false;
+  useInput(handler, { isActive: nothingCapturing && externalActive });
+}
+
+/**
+ * Returns `true` when any capturing layer is on the stack.
+ *
+ * Use this to disable `focus` props on child components (e.g. ScrollableList)
+ * so their internal `useInput` handlers don't fire while a dialog is open.
+ */
+export function useIsInputCaptured(): boolean {
+  const ctx = useContext(InputLayerContext);
+  return ctx ? !ctx.isStackEmpty() : false;
+}

src/tui/hooks/useRates.tsx

@@ -0,0 +1,68 @@
+import { useCallback, useMemo, useSyncExternalStore } from 'react';
+import type { RatesServiceEventMap } from '../../services/rates.js';
+import { useAppContext } from './useAppContext.js';
+
+/**
+ * Reactive hook for a single market pair.
+ *
+ * Pair format is NUMERATOR / DENOMINATOR, e.g. USD / BCH.
+ */
+export function useRate(
+  numeratorUnitCode: string,
+  denominatorUnitCode: string,
+): number | null {
+  const { appService } = useAppContext();
+
+  const normalizedNumerator = useMemo(
+    () => numeratorUnitCode.toUpperCase(),
+    [numeratorUnitCode],
+  );
+  
+  const normalizedDenominator = useMemo(
+    () => denominatorUnitCode.toUpperCase(),
+    [denominatorUnitCode],
+  );
+
+  const subscribe = useCallback(
+    (callback: () => void) => {
+      if (!appService) {
+        return () => {};
+      }
+
+      const onRateUpdated = (event: RatesServiceEventMap['rate-updated']) => {
+        if (
+          event.numeratorUnitCode === normalizedNumerator &&
+          event.denominatorUnitCode === normalizedDenominator
+        ) {
+          callback();
+        }
+      };
+
+      const unsubscribe = appService.rates.on('rate-updated', onRateUpdated);
+
+      return () => {
+        unsubscribe();
+      };
+    },
+    [appService, normalizedNumerator, normalizedDenominator],
+  );
+
+  const getSnapshot = useCallback(() => {
+    if (!appService) {
+      return null;
+    }
+
+    return appService.rates.getRate(normalizedNumerator, normalizedDenominator);
+  }, [appService, normalizedNumerator, normalizedDenominator]);
+
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+}
+
+/**
+ * Convenience hook for BCH -> fiat market rates.
+ */
+export function useBchToFiatRate(
+  targetCurrency: string = 'USD',
+): number | null {
+  return useRate(targetCurrency, 'BCH');
+}

src/tui/hooks/useSatoshisConversion.tsx

@@ -0,0 +1,42 @@
+import { useCallback, useMemo } from 'react';
+import { useAppContext } from './useAppContext.js';
+import { useBchToFiatRate } from './useRates.js';
+
+/**
+ * Reactive BCH satoshis -> fiat conversion helpers for TUI screens.
+ *
+ * This hook subscribes to rate updates through `useBchToFiatRate`, so any
+ * component using it will re-render automatically when the selected pair
+ * receives a new quote.
+ */
+export function useSatoshisConversion(targetCurrency: string = 'USD') {
+  const { appService } = useAppContext();
+  const currencyCode = useMemo(() => targetCurrency.toUpperCase(), [targetCurrency]);
+  const fiatPerBchRate = useBchToFiatRate(currencyCode);
+
+  const formattedFiatPerBchRate = useMemo(() => {
+    if (!appService || fiatPerBchRate === null) {
+      return null;
+    }
+
+    return appService.rates.formatCurrency(fiatPerBchRate, currencyCode);
+  }, [appService, fiatPerBchRate, currencyCode]);
+
+  const formatSatoshisToFiat = useCallback(
+    (satoshis: bigint): string | null => {
+      if (!appService || fiatPerBchRate === null) {
+        return null;
+      }
+
+      return appService.rates.formatBchToFiat(satoshis, currencyCode);
+    },
+    [appService, fiatPerBchRate, currencyCode],
+  );
+
+  return {
+    currencyCode,
+    fiatPerBchRate,
+    formattedFiatPerBchRate,
+    formatSatoshisToFiat,
+  } as const;
+}

src/tui/screens/SeedInput.tsx

@@ -1,25 +1,90 @@
 /**
  * Seed Input Screen - Initial screen for wallet seed phrase entry.
  * 
- * Allows users to enter their BIP39 seed phrase to initialize the wallet.
+ * Allows users to enter their BIP39 seed phrase to initialize the wallet,
+ * or select from previously saved mnemonic files on disk.
  */
 
-import React, { useState, useCallback } from 'react';
-import { Box, Text, useInput } from 'ink';
-import TextInput from 'ink-text-input';
+import React, { useState, useCallback, useEffect } from 'react';
+import { Box, Text } from 'ink';
+import TextInput from '../components/TextInput.js';
 import { Button } from '../components/Button.js';
 import { useNavigation } from '../hooks/useNavigation.js';
 import { useAppContext, useStatus } from '../hooks/useAppContext.js';
+import { useBlockableInput } from '../hooks/useInputLayer.js';
 import { colors, logo } from '../theme.js';
 
+import fs from 'fs';
+import path from 'path';
+import { createMnemonicFile } from '../../cli/mnemonic.js';
+import { getMnemonicsDir } from '../../utils/paths.js';
+import { BCHMnemonicURL } from '../../utils/bch-mnemonic-url.js';
+import { encodeBip39Mnemonic } from '@bitauth/libauth';
+
 /**
  * Status message type.
  */
 type StatusType = 'idle' | 'loading' | 'error' | 'success';
 
+/**
+ * Parsed mnemonic file entry with the derived seed phrase ready for wallet init.
+ */
+interface MnemonicFileEntry {
+  filename: string;
+  /** Friendly label derived from filename or the URL comment field. */
+  label: string;
+  /** The BIP39 mnemonic phrase derived from the file's entropy. */
+  mnemonic: string;
+}
+
+/**
+ * Focus sections the user can tab between.
+ * When saved wallets exist the file list is shown first.
+ */
+type FocusSection = 'files' | 'input' | 'saveCheckbox' | 'button';
+
+/**
+ * Reads mnemonic-* files from ~/.config/xo-cli/mnemonics/ (same as xo-cli),
+ * then from cwd for legacy installs. Parses each as a BCHMnemonicURL.
+ */
+function loadMnemonicFiles(): MnemonicFileEntry[] {
+  const dirs = [getMnemonicsDir(), process.cwd()];
+  const seenBasenames = new Set<string>();
+  const entries: MnemonicFileEntry[] = [];
+
+  for (const dir of dirs) {
+    if (!fs.existsSync(dir)) continue;
+    const filenames = fs
+      .readdirSync(dir)
+      .filter((f) => f.startsWith('mnemonic-'));
+    for (const filename of filenames) {
+      if (seenBasenames.has(filename)) continue;
+      try {
+        const content = fs.readFileSync(path.join(dir, filename), 'utf-8').trim();
+        const parsed = BCHMnemonicURL.fromURL(content);
+        const raw = parsed.toObject();
+
+        const mnemonicResult = encodeBip39Mnemonic(raw.entropy);
+        if (typeof mnemonicResult === 'string') continue;
+
+        /** Use the URL comment as the label, falling back to a cleaned-up filename. */
+        const label = raw.comment
+          ?? filename.replace(/^mnemonic-/, '').replace(/\.[^.]+$/, '');
+
+        entries.push({ filename, label, mnemonic: mnemonicResult.phrase });
+        seenBasenames.add(filename);
+      } catch {
+        // Skip files that can't be parsed
+      }
+    }
+  }
+  return entries;
+}
+
 /**
  * Seed Input Screen Component.
- * Provides seed phrase entry for wallet initialization.
+ * Provides seed phrase entry for wallet initialization and a selectable
+ * list of previously saved mnemonic files.
  */
 export function SeedInputScreen(): React.ReactElement {
   const { navigate } = useNavigation();
@@ -30,9 +95,31 @@ export function SeedInputScreen(): React.ReactElement {
   const [seedPhrase, setSeedPhrase] = useState('');
   const [statusMessage, setStatusMessage] = useState('');
   const [statusType, setStatusType] = useState<StatusType>('idle');
-  const [focusedElement, setFocusedElement] = useState<'input' | 'button'>('input');
   const [isSubmitting, setIsSubmitting] = useState(false);
 
+  // Mnemonic file list state
+  const [mnemonicFiles, setMnemonicFiles] = useState<MnemonicFileEntry[]>([]);
+  const [selectedFileIndex, setSelectedFileIndex] = useState(0);
+
+  /** When set, manual seed is written to ~/.config/xo-cli/mnemonics/ after a successful unlock. */
+  const [saveMnemonicChecked, setSaveMnemonicChecked] = useState(false);
+
+  // Focus: when saved wallets exist default to the file list, otherwise the input.
+  const [focusedSection, setFocusedSection] = useState<FocusSection>('input');
+
+  useEffect(() => {
+    const entries = loadMnemonicFiles();
+    setMnemonicFiles(entries);
+    if (entries.length > 0) setFocusedSection('files');
+  }, []);
+
+  /**
+   * The ordered list of focusable sections (files section only when entries exist).
+   */
+  const focusSections: FocusSection[] = mnemonicFiles.length > 0
+    ? ['files', 'input', 'saveCheckbox', 'button']
+    : ['input', 'saveCheckbox', 'button'];
+
   /**
    * Shows a status message with the given type.
    */
@@ -42,12 +129,55 @@ export function SeedInputScreen(): React.ReactElement {
   }, []);
 
   /**
-   * Handles seed phrase submission.
+   * Shared wallet initialization handler used by both manual entry and file selection.
+   */
+  const doInitialize = useCallback(
+    async (seed: string, options?: { saveMnemonic?: boolean }) => {
+      showStatus('Initializing wallet...', 'loading');
+      setStatus('Initializing wallet...');
+      setIsSubmitting(true);
+
+      try {
+        await initializeWallet(seed);
+
+        let statusText = 'Wallet initialized successfully!';
+        if (options?.saveMnemonic) {
+          try {
+            const savedAs = createMnemonicFile(getMnemonicsDir(), seed);
+            setMnemonicFiles(loadMnemonicFiles());
+            statusText = `Wallet initialized! Mnemonic saved as ${savedAs}`;
+          } catch (saveErr) {
+            const saveMsg =
+              saveErr instanceof Error ? saveErr.message : String(saveErr);
+            statusText = `Wallet initialized, but could not save mnemonic: ${saveMsg}`;
+          }
+        }
+
+        showStatus(statusText, 'success');
+        setStatus('Wallet ready');
+        setSeedPhrase('');
+        setSaveMnemonicChecked(false);
+
+        setTimeout(() => {
+          navigate('wallet');
+        }, 500);
+      } catch (error) {
+        const message =
+          error instanceof Error ? error.message : 'Failed to initialize wallet';
+        showStatus(message, 'error');
+        setStatus('Initialization failed');
+        setIsSubmitting(false);
+      }
+    },
+    [initializeWallet, navigate, showStatus, setStatus],
+  );
+
+  /**
+   * Handles manual seed phrase submission with validation.
    */
   const handleSubmit = useCallback(async () => {
     const seed = seedPhrase.trim();
 
-    // Basic validation
     if (!seed) {
       showStatus('Please enter your seed phrase', 'error');
       return;
@@ -59,60 +189,74 @@ export function SeedInputScreen(): React.ReactElement {
       return;
     }
 
-    // Show loading status
-    showStatus('Initializing wallet...', 'loading');
-    setStatus('Initializing wallet...');
-    setIsSubmitting(true);
+    await doInitialize(seed, { saveMnemonic: saveMnemonicChecked });
+  }, [seedPhrase, saveMnemonicChecked, doInitialize, showStatus]);
 
-    try {
-      // Initialize wallet and create AppService
-      await initializeWallet(seed);
+  /**
+   * Handles selecting a mnemonic file from the list.
+   */
+  const handleFileSelect = useCallback(async (index: number) => {
+    const entry = mnemonicFiles[index];
+    if (!entry) return;
+    await doInitialize(entry.mnemonic);
+  }, [mnemonicFiles, doInitialize]);
 
-      showStatus('Wallet initialized successfully!', 'success');
-      setStatus('Wallet ready');
-      
-      // Clear sensitive data before navigating
-      setSeedPhrase('');
-      
-      // Navigate to wallet state screen
-      setTimeout(() => {
-        navigate('wallet');
-      }, 500);
-
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Failed to initialize wallet';
-      showStatus(message, 'error');
-      setStatus('Initialization failed');
-      setIsSubmitting(false);
-    }
-  }, [seedPhrase, initializeWallet, navigate, showStatus, setStatus]);
-
-  // Handle keyboard navigation
-  useInput((input, key) => {
+  // Keyboard navigation
+  useBlockableInput((_input, key) => {
     if (isSubmitting) return;
 
-    // Tab to switch focus
+    // Tab / Shift-Tab to cycle focus sections
     if (key.tab) {
-      setFocusedElement(prev => prev === 'input' ? 'button' : 'input');
+      setFocusedSection((prev) => {
+        const idx = focusSections.indexOf(prev);
+        const next = key.shift
+          ? (idx - 1 + focusSections.length) % focusSections.length
+          : (idx + 1) % focusSections.length;
+        return focusSections[next]!;
+      });
+      return;
     }
 
-    // Enter on button submits
-    if (key.return && focusedElement === 'button') {
+    // Space or Enter toggles "save mnemonic" when that row is focused
+    if (focusedSection === 'saveCheckbox') {
+      if (_input === ' ' || key.return) {
+        setSaveMnemonicChecked((v) => !v);
+        return;
+      }
+    }
+
+    // Arrow keys inside the file list
+    if (focusedSection === 'files' && mnemonicFiles.length > 0) {
+      if (key.upArrow) {
+        setSelectedFileIndex((prev) => Math.max(0, prev - 1));
+        return;
+      }
+      if (key.downArrow) {
+        setSelectedFileIndex((prev) => Math.min(mnemonicFiles.length - 1, prev + 1));
+        return;
+      }
+      if (key.return) {
+        handleFileSelect(selectedFileIndex);
+        return;
+      }
+    }
+
+    // Enter on button submits manual seed
+    if (key.return && focusedSection === 'button') {
       handleSubmit();
     }
   });
 
-  // Get status color
+  // Derived style helpers
   const statusColor = statusType === 'error' ? colors.error :
                       statusType === 'success' ? colors.success :
                       statusType === 'loading' ? colors.info :
                       colors.textMuted;
 
-  // Get border color based on status
   const inputBorderColor = statusType === 'error' ? colors.error :
                            statusType === 'success' ? colors.success :
-                           focusedElement === 'input' ? colors.focus :
-                           colors.border;
+                           focusedSection === 'input' ? colors.focus :
+                           colors.borderMuted;
 
   return (
     <Box flexDirection='column' alignItems='center' paddingY={1}>
@@ -123,14 +267,82 @@ export function SeedInputScreen(): React.ReactElement {
 
       {/* Title */}
       <Text color={colors.text} bold>Welcome to XO Wallet CLI</Text>
-      <Text color={colors.textMuted}>Enter your seed phrase to get started</Text>
+      <Text color={colors.textMuted}>Enter your seed phrase or select a saved wallet</Text>
 
-      {/* Spacer */}
       <Box marginY={1} />
 
-      {/* Input section */}
       <Box flexDirection='column' width={64}>
-        <Text color={colors.text} bold>Seed Phrase (12 or 24 words):</Text>
+        {/* ── Saved Wallets ─────────────────────────────────── */}
+        {mnemonicFiles.length > 0 && (
+          <Box flexDirection='column' marginBottom={1}>
+            <Box marginBottom={1}>
+              <Text color={colors.primary} bold>
+                {'▸ '}Saved Wallets
+              </Text>
+              <Text color={colors.textMuted}> ({mnemonicFiles.length})</Text>
+            </Box>
+
+            <Box
+              flexDirection='column'
+              borderStyle='single'
+              borderColor={focusedSection === 'files' ? colors.focus : colors.borderMuted}
+              paddingX={1}
+            >
+              {mnemonicFiles.map((entry, idx) => {
+                const isHighlighted = focusedSection === 'files' && idx === selectedFileIndex;
+
+                return (
+                  <Box key={entry.filename} paddingY={0}>
+                    <Text
+                      color={isHighlighted ? colors.bg : colors.textMuted}
+                      backgroundColor={isHighlighted ? colors.focus : undefined}
+                      bold={isHighlighted}
+                    >
+                      {isHighlighted ? ' ▶ ' : '   '}
+                    </Text>
+                    <Text
+                      color={isHighlighted ? colors.bg : colors.text}
+                      backgroundColor={isHighlighted ? colors.focus : undefined}
+                      bold={isHighlighted}
+                    >
+                      {` ${entry.label} `}
+                    </Text>
+                    <Text
+                      color={isHighlighted ? colors.bg : colors.textMuted}
+                      backgroundColor={isHighlighted ? colors.focus : undefined}
+                      dimColor={!isHighlighted}
+                    >
+                      {` (${entry.filename})`}
+                    </Text>
+                  </Box>
+                );
+              })}
+            </Box>
+
+            {focusedSection === 'files' && (
+              <Box marginTop={0} paddingX={1}>
+                <Text color={colors.textMuted} dimColor>
+                  ↑↓ navigate • Enter: load wallet
+                </Text>
+              </Box>
+            )}
+          </Box>
+        )}
+
+        {/* ── Divider between sections ──────────────────────── */}
+        {mnemonicFiles.length > 0 && (
+          <Box marginBottom={1} justifyContent='center'>
+            <Text color={colors.borderMuted}>{'─'.repeat(20)} or {'─'.repeat(20)}</Text>
+          </Box>
+        )}
+
+        {/* ── Manual Seed Entry ─────────────────────────────── */}
+        <Text color={colors.primary} bold>
+          {'▸ '}Manual Entry
+        </Text>
+        <Box marginTop={1}>
+          <Text color={colors.text}>Seed Phrase (12 or 24 words):</Text>
+        </Box>
         <Box
           borderStyle='single'
           borderColor={inputBorderColor}
@@ -142,10 +354,36 @@ export function SeedInputScreen(): React.ReactElement {
             onChange={setSeedPhrase}
             onSubmit={handleSubmit}
             placeholder='Enter your seed phrase...'
-            focus={focusedElement === 'input' && !isSubmitting}
+            focus={focusedSection === 'input' && !isSubmitting}
           />
         </Box>
 
+        {/* Save mnemonic checkbox (manual entry only; applies on Continue) */}
+        <Box
+          marginTop={1}
+          paddingX={1}
+          borderStyle='single'
+          borderColor={
+            focusedSection === 'saveCheckbox' ? colors.focus : colors.borderMuted
+          }
+        >
+          <Text
+            color={focusedSection === 'saveCheckbox' ? colors.focus : colors.text}
+            bold={focusedSection === 'saveCheckbox'}
+          >
+            {saveMnemonicChecked ? '[x] ' : '[ ] '}
+          </Text>
+          <Text color={colors.text}>Save this mnemonic</Text>
+          <Text color={colors.textMuted}> (~/.config/xo-cli/mnemonics/)</Text>
+        </Box>
+        {focusedSection === 'saveCheckbox' && (
+          <Box marginTop={0} paddingX={1}>
+            <Text color={colors.textMuted} dimColor>
+              Space / Enter: toggle
+            </Text>
+          </Box>
+        )}
+
         {/* Status message */}
         <Box marginTop={1} height={1}>
           {statusMessage && (
@@ -162,7 +400,7 @@ export function SeedInputScreen(): React.ReactElement {
         <Box justifyContent='center' marginTop={1}>
           <Button
             label='Continue'
-            focused={focusedElement === 'button'}
+            focused={focusedSection === 'button'}
             disabled={isSubmitting}
             shortcut='Enter'
           />
@@ -172,7 +410,7 @@ export function SeedInputScreen(): React.ReactElement {
       {/* Help text */}
       <Box marginTop={2}>
         <Text color={colors.textMuted} dimColor>
-          Tab: navigate • Enter: submit • q: quit
+          Tab: navigate • Enter: submit, load wallet, or toggle save • Space: toggle save • Esc: back
         </Text>
       </Box>
     </Box>

src/tui/screens/TemplateList.tsx

@@ -7,10 +7,11 @@
  */
 
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
-import { Box, Text, useInput } from 'ink';
+import { Box, Text } from 'ink';
 import { ScrollableList, type ListItemData } from '../components/List.js';
 import { useNavigation } from '../hooks/useNavigation.js';
 import { useAppContext, useStatus } from '../hooks/useAppContext.js';
+import { useBlockableInput } from '../hooks/useInputLayer.js';
 import { colors, logoSmall } from '../theme.js';
 
 // XO Imports
@@ -21,10 +22,7 @@ import type { XOTemplate } from '@xo-cash/types';
 import {
   formatTemplateListItem,
   formatActionListItem,
-  deduplicateStartingActions,
   getTemplateRoles,
-  getRolesForAction,
-  type UniqueStartingAction,
 } from '../../utils/template-utils.js';
 
 /**
@@ -33,7 +31,7 @@ import {
 interface TemplateItem {
   template: XOTemplate;
   templateIdentifier: string;
-  startingActions: UniqueStartingAction[];
+  availableActions: TemplateActionItem[];
 }
 
 /**
@@ -42,9 +40,17 @@ interface TemplateItem {
 type TemplateListItem = ListItemData<TemplateItem>;
 
 /**
- * Action list item with UniqueStartingAction value.
+ * Action list item with available action value.
  */
-type ActionListItem = ListItemData<UniqueStartingAction>;
+type ActionListItem = ListItemData<TemplateActionItem>;
+
+interface TemplateActionItem {
+  actionIdentifier: string;
+  name: string;
+  description?: string;
+  roles: string[];
+  source: 'starting' | 'next' | 'starting+next';
+}
 
 /**
  * Template List Screen Component.
@@ -76,19 +82,90 @@ export function TemplateListScreen(): React.ReactElement {
       setStatus('Loading templates...');
 
       const templateList = await appService.engine.listImportedTemplates();
+      const allUtxos = await appService.engine.listUnspentOutputsData();
+
+      const ownedOutputsByTemplate = new Map<string, Set<string>>();
+      for (const utxo of allUtxos) {
+        const existing = ownedOutputsByTemplate.get(utxo.templateIdentifier) ?? new Set<string>();
+        existing.add(utxo.outputIdentifier);
+        ownedOutputsByTemplate.set(utxo.templateIdentifier, existing);
+      }
 
       const loadedTemplates = await Promise.all(
         templateList.map(async (template) => {
           const templateIdentifier = generateTemplateIdentifier(template);
           const rawStartingActions = await appService.engine.listStartingActions(templateIdentifier);
+          const actionMap = new Map<string, TemplateActionItem>();
 
-          // Use utility function to deduplicate actions
-          const startingActions = deduplicateStartingActions(template, rawStartingActions);
+          for (const startingAction of rawStartingActions) {
+            const existing = actionMap.get(startingAction.action);
+            if (existing) {
+              if (!existing.roles.includes(startingAction.role ?? '')) {
+                existing.roles.push(startingAction.role ?? '');
+              }
+              continue;
+            }
+
+            const actionDef = template.actions?.[startingAction.action];
+            actionMap.set(startingAction.action, {
+              actionIdentifier: startingAction.action,
+              name: actionDef?.name || startingAction.action,
+              description: actionDef?.description,
+              roles: [startingAction.role ?? ''],
+              source: 'starting',
+            });
+          }
+
+          const ownedOutputIdentifiers = ownedOutputsByTemplate.get(templateIdentifier) ?? new Set<string>();
+          for (const outputIdentifier of ownedOutputIdentifiers) {
+            const outputDef = template.outputs?.[outputIdentifier];
+            if (!outputDef || typeof outputDef.lockingScript !== 'string') continue;
+
+            const lockingScriptDefinition = (template.lockingScripts as Record<string, unknown> | undefined)?.[outputDef.lockingScript] as
+              | { roles?: Record<string, { actions?: Array<{ action?: string; role?: string } | string> }> }
+              | undefined;
+            if (!lockingScriptDefinition?.roles) continue;
+
+            for (const [lockscriptRoleId, lockscriptRoleDef] of Object.entries(lockingScriptDefinition.roles)) {
+              for (const actionSpec of lockscriptRoleDef.actions ?? []) {
+                const actionIdentifier = typeof actionSpec === 'string'
+                  ? actionSpec
+                  : actionSpec.action;
+                if (!actionIdentifier) continue;
+
+                const roleIdentifier = typeof actionSpec === 'string'
+                  ? lockscriptRoleId
+                  : (actionSpec.role ?? lockscriptRoleId);
+
+                const existing = actionMap.get(actionIdentifier);
+                if (existing) {
+                  if (!existing.roles.includes(roleIdentifier)) {
+                    existing.roles.push(roleIdentifier);
+                  }
+                  if (existing.source === 'starting') {
+                    existing.source = 'starting+next';
+                  }
+                  continue;
+                }
+
+                const actionDef = template.actions?.[actionIdentifier];
+                actionMap.set(actionIdentifier, {
+                  actionIdentifier,
+                  name: actionDef?.name || actionIdentifier,
+                  description: actionDef?.description,
+                  roles: [roleIdentifier],
+                  source: 'next',
+                });
+              }
+            }
+          }
+
+          const availableActions = Array.from(actionMap.values()).sort((a, b) => a.name.localeCompare(b.name));
 
           return {
             template,
             templateIdentifier,
-            startingActions,
+            availableActions,
           };
         })
       );
@@ -111,7 +188,7 @@ export function TemplateListScreen(): React.ReactElement {
 
   // Get current template and its actions
   const currentTemplate = templates[selectedTemplateIndex];
-  const currentActions = currentTemplate?.startingActions ?? [];
+  const currentActions = currentTemplate?.availableActions ?? [];
 
   /**
    * Build template list items for ScrollableList.
@@ -137,12 +214,13 @@ export function TemplateListScreen(): React.ReactElement {
       const formatted = formatActionListItem(
         action.actionIdentifier,
         currentTemplate?.template?.actions?.[action.actionIdentifier],
-        action.roleCount,
+        action.roles.length,
         index
       );
+
       return {
         key: action.actionIdentifier,
-        label: formatted.label,
+        label: `${formatted.label}`,
         description: formatted.description,
         value: action,
         hidden: !formatted.isValid,
@@ -171,13 +249,13 @@ export function TemplateListScreen(): React.ReactElement {
     navigate('wizard', {
       templateIdentifier: currentTemplate.templateIdentifier,
       actionIdentifier: action.actionIdentifier,
+      actionRoles: action.roles,
       template: currentTemplate.template,
     });
   }, [currentTemplate, navigate]);
 
   // Handle keyboard navigation
-  useInput((input, key) => {
-    // Tab to switch panels
+  useBlockableInput((_input, key) => {
     if (key.tab) {
       setFocusedPanel(prev => prev === 'templates' ? 'actions' : 'templates');
       return;
@@ -267,7 +345,7 @@ export function TemplateListScreen(): React.ReactElement {
             paddingX={1}
             flexGrow={1}
           >
-            <Text color={colors.primary} bold> Starting Actions </Text>
+            <Text color={colors.primary} bold> Available Actions </Text>
             {isLoading ? (
               <Box marginTop={1}>
                 <Text color={colors.textMuted}>Loading...</Text>
@@ -283,7 +361,7 @@ export function TemplateListScreen(): React.ReactElement {
                 onSelect={setSelectedActionIndex}
                 onActivate={handleActionActivate}
                 focus={focusedPanel === 'actions'}
-                emptyMessage="No starting actions available"
+                emptyMessage="No actions available"
                 renderItem={renderActionItem}
               />
             )}
@@ -339,9 +417,6 @@ export function TemplateListScreen(): React.ReactElement {
                 const action = currentActions[selectedActionIndex];
                 if (!action) return null;
 
-                // Get roles that can start this action using utility function
-                const availableRoles = getRolesForAction(currentTemplate.template, action.actionIdentifier);
-
                 return (
                   <>
                     <Text color={colors.text} bold>
@@ -351,16 +426,24 @@ export function TemplateListScreen(): React.ReactElement {
                       {action.description || 'No description available'}
                     </Text>
 
-                    {/* List available roles for this action */}
-                    {availableRoles.length > 0 && (
+                    {/* List roles available for this action in current context */}
+                    {action.roles.length > 0 && (
                       <Box marginTop={1} flexDirection="column">
                         <Text color={colors.text}>Available Roles:</Text>
-                        {availableRoles.map((role) => (
-                          <Text key={role.roleId} color={colors.textMuted}>
-                            {'  '}- {role.name}
-                            {role.description ? `: ${role.description}` : ''}
+                        {action.roles.map((roleId) => {
+                          const roleDef = currentTemplate.template.roles?.[roleId];
+                          const roleName = typeof roleDef === 'object' ? roleDef?.name ?? roleId : roleId;
+                          const roleDescription = typeof roleDef === 'object' ? roleDef?.description : undefined;
+                          return (
+                            <Text key={roleId} color={colors.textMuted}>
+                              {'  '}- {roleName}
+                              {roleDescription ? `: ${roleDescription}` : ''}
+                            </Text>
+                          );
+                        })}
+                        <Text color={colors.textMuted}>
+                          {'  '}Source: {action.source}
                         </Text>
-                        ))}
                       </Box>
                     )}
                   </>
@@ -370,7 +453,7 @@ export function TemplateListScreen(): React.ReactElement {
           ) : focusedPanel === 'actions' && !currentTemplate ? (
             <Text color={colors.textMuted}>Select a template first</Text>
           ) : focusedPanel === 'actions' && currentActions.length === 0 ? (
-            <Text color={colors.textMuted}>No starting actions available</Text>
+            <Text color={colors.textMuted}>No actions available</Text>
           ) : null}
         </Box>
       </Box>

src/tui/screens/Transaction.tsx

@@ -9,14 +9,14 @@
  */
 
 import React, { useState, useEffect, useCallback } from 'react';
-import { Box, Text, useInput } from 'ink';
+import { Box, Text } from 'ink';
 import { ConfirmDialog } from '../components/Dialog.js';
 import { useNavigation } from '../hooks/useNavigation.js';
 import { useAppContext, useStatus } from '../hooks/useAppContext.js';
+import { useBlockableInput } from '../hooks/useInputLayer.js';
 import { useInvitation } from '../hooks/useInvitations.js';
 import { colors, logoSmall, formatSatoshis, formatHex } from '../theme.js';
 import { copyToClipboard } from '../utils/clipboard.js';
-import type { XOInvitation } from '@xo-cash/types';
 
 /**
  * Action menu items.
@@ -147,10 +147,8 @@ export function TransactionScreen(): React.ReactElement {
     }
   }, [signTransaction, copyTransactionHex, goBack]);
 
-  // Handle keyboard navigation
-  useInput((input, key) => {
-    if (showBroadcastConfirm) return;
-
+  // Handle keyboard navigation — automatically blocked when the confirm dialog is open.
+  useBlockableInput((input, key) => {
     // Tab to switch panels
     if (key.tab) {
       setFocusedPanel(prev => {
@@ -177,7 +175,7 @@ export function TransactionScreen(): React.ReactElement {
         handleAction(action.value);
       }
     }
-  }, { isActive: !showBroadcastConfirm });
+  });
 
   // Extract transaction data from invitation
   const commits = invitation?.commits ?? [];
@@ -407,7 +405,6 @@ export function TransactionScreen(): React.ReactElement {
             message='Are you sure you want to broadcast this transaction? This action cannot be undone.'
             onConfirm={broadcastTransaction}
             onCancel={() => setShowBroadcastConfirm(false)}
-            isActive={showBroadcastConfirm}
           />
         </Box>
       )}

src/tui/screens/WalletState.tsx

@@ -8,18 +8,25 @@
  */
 
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
-import { Box, Text, useInput } from 'ink';
+import { Box, Text } from 'ink';
 import { ScrollableList, type ListItemData } from '../components/List.js';
+import { QRCode } from '../components/QRCode.js';
 import { useNavigation } from '../hooks/useNavigation.js';
 import { useAppContext, useStatus } from '../hooks/useAppContext.js';
+import { useSatoshisConversion } from '../hooks/useSatoshisConversion.js';
+import { useInputLayer, useLayeredInput, useBlockableInput, useIsInputCaptured } from '../hooks/useInputLayer.js';
 import { colors, formatSatoshis, formatHex, logoSmall } from '../theme.js';
 import type { HistoryItem } from '../../services/history.js';
 
+import { generateTemplateIdentifier } from '@xo-cash/engine';
+import { hexToBin, lockingBytecodeToCashAddress } from '@bitauth/libauth';
+
 // Import utility functions
 import {
-  formatHistoryListItem,
+  buildHistoryDisplayRows,
   getHistoryItemColorName,
   formatHistoryDate,
+  type HistoryDisplayRow,
   type HistoryColorName,
 } from '../../utils/history-utils.js';
 
@@ -52,13 +59,47 @@ const menuItems: ListItemData<string>[] = [
   { key: 'import', label: 'Import Invitation', value: 'import' },
   { key: 'invitations', label: 'View Invitations', value: 'invitations' },
   { key: 'new-address', label: 'Generate New Address', value: 'new-address' },
+  { key: 'unreserve-all', label: 'Unreserve All Resources', value: 'unreserve-all' },
   { key: 'refresh', label: 'Refresh', value: 'refresh' },
 ];
 
 /**
- * History list item with HistoryItem value.
+ * History list item with display row value.
  */
-type HistoryListItem = ListItemData<HistoryItem>;
+type HistoryListItem = ListItemData<HistoryDisplayRow>;
+
+/**
+ * QR code dialog overlay — auto-captures input via the layer system.
+ * Rendered only while a QR address is visible; closes on Enter/Esc.
+ */
+function QRDialogOverlay({ address, onClose }: { address: string; onClose: () => void }): React.ReactElement {
+  useInputLayer('qr-dialog');
+
+  useLayeredInput('qr-dialog', (_input, key) => {
+    if (key.escape || key.return) {
+      onClose();
+    }
+  });
+
+  return (
+    <Box
+      position="absolute"
+      flexDirection="column"
+      alignItems="center"
+      width="100%"
+    >
+      <QRCode
+        value={address}
+        dialog
+        dialogTitle="Receive Address"
+        showValue
+      />
+      <Box justifyContent="center" marginTop={1}>
+        <Text color={colors.textMuted}>Press Enter or Esc to close</Text>
+      </Box>
+    </Box>
+  );
+}
 
 /**
  * Wallet State Screen Component.
@@ -68,6 +109,12 @@ export function WalletStateScreen(): React.ReactElement {
   const { navigate } = useNavigation();
   const { appService, showError, showInfo } = useAppContext();
   const { setStatus } = useStatus();
+  const {
+    currencyCode,
+    fiatPerBchRate,
+    formattedFiatPerBchRate,
+    formatSatoshisToFiat,
+  } = useSatoshisConversion('USD');
 
   // State
   const [balance, setBalance] = useState<{ totalSatoshis: bigint; utxoCount: number } | null>(null);
@@ -77,6 +124,9 @@ export function WalletStateScreen(): React.ReactElement {
   const [selectedHistoryIndex, setSelectedHistoryIndex] = useState(0);
   const [isLoading, setIsLoading] = useState(true);
 
+  /** Cash address to display in the QR code dialog (null when dialog is hidden). */
+  const [qrAddress, setQrAddress] = useState<string | null>(null);
+
   /**
    * Refreshes wallet state.
    */
@@ -118,8 +168,23 @@ export function WalletStateScreen(): React.ReactElement {
     refresh();
   }, [refresh]);
 
+  // Keep wallet state in sync with invitation lifecycle and updates.
+  useEffect(() => {
+    if (!appService) return;
+
+    const onWalletStateChanged = () => {
+      void refresh();
+    };
+
+    appService.on('wallet-state-changed', onWalletStateChanged);
+
+    return () => {
+      appService.off('wallet-state-changed', onWalletStateChanged);
+    };
+  }, [appService, refresh]);
+
   /**
-   * Generates a new receiving address.
+   * Generates a new receiving address and displays it as a QR code.
    */
   const generateNewAddress = useCallback(async () => {
     if (!appService) {
@@ -139,24 +204,54 @@ export function WalletStateScreen(): React.ReactElement {
         return;
       }
 
-      // Generate a new locking bytecode
-      const { generateTemplateIdentifier } = await import('@xo-cash/engine');
+      // Generate the template identifier
       const templateId = generateTemplateIdentifier(p2pkhTemplate);
 
-      const lockingBytecode = await appService.engine.generateLockingBytecode(
+      // Generate the locking bytecode (returned as a hex string)
+      const lockingBytecodeHex = await appService.engine.generateLockingBytecode(
         templateId,
         'receiveOutput',
         'receiver',
       );
 
-      showInfo(`New address generated!\n\nLocking bytecode:\n${formatHex(lockingBytecode, 40)}`);
+      // Convert the locking bytecode to a BCH cash address for display and QR encoding.
+      const result = lockingBytecodeToCashAddress({ bytecode: hexToBin(lockingBytecodeHex), prefix: 'bitcoincash' });
+
+      if (typeof result === 'string') {
+        showError(`Failed to encode address: ${result}`);
+        return;
+      }
+
+      console.log(result);
+
+      setQrAddress(result.address);
+      setStatus('Address generated');
 
       // Refresh to show updated state
       await refresh();
     } catch (error) {
       showError(`Failed to generate address: ${error instanceof Error ? error.message : String(error)}`);
     }
-  }, [appService, setStatus, showInfo, showError, refresh]);
+  }, [appService, setStatus, showError, refresh]);
+
+  /**
+   * Unreserves all reserved UTXOs and refreshes the wallet state.
+   */
+  const unreserveAll = useCallback(async () => {
+    if (!appService) {
+      showError('AppService not initialized');
+      return;
+    }
+
+    try {
+      setStatus('Unreserving all resources...');
+      const count = await appService.unreserveAllResources();
+      showInfo(`Unreserved ${count} resource(s)`);
+      await refresh();
+    } catch (error) {
+      showError(`Failed to unreserve resources: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }, [appService, setStatus, showError, showInfo, refresh]);
 
   /**
    * Handles menu action.
@@ -175,11 +270,14 @@ export function WalletStateScreen(): React.ReactElement {
       case 'new-address':
         generateNewAddress();
         break;
+      case 'unreserve-all':
+        unreserveAll();
+        break;
       case 'refresh':
         refresh();
         break;
     }
-  }, [navigate, generateNewAddress, refresh]);
+  }, [navigate, generateNewAddress, unreserveAll, refresh]);
 
   /**
    * Handle menu item activation.
@@ -194,21 +292,42 @@ export function WalletStateScreen(): React.ReactElement {
    * Build history list items for ScrollableList.
    */
   const historyListItems = useMemo((): HistoryListItem[] => {
-    return history.map(item => {
-      const formatted = formatHistoryListItem(item, false);
+    return buildHistoryDisplayRows(history).map(row => {
       return {
-        key: item.id,
-        label: formatted.label,
-        description: formatted.description,
-        value: item,
-        color: formatted.color,
-        hidden: !formatted.isValid,
+        key: row.id,
+        label: row.label,
+        description: row.description,
+        value: row,
+        color: getHistoryItemColorName(row, false),
+        hidden: false,
       };
     });
   }, [history]);
 
-  // Handle keyboard navigation between panels
-  useInput((input, key) => {
+  /**
+   * Fiat values are memoized so we only recompute when balance or rate changes.
+   */
+  const formattedUsdPerBchRate = useMemo(() => {
+    return formattedFiatPerBchRate;
+  }, [formattedFiatPerBchRate]);
+
+  const formattedUsdBalance = useMemo(() => {
+    if (!balance || fiatPerBchRate === null) {
+      return null;
+    }
+
+    return formatSatoshisToFiat(balance.totalSatoshis);
+  }, [balance, fiatPerBchRate, formatSatoshisToFiat]);
+
+  const getFiatSuffix = useCallback((satoshis: bigint): string => {
+    const fiatValue = formatSatoshisToFiat(satoshis);
+    return fiatValue ? ` (~${fiatValue})` : '';
+  }, [formatSatoshisToFiat]);
+
+  // Screen input — automatically blocked when any dialog/overlay is capturing.
+  const isCaptured = useIsInputCaptured();
+
+  useBlockableInput((_input, key) => {
     if (key.tab) {
       setFocusedPanel(prev => prev === 'menu' ? 'history' : 'menu');
     }
@@ -222,49 +341,72 @@ export function WalletStateScreen(): React.ReactElement {
     isSelected: boolean,
     isFocused: boolean
   ): React.ReactNode => {
-    const historyItem = item.value;
-    if (!historyItem) return null;
+    const row = item.value;
+    if (!row) return null;
 
-    const colorName = getHistoryItemColorName(historyItem.type, isFocused);
+    const colorName = getHistoryItemColorName(row, isFocused);
     const itemColor = isFocused ? colors.focus : getHistoryColor(colorName);
-    const dateStr = formatHistoryDate(historyItem.timestamp);
+    const dateStr = formatHistoryDate(row.timestamp);
     const indicator = isFocused ? '▸ ' : '  ';
+    const groupingPrefix = row.isNested ? '  -> ' : '';
 
-    // Format based on type
-    if (historyItem.type === 'invitation_created') {
+    if (row.type === 'invitation') {
       return (
         <Box flexDirection="row" justifyContent="space-between">
           <Text color={itemColor}>
-            {indicator}[Invitation] {historyItem.description}
+            {indicator}[Invitation] {row.label}
           </Text>
           {dateStr && <Text color={colors.textMuted}>{dateStr}</Text>}
         </Box>
       );
-    } else if (historyItem.type === 'utxo_reserved') {
-      const sats = historyItem.valueSatoshis ?? 0n;
+    }
+
+    if (row.type === 'invitation_input') {
+      const inputSatoshis = row.utxo?.valueSatoshis;
+      const inputFiatSuffix = inputSatoshis !== undefined
+        ? getFiatSuffix(inputSatoshis)
+        : '';
       return (
         <Box flexDirection="row" justifyContent="space-between">
           <Box>
             <Text color={itemColor}>
-              {indicator}[Reserved] {formatSatoshis(sats)}
+              {indicator}{groupingPrefix}[Input] {row.label}
+              {inputFiatSuffix}
             </Text>
-            <Text color={colors.textMuted}> {historyItem.description}</Text>
+            {row.description && <Text color={colors.textMuted}> {row.description}</Text>}
           </Box>
           {dateStr && <Text color={colors.textMuted}>{dateStr}</Text>}
         </Box>
       );
-    } else if (historyItem.type === 'utxo_received') {
-      const sats = historyItem.valueSatoshis ?? 0n;
-      const reservedTag = historyItem.reserved ? ' [Reserved]' : '';
+    }
+
+    if (row.type === 'invitation_output') {
+      const sats = row.utxo?.valueSatoshis ?? 0n;
+      return (
+        <Box flexDirection="row" justifyContent="space-between">
+          <Box flexDirection="row">
+            <Text color={itemColor}>
+              {indicator}{groupingPrefix}[Output] {formatSatoshis(sats)}
+              {getFiatSuffix(sats)}
+            </Text>
+            {row.description && <Text color={colors.textMuted}> {row.description}</Text>}
+          </Box>
+          {dateStr && <Text color={colors.textMuted}>{dateStr}</Text>}
+        </Box>
+      );
+    }
+
+    if (row.type === 'utxo') {
+      const sats = row.utxo?.valueSatoshis ?? 0n;
+      const reservedTag = row.utxo?.reserved ? ' [Reserved]' : '';
       return (
         <Box flexDirection="row" justifyContent="space-between">
           <Box flexDirection="row">
             <Text color={itemColor}>
               {indicator}{formatSatoshis(sats)}
+              {getFiatSuffix(sats)}
             </Text>
-            <Text color={colors.textMuted}>
-              {' '}{historyItem.description}{reservedTag}
-            </Text>
+            {row.description && <Text color={colors.textMuted}> {row.description}{reservedTag}</Text>}
           </Box>
           {dateStr && <Text color={colors.textMuted}>{dateStr}</Text>}
         </Box>
@@ -275,12 +417,12 @@ export function WalletStateScreen(): React.ReactElement {
     return (
       <Box flexDirection="row" justifyContent="space-between">
         <Text color={itemColor}>
-          {indicator}{historyItem.type}: {historyItem.description}
+          {indicator}{row.label}
         </Text>
         {dateStr && <Text color={colors.textMuted}>{dateStr}</Text>}
       </Box>
     );
-  }, []);
+  }, [getFiatSuffix]);
 
   return (
     <Box flexDirection="column" flexGrow={1}>
@@ -312,6 +454,20 @@ export function WalletStateScreen(): React.ReactElement {
                   <Text color={colors.success} bold>
                     {formatSatoshis(balance.totalSatoshis)}
                   </Text>
+                  {formattedUsdBalance ? (
+                    <Text color={colors.info}>
+                      Approx. Fiat ({currencyCode}): {formattedUsdBalance}
+                    </Text>
+                  ) : (
+                    <Text color={colors.textMuted}>
+                      Approx. Fiat ({currencyCode}): Waiting for BCH/{currencyCode} rate...
+                    </Text>
+                  )}
+                  {formattedUsdPerBchRate && (
+                    <Text color={colors.textMuted}>
+                      1 BCH = {formattedUsdPerBchRate}
+                    </Text>
+                  )}
                   <Text color={colors.textMuted}>
                     UTXOs: {balance.utxoCount}
                   </Text>
@@ -341,7 +497,7 @@ export function WalletStateScreen(): React.ReactElement {
               selectedIndex={selectedMenuIndex}
               onSelect={setSelectedMenuIndex}
               onActivate={handleMenuItemActivate}
-              focus={focusedPanel === 'menu'}
+              focus={focusedPanel === 'menu' && !isCaptured}
               emptyMessage="No actions"
             />
           </Box>
@@ -369,7 +525,7 @@ export function WalletStateScreen(): React.ReactElement {
               items={historyListItems}
               selectedIndex={selectedHistoryIndex}
               onSelect={setSelectedHistoryIndex}
-              focus={focusedPanel === 'history'}
+              focus={focusedPanel === 'history' && !isCaptured}
               maxVisible={10}
               emptyMessage="No history found"
               renderItem={renderHistoryItem}
@@ -384,6 +540,14 @@ export function WalletStateScreen(): React.ReactElement {
           Tab: Switch focus • Enter: Select • ↑↓: Navigate • Esc: Back
         </Text>
       </Box>
+
+      {/* QR Code dialog overlay for generated addresses */}
+      {qrAddress && (
+        <QRDialogOverlay
+          address={qrAddress}
+          onClose={() => setQrAddress(null)}
+        />
+      )}
     </Box>
   );
 }

src/tui/screens/action-wizard/ActionWizardScreen.tsx

@@ -1,149 +1,22 @@
 import React from 'react';
-import { Box, Text, useInput } from 'ink';
+import { Box, Text } from 'ink';
 import { StepIndicator, type Step } from '../../components/ProgressBar.js';
 import { Button } from '../../components/Button.js';
 import { colors, logoSmall } from '../../theme.js';
-import { useActionWizard } from './useActionWizard.js';
+import { useActionWizard } from './hooks/useActionWizard.js';
+import { useWizardKeyboard } from './hooks/useWizardKeyboard.js';
 
 // Steps
-import { InfoStep } from './steps/InfoStep.js';
 import { RoleSelectStep } from './steps/RoleSelectStep.js';
 import { VariablesStep } from './steps/VariablesStep.js';
 import { InputsStep } from './steps/InputsStep.js';
 import { ReviewStep } from './steps/ReviewStep.js';
 import { PublishStep } from './steps/PublishStep.js';
+import { DataResultStep } from './steps/DataResultStep.js';
 
 export function ActionWizardScreen(): React.ReactElement {
   const wizard = useActionWizard();
-
-  // ── Keyboard handling ──────────────────────────────────────────
-  useInput(
-    (input, key) => {
-      // Tab to cycle between content area and button bar
-      if (key.tab) {
-        if (wizard.focusArea === 'content') {
-          // Within the role-select step, tab through roles first
-          if (
-            wizard.currentStepData?.type === 'role-select' &&
-            wizard.availableRoles.length > 0
-          ) {
-            if (
-              wizard.selectedRoleIndex <
-              wizard.availableRoles.length - 1
-            ) {
-              wizard.setSelectedRoleIndex((prev) => prev + 1);
-              return;
-            }
-          }
-          // Within the inputs step, tab through UTXOs first
-          if (
-            wizard.currentStepData?.type === 'inputs' &&
-            wizard.availableUtxos.length > 0
-          ) {
-            if (
-              wizard.selectedUtxoIndex <
-              wizard.availableUtxos.length - 1
-            ) {
-              wizard.setSelectedUtxoIndex((prev) => prev + 1);
-              return;
-            }
-          }
-          // Move focus down to the button bar
-          wizard.setFocusArea('buttons');
-          wizard.setFocusedButton('next');
-        } else {
-          // Cycle through buttons, then wrap back to content
-          if (wizard.focusedButton === 'back') {
-            wizard.setFocusedButton('cancel');
-          } else if (wizard.focusedButton === 'cancel') {
-            wizard.setFocusedButton('next');
-          } else {
-            wizard.setFocusArea('content');
-            wizard.setFocusedInput(0);
-            wizard.setSelectedUtxoIndex(0);
-            wizard.setSelectedRoleIndex(0);
-          }
-        }
-        return;
-      }
-
-      // Arrow keys for role selection in the content area
-      if (
-        wizard.focusArea === 'content' &&
-        wizard.currentStepData?.type === 'role-select'
-      ) {
-        if (key.upArrow) {
-          wizard.setSelectedRoleIndex((p) => Math.max(0, p - 1));
-        } else if (key.downArrow) {
-          wizard.setSelectedRoleIndex((p) =>
-            Math.min(wizard.availableRoles.length - 1, p + 1)
-          );
-        }
-        return;
-      }
-
-      // Arrow keys for UTXO selection in the content area
-      if (
-        wizard.focusArea === 'content' &&
-        wizard.currentStepData?.type === 'inputs'
-      ) {
-        if (key.upArrow) {
-          wizard.setSelectedUtxoIndex((p) => Math.max(0, p - 1));
-        } else if (key.downArrow) {
-          wizard.setSelectedUtxoIndex((p) =>
-            Math.min(wizard.availableUtxos.length - 1, p + 1)
-          );
-        } else if (key.return || input === ' ') {
-          wizard.toggleUtxoSelection(wizard.selectedUtxoIndex);
-        }
-        return;
-      }
-
-      // Arrow keys in button bar
-      if (wizard.focusArea === 'buttons') {
-        if (key.leftArrow) {
-          wizard.setFocusedButton((p) =>
-            p === 'next' ? 'cancel' : p === 'cancel' ? 'back' : 'back'
-          );
-        } else if (key.rightArrow) {
-          wizard.setFocusedButton((p) =>
-            p === 'back' ? 'cancel' : p === 'cancel' ? 'next' : 'next'
-          );
-        }
-
-        // Enter on a button
-        if (key.return) {
-          if (wizard.focusedButton === 'back') wizard.previousStep();
-          else if (wizard.focusedButton === 'cancel') wizard.cancel();
-          else if (wizard.focusedButton === 'next') wizard.nextStep();
-        }
-      }
-
-      // 'c' to copy invitation ID on the publish step
-      if (
-        input === 'c' &&
-        wizard.currentStepData?.type === 'publish' &&
-        wizard.invitationId
-      ) {
-        wizard.copyId();
-      }
-
-      // 'a' to select all UTXOs
-      if (input === 'a' && wizard.currentStepData?.type === 'inputs') {
-        wizard.setAvailableUtxos((p) =>
-          p.map((u) => ({ ...u, selected: true }))
-        );
-      }
-
-      // 'n' to deselect all UTXOs
-      if (input === 'n' && wizard.currentStepData?.type === 'inputs') {
-        wizard.setAvailableUtxos((p) =>
-          p.map((u) => ({ ...u, selected: false }))
-        );
-      }
-    },
-    { isActive: !wizard.textInputHasFocus }
-  );
+  useWizardKeyboard(wizard);
 
   // ── Step router ────────────────────────────────────────────────
   const renderStep = () => {
@@ -152,15 +25,6 @@ export function ActionWizardScreen(): React.ReactElement {
     }
 
     switch (wizard.currentStepData?.type) {
-      case 'info':
-        return (
-          <InfoStep
-            template={wizard.template!}
-            actionIdentifier={wizard.actionIdentifier!}
-            roleIdentifier={wizard.roleIdentifier!}
-            actionName={wizard.actionName}
-          />
-        );
       case 'role-select':
         return (
           <RoleSelectStep
@@ -205,7 +69,21 @@ export function ActionWizardScreen(): React.ReactElement {
           />
         );
       case 'publish':
-        return <PublishStep invitationId={wizard.invitationId} />;
+        return (
+          <PublishStep
+            invitationId={wizard.invitationId}
+            requirementsComplete={wizard.requirementsComplete}
+            hasSignedAndBroadcasted={wizard.hasSignedAndBroadcasted}
+          />
+        );
+      case 'result':
+        return (
+          <DataResultStep
+            actionName={wizard.actionName}
+            variables={wizard.variables}
+            dataResults={wizard.dataResults}
+          />
+        );
       default:
         return null;
     }
@@ -272,7 +150,7 @@ export function ActionWizardScreen(): React.ReactElement {
               wizard.focusArea === "buttons" &&
               wizard.focusedButton === "back"
             }
-            disabled={wizard.currentStepData?.type === "publish"}
+            disabled={wizard.isLastStep}
           />
           <Button
             label="Cancel"
@@ -283,9 +161,7 @@ export function ActionWizardScreen(): React.ReactElement {
           />
         </Box>
         <Button
-          label={
-            wizard.currentStepData?.type === "publish" ? "Done" : "Next"
-          }
+          label={wizard.nextButtonLabel}
           focused={
             wizard.focusArea === "buttons" &&
             wizard.focusedButton === "next"

src/tui/screens/action-wizard/flows/DataWizardFlow.ts

@@ -0,0 +1,40 @@
+import type { FlowContext, StepType } from "../types.js";
+import { WizardFlow } from "./WizardFlow.js";
+
+/**
+ * Flow strategy for data-only actions (e.g. sign, verify).
+ *
+ * These actions produce computed data rather than a transaction.
+ * No invitation, UTXOs, or fees are involved — just variables in,
+ * data result out.
+ *
+ * NOTE: Engine-level data action execution is not yet implemented.
+ * The result step is currently stubbed.
+ */
+export class DataWizardFlow extends WizardFlow {
+  readonly type = "data" as const;
+
+  /** The data field identifiers this action produces (from action.data). */
+  readonly dataOutputs: string[];
+
+  constructor(dataOutputs: string[]) {
+    super();
+    this.dataOutputs = dataOutputs;
+  }
+
+  getStepTypes(context: FlowContext): StepType[] {
+    const steps: StepType[] = [];
+    if (context.availableRoles.length > 1) steps.push("role-select");
+    if (context.hasVariables) steps.push("variables");
+    steps.push("result");
+    return steps;
+  }
+
+  canFinalize(): boolean {
+    return false;
+  }
+
+  getFinalActionLabel(): string {
+    return "Done";
+  }
+}

src/tui/screens/action-wizard/flows/TransactionWizardFlow.ts

@@ -0,0 +1,36 @@
+import type { FlowContext, StepType } from "../types.js";
+import { WizardFlow } from "./WizardFlow.js";
+
+/**
+ * Flow strategy for transaction-based actions.
+ *
+ * Handles both single-role actions (sendSatoshis, burn) where the
+ * creator provides inputs and signs locally, and multi-role actions
+ * (receive, request) where the creator publishes an invitation for
+ * another party to complete.
+ */
+export class TransactionWizardFlow extends WizardFlow {
+  readonly type = "transaction" as const;
+
+  getStepTypes(context: FlowContext): StepType[] {
+    const steps: StepType[] = [];
+    if (context.availableRoles.length > 1) steps.push("role-select");
+    if (context.hasVariables) steps.push("variables");
+    if (context.shouldCollectInputs) steps.push("inputs");
+    steps.push("review");
+    steps.push("publish");
+    return steps;
+  }
+
+  canFinalize(context: FlowContext): boolean {
+    return (
+      context.requirementsComplete &&
+      context.wizardCollectedInputs &&
+      !context.hasSignedAndBroadcasted
+    );
+  }
+
+  getFinalActionLabel(context: FlowContext): string {
+    return this.canFinalize(context) ? "Sign & Broadcast" : "Done";
+  }
+}

src/tui/screens/action-wizard/flows/WizardFlow.ts

@@ -0,0 +1,22 @@
+import type { FlowContext, StepType } from "../types.js";
+
+/**
+ * Abstract strategy that defines the shape of a wizard flow.
+ *
+ * Subclasses declare which steps are needed, whether the action can be
+ * finalized, and what the final button should say. They hold no React
+ * state — the orchestrator hook wires domain hooks to the step configs
+ * produced from these methods.
+ */
+export abstract class WizardFlow {
+  abstract readonly type: "transaction" | "data";
+
+  /** Determine which step types this flow needs given the current context. */
+  abstract getStepTypes(context: FlowContext): StepType[];
+
+  /** Whether the action can be finalized (e.g. signed & broadcast). */
+  abstract canFinalize(context: FlowContext): boolean;
+
+  /** Label for the primary action button on the final step. */
+  abstract getFinalActionLabel(context: FlowContext): string;
+}

src/tui/screens/action-wizard/flows/index.ts

@@ -0,0 +1,21 @@
+import type { XOTemplateAction } from "@xo-cash/types";
+import { TransactionWizardFlow } from "./TransactionWizardFlow.js";
+import { DataWizardFlow } from "./DataWizardFlow.js";
+import type { WizardFlow } from "./WizardFlow.js";
+
+export { WizardFlow } from "./WizardFlow.js";
+export { TransactionWizardFlow } from "./TransactionWizardFlow.js";
+export { DataWizardFlow } from "./DataWizardFlow.js";
+
+/**
+ * Inspect a template action and return the appropriate wizard flow strategy.
+ *
+ * Actions with `data` fields and no `transaction` are data-only flows.
+ * Everything else uses the transaction flow.
+ */
+export function createWizardFlow(action: XOTemplateAction): WizardFlow {
+  if (action.data?.length && !action.transaction) {
+    return new DataWizardFlow([action.data]);
+  }
+  return new TransactionWizardFlow();
+}

src/tui/screens/action-wizard/hooks/useActionWizard.ts

@@ -0,0 +1,534 @@
+import { useState, useMemo, useCallback, useEffect } from "react";
+import { useNavigation } from "../../../hooks/useNavigation.js";
+import { useAppContext, useStatus } from "../../../hooks/useAppContext.js";
+import { copyToClipboard } from "../../../utils/clipboard.js";
+import { roleRequiresInputs } from "../../../../utils/invitation-flow.js";
+import type { XOTemplate } from "@xo-cash/types";
+import type { StepConfig, FlowContext, DataResult } from "../types.js";
+import {
+  createWizardFlow,
+  type WizardFlow,
+  DataWizardFlow,
+} from "../flows/index.js";
+import { useRoleSelection } from "./useRoleSelection.js";
+import { useVariableInputs } from "./useVariableInputs.js";
+import { useUtxoSelection } from "./useUtxoSelection.js";
+import { useInvitationManager } from "./useInvitationManager.js";
+import { useWizardFocus } from "./useWizardFocus.js";
+import { useWizardSteps } from "./useWizardSteps.js";
+
+/**
+ * Thin orchestrator that composes domain hooks and wires them
+ * to step configs produced by the WizardFlow strategy.
+ *
+ * This replaces the original 861-line god-hook.
+ */
+export function useActionWizard() {
+  const { goBack, data: navData } = useNavigation();
+  const { appService, showError, showInfo } = useAppContext();
+  const { setStatus } = useStatus();
+
+  if (!appService) {
+    throw new Error("AppService not initialized");
+  }
+
+  // ── Navigation data ───────────────────────────────────────────
+  const templateIdentifier = navData.templateIdentifier as string | undefined;
+  const actionIdentifier = navData.actionIdentifier as string | undefined;
+  const template = navData.template as XOTemplate | undefined;
+  const actionRolesFromNavigation = navData.actionRoles as string[] | undefined;
+
+  // ── Derived template data ─────────────────────────────────────
+  const action = template?.actions?.[actionIdentifier ?? ""];
+  const actionName = action?.name || actionIdentifier || "Unknown";
+
+  // ── Flow strategy ─────────────────────────────────────────────
+  const flow = useMemo<WizardFlow>(() => {
+    // Create a default action if no action is found
+    if (!action) {
+      return createWizardFlow({ name: "", description: "" });
+    }
+
+    // Create the flow from the action
+    return createWizardFlow(action);
+  }, [action]);
+
+  // ── Domain hooks ──────────────────────────────────────────────
+  const roleSelection = useRoleSelection(
+    template,
+    actionIdentifier,
+    actionRolesFromNavigation,
+  );
+  const variableInputs = useVariableInputs();
+  const utxoSelection = useUtxoSelection();
+  const invitationManager = useInvitationManager({
+    appService,
+    showError,
+    showInfo,
+    setStatus,
+  });
+  const focus = useWizardFocus();
+
+  // ── Data results (data-only flows) ────────────────────────────
+  const [dataResults, setDataResults] = useState<DataResult[]>([]);
+
+  // ── Initialize variables when role becomes available ──────────
+  useEffect(() => {
+    if (template && actionIdentifier && roleSelection.effectiveRole) {
+      const act = template.actions?.[actionIdentifier];
+      const role = act?.roles?.[roleSelection.effectiveRole];
+      const varIds = role?.requirements?.variables;
+      if (varIds && varIds.length > 0) {
+        variableInputs.initFromTemplate(
+          template,
+          actionIdentifier,
+          roleSelection.effectiveRole,
+        );
+      }
+    }
+  }, [
+    template,
+    actionIdentifier,
+    roleSelection.effectiveRole,
+    variableInputs.initFromTemplate,
+  ]);
+
+  // ── Determine whether creator should provide inputs ───────────
+  const shouldCollectInputs = useMemo(() => {
+    if (flow.type !== "transaction") return false;
+    if (!template || !actionIdentifier || !roleSelection.effectiveRole)
+      return false;
+
+    const act = template.actions?.[actionIdentifier];
+    const totalActionRoles = Object.keys(act?.roles ?? {}).length;
+    const isSingleRoleAction = totalActionRoles <= 1;
+    return (
+      isSingleRoleAction &&
+      roleRequiresInputs(
+        template,
+        actionIdentifier,
+        roleSelection.effectiveRole,
+      )
+    );
+  }, [flow.type, template, actionIdentifier, roleSelection.effectiveRole]);
+
+  // ── Build flow context for strategy methods ───────────────────
+  const flowContext = useMemo<FlowContext>(
+    () => ({
+      availableRoles: roleSelection.availableRoles,
+      hasVariables: variableInputs.variables.length > 0,
+      shouldCollectInputs,
+      requirementsComplete: invitationManager.requirementsComplete,
+      wizardCollectedInputs: shouldCollectInputs,
+      hasSignedAndBroadcasted: invitationManager.hasSignedAndBroadcasted,
+    }),
+    [
+      roleSelection.availableRoles,
+      variableInputs.variables.length,
+      shouldCollectInputs,
+      invitationManager.requirementsComplete,
+      invitationManager.hasSignedAndBroadcasted,
+    ],
+  );
+
+  // ── Handle Enter inside a TextInput ───────────────────────────
+  const handleTextInputSubmit = useCallback(() => {
+    if (focus.focusedInput < variableInputs.variables.length - 1) {
+      focus.setFocusedInput((prev) => prev + 1);
+    } else {
+      focus.moveToButtons();
+    }
+  }, [
+    focus.focusedInput,
+    variableInputs.variables.length,
+    focus.setFocusedInput,
+    focus.moveToButtons,
+  ]);
+
+  // ── Copy invitation ID to clipboard ───────────────────────────
+  const copyId = useCallback(async () => {
+    if (!invitationManager.invitationId) return;
+    try {
+      await copyToClipboard(invitationManager.invitationId);
+      showInfo(`Copied to clipboard!\n\n${invitationManager.invitationId}`);
+    } catch (error) {
+      showError(
+        `Failed to copy: ${error instanceof Error ? error.message : String(error)}`,
+      );
+    }
+  }, [invitationManager.invitationId, showInfo, showError]);
+
+  // ── Helper: create invitation if it doesn't exist yet ─────────
+  const ensureInvitation = useCallback(
+    async (roleId?: string): Promise<string | null> => {
+      if (invitationManager.invitationId) return invitationManager.invitationId;
+      const role = roleId ?? roleSelection.effectiveRole;
+      if (!templateIdentifier || !actionIdentifier || !role || !template)
+        return null;
+      return invitationManager.createWithVariables(
+        templateIdentifier,
+        actionIdentifier,
+        role,
+        template,
+        variableInputs.variables,
+      );
+    },
+    [
+      invitationManager.invitationId,
+      invitationManager.createWithVariables,
+      roleSelection.effectiveRole,
+      templateIdentifier,
+      actionIdentifier,
+      template,
+      variableInputs.variables,
+    ],
+  );
+
+  // ── Helper: load UTXOs after invitation is created ────────────
+  const loadUtxosForInvitation = useCallback(
+    async (invId: string) => {
+      if (!appService || !templateIdentifier) return;
+      const instance = appService.invitations.find(
+        (inv) => inv.data.invitationIdentifier === invId,
+      );
+      if (instance) {
+        invitationManager.setIsProcessing(true);
+        try {
+          await utxoSelection.loadUtxos(
+            instance,
+            templateIdentifier,
+            variableInputs.variables,
+            setStatus,
+          );
+        } finally {
+          invitationManager.setIsProcessing(false);
+        }
+      }
+    },
+    [
+      appService,
+      templateIdentifier,
+      variableInputs.variables,
+      utxoSelection.loadUtxos,
+      invitationManager.setIsProcessing,
+      setStatus,
+    ],
+  );
+
+  // ── Build step configs from flow strategy ─────────────────────
+  const stepConfigs = useMemo<StepConfig[]>(() => {
+    const stepTypes = flow.getStepTypes(flowContext);
+
+    return stepTypes.map((type): StepConfig => {
+      switch (type) {
+        case "role-select":
+          return {
+            type,
+            name: "Select Role",
+            validate: () => {
+              const selectedRole =
+                roleSelection.availableRoles[roleSelection.selectedRoleIndex];
+              return selectedRole ? null : "Please select a role";
+            },
+            onNext: async () => {
+              const selectedRole =
+                roleSelection.availableRoles[roleSelection.selectedRoleIndex];
+              if (!selectedRole) return false;
+
+              // Initialize variables for this role immediately
+              if (template && actionIdentifier) {
+                const act = template.actions?.[actionIdentifier];
+                const role = act?.roles?.[selectedRole];
+                const hasVars =
+                  (role?.requirements?.variables?.length ?? 0) > 0;
+
+                if (hasVars) {
+                  variableInputs.initFromTemplate(
+                    template,
+                    actionIdentifier,
+                    selectedRole,
+                  );
+                }
+
+                // If no variables step follows, create the invitation now (transaction flows only)
+                if (!hasVars && flow.type === "transaction") {
+                  if (templateIdentifier && template) {
+                    const invId = await invitationManager.createWithVariables(
+                      templateIdentifier,
+                      actionIdentifier,
+                      selectedRole,
+                      template,
+                      [],
+                    );
+                    if (!invId) return false;
+
+                    // Pre-load UTXOs if the inputs step follows
+                    const totalRoles = Object.keys(act?.roles ?? {}).length;
+                    const needsInputs =
+                      totalRoles <= 1 &&
+                      roleRequiresInputs(
+                        template,
+                        actionIdentifier,
+                        selectedRole,
+                      );
+                    if (needsInputs) {
+                      await loadUtxosForInvitation(invId);
+                    }
+                  }
+                }
+              }
+
+              roleSelection.setRoleIdentifier(selectedRole);
+              focus.resetToContent();
+              return true;
+            },
+          };
+
+        case "variables":
+          return {
+            type,
+            name: "Variables",
+            validate: () => variableInputs.validate(),
+            onNext: async () => {
+              if (flow.type === "transaction") {
+                if (
+                  !templateIdentifier ||
+                  !actionIdentifier ||
+                  !template ||
+                  !roleSelection.effectiveRole
+                )
+                  return false;
+
+                const invId = await invitationManager.createWithVariables(
+                  templateIdentifier,
+                  actionIdentifier,
+                  roleSelection.effectiveRole,
+                  template,
+                  variableInputs.variables,
+                );
+                if (!invId) return false;
+
+                // Pre-load UTXOs if the inputs step follows
+                if (shouldCollectInputs) {
+                  await loadUtxosForInvitation(invId);
+                }
+              }
+
+              // For data flows, just advance — variables are used in the result step
+              focus.resetToContent();
+              return true;
+            },
+          };
+
+        case "inputs":
+          return {
+            type,
+            name: "Select UTXOs",
+            validate: () => utxoSelection.validate(),
+            onNext: async () => {
+              const selectedUtxos = utxoSelection.availableUtxos.filter(
+                (u) => u.selected,
+              );
+              const success = await invitationManager.addInputsAndOutputs(
+                selectedUtxos,
+                utxoSelection.changeAmount,
+              );
+              if (success) focus.resetToContent();
+              return success;
+            },
+          };
+
+        case "review":
+          return {
+            type,
+            name: "Review",
+            validate: () => null,
+            onNext: async () => {
+              // Ensure invitation exists (covers the case where no prior step created it)
+              const invId = await ensureInvitation();
+              if (!invId) return false;
+              await invitationManager.refreshRequirements(invId);
+              focus.resetToContent();
+              return true;
+            },
+          };
+
+        case "publish":
+          return {
+            type,
+            name: "Publish",
+            validate: () => null,
+            onNext: async () => {
+              if (flow.canFinalize(flowContext)) {
+                await invitationManager.signAndBroadcast();
+                // Stay on publish step (it's the last step, stepper won't advance)
+                return true;
+              }
+              goBack();
+              return true;
+            },
+          };
+
+        case "result":
+          return {
+            type,
+            name: "Result",
+            validate: () => null,
+            onNext: async () => {
+              // Data-only flows: populate stubbed results, then exit
+              if (flow instanceof DataWizardFlow) {
+                const results: DataResult[] = flow.dataOutputs.map((dataId) => {
+                  const dataDef = template?.data?.[dataId];
+                  return {
+                    id: dataId,
+                    name: dataDef?.hint ?? dataId,
+                    type: dataDef?.type ?? "unknown",
+                    hint: dataDef?.hint,
+                    value: null, // Engine-level data execution not yet implemented
+                  };
+                });
+                setDataResults(results);
+              }
+              goBack();
+              return true;
+            },
+          };
+
+        default:
+          return {
+            type,
+            name: type,
+            validate: () => null,
+            onNext: async () => true,
+          };
+      }
+    });
+  }, [
+    flow,
+    flowContext,
+    roleSelection,
+    variableInputs,
+    utxoSelection,
+    invitationManager,
+    focus,
+    template,
+    templateIdentifier,
+    actionIdentifier,
+    shouldCollectInputs,
+    ensureInvitation,
+    loadUtxosForInvitation,
+    goBack,
+    setStatus,
+  ]);
+
+  // ── Step navigation ───────────────────────────────────────────
+  const stepper = useWizardSteps(stepConfigs, goBack, showError);
+
+  // ── Set initial status ────────────────────────────────────────
+  useEffect(() => {
+    if (!template || !actionIdentifier) {
+      showError("Missing wizard data");
+      goBack();
+      return;
+    }
+    setStatus(
+      roleSelection.effectiveRole
+        ? `${actionIdentifier}/${roleSelection.effectiveRole}`
+        : actionIdentifier,
+    );
+  }, [
+    template,
+    actionIdentifier,
+    roleSelection.effectiveRole,
+    showError,
+    goBack,
+    setStatus,
+  ]);
+
+  // ── Convenience derived values ────────────────────────────────
+  const textInputHasFocus =
+    stepper.currentStepData?.type === "variables" &&
+    focus.focusArea === "content";
+
+  const canSignAndBroadcast = flow.canFinalize(flowContext);
+
+  const isLastStep = stepper.currentStep >= stepper.steps.length - 1;
+  const lastStepType = stepper.currentStepData?.type;
+  const nextButtonLabel =
+    lastStepType === "publish"
+      ? flow.getFinalActionLabel(flowContext)
+      : lastStepType === "result"
+        ? "Done"
+        : "Next";
+
+  // ── Public API ────────────────────────────────────────────────
+  return {
+    // Meta
+    template,
+    templateIdentifier,
+    actionIdentifier,
+    roleIdentifier: roleSelection.effectiveRole,
+    action,
+    actionName,
+    flow,
+    flowContext,
+
+    // Role selection
+    availableRoles: roleSelection.availableRoles,
+    selectedRoleIndex: roleSelection.selectedRoleIndex,
+    setSelectedRoleIndex: roleSelection.setSelectedRoleIndex,
+
+    // Steps
+    steps: stepper.steps,
+    currentStep: stepper.currentStep,
+    currentStepData: stepper.currentStepData,
+
+    // Variables
+    variables: variableInputs.variables,
+    updateVariable: variableInputs.updateVariable,
+    handleTextInputSubmit,
+
+    // UTXOs
+    availableUtxos: utxoSelection.availableUtxos,
+    selectedUtxoIndex: utxoSelection.selectedUtxoIndex,
+    setSelectedUtxoIndex: utxoSelection.setSelectedUtxoIndex,
+    requiredAmount: utxoSelection.requiredAmount,
+    fee: utxoSelection.fee,
+    selectedAmount: utxoSelection.selectedAmount,
+    changeAmount: utxoSelection.changeAmount,
+    toggleUtxoSelection: utxoSelection.toggleSelection,
+    selectAll: utxoSelection.selectAll,
+    deselectAll: utxoSelection.deselectAll,
+
+    // Invitation
+    invitation: invitationManager.invitation,
+    invitationId: invitationManager.invitationId,
+    requirementsComplete: invitationManager.requirementsComplete,
+    hasSignedAndBroadcasted: invitationManager.hasSignedAndBroadcasted,
+    canSignAndBroadcast,
+
+    // Data results
+    dataResults,
+
+    // UI focus
+    focusedInput: focus.focusedInput,
+    setFocusedInput: focus.setFocusedInput,
+    focusedButton: focus.focusedButton,
+    setFocusedButton: focus.setFocusedButton,
+    focusArea: focus.focusArea,
+    setFocusArea: focus.setFocusArea,
+    isProcessing: invitationManager.isProcessing,
+    textInputHasFocus,
+    nextButtonLabel,
+    isLastStep,
+
+    // Actions
+    nextStep: stepper.nextStep,
+    previousStep: stepper.previousStep,
+    cancel: stepper.cancel,
+    copyId,
+  } as const;
+}
+
+/** Convenience type so other files can type the return value. */
+export type ActionWizardState = ReturnType<typeof useActionWizard>;

src/tui/screens/action-wizard/hooks/useInvitationManager.ts

@@ -0,0 +1,295 @@
+import { useState, useCallback } from "react";
+import type {
+  XOTemplate,
+  XOInvitation,
+  XOTemplateTransactionOutput,
+} from "@xo-cash/types";
+import type { VariableInput, SelectableUTXO } from "../types.js";
+import {
+  getTransactionOutputIdentifier,
+  isInvitationRequirementsComplete,
+  resolveProvidedLockingBytecodeHex,
+} from "../../../../utils/invitation-flow.js";
+import type { AppService } from "../../../../services/app.js";
+
+interface InvitationManagerDeps {
+  appService: AppService;
+  showError: (msg: string) => void;
+  showInfo: (msg: string) => void;
+  setStatus: (msg: string) => void;
+}
+
+/**
+ * Manages the full invitation lifecycle for transaction-based actions:
+ * creation, variable persistence, output generation, input addition,
+ * signing, and broadcasting.
+ *
+ * Only relevant for TransactionWizardFlow — data flows bypass this entirely.
+ */
+export function useInvitationManager(deps: InvitationManagerDeps) {
+  const { appService, showError, showInfo, setStatus } = deps;
+
+  const [invitation, setInvitation] = useState<XOInvitation | null>(null);
+  const [invitationId, setInvitationId] = useState<string | null>(null);
+  const [requirementsComplete, setRequirementsComplete] = useState(false);
+  const [hasSignedAndBroadcasted, setHasSignedAndBroadcasted] = useState(false);
+  const [isProcessing, setIsProcessing] = useState(false);
+
+  /** Re-check whether all invitation requirements are satisfied. */
+  const refreshRequirements = useCallback(
+    async (identifier: string | null = invitationId): Promise<boolean> => {
+      if (!identifier || !appService) {
+        setRequirementsComplete(false);
+        return false;
+      }
+
+      const instance = appService.invitations.find(
+        (inv: any) => inv.data.invitationIdentifier === identifier,
+      );
+      if (!instance) {
+        setRequirementsComplete(false);
+        return false;
+      }
+
+      const complete = await isInvitationRequirementsComplete(instance);
+      setRequirementsComplete(complete);
+      return complete;
+    },
+    [appService, invitationId],
+  );
+
+  /**
+   * Create an invitation, persist variable values, and add
+   * template-required transaction outputs.
+   *
+   * @returns The invitation identifier on success, or null on failure.
+   */
+  const createWithVariables = useCallback(
+    async (
+      templateIdentifier: string,
+      actionIdentifier: string,
+      roleIdentifier: string,
+      template: XOTemplate,
+      variables: VariableInput[],
+    ): Promise<string | null> => {
+      if (!appService) return null;
+
+      setIsProcessing(true);
+      setStatus("Creating invitation...");
+
+      try {
+        // Create via the engine
+        const xoInvitation = await appService.engine.createInvitation({
+          templateIdentifier,
+          actionIdentifier,
+        });
+
+        // Wrap and track
+        const invitationInstance =
+          await appService.createInvitation(xoInvitation);
+        let inv = invitationInstance.data;
+        const invId = inv.invitationIdentifier;
+        setInvitationId(invId);
+
+        // Persist variable values
+        if (variables.length > 0) {
+          setStatus("Adding variables...");
+          const variableData = variables.map((v) => {
+            const isNumeric =
+              ["integer", "number", "satoshis"].includes(v.type) ||
+              (v.hint && ["satoshis", "amount"].includes(v.hint));
+
+            return {
+              variableIdentifier: v.id,
+              roleIdentifier,
+              value: isNumeric ? BigInt(v.value || "0") : v.value,
+            };
+          });
+          await invitationInstance.addVariables(variableData);
+          inv = invitationInstance.data;
+        }
+
+        // Build variable values lookup for output resolution
+        const variableValuesByIdentifier = variables.reduce(
+          (acc, variable) => {
+            if (
+              typeof variable.value === "string" &&
+              variable.value.trim().length > 0
+            ) {
+              acc[variable.id] = variable.value;
+            }
+            return acc;
+          },
+          {} as Record<string, string>,
+        );
+
+        // Add template-required transaction outputs
+        const act = template.actions?.[actionIdentifier];
+        const transaction = act?.transaction
+          ? template.transactions?.[act.transaction]
+          : null;
+
+        if (transaction?.outputs && transaction.outputs.length > 0) {
+          setStatus("Adding required outputs...");
+          const outputsToAdd = await Promise.all(
+            transaction.outputs.map(
+              async (output: XOTemplateTransactionOutput) => {
+                const outputIdentifier = getTransactionOutputIdentifier(output);
+                if (!outputIdentifier) {
+                  throw new Error("Invalid transaction output definition");
+                }
+
+                const providedHex = resolveProvidedLockingBytecodeHex(
+                  template,
+                  outputIdentifier,
+                  variableValuesByIdentifier,
+                );
+
+                const lockingBytecodeHex =
+                  providedHex ??
+                  (await invitationInstance.generateLockingBytecode(
+                    outputIdentifier,
+                    roleIdentifier,
+                  ));
+
+                return {
+                  outputIdentifier,
+                  lockingBytecode: lockingBytecodeHex,
+                };
+              },
+            ),
+          );
+
+          // TODO: Clean this up. Suggestions: 1. Convert to bytes above. 2. Have addOutputs accept a hex string. 3. Have addOutputs handle lockscript generation.
+          await invitationInstance.addOutputs(
+            outputsToAdd.map((output) => ({
+              outputIdentifier: output.outputIdentifier,
+              lockingBytecode: new Uint8Array(
+                Buffer.from(output.lockingBytecode, "hex"),
+              ),
+            })),
+          );
+
+          inv = invitationInstance.data;
+        }
+
+        setInvitation(inv);
+        await refreshRequirements(invId);
+        setStatus("Invitation created");
+        return invId;
+      } catch (error) {
+        showError(
+          `Failed to create invitation: ${error instanceof Error ? error.message : String(error)}`,
+        );
+        return null;
+      } finally {
+        setIsProcessing(false);
+      }
+    },
+    [appService, showError, setStatus, refreshRequirements],
+  );
+
+  /**
+   * Add the selected UTXOs as inputs and a change output to the invitation.
+   *
+   * @returns true on success, false on failure.
+   */
+  const addInputsAndOutputs = useCallback(
+    async (
+      selectedUtxos: SelectableUTXO[],
+      changeAmount: bigint,
+    ): Promise<boolean> => {
+      if (!invitationId || !appService) return false;
+
+      setIsProcessing(true);
+      setStatus("Adding inputs and outputs...");
+
+      try {
+        const instance = appService.invitations.find(
+          (inv: any) => inv.data.invitationIdentifier === invitationId,
+        );
+        if (!instance) throw new Error("Invitation not found");
+
+        const inputs = selectedUtxos.map((utxo) => ({
+          outpointTransactionHash: new Uint8Array(
+            Buffer.from(utxo.outpointTransactionHash, "hex"),
+          ),
+          outpointIndex: utxo.outpointIndex,
+        }));
+
+        await instance.addInputs(inputs);
+        await instance.addOutputs([{ valueSatoshis: changeAmount }]);
+        await refreshRequirements(invitationId);
+        setStatus("Inputs and outputs added");
+        return true;
+      } catch (error) {
+        showError(
+          `Failed to add inputs/outputs: ${error instanceof Error ? error.message : String(error)}`,
+        );
+        return false;
+      } finally {
+        setIsProcessing(false);
+      }
+    },
+    [invitationId, appService, showError, setStatus, refreshRequirements],
+  );
+
+  /** Sign the invitation and broadcast the transaction. */
+  const signAndBroadcast = useCallback(async (): Promise<boolean> => {
+    if (!invitationId || !appService) return false;
+
+    setIsProcessing(true);
+    setStatus("Signing invitation...");
+
+    try {
+      const instance = appService.invitations.find(
+        (inv: any) => inv.data.invitationIdentifier === invitationId,
+      );
+      if (!instance) throw new Error("Invitation not found");
+
+      const complete = await refreshRequirements(invitationId);
+      if (!complete) {
+        showError("Invitation requirements are not complete yet.");
+        return false;
+      }
+
+      await instance.sign();
+      setStatus("Broadcasting transaction...");
+      await instance.broadcast();
+      setHasSignedAndBroadcasted(true);
+      setStatus("Transaction signed and broadcasted");
+      showInfo("Transaction signed and broadcasted.");
+      await refreshRequirements(invitationId);
+      return true;
+    } catch (error) {
+      showError(
+        `Failed to sign and broadcast: ${error instanceof Error ? error.message : String(error)}`,
+      );
+      return false;
+    } finally {
+      setIsProcessing(false);
+    }
+  }, [
+    invitationId,
+    appService,
+    setStatus,
+    showError,
+    showInfo,
+    refreshRequirements,
+  ]);
+
+  return {
+    invitation,
+    invitationId,
+    requirementsComplete,
+    hasSignedAndBroadcasted,
+    isProcessing,
+    setIsProcessing,
+    refreshRequirements,
+    createWithVariables,
+    addInputsAndOutputs,
+    signAndBroadcast,
+  } as const;
+}
+
+export type InvitationManagerState = ReturnType<typeof useInvitationManager>;

src/tui/screens/action-wizard/hooks/useRoleSelection.ts

@@ -0,0 +1,50 @@
+import { useState, useEffect, useMemo } from "react";
+import type { XOTemplate } from "@xo-cash/types";
+import { resolveActionRoles } from "../../../../utils/invitation-flow.js";
+
+/**
+ * Manages role selection state for the wizard.
+ *
+ * Derives the list of available roles from the template and auto-selects
+ * when only one role exists for the action.
+ */
+export function useRoleSelection(
+  template: XOTemplate | undefined,
+  actionIdentifier: string | undefined,
+  actionRolesFromNavigation: string[] | undefined,
+) {
+  const [roleIdentifier, setRoleIdentifier] = useState<string | undefined>();
+  const [selectedRoleIndex, setSelectedRoleIndex] = useState(0);
+
+  /** Roles that can start this action, derived from template start entries. */
+  const availableRoles = useMemo(() => {
+    return resolveActionRoles(
+      template,
+      actionIdentifier,
+      actionRolesFromNavigation,
+    );
+  }, [template, actionIdentifier, actionRolesFromNavigation]);
+
+  /** The role to use for the flow — either explicitly selected or auto-selected when only one exists. */
+  const effectiveRole =
+    roleIdentifier ??
+    (availableRoles.length === 1 ? availableRoles[0] : undefined);
+
+  // Auto-select when only one role exists.
+  useEffect(() => {
+    if (!roleIdentifier && availableRoles.length === 1) {
+      setRoleIdentifier(availableRoles[0]);
+    }
+  }, [roleIdentifier, availableRoles]);
+
+  return {
+    roleIdentifier,
+    setRoleIdentifier,
+    selectedRoleIndex,
+    setSelectedRoleIndex,
+    availableRoles,
+    effectiveRole,
+  } as const;
+}
+
+export type RoleSelectionState = ReturnType<typeof useRoleSelection>;

src/tui/screens/action-wizard/hooks/useUtxoSelection.ts

@@ -0,0 +1,123 @@
+import { useState, useCallback, useMemo } from "react";
+import type { SelectableUTXO, VariableInput } from "../types.js";
+import type { Invitation } from "../../../../services/invitation.js";
+import { formatSatoshis } from "../../../theme.js";
+import {
+  autoSelectGreedyUtxos,
+  mapUnspentOutputsToSelectable,
+} from "../../../../utils/invitation-flow.js";
+
+/**
+ * Manages UTXO selection state for the wizard's inputs step.
+ *
+ * Only active for transaction flows that require the creator
+ * to provide funding inputs.
+ */
+export function useUtxoSelection() {
+  const [availableUtxos, setAvailableUtxos] = useState<SelectableUTXO[]>([]);
+  const [selectedUtxoIndex, setSelectedUtxoIndex] = useState(0);
+  const [requiredAmount, setRequiredAmount] = useState<bigint>(0n);
+  const [fee, setFee] = useState<bigint>(500n);
+
+  const selectedAmount = useMemo(
+    () =>
+      availableUtxos
+        .filter((u) => u.selected)
+        .reduce((sum, u) => sum + u.valueSatoshis, 0n),
+    [availableUtxos],
+  );
+
+  const changeAmount = useMemo(
+    () => selectedAmount - requiredAmount - fee,
+    [selectedAmount, requiredAmount, fee],
+  );
+
+  /** Toggle the selected state of a single UTXO. */
+  const toggleSelection = useCallback((index: number) => {
+    setAvailableUtxos((prev) => {
+      const updated = [...prev];
+      const utxo = updated[index];
+      if (utxo) {
+        updated[index] = { ...utxo, selected: !utxo.selected };
+      }
+      return updated;
+    });
+  }, []);
+
+  /** Select all available UTXOs. */
+  const selectAll = useCallback(() => {
+    setAvailableUtxos((prev) => prev.map((u) => ({ ...u, selected: true })));
+  }, []);
+
+  /** Deselect all UTXOs. */
+  const deselectAll = useCallback(() => {
+    setAvailableUtxos((prev) => prev.map((u) => ({ ...u, selected: false })));
+  }, []);
+
+  /**
+   * Query the invitation instance for suitable UTXOs and auto-select
+   * greedily to meet the required amount.
+   */
+  const loadUtxos = useCallback(
+    async (
+      invitationInstance: Invitation,
+      templateIdentifier: string,
+      variables: VariableInput[],
+      setStatus: (msg: string) => void,
+    ): Promise<void> => {
+      setStatus("Finding suitable UTXOs...");
+
+      // Derive required amount from variables that look like satoshi/amount fields.
+      const requestedVar = variables.find(
+        (v) =>
+          v.id.toLowerCase().includes("satoshi") ||
+          v.id.toLowerCase().includes("amount"),
+      );
+      const requested = requestedVar ? BigInt(requestedVar.value || "0") : 0n;
+      setRequiredAmount(requested);
+
+      const unspentOutputs = await invitationInstance.findSuitableResources({
+        templateIdentifier,
+      });
+
+      const mapped = mapUnspentOutputsToSelectable(unspentOutputs);
+      const autoSelected = autoSelectGreedyUtxos(mapped, requested + fee);
+      setAvailableUtxos(autoSelected as SelectableUTXO[]);
+      setStatus("Ready");
+    },
+    [fee],
+  );
+
+  /** Validate that the selection meets the required amounts. */
+  const validate = useCallback((): string | null => {
+    const selected = availableUtxos.filter((u) => u.selected);
+    if (selected.length === 0) {
+      return "Please select at least one UTXO";
+    }
+    if (selectedAmount < requiredAmount + fee) {
+      return `Insufficient funds. Need ${formatSatoshis(requiredAmount + fee)}, selected ${formatSatoshis(selectedAmount)}`;
+    }
+    if (changeAmount < 546n) {
+      return `Change amount (${changeAmount}) is below dust threshold (546 sats)`;
+    }
+    return null;
+  }, [availableUtxos, selectedAmount, requiredAmount, fee, changeAmount]);
+
+  return {
+    availableUtxos,
+    setAvailableUtxos,
+    selectedUtxoIndex,
+    setSelectedUtxoIndex,
+    requiredAmount,
+    fee,
+    selectedAmount,
+    changeAmount,
+    toggleSelection,
+    selectAll,
+    deselectAll,
+    loadUtxos,
+    validate,
+  } as const;
+}
+
+export type UtxoSelectionState = ReturnType<typeof useUtxoSelection>;

src/tui/screens/action-wizard/hooks/useVariableInputs.ts

@@ -0,0 +1,75 @@
+import { useState, useCallback } from "react";
+import type { XOTemplate } from "@xo-cash/types";
+import type { VariableInput } from "../types.js";
+
+/**
+ * Manages the variable input state for the wizard's variables step.
+ *
+ * Populates variables from the template's action/role requirements
+ * and provides validation + update helpers.
+ */
+export function useVariableInputs() {
+  const [variables, setVariables] = useState<VariableInput[]>([]);
+
+  /**
+   * Populate the variable list from the template's role requirements.
+   * Calling this again replaces the current variables entirely.
+   */
+  const initFromTemplate = useCallback(
+    (
+      template: XOTemplate,
+      actionIdentifier: string,
+      roleIdentifier: string,
+    ) => {
+      const action = template.actions?.[actionIdentifier];
+      const role = action?.roles?.[roleIdentifier];
+      const varIds = role?.requirements?.variables ?? [];
+
+      const varInputs: VariableInput[] = varIds.map((varId) => {
+        const varDef = template.variables?.[varId];
+        return {
+          id: varId,
+          name: varDef?.name || varId,
+          type: varDef?.type || "string",
+          hint: varDef?.hint,
+          value: "",
+        };
+      });
+      setVariables(varInputs);
+    },
+    [],
+  );
+
+  /** Update a single variable's value by index. */
+  const updateVariable = useCallback((index: number, value: string) => {
+    setVariables((prev) => {
+      const updated = [...prev];
+      const variable = updated[index];
+      if (variable) {
+        updated[index] = { ...variable, value };
+      }
+      return updated;
+    });
+  }, []);
+
+  /** Returns an error message if any required variable is empty, or null if valid. */
+  const validate = useCallback((): string | null => {
+    const emptyVars = variables.filter(
+      (v) => !v.value || v.value.trim() === "",
+    );
+    if (emptyVars.length > 0) {
+      return `Please enter values for: ${emptyVars.map((v) => v.name).join(", ")}`;
+    }
+    return null;
+  }, [variables]);
+
+  return {
+    variables,
+    setVariables,
+    initFromTemplate,
+    updateVariable,
+    validate,
+  } as const;
+}
+
+export type VariableInputsState = ReturnType<typeof useVariableInputs>;

src/tui/screens/action-wizard/hooks/useWizardFocus.ts

@@ -0,0 +1,37 @@
+import { useState, useCallback } from "react";
+import type { FocusArea, ButtonFocus } from "../types.js";
+
+/**
+ * Manages which area of the wizard UI has keyboard focus and
+ * which specific element within that area is highlighted.
+ */
+export function useWizardFocus() {
+  const [focusArea, setFocusArea] = useState<FocusArea>("content");
+  const [focusedButton, setFocusedButton] = useState<ButtonFocus>("next");
+  const [focusedInput, setFocusedInput] = useState(0);
+
+  /** Reset focus to the content area at the first element. */
+  const resetToContent = useCallback(() => {
+    setFocusArea("content");
+    setFocusedInput(0);
+  }, []);
+
+  /** Move focus to the button bar. */
+  const moveToButtons = useCallback((button: ButtonFocus = "next") => {
+    setFocusArea("buttons");
+    setFocusedButton(button);
+  }, []);
+
+  return {
+    focusArea,
+    setFocusArea,
+    focusedButton,
+    setFocusedButton,
+    focusedInput,
+    setFocusedInput,
+    resetToContent,
+    moveToButtons,
+  } as const;
+}
+
+export type WizardFocusState = ReturnType<typeof useWizardFocus>;

src/tui/screens/action-wizard/hooks/useWizardKeyboard.ts

@@ -0,0 +1,153 @@
+import { useBlockableInput } from "../../../hooks/useInputLayer.js";
+import type { ActionWizardState } from "./useActionWizard.js";
+
+/**
+ * Keyboard input handler for the action wizard.
+ *
+ * Dispatches key presses to step-specific handlers based on the
+ * current step type and focus area. Extracted from the screen
+ * component to keep it purely presentational.
+ */
+export function useWizardKeyboard(wizard: ActionWizardState): void {
+  useBlockableInput(
+    (input, key) => {
+      // ── Tab: cycle through content and button bar ─────────
+      if (key.tab) {
+        handleTab(wizard);
+        return;
+      }
+
+      // ── Content-area: step-specific input handling ────────
+      if (wizard.focusArea === "content") {
+        if (wizard.currentStepData?.type === "role-select") {
+          handleRoleSelectInput(wizard, input, key);
+          return;
+        }
+        if (wizard.currentStepData?.type === "inputs") {
+          handleInputsStepInput(wizard, input, key);
+          return;
+        }
+      }
+
+      // ── Button bar navigation + activation ────────────────
+      if (wizard.focusArea === "buttons") {
+        handleButtonBarInput(wizard, key);
+      }
+
+      // ── Global shortcuts ──────────────────────────────────
+      if (
+        input === "c" &&
+        wizard.currentStepData?.type === "publish" &&
+        wizard.invitationId
+      ) {
+        wizard.copyId();
+      }
+      if (input === "a" && wizard.currentStepData?.type === "inputs") {
+        wizard.selectAll();
+      }
+      if (input === "n" && wizard.currentStepData?.type === "inputs") {
+        wizard.deselectAll();
+      }
+    },
+    { isActive: !wizard.textInputHasFocus },
+  );
+}
+
+// ── Tab cycling ─────────────────────────────────────────────────
+
+function handleTab(wizard: ActionWizardState): void {
+  if (wizard.focusArea === "content") {
+    // Within role-select, tab through roles before moving to buttons
+    if (
+      wizard.currentStepData?.type === "role-select" &&
+      wizard.availableRoles.length > 0 &&
+      wizard.selectedRoleIndex < wizard.availableRoles.length - 1
+    ) {
+      wizard.setSelectedRoleIndex((prev) => prev + 1);
+      return;
+    }
+
+    // Within inputs, tab through UTXOs before moving to buttons
+    if (
+      wizard.currentStepData?.type === "inputs" &&
+      wizard.availableUtxos.length > 0 &&
+      wizard.selectedUtxoIndex < wizard.availableUtxos.length - 1
+    ) {
+      wizard.setSelectedUtxoIndex((prev) => prev + 1);
+      return;
+    }
+
+    // Move to button bar
+    wizard.setFocusArea("buttons");
+    wizard.setFocusedButton("next");
+  } else {
+    // Cycle through buttons, then wrap back to content
+    if (wizard.focusedButton === "back") {
+      wizard.setFocusedButton("cancel");
+    } else if (wizard.focusedButton === "cancel") {
+      wizard.setFocusedButton("next");
+    } else {
+      wizard.setFocusArea("content");
+      wizard.setFocusedInput(0);
+      wizard.setSelectedUtxoIndex(0);
+      wizard.setSelectedRoleIndex(0);
+    }
+  }
+}
+
+// ── Role-select step ────────────────────────────────────────────
+
+function handleRoleSelectInput(
+  wizard: ActionWizardState,
+  _input: string,
+  key: { upArrow: boolean; downArrow: boolean },
+): void {
+  if (key.upArrow) {
+    wizard.setSelectedRoleIndex((p) => Math.max(0, p - 1));
+  } else if (key.downArrow) {
+    wizard.setSelectedRoleIndex((p) =>
+      Math.min(wizard.availableRoles.length - 1, p + 1),
+    );
+  }
+}
+
+// ── Inputs step (UTXO selection) ────────────────────────────────
+
+function handleInputsStepInput(
+  wizard: ActionWizardState,
+  input: string,
+  key: { upArrow: boolean; downArrow: boolean; return: boolean },
+): void {
+  if (key.upArrow) {
+    wizard.setSelectedUtxoIndex((p) => Math.max(0, p - 1));
+  } else if (key.downArrow) {
+    wizard.setSelectedUtxoIndex((p) =>
+      Math.min(wizard.availableUtxos.length - 1, p + 1),
+    );
+  } else if (key.return || input === " ") {
+    wizard.toggleUtxoSelection(wizard.selectedUtxoIndex);
+  }
+}
+
+// ── Button bar ──────────────────────────────────────────────────
+
+function handleButtonBarInput(
+  wizard: ActionWizardState,
+  key: { leftArrow: boolean; rightArrow: boolean; return: boolean },
+): void {
+  if (key.leftArrow) {
+    wizard.setFocusedButton((p) =>
+      p === "next" ? "cancel" : p === "cancel" ? "back" : "back",
+    );
+  } else if (key.rightArrow) {
+    wizard.setFocusedButton((p) =>
+      p === "back" ? "cancel" : p === "cancel" ? "next" : "next",
+    );
+  }
+
+  if (key.return) {
+    if (wizard.focusedButton === "back") wizard.previousStep();
+    else if (wizard.focusedButton === "cancel") wizard.cancel();
+    else if (wizard.focusedButton === "next") wizard.nextStep();
+  }
+}

src/tui/screens/action-wizard/hooks/useWizardSteps.ts

@@ -0,0 +1,73 @@
+import { useState, useCallback, useMemo } from "react";
+import type { StepConfig, WizardStep } from "../types.js";
+
+/**
+ * Generic step navigation driven by an array of StepConfig objects.
+ *
+ * The orchestrator builds the StepConfig[] from the flow strategy
+ * and domain hooks; this hook just manages the step index and
+ * delegates validate/onNext to the current config.
+ */
+export function useWizardSteps(
+  stepConfigs: StepConfig[],
+  onCancel: () => void,
+  showError: (msg: string) => void,
+) {
+  const [currentStep, setCurrentStep] = useState(0);
+
+  /** Flat step descriptors for the progress indicator. */
+  const steps: WizardStep[] = useMemo(
+    () => stepConfigs.map((c) => ({ name: c.name, type: c.type })),
+    [stepConfigs],
+  );
+
+  const currentStepData = steps[currentStep];
+  const currentConfig = stepConfigs[currentStep];
+
+  /** Validate the current step, run its onNext, then advance if not the last step. */
+  const nextStep = useCallback(async () => {
+    const config = stepConfigs[currentStep];
+    if (!config) return;
+
+    const error = config.validate();
+    if (error) {
+      showError(error);
+      return;
+    }
+
+    const success = await config.onNext();
+    if (!success) return;
+
+    // Don't advance past the last step — the final step's onNext handles exit.
+    if (currentStep < stepConfigs.length - 1) {
+      setCurrentStep((prev) => prev + 1);
+    }
+  }, [currentStep, stepConfigs, showError]);
+
+  /** Go back one step, or cancel the wizard if already at the first step. */
+  const previousStep = useCallback(() => {
+    if (currentStep <= 0) {
+      onCancel();
+      return;
+    }
+    setCurrentStep((prev) => prev - 1);
+  }, [currentStep, onCancel]);
+
+  /** Cancel the wizard entirely. */
+  const cancel = useCallback(() => {
+    onCancel();
+  }, [onCancel]);
+
+  return {
+    steps,
+    currentStep,
+    setCurrentStep,
+    currentStepData,
+    currentConfig,
+    nextStep,
+    previousStep,
+    cancel,
+  } as const;
+}
+
+export type WizardStepsState = ReturnType<typeof useWizardSteps>;

src/tui/screens/action-wizard/index.ts

@@ -1,4 +1,5 @@
-export * from './ActionWizardScreen.js';
-export * from './useActionWizard.js';
-export * from './types.js';
-export * from './steps/index.js';
+export * from "./ActionWizardScreen.js";
+export * from "./hooks/useActionWizard.js";
+export * from "./types.js";
+export * from "./steps/index.js";
+export * from "./flows/index.js";

src/tui/screens/action-wizard/steps/DataResultStep.tsx

@@ -0,0 +1,81 @@
+import React from 'react';
+import { Box, Text } from 'ink';
+import { colors } from '../../../theme.js';
+import type { VariableInput, DataResult } from '../types.js';
+
+interface DataResultStepProps {
+  actionName: string;
+  variables: VariableInput[];
+  dataResults: DataResult[];
+}
+
+/**
+ * Displays the result of a data-only action (e.g. sign, verify).
+ *
+ * NOTE: Engine-level data action execution is not yet implemented.
+ * The computed values are stubbed until the engine supports evaluating
+ * CashASM data expressions outside of a transaction context.
+ */
+export function DataResultStep({
+  actionName,
+  variables,
+  dataResults,
+}: DataResultStepProps): React.ReactElement {
+  return (
+    <Box flexDirection="column">
+      <Text color={colors.primary} bold>
+        {actionName} — Result
+      </Text>
+
+      {/* Variables that were provided */}
+      {variables.length > 0 && (
+        <Box marginTop={1} flexDirection="column">
+          <Text color={colors.text}>Provided values:</Text>
+          {variables.map((v) => (
+            <Text key={v.id} color={colors.textMuted}>
+              {'  '}{v.name}: {v.value || '(empty)'}
+            </Text>
+          ))}
+        </Box>
+      )}
+
+      {/* Computed data results */}
+      <Box marginTop={1} flexDirection="column">
+        <Text color={colors.text}>Output:</Text>
+        {dataResults.length === 0 ? (
+          <Text color={colors.warning}>
+            {'  '}Engine support for data actions is not yet implemented.
+          </Text>
+        ) : (
+          dataResults.map((result) => (
+            <Box key={result.id} flexDirection="column" marginTop={0}>
+              <Text color={colors.textMuted}>
+                {'  '}{result.name} ({result.type}):
+              </Text>
+              {result.value !== null ? (
+                <Box
+                  borderStyle="single"
+                  borderColor={colors.primary}
+                  paddingX={1}
+                  marginLeft={2}
+                >
+                  <Text color={colors.accent}>{result.value}</Text>
+                </Box>
+              ) : (
+                <Text color={colors.warning} dimColor>
+                  {'    '}Pending — engine data execution not yet available
+                </Text>
+              )}
+            </Box>
+          ))
+        )}
+      </Box>
+
+      <Box marginTop={1}>
+        <Text color={colors.textMuted} dimColor>
+          Press Done to exit.
+        </Text>
+      </Box>
+    </Box>
+  );
+}

src/tui/screens/action-wizard/steps/InfoStep.tsx

@@ -1,52 +0,0 @@
-import React from 'react';
-import { Box, Text } from 'ink';
-import { colors } from '../../../theme.js';
-import type { WizardStepProps } from '../types.js';
-
-type Props = Pick<
-  WizardStepProps,
-  'template' | 'actionIdentifier' | 'roleIdentifier' | 'actionName'
->;
-
-export function InfoStep({
-  template,
-  actionIdentifier,
-  roleIdentifier,
-  actionName,
-}: Props): React.ReactElement {
-  const action = template?.actions?.[actionIdentifier];
-  const role = action?.roles?.[roleIdentifier];
-
-  return (
-    <Box flexDirection='column'>
-      <Text color={colors.primary} bold>
-        Action: {actionName}
-      </Text>
-      <Text color={colors.textMuted}>
-        {action?.description || 'No description'}
-      </Text>
-
-      <Box marginTop={1}>
-        <Text color={colors.text}>Your Role: </Text>
-        <Text color={colors.accent}>{roleIdentifier}</Text>
-      </Box>
-
-      {role?.requirements && (
-        <Box marginTop={1} flexDirection='column'>
-          <Text color={colors.text}>Requirements:</Text>
-          {role.requirements.variables?.map((v) => (
-            <Text key={v} color={colors.textMuted}>
-              {'  '}• Variable: {v}
-            </Text>
-          ))}
-          {role.requirements.slots && (
-            <Text color={colors.textMuted}>
-              {'  '}• Slots: {role.requirements.slots.min} min (UTXO selection
-              required)
-            </Text>
-          )}
-        </Box>
-      )}
-    </Box>
-  );
-}

src/tui/screens/action-wizard/steps/InputsStep.tsx

@@ -1,18 +1,18 @@
 import React from 'react';
 import { Box, Text } from 'ink';
 import { colors, formatSatoshis, formatHex } from '../../../theme.js';
-import type { WizardStepProps } from '../types.js';
+import { useSatoshisConversion } from '../../../hooks/useSatoshisConversion.js';
+import type { SelectableUTXO, FocusArea } from '../types.js';
 
-type Props = Pick<
-  WizardStepProps,
-  | 'availableUtxos'
-  | 'selectedUtxoIndex'
-  | 'requiredAmount'
-  | 'fee'
-  | 'selectedAmount'
-  | 'changeAmount'
-  | 'focusArea'
->;
+interface Props {
+  availableUtxos: SelectableUTXO[];
+  selectedUtxoIndex: number;
+  requiredAmount: bigint;
+  fee: bigint;
+  selectedAmount: bigint;
+  changeAmount: bigint;
+  focusArea: FocusArea;
+}
 
 export function InputsStep({
   availableUtxos,
@@ -23,6 +23,13 @@ export function InputsStep({
   changeAmount,
   focusArea,
 }: Props): React.ReactElement {
+  const { formatSatoshisToFiat } = useSatoshisConversion('USD');
+
+  const getFiatSuffix = (satoshis: bigint): string => {
+    const fiatValue = formatSatoshisToFiat(satoshis);
+    return fiatValue ? ` (~${fiatValue})` : '';
+  };
+
   return (
     <Box flexDirection='column'>
       <Text color={colors.text} bold>
@@ -33,6 +40,7 @@ export function InputsStep({
         <Text color={colors.textMuted}>
           Required: {formatSatoshis(requiredAmount)} +{' '}
           {formatSatoshis(fee)} fee
+          {getFiatSuffix(requiredAmount + fee)}
         </Text>
         <Text
           color={
@@ -42,10 +50,12 @@ export function InputsStep({
           }
         >
           Selected: {formatSatoshis(selectedAmount)}
+          {getFiatSuffix(selectedAmount)}
         </Text>
         {selectedAmount > requiredAmount + fee && (
           <Text color={colors.info}>
             Change: {formatSatoshis(changeAmount)}
+            {getFiatSuffix(changeAmount)}
           </Text>
         )}
       </Box>
@@ -66,6 +76,7 @@ export function InputsStep({
             return (
               <Box
                 key={`${utxo.outpointTransactionHash}:${utxo.outpointIndex}`}
+                flexDirection='column'
               >
                 <Text
                   color={isCursor ? colors.focus : colors.text}
@@ -76,6 +87,15 @@ export function InputsStep({
                   {formatHex(utxo.outpointTransactionHash, 12)}:
                   {utxo.outpointIndex}
                 </Text>
+                {(() => {
+                  const fiatValue = formatSatoshisToFiat(utxo.valueSatoshis);
+                  if (!fiatValue) return null;
+                  return (
+                    <Text color={colors.textMuted}>
+                      {'   '}≈ {fiatValue}
+                    </Text>
+                  );
+                })()}
               </Box>
             );
           })

src/tui/screens/action-wizard/steps/PublishStep.tsx

@@ -4,15 +4,19 @@ import { colors } from '../../../theme.js';
 
 interface PublishStepProps {
   invitationId: string | null;
+  requirementsComplete: boolean;
+  hasSignedAndBroadcasted: boolean;
 }
 
 export function PublishStep({
   invitationId,
+  requirementsComplete,
+  hasSignedAndBroadcasted,
 }: PublishStepProps): React.ReactElement {
   return (
     <Box flexDirection='column'>
       <Text color={colors.success} bold>
-        ✓ Invitation Created & Published!
+        ✓ Invitation Ready
       </Text>
 
       <Box marginTop={1} flexDirection='column'>
@@ -30,9 +34,19 @@ export function PublishStep({
       </Box>
 
       <Box marginTop={1}>
-        <Text color={colors.textMuted}>
-          Share this ID with the other party to complete the transaction.
+        {hasSignedAndBroadcasted ? (
+          <Text color={colors.success}>
+            Transaction signed and broadcasted.
           </Text>
+        ) : requirementsComplete ? (
+          <Text color={colors.textMuted}>
+            Requirements are complete. Use the Sign & Broadcast button to finalize.
+          </Text>
+        ) : (
+          <Text color={colors.warning}>
+            Requirements are incomplete. Complete missing requirements before signing.
+          </Text>
+        )}
       </Box>
 
       <Box marginTop={1}>

src/tui/screens/action-wizard/steps/ReviewStep.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Box, Text } from 'ink';
 import { colors, formatSatoshis } from '../../../theme.js';
+import { useSatoshisConversion } from '../../../hooks/useSatoshisConversion.js';
 import type { VariableInput, SelectableUTXO } from '../types.js';
 import type { XOTemplate } from '@xo-cash/types';
 
@@ -22,6 +23,32 @@ export function ReviewStep({
   changeAmount,
 }: ReviewStepProps): React.ReactElement {
   const selectedUtxos = availableUtxos.filter((u) => u.selected);
+  const { formatSatoshisToFiat } = useSatoshisConversion('USD');
+
+  const getFiatSuffix = (satoshis: bigint): string => {
+    const fiatValue = formatSatoshisToFiat(satoshis);
+    return fiatValue ? ` (~${fiatValue})` : '';
+  };
+
+  const getVariableFiatSuffix = (variable: VariableInput): string => {
+    if (variable.type !== 'integer') {
+      return '';
+    }
+
+    if (variable.hint?.toLowerCase().includes('satoshi') !== true) {
+      return '';
+    }
+
+    if (!/^[-]?\d+$/.test(variable.value.trim())) {
+      return '';
+    }
+
+    try {
+      return getFiatSuffix(BigInt(variable.value));
+    } catch {
+      return '';
+    }
+  };
 
   return (
     <Box flexDirection='column'>
@@ -44,6 +71,7 @@ export function ReviewStep({
             <Text key={v.id} color={colors.textMuted}>
               {'  '}
               {v.name}: {v.value || '(empty)'}
+              {v.value ? getVariableFiatSuffix(v) : ''}
             </Text>
           ))}
         </Box>
@@ -62,6 +90,7 @@ export function ReviewStep({
             >
               {'  '}
               {formatSatoshis(u.valueSatoshis)}
+              {getFiatSuffix(u.valueSatoshis)}
             </Text>
           ))}
           {selectedUtxos.length > 3 && (
@@ -78,6 +107,7 @@ export function ReviewStep({
           <Text color={colors.text}>Outputs:</Text>
           <Text color={colors.textMuted}>
             {'  '}Change: {formatSatoshis(changeAmount)}
+            {getFiatSuffix(changeAmount)}
           </Text>
         </Box>
       )}

src/tui/screens/action-wizard/steps/RoleSelectStep.tsx

@@ -61,13 +61,16 @@ export function RoleSelectStep({
         {availableRoles.length === 0 ? (
           <Text color={colors.textMuted}>No roles available</Text>
         ) : (
-          availableRoles.map((roleId, index) => {
+          availableRoles.map((roleId: string, index: number) => {
             const isCursor =
               selectedRoleIndex === index && focusArea === 'content';
             const roleDef = template.roles?.[roleId];
             const actionRole = action?.roles?.[roleId];
             const requirements = actionRole?.requirements;
 
+            const actionRequirements = action?.requirements;
+            const actionRoleRequirements = actionRole && actionRequirements && actionRequirements.participants?.find((participant) => participant.role === roleId);
+
             return (
               <Box key={roleId} flexDirection="column" marginY={0}>
                 <Text
@@ -96,10 +99,10 @@ export function RoleSelectStep({
                         {'  '}
                       </Text>
                     )}
-                    {requirements.slots && requirements.slots.min > 0 && (
+                    {actionRoleRequirements && actionRoleRequirements.slots && actionRoleRequirements.slots.min > 0 && (
                       <Text color={colors.textMuted} dimColor>
-                        {requirements.slots.min} input slot
-                        {requirements.slots.min !== 1 ? 's' : ''}
+                        {actionRoleRequirements.slots.min} input slot
+                        {actionRoleRequirements.slots.min !== 1 ? 's' : ''}
                       </Text>
                     )}
                   </Box>

src/tui/screens/action-wizard/steps/VariablesStep.tsx

@@ -2,16 +2,15 @@ import React from 'react';
 import { Box, Text } from 'ink';
 import { colors } from '../../../theme.js';
 import { VariableInputField } from '../../../components/VariableInputField.js';
-import type { WizardStepProps } from '../types.js';
+import type { VariableInput, FocusArea } from '../types.js';
 
-type Props = Pick<
-  WizardStepProps,
-  | 'variables'
-  | 'updateVariable'
-  | 'handleTextInputSubmit'
-  | 'focusArea'
-  | 'focusedInput'
->;
+interface Props {
+  variables: VariableInput[];
+  updateVariable: (index: number, value: string) => void;
+  handleTextInputSubmit: () => void;
+  focusArea: FocusArea;
+  focusedInput: number;
+}
 
 export function VariablesStep({
   variables,

src/tui/screens/action-wizard/steps/index.ts

@@ -1,6 +1,6 @@
-export * from './InfoStep.js';
-export * from './RoleSelectStep.js';
-export * from './VariablesStep.js';
-export * from './InputsStep.js';
-export * from './ReviewStep.js';
-export * from './PublishStep.js';
+export * from "./RoleSelectStep.js";
+export * from "./VariablesStep.js";
+export * from "./InputsStep.js";
+export * from "./ReviewStep.js";
+export * from "./PublishStep.js";
+export * from "./DataResultStep.js";

src/tui/screens/action-wizard/types.ts

@@ -1,12 +1,50 @@
-import type { XOTemplate } from '@xo-cash/types';
+/**
+ * Shared types for the action wizard.
+ */
 
-export type StepType = 'info' | 'role-select' | 'variables' | 'inputs' | 'review' | 'publish';
+/** Supported step types in the wizard. */
+export type StepType =
+  | "role-select"
+  | "variables"
+  | "inputs"
+  | "review"
+  | "publish"
+  | "result";
 
+/** A step displayed in the wizard's progress indicator. */
 export interface WizardStep {
   name: string;
   type: StepType;
 }
 
+/**
+ * Configuration for a single wizard step.
+ * The flow strategy determines which steps exist; the orchestrator
+ * wires validate/onNext to the appropriate domain hooks.
+ */
+export interface StepConfig {
+  type: StepType;
+  name: string;
+  /** Return an error message if the step is invalid, or null if OK to proceed. */
+  validate: () => string | null;
+  /** Execute transition logic. Return true on success, false to stay on this step. */
+  onNext: () => Promise<boolean>;
+}
+
+/**
+ * Context passed to WizardFlow strategy methods so they can
+ * determine steps and finalization state without holding React state.
+ */
+export interface FlowContext {
+  availableRoles: string[];
+  hasVariables: boolean;
+  shouldCollectInputs: boolean;
+  requirementsComplete: boolean;
+  wizardCollectedInputs: boolean;
+  hasSignedAndBroadcasted: boolean;
+}
+
+/** Variable input state for the variables step. */
 export interface VariableInput {
   id: string;
   name: string;
@@ -15,6 +53,7 @@ export interface VariableInput {
   value: string;
 }
 
+/** A UTXO that can be toggled for transaction funding. */
 export interface SelectableUTXO {
   outpointTransactionHash: string;
   outpointIndex: number;
@@ -23,40 +62,18 @@ export interface SelectableUTXO {
   selected: boolean;
 }
 
-export type FocusArea = 'content' | 'buttons';
-export type ButtonFocus = 'back' | 'cancel' | 'next';
+/** Which area of the wizard UI currently has keyboard focus. */
+export type FocusArea = "content" | "buttons";
 
-/**
- * The 'downward' contract — what every step component receives.
- */
-export interface WizardStepProps {
-  // Data
-  template: XOTemplate;
-  actionIdentifier: string;
-  roleIdentifier: string;
-  actionName: string;
+/** Which button in the bottom bar is focused. */
+export type ButtonFocus = "back" | "cancel" | "next";
 
-  // Variable state
-  variables: VariableInput[];
-  updateVariable: (index: number, value: string) => void;
-
-  // UTXO state
-  availableUtxos: SelectableUTXO[];
-  selectedUtxoIndex: number;
-  requiredAmount: bigint;
-  fee: bigint;
-  selectedAmount: bigint;
-  changeAmount: bigint;
-  toggleUtxoSelection: (index: number) => void;
-
-  // Invitation
-  invitationId: string | null;
-
-  // Focus
-  focusArea: FocusArea;
-  focusedInput: number;
-
-  // Callbacks
-  handleTextInputSubmit: () => void;
-  copyId: () => Promise<void>;
+/** A computed data result from a data-only action. */
+export interface DataResult {
+  id: string;
+  name: string;
+  type: string;
+  hint?: string;
+  /** null when the engine hasn't computed the value yet. */
+  value: string | null;
 }

src/tui/screens/action-wizard/useActionWizard.ts

@@ -1,680 +0,0 @@
-import { useState, useEffect, useCallback, useMemo } from 'react';
-import { useNavigation } from '../../hooks/useNavigation.js';
-import { useAppContext, useStatus } from '../../hooks/useAppContext.js';
-import { formatSatoshis } from '../../theme.js';
-import { copyToClipboard } from '../../utils/clipboard.js';
-import type { XOTemplate, XOInvitation, XOTemplateTransactionOutput } from '@xo-cash/types';
-import type {
-  WizardStep,
-  VariableInput,
-  SelectableUTXO,
-  FocusArea,
-  ButtonFocus,
-} from './types.js';
-
-export function useActionWizard() {
-  const { navigate, goBack, data: navData } = useNavigation();
-  const { appService, showError, showInfo } = useAppContext();
-  const { setStatus } = useStatus();
-
-  // ── Navigation data ──────────────────────────────────────────────
-  // Role is no longer passed via navigation — it is selected in the wizard.
-  const templateIdentifier = navData.templateIdentifier as string | undefined;
-  const actionIdentifier = navData.actionIdentifier as string | undefined;
-  const template = navData.template as XOTemplate | undefined;
-
-  // ── Role selection state ────────────────────────────────────────
-  const [roleIdentifier, setRoleIdentifier] = useState<string | undefined>();
-  const [selectedRoleIndex, setSelectedRoleIndex] = useState(0);
-
-  /**
-   * Roles that can start this action, derived from the template's
-   * `start` entries filtered to the current action.
-   */
-  const availableRoles = useMemo(() => {
-    if (!template || !actionIdentifier) return [];
-    const starts = template.start ?? [];
-    const roleIds = starts
-      .filter((s) => s.action === actionIdentifier)
-      .map((s) => s.role);
-    // Deduplicate while preserving order
-    return [...new Set(roleIds)];
-  }, [template, actionIdentifier]);
-
-  // ── Wizard state ─────────────────────────────────────────────────
-  const [steps, setSteps] = useState<WizardStep[]>([]);
-  const [currentStep, setCurrentStep] = useState(0);
-
-  // ── Variable inputs ──────────────────────────────────────────────
-  const [variables, setVariables] = useState<VariableInput[]>([]);
-
-  // ── UTXO selection ───────────────────────────────────────────────
-  const [availableUtxos, setAvailableUtxos] = useState<SelectableUTXO[]>([]);
-  const [selectedUtxoIndex, setSelectedUtxoIndex] = useState(0);
-  const [requiredAmount, setRequiredAmount] = useState<bigint>(0n);
-  const [fee, setFee] = useState<bigint>(500n);
-
-  // ── Invitation ───────────────────────────────────────────────────
-  const [invitation, setInvitation] = useState<XOInvitation | null>(null);
-  const [invitationId, setInvitationId] = useState<string | null>(null);
-
-  // ── UI state ─────────────────────────────────────────────────────
-  const [focusedInput, setFocusedInput] = useState(0);
-  const [focusedButton, setFocusedButton] = useState<ButtonFocus>('next');
-  const [focusArea, setFocusArea] = useState<FocusArea>('content');
-  const [isProcessing, setIsProcessing] = useState(false);
-
-  // ── Derived values ───────────────────────────────────────────────
-  const currentStepData = steps[currentStep];
-  const action = template?.actions?.[actionIdentifier ?? ''];
-  const actionName = action?.name || actionIdentifier || 'Unknown';
-
-  const selectedAmount = availableUtxos
-    .filter((u) => u.selected)
-    .reduce((sum, u) => sum + u.valueSatoshis, 0n);
-
-  const changeAmount = selectedAmount - requiredAmount - fee;
-
-  const textInputHasFocus =
-    currentStepData?.type === 'variables' && focusArea === 'content';
-
-  // ── Initialization ───────────────────────────────────────────────
-  // Builds the wizard steps dynamically based on the selected role.
-  // Re-runs when roleIdentifier changes to add role-specific steps.
-  useEffect(() => {
-    if (!template || !actionIdentifier) {
-      showError('Missing wizard data');
-      goBack();
-      return;
-    }
-
-    const wizardSteps: WizardStep[] = [];
-
-    // Always start with role selection
-    wizardSteps.push({ name: 'Select Role', type: 'role-select' });
-
-    // Add role-specific steps only after role is selected
-    if (roleIdentifier) {
-      const act = template.actions?.[actionIdentifier];
-      const role = act?.roles?.[roleIdentifier];
-      const requirements = role?.requirements;
-
-      // Add variables step if needed
-      if (requirements?.variables && requirements.variables.length > 0) {
-        wizardSteps.push({ name: 'Variables', type: 'variables' });
-
-        const varInputs = requirements.variables.map((varId) => {
-          const varDef = template.variables?.[varId];
-          return {
-            id: varId,
-            name: varDef?.name || varId,
-            type: varDef?.type || 'string',
-            hint: varDef?.hint,
-            value: '',
-          };
-        });
-        setVariables(varInputs);
-      }
-
-      // Add inputs step if role requires slots (funding inputs)
-      if (requirements?.slots && requirements.slots.min > 0) {
-        wizardSteps.push({ name: 'Select UTXOs', type: 'inputs' });
-      }
-    }
-
-    // Always add review and publish at the end
-    wizardSteps.push({ name: 'Review', type: 'review' });
-    wizardSteps.push({ name: 'Publish', type: 'publish' });
-
-    setSteps(wizardSteps);
-    setStatus(roleIdentifier ? `${actionIdentifier}/${roleIdentifier}` : actionIdentifier);
-  }, [
-    template,
-    actionIdentifier,
-    roleIdentifier,
-    showError,
-    goBack,
-    setStatus,
-  ]);
-
-  // ── Auto-advance from role-select after role is chosen ──────────
-  // This runs after the main useEffect has rebuilt steps, ensuring
-  // we advance to the correct step (variables, inputs, or review).
-  useEffect(() => {
-    if (roleIdentifier && currentStep === 0 && steps[0]?.type === 'role-select') {
-      setCurrentStep(1);
-      setFocusArea('content');
-      setFocusedInput(0);
-    }
-  }, [roleIdentifier, currentStep, steps]);
-
-  // ── Update a single variable value ───────────────────────────────
-  const updateVariable = useCallback((index: number, value: string) => {
-    setVariables((prev) => {
-      const updated = [...prev];
-      const variable = updated[index];
-      if (variable) {
-        updated[index] = { ...variable, value };
-      }
-      return updated;
-    });
-  }, []);
-
-  // ── Toggle a UTXO's selected state ──────────────────────────────
-  const toggleUtxoSelection = useCallback((index: number) => {
-    setAvailableUtxos((prev) => {
-      const updated = [...prev];
-      const utxo = updated[index];
-      if (utxo) {
-        updated[index] = { ...utxo, selected: !utxo.selected };
-      }
-      return updated;
-    });
-  }, []);
-
-  // ── Handle Enter inside a TextInput ─────────────────────────────
-  const handleTextInputSubmit = useCallback(() => {
-    if (focusedInput < variables.length - 1) {
-      setFocusedInput((prev) => prev + 1);
-    } else {
-      setFocusArea('buttons');
-      setFocusedButton('next');
-    }
-  }, [focusedInput, variables.length]);
-
-  // ── Copy invitation ID to clipboard ─────────────────────────────
-  const copyId = useCallback(async () => {
-    if (!invitationId) return;
-    try {
-      await copyToClipboard(invitationId);
-      showInfo(`Copied to clipboard!\n\n${invitationId}`);
-    } catch (error) {
-      showError(
-        `Failed to copy: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }, [invitationId, showInfo, showError]);
-
-  // ── Load available UTXOs for the inputs step ────────────────────
-  const loadAvailableUtxos = useCallback(async () => {
-    if (!invitation || !templateIdentifier || !appService || !invitationId) {
-      return;
-    }
-
-    try {
-      setIsProcessing(true);
-      setStatus('Finding suitable UTXOs...');
-
-      // Determine required amount from variables
-      const requestedVar = variables.find(
-        (v) =>
-          v.id.toLowerCase().includes('satoshi') ||
-          v.id.toLowerCase().includes('amount')
-      );
-      const requested = requestedVar
-        ? BigInt(requestedVar.value || '0')
-        : 0n;
-      setRequiredAmount(requested);
-
-      // Find the tracked invitation instance
-      const invitationInstance = appService.invitations.find(
-        (inv) => inv.data.invitationIdentifier === invitationId
-      );
-
-      if (!invitationInstance) {
-        throw new Error('Invitation not found');
-      }
-
-      // Query for suitable resources
-      const unspentOutputs = await invitationInstance.findSuitableResources({
-        templateIdentifier,
-        outputIdentifier: 'receiveOutput',
-      });
-
-      // Map to selectable UTXOs
-      const utxos: SelectableUTXO[] = unspentOutputs.map((utxo: any) => ({
-        outpointTransactionHash: utxo.outpointTransactionHash,
-        outpointIndex: utxo.outpointIndex,
-        valueSatoshis: BigInt(utxo.valueSatoshis),
-        lockingBytecode: utxo.lockingBytecode
-          ? typeof utxo.lockingBytecode === 'string'
-            ? utxo.lockingBytecode
-            : Buffer.from(utxo.lockingBytecode).toString('hex')
-          : undefined,
-        selected: false,
-      }));
-
-      // Auto-select UTXOs greedily until the requirement is met
-      let accumulated = 0n;
-      const seenLockingBytecodes = new Set<string>();
-
-      for (const utxo of utxos) {
-        if (
-          utxo.lockingBytecode &&
-          seenLockingBytecodes.has(utxo.lockingBytecode)
-        ) {
-          continue;
-        }
-        if (utxo.lockingBytecode) {
-          seenLockingBytecodes.add(utxo.lockingBytecode);
-        }
-
-        utxo.selected = true;
-        accumulated += utxo.valueSatoshis;
-
-        if (accumulated >= requested + fee) {
-          break;
-        }
-      }
-
-      setAvailableUtxos(utxos);
-      setStatus('Ready');
-    } catch (error) {
-      showError(
-        `Failed to load UTXOs: ${error instanceof Error ? error.message : String(error)}`
-      );
-    } finally {
-      setIsProcessing(false);
-    }
-  }, [
-    invitation,
-    templateIdentifier,
-    variables,
-    appService,
-    invitationId,
-    fee,
-    showError,
-    setStatus,
-  ]);
-
-  // ── Create invitation and persist variables ─────────────────────
-  /**
-   * Creates an invitation, optionally persists variable values,
-   * and adds template-required outputs.
-   *
-   * Accepts an explicit `roleId` to avoid stale-closure issues
-   * when called immediately after setting role state.
-   *
-   * Does NOT advance the wizard step — the caller is responsible.
-   *
-   * @returns `true` on success, `false` on failure.
-   */
-  const createInvitationWithVariables = useCallback(
-    async (roleId?: string): Promise<boolean> => {
-      const effectiveRole = roleId ?? roleIdentifier;
-
-      if (
-        !templateIdentifier ||
-        !actionIdentifier ||
-        !effectiveRole ||
-        !template ||
-        !appService
-      ) {
-        return false;
-      }
-
-      setIsProcessing(true);
-      setStatus('Creating invitation...');
-
-      try {
-        // Create via the engine
-        const xoInvitation = await appService.engine.createInvitation({
-          templateIdentifier,
-          actionIdentifier,
-        });
-
-        console.log(xoInvitation)
-
-        // Wrap and track
-        const invitationInstance =
-          await appService.createInvitation(xoInvitation);
-
-        let inv = invitationInstance.data;
-        const invId = inv.invitationIdentifier;
-        setInvitationId(invId);
-
-        // Persist variable values
-        if (variables.length > 0) {
-          const variableData = variables.map((v) => {
-            const isNumeric =
-              ['integer', 'number', 'satoshis'].includes(v.type) ||
-              (v.hint && ['satoshis', 'amount'].includes(v.hint));
-
-            return {
-              variableIdentifier: v.id,
-              roleIdentifier: effectiveRole,
-              value: isNumeric ? BigInt(v.value || '0') : v.value,
-            };
-          });
-          await invitationInstance.addVariables(variableData);
-          inv = invitationInstance.data;
-        }
-
-        // Add template-required outputs for the current role
-        const act = template.actions?.[actionIdentifier];
-        const transaction = act?.transaction
-          ? template.transactions?.[act.transaction]
-          : null;
-
-        if (transaction?.outputs && transaction.outputs.length > 0) {
-          setStatus('Adding required outputs...');
-
-          const outputsToAdd = transaction.outputs.map(
-            (output: XOTemplateTransactionOutput) => ({
-              outputIdentifier: output.output,
-              roleIdentifier: roleIdentifier,
-            })
-          );
-
-          await invitationInstance.addOutputs(outputsToAdd);
-          inv = invitationInstance.data;
-        }
-
-        setInvitation(inv);
-        setStatus('Invitation created');
-        return true;
-      } catch (error) {
-        showError(
-          `Failed to create invitation: ${error instanceof Error ? error.message : String(error)}`
-        );
-        return false;
-      } finally {
-        setIsProcessing(false);
-      }
-    },
-    [
-      templateIdentifier,
-      actionIdentifier,
-      roleIdentifier,
-      template,
-      variables,
-      appService,
-      showError,
-      setStatus,
-    ]
-  );
-
-  // ── Add selected inputs + change output to the invitation ───────
-  const addInputsAndOutputs = useCallback(async () => {
-    if (!invitationId || !invitation || !appService) return;
-
-    const selectedUtxos = availableUtxos.filter((u) => u.selected);
-
-    if (selectedUtxos.length === 0) {
-      showError('Please select at least one UTXO');
-      return;
-    }
-
-    if (selectedAmount < requiredAmount + fee) {
-      showError(
-        `Insufficient funds. Need ${formatSatoshis(requiredAmount + fee)}, selected ${formatSatoshis(selectedAmount)}`
-      );
-      return;
-    }
-
-    if (changeAmount < 546n) {
-      showError(
-        `Change amount (${changeAmount}) is below dust threshold (546 sats)`
-      );
-      return;
-    }
-
-    setIsProcessing(true);
-    setStatus('Adding inputs and outputs...');
-
-    try {
-      const invitationInstance = appService.invitations.find(
-        (inv) => inv.data.invitationIdentifier === invitationId
-      );
-
-      if (!invitationInstance) {
-        throw new Error('Invitation not found');
-      }
-
-      // Add selected inputs
-      const inputs = selectedUtxos.map((utxo) => ({
-        outpointTransactionHash: new Uint8Array(
-          Buffer.from(utxo.outpointTransactionHash, 'hex')
-        ),
-        outpointIndex: utxo.outpointIndex,
-      }));
-
-      await invitationInstance.addInputs(inputs);
-
-      // Add change output
-      const outputs = [
-        {
-          valueSatoshis: changeAmount,
-        },
-      ];
-
-      await invitationInstance.addOutputs(outputs);
-
-      setCurrentStep((prev) => prev + 1);
-      setStatus('Inputs and outputs added');
-    } catch (error) {
-      showError(
-        `Failed to add inputs/outputs: ${error instanceof Error ? error.message : String(error)}`
-      );
-    } finally {
-      setIsProcessing(false);
-    }
-  }, [
-    invitationId,
-    invitation,
-    availableUtxos,
-    selectedAmount,
-    requiredAmount,
-    fee,
-    changeAmount,
-    appService,
-    showError,
-    setStatus,
-  ]);
-
-  // ── Publish the invitation ──────────────────────────────────────
-  const publishInvitation = useCallback(async () => {
-    if (!invitationId || !appService) return;
-
-    setIsProcessing(true);
-    setStatus('Publishing invitation...');
-
-    try {
-      const invitationInstance = appService.invitations.find(
-        (inv) => inv.data.invitationIdentifier === invitationId
-      );
-
-      if (!invitationInstance) {
-        throw new Error('Invitation not found');
-      }
-
-      // Already tracked and synced via SSE from createInvitation
-      setCurrentStep((prev) => prev + 1);
-      setStatus('Invitation published');
-    } catch (error) {
-      showError(
-        `Failed to publish: ${error instanceof Error ? error.message : String(error)}`
-      );
-    } finally {
-      setIsProcessing(false);
-    }
-  }, [invitationId, appService, showError, setStatus]);
-
-  // ── Navigate to the next step ───────────────────────────────────
-  const nextStep = useCallback(async () => {
-    if (currentStep >= steps.length - 1) return;
-
-    const stepType = currentStepData?.type;
-
-    // ── Role selection ──────────────────────────────────────────
-    if (stepType === 'role-select') {
-      const selectedRole = availableRoles[selectedRoleIndex];
-      if (!selectedRole) {
-        showError('Please select a role');
-        return;
-      }
-
-      // Check what the selected role requires
-      const act = template?.actions?.[actionIdentifier ?? ''];
-      const role = act?.roles?.[selectedRole];
-      const requirements = role?.requirements;
-
-      const hasVariables =
-        requirements?.variables && requirements.variables.length > 0;
-      const hasSlots = requirements?.slots && requirements.slots.min > 0;
-
-      // If there is no variables step, the invitation must be created now
-      // because the variables step would normally handle it.
-      if (!hasVariables) {
-        const success = await createInvitationWithVariables(selectedRole);
-        if (!success) return;
-
-        // If we're going to the inputs step, load UTXOs
-        if (hasSlots) {
-          setTimeout(() => loadAvailableUtxos(), 100);
-        }
-      }
-
-      // Set role — this triggers the useEffect to rebuild steps and advance
-      setRoleIdentifier(selectedRole);
-      return;
-    }
-
-    // ── Variables ───────────────────────────────────────────────
-    if (stepType === 'variables') {
-      const emptyVars = variables.filter(
-        (v) => !v.value || v.value.trim() === ''
-      );
-      if (emptyVars.length > 0) {
-        showError(
-          `Please enter values for: ${emptyVars.map((v) => v.name).join(', ')}`
-        );
-        return;
-      }
-
-      // Create the invitation and persist the variable values
-      const success = await createInvitationWithVariables();
-      if (!success) return;
-
-      // Advance, optionally kicking off UTXO loading
-      const nextStepType = steps[currentStep + 1]?.type;
-      if (nextStepType === 'inputs') {
-        setCurrentStep((prev) => prev + 1);
-        setTimeout(() => loadAvailableUtxos(), 100);
-      } else {
-        setCurrentStep((prev) => prev + 1);
-      }
-
-      setFocusArea('content');
-      setFocusedInput(0);
-      return;
-    }
-
-    // ── Inputs ──────────────────────────────────────────────────
-    if (stepType === 'inputs') {
-      await addInputsAndOutputs();
-      return;
-    }
-
-    // ── Review ──────────────────────────────────────────────────
-    if (stepType === 'review') {
-      await publishInvitation();
-      return;
-    }
-
-    // ── Generic advance (e.g. publish → done) ───────────────────
-    setCurrentStep((prev) => prev + 1);
-    setFocusArea('content');
-    setFocusedInput(0);
-  }, [
-    currentStep,
-    steps,
-    currentStepData,
-    availableRoles,
-    selectedRoleIndex,
-    template,
-    actionIdentifier,
-    variables,
-    showError,
-    createInvitationWithVariables,
-    loadAvailableUtxos,
-    addInputsAndOutputs,
-    publishInvitation,
-  ]);
-
-  // ── Navigate to the previous step ──────────────────────────────
-  const previousStep = useCallback(() => {
-    if (currentStep <= 0) {
-      goBack();
-      return;
-    }
-    setCurrentStep((prev) => prev - 1);
-    setFocusArea('content');
-    setFocusedInput(0);
-  }, [currentStep, goBack]);
-
-  // ── Cancel the wizard entirely ──────────────────────────────────
-  const cancel = useCallback(() => {
-    goBack();
-  }, [goBack]);
-
-  // ── Public API ──────────────────────────────────────────────────
-  return {
-    // Navigation / meta
-    template,
-    templateIdentifier,
-    actionIdentifier,
-    roleIdentifier,
-    action,
-    actionName,
-
-    // Role selection
-    availableRoles,
-    selectedRoleIndex,
-    setSelectedRoleIndex,
-
-    // Steps
-    steps,
-    currentStep,
-    currentStepData,
-
-    // Variables
-    variables,
-    updateVariable,
-    handleTextInputSubmit,
-
-    // UTXOs
-    availableUtxos,
-    setAvailableUtxos,
-    selectedUtxoIndex,
-    setSelectedUtxoIndex,
-    requiredAmount,
-    fee,
-    selectedAmount,
-    changeAmount,
-    toggleUtxoSelection,
-
-    // Invitation
-    invitation,
-    invitationId,
-
-    // UI focus
-    focusedInput,
-    setFocusedInput,
-    focusedButton,
-    setFocusedButton,
-    focusArea,
-    setFocusArea,
-    isProcessing,
-    textInputHasFocus,
-
-    // Actions
-    nextStep,
-    previousStep,
-    cancel,
-    copyId,
-  } as const;
-}
-
-/** Convenience type so other files can type the return value. */
-export type ActionWizardState = ReturnType<typeof useActionWizard>;

src/tui/screens/index.tsx

@@ -6,5 +6,5 @@ export * from './action-wizard/index.js';
 export { SeedInputScreen } from './SeedInput.js';
 export { WalletStateScreen } from './WalletState.js';
 export { TemplateListScreen } from './TemplateList.js';
-export { InvitationScreen } from './Invitation.js';
+export { InvitationScreen } from './invitations/InvitationScreen.js';
 export { TransactionScreen } from './Transaction.js';

src/tui/screens/invitations/InvitationScreen.tsx

@@ -2,7 +2,7 @@
  * Invitation Screen - Manages invitations (create, import, view, monitor).
  *
  * Provides:
- * - Import invitation by ID with role selection
+ * - Import invitation by ID with multi-step import flow
  * - View active invitations with detailed information
  * - Monitor invitation updates via SSE
  * - Fill missing requirements
@@ -10,18 +10,19 @@
  */
 
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
-import { Box, Text, useInput } from 'ink';
-import { InputDialog } from '../components/Dialog.js';
-import { ScrollableList, type ListItemData, type ListGroup } from '../components/List.js';
-import { useNavigation } from '../hooks/useNavigation.js';
-import { useAppContext, useStatus } from '../hooks/useAppContext.js';
-import { useInvitations } from '../hooks/useInvitations.js';
-import { colors, logoSmall, formatSatoshis } from '../theme.js';
-import { copyToClipboard } from '../utils/clipboard.js';
-import type { Invitation } from '../../services/invitation.js';
+import { Box, Text } from 'ink';
+import { InputDialog } from '../../components/Dialog.js';
+import { ScrollableList, type ListItemData, type ListGroup } from '../../components/List.js';
+import { useNavigation } from '../../hooks/useNavigation.js';
+import { useAppContext, useStatus } from '../../hooks/useAppContext.js';
+import { useBlockableInput, useIsInputCaptured } from '../../hooks/useInputLayer.js';
+import { useInvitations } from '../../hooks/useInvitations.js';
+import { useSatoshisConversion } from '../../hooks/useSatoshisConversion.js';
+import { colors, logoSmall, formatSatoshis } from '../../theme.js';
+import { copyToClipboard } from '../../utils/clipboard.js';
+import type { Invitation } from '../../../services/invitation.js';
 import type { XOTemplate } from '@xo-cash/types';
 
-// Import utility functions
 import {
   getInvitationState,
   getStateColorName,
@@ -31,7 +32,9 @@ import {
   getUserRole,
   formatInvitationListItem,
   formatInvitationId,
-} from '../../utils/invitation-utils.js';
+} from '../../../utils/invitation-utils.js';
+
+import { InvitationImportFlow } from './invitation-import/InvitationImportFlow.js';
 
 /**
  * Map state color name to theme color.
@@ -85,37 +88,32 @@ export function InvitationScreen(): React.ReactElement {
   const { appService, showError, showInfo } = useAppContext();
   const { setStatus } = useStatus();
 
-  // Use hooks for reactive invitation list
   const invitations = useInvitations();
+  const { currencyCode, formattedFiatPerBchRate, formatSatoshisToFiat } =
+    useSatoshisConversion('USD');
 
-  // State
+  // ── UI state ─────────────────────────────────────────────────────────────
   const [selectedIndex, setSelectedIndex] = useState(0);
   const [selectedActionIndex, setSelectedActionIndex] = useState(0);
   const [focusedPanel, setFocusedPanel] = useState<'list' | 'actions'>('list');
   const [isLoading, setIsLoading] = useState(false);
 
-  // Import flow state - two stages: 'id' for entering ID, 'role-select' for choosing role
-  const [importStage, setImportStage] = useState<'id' | 'role-select' | null>(null);
-  const [importingInvitation, setImportingInvitation] = useState<Invitation | null>(null);
-  const [availableRoles, setAvailableRoles] = useState<string[]>([]);
-  const [selectedRoleIndex, setSelectedRoleIndex] = useState(0);
-  const [importTemplate, setImportTemplate] = useState<XOTemplate | null>(null);
+  // ── Import state ─────────────────────────────────────────────────────────
+  // Two phases: first the ID input dialog, then the multi-step import flow.
+  const [showIdDialog, setShowIdDialog] = useState(false);
+  const [importingId, setImportingId] = useState<string | null>(null);
+  const [pendingImportedInvitationId, setPendingImportedInvitationId] = useState<string | null>(null);
 
-  // Template cache for displaying invitation list with template names
+  // ── Template cache ───────────────────────────────────────────────────────
   const [templateCache, setTemplateCache] = useState<Map<string, XOTemplate>>(new Map());
-
-  // Selected invitation template for details view
   const [selectedTemplate, setSelectedTemplate] = useState<XOTemplate | null>(null);
 
   // Check if we should open import dialog on mount
   const initialMode = navData.mode as string | undefined;
 
-  /**
-   * Show import dialog on mount if needed.
-   */
   useEffect(() => {
     if (initialMode === 'import') {
-      setImportStage('id');
+      setShowIdDialog(true);
     }
   }, [initialMode]);
 
@@ -139,10 +137,8 @@ export function InvitationScreen(): React.ReactElement {
 
   /**
    * Build list items for ScrollableList.
-   * Index 0 is "Import Invitation", subsequent indices are actual invitations.
    */
   const listItems = useMemo((): InvitationListItem[] => {
-    // Import action at top
     const importItem: InvitationListItem = {
       key: 'import',
       label: '+ Import Invitation',
@@ -151,11 +147,9 @@ export function InvitationScreen(): React.ReactElement {
       color: 'info',
     };
 
-    // Map invitations to list items
     const invitationItems: InvitationListItem[] = invitations.map(inv => {
       const template = templateCache.get(inv.data.templateIdentifier);
       const formatted = formatInvitationListItem(inv, template);
-      const state = getInvitationState(inv);
 
       return {
         key: inv.data.invitationIdentifier,
@@ -163,14 +157,13 @@ export function InvitationScreen(): React.ReactElement {
         value: inv,
         group: 'invitations',
         color: formatted.statusColor,
-        hidden: !formatted.isValid, // Hide invalid items
+        hidden: !formatted.isValid,
       };
     });
 
     return [importItem, ...invitationItems];
-  }, [invitations, templateCache]);
+  }, [invitations.length, templateCache]);
 
-  // Get selected invitation from list items
   const selectedItem = listItems[selectedIndex];
   const selectedInvitation = selectedItem?.value ?? null;
 
@@ -187,111 +180,49 @@ export function InvitationScreen(): React.ReactElement {
       .then(template => setSelectedTemplate(template ?? null));
   }, [selectedInvitation, appService]);
 
+  // ── Import flow callbacks ──────────────────────────────────────────────
+
   /**
-   * Stage 1: Import invitation by ID (fetches invitation and moves to role selection).
+   * ID dialog submitted — transition to the multi-step import flow.
    */
-  const handleImportIdSubmit = useCallback(async (invitationId: string) => {
-    if (!invitationId.trim() || !appService) {
-      setImportStage(null);
+  const handleImportIdSubmit = useCallback((invitationId: string) => {
+    if (!invitationId.trim()) {
+      setShowIdDialog(false);
       return;
     }
-
-    console.log('Importing invitation:', invitationId);
-
-    try {
-      setIsLoading(true);
-      setStatus('Fetching invitation...');
-
-      // Create invitation instance (will fetch from sync server)
-      const invitation = await appService.createInvitation(invitationId);
-
-      console.log(invitation);
-
-      const missingRequirements = await invitation.getMissingRequirements();
-      console.log(missingRequirements);
-
-      // Get available roles for this invitation
-      const roles = await invitation.getAvailableRoles();
-
-      console.log(roles);
-
-      // Get the template for display
-      const template = await appService.engine.getTemplate(invitation.data.templateIdentifier);
-
-      // Store for next stage
-      setImportingInvitation(invitation);
-      setAvailableRoles(roles);
-      setSelectedRoleIndex(0);
-      setImportTemplate(template ?? null);
-      
-      // Move to role selection stage
-      setImportStage('role-select');
-      setStatus('Ready');
-    } catch (error) {
-      showError(`Failed to import: ${error instanceof Error ? error.message : String(error)}`);
-      setImportStage(null);
-    } finally {
-      setIsLoading(false);
-    }
-  }, [appService, showError, setStatus]);
+    setShowIdDialog(false);
+    setImportingId(invitationId.trim());
+  }, []);
 
   /**
-   * Stage 2: Accept invitation with selected role.
+   * Import flow closed (completed or cancelled).
    */
-  const handleRoleSelect = useCallback(async () => {
-    if (!importingInvitation || !appService) return;
-
-    const selectedRole = availableRoles[selectedRoleIndex];
-    if (!selectedRole) {
-      showError('No role selected');
-      return;
+  const handleImportFlowClose = useCallback((importedInvitationId?: string) => {
+    if (importedInvitationId) {
+      setPendingImportedInvitationId(importedInvitationId);
     }
-
-    try {
-      setIsLoading(true);
-      setStatus(`Accepting as ${selectedRole}...`);
-
-      // TODO: Engine doesnt support "accepting" without supplying some kind of data along with it.
-      // We also dont have a way to say "this action will require inputs, so i will do that."
-      // If it did, we could add an "input" with the role identifier.
-      // For now, we are just going to hard-code the input with the role identifier.
-      await importingInvitation.addInputs([{
-        roleIdentifier: selectedRole,
-      }]);
-
-      showInfo(`Invitation imported and accepted!\n\nRole: ${selectedRole}\nTemplate: ${importTemplate?.name ?? importingInvitation.data.templateIdentifier}\nAction: ${importingInvitation.data.actionIdentifier}`);
-      setStatus('Ready');
-      
-      // Reset import state
-      setImportStage(null);
-      setImportingInvitation(null);
-      setAvailableRoles([]);
-      setImportTemplate(null);
-    } catch (error) {
-      showError(`Failed to accept: ${error instanceof Error ? error.message : String(error)}`);
-    } finally {
-      setIsLoading(false);
-    }
-  }, [importingInvitation, availableRoles, selectedRoleIndex, appService, importTemplate, showInfo, showError, setStatus]);
+    setImportingId(null);
+  }, []);
 
   /**
-   * Cancel import and remove the invitation if it was added.
+   * Once imported invitation is visible in the list, select and focus it.
    */
-  const handleImportCancel = useCallback(async () => {
-    if (importingInvitation && appService) {
-      // Remove the invitation since user declined
-      await appService.removeInvitation(importingInvitation);
+  useEffect(() => {
+    if (!pendingImportedInvitationId) return;
+
+    const importedIndex = listItems.findIndex((item) => {
+      return item.value?.data.invitationIdentifier === pendingImportedInvitationId;
+    });
+
+    if (importedIndex >= 0) {
+      setSelectedIndex(importedIndex);
+      setFocusedPanel('list');
+      setPendingImportedInvitationId(null);
     }
+  }, [pendingImportedInvitationId, listItems]);
 
-    setImportStage(null);
-    setImportingInvitation(null);
-    setAvailableRoles([]);
-    setImportTemplate(null);
-  }, [importingInvitation, appService]);
+  // ── Action handlers ────────────────────────────────────────────────────
 
-  /**
-   * Accept selected invitation (from actions menu).
-   */
   const acceptInvitation = useCallback(async () => {
     if (!selectedInvitation) {
       showError('No invitation selected');
@@ -307,7 +238,6 @@ export function InvitationScreen(): React.ReactElement {
       setStatus('Ready');
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
-      // Check if already accepted
       if (errorMsg.toLowerCase().includes('already') || errorMsg.toLowerCase().includes('participant')) {
         showInfo('You have already accepted this invitation.\n\nNext step: Use "Fill Requirements" to add your UTXOs.');
       } else {
@@ -318,9 +248,6 @@ export function InvitationScreen(): React.ReactElement {
     }
   }, [selectedInvitation, showInfo, showError, setStatus]);
 
-  /**
-   * Sign selected invitation.
-   */
   const signInvitation = useCallback(async () => {
     if (!selectedInvitation) {
       showError('No invitation selected');
@@ -341,9 +268,6 @@ export function InvitationScreen(): React.ReactElement {
     }
   }, [selectedInvitation, showInfo, showError, setStatus]);
 
-  /**
-   * Copy invitation ID.
-   */
   const copyId = useCallback(async () => {
     if (!selectedInvitation) {
       showError('No invitation selected');
@@ -358,9 +282,6 @@ export function InvitationScreen(): React.ReactElement {
     }
   }, [selectedInvitation, showInfo, showError]);
 
-  /**
-   * Fill requirements for selected invitation.
-   */
   const fillRequirements = useCallback(async () => {
     if (!selectedInvitation) {
       showError('No invitation selected');
@@ -370,15 +291,12 @@ export function InvitationScreen(): React.ReactElement {
     try {
       setIsLoading(true);
 
-      // Step 1: Check available roles
       setStatus('Checking available roles...');
       const roles = await selectedInvitation.getAvailableRoles();
 
       if (roles.length === 0) {
-        // Already participating, check if we can add inputs
         showInfo('You are already participating in this invitation. Checking if inputs are needed...');
       } else {
-        // Need to accept a role first
         const roleToTake = roles[0];
         showInfo(`Accepting invitation as role: ${roleToTake}`);
         setStatus(`Accepting as ${roleToTake}...`);
@@ -392,10 +310,8 @@ export function InvitationScreen(): React.ReactElement {
         }
       }
 
-      // Step 2: Check if invitation already has inputs or needs funding
       setStatus('Analyzing invitation...');
 
-      // Calculate how much we need
       let requiredAmount = 0n;
       const commits = selectedInvitation.data.commits || [];
       for (const commit of commits) {
@@ -413,7 +329,6 @@ export function InvitationScreen(): React.ReactElement {
       const dust = 546n;
       const totalNeeded = requiredAmount + fee + dust;
 
-      // Find resources
       const utxos = await selectedInvitation.findSuitableResources({
         templateIdentifier: selectedInvitation.data.templateIdentifier,
         outputIdentifier: 'receiveOutput',
@@ -425,7 +340,6 @@ export function InvitationScreen(): React.ReactElement {
         return;
       }
 
-      // Select UTXOs
       setStatus('Selecting UTXOs...');
 
       const selectedUtxos: Array<{
@@ -437,18 +351,14 @@ export function InvitationScreen(): React.ReactElement {
       const seenLockingBytecodes = new Set<string>();
 
       for (const utxo of utxos) {
-        const lockingBytecodeHex = utxo.lockingBytecode
-          ? typeof utxo.lockingBytecode === 'string'
-            ? utxo.lockingBytecode
-            : Buffer.from(utxo.lockingBytecode).toString('hex')
+        const lockingBytecodeHex = utxo.scriptHash
+          ? typeof utxo.scriptHash === 'string'
+            ? utxo.scriptHash
+            : Buffer.from(utxo.scriptHash).toString('hex')
           : undefined;
 
-        if (lockingBytecodeHex && seenLockingBytecodes.has(lockingBytecodeHex)) {
-          continue;
-        }
-        if (lockingBytecodeHex) {
-          seenLockingBytecodes.add(lockingBytecodeHex);
-        }
+        if (lockingBytecodeHex && seenLockingBytecodes.has(lockingBytecodeHex)) continue;
+        if (lockingBytecodeHex) seenLockingBytecodes.add(lockingBytecodeHex);
 
         selectedUtxos.push({
           outpointTransactionHash: utxo.outpointTransactionHash,
@@ -457,9 +367,7 @@ export function InvitationScreen(): React.ReactElement {
         });
         accumulated += BigInt(utxo.valueSatoshis);
 
-        if (accumulated >= totalNeeded) {
-          break;
-        }
+        if (accumulated >= totalNeeded) break;
       }
 
       if (accumulated < totalNeeded) {
@@ -470,7 +378,6 @@ export function InvitationScreen(): React.ReactElement {
 
       const changeAmount = accumulated - requiredAmount - fee;
 
-      // Add inputs
       setStatus('Adding inputs...');
       await selectedInvitation.addInputs(
         selectedUtxos.map(u => ({
@@ -479,7 +386,6 @@ export function InvitationScreen(): React.ReactElement {
         }))
       );
 
-      // Add change output
       if (changeAmount >= dust) {
         setStatus('Adding change output...');
         await selectedInvitation.addOutputs([{
@@ -487,7 +393,6 @@ export function InvitationScreen(): React.ReactElement {
         }]);
       }
 
-      // Show success
       showInfo(
         `Requirements filled!\n\n` +
         `• Selected ${selectedUtxos.length} UTXO(s)\n` +
@@ -498,7 +403,6 @@ export function InvitationScreen(): React.ReactElement {
         `Now use "Sign Transaction" to complete.`
       );
       setStatus('Ready');
-
     } catch (error) {
       showError(`Failed to fill requirements: ${error instanceof Error ? error.message : String(error)}`);
       setStatus('Ready');
@@ -507,9 +411,6 @@ export function InvitationScreen(): React.ReactElement {
     }
   }, [selectedInvitation, showInfo, showError, setStatus]);
 
-  /**
-   * Handle action selection.
-   */
   const handleAction = useCallback((action: string) => {
     switch (action) {
       case 'copy':
@@ -532,70 +433,44 @@ export function InvitationScreen(): React.ReactElement {
     }
   }, [selectedInvitation, copyId, acceptInvitation, fillRequirements, signInvitation, navigate]);
 
-  /**
-   * Handle list item activation.
-   */
-  const handleListItemActivate = useCallback((item: InvitationListItem, index: number) => {
+  const handleListItemActivate = useCallback((item: InvitationListItem, _index: number) => {
     if (item.key === 'import') {
-      setImportStage('id');
+      setShowIdDialog(true);
     }
-    // For invitation items, we just select them - actions are in the actions panel
   }, []);
 
-  /**
-   * Handle action item activation.
-   */
-  const handleActionItemActivate = useCallback((item: ListItemData<string>, index: number) => {
+  const handleActionItemActivate = useCallback((item: ListItemData<string>, _index: number) => {
     if (item.value) {
       handleAction(item.value);
     }
   }, [handleAction]);
 
-  // Handle keyboard navigation
-  useInput((input, key) => {
-    // Handle role selection dialog navigation
-    if (importStage === 'role-select') {
-      if (key.upArrow || input === 'k') {
-        setSelectedRoleIndex(prev => Math.max(0, prev - 1));
-      } else if (key.downArrow || input === 'j') {
-        setSelectedRoleIndex(prev => Math.min(availableRoles.length - 1, prev + 1));
-      } else if (key.return) {
-        handleRoleSelect();
-      } else if (key.escape) {
-        handleImportCancel();
-      }
-      return;
-    }
+  // ── Keyboard navigation ──────────────────────────────────────────────────
+  // Automatically blocked when any dialog/overlay is capturing input.
+  const isCaptured = useIsInputCaptured();
 
-    // Don't handle input while ID input dialog is open
-    if (importStage === 'id') return;
-
-    // Tab to switch panels (list -> actions -> list)
+  useBlockableInput((input, key) => {
     if (key.tab) {
       setFocusedPanel(prev => prev === 'list' ? 'actions' : 'list');
       return;
     }
 
-    // 'c' to copy
     if (input === 'c' && selectedInvitation) {
       copyId();
     }
 
-    // 'i' to import
     if (input === 'i') {
-      setImportStage('id');
+      setShowIdDialog(true);
     }
-  }, { isActive: importStage !== 'id' });
+  });
+
+  // ── Render helpers ───────────────────────────────────────────────────────
 
-  /**
-   * Render custom list item for invitation list.
-   */
   const renderInvitationListItem = useCallback((
     item: InvitationListItem,
     isSelected: boolean,
     isFocused: boolean
   ): React.ReactNode => {
-    // Import item
     if (item.key === 'import') {
       return (
         <Text
@@ -608,7 +483,6 @@ export function InvitationScreen(): React.ReactElement {
       );
     }
 
-    // Invitation item
     const inv = item.value;
     if (!inv) return null;
 
@@ -628,9 +502,6 @@ export function InvitationScreen(): React.ReactElement {
     );
   }, [templateCache]);
 
-  /**
-   * Render detailed invitation information.
-   */
   const renderDetails = () => {
     if (!selectedInvitation) {
       return <Text color={colors.textMuted}>Select an invitation to view details</Text>;
@@ -642,15 +513,52 @@ export function InvitationScreen(): React.ReactElement {
     const outputs = getInvitationOutputs(selectedInvitation);
     const variables = getInvitationVariables(selectedInvitation);
 
-    // Try to determine user's entity ID (from first commit they made)
     const userEntityId = selectedInvitation.data.commits?.[0]?.entityIdentifier ?? null;
     const userRole = getUserRole(selectedInvitation, userEntityId);
     const roleInfoRaw = userRole && selectedTemplate?.roles?.[userRole];
     const roleInfo = roleInfoRaw && typeof roleInfoRaw === 'object' ? roleInfoRaw : null;
 
+    const getFiatSuffix = (satoshis: bigint): string => {
+      const fiatValue = formatSatoshisToFiat(satoshis);
+      return fiatValue ? ` (~${fiatValue})` : '';
+    };
+
+    const parseNumberishToBigInt = (value: unknown): bigint | null => {
+      if (typeof value === 'bigint') {
+        return value;
+      }
+
+      const asString = String(value).trim();
+      if (!/^[-]?\d+$/.test(asString)) {
+        return null;
+      }
+
+      try {
+        return BigInt(asString);
+      } catch {
+        return null;
+      }
+    };
+
+    const isSatoshisVariable = (variableIdentifier: string): boolean => {
+      const templateVariable = selectedTemplate?.variables?.[variableIdentifier];
+      const templateType = templateVariable?.type?.toLowerCase();
+      const templateHint = templateVariable?.hint?.toLowerCase();
+      const identifier = variableIdentifier.toLowerCase();
+
+      if (templateHint?.includes('satoshi')) {
+        return true;
+      }
+
+      return (
+        templateType === 'integer' &&
+        (identifier.includes('satoshi') || identifier.includes('amount'))
+      );
+    };
+
     return (
       <Box flexDirection="column">
-        {/* Row 1: Type, Description, Status */}
+        {/* Type & Status */}
         <Box flexDirection="row" marginBottom={1}>
           <Box width="50%">
             <Box flexDirection="column">
@@ -668,6 +576,11 @@ export function InvitationScreen(): React.ReactElement {
               <Text color={colors.textMuted}>
                 Action: {action?.name ?? selectedInvitation.data.actionIdentifier}
               </Text>
+              {formattedFiatPerBchRate && (
+                <Text color={colors.textMuted}>
+                  1 BCH = {formattedFiatPerBchRate}
+                </Text>
+              )}
               {action?.description && (
                 <Text color={colors.textMuted} dimColor>{action.description}</Text>
               )}
@@ -675,7 +588,7 @@ export function InvitationScreen(): React.ReactElement {
           </Box>
         </Box>
 
-        {/* Row 2: Your Role */}
+        {/* Your Role */}
         {userRole && (
           <Box marginBottom={1} flexDirection="column">
             <Text color={colors.primary} bold>Your Role: </Text>
@@ -686,9 +599,8 @@ export function InvitationScreen(): React.ReactElement {
           </Box>
         )}
 
-        {/* Row 3: Inputs & Outputs side by side */}
+        {/* Inputs & Outputs */}
         <Box flexDirection="row" marginBottom={1}>
-          {/* Inputs */}
           <Box width="50%" flexDirection="column">
             <Text color={colors.primary} bold>Inputs ({inputs.length}):</Text>
             {inputs.length === 0 ? (
@@ -697,6 +609,11 @@ export function InvitationScreen(): React.ReactElement {
               inputs.map((input, idx) => {
                 const isUserInput = input.entityIdentifier === userEntityId;
                 const inputTemplate = selectedTemplate?.inputs?.[input.inputIdentifier ?? ''];
+                const inputSatoshis = (
+                  'valueSatoshis' in input && input.valueSatoshis !== undefined
+                )
+                  ? parseNumberishToBigInt(input.valueSatoshis)
+                  : null;
                 return (
                   <Text
                     key={`input-${idx}`}
@@ -705,13 +622,13 @@ export function InvitationScreen(): React.ReactElement {
                     {'  '}{isUserInput ? '• ' : '○ '}
                     {inputTemplate?.name ?? input.inputIdentifier ?? `Input ${idx}`}
                     {input.roleIdentifier && ` (${input.roleIdentifier})`}
+                    {inputSatoshis !== null && ` ${formatSatoshis(inputSatoshis)}${getFiatSuffix(inputSatoshis)}`}
                   </Text>
                 );
               })
             )}
           </Box>
 
-          {/* Outputs */}
           <Box width="50%" flexDirection="column">
             <Text color={colors.primary} bold>Outputs ({outputs.length}):</Text>
             {outputs.length === 0 ? (
@@ -720,6 +637,9 @@ export function InvitationScreen(): React.ReactElement {
               outputs.map((output, idx) => {
                 const isUserOutput = output.entityIdentifier === userEntityId;
                 const outputTemplate = selectedTemplate?.outputs?.[output.outputIdentifier ?? ''];
+                const outputSatoshis = output.valueSatoshis !== undefined
+                  ? parseNumberishToBigInt(output.valueSatoshis)
+                  : null;
                 return (
                   <Text
                     key={`output-${idx}`}
@@ -727,7 +647,7 @@ export function InvitationScreen(): React.ReactElement {
                   >
                     {'  '}{isUserOutput ? '• ' : '○ '}
                     {outputTemplate?.name ?? output.outputIdentifier ?? `Output ${idx}`}
-                    {output.valueSatoshis !== undefined && ` (${formatSatoshis(output.valueSatoshis)})`}
+                    {outputSatoshis !== null && ` (${formatSatoshis(outputSatoshis)}${getFiatSuffix(outputSatoshis)})`}
                   </Text>
                 );
               })
@@ -735,7 +655,7 @@ export function InvitationScreen(): React.ReactElement {
           </Box>
         </Box>
 
-        {/* Row 4: Variables */}
+        {/* Variables */}
         <Box flexDirection="column">
           <Text color={colors.primary} bold>Variables ({variables.length}):</Text>
           {variables.length === 0 ? (
@@ -747,6 +667,9 @@ export function InvitationScreen(): React.ReactElement {
               const displayValue = typeof variable.value === 'bigint'
                 ? variable.value.toString()
                 : String(variable.value);
+              const parsedVariableSatoshis = isSatoshisVariable(variable.variableIdentifier)
+                ? parseNumberishToBigInt(variable.value)
+                : null;
               return (
                 <Text
                   key={`var-${idx}`}
@@ -754,6 +677,8 @@ export function InvitationScreen(): React.ReactElement {
                 >
                   {'  '}{isUserVariable ? '• ' : '○ '}
                   {varTemplate?.name ?? variable.variableIdentifier}: {displayValue}
+                  {parsedVariableSatoshis !== null &&
+                    ` (${formatSatoshis(parsedVariableSatoshis)}${getFiatSuffix(parsedVariableSatoshis)})`}
                   {varTemplate?.description && (
                     <Text color={colors.textMuted} dimColor> - {varTemplate.description}</Text>
                   )}
@@ -763,7 +688,6 @@ export function InvitationScreen(): React.ReactElement {
           )}
         </Box>
 
-        {/* Shortcuts */}
         <Box marginTop={1}>
           <Text color={colors.textMuted} dimColor>c: Copy ID</Text>
         </Box>
@@ -771,84 +695,7 @@ export function InvitationScreen(): React.ReactElement {
     );
   };
 
-  /**
-   * Render role selection dialog for import flow.
-   */
-  const renderRoleSelectionDialog = () => {
-    if (!importingInvitation) return null;
-
-    const action = importTemplate?.actions?.[importingInvitation.data.actionIdentifier];
-
-    return (
-      <Box
-        position="absolute"
-        flexDirection="column"
-        alignItems="center"
-        justifyContent="center"
-        width="100%"
-        height="100%"
-      >
-        <Box
-          flexDirection="column"
-          borderStyle="double"
-          borderColor={colors.primary}
-          backgroundColor="black"
-          paddingX={2}
-          paddingY={1}
-          width={70}
-        >
-          <Text color={colors.primary} bold>Import Invitation - Select Role</Text>
-          
-          {/* Invitation Details */}
-          <Box marginY={1} flexDirection="column">
-            <Text color={colors.text}>Template: {importTemplate?.name ?? 'Unknown'}</Text>
-            {importTemplate?.description && (
-              <Text color={colors.textMuted} dimColor>{importTemplate.description}</Text>
-            )}
-            <Text color={colors.text}>Action: {action?.name ?? importingInvitation.data.actionIdentifier}</Text>
-            {action?.description && (
-              <Text color={colors.textMuted} dimColor>{action.description}</Text>
-            )}
-          </Box>
-
-          {/* Role Selection */}
-          <Box marginY={1} flexDirection="column">
-            <Text color={colors.primary} bold>Available Roles:</Text>
-            {availableRoles.length === 0 ? (
-              <Text color={colors.warning}>No roles available (you may have already joined)</Text>
-            ) : (
-              availableRoles.map((role, index) => {
-                const roleInfoRaw = importTemplate?.roles?.[role];
-                const roleInfo = roleInfoRaw && typeof roleInfoRaw === 'object' ? roleInfoRaw : null;
-                const actionRoleRaw = action?.roles?.[role];
-                const actionRole = actionRoleRaw && typeof actionRoleRaw === 'object' ? actionRoleRaw : null;
-                return (
-                  <Box key={role} flexDirection="column">
-                    <Text
-                      color={index === selectedRoleIndex ? colors.focus : colors.text}
-                      bold={index === selectedRoleIndex}
-                    >
-                      {index === selectedRoleIndex ? '▸ ' : '  '}
-                      {roleInfo?.name ?? role}
-                    </Text>
-                    {(roleInfo?.description || actionRole?.description) && (
-                      <Text color={colors.textMuted} dimColor>
-                        {'    '}{actionRole?.description ?? roleInfo?.description}
-                      </Text>
-                    )}
-                  </Box>
-                );
-              })
-            )}
-          </Box>
-
-          <Box marginTop={1}>
-            <Text color={colors.textMuted}>↑↓: Select role • Enter: Accept • Esc: Decline</Text>
-          </Box>
-        </Box>
-      </Box>
-    );
-  };
+  // ── Main render ──────────────────────────────────────────────────────────
 
   return (
     <Box flexDirection="column" flexGrow={1}>
@@ -857,7 +704,7 @@ export function InvitationScreen(): React.ReactElement {
         <Text color={colors.primary} bold>{logoSmall} - Invitations</Text>
       </Box>
 
-      {/* Main content - Top row: List + Actions */}
+      {/* Top row: List + Actions */}
       <Box flexDirection="row" marginTop={1} height={12}>
         {/* Left column: Invitation list */}
         <Box flexDirection="column" width="70%" paddingRight={1}>
@@ -874,7 +721,7 @@ export function InvitationScreen(): React.ReactElement {
               selectedIndex={selectedIndex}
               onSelect={setSelectedIndex}
               onActivate={handleListItemActivate}
-              focus={focusedPanel === 'list'}
+              focus={focusedPanel === 'list' && !isCaptured}
               maxVisible={6}
               groups={invitationListGroups}
               emptyMessage="No invitations yet"
@@ -898,14 +745,14 @@ export function InvitationScreen(): React.ReactElement {
               selectedIndex={selectedActionIndex}
               onSelect={setSelectedActionIndex}
               onActivate={handleActionItemActivate}
-              focus={focusedPanel === 'actions'}
+              focus={focusedPanel === 'actions' && !isCaptured}
               emptyMessage="No actions"
             />
           </Box>
         </Box>
       </Box>
 
-      {/* Bottom row: Details (full width) */}
+      {/* Bottom row: Details */}
       <Box flexDirection="column" marginTop={1} flexGrow={1}>
         <Box
           borderStyle="single"
@@ -928,8 +775,8 @@ export function InvitationScreen(): React.ReactElement {
         </Text>
       </Box>
 
-      {/* Import ID dialog (Stage 1) */}
-      {importStage === 'id' && (
+      {/* Import ID dialog */}
+      {showIdDialog && (
         <Box
           position="absolute"
           flexDirection="column"
@@ -943,14 +790,24 @@ export function InvitationScreen(): React.ReactElement {
             prompt="Enter Invitation ID:"
             placeholder="Paste invitation ID..."
             onSubmit={handleImportIdSubmit}
-            onCancel={() => setImportStage(null)}
+            onCancel={() => setShowIdDialog(false)}
             isActive={true}
           />
         </Box>
       )}
 
-      {/* Role Selection dialog (Stage 2) */}
-      {importStage === 'role-select' && renderRoleSelectionDialog()}
+      {/* Multi-step import flow */}
+      {importingId && appService && (
+        <InvitationImportFlow
+          invitationId={importingId}
+          mode="screen"
+          appService={appService}
+          onClose={handleImportFlowClose}
+          showError={showError}
+          showInfo={showInfo}
+          setStatus={setStatus}
+        />
+      )}
     </Box>
   );
 }

src/tui/screens/invitations/invitation-import/InvitationImportFlow.tsx

@@ -0,0 +1,317 @@
+/**
+ * InvitationImportFlow — orchestrates the multi-step invitation import.
+ *
+ * Manages the step state machine, accumulates data from each step, and
+ * injects it into the next step via props (dependency injection).
+ *
+ * Supports two display modes:
+ * - `'dialog'`: renders as an absolute-positioned overlay (used when called from InvitationScreen)
+ * - `'screen'`: renders as a full-screen component with header, step indicator, and button bar
+ */
+
+import React, { useState, useCallback } from 'react';
+import { Box, Text } from 'ink';
+import { colors, logoSmall } from '../../../theme.js';
+import { StepIndicator, type Step } from '../../../components/ProgressBar.js';
+
+import { FetchInvitationStep } from './steps/FetchInvitationStep.js';
+import { PreviewInvitationStep } from './steps/PreviewInvitationStep.js';
+import { RoleSelectStep } from './steps/RoleSelectStep.js';
+import { InputsSelectStep } from './steps/InputsSelectStep.js';
+import { ReviewStep } from './steps/ReviewStep.js';
+
+import { IMPORT_STEPS, type ImportFlowProps, type SelectableUTXO } from './types.js';
+import type { Invitation } from '../../../../services/invitation.js';
+import type { XOTemplate } from '@xo-cash/types';
+import { DialogWrapper } from '../../../components/Dialog.js';
+import { useInputLayer, useLayeredInput } from '../../../hooks/useInputLayer.js';
+import { InvitationBuilder } from '@xo-cash/engine';
+import { hexToBin } from '@bitauth/libauth';
+
+/** Default fee estimate in satoshis. */
+const DEFAULT_FEE = 500n;
+
+/** Dust threshold — outputs below this are unspendable. */
+const DUST_THRESHOLD = 546n;
+
+export function InvitationImportFlow({
+  invitationId,
+  mode,
+  appService,
+  onClose,
+  showError,
+  showInfo,
+  setStatus,
+}: ImportFlowProps): React.ReactElement {
+  // ── Accumulated state ────────────────────────────────────────────────────
+  const [currentStep, setCurrentStep] = useState(0);
+  const [invitation, setInvitation] = useState<Invitation | null>(null);
+  const [buildableInvitation, setBuildableInvitation] = useState<InvitationBuilder | null>(null);
+  const [template, setTemplate] = useState<XOTemplate | null>(null);
+  const [availableRoles, setAvailableRoles] = useState<string[]>([]);
+  const [selectedRole, setSelectedRole] = useState<string | null>(null);
+  const [selectedInputs, setSelectedInputs] = useState<SelectableUTXO[]>([]);
+  const [changeAmount, setChangeAmount] = useState(0n);
+  const [requiredAmount, setRequiredAmount] = useState(0n);
+
+  // ── Cancel handler ───────────────────────────────────────────────────────
+  /**
+   * Cleans up (removes the invitation if it was fetched) and signals the parent.
+   */
+  const handleCancel = useCallback(async () => {
+    if (invitation && appService) {
+      try {
+        await appService.removeInvitation(invitation);
+      } catch {
+        // Best-effort removal — don't block close on failure
+      }
+    }
+    onClose();
+  }, [invitation, appService, onClose]);
+
+  // ── Step completion callbacks ────────────────────────────────────────────
+
+  /**
+   * FetchStep completed — invitation and template are now available.
+   * Also pre-fetches available roles for the next steps.
+   */
+  const handleFetchComplete = useCallback(async (inv: Invitation, tmpl: XOTemplate | null) => {
+    setInvitation(inv);
+    setTemplate(tmpl);
+
+    const builder = InvitationBuilder.fromInvitation(inv.data);
+    setBuildableInvitation(builder);
+
+    try {
+      const roles = await inv.getAvailableRoles();
+      setAvailableRoles(roles);
+    } catch (err) {
+      showError(`Failed to get roles: ${err instanceof Error ? err.message : String(err)}`);
+    }
+
+    setCurrentStep(1); // → Preview
+  }, [showError]);
+
+  /** PreviewStep completed — user reviewed the invitation state and wants to proceed. */
+  const handlePreviewComplete = useCallback(() => {
+    setCurrentStep(2); // → Role Select
+  }, []);
+
+  /** RoleSelectStep completed — user picked a role. */
+  const handleRoleComplete = useCallback((role: string) => {
+    setSelectedRole(role);
+    setCurrentStep(3); // → Inputs Select
+  }, []);
+
+  /** InputsSelectStep completed — user selected UTXOs. */
+  const handleInputsComplete = useCallback(async (inputs: SelectableUTXO[]) => {
+    setSelectedInputs(inputs);
+
+    await invitation?.addInputs(inputs.map(input => ({
+      outpointTransactionHash: hexToBin(input.outpointTransactionHash),
+      outpointIndex: input.outpointIndex,
+    })));
+
+    // Compute totals from selected inputs
+    const totalSelected = inputs.reduce((sum, u) => sum + u.valueSatoshis, 0n);
+
+    // Determine required amount from invitation variables
+    const requiredSats = await invitation?.getSatsOut() ?? 0n;
+    setRequiredAmount(requiredSats);
+
+    // Set the change amount for the review step
+    const changeAmountSats = totalSelected - requiredSats - DEFAULT_FEE;
+    setChangeAmount(changeAmountSats);
+
+    // Add the change output if it exceeds the dust threshold
+    if (changeAmountSats >= DUST_THRESHOLD) {
+      await invitation?.addOutputs([{
+        valueSatoshis: changeAmountSats,
+      }]);
+    }
+
+    setCurrentStep(4); // → Review
+  }, [invitation, buildableInvitation, selectedInputs]);
+
+  /** ReviewStep completed — invitation import is done. */
+  const handleReviewComplete = useCallback(() => {
+    const roleName = (() => {
+      if (!selectedRole || !template) return selectedRole ?? '';
+      const raw = template.roles?.[selectedRole];
+      return (raw && typeof raw === 'object' && 'name' in raw) ? String(raw.name) : selectedRole;
+    })();
+
+    showInfo(
+      `Invitation imported and accepted!\n\n` +
+      `Role: ${roleName}\n` +
+      `Template: ${template?.name ?? invitation?.data.templateIdentifier ?? 'Unknown'}\n` +
+      `Action: ${invitation?.data.actionIdentifier ?? 'Unknown'}`
+    );
+    setStatus('Ready');
+    onClose(invitation?.data.invitationIdentifier);
+  }, [selectedRole, template, invitation, showInfo, setStatus, onClose]);
+
+  // ── Keyboard handling ────────────────────────────────────────────────────
+  // The import flow registers its own layer so it captures input above the
+  // parent screen.  Individual steps also register sub-layers when needed.
+  useInputLayer('import-flow');
+
+  useLayeredInput('import-flow', (_input, key) => {
+    if (currentStep !== 0) return;
+    // Enter retries, Esc cancels — handled within FetchStep rendering,
+    // but we also catch Esc here for safety.
+    if (key.escape) handleCancel();
+  });
+
+  // ── Step router ──────────────────────────────────────────────────────────
+  const renderStep = (): React.ReactNode => {
+    const stepDef = IMPORT_STEPS[currentStep];
+    if (!stepDef) return null;
+
+    switch (stepDef.type) {
+      case 'fetch':
+        return (
+          <FetchInvitationStep
+            invitationId={invitationId}
+            appService={appService}
+            onComplete={handleFetchComplete}
+            onCancel={handleCancel}
+            isActive={true}
+          />
+        );
+
+      case 'preview':
+        if (!invitation) return null;
+        return (
+          <PreviewInvitationStep
+            invitation={invitation}
+            template={template}
+            onComplete={handlePreviewComplete}
+            onCancel={handleCancel}
+            isActive={true}
+          />
+        );
+
+      case 'role-select':
+        if (!invitation) return null;
+        return (
+          <RoleSelectStep
+            invitation={invitation}
+            template={template}
+            availableRoles={availableRoles}
+            onComplete={handleRoleComplete}
+            onCancel={handleCancel}
+            isActive={true}
+          />
+        );
+
+      case 'inputs-select':
+        if (!invitation || !selectedRole) return null;
+        return (
+          <InputsSelectStep
+            invitation={invitation}
+            template={template}
+            selectedRole={selectedRole}
+            appService={appService}
+            onComplete={handleInputsComplete}
+            onCancel={handleCancel}
+            isActive={true}
+          />
+        );
+
+      case 'review':
+        if (!invitation || !selectedRole) return null;
+        return (
+          <ReviewStep
+            invitation={invitation}
+            template={template}
+            selectedRole={selectedRole}
+            selectedInputs={selectedInputs}
+            changeAmount={changeAmount}
+            requiredAmount={requiredAmount}
+            appService={appService}
+            onComplete={handleReviewComplete}
+            onCancel={handleCancel}
+            isActive={true}
+          />
+        );
+
+      default:
+        return null;
+    }
+  };
+
+  // ── Step indicator data ──────────────────────────────────────────────────
+  const indicatorSteps: Step[] = IMPORT_STEPS.map(s => ({ label: s.name }));
+
+  // ── Layout: dialog mode ──────────────────────────────────────────────────
+  if (mode === 'dialog') {
+    return (
+      <Box
+          position="absolute"
+          flexDirection="column"
+          alignItems="center"
+          justifyContent="center"
+          width="100%"
+          height="100%"
+        >
+        <DialogWrapper title="Import Invitation" borderColor={colors.primary}>
+          {/* Step indicator (compact) */}
+          <Box marginTop={1}>
+            <StepIndicator steps={indicatorSteps} currentStep={currentStep} />
+          </Box>
+
+          {/* Step content */}
+          <Box marginTop={1} flexDirection="column">
+            {renderStep()}
+          </Box>
+        </DialogWrapper>
+      </Box>
+    );
+  }
+
+  // ── Layout: screen mode ──────────────────────────────────────────────────
+  return (
+    <Box flexDirection="column" flexGrow={1}>
+      {/* Header */}
+      <Box borderStyle="single" borderColor={colors.secondary} paddingX={1} flexDirection="column">
+        <Text color={colors.primary} bold>{logoSmall} - Import Invitation</Text>
+        <Text color={colors.textMuted}>
+          {template?.name ?? 'Loading...'}
+          {selectedRole ? ` (as ${selectedRole})` : ''}
+        </Text>
+      </Box>
+
+      {/* Step indicator */}
+      <Box marginTop={1} paddingX={1}>
+        <StepIndicator steps={indicatorSteps} currentStep={currentStep} />
+      </Box>
+
+      {/* Step content */}
+      <Box
+        borderStyle="single"
+        borderColor={colors.primary}
+        flexDirection="column"
+        paddingX={1}
+        paddingY={1}
+        marginTop={1}
+        marginX={1}
+        flexGrow={1}
+      >
+        <Text color={colors.primary} bold>
+          {IMPORT_STEPS[currentStep]?.name ?? 'Unknown'} ({currentStep + 1}/{IMPORT_STEPS.length})
+        </Text>
+        <Box marginTop={1} flexDirection="column">
+          {renderStep()}
+        </Box>
+      </Box>
+
+      {/* Help text */}
+      <Box marginTop={1} marginX={1}>
+        <Text color={colors.textMuted} dimColor>
+          Esc: Cancel import
+        </Text>
+      </Box>
+    </Box>
+  );
+}

src/tui/screens/invitations/invitation-import/steps/FetchInvitationStep.tsx

@@ -0,0 +1,73 @@
+/**
+ * FetchInvitationStep — first step in the import flow.
+ *
+ * Receives an invitation ID, fetches the invitation from the sync server,
+ * resolves its template, and auto-advances once loaded.
+ * Shows a loading spinner while fetching and an error state with retry/cancel.
+ */
+
+import React, { useState, useEffect, useCallback } from 'react';
+import { Box, Text } from 'ink';
+import { colors } from '../../../../theme.js';
+import type { FetchStepProps } from '../types.js';
+
+export function FetchInvitationStep({
+  invitationId,
+  appService,
+  onComplete,
+  isActive,
+}: FetchStepProps): React.ReactElement {
+  const [status, setStatus] = useState<'loading' | 'error'>('loading');
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+
+  /**
+   * Fetch the invitation and its template, then auto-advance.
+   */
+  const fetchInvitation = useCallback(async () => {
+    setStatus('loading');
+    setErrorMessage(null);
+
+    try {
+      // Create/fetch the invitation instance (fetches from sync server if needed)
+      const invitation = await appService.createInvitation(invitationId);
+
+      // Resolve the template for display in later steps
+      const template = await appService.engine.getTemplate(invitation.data.templateIdentifier);
+
+      // Auto-advance — hand the loaded data to the flow controller
+      onComplete(invitation, template ?? null);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      setErrorMessage(message);
+      setStatus('error');
+    }
+  }, [invitationId, appService, onComplete]);
+
+  // Kick off the fetch on mount
+  useEffect(() => {
+    if (isActive) {
+      fetchInvitation();
+    }
+  }, [isActive, fetchInvitation]);
+
+  return (
+    <Box flexDirection="column">
+      {status === 'loading' && (
+        <Box flexDirection="column">
+          <Text color={colors.info}>Fetching invitation...</Text>
+          <Text color={colors.textMuted} dimColor>ID: {invitationId}</Text>
+        </Box>
+      )}
+
+      {status === 'error' && (
+        <Box flexDirection="column">
+          <Text color={colors.error} bold>Failed to fetch invitation</Text>
+          <Text color={colors.textMuted} wrap="wrap">{errorMessage}</Text>
+          <Box marginTop={1}>
+            <Text color={colors.textMuted}>Press Enter to retry or Esc to cancel</Text>
+          </Box>
+        </Box>
+      )}
+    </Box>
+  );
+}

src/tui/screens/invitations/invitation-import/steps/InputsSelectStep.tsx

@@ -0,0 +1,267 @@
+/**
+ * InputsSelectStep — lets the user select UTXOs to fund the invitation.
+ *
+ * On mount, queries for suitable resources via the invitation's `findSuitableResources`.
+ * Auto-selects greedily, then lets the user toggle individual UTXOs.
+ * Shows required, selected, and change amounts.
+ */
+
+import React, { useState, useEffect, useCallback, useRef } from 'react';
+import { Box, Text } from 'ink';
+import { colors, formatSatoshis } from '../../../../theme.js';
+import { useSatoshisConversion } from '../../../../hooks/useSatoshisConversion.js';
+import { useLayeredInput } from '../../../../hooks/useInputLayer.js';
+import type { InputsSelectStepProps, SelectableUTXO } from '../types.js';
+import { autoSelectGreedyUtxos, mapUnspentOutputsToSelectable } from '../../../../../utils/invitation-flow.js';
+import type { UnspentOutputData } from '@xo-cash/state';
+
+/** Default fee estimate in satoshis. */
+const DEFAULT_FEE = 500n;
+
+/** Dust threshold — outputs below this are unspendable. */
+const DUST_THRESHOLD = 546n;
+
+export function InputsSelectStep({
+  invitation,
+  appService,
+  onComplete,
+  onCancel,
+  isActive,
+}: InputsSelectStepProps): React.ReactElement {
+  const [utxos, setUtxos] = useState<SelectableUTXO[]>([]);
+  const [focusedIndex, setFocusedIndex] = useState(0);
+  const [requiredAmount, setRequiredAmount] = useState(0n);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const { formatSatoshisToFiat } = useSatoshisConversion('USD');
+
+  const fee = DEFAULT_FEE;
+
+  // Derived totals
+  const selectedAmount = utxos
+    .filter(u => u.selected)
+    .reduce((sum, u) => sum + u.valueSatoshis, 0n);
+  const changeAmount = selectedAmount - requiredAmount - fee;
+  const hasEnough = selectedAmount >= requiredAmount + fee;
+
+  const getFiatSuffix = (satoshis: bigint): string => {
+    const fiatValue = formatSatoshisToFiat(satoshis);
+    return fiatValue ? ` (~${fiatValue})` : '';
+  };
+
+  /**
+   * Determine the required satoshi amount from the invitation's variables.
+   */
+  const computeRequiredAmount = useCallback(async (): Promise<bigint> => {
+    return await invitation.getSatsOut() ?? 0n;
+  }, [invitation]);
+
+  /**
+   * Fetch suitable UTXOs from the engine and auto-select greedily.
+   */
+  const loadUtxos = useCallback(async () => {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      const required = await computeRequiredAmount();
+      setRequiredAmount(required);
+
+      const template = await appService.engine.getTemplate(invitation.data.templateIdentifier);
+      if (!template) {
+        throw new Error('Template not found');
+      }
+
+      // Get the action that we are calling from the template
+      const action = template.actions[invitation.data.actionIdentifier];
+      if (!action) {
+        throw new Error('Action not found');
+      }
+
+      if (!action.transaction) {
+        throw new Error('Action does not have a transaction');
+      }
+
+      // Get the transaction that the action is creating
+      const transaction = template.transactions?.[action.transaction];
+      if (!transaction) {
+        throw new Error(`Transaction not found for action: ${action.transaction}`);
+      }
+
+      if (!transaction.outputs) {
+        throw new Error(`Transaction does not have outputs`);
+      }
+
+      // Create a set to store all the output identifiers
+      const outputIdentifiers = new Set<string>();
+      for (const output of transaction.outputs) {
+        outputIdentifiers.add(output.output);
+      }
+
+      // Create a map of the utxoID to suitable resource
+      const utxoIdToSuitableResource = new Map<string, UnspentOutputData>();
+      for (const outputIdentifier of outputIdentifiers) {
+        const suitableResources = await invitation.findSuitableResources();
+        for (const suitableResource of suitableResources) {
+          utxoIdToSuitableResource.set(suitableResource.outpointTransactionHash + ':' + suitableResource.outpointIndex, suitableResource);
+        }
+      }
+
+      const selectable = mapUnspentOutputsToSelectable(Array.from(utxoIdToSuitableResource.values()));
+      const autoSelected = autoSelectGreedyUtxos(selectable, required + fee);
+      setUtxos(autoSelected as SelectableUTXO[]);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setIsLoading(false);
+    }
+  }, [invitation, computeRequiredAmount, fee]);
+
+  // Load UTXOs once on mount. We use a ref guard to prevent re-firing when
+  // `loadUtxos` identity changes due to parent re-renders — each re-fire
+  // flashes the loading state, causing the visible flicker bug.
+  const hasLoadedRef = useRef(false);
+  useEffect(() => {
+    if (isActive && !hasLoadedRef.current) {
+      hasLoadedRef.current = true;
+      loadUtxos();
+    }
+  }, [isActive, loadUtxos]);
+
+  /**
+   * Toggle the selection of a UTXO at the given index.
+   */
+  const toggleSelection = useCallback((index: number) => {
+    setUtxos(prev => {
+      const updated = [...prev];
+      const utxo = updated[index];
+      if (utxo) updated[index] = { ...utxo, selected: !utxo.selected };
+      return updated;
+    });
+  }, []);
+
+  // Keyboard handling — gated by the import-flow layer so dialogs on top block input.
+  useLayeredInput('import-flow', (input, key) => {
+    if (key.upArrow || input === 'k') {
+      setFocusedIndex(prev => Math.max(0, prev - 1));
+    } else if (key.downArrow || input === 'j') {
+      setFocusedIndex(prev => Math.min(utxos.length - 1, prev + 1));
+    } else if (input === ' ') {
+      if (utxos.length > 0) toggleSelection(focusedIndex);
+    } else if (input === 'a') {
+      setUtxos(prev => prev.map(u => ({ ...u, selected: true })));
+    } else if (input === 'n') {
+      setUtxos(prev => prev.map(u => ({ ...u, selected: false })));
+    } else if (key.return) {
+      if (hasEnough) {
+        onComplete(utxos.filter(u => u.selected));
+      }
+    } else if (key.escape) {
+      onCancel();
+    }
+  }, { isActive });
+
+  // Loading state
+  if (isLoading) {
+    return (
+      <Box flexDirection="column">
+        <Text color={colors.info}>Finding suitable UTXOs...</Text>
+      </Box>
+    );
+  }
+
+  // Error state
+  if (error) {
+    return (
+      <Box flexDirection="column">
+        <Text color={colors.error} bold>Failed to load UTXOs</Text>
+        <Text color={colors.textMuted}>{error}</Text>
+        <Box marginTop={1}>
+          <Text color={colors.textMuted}>Esc: Cancel</Text>
+        </Box>
+      </Box>
+    );
+  }
+
+  // No UTXOs found
+  if (utxos.length === 0) {
+    return (
+      <Box flexDirection="column">
+        <Text color={colors.warning}>No suitable UTXOs found. Make sure your wallet has funds.</Text>
+        <Box marginTop={1}>
+          <Text color={colors.textMuted}>Esc: Cancel</Text>
+        </Box>
+      </Box>
+    );
+  }
+
+  return (
+    <Box flexDirection="column">
+      {/* Summary bar */}
+      <Box flexDirection="row" marginBottom={1}>
+        <Text color={colors.primary} bold>Required: </Text>
+        <Text color={colors.text}>
+          {formatSatoshis(requiredAmount + fee)}
+          {getFiatSuffix(requiredAmount + fee)}
+        </Text>
+        <Text color={colors.textMuted}> (amount {formatSatoshis(requiredAmount)} + fee {formatSatoshis(fee)})</Text>
+      </Box>
+
+      <Box flexDirection="row" marginBottom={1}>
+        <Text color={colors.primary} bold>Selected: </Text>
+        <Text color={hasEnough ? colors.success : colors.error}>
+          {formatSatoshis(selectedAmount)}
+          {getFiatSuffix(selectedAmount)}
+        </Text>
+        {hasEnough && changeAmount >= DUST_THRESHOLD && (
+          <Text color={colors.textMuted}>
+            {' '}
+            (change: {formatSatoshis(changeAmount)}
+            {getFiatSuffix(changeAmount)})
+          </Text>
+        )}
+        {!hasEnough && (
+          <Text color={colors.error}>
+            {' '}
+            — need {formatSatoshis(requiredAmount + fee - selectedAmount)}
+            {getFiatSuffix(requiredAmount + fee - selectedAmount)} more
+          </Text>
+        )}
+      </Box>
+
+      {/* UTXO list */}
+      <Text color={colors.primary} bold>UTXOs ({utxos.length}):</Text>
+      {utxos.map((utxo, index) => {
+        const isFocused = index === focusedIndex;
+        const checkMark = utxo.selected ? '☑' : '☐';
+        const txShort = utxo.outpointTransactionHash.slice(0, 8);
+
+        return (
+          <Box
+            key={`${utxo.outpointTransactionHash}:${utxo.outpointIndex}`}
+            flexDirection="column"
+          >
+            <Text
+              color={isFocused ? colors.focus : utxo.selected ? colors.success : colors.text}
+              bold={isFocused}
+            >
+              {isFocused ? '▸ ' : '  '}{checkMark} {formatSatoshis(utxo.valueSatoshis)} ({txShort}…:{utxo.outpointIndex})
+            </Text>
+            {formatSatoshisToFiat(utxo.valueSatoshis) && (
+              <Text color={colors.textMuted}>
+                {'   '}≈ {formatSatoshisToFiat(utxo.valueSatoshis)}
+              </Text>
+            )}
+          </Box>
+        );
+      })}
+
+      {/* Navigation hint */}
+      <Box marginTop={1}>
+        <Text color={colors.textMuted}>
+          ↑↓: Navigate • Space: Toggle • a: All • n: None • return: Confirm • Esc: Cancel
+        </Text>
+      </Box>
+    </Box>
+  );
+}

src/tui/screens/invitations/invitation-import/steps/PreviewInvitationStep.tsx

@@ -0,0 +1,226 @@
+/**
+ * PreviewInvitationStep — displays the current state of a fetched invitation.
+ *
+ * Shows which roles, inputs, outputs, and variables have already been filled
+ * so the user can understand what they're joining before proceeding.
+ * Press Enter to continue, Esc to cancel.
+ */
+
+import React from 'react';
+import { Box, Text } from 'ink';
+import { colors, formatSatoshis } from '../../../../theme.js';
+import { useSatoshisConversion } from '../../../../hooks/useSatoshisConversion.js';
+import { useLayeredInput } from '../../../../hooks/useInputLayer.js';
+import {
+  getInvitationState,
+  getStateColorName,
+  getInvitationInputs,
+  getInvitationOutputs,
+  getInvitationVariables,
+} from '../../../../../utils/invitation-utils.js';
+import type { PreviewStepProps } from '../types.js';
+
+/**
+ * Map a semantic color name to an actual theme color value.
+ */
+function stateColor(state: string): string {
+  const name = getStateColorName(state);
+  switch (name) {
+    case 'info': return colors.info as string;
+    case 'warning': return colors.warning as string;
+    case 'success': return colors.success as string;
+    case 'error': return colors.error as string;
+    case 'muted':
+    default: return colors.textMuted as string;
+  }
+}
+
+export function PreviewInvitationStep({
+  invitation,
+  template,
+  onComplete,
+  onCancel,
+  isActive,
+}: PreviewStepProps): React.ReactElement {
+  const { formatSatoshisToFiat } = useSatoshisConversion('USD');
+
+  useLayeredInput('import-flow', (_input, key) => {
+    if (key.return) onComplete();
+    if (key.escape) onCancel();
+  }, { isActive });
+
+  const state = getInvitationState(invitation);
+  const action = template?.actions?.[invitation.data.actionIdentifier];
+  const inputs = getInvitationInputs(invitation);
+  const outputs = getInvitationOutputs(invitation);
+  const variables = getInvitationVariables(invitation);
+
+  // Collect role identifiers that appear across all commits
+  const filledRoles = new Set<string>();
+  for (const commit of invitation.data.commits ?? []) {
+    for (const input of commit.data?.inputs ?? []) {
+      if (input.roleIdentifier) filledRoles.add(input.roleIdentifier);
+    }
+  }
+
+  return (
+    <Box flexDirection="column">
+      {/* Template info */}
+      <Box flexDirection="column" marginBottom={1}>
+        <Box>
+          <Text color={colors.primary} bold>Template:</Text>
+        </Box>
+        <Box>
+          <Text color={colors.text}>{template?.name ?? invitation.data.templateIdentifier}</Text>
+        </Box>
+        {template?.description && (
+          <Box>
+            <Text color={colors.textMuted} dimColor>{template.description}</Text>
+          </Box>
+        )}
+      </Box>
+
+      {/* Action info */}
+      <Box flexDirection="column" marginBottom={1}>
+        <Box>
+          <Text color={colors.primary} bold>Action:</Text>
+        </Box>
+        <Box>
+          <Text color={colors.text}>{action?.name ?? invitation.data.actionIdentifier}</Text>
+        </Box>
+        {action?.description && (
+          <Box>
+            <Text color={colors.textMuted} dimColor>{action.description}</Text>
+          </Box>
+        )}
+      </Box>
+
+      {/* Status */}
+      <Box flexDirection="column" marginBottom={1}>
+        <Box>
+          <Text color={colors.primary} bold>Status:</Text>
+        </Box>
+        <Box>
+          <Text color={stateColor(state)}>{state}</Text>
+        </Box>
+      </Box>
+
+      {/* Roles already filled */}
+      <Box flexDirection="column" marginBottom={1}>
+        <Box>
+          <Text color={colors.primary} bold>Roles Filled ({filledRoles.size}):</Text>
+        </Box>
+
+        <Box marginLeft={1}>
+          {filledRoles.size === 0 ? (
+            <Box>
+              <Text color={colors.textMuted}>  None yet</Text>
+            </Box>
+          ) : (
+            Array.from(filledRoles).map(role => {
+              const roleInfoRaw = template?.roles?.[role];
+              const roleInfo = roleInfoRaw && typeof roleInfoRaw === 'object' ? roleInfoRaw : null;
+              return (
+                <Box key={role}>
+                  <Text color={colors.text}>  • {roleInfo?.name ?? role}</Text>
+                </Box>
+              );
+            })
+          )}
+        </Box>
+      </Box>
+
+      {/* Inputs */}
+      <Box flexDirection="column" marginBottom={1}>
+        <Box>
+          <Text color={colors.primary} bold>Inputs ({inputs.length}):</Text>
+        </Box>
+
+        <Box marginLeft={1}>
+          {inputs.length === 0 ? (
+            <Box>
+              <Text color={colors.textMuted}>  None yet</Text>
+            </Box>
+          ) : (
+            inputs.map((input, idx) => {
+              const inputTemplate = template?.inputs?.[input.inputIdentifier ?? ''];
+              return (
+                <Box key={`input-${idx}`}>
+                  <Text color={colors.text}>
+                    {'  '}• {inputTemplate?.name ?? input.inputIdentifier ?? `Input ${idx}`}
+                    {input.roleIdentifier && ` (${input.roleIdentifier})`}
+                  </Text>
+                </Box>
+              );
+            })
+          )}
+        </Box>
+      </Box>
+
+      {/* Outputs */}
+      <Box flexDirection="column" marginBottom={1} marginLeft={1}>
+        <Box>
+          <Text color={colors.primary} bold>Outputs ({outputs.length}):</Text>
+        </Box>
+
+        <Box marginLeft={1}>
+          {outputs.length === 0 ? (
+            <Box>
+              <Text color={colors.textMuted}>None yet</Text>
+            </Box>
+          ) : (
+            outputs.map((output, idx) => {
+              const outputTemplate = template?.outputs?.[output.outputIdentifier ?? ''];
+              const fiatValue = output.valueSatoshis !== undefined
+                ? formatSatoshisToFiat(output.valueSatoshis)
+                : null;
+              return (
+                <Box key={`output-${idx}`}>
+                  <Text color={colors.text}>
+                    {'  '}• {outputTemplate?.name ?? output.outputIdentifier ?? `Output ${idx}`}
+                    {output.valueSatoshis !== undefined && ` (${formatSatoshis(output.valueSatoshis)})`}
+                    {fiatValue && ` (~${fiatValue})`}
+                  </Text>
+                </Box>
+              );
+            })
+          )}
+        </Box>
+      </Box>
+
+      {/* Variables */}
+      <Box flexDirection="column" marginBottom={1}>
+        <Box>
+          <Text color={colors.primary} bold>Variables ({variables.length}):</Text>
+        </Box>
+
+        <Box marginLeft={1}>
+          {variables.length === 0 ? (
+            <Box>
+              <Text color={colors.textMuted}>  None set</Text>
+            </Box>
+          ) : (
+            variables.map((variable, idx) => {
+              const varTemplate = template?.variables?.[variable.variableIdentifier];
+              const displayValue = typeof variable.value === 'bigint'
+                ? variable.value.toString()
+                : String(variable.value);
+              return (
+                <Box key={`var-${idx}`}>
+                  <Text color={colors.text}>
+                    {'  '}• {varTemplate?.name ?? variable.variableIdentifier}: {displayValue}
+                  </Text>
+                </Box>
+              );
+            })
+          )}
+        </Box>
+      </Box>
+
+      {/* Navigation hint */}
+      <Box marginTop={1}>
+        <Text color={colors.textMuted}>Enter: Continue • Esc: Cancel</Text>
+      </Box>
+    </Box>
+  );
+}

src/tui/screens/invitations/invitation-import/steps/ReviewStep.tsx

@@ -0,0 +1,140 @@
+/**
+ * ReviewStep — final step that summarizes the import and executes it.
+ *
+ * Displays the accumulated selections (role, inputs, amounts) and on confirmation:
+ * 1. Adds inputs (with the selected role identifier) to the invitation.
+ * 2. Optionally adds a change output if the change exceeds the dust threshold.
+ * 3. Calls `onComplete()` to signal the flow is finished.
+ */
+
+import React, { useState, useCallback } from 'react';
+import { Box, Text } from 'ink';
+import { colors, formatSatoshis } from '../../../../theme.js';
+import { useSatoshisConversion } from '../../../../hooks/useSatoshisConversion.js';
+import { useLayeredInput } from '../../../../hooks/useInputLayer.js';
+import type { ReviewStepProps, SelectableUTXO } from '../types.js';
+
+/** Default fee estimate in satoshis. */
+const DEFAULT_FEE = 500n;
+
+/** Dust threshold — outputs below this are unspendable. */
+const DUST_THRESHOLD = 546n;
+
+export function ReviewStep({
+  invitation,
+  template,
+  selectedRole,
+  selectedInputs,
+  requiredAmount,
+  changeAmount,
+  onComplete,
+  onCancel,
+  isActive,
+}: ReviewStepProps): React.ReactElement {
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const { formatSatoshisToFiat } = useSatoshisConversion('USD');
+
+  const fee = DEFAULT_FEE;
+  const action = template?.actions?.[invitation.data.actionIdentifier];
+
+  // Compute totals from selected inputs
+  const totalSelected = selectedInputs.reduce((sum, u) => sum + u.valueSatoshis, 0n);
+
+  const getFiatSuffix = (satoshis: bigint): string => {
+    const fiatValue = formatSatoshisToFiat(satoshis);
+    return fiatValue ? ` (~${fiatValue})` : '';
+  };
+
+  /**
+   * Execute the import: add inputs (with role) and optional change output.
+   */
+  const submit = useCallback(async () => {
+    setIsSubmitting(true);
+    setError(null);
+
+    try {
+      onComplete();
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, [invitation, selectedRole, selectedInputs, onComplete]);
+
+  // Keyboard handling — gated by the import-flow layer.
+  useLayeredInput('import-flow', (_input, key) => {
+    if (isSubmitting) return;
+
+    if (key.return) {
+      submit();
+    } else if (key.escape) {
+      onCancel();
+    }
+  }, { isActive });
+
+  // Resolve role display name
+  const roleInfoRaw = template?.roles?.[selectedRole];
+  const roleInfo = roleInfoRaw && typeof roleInfoRaw === 'object' ? roleInfoRaw : null;
+
+  return (
+    <Box flexDirection="column">
+      <Text color={colors.primary} bold>Review Import</Text>
+
+      {/* Template & action */}
+      <Box marginTop={1} flexDirection="column">
+        <Text color={colors.text}>Template: {template?.name ?? invitation.data.templateIdentifier}</Text>
+        <Text color={colors.text}>Action: {action?.name ?? invitation.data.actionIdentifier}</Text>
+        <Text color={colors.text}>Role: {roleInfo?.name ?? selectedRole}</Text>
+      </Box>
+
+      {/* Funding summary */}
+      <Box marginTop={1} flexDirection="column">
+        <Text color={colors.primary} bold>Funding:</Text>
+        <Text color={colors.text}>  • UTXOs: {selectedInputs.length}</Text>
+        <Text color={colors.text}>  • Total: {formatSatoshis(totalSelected)}{getFiatSuffix(totalSelected)}</Text>
+        <Text color={colors.text}>  • Required: {formatSatoshis(requiredAmount)}{getFiatSuffix(requiredAmount)}</Text>
+        <Text color={colors.text}>  • Fee: {formatSatoshis(fee)}{getFiatSuffix(fee)}</Text>
+        {changeAmount >= DUST_THRESHOLD && (
+          <Text color={colors.text}>  • Change: {formatSatoshis(changeAmount)}{getFiatSuffix(changeAmount)}</Text>
+        )}
+      </Box>
+
+      {selectedInputs.length > 0 && (
+        <Box marginTop={1} flexDirection="column">
+          <Text color={colors.primary} bold>Selected UTXOs:</Text>
+          {selectedInputs.slice(0, 3).map((utxo) => (
+            <Text
+              key={`${utxo.outpointTransactionHash}:${utxo.outpointIndex}`}
+              color={colors.textMuted}
+            >
+              {'  '}• {formatSatoshis(utxo.valueSatoshis)}
+              {getFiatSuffix(utxo.valueSatoshis)}
+            </Text>
+          ))}
+          {selectedInputs.length > 3 && (
+            <Text color={colors.textMuted}>
+              {'  '}...and {selectedInputs.length - 3} more
+            </Text>
+          )}
+        </Box>
+      )}
+
+      {/* Error display */}
+      {error && (
+        <Box marginTop={1}>
+          <Text color={colors.error} bold>Error: {error}</Text>
+        </Box>
+      )}
+
+      {/* Status / hint */}
+      <Box marginTop={1}>
+        {isSubmitting ? (
+          <Text color={colors.info}>Submitting...</Text>
+        ) : (
+          <Text color={colors.textMuted}>Enter: Confirm & Import • Esc: Cancel</Text>
+        )}
+      </Box>
+    </Box>
+  );
+}

src/tui/screens/invitations/invitation-import/steps/RoleSelectStep.tsx

@@ -0,0 +1,87 @@
+/**
+ * RoleSelectStep — lets the user choose which role to take in the invitation.
+ *
+ * Displays available roles with their template-level and action-level descriptions.
+ * Arrow keys to navigate, Enter to select, Esc to cancel.
+ */
+
+import React, { useState } from 'react';
+import { Box, Text } from 'ink';
+import { colors } from '../../../../theme.js';
+import { useLayeredInput } from '../../../../hooks/useInputLayer.js';
+import type { RoleSelectStepProps } from '../types.js';
+
+export function RoleSelectStep({
+  invitation,
+  template,
+  availableRoles,
+  onComplete,
+  onCancel,
+  isActive,
+}: RoleSelectStepProps): React.ReactElement {
+  const [selectedIndex, setSelectedIndex] = useState(0);
+
+  useLayeredInput('import-flow', (input, key) => {
+    if (key.upArrow || input === 'k') {
+      setSelectedIndex(prev => Math.max(0, prev - 1));
+    } else if (key.downArrow || input === 'j') {
+      setSelectedIndex(prev => Math.min(availableRoles.length - 1, prev + 1));
+    } else if (key.return) {
+      const role = availableRoles[selectedIndex];
+      if (role) onComplete(role);
+    } else if (key.escape) {
+      onCancel();
+    }
+  }, { isActive });
+
+  const action = template?.actions?.[invitation.data.actionIdentifier];
+
+  return (
+    <Box flexDirection="column">
+      {/* Context header */}
+      <Box marginBottom={1} flexDirection="column">
+        <Text color={colors.text}>Template: {template?.name ?? 'Unknown'}</Text>
+        <Text color={colors.text}>Action: {action?.name ?? invitation.data.actionIdentifier}</Text>
+      </Box>
+
+      {/* Role list */}
+      <Box flexDirection="column">
+        <Text color={colors.primary} bold>Available Roles:</Text>
+
+        {availableRoles.length === 0 ? (
+          <Text color={colors.warning}>No roles available (you may have already joined)</Text>
+        ) : (
+          availableRoles.map((role, index) => {
+            const roleInfoRaw = template?.roles?.[role];
+            const roleInfo = roleInfoRaw && typeof roleInfoRaw === 'object' ? roleInfoRaw : null;
+            const actionRoleRaw = action?.roles?.[role];
+            const actionRole = actionRoleRaw && typeof actionRoleRaw === 'object' ? actionRoleRaw : null;
+            const isFocused = index === selectedIndex;
+
+            return (
+              <Box key={role} flexDirection="column">
+                <Text
+                  color={isFocused ? colors.focus : colors.text}
+                  bold={isFocused}
+                >
+                  {isFocused ? '▸ ' : '  '}
+                  {roleInfo?.name ?? role}
+                </Text>
+                {(roleInfo?.description || actionRole?.description) && (
+                  <Text color={colors.textMuted} dimColor>
+                    {'    '}{actionRole?.description ?? roleInfo?.description}
+                  </Text>
+                )}
+              </Box>
+            );
+          })
+        )}
+      </Box>
+
+      {/* Navigation hint */}
+      <Box marginTop={1}>
+        <Text color={colors.textMuted}>↑↓: Select role • Enter: Accept • Esc: Cancel</Text>
+      </Box>
+    </Box>
+  );
+}

src/tui/screens/invitations/invitation-import/types.ts

@@ -0,0 +1,131 @@
+/**
+ * Shared types for the invitation import flow.
+ *
+ * Each step in the flow receives only what it needs via props (dependency injection).
+ * The flow controller (`InvitationImportFlow`) accumulates data and passes it forward.
+ */
+
+import type { Invitation } from "../../../../services/invitation.js";
+import type { AppService } from "../../../../services/app.js";
+import type { XOTemplate } from "@xo-cash/types";
+
+// ── Step definitions ─────────────────────────────────────────────────────────
+
+/** Identifies each step in the import flow. */
+export type ImportStepType =
+  | "fetch"
+  | "preview"
+  | "role-select"
+  | "inputs-select"
+  | "review";
+
+/** A single step descriptor used by the flow controller and step indicator. */
+export interface ImportStep {
+  name: string;
+  type: ImportStepType;
+}
+
+/** The ordered list of steps in the import flow. */
+export const IMPORT_STEPS: ImportStep[] = [
+  { name: "Fetch", type: "fetch" },
+  { name: "Preview", type: "preview" },
+  { name: "Select Role", type: "role-select" },
+  { name: "Select Inputs", type: "inputs-select" },
+  { name: "Review", type: "review" },
+];
+
+// ── Display mode ─────────────────────────────────────────────────────────────
+
+/** Controls whether the import flow renders as a dialog overlay or a full screen. */
+export type ImportFlowMode = "dialog" | "screen";
+
+// ── UTXO selection ───────────────────────────────────────────────────────────
+
+/** A UTXO that the user can toggle on/off during the inputs step. */
+export interface SelectableUTXO {
+  outpointTransactionHash: string;
+  outpointIndex: number;
+  valueSatoshis: bigint;
+  lockingBytecode?: string;
+  selected: boolean;
+}
+
+// ── Step props ───────────────────────────────────────────────────────────────
+// Each step receives exactly the data and callbacks it needs.
+
+/** Props for FetchInvitationStep — loads the invitation from an ID. */
+export interface FetchStepProps {
+  invitationId: string;
+  appService: AppService;
+  onComplete: (invitation: Invitation, template: XOTemplate | null) => void;
+  onCancel: () => void;
+  isActive: boolean;
+}
+
+/** Props for PreviewInvitationStep — displays invitation state. */
+export interface PreviewStepProps {
+  invitation: Invitation;
+  template: XOTemplate | null;
+  onComplete: () => void;
+  onCancel: () => void;
+  isActive: boolean;
+}
+
+/** Props for RoleSelectStep — lets user pick a role. */
+export interface RoleSelectStepProps {
+  invitation: Invitation;
+  template: XOTemplate | null;
+  availableRoles: string[];
+  onComplete: (selectedRole: string) => void;
+  onCancel: () => void;
+  isActive: boolean;
+}
+
+/** Props for InputsSelectStep — lets user pick UTXOs to fund the invitation. */
+export interface InputsSelectStepProps {
+  invitation: Invitation;
+  template: XOTemplate | null;
+  selectedRole: string;
+  appService: AppService;
+  onComplete: (inputs: SelectableUTXO[]) => void;
+  onCancel: () => void;
+  isActive: boolean;
+}
+
+/** Props for ReviewStep — summarizes and executes the import. */
+export interface ReviewStepProps {
+  invitation: Invitation;
+  template: XOTemplate | null;
+  selectedRole: string;
+  selectedInputs: SelectableUTXO[];
+  changeAmount: bigint;
+  requiredAmount: bigint;
+  appService: AppService;
+  onComplete: () => void;
+  onCancel: () => void;
+  isActive: boolean;
+}
+
+// ── Flow controller props ────────────────────────────────────────────────────
+
+/** Props for the top-level InvitationImportFlow component. */
+export interface ImportFlowProps {
+  /** The invitation ID to import (already entered by the user in InvitationScreen). */
+  invitationId: string;
+  /** Whether to render as a dialog overlay or a full screen. */
+  mode: ImportFlowMode;
+  /** The application service — injected, not pulled from context. */
+  appService: AppService;
+  /**
+   * Called when the flow completes or is cancelled.
+   * When import succeeds, the invitation identifier is provided so callers can
+   * select/focus the imported invitation in their UI.
+   */
+  onClose: (importedInvitationId?: string) => void;
+  /** Display an error message to the user. */
+  showError: (message: string) => void;
+  /** Display an info message to the user. */
+  showInfo: (message: string) => void;
+  /** Update the global status bar. */
+  setStatus: (message: string) => void;
+}

src/tui/theme.ts

@@ -3,12 +3,12 @@
  * Defines colors, styles, and visual constants used throughout the application.
  */
 
-import type { TextProps } from 'ink';
+import type { TextProps } from "ink";
 
 /**
  * Color type - supports Ink color names.
  */
-export type Color = TextProps['color'];
+export type Color = TextProps["color"];
 
 /**
  * Color palette for the application.
@@ -16,33 +16,33 @@ export type Color = TextProps['color'];
  */
 export const colors = {
   // Primary colors
-  primary: 'cyan' as Color,
-  secondary: 'blue' as Color,
-  accent: 'magenta' as Color,
+  primary: "cyan" as Color,
+  secondary: "blue" as Color,
+  accent: "magenta" as Color,
 
   // Status colors
-  success: 'green' as Color,
-  warning: 'yellow' as Color,
-  error: 'red' as Color,
-  info: 'cyan' as Color,
+  success: "green" as Color,
+  warning: "yellow" as Color,
+  error: "red" as Color,
+  info: "cyan" as Color,
 
   // Text colors
-  text: 'white' as Color,
-  textMuted: 'gray' as Color,
-  textHighlight: 'whiteBright' as Color,
+  text: "white" as Color,
+  textMuted: "gray" as Color,
+  textHighlight: "whiteBright" as Color,
 
   // Background colors
-  bg: 'black' as Color,
-  bgSelected: 'blue' as Color,
-  bgHover: 'gray' as Color,
+  bg: "black" as Color,
+  bgSelected: "blue" as Color,
+  bgHover: "gray" as Color,
 
   // Border colors
-  border: 'cyan' as Color,
-  borderFocused: 'yellowBright' as Color,
-  borderMuted: 'gray' as Color,
+  border: "cyan" as Color,
+  borderFocused: "yellowBright" as Color,
+  borderMuted: "gray" as Color,
 
   // Focus highlight color (very visible)
-  focus: 'yellowBright' as Color,
+  focus: "yellowBright" as Color,
 } as const;
 
 /**
@@ -76,7 +76,7 @@ export const logo = `
 /**
  * Small logo for status bar.
  */
-export const logoSmall = 'XO Wallet';
+export const logoSmall = "XO Wallet";
 
 /**
  * Helper to format satoshis for display.
@@ -84,7 +84,7 @@ export const logoSmall = 'XO Wallet';
  * @returns Formatted string with BCH amount
  */
 export function formatSatoshis(satoshis: bigint | number): string {
-  const value = typeof satoshis === 'bigint' ? satoshis : BigInt(satoshis);
+  const value = typeof satoshis === "bigint" ? satoshis : BigInt(satoshis);
   const bch = Number(value) / 100_000_000;
   return `${bch.toFixed(8)} BCH (${value.toLocaleString()} sats)`;
 }
@@ -97,7 +97,7 @@ export function formatSatoshis(satoshis: bigint | number): string {
  */
 export function truncate(str: string, maxLength: number): string {
   if (str.length <= maxLength) return str;
-  return str.slice(0, maxLength - 3) + '...';
+  return str.slice(0, maxLength - 3) + "...";
 }
 
 /**

src/tui/types.ts

@@ -2,19 +2,19 @@
  * Shared types for the CLI TUI.
  */
 
-import type { AppService } from '../services/app.js';
-import type { AppConfig } from '../app.js';
+import type { AppService } from "../services/app.js";
+import type { AppConfig } from "../app.js";
 
 /**
  * Screen names for navigation.
  */
 export type ScreenName =
-  | 'seed-input'
-  | 'wallet'
-  | 'templates'
-  | 'wizard'
-  | 'invitations'
-  | 'transaction';
+  | "seed-input"
+  | "wallet"
+  | "templates"
+  | "wizard"
+  | "invitations"
+  | "transaction";
 
 /**
  * Navigation context data that can be passed between screens.
@@ -81,7 +81,7 @@ export interface DialogState {
   /** Whether dialog is visible */
   visible: boolean;
   /** Dialog type */
-  type: 'error' | 'info' | 'confirm';
+  type: "error" | "info" | "confirm";
   /** Dialog message */
   message: string;
   /** Callback for confirm dialog */

src/tui/utils/clipboard.ts

@@ -2,11 +2,42 @@
  * Cross-platform clipboard utility with multiple fallback methods.
  */
 
-import { exec } from 'child_process';
-import { promisify } from 'util';
+import clipboardy from "clipboardy";
+import { exec } from "child_process";
+import { promisify } from "util";
 
 const execAsync = promisify(exec);
 
+// Define a list of clipboard methods with their platform and command.
+// The platform is a function that returns true if the method is available on the current platform.
+// The command is a function that returns a promise that resolves to the result of the command.
+const clipboardMethods = {
+  pbCopy: {
+    platform: (platform: string) => platform === 'darwin',
+    command: async (text: string) => execAsync(`printf '%s' '${text}' | pbcopy`),
+  },
+  xclip: {
+    platform: (platform: string) => platform === 'linux',
+    command: async (text: string) => execAsync(`printf '%s' '${text}' | xclip -selection clipboard`),
+  },
+  xsel: {
+    platform: (platform: string) => platform === 'linux',
+    command: async (text: string) => execAsync(`printf '%s' '${text}' | xsel --clipboard --input`),
+  },
+  ssh: {
+    platform: (platform: string) => platform === 'linux',
+    command: async (text: string) => process.stdout.write(`\x1b]52;c;${Buffer.from(text, 'utf-8').toString('base64')}\x07`),
+  },
+  clip: {
+    platform: (platform: string) => platform === 'windows',
+    command: async (text: string) => execAsync(`echo|set /p="${text}" | clip`),
+  },
+  clipboardy: {
+    platform: (platform: string) => platform === 'windows',
+    command: async (text: string) => clipboardy.writeSync(text),
+  },
+}
+
 /**
  * Attempts to copy text to clipboard using multiple methods.
  * Tries native commands first (most reliable), then clipboardy as fallback.
@@ -20,43 +51,25 @@ export async function copyToClipboard(text: string): Promise<void> {
   // Escape the text for shell commands
   const escapedText = text.replace(/'/g, "'\\''");
 
-  // Try native commands first - they're more reliable
-  try {
-    if (platform === 'darwin') {
-      // macOS - use pbcopy directly
-      await execAsync(`printf '%s' '${escapedText}' | pbcopy`);
-      return;
-    } else if (platform === 'linux') {
-      // Linux - try xclip, then xsel
-      try {
-        await execAsync(`printf '%s' '${escapedText}' | xclip -selection clipboard`);
-        return;
-      } catch {
-        try {
-          await execAsync(`printf '%s' '${escapedText}' | xsel --clipboard --input`);
-          return;
-        } catch {
-          // Fall through to clipboardy
-        }
-      }
-    } else if (platform === 'win32') {
-      // Windows - use clip.exe
-      await execAsync(`echo|set /p="${text}" | clip`);
-      return;
-    }
-  } catch {
-    // Native command failed, try clipboardy
-  }
+  const availableMethods = Object.values(clipboardMethods).filter(method => method.platform(platform));
 
-  // Fallback to clipboardy
+  const errors: Error[] = [];
+
+  for (const method of availableMethods) {
     try {
-    const clipboard = await import('clipboardy');
-    await clipboard.default.write(text);
+      if (method.platform(platform)) {
+        await method.command(escapedText);
+      } else {
+        continue;
+      }
       return;
-  } catch {
-    // clipboardy also failed
+    } catch(error) {
+      if (error instanceof Error) {
+        errors.push(error);
+      }
+    }
   }
 
   // All methods failed
-  throw new Error(`Clipboard not available. Install xclip or xsel on Linux.`);
+  throw new Error(`Clipboard not available. ${errors.map(error => error.message).join('\n')}`);
 }

src/utils/bch-mnemonic-url.ts

@@ -0,0 +1,183 @@
+/*
+ * Handles BCH Mnemonic parsing to/from URL form.
+ * Pulled directly from the old stack package.
+ */
+import { z } from "zod";
+import { decodeBip39Mnemonic } from "@bitauth/libauth";
+
+export type BCHMnemonicURLRaw = {
+  entropy: Uint8Array;
+  passphrase?: string;
+  language?: (typeof BCHMnemonicURL.SUPPORTED_LANGUAGES)[number];
+  comment?: string;
+  path?: string;
+  startHeight?: number;
+};
+
+/**
+ * Handles BCHMnemonic URLs
+ */
+export class BCHMnemonicURL {
+  static PROTOCOL = "bch-mnemonic";
+
+  /**
+   * Check if a URL is a valid wallet backup URL
+   *
+   * @param url The URL to check
+   * @returns True if the URL is a valid wallet backup URL, false otherwise
+   */
+  public static canHandle(urlStr: string): boolean {
+    try {
+      BCHMnemonicURL.fromURL(urlStr);
+      return true;
+    } catch (_error) {
+      return false;
+    }
+  }
+
+  /**
+   * Creates a BCHMnemonic from a URL-encoded string
+   * @param urlStr - The URL-encoded mnemonic string
+   * @returns A new BCHMnemonic instance
+   * @throws Error if the URL format is invalid or entropy is invalid
+   */
+  static fromURL(urlStr: string): BCHMnemonicURL {
+    const url = new URL(urlStr);
+
+    if (url.protocol !== `${BCHMnemonicURL.PROTOCOL}:`) {
+      throw new Error(`Invalid URL protocol: ${url.protocol}`);
+    }
+
+    // Decode the entropy.
+    const entropy = new Uint8Array(Buffer.from(url.pathname, "base64"));
+
+    // Pick out our encoding keys from the URL
+    const params = BCHMnemonicURL.schema.parse(
+      Object.fromEntries(url.searchParams.entries()),
+    );
+
+    // Create and return the backup with validated parameters
+    return BCHMnemonicURL.fromRaw({
+      entropy,
+      language: params[BCHMnemonicURL.ENCODING_KEYS.language],
+      comment: params[BCHMnemonicURL.ENCODING_KEYS.comment],
+      path: params[BCHMnemonicURL.ENCODING_KEYS.path],
+      startHeight: params[BCHMnemonicURL.ENCODING_KEYS.startHeight],
+    });
+  }
+
+  /**
+   * Create a new WalletBackup from a raw object
+   *
+   * @param raw - The raw object to create the WalletBackup from
+   * @returns The created WalletBackup
+   */
+  static fromRaw(raw: BCHMnemonicURLRaw): BCHMnemonicURL {
+    // Add entropy validation
+    if (!raw.entropy || raw.entropy.length === 0) {
+      throw new Error("Invalid entropy: must be non-empty");
+    }
+
+    // Validate entropy length (typically 16, 20, 24, 28, or 32 bytes for BIP39)
+    const validLengths = [16, 20, 24, 28, 32];
+    if (!validLengths.includes(raw.entropy.length)) {
+      throw new Error(`Invalid entropy length: ${raw.entropy.length} bytes`);
+    }
+
+    return new BCHMnemonicURL(raw);
+  }
+
+  static fromSeed(seed: string): BCHMnemonicURL {
+    // Encode the seed to a Uint8Array
+    const entropy = decodeBip39Mnemonic(seed);
+
+    // If the decode failed, throw an error
+    if (typeof entropy === "string") {
+      throw new Error(`Invalid seed: ${entropy}`);
+    }
+
+    return BCHMnemonicURL.fromRaw({ entropy });
+  }
+
+  constructor(protected raw: BCHMnemonicURLRaw) {}
+
+  toObject() {
+    return this.raw;
+  }
+
+  /**
+   * Encode the backup into a URL encoding
+   *
+   * @param prefix - The prefix to use for the URL encoding
+   * @returns The URL encoding of the backup
+   */
+  toURL(): string {
+    // Conver the mnemonic words into the entropy used to derive the mnemonic words
+    const entropyBase64 = Buffer.from(this.raw.entropy).toString("base64");
+
+    // Create a new URL object with the prefix and the base64 encoded mnemonic
+    const url = new URL(`${BCHMnemonicURL.PROTOCOL}:${entropyBase64}`);
+
+    // Add the raw values to the url encoded string. Only add the values that are defined.
+    if (this.raw.language !== undefined) {
+      url.searchParams.set(
+        BCHMnemonicURL.ENCODING_KEYS.language,
+        this.raw.language,
+      );
+    }
+
+    if (this.raw.comment !== undefined) {
+      url.searchParams.set(
+        BCHMnemonicURL.ENCODING_KEYS.comment,
+        this.raw.comment,
+      );
+    }
+
+    if (this.raw.path !== undefined) {
+      url.searchParams.set(BCHMnemonicURL.ENCODING_KEYS.path, this.raw.path);
+    }
+
+    if (this.raw.startHeight !== undefined) {
+      url.searchParams.set(
+        BCHMnemonicURL.ENCODING_KEYS.startHeight,
+        this.raw.startHeight.toString(),
+      );
+    }
+
+    return url.toString();
+  }
+
+  static ENCODING_KEYS = {
+    language: "l",
+    passphrase: "p",
+    comment: "c",
+    path: "d",
+    startHeight: "h",
+  } as const;
+
+  static SUPPORTED_LANGUAGES = [
+    "en",
+    "zh-CN",
+    "zh-TW",
+    "ja",
+    "es",
+    "pt",
+    "ko",
+    "fr",
+    "it",
+    "cs",
+  ] as const;
+
+  /**
+   * Zod schema for validating URL parameters
+   */
+  static schema = z.object({
+    [BCHMnemonicURL.ENCODING_KEYS.language]: z
+      .enum(BCHMnemonicURL.SUPPORTED_LANGUAGES)
+      .optional(),
+    [BCHMnemonicURL.ENCODING_KEYS.passphrase]: z.string().optional(),
+    [BCHMnemonicURL.ENCODING_KEYS.comment]: z.string().optional(),
+    [BCHMnemonicURL.ENCODING_KEYS.path]: z.string().optional(),
+    [BCHMnemonicURL.ENCODING_KEYS.startHeight]: z.coerce.number().optional(),
+  });
+}

src/utils/exponential-backoff.ts

@@ -71,7 +71,7 @@ export class ExponentialBackoff {
     fn: () => Promise<T>,
     onError = (_error: Error) => {},
   ): Promise<T> {
-    let lastError: Error = new Error('Exponential backoff: Max retries hit');
+    let lastError: Error = new Error("Exponential backoff: Max retries hit");
 
     let attempt = 0;
 

src/utils/ext-json.ts

@@ -7,7 +7,7 @@
  *       See: https://github.com/bitauth/libauth/pull/108
  */
 
-import { binToHex, hexToBin } from '@bitauth/libauth';
+import { binToHex, hexToBin } from "@bitauth/libauth";
 
 /**
  * Replaces BigInt and Uint8Array values with their ExtJSON string representations.
@@ -15,7 +15,7 @@ import { binToHex, hexToBin } from '@bitauth/libauth';
  * @returns The replaced value as an ExtJSON string, or the original value
  */
 export const extendedJsonReplacer = function (value: unknown): unknown {
-  if (typeof value === 'bigint') {
+  if (typeof value === "bigint") {
     return `<bigint: ${value.toString()}n>`;
   } else if (value instanceof Uint8Array) {
     return `<Uint8Array: ${binToHex(value)}>`;
@@ -36,7 +36,7 @@ export const extendedJsonReviver = function (value: unknown): unknown {
 
   // Only perform a check if the value is a string.
   // NOTE: We can skip all other values as all Extended JSON encoded fields WILL be a string.
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     // Check if this value matches an Extended JSON encoded bigint.
     const bigintMatch = value.match(bigIntRegex);
     if (bigintMatch) {
@@ -70,7 +70,7 @@ export const encodeExtendedJsonObject = function (value: unknown): unknown {
   // If this is an object type (and it is not null - which is technically an "object")...
   // ... and it is not an ArrayBuffer (e.g. Uint8Array) which is also technically an "object...
   if (
-    typeof value === 'object' &&
+    typeof value === "object" &&
     value !== null &&
     !ArrayBuffer.isView(value)
   ) {
@@ -83,7 +83,9 @@ export const encodeExtendedJsonObject = function (value: unknown): unknown {
     const encodedObject: Record<string, unknown> = {};
 
     // Iterate through each entry and encode it to extended JSON.
-    for (const [key, valueToEncode] of Object.entries(value as Record<string, unknown>)) {
+    for (const [key, valueToEncode] of Object.entries(
+      value as Record<string, unknown>,
+    )) {
       encodedObject[key] = encodeExtendedJsonObject(valueToEncode);
     }
 
@@ -104,7 +106,7 @@ export const decodeExtendedJsonObject = function (value: unknown): unknown {
   // If this is an object type (and it is not null - which is technically an "object")...
   // ... and it is not an ArrayBuffer (e.g. Uint8Array) which is also technically an "object...
   if (
-    typeof value === 'object' &&
+    typeof value === "object" &&
     value !== null &&
     !ArrayBuffer.isView(value)
   ) {
@@ -117,7 +119,9 @@ export const decodeExtendedJsonObject = function (value: unknown): unknown {
     const decodedObject: Record<string, unknown> = {};
 
     // Iterate through each entry and decode it from extended JSON.
-    for (const [key, valueToEncode] of Object.entries(value as Record<string, unknown>)) {
+    for (const [key, valueToEncode] of Object.entries(
+      value as Record<string, unknown>,
+    )) {
       decodedObject[key] = decodeExtendedJsonObject(valueToEncode);
     }
 

src/utils/history-utils.ts

@@ -1,259 +1,120 @@
-/**
- * History utility functions.
- * 
- * Pure functions for parsing and formatting wallet history data.
- * These functions have no React dependencies and can be used
- * in both TUI and CLI contexts.
- */
+import type {
+  HistoryItem,
+  HistoryInvitationItem,
+  HistoryUtxoItem,
+} from "../services/history.js";
 
-import type { HistoryItem, HistoryItemType } from '../services/history.js';
+export type HistoryColorName =
+  | "info"
+  | "warning"
+  | "success"
+  | "error"
+  | "muted"
+  | "text";
 
-/**
- * Color names for history item types.
- * These are semantic color names that can be mapped to actual colors
- * by the consuming application (TUI or CLI).
- */
-export type HistoryColorName = 'info' | 'warning' | 'success' | 'error' | 'muted' | 'text';
+export type HistoryRowType =
+  | "invitation"
+  | "invitation_input"
+  | "invitation_output"
+  | "utxo";
 
-/**
- * Formatted history list item data.
- */
-export interface FormattedHistoryItem {
-  /** The display label for the history item */
+export interface HistoryDisplayRow {
+  id: string;
+  type: HistoryRowType;
   label: string;
-  /** Optional secondary description */
   description?: string;
-  /** The formatted date string */
-  dateStr?: string;
-  /** The semantic color name for this item type */
-  color: HistoryColorName;
-  /** The history item type */
-  type: HistoryItemType;
-  /** Whether the item data is valid */
-  isValid: boolean;
+  timestamp?: number;
+  isNested: boolean;
+  utxo?: HistoryUtxoItem;
+  invitation?: HistoryInvitationItem;
 }
 
-/**
- * Get the semantic color name for a history item type.
- * 
- * @param type - The history item type
- * @param isSelected - Whether the item is currently selected
- * @returns A semantic color name
- */
-export function getHistoryItemColorName(type: HistoryItemType, isSelected: boolean = false): HistoryColorName {
-  if (isSelected) return 'info'; // Use focus color when selected
-  
-  switch (type) {
-    case 'invitation_created':
-      return 'text';
-    case 'utxo_reserved':
-      return 'warning';
-    case 'utxo_received':
-      return 'success';
-    default:
-      return 'text';
-  }
-}
-
-/**
- * Format a satoshi value for display.
- * 
- * @param satoshis - The value in satoshis
- * @returns Formatted string with BCH amount
- */
-export function formatSatoshisValue(satoshis: bigint | number): string {
-  const value = typeof satoshis === 'bigint' ? satoshis : BigInt(satoshis);
-  const bch = Number(value) / 100_000_000;
-  return `${bch.toFixed(8)} BCH (${value.toLocaleString()} sats)`;
-}
-
-/**
- * Format a timestamp for display.
- * 
- * @param timestamp - Unix timestamp in milliseconds
- * @returns Formatted date string or undefined
- */
 export function formatHistoryDate(timestamp?: number): string | undefined {
   if (!timestamp) return undefined;
   return new Date(timestamp).toLocaleDateString();
 }
 
-/**
- * Format a history item for display in a list.
- * 
- * @param item - The history item to format
- * @param isSelected - Whether the item is currently selected
- * @returns Formatted item data for display
- */
-export function formatHistoryListItem(
-  item: HistoryItem | null | undefined,
-  isSelected: boolean = false
-): FormattedHistoryItem {
-  if (!item) {
-    return {
-      label: '',
-      description: undefined,
-      dateStr: undefined,
-      color: 'muted',
-      type: 'utxo_received',
-      isValid: false,
-    };
-  }
-
-  const dateStr = formatHistoryDate(item.timestamp);
-  const color = getHistoryItemColorName(item.type, isSelected);
-
-  switch (item.type) {
-    case 'invitation_created':
-      return {
-        label: `[Invitation] ${item.description}`,
-        description: undefined,
-        dateStr,
-        color,
-        type: item.type,
-        isValid: true,
-      };
-
-    case 'utxo_reserved': {
-      const satsStr = item.valueSatoshis !== undefined 
-        ? formatSatoshisValue(item.valueSatoshis) 
-        : 'Unknown amount';
-      return {
-        label: `[Reserved] ${satsStr}`,
-        description: item.description,
-        dateStr,
-        color,
-        type: item.type,
-        isValid: true,
-      };
-    }
-
-    case 'utxo_received': {
-      const satsStr = item.valueSatoshis !== undefined 
-        ? formatSatoshisValue(item.valueSatoshis) 
-        : 'Unknown amount';
-      const reservedTag = item.reserved ? ' [Reserved]' : '';
-      return {
-        label: satsStr,
-        description: `${item.description}${reservedTag}`,
-        dateStr,
-        color,
-        type: item.type,
-        isValid: true,
-      };
-    }
-
-    default:
-      return {
-        label: `${item.type}: ${item.description}`,
-        description: undefined,
-        dateStr,
-        color: 'text',
-        type: item.type,
-        isValid: true,
-      };
-  }
-}
-
-/**
- * Get a type label for display.
- * 
- * @param type - The history item type
- * @returns Human-readable type label
- */
-export function getHistoryTypeLabel(type: HistoryItemType): string {
-  switch (type) {
-    case 'invitation_created':
-      return 'Invitation';
-    case 'utxo_reserved':
-      return 'Reserved';
-    case 'utxo_received':
-      return 'Received';
-    default:
-      return type;
-  }
-}
-
-/**
- * Calculate scrolling window indices for a list.
- * 
- * @param selectedIndex - Currently selected index
- * @param totalItems - Total number of items
- * @param maxVisible - Maximum visible items
- * @returns Start and end indices for the visible window
- */
-export function calculateScrollWindow(
-  selectedIndex: number,
-  totalItems: number,
-  maxVisible: number
-): { startIndex: number; endIndex: number } {
-  const halfWindow = Math.floor(maxVisible / 2);
-  let startIndex = Math.max(0, selectedIndex - halfWindow);
-  const endIndex = Math.min(totalItems, startIndex + maxVisible);
-  
-  // Adjust start if we're near the end
-  if (endIndex - startIndex < maxVisible) {
-    startIndex = Math.max(0, endIndex - maxVisible);
-  }
-  
-  return { startIndex, endIndex };
-}
-
-/**
- * Check if a history item is a UTXO-related event.
- * 
- * @param item - The history item to check
- * @returns True if the item is UTXO-related
- */
-export function isUtxoEvent(item: HistoryItem): boolean {
-  return item.type === 'utxo_received' || item.type === 'utxo_reserved';
-}
-
-/**
- * Filter history items by type.
- * 
- * @param items - Array of history items
- * @param types - Types to include
- * @returns Filtered array
- */
-export function filterHistoryByType(
+export function buildHistoryDisplayRows(
   items: HistoryItem[],
-  types: HistoryItemType[]
-): HistoryItem[] {
-  return items.filter(item => types.includes(item.type));
-}
-
-/**
- * Get summary statistics for history items.
- * 
- * @param items - Array of history items
- * @returns Summary statistics
- */
-export function getHistorySummary(items: HistoryItem[]): {
-  totalReceived: bigint;
-  totalReserved: bigint;
-  invitationCount: number;
-  utxoCount: number;
-} {
-  let totalReceived = 0n;
-  let totalReserved = 0n;
-  let invitationCount = 0;
-  let utxoCount = 0;
+): HistoryDisplayRow[] {
+  const rows: HistoryDisplayRow[] = [];
 
   for (const item of items) {
-    switch (item.type) {
-      case 'invitation_created':
-        invitationCount++;
-        break;
-      case 'utxo_reserved':
-        totalReserved += item.valueSatoshis ?? 0n;
-        break;
-      case 'utxo_received':
-        totalReceived += item.valueSatoshis ?? 0n;
-        utxoCount++;
-        break;
-    }
+    if (item.kind === "invitation") {
+      rows.push({
+        id: item.id,
+        type: "invitation",
+        label: item.description,
+        timestamp: item.createdAtTimestamp,
+        isNested: false,
+        invitation: item,
+      });
+
+      for (const input of item.inputs) {
+        const satsPrefix =
+          input.valueSatoshis !== undefined
+            ? `${input.valueSatoshis.toLocaleString()} sats `
+            : "";
+        rows.push({
+          id: `${item.id}-input-${input.id}`,
+          type: "invitation_input",
+          label: `${satsPrefix}${input.outpoint.txid}:${input.outpoint.index}`,
+          description: input.description,
+          isNested: true,
+          utxo: input,
+          invitation: item,
+        });
       }
 
-  return { totalReceived, totalReserved, invitationCount, utxoCount };
+      for (const output of item.outputs) {
+        rows.push({
+          id: `${item.id}-output-${output.id}`,
+          type: "invitation_output",
+          label:
+            output.valueSatoshis !== undefined
+              ? `${output.valueSatoshis.toLocaleString()} sats`
+              : "Output",
+          description: output.description,
+          isNested: true,
+          utxo: output,
+          invitation: item,
+        });
+      }
+
+      continue;
+    }
+
+    rows.push({
+      id: item.id,
+      type: "utxo",
+      label:
+        item.valueSatoshis !== undefined
+          ? `${item.valueSatoshis.toLocaleString()} sats`
+          : "UTXO",
+      description: item.description,
+      isNested: false,
+      utxo: item,
+    });
+  }
+
+  return rows;
+}
+
+export function getHistoryItemColorName(
+  row: HistoryDisplayRow,
+  isSelected: boolean = false,
+): HistoryColorName {
+  if (isSelected) return "info";
+  switch (row.type) {
+    case "invitation":
+      return "text";
+    case "invitation_input":
+      return "error";
+    case "invitation_output":
+      return "success";
+    case "utxo":
+      return row.utxo?.reserved ? "warning" : "success";
+    default:
+      return "text";
+  }
 }

src/utils/invitation-flow.ts

@@ -0,0 +1,204 @@
+import type { XOTemplate, XOTemplateTransactionOutput } from "@xo-cash/types";
+import type { Invitation } from "../services/invitation.js";
+import { cashAddressToLockingBytecode, binToHex } from "@bitauth/libauth";
+
+export interface SelectableUtxoLike {
+  outpointTransactionHash: string;
+  outpointIndex: number;
+  valueSatoshis: bigint;
+  lockingBytecode?: string;
+  selected: boolean;
+}
+
+export const hasMissingRequirements = (missingRequirements: {
+  variables?: string[];
+  inputs?: string[];
+  outputs?: string[];
+  roles?: Record<string, unknown>;
+}): boolean => {
+  return (
+    (missingRequirements.variables?.length ?? 0) > 0 ||
+    (missingRequirements.inputs?.length ?? 0) > 0 ||
+    (missingRequirements.outputs?.length ?? 0) > 0 ||
+    (missingRequirements.roles !== undefined &&
+      Object.keys(missingRequirements.roles).length > 0)
+  );
+};
+
+export const isInvitationRequirementsComplete = async (
+  invitation: Invitation,
+): Promise<boolean> => {
+  const missingRequirements = await invitation.getMissingRequirements();
+  return !hasMissingRequirements(missingRequirements);
+};
+
+export const resolveActionRoles = (
+  template: XOTemplate | undefined,
+  actionIdentifier: string | undefined,
+  rolesFromNavigation?: string[],
+): string[] => {
+  if (rolesFromNavigation && rolesFromNavigation.length > 0) {
+    return [...new Set(rolesFromNavigation)];
+  }
+
+  if (!template || !actionIdentifier) return [];
+  const starts = template.start ?? [];
+  const roleIds = starts
+    .filter((entry) => entry.action === actionIdentifier)
+    .map((entry) => entry.role)
+    .filter((roleId) => roleId !== undefined);
+
+  return [...new Set(roleIds)];
+};
+
+export const roleRequiresInputs = (
+  template: XOTemplate | undefined,
+  actionIdentifier: string | undefined,
+  roleIdentifier: string | undefined,
+): boolean => {
+  if (!template || !actionIdentifier || !roleIdentifier) return false;
+  const action = template.actions?.[actionIdentifier];
+  if (!action) return false;
+
+  const actionRole = action.roles?.[roleIdentifier];
+  const actionRequirements = action.requirements;
+  const actionRoleRequirements = actionRole && actionRequirements && actionRequirements.participants?.find((participant) => participant.role === roleIdentifier);
+  const roleSlotsMin = actionRoleRequirements && actionRoleRequirements.slots && actionRoleRequirements.slots.min > 0 ? actionRoleRequirements.slots.min : 0;
+  if (roleSlotsMin > 0) return true;
+
+  const transactionIdentifier = action.transaction;
+  const transaction = transactionIdentifier
+    ? template.transactions?.[transactionIdentifier]
+    : undefined;
+  const roleInputs = transaction?.roles?.[roleIdentifier]?.inputs;
+
+  return (roleInputs?.length ?? 0) > 0;
+};
+
+export const getTransactionOutputIdentifier = (
+  output: XOTemplateTransactionOutput,
+): string | undefined => {
+  if (typeof output === "string") return output;
+  if (
+    output &&
+    typeof output === "object" &&
+    "output" in output &&
+    typeof output.output === "string"
+  ) {
+    return output.output;
+  }
+  return undefined;
+};
+
+export const normalizeLockingBytecodeHex = (value: string): string =>
+  value.trim().replace(/^0x/i, "");
+
+/**
+ * Checks whether a string looks like a CashAddress and, if so, converts it
+ * to locking bytecode hex. Returns undefined when the value is not a
+ * recognizable CashAddress (callers should fall through to treat it as raw hex).
+ */
+export const tryCashAddressToLockingBytecodeHex = (
+  value: string,
+): string | undefined => {
+  const trimmed = value.trim();
+
+  // Quick prefix check so we don't run the decoder on obvious hex strings.
+  const looksLikeCashAddress =
+    trimmed.startsWith("bitcoincash:") ||
+    trimmed.startsWith("bchtest:") ||
+    trimmed.startsWith("bchreg:") ||
+    // Handle prefix-less addresses (e.g. "qp..." or "pp...")
+    /^[qpQP][a-zA-Z0-9]{41,}$/.test(trimmed);
+
+  if (!looksLikeCashAddress) return undefined;
+
+  const result = cashAddressToLockingBytecode(trimmed);
+
+  // cashAddressToLockingBytecode returns a string on failure.
+  if (typeof result === "string") return undefined;
+
+  return binToHex(result.bytecode);
+};
+
+export const resolveProvidedLockingBytecodeHex = (
+  template: XOTemplate,
+  outputIdentifier: string,
+  variableValues: Record<string, string>,
+): string | undefined => {
+  const outputDefinition = template.outputs?.[outputIdentifier];
+  if (!outputDefinition || typeof outputDefinition.lockingScript !== "string") {
+    return undefined;
+  }
+
+  const lockingScriptDefinition = template.lockingScripts?.[outputDefinition.lockingScript];
+  const scriptIdentifier = lockingScriptDefinition?.lockingBytecode;
+  if (!scriptIdentifier) return undefined;
+
+  const scriptExpression = (
+    template.scripts as Record<string, unknown> | undefined
+  )?.[scriptIdentifier];
+  if (typeof scriptExpression !== "string") return undefined;
+
+  const directVariableMatch = scriptExpression.match(
+    /^<\s*([A-Za-z0-9_]+)\s*>$/,
+  );
+  if (!directVariableMatch) return undefined;
+
+  const variableIdentifier = directVariableMatch[1];
+  if (!variableIdentifier) return undefined;
+
+  const providedValue = variableValues[variableIdentifier];
+  if (!providedValue) return undefined;
+
+  // If the user pasted a CashAddress, convert it to locking bytecode hex.
+  const fromAddress = tryCashAddressToLockingBytecodeHex(providedValue);
+  if (fromAddress) return fromAddress;
+
+  return normalizeLockingBytecodeHex(providedValue);
+};
+
+export const mapUnspentOutputsToSelectable = (
+  unspentOutputs: any[],
+): SelectableUtxoLike[] => {
+  return unspentOutputs.map((utxo: any) => ({
+    outpointTransactionHash: utxo.outpointTransactionHash,
+    outpointIndex: utxo.outpointIndex,
+    valueSatoshis: BigInt(utxo.valueSatoshis),
+    lockingBytecode: utxo.lockingBytecode
+      ? typeof utxo.lockingBytecode === "string"
+        ? utxo.lockingBytecode
+        : Buffer.from(utxo.lockingBytecode).toString("hex")
+      : undefined,
+    selected: false,
+  }));
+};
+
+export const autoSelectGreedyUtxos = (
+  utxos: SelectableUtxoLike[],
+  requiredWithFee: bigint,
+): SelectableUtxoLike[] => {
+  let accumulated = 0n;
+  const seenLockingBytecodes = new Set<string>();
+
+  for (const utxo of utxos) {
+    if (
+      utxo.lockingBytecode &&
+      seenLockingBytecodes.has(utxo.lockingBytecode)
+    ) {
+      continue;
+    }
+    if (utxo.lockingBytecode) {
+      seenLockingBytecodes.add(utxo.lockingBytecode);
+    }
+
+    utxo.selected = true;
+    accumulated += utxo.valueSatoshis;
+
+    if (accumulated >= requiredWithFee) {
+      break;
+    }
+  }
+
+  return utxos;
+};

src/utils/invitation-utils.ts

@@ -6,15 +6,15 @@
  * in both TUI and CLI contexts.
  */
 
-import type { Invitation } from '../services/invitation.js';
-import type { XOTemplate } from '@xo-cash/types';
+import type { Invitation } from "../services/invitation.js";
+import type { XOTemplate } from "@xo-cash/types";
 
 /**
  * Color names for invitation states.
  * These are semantic color names that can be mapped to actual colors
  * by the consuming application (TUI or CLI).
  */
-export type StateColorName = 'info' | 'warning' | 'success' | 'error' | 'muted';
+export type StateColorName = "info" | "warning" | "success" | "error" | "muted";
 
 /**
  * Input data extracted from invitation commits.
@@ -77,21 +77,22 @@ export function getInvitationState(invitation: Invitation): string {
  */
 export function getStateColorName(state: string): StateColorName {
   switch (state) {
-    case 'created':
-    case 'published':
-      return 'info';
-    case 'pending':
-      return 'warning';
-    case 'ready':
-    case 'signed':
-    case 'broadcast':
-    case 'completed':
-      return 'success';
-    case 'expired':
-    case 'error':
-      return 'error';
+    case "created":
+    case "published":
+      return "info";
+    case "pending":
+      return "warning";
+    case "ready":
+    case "signed":
+    case "complete":
+    case "broadcast":
+    case "completed":
+      return "success";
+    case "expired":
+    case "error":
+      return "error";
     default:
-      return 'muted';
+      return "muted";
   }
 }
 
@@ -121,7 +122,9 @@ export function getInvitationInputs(invitation: Invitation): InvitationInput[] {
  * @param invitation - The invitation to extract outputs from
  * @returns Array of output data
  */
-export function getInvitationOutputs(invitation: Invitation): InvitationOutput[] {
+export function getInvitationOutputs(
+  invitation: Invitation,
+): InvitationOutput[] {
   const outputs: InvitationOutput[] = [];
   for (const commit of invitation.data.commits || []) {
     for (const output of commit.data?.outputs || []) {
@@ -142,7 +145,9 @@ export function getInvitationOutputs(invitation: Invitation): InvitationOutput[]
  * @param invitation - The invitation to extract variables from
  * @returns Array of variable data
  */
-export function getInvitationVariables(invitation: Invitation): InvitationVariable[] {
+export function getInvitationVariables(
+  invitation: Invitation,
+): InvitationVariable[] {
   const variables: InvitationVariable[] = [];
   for (const commit of invitation.data.commits || []) {
     for (const variable of commit.data?.variables || []) {
@@ -164,7 +169,10 @@ export function getInvitationVariables(invitation: Invitation): InvitationVariab
  * @param userEntityId - The user's entity identifier
  * @returns The role identifier if found, null otherwise
  */
-export function getUserRole(invitation: Invitation, userEntityId: string | null): string | null {
+export function getUserRole(
+  invitation: Invitation,
+  userEntityId: string | null,
+): string | null {
   if (!userEntityId) return null;
 
   for (const commit of invitation.data.commits || []) {
@@ -195,7 +203,7 @@ export function getUserRole(invitation: Invitation, userEntityId: string | null)
  */
 export function formatInvitationListItem(
   invitation: Invitation,
-  template?: XOTemplate | null
+  template?: XOTemplate | null,
 ): FormattedInvitationItem {
   // Validate that we have the minimum required data
   const invitationId = invitation?.data?.invitationIdentifier;
@@ -203,15 +211,15 @@ export function formatInvitationListItem(
 
   if (!invitationId || !actionId) {
     return {
-      label: '',
-      status: 'error',
-      statusColor: 'error',
+      label: "",
+      status: "error",
+      statusColor: "error",
       isValid: false,
     };
   }
 
   const state = getInvitationState(invitation);
-  const templateName = template?.name ?? 'Unknown';
+  const templateName = template?.name ?? "Unknown";
   const shortId = formatInvitationId(invitationId, 8);
 
   return {
@@ -258,7 +266,10 @@ export function getInvitationParticipants(invitation: Invitation): string[] {
  * @param userEntityId - The user's entity identifier
  * @returns True if the user has made at least one commit
  */
-export function isUserParticipant(invitation: Invitation, userEntityId: string | null): boolean {
+export function isUserParticipant(
+  invitation: Invitation,
+  userEntityId: string | null,
+): boolean {
   if (!userEntityId) return false;
   return getInvitationParticipants(invitation).includes(userEntityId);
 }

src/utils/logger.ts

@@ -5,7 +5,11 @@ export class Logger {
     private readonly path: string,
   ) {}
 
-  send(level: 'log' | 'error' | 'warn' | 'info', message: string, ...metadata: unknown[]) {
+  send(
+    level: "log" | "error" | "warn" | "info",
+    message: string,
+    ...metadata: unknown[]
+  ) {
     const data = {
       level,
       message: `${this.path}: ${message}`,
@@ -13,31 +17,31 @@ export class Logger {
     };
 
     fetch(`${this.endpoint}`, {
-      method: 'POST',
+      method: "POST",
       body: JSON.stringify(data),
       headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': this.token,
+        "Content-Type": "application/json",
+        "x-api-key": this.token,
       },
-    }).catch(error => {
-      console.error('Failed to send log to logger:', error);
+    }).catch((error) => {
+      console.error("Failed to send log to logger:", error);
     });
   }
 
   log(message: string, ...metadata: unknown[]) {
-    this.send('log', message, ...metadata);
+    this.send("log", message, ...metadata);
   }
 
   error(message: string, ...metadata: unknown[]) {
-    this.send('error', message, ...metadata);
+    this.send("error", message, ...metadata);
   }
 
   warn(message: string, ...metadata: unknown[]) {
-    this.send('warn', message, ...metadata);
+    this.send("warn", message, ...metadata);
   }
 
   info(message: string, ...metadata: unknown[]) {
-    this.send('info', message, ...metadata);
+    this.send("info", message, ...metadata);
   }
 
   child(path: string): Logger {

src/utils/paths.ts

@@ -0,0 +1,70 @@
+/**
+ * Global XO CLI config layout (XDG-style: ~/.config/xo-cli/).
+ * User-provided paths (templates, invitation JSON) stay relative to cwd.
+ */
+
+import { existsSync, mkdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { basename, isAbsolute, join, resolve } from "node:path";
+
+/**
+ * Base config directory. Created on first access.
+ */
+export function getConfigDir(): string {
+  const dir = join(homedir(), ".config", "xo-cli");
+  mkdirSync(dir, { recursive: true });
+  return dir;
+}
+
+/**
+ * Directory for mnemonic wallet files (mnemonic-*).
+ */
+export function getMnemonicsDir(): string {
+  const dir = join(getConfigDir(), "mnemonics");
+  mkdirSync(dir, { recursive: true });
+  return dir;
+}
+
+/**
+ * Directory for engine DB and invitation storage SQLite files.
+ */
+export function getDataDir(): string {
+  const dir = join(getConfigDir(), "data");
+  mkdirSync(dir, { recursive: true });
+  return dir;
+}
+
+/**
+ * File storing the last-used mnemonic reference for `-m` omission.
+ */
+export function getWalletConfigPath(): string {
+  return join(getConfigDir(), ".wallet");
+}
+
+/**
+ * Resolves a mnemonic reference to an absolute path.
+ * Order: absolute path if it exists → path relative to cwd → ~/.config/xo-cli/mnemonics/<basename>.
+ *
+ * @param mnemonicRef - Path or basename (e.g. `mnemonic-nuclear`)
+ * @returns Absolute path to the mnemonic file
+ * @throws If no matching file exists
+ */
+export function resolveMnemonicFilePath(mnemonicRef: string): string {
+  if (isAbsolute(mnemonicRef) && existsSync(mnemonicRef)) {
+    return mnemonicRef;
+  }
+
+  const relativeToCwd = resolve(process.cwd(), mnemonicRef);
+  if (existsSync(relativeToCwd)) {
+    return relativeToCwd;
+  }
+
+  const inMnemonics = join(getMnemonicsDir(), basename(mnemonicRef));
+  if (existsSync(inMnemonics)) {
+    return inMnemonics;
+  }
+
+  throw new Error(
+    `Mnemonic file not found: ${mnemonicRef}. Run "xo-cli mnemonic list" to see available files.`,
+  );
+}

src/utils/rates/base-rates.ts

@@ -0,0 +1,56 @@
+import { EventEmitter } from '../event-emitter.js';
+
+/**
+ * Events emitted by our Rates Adapters
+ */
+export type RatesEventMap = {
+  rateUpdated: {
+    numeratorUnitCode: string;
+    denominatorUnitCode: string;
+    price: number;
+  };
+};
+
+export abstract class BaseRates<
+  T extends RatesEventMap = RatesEventMap,
+> extends EventEmitter<T> {
+  /** Starts the given rates adapter so that it will emit events on price updates. */
+  public abstract start(): Promise<void>;
+
+  /** Stops the given rates adapter so that it will stop checking for price updates. */
+  public abstract stop(): Promise<void>;
+
+  /**
+   * List all available market products (pairs).
+   * @returns A set of strings in the format "NUMERATOR/DENOMINATOR"
+   */
+  public abstract listPairs(): Promise<Set<string>>;
+
+  // TODO: Consider whether we actually want the below.
+  //       Ideally, we will want to replace this with something like the Units class:
+  //       See: https://gitlab.com/GeneralProtocols/xo/stack/-/issues/44
+  /**
+   * Format the amount in the target currency to the correct number of decimal places.
+   *
+   * @param {number} amount - The amount to format.
+   * @param {string} targetCurrency - The target currency.
+   *
+   * @returns The formatted amount.
+   */
+  public formatCurrency(amount: number, targetCurrency: string): string {
+    const minimumFractionDigitsMap: { [currency: string]: number } = {
+      AUD: 2,
+      BCH: 8,
+      USD: 2,
+    };
+
+    const formatter = new Intl.NumberFormat('en-US', {
+      style: 'currency',
+      currency: targetCurrency,
+      currencyDisplay: 'narrowSymbol',
+      minimumFractionDigits: minimumFractionDigitsMap[targetCurrency] || 0,
+    });
+
+    return formatter.format(amount);
+  }
+}

src/utils/rates/rates-oracles.ts

@@ -0,0 +1,170 @@
+import {
+  OracleClient,
+  OracleMetadataMessage,
+  OraclePriceMessage,
+  type OracleMetadataMap,
+} from '@generalprotocols/oracle-client';
+
+import { type RatesEventMap, BaseRates } from './base-rates.js';
+
+// Add the Oracle Price Message to our Events for this Adapter.
+export type RatesOracleEventMap = RatesEventMap & {
+  rateUpdated: {
+    oraclePriceMessage: OraclePriceMessage;
+  };
+};
+
+// TODO: Add RatesHistorical trait since Oracles can provide historical rates.
+export class RatesOracle extends BaseRates<RatesOracleEventMap> {
+  /**
+   * Create a new rates oracle.
+   *
+   * @param client The underlying oracle client. If not provided, a new client will be created.
+   * @returns The rates oracle.
+   */
+  static async from(client?: OracleClient) {
+    const ratesOracle = new RatesOracle(client ?? (await OracleClient.from()));
+
+    return ratesOracle;
+  }
+
+  private client: OracleClient;
+  private oracles: OracleMetadataMap;
+
+  private started: boolean = false;
+
+  private constructor(client: OracleClient) {
+    super();
+
+    this.client = client;
+    this.oracles = {};
+  }
+
+  /**
+   * Start the rates oracle and the underlying client.
+   */
+  async start() {
+    if (this.started) {
+      return;
+    }
+    this.started = true;
+
+    // Create event listeners for the client.
+    this.client.setOnMetadataMessage(this.handleMetadataMessage.bind(this));
+    this.client.setOnPriceMessage(this.handlePriceMessage.bind(this));
+
+    // Get the metadata for the client.
+    this.oracles = await this.client.getMetadataMap();
+
+    // Start the client.
+    await this.client.start();
+
+    // Refresh the prices.
+    await this.refreshPrices();
+  }
+
+  /**
+   * Stop the rates oracle and the underlying client.
+   */
+  async stop() {
+    if (!this.started) {
+      return;
+    }
+    this.started = false;
+
+    // Remove event listeners by setting them to empty functions.
+    this.client.setOnMetadataMessage(() => {});
+    this.client.setOnPriceMessage(() => {});
+
+    await this.client.stop();
+  }
+
+  /**
+   * List the pairs that we are tracking.
+   *
+   * @returns A set of pairs.
+   */
+  async listPairs() {
+    return new Set(
+      Object.values(this.oracles).map((oracle) => {
+        return `${oracle.SOURCE_NUMERATOR_UNIT_CODE}/${oracle.SOURCE_DENOMINATOR_UNIT_CODE}`;
+      }),
+    );
+  }
+
+  /**
+   * Get the latest prices for all the pairs and emit a rate updated event for each.
+   */
+  public async refreshPrices() {
+    const oracles = await this.client.getOracles();
+
+    // For each oracle, get the lastest dataSequence (price) message and emit a rate updated event.
+    await Promise.allSettled(
+      oracles.map(async (oracle) => {
+        try {
+          const messages = await this.client.getOracleMessages({
+            publicKey: oracle.publicKey,
+            minDataSequence: 1,
+            count: 1,
+          });
+
+          // We are only expecting a single message back. Just in case, we take the latest one.
+          const message = messages.reduce((latest, msg) => {
+            if (
+              msg instanceof OraclePriceMessage &&
+              msg.messageSequence > (latest?.messageSequence ?? 0)
+            ) {
+              return msg;
+            }
+            return latest;
+          }, messages[0]);
+
+          // If the message is a price message, handle it.
+          if (message instanceof OraclePriceMessage) {
+            this.handlePriceMessage(message);
+          }
+        } catch (error) {
+          console.error('Error refreshing prices for oracle:', oracle.publicKey, error);
+        }
+      }),
+    );
+  }
+
+  /**
+   * Update the metadata map that we use to track the pairs.
+   *
+   * @param message The metadata message.
+   */
+  private handleMetadataMessage(message: OracleMetadataMessage) {
+    this.oracles = OracleClient.updateMetadataMap(this.oracles, message);
+  }
+
+  /**
+   * Emit a rate updated event for the given pair.
+   *
+   * @param message The price message.
+   */
+  private handlePriceMessage(message: OraclePriceMessage) {
+    const oracle = this.oracles[message.toHexObject().publicKey];
+
+    // If the oracle doesn't have the required metadata, we can't use it.
+    if (
+      !oracle ||
+      !oracle.SOURCE_NUMERATOR_UNIT_CODE ||
+      !oracle.SOURCE_DENOMINATOR_UNIT_CODE ||
+      !oracle.ATTESTATION_SCALING
+    ) {
+      return;
+    }
+
+    // Scale the price
+    const priceValue = message.priceValue / oracle.ATTESTATION_SCALING;
+
+    this.emit('rateUpdated', {
+      numeratorUnitCode: oracle.SOURCE_NUMERATOR_UNIT_CODE,
+      denominatorUnitCode: oracle.SOURCE_DENOMINATOR_UNIT_CODE,
+      price: priceValue,
+      oraclePriceMessage: message,
+    });
+  }
+}

src/utils/sse-client.ts

@@ -1,11 +1,19 @@
-import { ExponentialBackoff } from './exponential-backoff.js';
+import { ExponentialBackoff } from "./exponential-backoff.js";
 
 // Type declarations for browser environment (not available in Node.js)
-declare const document: {
-  visibilityState: 'visible' | 'hidden';
-  addEventListener: (event: string, handler: (event: Event) => void) => void;
-  removeEventListener: (event: string, handler: (event: Event) => void) => void;
-} | undefined;
+declare const document:
+  | {
+      visibilityState: "visible" | "hidden";
+      addEventListener: (
+        event: string,
+        handler: (event: Event) => void,
+      ) => void;
+      removeEventListener: (
+        event: string,
+        handler: (event: Event) => void,
+      ) => void;
+    }
+  | undefined;
 
 /**
  * A Server-Sent Events client implementation using fetch API.
@@ -51,14 +59,14 @@ export class SSESession {
     this.options = {
       // Use default fetch function.
       fetch: (...args) => fetch(...args),
-      method: 'GET',
+      method: "GET",
       headers: {
-        Accept: 'text/event-stream',
-        'Cache-Control': 'no-cache',
+        Accept: "text/event-stream",
+        "Cache-Control": "no-cache",
       },
       onConnected: () => {},
       onMessage: () => {},
-      onError: (error) => console.error('SSESession error:', error),
+      onError: (error) => console.error("SSESession error:", error),
       onDisconnected: () => {},
       onReconnect: (options) => Promise.resolve(options),
 
@@ -71,10 +79,10 @@ export class SSESession {
     this.controller = new AbortController();
 
     // Set up visibility change handling if in mobile browser environment
-    if (typeof document !== 'undefined') {
+    if (typeof document !== "undefined") {
       this.visibilityChangeHandler = this.handleVisibilityChange.bind(this);
       document.addEventListener(
-        'visibilitychange',
+        "visibilitychange",
         this.visibilityChangeHandler,
       );
     }
@@ -85,16 +93,16 @@ export class SSESession {
    */
   private async handleVisibilityChange(): Promise<void> {
     // Guard for Node.js environment where document is undefined
-    if (typeof document === 'undefined') return;
+    if (typeof document === "undefined") return;
 
     // When going to background, close the current connection cleanly
     // This allows us to reconnect mobile devices when they come back after leaving the tab or browser app.
-    if (document.visibilityState === 'hidden') {
+    if (document.visibilityState === "hidden") {
       this.controller.abort();
     }
 
     // When coming back to foreground, attempt to reconnect if not connected
-    if (document.visibilityState === 'visible' && !this.connected) {
+    if (document.visibilityState === "visible" && !this.connected) {
       await this.connect();
     }
   }
@@ -115,7 +123,7 @@ export class SSESession {
       headers: headers || {},
       body: body || null,
       signal: this.controller.signal,
-      cache: 'no-store',
+      cache: "no-store",
     };
 
     const exponentialBackoff = ExponentialBackoff.from({
@@ -144,7 +152,7 @@ export class SSESession {
       }
 
       if (!res.body) {
-        throw new Error('Response body is null');
+        throw new Error("Response body is null");
       }
 
       return res.body.getReader();
@@ -228,10 +236,10 @@ export class SSESession {
       const line = lines[i];
 
       // Empty line signals the end of an event
-      if (line === '') {
+      if (line === "") {
         if (currentEvent.data) {
           // Remove trailing newline if present
-          currentEvent.data = currentEvent.data.replace(/\n$/, '');
+          currentEvent.data = currentEvent.data.replace(/\n$/, "");
           events.push(currentEvent as SSEvent);
           currentEvent = {};
           completeEventCount = i + 1;
@@ -242,24 +250,24 @@ export class SSESession {
       if (!line) continue;
 
       // Parse field: value format
-      const colonIndex = line.indexOf(':');
+      const colonIndex = line.indexOf(":");
       if (colonIndex === -1) continue;
 
       const field = line.slice(0, colonIndex);
       // Skip initial space after colon if present
       const valueStartIndex =
-        colonIndex + 1 + (line[colonIndex + 1] === ' ' ? 1 : 0);
+        colonIndex + 1 + (line[colonIndex + 1] === " " ? 1 : 0);
       const value = line.slice(valueStartIndex);
 
-      if (field === 'data') {
+      if (field === "data") {
         currentEvent.data = currentEvent.data
-          ? currentEvent.data + '\n' + value
+          ? currentEvent.data + "\n" + value
           : value;
-      } else if (field === 'event') {
+      } else if (field === "event") {
         currentEvent.event = value;
-      } else if (field === 'id') {
+      } else if (field === "id") {
         currentEvent.id = value;
-      } else if (field === 'retry') {
+      } else if (field === "retry") {
         const retryMs = parseInt(value, 10);
         if (!isNaN(retryMs)) {
           currentEvent.retry = retryMs;
@@ -268,7 +276,7 @@ export class SSESession {
     }
 
     // Store the remainder of the buffer for the next chunk
-    const remainder = lines.slice(completeEventCount).join('\n');
+    const remainder = lines.slice(completeEventCount).join("\n");
     this.messageBuffer = this.textEncoder.encode(remainder);
 
     return events;
@@ -291,9 +299,9 @@ export class SSESession {
     this.controller.abort();
 
     // Remove the visibility handler (This is only required on browsers)
-    if (this.visibilityChangeHandler && typeof document !== 'undefined') {
+    if (this.visibilityChangeHandler && typeof document !== "undefined") {
       document.removeEventListener(
-        'visibilitychange',
+        "visibilitychange",
         this.visibilityChangeHandler,
       );
       this.visibilityChangeHandler = null;
@@ -348,7 +356,7 @@ export interface SSESessionOptions {
   /**
    * HTTP method to use (GET or POST).
    */
-  method: 'GET' | 'POST';
+  method: "GET" | "POST";
 
   /**
    * HTTP headers to send with the request.

src/utils/sync-server.ts

@@ -1,17 +1,20 @@
 import type { XOInvitation } from "@xo-cash/types";
 import { EventEmitter } from "./event-emitter.js";
 import { SSESession, type SSEvent } from "./sse-client.js";
-import { decodeExtendedJson, decodeExtendedJsonObject, encodeExtendedJson, encodeExtendedJsonObject } from "./ext-json.js";
+import { decodeExtendedJson, encodeExtendedJson } from "./ext-json.js";
 
 export type SyncServerEventMap = {
-  'connected': void;
-  'disconnected': void;
-  'error': Error;
-  'message': SSEvent;
-}
+  connected: void;
+  disconnected: void;
+  error: Error;
+  message: SSEvent;
+};
 
 export class SyncServer extends EventEmitter<SyncServerEventMap> {
-  static async from(baseUrl: string, invitationIdentifier: string): Promise<SyncServer> {
+  static async from(
+    baseUrl: string,
+    invitationIdentifier: string,
+  ): Promise<SyncServer> {
     const server = new SyncServer(baseUrl, invitationIdentifier);
     await server.connect();
     return server;
@@ -19,22 +22,32 @@ export class SyncServer extends EventEmitter<SyncServerEventMap> {
 
   private sse: SSESession;
 
-  constructor(private readonly baseUrl: string, private readonly invitationIdentifier: string) {
+  constructor(
+    private readonly baseUrl: string,
+    private readonly invitationIdentifier: string,
+  ) {
     super();
 
     // Create an SSE Session
-    this.sse = new SSESession(`${baseUrl}/invitations?invitationIdentifier=${invitationIdentifier}`, {
-      method: 'GET',
+    this.sse = new SSESession(
+      `${baseUrl}/invitations?invitationIdentifier=${invitationIdentifier}`,
+      {
+        method: "GET",
         headers: {
-        'Accept': 'text/event-stream',
+          Accept: "text/event-stream",
         },
 
         // Create our event bubblers
-      onMessage: (event: SSEvent) => this.emit('message', event),
-      onError: (error: unknown) => this.emit('error', error instanceof Error ? error : new Error(String(error))),
-      onDisconnected: () => this.emit('disconnected', undefined),
-      onConnected: () => this.emit('connected', undefined),
-    });
+        onMessage: (event: SSEvent) => this.emit("message", event),
+        onError: (error: unknown) =>
+          this.emit(
+            "error",
+            error instanceof Error ? error : new Error(String(error)),
+          ),
+        onDisconnected: () => this.emit("disconnected", undefined),
+        onConnected: () => this.emit("connected", undefined),
+      },
+    );
   }
 
   /**
@@ -60,13 +73,17 @@ export class SyncServer extends EventEmitter<SyncServerEventMap> {
    */
   async getInvitation(identifier: string): Promise<XOInvitation | undefined> {
     // Send a GET request to the sync server
-    const response = await fetch(`${this.baseUrl}/invitations?invitationIdentifier=${identifier}`);
+    const response = await fetch(
+      `${this.baseUrl}/invitations?invitationIdentifier=${identifier}`,
+    );
 
     if (!response.ok) {
       throw new Error(`Failed to get invitation: ${response.statusText}`);
     }
 
-    const invitation = decodeExtendedJson(await response.text()) as XOInvitation | undefined;
+    const invitation = decodeExtendedJson(await response.text()) as
+      | XOInvitation
+      | undefined;
     return invitation;
   }
 
@@ -78,10 +95,10 @@ export class SyncServer extends EventEmitter<SyncServerEventMap> {
   async publishInvitation(invitation: XOInvitation): Promise<XOInvitation> {
     // Send a POST request to the sync server
     const response = await fetch(`${this.baseUrl}/invitations`, {
-      method: 'POST',
+      method: "POST",
       body: encodeExtendedJson(invitation),
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
     });
 

src/utils/template-utils.ts

@@ -6,7 +6,7 @@
  * in both TUI and CLI contexts.
  */
 
-import type { XOTemplate, XOTemplateAction } from '@xo-cash/types';
+import type { XOTemplate, XOTemplateAction } from "@xo-cash/types";
 
 /**
  * Formatted template list item data.
@@ -64,18 +64,18 @@ export interface TemplateRole {
  */
 export function formatTemplateListItem(
   template: XOTemplate | null | undefined,
-  index?: number
+  index?: number,
 ): FormattedTemplateItem {
   if (!template) {
     return {
-      label: '',
+      label: "",
       description: undefined,
       isValid: false,
     };
   }
 
-  const name = template.name || 'Unnamed Template';
-  const prefix = index !== undefined ? `${index + 1}. ` : '';
+  const name = template.name || "Unnamed Template";
+  const prefix = index !== undefined ? `${index + 1}. ` : "";
 
   return {
     label: `${prefix}${name}`,
@@ -97,11 +97,11 @@ export function formatActionListItem(
   actionId: string,
   action: XOTemplateAction | null | undefined,
   roleCount: number = 1,
-  index?: number
+  index?: number,
 ): FormattedActionItem {
   if (!actionId) {
     return {
-      label: '',
+      label: "",
       description: undefined,
       roleCount: 0,
       isValid: false,
@@ -109,8 +109,8 @@ export function formatActionListItem(
   }
 
   const name = action?.name || actionId;
-  const prefix = index !== undefined ? `${index + 1}. ` : '';
-  const roleSuffix = roleCount > 1 ? ` (${roleCount} roles)` : '';
+  const prefix = index !== undefined ? `${index + 1}. ` : "";
+  const roleSuffix = roleCount > 1 ? ` (${roleCount} roles)` : "";
 
   return {
     label: `${prefix}${name}${roleSuffix}`,
@@ -131,7 +131,7 @@ export function formatActionListItem(
  */
 export function deduplicateStartingActions(
   template: XOTemplate,
-  startingActions: Array<{ action: string; role: string }>
+  startingActions: Array<{ action: string; role: string }>,
 ): UniqueStartingAction[] {
   const actionMap = new Map<string, UniqueStartingAction>();
 
@@ -163,7 +163,7 @@ export function getTemplateRoles(template: XOTemplate): TemplateRole[] {
 
   return Object.entries(template.roles).map(([roleId, role]) => {
     // Handle case where role might be a string instead of object
-    const roleObj = typeof role === 'object' ? role : null;
+    const roleObj = typeof role === "object" ? role : null;
     return {
       roleId,
       name: roleObj?.name || roleId,
@@ -181,17 +181,20 @@ export function getTemplateRoles(template: XOTemplate): TemplateRole[] {
  */
 export function getRolesForAction(
   template: XOTemplate,
-  actionIdentifier: string
+  actionIdentifier: string,
 ): TemplateRole[] {
-  const startEntries = (template.start ?? [])
-    .filter((s) => s.action === actionIdentifier);
+  const startEntries = (template.start ?? []).filter(
+    (s) => s.action === actionIdentifier,
+  );
 
   return startEntries.map((entry) => {
-    const roleDef = template.roles?.[entry.role];
-    const roleObj = typeof roleDef === 'object' ? roleDef : null;
+    const roleDef = template.roles?.[entry.role || ''];
+    const roleObj = typeof roleDef === "object" ? roleDef : null;
+
+    // TODO: This is ugly. Lot of conditionals. Need to take a much closer look at this.
     return {
-      roleId: entry.role,
-      name: roleObj?.name || entry.role,
+      roleId: entry.role || '',
+      name: roleObj?.name || entry.role || '',
       description: roleObj?.description,
     };
   });
@@ -203,8 +206,10 @@ export function getRolesForAction(
  * @param template - The template
  * @returns The template name or a default
  */
-export function getTemplateName(template: XOTemplate | null | undefined): string {
-  return template?.name || 'Unknown Template';
+export function getTemplateName(
+  template: XOTemplate | null | undefined,
+): string {
+  return template?.name || "Unknown Template";
 }
 
 /**
@@ -213,7 +218,9 @@ export function getTemplateName(template: XOTemplate | null | undefined): string
  * @param template - The template
  * @returns The template description or undefined
  */
-export function getTemplateDescription(template: XOTemplate | null | undefined): string | undefined {
+export function getTemplateDescription(
+  template: XOTemplate | null | undefined,
+): string | undefined {
   return template?.description;
 }
 
@@ -226,7 +233,7 @@ export function getTemplateDescription(template: XOTemplate | null | undefined):
  */
 export function getActionName(
   template: XOTemplate | null | undefined,
-  actionId: string
+  actionId: string,
 ): string {
   return template?.actions?.[actionId]?.name || actionId;
 }
@@ -240,7 +247,7 @@ export function getActionName(
  */
 export function getActionDescription(
   template: XOTemplate | null | undefined,
-  actionId: string
+  actionId: string,
 ): string | undefined {
   return template?.actions?.[actionId]?.description;
 }

src/utils/templates.ts

@@ -222,7 +222,14 @@ export function resolveTemplateReferences(
   const resolved = structuredClone(template);
 
   for (const rule of RESOLUTION_RULES) {
-    applyRule(resolved, resolved, rule.path.split("."), 0, rule.from, rule.mode);
+    applyRule(
+      resolved,
+      resolved,
+      rule.path.split("."),
+      0,
+      rule.from,
+      rule.mode,
+    );
   }
 
   return resolved as unknown as ResolvedXOTemplate;
@@ -357,15 +364,9 @@ interface ResolvedStartEntry {
 
 // ─── The full resolved template ──────────────────────────────────
 
-interface ResolvedXOTemplate
-  extends Omit<
+interface ResolvedXOTemplate extends Omit<
   XOTemplate,
-    | "actions"
-    | "transactions"
-    | "outputs"
-    | "inputs"
-    | "lockingScripts"
-    | "start"
+  "actions" | "transactions" | "outputs" | "inputs" | "lockingScripts" | "start"
 > {
   start: ResolvedStartEntry[];
   actions: Record<string, ResolvedActionDefinition>;