diff --git a/.gitignore b/.gitignore
index 5be6aec..c941700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ Electrum.sqlite
 XO.sqlite
 node_modules/
 dist/
+coverage/
 *.db
 *.db-shm
 *.db-wal
@@ -10,5 +11,5 @@ dist/
 *.sqlite-journal
 resolvedTemplate.json
 mnemonic-*
-.xo-cli-wallet
-inv-*.json
\ No newline at end of file
+inv-*.json
+.xo-cli-wallet
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index bf29c54..dd303f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@bitauth/libauth": "^3.0.0",
         "@electrum-cash/protocol": "^2.3.1",
+        "@xo-cash/crypto": "file:../crypto",
         "@xo-cash/engine": "file:../engine",
         "@xo-cash/state": "file:../state",
         "@xo-cash/templates": "file:../templates",
@@ -23,16 +24,55 @@
         "react": "^19.2.4",
         "zod": "^4.3.6"
       },
+      "bin": {
+        "xo-cli": "dist/cli/index.js",
+        "xo-complete": "dist/cli/complete.js",
+        "xo-tui": "dist/index.js"
+      },
       "devDependencies": {
         "@types/better-sqlite3": "^7.6.13",
         "@types/node": "^25.0.10",
         "@types/qrcode": "^1.5.6",
         "@types/react": "^19.2.14",
+        "@vitest/coverage-v8": "^4.1.2",
+        "esbuild": "^0.28.0",
         "tsx": "^4.21.0",
         "typescript": "^5.9.3",
         "vitest": "^4.1.2"
       }
     },
+    "../crypto": {
+      "name": "@xo-cash/crypto",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@bitauth/libauth": "^3.1.0-next.8",
+        "@xo-cash/primitives": "0.0.1",
+        "@xo-cash/types": "0.0.1"
+      },
+      "devDependencies": {
+        "@chalp/eslint-airbnb": "^1.3.0",
+        "@generalprotocols/cspell-dictionary": "^1.0.1",
+        "@stylistic/eslint-plugin": "^5.7.0",
+        "@typescript-eslint/eslint-plugin": "^8.53.1",
+        "@typescript-eslint/parser": "^8.53.1",
+        "@vitest/coverage-v8": "^4.0.17",
+        "@viz-kit/esbuild-analyzer": "^1.0.0",
+        "@xo-cash/eslint-config": "1.0.1",
+        "cspell": "^9.6.0",
+        "eslint": "^9.39.2",
+        "prettier": "^3.6.2",
+        "tsdown": "^0.20.0-beta.4",
+        "typedoc": "^0.28.16",
+        "typedoc-plugin-coverage": "^4.0.2",
+        "typescript": "^5.3.2",
+        "typescript-eslint": "^8.53.1",
+        "vitest": "^4.0.17"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "../engine": {
       "name": "@xo-cash/engine",
       "version": "0.0.1",
@@ -43,11 +83,11 @@
         "@electrum-cash/network": "^4.2.2",
         "@electrum-cash/protocol": "^2.3.1",
         "@electrum-cash/servers": "^3.1.0",
-        "@xo-cash/crypto": "file:../crypto",
-        "@xo-cash/primitives": "file:../primitives",
-        "@xo-cash/state": "file:../state",
-        "@xo-cash/types": "file:../types",
-        "@xo-cash/utils": "file:../utils",
+        "@xo-cash/crypto": "0.0.1",
+        "@xo-cash/primitives": "0.0.1",
+        "@xo-cash/state": "0.0.1",
+        "@xo-cash/types": "0.0.1",
+        "@xo-cash/utils": "0.0.1",
         "eventemitter3": "^5.0.1"
       },
       "devDependencies": {
@@ -79,7 +119,7 @@
       "license": "MIT",
       "dependencies": {
         "@bitauth/libauth": "^3.1.0-next.8",
-        "@xo-cash/types": "0.0.1",
+        "@xo-cash/types": "0.0.1-development.13730885533",
         "@xo-cash/utils": "0.0.1",
         "better-sqlite3": "^12.5.0",
         "idb": "^8.0.3",
@@ -105,9 +145,6 @@
         "typescript": "^5.3.2",
         "typescript-eslint": "^8.53.1",
         "vitest": "^4.0.17"
-      },
-      "engines": {
-        "node": ">=18.0.0"
       }
     },
     "../templates": {
@@ -177,6 +214,66 @@
         "node": ">=18"
       }
     },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
+      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.0"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@bitauth/libauth": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@bitauth/libauth/-/libauth-3.0.0.tgz",
@@ -234,47 +331,10 @@
         "ws": "^8.13.0"
       }
     },
-    "node_modules/@emnapi/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.0",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.1.tgz",
-      "integrity": "sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/wasi-threads": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz",
-      "integrity": "sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
-      "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz",
+      "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==",
       "cpu": [
         "ppc64"
       ],
@@ -289,9 +349,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz",
-      "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz",
+      "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==",
       "cpu": [
         "arm"
       ],
@@ -306,9 +366,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz",
-      "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz",
+      "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==",
       "cpu": [
         "arm64"
       ],
@@ -323,9 +383,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz",
-      "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz",
+      "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==",
       "cpu": [
         "x64"
       ],
@@ -340,9 +400,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz",
-      "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz",
+      "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==",
       "cpu": [
         "arm64"
       ],
@@ -357,9 +417,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz",
-      "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz",
+      "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==",
       "cpu": [
         "x64"
       ],
@@ -374,9 +434,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz",
-      "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==",
       "cpu": [
         "arm64"
       ],
@@ -391,9 +451,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz",
-      "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz",
+      "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==",
       "cpu": [
         "x64"
       ],
@@ -408,9 +468,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz",
-      "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz",
+      "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==",
       "cpu": [
         "arm"
       ],
@@ -425,9 +485,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz",
-      "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz",
+      "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==",
       "cpu": [
         "arm64"
       ],
@@ -442,9 +502,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz",
-      "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz",
+      "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==",
       "cpu": [
         "ia32"
       ],
@@ -459,9 +519,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz",
-      "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz",
+      "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==",
       "cpu": [
         "loong64"
       ],
@@ -476,9 +536,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz",
-      "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz",
+      "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==",
       "cpu": [
         "mips64el"
       ],
@@ -493,9 +553,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz",
-      "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz",
+      "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==",
       "cpu": [
         "ppc64"
       ],
@@ -510,9 +570,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz",
-      "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz",
+      "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==",
       "cpu": [
         "riscv64"
       ],
@@ -527,9 +587,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz",
-      "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz",
+      "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==",
       "cpu": [
         "s390x"
       ],
@@ -544,9 +604,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz",
-      "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz",
+      "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==",
       "cpu": [
         "x64"
       ],
@@ -561,9 +621,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz",
-      "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==",
       "cpu": [
         "arm64"
       ],
@@ -578,9 +638,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz",
-      "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz",
+      "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==",
       "cpu": [
         "x64"
       ],
@@ -595,9 +655,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz",
-      "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==",
       "cpu": [
         "arm64"
       ],
@@ -612,9 +672,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz",
-      "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz",
+      "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==",
       "cpu": [
         "x64"
       ],
@@ -629,9 +689,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz",
-      "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz",
+      "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==",
       "cpu": [
         "arm64"
       ],
@@ -646,9 +706,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz",
-      "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz",
+      "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==",
       "cpu": [
         "x64"
       ],
@@ -663,9 +723,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz",
-      "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz",
+      "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==",
       "cpu": [
         "arm64"
       ],
@@ -680,9 +740,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz",
-      "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz",
+      "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==",
       "cpu": [
         "ia32"
       ],
@@ -697,9 +757,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz",
-      "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz",
+      "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==",
       "cpu": [
         "x64"
       ],
@@ -713,6 +773,16 @@
         "node": ">=18"
       }
     },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
@@ -720,6 +790,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "node_modules/@monsterbitar/isomorphic-ws": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@monsterbitar/isomorphic-ws/-/isomorphic-ws-5.3.1.tgz",
@@ -729,39 +810,24 @@
         "ws": "*"
       }
     },
-    "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.2.tgz",
-      "integrity": "sha512-sNXv5oLJ7ob93xkZ1XnxisYhGYXfaG9f65/ZgYuAu3qt7b3NadcOEhLvx28hv31PgX8SZJRYrAIPQilQmFpLVw==",
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.2.tgz",
+      "integrity": "sha512-dnlp69efPPg6Uaw2dVqzWRfAWRnYVb1XJ8CyyhIbZeaq4CA5/mLeZ1IEt9QqQxmbdvagjLIm2ZL8BxXv5lH4Yw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "dependencies": {
-        "@tybys/wasm-util": "^0.10.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Brooooooklyn"
-      },
-      "peerDependencies": {
-        "@emnapi/core": "^1.7.1",
-        "@emnapi/runtime": "^1.7.1"
-      }
+      "os": [
+        "android"
+      ]
     },
-    "node_modules/@oxc-project/types": {
-      "version": "0.122.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.122.0.tgz",
-      "integrity": "sha512-oLAl5kBpV4w69UtFZ9xqcmTi+GENWOcPF7FCrczTiBbmC0ibXxCwyvZGbO39rCVEuLGAZM84DH0pUIyyv/YJzA==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/Boshen"
-      }
-    },
-    "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-pv1y2Fv0JybcykuiiD3qBOBdz6RteYojRFY1d+b95WVuzx211CRh+ytI/+9iVyWQ6koTh5dawe4S/yRfOFjgaA==",
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.2.tgz",
+      "integrity": "sha512-OqZTwDRDchGRHHm/hwLOL7uVPB9aUvI0am/eQuWMNyFHf5PSEQmyEeYYheA0EPPKUO/l0uigCp+iaTjoLjVoHg==",
       "cpu": [
         "arm64"
       ],
@@ -770,15 +836,12 @@
       "optional": true,
       "os": [
         "android"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-cFYr6zTG/3PXXF3pUO+umXxt1wkRK/0AYT8lDwuqvRC+LuKYWSAQAQZjCWDQpAH172ZV6ieYrNnFzVVcnSflAg==",
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.2.tgz",
+      "integrity": "sha512-UwRE7CGpvSVEQS8gUMBe1uADWjNnVgP3Iusyda1nSRwNDCsRjnGc7w6El6WLQsXmZTbLZx9cecegumcitNfpmA==",
       "cpu": [
         "arm64"
       ],
@@ -787,15 +850,12 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-ZCsYknnHzeXYps0lGBz8JrF37GpE9bFVefrlmDrAQhOEi4IOIlcoU1+FwHEtyXGx2VkYAvhu7dyBf75EJQffBw==",
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.2.tgz",
+      "integrity": "sha512-gjEtURKLCC5VXm1I+2i1u9OhxFsKAQJKTVB8WvDAHF+oZlq0GTVFOlTlO1q3AlCTE/DF32c16ESvfgqR7343/g==",
       "cpu": [
         "x64"
       ],
@@ -804,15 +864,26 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-dMLeprcVsyJsKolRXyoTH3NL6qtsT0Y2xeuEA8WQJquWFXkEC4bcu1rLZZSnZRMtAqwtrF/Ib9Ddtpa/Gkge9Q==",
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.2.tgz",
+      "integrity": "sha512-Bcl6CYDeAgE70cqZaMojOi/eK63h5Me97ZqAQoh77VPjMysA/4ORQBRGo3rRy45x4MzVlU9uZxs8Uwy7ZaKnBw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.2.tgz",
+      "integrity": "sha512-LU+TPda3mAE2QB0/Hp5VyeKJivpC6+tlOXd1VMoXV/YFMvk/MNk5iXeBfB4MQGRWyOYVJ01625vjkr0Az98OJQ==",
       "cpu": [
         "x64"
       ],
@@ -821,15 +892,12 @@
       "optional": true,
       "os": [
         "freebsd"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.12.tgz",
-      "integrity": "sha512-YqWjAgGC/9M1lz3GR1r1rP79nMgo3mQiiA+Hfo+pvKFK1fAJ1bCi0ZQVh8noOqNacuY1qIcfyVfP6HoyBRZ85Q==",
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.2.tgz",
+      "integrity": "sha512-2QxQrM+KQ7DAW4o22j+XZ6RKdxjLD7BOWTP0Bv0tmjdyhXSsr2Ul1oJDQqh9Zf5qOwTuTc7Ek83mOFaKnodPjg==",
       "cpu": [
         "arm"
       ],
@@ -838,15 +906,26 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-/I5AS4cIroLpslsmzXfwbe5OmWvSsrFuEw3mwvbQ1kDxJ822hFHIx+vsN/TAzNVyepI/j/GSzrtCIwQPeKCLIg==",
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.2.tgz",
+      "integrity": "sha512-TbziEu2DVsTEOPif2mKWkMeDMLoYjx95oESa9fkQQK7r/Orta0gnkcDpzwufEcAO2BLBsD7mZkXGFqEdMRRwfw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.2.tgz",
+      "integrity": "sha512-bO/rVDiDUuM2YfuCUwZ1t1cP+/yqjqz+Xf2VtkdppefuOFS2OSeAfgafaHNkFn0t02hEyXngZkxtGqXcXwO8Rg==",
       "cpu": [
         "arm64"
       ],
@@ -855,15 +934,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.12.tgz",
-      "integrity": "sha512-V6/wZztnBqlx5hJQqNWwFdxIKN0m38p8Jas+VoSfgH54HSj9tKTt1dZvG6JRHcjh6D7TvrJPWFGaY9UBVOaWPw==",
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.2.tgz",
+      "integrity": "sha512-hr26p7e93Rl0Za+JwW7EAnwAvKkehh12BU1Llm9Ykiibg4uIr2rbpxG9WCf56GuvidlTG9KiiQT/TXT1yAWxTA==",
       "cpu": [
         "arm64"
       ],
@@ -872,15 +948,40 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-AP3E9BpcUYliZCxa3w5Kwj9OtEVDYK6sVoUzy4vTOJsjPOgdaJZKFmN4oOlX0Wp0RPV2ETfmIra9x1xuayFB7g==",
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.2.tgz",
+      "integrity": "sha512-pOjB/uSIyDt+ow3k/RcLvUAOGpysT2phDn7TTUB3n75SlIgZzM6NKAqlErPhoFU+npgY3/n+2HYIQVbF70P9/A==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.2.tgz",
+      "integrity": "sha512-2/w+q8jszv9Ww1c+6uJT3OwqhdmGP2/4T17cu8WuwyUuuaCDDJ2ojdyYwZzCxx0GcsZBhzi3HmH+J5pZNXnd+Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.2.tgz",
+      "integrity": "sha512-11+aL5vKheYgczxtPVVRhdptAM2H7fcDR5Gw4/bTcteuZBlH4oP9f5s9zYO9aGZvoGeBpqXI/9TZZihZ609wKw==",
       "cpu": [
         "ppc64"
       ],
@@ -889,15 +990,54 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-nWwpvUSPkoFmZo0kQazZYOrT7J5DGOJ/+QHHzjvNlooDZED8oH82Yg67HvehPPLAg5fUff7TfWFHQS8IV1n3og==",
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.2.tgz",
+      "integrity": "sha512-i16fokAGK46IVZuV8LIIwMdtqhin9hfYkCh8pf8iC3QU3LpwL+1FSFGej+O7l3E/AoknL6Dclh2oTdnRMpTzFQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.2.tgz",
+      "integrity": "sha512-49FkKS6RGQoriDSK/6E2GkAsAuU5kETFCh7pG4yD/ylj9rKhTmO3elsnmBvRD4PgJPds5W2PkhC82aVwmUcJ7A==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.2.tgz",
+      "integrity": "sha512-mjYNkHPfGpUR00DuM1ZZIgs64Hpf4bWcz9Z41+4Q+pgDx73UwWdAYyf6EG/lRFldmdHHzgrYyge5akFUW0D3mQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.2.tgz",
+      "integrity": "sha512-ALyvJz965BQk8E9Al/JDKKDLH2kfKFLTGMlgkAbbYtZuJt9LU8DW3ZoDMCtQpXAltZxwBHevXz5u+gf0yA0YoA==",
       "cpu": [
         "s390x"
       ],
@@ -906,15 +1046,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-RNrafz5bcwRy+O9e6P8Z/OCAJW/A+qtBczIqVYwTs14pf4iV1/+eKEjdOUta93q2TsT/FI0XYDP3TCky38LMAg==",
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.2.tgz",
+      "integrity": "sha512-UQjrkIdWrKI626Du8lCQ6MJp/6V1LAo2bOK9OTu4mSn8GGXIkPXk/Vsp4bLHCd9Z9Iz2OTEaokUE90VweJgIYQ==",
       "cpu": [
         "x64"
       ],
@@ -923,15 +1060,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.12.tgz",
-      "integrity": "sha512-Jpw/0iwoKWx3LJ2rc1yjFrj+T7iHZn2JDg1Yny1ma0luviFS4mhAIcd1LFNxK3EYu3DHWCps0ydXQ5i/rrJ2ig==",
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.2.tgz",
+      "integrity": "sha512-bTsRGj6VlSdn/XD4CGyzMnzaBs9bsRxy79eTqTCBsA8TMIEky7qg48aPkvJvFe1HyzQ5oMZdg7AnVlWQSKLTnw==",
       "cpu": [
         "x64"
       ],
@@ -940,15 +1074,26 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-vRugONE4yMfVn0+7lUKdKvN4D5YusEiPilaoO2sgUWpCvrncvWgPMzK00ZFFJuiPgLwgFNP5eSiUlv2tfc+lpA==",
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.2.tgz",
+      "integrity": "sha512-6d4Z3534xitaA1FcMWP7mQPq5zGwBmGbhphh2DwaA1aNIXUu3KTOfwrWpbwI4/Gr0uANo7NTtaykFyO2hPuFLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.2.tgz",
+      "integrity": "sha512-NetAg5iO2uN7eB8zE5qrZ3CSil+7IJt4WDFLcC75Ymywq1VZVD6qJ6EvNLjZ3rEm6gB7XW5JdT60c6MN35Z85Q==",
       "cpu": [
         "arm64"
       ],
@@ -957,32 +1102,12 @@
       "optional": true,
       "os": [
         "openharmony"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.12.tgz",
-      "integrity": "sha512-ykGiLr/6kkiHc0XnBfmFJuCjr5ZYKKofkx+chJWDjitX+KsJuAmrzWhwyOMSHzPhzOHOy7u9HlFoa5MoAOJ/Zg==",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@napi-rs/wasm-runtime": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.12.tgz",
-      "integrity": "sha512-5eOND4duWkwx1AzCxadcOrNeighiLwMInEADT0YM7xeEOOFcovWZCq8dadXgcRHSf3Ulh1kFo/qvzoFiCLOL1Q==",
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.2.tgz",
+      "integrity": "sha512-NCYhOotpgWZ5kdxCZsv6Iudx0wX8980Q/oW4pNFNihpBKsDbEA1zpkfxJGC0yugsUuyDZ7gL37dbzwhR0VI7pQ==",
       "cpu": [
         "arm64"
       ],
@@ -991,15 +1116,26 @@
       "optional": true,
       "os": [
         "win32"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.12.tgz",
-      "integrity": "sha512-PyqoipaswDLAZtot351MLhrlrh6lcZPo2LSYE+VDxbVk24LVKAGOuE4hb8xZQmrPAuEtTZW8E6D2zc5EUZX4Lw==",
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.2.tgz",
+      "integrity": "sha512-RXsaOqXxfoUBQoOgvmmijVxJnW2IGB0eoMO7F8FAjaj0UTywUO/luSqimWBJn04WNgUkeNhh7fs7pESXajWmkg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.2.tgz",
+      "integrity": "sha512-qdAzEULD+/hzObedtmV6iBpdL5TIbKVztGiK7O3/KYSf+HIzU257+MX1EXJcyIiDbMAqmbwaufcYPvyRryeZtA==",
       "cpu": [
         "x64"
       ],
@@ -1008,17 +1144,21 @@
       "optional": true,
       "os": [
         "win32"
-      ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
+      ]
     },
-    "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.12.tgz",
-      "integrity": "sha512-HHMwmarRKvoFsJorqYlFeFRzXZqCt2ETQlEDOb9aqssrnVBB1/+xgTGtuTrIk5vzLNX1MjMtTf7W9z3tsSbrxw==",
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.2.tgz",
+      "integrity": "sha512-Nd/SgG27WoA9e+/TdK74KnHz852TLa94ovOYySo/yMPuTmpckK/jIF2jSwS3g7ELSKXK13/cVdmg1Z/DaCWKxA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
     "node_modules/@sec-ant/readable-stream": {
       "version": "0.4.1",
@@ -1045,17 +1185,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@tybys/wasm-util": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
-      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@types/better-sqlite3": {
       "version": "7.6.13",
       "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz",
@@ -1129,6 +1258,37 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@vitest/coverage-v8": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.2.tgz",
+      "integrity": "sha512-sPK//PHO+kAkScb8XITeB1bf7fsk85Km7+rt4eeuRR3VS1/crD47cmV5wicisJmjNdfeokTZwjMk4Mj2d58Mgg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^1.0.2",
+        "@vitest/utils": "4.1.2",
+        "ast-v8-to-istanbul": "^1.0.0",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-reports": "^3.2.0",
+        "magicast": "^0.5.2",
+        "obug": "^2.1.1",
+        "std-env": "^4.0.0-rc.1",
+        "tinyrainbow": "^3.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/browser": "4.1.2",
+        "vitest": "4.1.2"
+      },
+      "peerDependenciesMeta": {
+        "@vitest/browser": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@vitest/expect": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.2.tgz",
@@ -1242,6 +1402,10 @@
         "url": "https://opencollective.com/vitest"
       }
     },
+    "node_modules/@xo-cash/crypto": {
+      "resolved": "../crypto",
+      "link": true
+    },
     "node_modules/@xo-cash/engine": {
       "resolved": "../engine",
       "link": true
@@ -1307,6 +1471,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.0.tgz",
+      "integrity": "sha512-1fSfIwuDICFA4LKkCzRPO7F0hzFf0B7+Xqrl27ynQaa+Rh0e1Es0v6kWHPott3lU10AyAr7oKHa65OppjLn3Rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.31",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^10.0.0"
+      }
+    },
     "node_modules/async-mutex": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
@@ -1788,9 +1964,9 @@
       ]
     },
     "node_modules/esbuild": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
-      "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz",
+      "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1801,32 +1977,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.2",
-        "@esbuild/android-arm": "0.27.2",
-        "@esbuild/android-arm64": "0.27.2",
-        "@esbuild/android-x64": "0.27.2",
-        "@esbuild/darwin-arm64": "0.27.2",
-        "@esbuild/darwin-x64": "0.27.2",
-        "@esbuild/freebsd-arm64": "0.27.2",
-        "@esbuild/freebsd-x64": "0.27.2",
-        "@esbuild/linux-arm": "0.27.2",
-        "@esbuild/linux-arm64": "0.27.2",
-        "@esbuild/linux-ia32": "0.27.2",
-        "@esbuild/linux-loong64": "0.27.2",
-        "@esbuild/linux-mips64el": "0.27.2",
-        "@esbuild/linux-ppc64": "0.27.2",
-        "@esbuild/linux-riscv64": "0.27.2",
-        "@esbuild/linux-s390x": "0.27.2",
-        "@esbuild/linux-x64": "0.27.2",
-        "@esbuild/netbsd-arm64": "0.27.2",
-        "@esbuild/netbsd-x64": "0.27.2",
-        "@esbuild/openbsd-arm64": "0.27.2",
-        "@esbuild/openbsd-x64": "0.27.2",
-        "@esbuild/openharmony-arm64": "0.27.2",
-        "@esbuild/sunos-x64": "0.27.2",
-        "@esbuild/win32-arm64": "0.27.2",
-        "@esbuild/win32-ia32": "0.27.2",
-        "@esbuild/win32-x64": "0.27.2"
+        "@esbuild/aix-ppc64": "0.28.0",
+        "@esbuild/android-arm": "0.28.0",
+        "@esbuild/android-arm64": "0.28.0",
+        "@esbuild/android-x64": "0.28.0",
+        "@esbuild/darwin-arm64": "0.28.0",
+        "@esbuild/darwin-x64": "0.28.0",
+        "@esbuild/freebsd-arm64": "0.28.0",
+        "@esbuild/freebsd-x64": "0.28.0",
+        "@esbuild/linux-arm": "0.28.0",
+        "@esbuild/linux-arm64": "0.28.0",
+        "@esbuild/linux-ia32": "0.28.0",
+        "@esbuild/linux-loong64": "0.28.0",
+        "@esbuild/linux-mips64el": "0.28.0",
+        "@esbuild/linux-ppc64": "0.28.0",
+        "@esbuild/linux-riscv64": "0.28.0",
+        "@esbuild/linux-s390x": "0.28.0",
+        "@esbuild/linux-x64": "0.28.0",
+        "@esbuild/netbsd-arm64": "0.28.0",
+        "@esbuild/netbsd-x64": "0.28.0",
+        "@esbuild/openbsd-arm64": "0.28.0",
+        "@esbuild/openbsd-x64": "0.28.0",
+        "@esbuild/openharmony-arm64": "0.28.0",
+        "@esbuild/sunos-x64": "0.28.0",
+        "@esbuild/win32-arm64": "0.28.0",
+        "@esbuild/win32-ia32": "0.28.0",
+        "@esbuild/win32-x64": "0.28.0"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -2028,6 +2204,23 @@
       "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
       "license": "MIT"
     },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/human-signals": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.1.tgz",
@@ -2297,266 +2490,51 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "license": "ISC"
     },
-    "node_modules/lightningcss": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
-      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
-      "license": "MPL-2.0",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "detect-libc": "^2.0.3"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-android-arm64": "1.32.0",
-        "lightningcss-darwin-arm64": "1.32.0",
-        "lightningcss-darwin-x64": "1.32.0",
-        "lightningcss-freebsd-x64": "1.32.0",
-        "lightningcss-linux-arm-gnueabihf": "1.32.0",
-        "lightningcss-linux-arm64-gnu": "1.32.0",
-        "lightningcss-linux-arm64-musl": "1.32.0",
-        "lightningcss-linux-x64-gnu": "1.32.0",
-        "lightningcss-linux-x64-musl": "1.32.0",
-        "lightningcss-win32-arm64-msvc": "1.32.0",
-        "lightningcss-win32-x64-msvc": "1.32.0"
+        "node": ">=10"
       }
     },
-    "node_modules/lightningcss-android-arm64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
-      "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
       "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
-      "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/js-tokens": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz",
+      "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==",
       "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-darwin-x64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
-      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
-      "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
-      "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
-      "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
-      "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
-      "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
-      "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
-      "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
-      "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+      "license": "MIT"
     },
     "node_modules/locate-path": {
       "version": "5.0.0",
@@ -2586,6 +2564,34 @@
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
+    "node_modules/magicast": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.2.tgz",
+      "integrity": "sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
+        "source-map-js": "^1.2.1"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -2840,9 +2846,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.8",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
-      "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
+      "version": "8.5.10",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz",
+      "integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==",
       "dev": true,
       "funding": [
         {
@@ -3063,38 +3069,49 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "license": "ISC"
     },
-    "node_modules/rolldown": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.12.tgz",
-      "integrity": "sha512-yP4USLIMYrwpPHEFB5JGH1uxhcslv6/hL0OyvTuY+3qlOSJvZ7ntYnoWpehBxufkgN0cvXxppuTu5hHa/zPh+A==",
+    "node_modules/rollup": {
+      "version": "4.60.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.2.tgz",
+      "integrity": "sha512-J9qZyW++QK/09NyN/zeO0dG/1GdGfyp9lV8ajHnRVLfo/uFsbji5mHnDgn/qYdUHyCkM2N+8VyspgZclfAh0eQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@oxc-project/types": "=0.122.0",
-        "@rolldown/pluginutils": "1.0.0-rc.12"
+        "@types/estree": "1.0.8"
       },
       "bin": {
-        "rolldown": "bin/cli.mjs"
+        "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": "^20.19.0 || >=22.12.0"
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.0.0-rc.12",
-        "@rolldown/binding-darwin-arm64": "1.0.0-rc.12",
-        "@rolldown/binding-darwin-x64": "1.0.0-rc.12",
-        "@rolldown/binding-freebsd-x64": "1.0.0-rc.12",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.12",
-        "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.12",
-        "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-x64-musl": "1.0.0-rc.12",
-        "@rolldown/binding-openharmony-arm64": "1.0.0-rc.12",
-        "@rolldown/binding-wasm32-wasi": "1.0.0-rc.12",
-        "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.12",
-        "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.12"
+        "@rollup/rollup-android-arm-eabi": "4.60.2",
+        "@rollup/rollup-android-arm64": "4.60.2",
+        "@rollup/rollup-darwin-arm64": "4.60.2",
+        "@rollup/rollup-darwin-x64": "4.60.2",
+        "@rollup/rollup-freebsd-arm64": "4.60.2",
+        "@rollup/rollup-freebsd-x64": "4.60.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.60.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.60.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.60.2",
+        "@rollup/rollup-linux-arm64-musl": "4.60.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.60.2",
+        "@rollup/rollup-linux-loong64-musl": "4.60.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.60.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.60.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.60.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.60.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.60.2",
+        "@rollup/rollup-linux-x64-gnu": "4.60.2",
+        "@rollup/rollup-linux-x64-musl": "4.60.2",
+        "@rollup/rollup-openbsd-x64": "4.60.2",
+        "@rollup/rollup-openharmony-arm64": "4.60.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.60.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.60.2",
+        "@rollup/rollup-win32-x64-gnu": "4.60.2",
+        "@rollup/rollup-win32-x64-msvc": "4.60.2",
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/safe-buffer": {
@@ -3340,6 +3357,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/system-architecture": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/system-architecture/-/system-architecture-0.1.0.tgz",
@@ -3450,6 +3480,490 @@
         "fsevents": "~2.3.3"
       }
     },
+    "node_modules/tsx/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
+      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
+      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
+      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
+      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
+      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
+      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
+      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
+      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
+      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
+      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
+      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
+      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
+      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
+      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
+      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
+      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
+      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
+      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
+      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
+      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
+      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/esbuild": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
+      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.27.7",
+        "@esbuild/android-arm": "0.27.7",
+        "@esbuild/android-arm64": "0.27.7",
+        "@esbuild/android-x64": "0.27.7",
+        "@esbuild/darwin-arm64": "0.27.7",
+        "@esbuild/darwin-x64": "0.27.7",
+        "@esbuild/freebsd-arm64": "0.27.7",
+        "@esbuild/freebsd-x64": "0.27.7",
+        "@esbuild/linux-arm": "0.27.7",
+        "@esbuild/linux-arm64": "0.27.7",
+        "@esbuild/linux-ia32": "0.27.7",
+        "@esbuild/linux-loong64": "0.27.7",
+        "@esbuild/linux-mips64el": "0.27.7",
+        "@esbuild/linux-ppc64": "0.27.7",
+        "@esbuild/linux-riscv64": "0.27.7",
+        "@esbuild/linux-s390x": "0.27.7",
+        "@esbuild/linux-x64": "0.27.7",
+        "@esbuild/netbsd-arm64": "0.27.7",
+        "@esbuild/netbsd-x64": "0.27.7",
+        "@esbuild/openbsd-arm64": "0.27.7",
+        "@esbuild/openbsd-x64": "0.27.7",
+        "@esbuild/openharmony-arm64": "0.27.7",
+        "@esbuild/sunos-x64": "0.27.7",
+        "@esbuild/win32-arm64": "0.27.7",
+        "@esbuild/win32-ia32": "0.27.7",
+        "@esbuild/win32-x64": "0.27.7"
+      }
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -3513,23 +4027,24 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.3.tgz",
-      "integrity": "sha512-B9ifbFudT1TFhfltfaIPgjo9Z3mDynBTJSUYxTjOQruf/zHH+ezCQKcoqO+h7a9Pw9Nm/OtlXAiGT1axBgwqrQ==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz",
+      "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "lightningcss": "^1.32.0",
-        "picomatch": "^4.0.4",
-        "postcss": "^8.5.8",
-        "rolldown": "1.0.0-rc.12",
-        "tinyglobby": "^0.2.15"
+        "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
+        "postcss": "^8.5.3",
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^20.19.0 || >=22.12.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -3538,15 +4053,14 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^20.19.0 || >=22.12.0",
-        "@vitejs/devtools": "^0.1.0",
-        "esbuild": "^0.27.0",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
         "jiti": ">=1.21.0",
-        "less": "^4.0.0",
-        "sass": "^1.70.0",
-        "sass-embedded": "^1.70.0",
-        "stylus": ">=0.54.8",
-        "sugarss": "^5.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
         "terser": "^5.16.0",
         "tsx": "^4.8.1",
         "yaml": "^2.4.2"
@@ -3555,18 +4069,15 @@
         "@types/node": {
           "optional": true
         },
-        "@vitejs/devtools": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
         "jiti": {
           "optional": true
         },
         "less": {
           "optional": true
         },
+        "lightningcss": {
+          "optional": true
+        },
         "sass": {
           "optional": true
         },
@@ -3590,6 +4101,490 @@
         }
       }
     },
+    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
+      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/esbuild": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
+      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.12",
+        "@esbuild/android-arm": "0.25.12",
+        "@esbuild/android-arm64": "0.25.12",
+        "@esbuild/android-x64": "0.25.12",
+        "@esbuild/darwin-arm64": "0.25.12",
+        "@esbuild/darwin-x64": "0.25.12",
+        "@esbuild/freebsd-arm64": "0.25.12",
+        "@esbuild/freebsd-x64": "0.25.12",
+        "@esbuild/linux-arm": "0.25.12",
+        "@esbuild/linux-arm64": "0.25.12",
+        "@esbuild/linux-ia32": "0.25.12",
+        "@esbuild/linux-loong64": "0.25.12",
+        "@esbuild/linux-mips64el": "0.25.12",
+        "@esbuild/linux-ppc64": "0.25.12",
+        "@esbuild/linux-riscv64": "0.25.12",
+        "@esbuild/linux-s390x": "0.25.12",
+        "@esbuild/linux-x64": "0.25.12",
+        "@esbuild/netbsd-arm64": "0.25.12",
+        "@esbuild/netbsd-x64": "0.25.12",
+        "@esbuild/openbsd-arm64": "0.25.12",
+        "@esbuild/openbsd-x64": "0.25.12",
+        "@esbuild/openharmony-arm64": "0.25.12",
+        "@esbuild/sunos-x64": "0.25.12",
+        "@esbuild/win32-arm64": "0.25.12",
+        "@esbuild/win32-ia32": "0.25.12",
+        "@esbuild/win32-x64": "0.25.12"
+      }
+    },
     "node_modules/vitest": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.2.tgz",
diff --git a/package.json b/package.json
index 9b53085..e13bf89 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,19 @@
   "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.bundle.js"
+  },
   "scripts": {
     "dev": "SYNC_SERVER_URL=https://sync.xo.harvmaster.com tsx src/index.ts",
-    "build": "tsc",
+    "build": "tsc && npm run build:autocomplete",
+    "build:autocomplete": "node scripts/build-autocomplete.mjs",
     "start": "SYNC_SERVER_URL=https://sync.xo.harvmaster.com node dist/index.js",
-    "test": "vitest --run",
+    "test": "vitest --run --passWithNoTests",
     "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
+    "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",
@@ -27,6 +33,7 @@
   "dependencies": {
     "@bitauth/libauth": "^3.0.0",
     "@electrum-cash/protocol": "^2.3.1",
+    "@xo-cash/crypto": "file:../crypto",
     "@xo-cash/engine": "file:../engine",
     "@xo-cash/state": "file:../state",
     "@xo-cash/templates": "file:../templates",
@@ -44,6 +51,8 @@
     "@types/node": "^25.0.10",
     "@types/qrcode": "^1.5.6",
     "@types/react": "^19.2.14",
+    "@vitest/coverage-v8": "^4.1.2",
+    "esbuild": "^0.28.0",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.2"
diff --git a/scripts/build-autocomplete.mjs b/scripts/build-autocomplete.mjs
new file mode 100644
index 0000000..30b1370
--- /dev/null
+++ b/scripts/build-autocomplete.mjs
@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+/**
+ * Build script for xo-complete autocomplete helper.
+ * 
+ * Bundles the autocomplete script with all dependencies into a single file
+ * for faster startup time. This avoids the ~600ms module import overhead
+ * that occurs with dynamic ESM imports.
+ */
+
+import * as esbuild from "esbuild";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const projectRoot = join(__dirname, "..");
+
+async function build() {
+  try {
+    const result = await esbuild.build({
+      entryPoints: [join(projectRoot, "src/cli/autocomplete/complete.ts")],
+      bundle: true,
+      platform: "node",
+      target: "node20",
+      format: "esm",
+      outfile: join(projectRoot, "dist/cli/autocomplete/complete.bundle.js"),
+      
+      // Mark modules as external that either have native components or bundling issues
+      // We keep heavy deps external, and also keep offline-engine external so it stays
+      // as a dynamic import (it pulls in the heavy engine dependencies)
+      external: [
+        "better-sqlite3",
+        "fsevents",
+        "@bitauth/libauth",
+        "@xo-cash/*",
+        "@electrum-cash/*",
+        "./offline-engine.js",
+      ],
+      
+      // Generate source maps for debugging
+      sourcemap: true,
+      
+      // Minify for slightly smaller bundle
+      minify: false,
+      
+      // Keep names for better error messages
+      keepNames: true,
+      
+      // Log build info
+      logLevel: "info",
+    });
+
+    console.log("Autocomplete bundle built successfully!");
+    if (result.warnings.length > 0) {
+      console.warn("Warnings:", result.warnings);
+    }
+  } catch (error) {
+    console.error("Build failed:", error);
+    process.exit(1);
+  }
+}
+
+build();
diff --git a/scripts/template-to-json.ts b/scripts/template-to-json.ts
new file mode 100644
index 0000000..e8b3020
--- /dev/null
+++ b/scripts/template-to-json.ts
@@ -0,0 +1,102 @@
+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();
diff --git a/src/app.ts b/src/app.ts
index e3de7e7..5c1019b 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -3,9 +3,11 @@
  * Simplified to render TUI immediately and let it handle AppService creation.
  */
 
+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,13 +48,14 @@ 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 ?? "./",
+      databasePath: config.databasePath ?? dataDir,
       databaseFilename: config.databaseFilename ?? "xo-wallet.db",
       invitationStoragePath:
-        config.invitationStoragePath ?? "./xo-invitations.db",
+        config.invitationStoragePath ?? join(dataDir, "xo-invitations.db"),
     };
 
     console.log("Full config:", fullConfig);
diff --git a/src/cli/README.md b/src/cli/README.md
index a7b2f9f..bf585df 100644
--- a/src/cli/README.md
+++ b/src/cli/README.md
@@ -2,112 +2,135 @@
 
 Command-line interface for the XO Engine. Create wallets, manage templates, build invitations, sign transactions, and broadcast them to the Bitcoin Cash network.
 
-## Getting Started
+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
-# Run any command via tsx from the cli/ directory
-npx tsx src/cli/index.ts <command> [options]
+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
 
-Before using most commands you need a mnemonic wallet file.
-
 ```bash
-# Generate a new mnemonic and save it to a file
+# 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 available mnemonic files in the current directory
+# List mnemonic basenames (use with -m)
 xo-cli mnemonic list
 ```
 
-Mnemonic files are stored in the working directory with the prefix `mnemonic-`.
+**Options:** `-o <filename>` — basename only; file is written under the global mnemonics directory.
 
 ### Wallet Persistence
 
-The first time you pass `-m <file>`, the choice is saved to `.xo-cli-wallet`. Subsequent commands will use that wallet automatically so you can omit `-m`.
+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
-# First run — pass the wallet explicitly
 xo-cli resource list -m mnemonic-nuclear
-
-# All future runs remember the wallet
 xo-cli resource list
 ```
 
-To switch wallets, pass `-m` again with a different file.
-
-## Global Options
+## Global Options (`xo-cli`)
 
 | Flag | Description |
-|---|---|
-| `-m`, `--mnemonic-file <file>` | Mnemonic file to use (persisted after first use) |
-| `-v`, `--verbose` | Show detailed debug output |
-| `-h`, `--help` | Show help message |
+|------|-------------|
+| `-m`, `--mnemonic-file <file>` | Mnemonic file (basename, cwd-relative, or absolute) |
+| `-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                   # Generate a new mnemonic
-xo-cli mnemonic import <seed words...>   # Import a mnemonic from seed words
-xo-cli mnemonic list                     # List mnemonic files in cwd
+xo-cli mnemonic create
+xo-cli mnemonic import <seed words...>
+xo-cli mnemonic list
 ```
 
-**Options:**
-- `-o <filename>` — Custom output filename for the mnemonic file.
-
 ### `template` — Manage Templates
 
 ```bash
-xo-cli template import <template-file>                          # Import a template
-xo-cli template list                                            # List imported templates
-xo-cli template list <category> <template-id>                   # List items in a category
-xo-cli template inspect <category> <template-id> <field>        # Inspect a specific field
-xo-cli template set-default <template-file> <output-id> <role>  # Set default locking params
+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`
 
-**Example — discover what a template offers:**
-
-```bash
-xo-cli template import p2pkh-template.json
-xo-cli template list
-xo-cli template list action <template-identifier>
-```
+Template paths are resolved relative to the **current working directory**.
 
 ### `resource` — Manage UTXOs
 
 ```bash
-xo-cli resource list               # List unreserved (spendable) UTXOs
-xo-cli resource list reserved      # List UTXOs reserved by invitations
-xo-cli resource list all           # List all UTXOs (reserved + unreserved)
-xo-cli resource unreserve <txhash:vout>   # Unreserve a specific UTXO
-xo-cli resource unreserve-all             # Unreserve all reserved UTXOs
+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
 ```
 
-Each UTXO is displayed as `<txhash>:<vout> <sats> <outputId> (height <n>)`.
-
 ### `receive` — Generate a Receiving Address
 
 ```bash
 xo-cli receive <template-file> <output-identifier> [role-identifier]
 ```
 
-Generates a single-use BCH cash address from a template. If the role is omitted, the first available role is used.
-
-```bash
-xo-cli receive p2pkh-template.json receiveOutput receiver
-```
-
-### `invitation` — Build, Sign & Broadcast Transactions
-
-This is the core command for sending funds. An invitation goes through these stages: **create** → **sign** → **broadcast**.
+### `invitation` — Build, Sign & Broadcast
 
 ```bash
 xo-cli invitation create <template-file> <action-id> [options]
@@ -119,42 +142,24 @@ xo-cli invitation import <invitation-file>
 xo-cli invitation list
 ```
 
-#### Create / Append Options
+**Create / append options:**
 
 | Flag | Description |
-|---|---|
-| `-var-<name> <value>` | Set a template variable (kebab-case → camelCase) |
-| `--add-input <txhash:vout>` | Add UTXO input(s), comma-separated |
-| `--add-output <id>` | Override output(s) — **omit to auto-discover from template** |
-| `--auto-inputs` | Automatically select UTXOs to cover the required amount |
-| `-role <role>` | Role identifier for variable scoping and bytecode generation |
-| `--sign` | Auto-sign after all requirements are satisfied |
-| `--broadcast` | Auto-broadcast after signing (implies `--sign`) |
+|------|-------------|
+| `-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`) |
 
-When inputs are provided, a **change output is automatically added** if the input total exceeds the required amount + fee (500 sats). Change below the dust threshold (546 sats) is donated as fee.
+Invitation JSON files from `create` / `append` are written to the **current working directory**.
 
-Outputs are **auto-discovered from the template** when `--add-output` is omitted, so you typically don't need to specify them.
-
-#### Variable Naming
-
-Variable flags use kebab-case which maps to the template's camelCase identifiers:
-
-```
--var-transferred-satoshis 4678  →  transferredSatoshis = "4678"
--var-recipient-lockingscript <addr>  →  recipientLockingscript = "<addr>"
-```
-
-## Full Send Flow
-
-### One-Command Send (Recommended)
-
-With `--broadcast`, the entire create → sign → broadcast flow happens in a single invocation:
+### One-command send
 
 ```bash
-# 1. List UTXOs to pick an input
 xo-cli resource list
-
-# 2. Send in one shot
 xo-cli invitation create p2pkh-template.json sendSatoshis \
   -var-transferred-satoshis 4678 \
   -var-recipient-lockingscript "bitcoincash:qz..." \
@@ -163,72 +168,25 @@ xo-cli invitation create p2pkh-template.json sendSatoshis \
   --broadcast
 ```
 
-Output:
-
-```
-Invitation created: abc123.json (abc123)
-Invitation signed: abc123
-Transaction broadcast: <txid>
-```
-
-### Step-by-Step Send
-
-For multi-party transactions or debugging, you can run each step separately:
+### `xo-tui`
 
 ```bash
-# 1. Import template (only needed once)
-xo-cli template import p2pkh-template.json
-
-# 2. Check available UTXOs
-xo-cli resource list
-
-# 3. Create the invitation with variables and inputs
-xo-cli invitation create p2pkh-template.json sendSatoshis \
-  -var-transferred-satoshis 4678 \
-  -var-recipient-lockingscript "bitcoincash:qz..." \
-  --add-input <txhash>:<vout> \
-  -role sender
-
-# 4. Sign
-xo-cli invitation sign <invitation-id>
-
-# 5. Broadcast
-xo-cli invitation broadcast <invitation-id>
+xo-tui
 ```
 
-### Using Auto-Inputs
-
-Instead of manually selecting UTXOs, let the CLI pick them:
-
-```bash
-xo-cli invitation create p2pkh-template.json sendSatoshis \
-  -var-transferred-satoshis 4678 \
-  -var-recipient-lockingscript "bitcoincash:qz..." \
-  --auto-inputs \
-  -role sender \
-  --broadcast
-```
+Launches the full-screen wallet UI; uses the same global data directory unless overridden by env vars.
 
 ## Shell Completions
 
-Tab-completion is available for bash, zsh, and fish:
-
 ```bash
-# Bash
 eval "$(xo-cli completions bash)"
-
-# Zsh
 eval "$(xo-cli completions zsh)"
-
-# Fish
 xo-cli completions fish | source
 ```
 
 ## File Conventions
 
-| File/Pattern | Purpose |
-|---|---|
-| `mnemonic-*` | Wallet mnemonic files |
-| `.xo-cli-wallet` | Persisted wallet selection |
-| `*.json` | Invitation files (saved by create/append) |
-| `*.db` | Engine database files |
+| Location | Purpose |
+|----------|---------|
+| `~/.config/xo-cli/` | Global wallet state |
+| `./` (cwd) | Templates, invitation JSON, explicit paths |
diff --git a/src/cli/autocomplete/complete.ts b/src/cli/autocomplete/complete.ts
new file mode 100644
index 0000000..ab592f9
--- /dev/null
+++ b/src/cli/autocomplete/complete.ts
@@ -0,0 +1,298 @@
+#!/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
+ *   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();
+  }
+}
+
+/**
+ * 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 { generateTemplateIdentifier } = await getEngineModule();
+
+  const engine = await tryCreateOfflineEngine(mnemonic, {
+    databasePath: getDataDir(),
+    databaseFilename: "xo-wallet.db",
+  });
+
+  if (!engine) return;
+
+  try {
+    // Try to resolve the template by name or ID
+    const templates = await engine.listImportedTemplates();
+    let template = templates.find(
+      (t) => t.name === templateQuery || generateTemplateIdentifier(t) === templateQuery,
+    );
+
+    if (!template) {
+      // Try partial match on name
+      template = templates.find((t) =>
+        t.name?.toLowerCase().includes(templateQuery.toLowerCase()),
+      );
+    }
+
+    if (template && template.actions) {
+      const actions = Object.keys(template.actions);
+      outputCompletions(actions, 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 "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);
+});
diff --git a/src/cli/autocomplete/completions.ts b/src/cli/autocomplete/completions.ts
new file mode 100644
index 0000000..8f09a9f
--- /dev/null
+++ b/src/cli/autocomplete/completions.ts
@@ -0,0 +1,568 @@
+/**
+ * Shell completion script generation.
+ *
+ * Defines the CLI command tree in one place and generates
+ * bash/zsh/fish completion scripts from it. Users source the output
+ * in their shell profile for tab-completion support.
+ *
+ * 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
+ */
+
+/**
+ * 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"];
+
+/**
+ * Generates a bash completion script with dynamic completion support.
+ * @param binName - The name of the CLI binary (used in the `complete` registration).
+ */
+export function generateBashCompletions(binName: string): string {
+  const commands = Object.keys(COMMAND_TREE).join(" ");
+  const options = GLOBAL_OPTIONS.join(" ");
+  const funcName = binName.replace(/-/g, "_");
+
+  return `# bash completion for ${binName}
+# Add to ~/.bashrc:  eval "$(${binName} 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 ${binName} &>/dev/null; then
+  __xo_complete_bin="$(dirname "$(command -v ${binName})")/xo-complete"
+fi
+
+# Wrapper to call xo-complete helper
+__xo_complete() {
+  [[ -n "\${__xo_complete_bin}" ]] && "\${__xo_complete_bin}" "$@" 2>/dev/null
+}
+
+_${funcName}_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.join(" ")}" -- "\${cur}"))
+      fi
+      ;;
+
+    template)
+      if [[ -z "\${subcmd}" ]]; then
+        COMPREPLY=($(compgen -W "${TEMPLATE_SUBS.join(" ")}" -- "\${cur}"))
+      elif [[ "\${subcmd}" == "list" || "\${subcmd}" == "inspect" ]]; then
+        # template list/inspect <category> <template> [field] - category first, then template
+        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
+        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.join(" ")}" -- "\${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.join(" ")}" -- "\${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 _${funcName}_completions ${binName}
+`;
+}
+
+/**
+ * Generates a zsh completion script with dynamic completion support.
+ * @param binName - The name of the CLI binary.
+ */
+export function generateZshCompletions(binName: string): string {
+  const commands = Object.keys(COMMAND_TREE).join(" ");
+  const options = GLOBAL_OPTIONS.join(" ");
+  const funcName = binName.replace(/-/g, "_");
+
+  return `# zsh completion for ${binName}
+# Add to ~/.zshrc:  eval "$(${binName} 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[${binName}] )); then
+  __xo_complete_bin="\${commands[${binName}]:h}/xo-complete"
+fi
+
+# Wrapper to call xo-complete helper
+__xo_complete() {
+  [[ -n "\${__xo_complete_bin}" ]] && "\${__xo_complete_bin}" "$@" 2>/dev/null
+}
+
+_${funcName}_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.join(" ")}
+      fi
+      ;;
+
+    template)
+      if [[ -z "\${subcmd}" ]]; then
+        compadd -- ${TEMPLATE_SUBS.join(" ")}
+      elif [[ "\${subcmd}" == "list" || "\${subcmd}" == "inspect" ]]; then
+        # template list/inspect <category> <template> - category first
+        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
+        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.join(" ")}
+      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.join(" ")}
+      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 _${funcName}_completions ${binName}
+`;
+}
+
+/**
+ * Generates a fish completion script with dynamic completion support.
+ * @param binName - The name of the CLI binary.
+ */
+export function generateFishCompletions(binName: string): string {
+  const lines: string[] = [
+    `# fish completion for ${binName}`,
+    `# Add to fish config:  ${binName} completions fish | source`,
+    "",
+    `# Disable file completions by default`,
+    `complete -c ${binName} -f`,
+    "",
+    `# Helper function to get dynamic completions`,
+    `# Finds xo-complete in the same directory as ${binName}`,
+    `function __${binName.replace(/-/g, "_")}_complete_dynamic`,
+    `  set -l xo_complete_bin ""`,
+    `  if command -q xo-complete`,
+    `    set xo_complete_bin xo-complete`,
+    `  else if command -q ${binName}`,
+    `    set xo_complete_bin (dirname (command -s ${binName}))/xo-complete`,
+    `  end`,
+    `  if test -n "$xo_complete_bin"`,
+    `    $xo_complete_bin $argv 2>/dev/null`,
+    `  end`,
+    `end`,
+    "",
+  ];
+
+  // Global options
+  for (const opt of GLOBAL_OPTIONS) {
+    const isShort = !opt.startsWith("--");
+    const flag = opt.replace(/^-+/, "");
+    if (isShort) {
+      lines.push(`complete -c ${binName} -s ${flag} -d "Option flag"`);
+    } else {
+      lines.push(`complete -c ${binName} -l ${flag} -d "Option flag"`);
+    }
+  }
+
+  // Mnemonic file completion for -m
+  lines.push("");
+  lines.push(`# Dynamic mnemonic file completion for -m`);
+  lines.push(`complete -c ${binName} -s m -l mnemonic-file -xa '(__${binName.replace(/-/g, "_")}_complete_dynamic mnemonics)'`);
+  lines.push("");
+
+  // Top-level commands (only when no sub-command is given yet)
+  lines.push(`# Top-level commands`);
+  const commandNames = Object.keys(COMMAND_TREE);
+  for (const cmd of commandNames) {
+    lines.push(`complete -c ${binName} -n "__fish_use_subcommand" -a "${cmd}" -d "${cmd} command"`);
+  }
+  lines.push("");
+
+  // Static sub-commands for each command
+  lines.push(`# Static sub-commands`);
+  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}"`);
+    }
+  }
+  lines.push("");
+
+  // Dynamic completions
+  lines.push(`# Dynamic completions`);
+  lines.push("");
+
+  // invitation create <template> <action>
+  lines.push(`# invitation create: template names`);
+  lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from create; and test (count (commandline -opc)) -eq 3" -xa '(__${binName.replace(/-/g, "_")}_complete_dynamic templates)'`);
+  lines.push("");
+
+  // invitation append/sign/broadcast/requirements/inspect: invitation IDs
+  lines.push(`# invitation append/sign/broadcast/requirements/inspect: invitation IDs`);
+  for (const sub of ["append", "sign", "broadcast", "requirements", "inspect"]) {
+    lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from ${sub}; and test (count (commandline -opc)) -eq 3" -xa '(__${binName.replace(/-/g, "_")}_complete_dynamic invitations)'`);
+  }
+  lines.push("");
+
+  // invitation import: file completion
+  lines.push(`# invitation import: file completion`);
+  lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from invitation; and __fish_seen_subcommand_from import" -F`);
+  lines.push("");
+
+  // template list/inspect: category first, then template
+  lines.push(`# template list/inspect: category first (pos 3), then template (pos 4)`);
+  for (const sub of ["list", "inspect"]) {
+    lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from ${sub}; and test (count (commandline -opc)) -eq 3" -xa 'action transaction output lockingscript variable'`);
+    lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from ${sub}; and test (count (commandline -opc)) -eq 4" -xa '(__${binName.replace(/-/g, "_")}_complete_dynamic templates)'`);
+  }
+  lines.push("");
+
+  // template set-default: template first
+  lines.push(`# template set-default: template first`);
+  lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from template; and __fish_seen_subcommand_from set-default; and test (count (commandline -opc)) -eq 3" -xa '(__${binName.replace(/-/g, "_")}_complete_dynamic templates)'`);
+  lines.push("");
+
+  // resource unreserve: outpoints
+  lines.push(`# resource unreserve: UTXO outpoints`);
+  lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from resource; and __fish_seen_subcommand_from unreserve; and test (count (commandline -opc)) -eq 3" -xa '(__${binName.replace(/-/g, "_")}_complete_dynamic resources)'`);
+  lines.push("");
+
+  // receive: template names
+  lines.push(`# receive: template names`);
+  lines.push(`complete -c ${binName} -n "__fish_seen_subcommand_from receive; and test (count (commandline -opc)) -eq 2" -xa '(__${binName.replace(/-/g, "_")}_complete_dynamic templates)'`);
+
+  return lines.join("\n") + "\n";
+}
+
+type ShellType = "bash" | "zsh" | "fish";
+
+const generators: Record<ShellType, (binName: string) => string> = {
+  bash: generateBashCompletions,
+  zsh: generateZshCompletions,
+  fish: generateFishCompletions,
+};
+
+/**
+ * Handles the `completions` command.
+ * Prints the generated completion script for the given shell to stdout.
+ * @param args - Positional args after "completions", e.g. ["bash"].
+ * @param binName - The CLI binary name to use in the completion script.
+ */
+export function handleCompletionsCommand(args: string[], binName: string = "xo-cli"): void {
+  const shell = args[0] as ShellType | undefined;
+
+  if (!shell || !generators[shell]) {
+    const supported = Object.keys(generators).join(", ");
+    console.error(`Usage: ${binName} completions <${supported}>`);
+    console.error("");
+    console.error("Examples:");
+    console.error(`  eval "$(${binName} completions bash)"   # Add to ~/.bashrc`);
+    console.error(`  eval "$(${binName} completions zsh)"    # Add to ~/.zshrc`);
+    console.error(`  ${binName} completions fish | source    # Add to fish config`);
+    process.exit(1);
+  }
+
+  process.stdout.write(generators[shell](binName));
+}
diff --git a/src/cli/autocomplete/offline-engine.ts b/src/cli/autocomplete/offline-engine.ts
new file mode 100644
index 0000000..8e1256b
--- /dev/null
+++ b/src/cli/autocomplete/offline-engine.ts
@@ -0,0 +1,99 @@
+/**
+ * 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;
+  }
+}
diff --git a/src/cli/cli-utils.ts b/src/cli/cli-utils.ts
index 486f974..da176ba 100644
--- a/src/cli/cli-utils.ts
+++ b/src/cli/cli-utils.ts
@@ -42,7 +42,3 @@ export const formatObject = (obj: unknown) => {
     compact: false
   });
 };
-
-export const objectPrint = (obj: unknown) => {
-  console.log(formatObject(obj));
-};
\ No newline at end of file
diff --git a/src/cli/commands/index.ts b/src/cli/commands/index.ts
index d491fa8..d729aa7 100644
--- a/src/cli/commands/index.ts
+++ b/src/cli/commands/index.ts
@@ -1,7 +1,7 @@
-export type { CommandDependencies } from "./types.js";
-
 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";
diff --git a/src/cli/commands/invitation.ts b/src/cli/commands/invitation.ts
index 5c39fb7..1dd0a81 100644
--- a/src/cli/commands/invitation.ts
+++ b/src/cli/commands/invitation.ts
@@ -1,10 +1,11 @@
-import { existsSync, readFileSync, writeFileSync } from "fs";
+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 "../cli-utils.js";
-import type { CommandDependencies } from "./types.js";
+import type { CommandDependencies, CommandIO } from "./types.js";
+import { CommandError } from "./types.js";
 import type { Invitation } from "../../services/invitation.js";
 import {
   resolveProvidedLockingBytecodeHex,
@@ -12,6 +13,7 @@ import {
   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;
@@ -89,10 +91,10 @@ async function buildAppendParams(
       }));
 
     if (inputs.length === 0) {
-      console.error("No suitable UTXOs found for auto-input selection.");
+      deps.io.err("No suitable UTXOs found for auto-input selection.");
       return null;
     }
-    deps.verboseLogger(`Auto-selected ${inputs.length} input(s)`);
+    deps.io.verbose(`Auto-selected ${inputs.length} input(s)`);
   } else if (options["addInput"]) {
     inputs = options["addInput"].split(",").map((entry) => {
       const separatorIndex = entry.lastIndexOf(":");
@@ -110,7 +112,7 @@ async function buildAppendParams(
       };
     });
   }
-  deps.verboseLogger(`Inputs: ${formatObject(inputs.map(i => ({ txHash: binToHex(i.outpointTransactionHash), vout: i.outpointIndex })))}`);
+  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.
@@ -133,7 +135,7 @@ async function buildAppendParams(
     }
     outputIdentifiers = [...discovered];
     if (outputIdentifiers.length > 0) {
-      deps.verboseLogger(`Auto-discovered output(s) from template: ${outputIdentifiers.join(", ")}`);
+      deps.io.verbose(`Auto-discovered output(s) from template: ${outputIdentifiers.join(", ")}`);
     }
   }
 
@@ -161,14 +163,14 @@ async function buildAppendParams(
       const lockingBytecodeHex = providedHex
         ?? await invitation.generateLockingBytecode(outputId, roleIdentifier);
 
-      deps.verboseLogger(`Locking bytecode for output "${outputId}": ${lockingBytecodeHex}`);
+      deps.io.verbose(`Locking bytecode for output "${outputId}": ${lockingBytecodeHex}`);
       return {
         outputIdentifier: outputId,
         lockingBytecode: new Uint8Array(Buffer.from(lockingBytecodeHex, "hex")),
       };
     }),
   );
-  deps.verboseLogger(`Outputs: ${formatObject(outputs.map(o => o.outputIdentifier))}`);
+  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
@@ -182,29 +184,29 @@ async function buildAppendParams(
       const txHashHex = binToHex(input.outpointTransactionHash);
       const utxo = utxoMap.get(`${txHashHex}:${input.outpointIndex}`);
       if (!utxo) {
-        console.error(`UTXO not found: ${txHashHex}:${input.outpointIndex}. Make sure it exists in your wallet.`);
+        deps.io.err(`UTXO not found: ${txHashHex}:${input.outpointIndex}. Make sure it exists in your wallet.`);
         return null;
       }
       totalInputSats += BigInt(utxo.valueSatoshis);
     }
-    deps.verboseLogger(`Total input value: ${totalInputSats} satoshis`);
+    deps.io.verbose(`Total input value: ${totalInputSats} satoshis`);
 
     const requiredSats = await invitation.getSatsOut();
-    deps.verboseLogger(`Required output value: ${requiredSats} satoshis`);
+    deps.io.verbose(`Required output value: ${requiredSats} satoshis`);
 
     const changeAmount = totalInputSats - requiredSats - DEFAULT_FEE;
-    deps.verboseLogger(`Change amount: ${changeAmount} satoshis (fee: ${DEFAULT_FEE})`);
+    deps.io.verbose(`Change amount: ${changeAmount} satoshis (fee: ${DEFAULT_FEE})`);
 
     if (changeAmount < 0n) {
-      console.error(`Insufficient funds. Inputs total ${totalInputSats} sats, but need ${requiredSats + DEFAULT_FEE} sats (${requiredSats} required + ${DEFAULT_FEE} fee).`);
+      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 });
-      console.log(`Auto-adding change output: ${changeAmount} satoshis`);
+      deps.io.out(`Auto-adding change output: ${changeAmount} satoshis`);
     } else if (changeAmount > 0n) {
-      console.log(`Change ${changeAmount} sats is below dust threshold (${DUST_THRESHOLD} sats), donating to miners as fee.`);
+      deps.io.out(`Change ${changeAmount} sats is below dust threshold (${DUST_THRESHOLD} sats), donating to miners as fee.`);
     }
   }
 
@@ -214,8 +216,8 @@ async function buildAppendParams(
 /**
  * Prints the help message for the invitation command
  */
-export const printInvitationHelp = () => {
-  console.log(
+export const printInvitationHelp = (io: CommandIO): void => {
+  io.out(
 `
 ${bold("Usage:")} xo-cli invitation <sub-command>
 
@@ -242,82 +244,87 @@ ${bold("Create / Append options:")}
   `);
 };
 
+/**
+ * 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<void> => {
+export const handleInvitationCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+  options: Record<string, string>,
+): Promise<InvitationCommandResult> => {
   const subCommand = args[0];
-  deps.verboseLogger(`Invitation sub-command: ${subCommand}`);
+  deps.io.verbose(`Invitation sub-command: ${subCommand}`);
 
   if (!subCommand) {
-    deps.verboseLogger("No sub-command provided");
-    printInvitationHelp();
-    return;
+    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 templateFile = args[1];
+      const templateQuery = args[1];
       const actionIdentifier = args[2];
-      deps.verboseLogger(`Template file: ${templateFile}, action identifier: ${actionIdentifier}`);
+      deps.io.verbose(`Template query: ${templateQuery}, action identifier: ${actionIdentifier}`);
 
-      if (!templateFile || !actionIdentifier) {
-        deps.verboseLogger("No template file or action identifier provided");
-        printInvitationHelp();
-        return;
+      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");
       }
 
-      // Resolve and validate the template file path
-      const templatePath = path.resolve(`${process.cwd()}/${templateFile}`);
-      deps.verboseLogger(`Template path: ${templatePath}`);
-
-      if (!existsSync(templatePath)) {
-        console.error(`Template file does not exist: ${templatePath}`);
-        printInvitationHelp();
-        return;
-      }
-
-      const template = await readFileSync(templatePath, "utf8");
-      const templateIdentifier = generateTemplateIdentifier(JSON.parse(template));
-
-      // Create the base invitation via the engine
+      const template = await resolveTemplate(deps, templateQuery);
+      const templateIdentifier = generateTemplateIdentifier(template);
       const rawInvitation = await deps.app.engine.createInvitation({
-        templateIdentifier: templateIdentifier,
-        actionIdentifier: actionIdentifier,
+        templateIdentifier,
+        actionIdentifier,
       });
-      deps.verboseLogger(`XOInvitation created: ${formatObject(rawInvitation)}`);
+      deps.io.verbose(`XOInvitation created: ${formatObject(rawInvitation)}`);
 
       const invitationInstance = await deps.app.createInvitation(rawInvitation);
-      deps.verboseLogger(`Invitation created: ${formatObject(invitationInstance.data)}`);
+      deps.io.verbose(`Invitation created: ${formatObject(invitationInstance.data)}`);
 
-      // Commit variables first so getSatsOut can resolve them for change calc
-      // and resolveProvidedLockingBytecodeHex can read them from commits.
       const variables = parseVariablesFromOptions(options);
-      deps.verboseLogger(`Variables: ${formatObject(variables)}`);
+      deps.io.verbose(`Variables: ${formatObject(variables)}`);
       if (variables.length > 0) {
         await invitationInstance.addVariables(variables);
       }
 
-      // Parse inputs/outputs and calculate change (variables are now committed)
       const params = await buildAppendParams(deps, invitationInstance, options);
-      if (!params) return;
+      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 });
       }
 
-      // Save the invitation to a file
-      const invitationFilePath = `${process.cwd()}/inv-${invitationInstance.data.invitationIdentifier}.json`;
-      deps.verboseLogger(`Invitation file path: ${invitationFilePath}`);
+      const invitationFilePath = `${deps.paths.workingDir}/inv-${invitationInstance.data.invitationIdentifier}.json`;
+      deps.io.verbose(`Invitation file path: ${invitationFilePath}`);
       writeFileSync(invitationFilePath, encodeExtendedJson(invitationInstance.data, 2));
-      console.log(`Invitation created: ${path.basename(invitationFilePath)} (${invitationInstance.data.invitationIdentifier})`);
+      deps.io.out(`Invitation created: ${path.basename(invitationFilePath)} (${invitationInstance.data.invitationIdentifier})`);
 
-      // Check remaining requirements
       const missingRequirements = await invitationInstance.getMissingRequirements();
       const hasMissing =
         (missingRequirements.variables?.length ?? 0) > 0 ||
@@ -326,76 +333,74 @@ export const handleInvitationCommand = async (deps: CommandDependencies, args: s
         (missingRequirements.roles !== undefined && Object.keys(missingRequirements.roles).length > 0);
 
       if (hasMissing) {
-        console.log(`\n${bold("Remaining requirements:")}`);
-        console.log(formatObject(missingRequirements));
+        deps.io.out(`\n${bold("Remaining requirements:")}`);
+        deps.io.out(formatObject(missingRequirements));
       } else {
-        // --broadcast implies --sign
         const shouldSign = options["sign"] === "true" || options["broadcast"] === "true";
         const shouldBroadcast = options["broadcast"] === "true";
 
         if (shouldSign) {
           await invitationInstance.sign();
-          console.log(`Invitation signed: ${invitationInstance.data.invitationIdentifier}`);
+          deps.io.out(`Invitation signed: ${invitationInstance.data.invitationIdentifier}`);
         }
 
         if (shouldBroadcast) {
           const txHash = await invitationInstance.broadcast();
-          console.log(`Transaction broadcast: ${bold(txHash)}`);
+          deps.io.out(`Transaction broadcast: ${bold(txHash)}`);
         } else if (!shouldSign) {
-          console.log(`\n${bold("All requirements satisfied.")} You can now sign with: xo-cli invitation sign ${invitationInstance.data.invitationIdentifier}`);
+          deps.io.out(`\n${bold("All requirements satisfied.")} You can now sign with: xo-cli invitation sign ${invitationInstance.data.invitationIdentifier}`);
         }
       }
-      break;
+      return { invitationIdentifier: invitationInstance.data.invitationIdentifier };
     }
 
     case "append": {
       const invitationIdentifier = args[1];
-      deps.verboseLogger(`Invitation identifier: ${invitationIdentifier}`);
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
 
       if (!invitationIdentifier) {
-        deps.verboseLogger("No invitation identifier provided");
-        printInvitationHelp();
-        return;
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError("invitation.append.identifier_missing", "No invitation identifier provided");
       }
 
-      // Find the invitation by identifier
-      const invitation = deps.app.invitations.find(inv => inv.data.invitationIdentifier === invitationIdentifier);
+      const invitation = deps.app.invitations.find(
+        (inv) => inv.data.invitationIdentifier === invitationIdentifier,
+      );
       if (!invitation) {
-        console.error(`Invitation not found: ${invitationIdentifier}`);
-        return;
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError("invitation.append.not_found", `Invitation not found: ${invitationIdentifier}`);
       }
-      deps.verboseLogger(`Invitation: ${formatObject(invitation.data)}`);
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
 
-      // Commit variables first so getSatsOut can resolve them for change calc
       const variables = parseVariablesFromOptions(options);
-      deps.verboseLogger(`Variables to append: ${formatObject(variables)}`);
+      deps.io.verbose(`Variables to append: ${formatObject(variables)}`);
       if (variables.length > 0) {
         await invitation.addVariables(variables);
       }
 
-      // Parse inputs/outputs and calculate change (variables are now committed)
       const params = await buildAppendParams(deps, invitation, options);
-      if (!params) return;
+      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) {
-        console.error("Nothing to append. Provide variables (-var-<name> <value>), inputs (--add-input <txhash>:<vout>), or outputs (--add-output <identifier>).");
-        return;
+        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.verboseLogger(`Invitation appended: ${formatObject(invitation.data)}`);
-      console.log(`Invitation appended: ${invitationIdentifier}`);
+      deps.io.verbose(`Invitation appended: ${formatObject(invitation.data)}`);
+      deps.io.out(`Invitation appended: ${invitationIdentifier}`);
 
-      // Save the updated invitation to a file
-      const invitationFilePath = `${process.cwd()}/inv-${invitation.data.invitationIdentifier}.json`;
+      const invitationFilePath = `${deps.paths.workingDir}/inv-${invitation.data.invitationIdentifier}.json`;
       writeFileSync(invitationFilePath, encodeExtendedJson(invitation.data, 2));
-      console.log(`Invitation updated: ${path.basename(invitationFilePath)} (${invitation.data.invitationIdentifier})`);
+      deps.io.out(`Invitation updated: ${path.basename(invitationFilePath)} (${invitation.data.invitationIdentifier})`);
 
-      // Check remaining requirements
       const missingRequirements = await invitation.getMissingRequirements();
       const hasMissing =
         (missingRequirements.variables?.length ?? 0) > 0 ||
@@ -404,159 +409,212 @@ export const handleInvitationCommand = async (deps: CommandDependencies, args: s
         (missingRequirements.roles !== undefined && Object.keys(missingRequirements.roles).length > 0);
 
       if (hasMissing) {
-        console.log(`\n${bold("Remaining requirements:")}`);
-        console.log(formatObject(missingRequirements));
+        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();
-          console.log(`Invitation signed: ${invitationIdentifier}`);
+          deps.io.out(`Invitation signed: ${invitationIdentifier}`);
         }
 
         if (shouldBroadcast) {
           const txHash = await invitation.broadcast();
-          console.log(`Transaction broadcast: ${bold(txHash)}`);
+          deps.io.out(`Transaction broadcast: ${bold(txHash)}`);
         } else if (!shouldSign) {
-          console.log(`\n${bold("All requirements satisfied.")} You can now sign with: xo-cli invitation sign ${invitationIdentifier}`);
+          deps.io.out(`\n${bold("All requirements satisfied.")} You can now sign with: xo-cli invitation sign ${invitationIdentifier}`);
         }
       }
-      break;
+      return { invitationIdentifier };
     }
 
     case "sign": {
       const invitationIdentifier = args[1];
-      deps.verboseLogger(`Invitation identifier: ${invitationIdentifier}`);
-
-      // Check if the invitation identifier is provided
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
       if (!invitationIdentifier) {
-        deps.verboseLogger("No invitation identifier provided");
-        printInvitationHelp();
-        return;
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError("invitation.sign.identifier_missing", "No invitation identifier provided");
       }
 
-      // Find the invitation by identifier
-      const invitation = await deps.app.invitations.find(invitation => invitation.data.invitationIdentifier === invitationIdentifier);
+      const invitation = deps.app.invitations.find(
+        (candidate) => candidate.data.invitationIdentifier === invitationIdentifier,
+      );
       if (!invitation) {
-        console.error(`Invitation not found: ${invitationIdentifier}`);
-        return;
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError("invitation.sign.not_found", `Invitation not found: ${invitationIdentifier}`);
       }
-      deps.verboseLogger(`Invitation: ${formatObject(invitation.data)}`);
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
 
-      // Sign the invitation
       await invitation.sign();
-      deps.verboseLogger(`Invitation signed: ${formatObject(invitation.data)}`);
-      console.log(`Invitation signed: ${invitationIdentifier}`);
-      break;
+      deps.io.verbose(`Invitation signed: ${formatObject(invitation.data)}`);
+      deps.io.out(`Invitation signed: ${invitationIdentifier}`);
+      return { invitationIdentifier };
     }
 
     case "broadcast": {
       const invitationIdentifier = args[1];
-      deps.verboseLogger(`Invitation identifier: ${invitationIdentifier}`);
-
-      // Check if the invitation identifier is provided
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
       if (!invitationIdentifier) {
-        deps.verboseLogger("No invitation identifier provided");
-        printInvitationHelp();
-        return;
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError("invitation.broadcast.identifier_missing", "No invitation identifier provided");
       }
 
-      // Find the invitation by identifier
-      const invitation = await deps.app.invitations.find(invitation => invitation.data.invitationIdentifier === invitationIdentifier);
+      const invitation = deps.app.invitations.find(
+        (candidate) => candidate.data.invitationIdentifier === invitationIdentifier,
+      );
       if (!invitation) {
-        console.error(`Invitation not found: ${invitationIdentifier}`);
-        return;
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError("invitation.broadcast.not_found", `Invitation not found: ${invitationIdentifier}`);
       }
-      deps.verboseLogger(`Invitation: ${formatObject(invitation.data)}`);
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
 
-      // Broadcast the invitation
       const txHash = await invitation.broadcast();
-      deps.verboseLogger(`Invitation broadcasted: ${formatObject(invitation.data)}`);
-      console.log(`Transaction broadcast: ${bold(txHash)}`);
-      break;
+      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.verboseLogger(`Invitation identifier: ${invitationIdentifier}`);
-
-      // Check if the invitation identifier is provided
+      deps.io.verbose(`Invitation identifier: ${invitationIdentifier}`);
       if (!invitationIdentifier) {
-        deps.verboseLogger("No invitation identifier provided");
-        printInvitationHelp();
-        return;
+        deps.io.verbose("No invitation identifier provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError("invitation.requirements.identifier_missing", "No invitation identifier provided");
       }
 
-      // Find the invitation by identifier
-      const invitation = await deps.app.invitations.find(invitation => invitation.data.invitationIdentifier === invitationIdentifier);
+      const invitation = deps.app.invitations.find(
+        (candidate) => candidate.data.invitationIdentifier === invitationIdentifier,
+      );
       if (!invitation) {
-        console.error(`Invitation not found: ${invitationIdentifier}`);
-        return;
+        deps.io.err(`Invitation not found: ${invitationIdentifier}`);
+        throw new CommandError("invitation.requirements.not_found", `Invitation not found: ${invitationIdentifier}`);
       }
-      deps.verboseLogger(`Invitation: ${formatObject(invitation.data)}`);
+      deps.io.verbose(`Invitation: ${formatObject(invitation.data)}`);
 
-      // List the requirements for the invitation
       const requirements = await deps.app.engine.listRequirements(invitation.data);
-      deps.verboseLogger(`Requirements: ${formatObject(requirements)}`);
-      console.log(formatObject(requirements));
-      break;
+      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": {
-      // Check if the invitation file path is provided
       const invitationFilePath = args[1];
-      deps.verboseLogger(`Invitation file path: ${invitationFilePath}`);
-      
-      // Check if the invitation file path is provided
+      deps.io.verbose(`Invitation file path: ${invitationFilePath}`);
+
       if (!invitationFilePath) {
-        deps.verboseLogger("No invitation file provided");
-        printInvitationHelp();
-        return;
+        deps.io.verbose("No invitation file provided");
+        printInvitationHelp(deps.io);
+        throw new CommandError("invitation.import.file_missing", "No invitation file provided");
       }
 
-      // Read the invitation file
       const invitationFile = await readFileSync(invitationFilePath, "utf8");
-      deps.verboseLogger(`Invitation file: ${invitationFile}`);
-
-      // Parse the invitation file
+      deps.io.verbose(`Invitation file: ${invitationFile}`);
       const invitation = JSON.parse(invitationFile);
-      deps.verboseLogger(`Invitation: ${formatObject(invitation)}`);
-
-      // Create the invitation (internal to XO Engine)
+      deps.io.verbose(`Invitation: ${formatObject(invitation)}`);
       const xoInvitation = await deps.app.engine.createInvitation(invitation);
-
-      // Create the invitation instance
       const invitationInstance = await deps.app.createInvitation(xoInvitation);
-      deps.verboseLogger(`Invitation created: ${formatObject(invitationInstance.data)}`);
-      break;
+      deps.io.verbose(`Invitation created: ${formatObject(invitationInstance.data)}`);
+      return { invitationIdentifier: invitationInstance.data.invitationIdentifier };
     }
 
     case "list": {
-      // List all invitations
-      const invitations = await Promise.all(deps.app.invitations.map(async invitation => {
-        // Get the template for the invitation so we can display the name of it
-        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.verboseLogger(`Invitations: ${formatObject(invitations)}`);
-
-      // Format the invitations for display and print it
-      const formattedInvitations = invitations.map(invitation => `${bold(invitation.templateName)} ${dim(invitation.status)} ${dim(invitation.invitationIdentifier)} ${dim(invitation.actionIdentifier)} (${dim(invitation.roleIdentifier)})`);
-      console.log(formattedInvitations.join('\n'));
-      break;
+      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.verboseLogger(`Unknown invitation sub-command: ${subCommand}`);
-      printInvitationHelp();
-      return;
+      deps.io.verbose(`Unknown invitation sub-command: ${subCommand}`);
+      printInvitationHelp(deps.io);
+      throw new CommandError("invitation.subcommand.unknown", `Unknown invitation sub-command: ${subCommand}`);
   }
 };
diff --git a/src/cli/commands/mnemonic.ts b/src/cli/commands/mnemonic.ts
index cc31a72..a5520ff 100644
--- a/src/cli/commands/mnemonic.ts
+++ b/src/cli/commands/mnemonic.ts
@@ -1,12 +1,13 @@
 import { bold, dim } from "../cli-utils.js";
-import { listMnemonicFiles, createMnemonicFile, createMnemonicSeed } from "../mnemonic.js";
-import type { CommandDependencies } from "./types.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 = () => {
-  console.log(
+export const printMnemonicHelp = (io: CommandIO): void => {
+  io.out(
 `
 ${bold("Usage:")} xo-cli mnemonic <sub-command>
 
@@ -22,52 +23,79 @@ ${bold("Options:")}
 
 /**
  * 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: Omit<CommandDependencies, "app">, args: string[], options: Record<string, string>): Promise<void> => {
+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.verboseLogger("No sub-command provided");
-    printMnemonicHelp();
-    return;
+    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();
-      await createMnemonicFile(mnemonicSeed, options["output"]);
+      const savedAs = createMnemonicFile(mnemonicsDir, mnemonicSeed, options["output"]);
 
-      console.log(`Mnemonic file created: ${options["output"]} (${mnemonicSeed})`);
-      break;
+      deps.io.out(`Mnemonic file created: ${savedAs} (${mnemonicSeed})`);
+      return { savedAs };
     }
 
     case "import": {
-      // The mnemonic seed words are all the positional args after the sub-command
       const mnemonicSeed = args.slice(1).join(" ");
 
       if (!mnemonicSeed) {
-        deps.verboseLogger("No mnemonic seed provided");
-        printMnemonicHelp();
-        return;
+        deps.io.verbose("No mnemonic seed provided");
+        printMnemonicHelp(deps.io);
+        throw new CommandError("mnemonic.import.seed_missing", "No mnemonic seed provided");
       }
 
-      deps.verboseLogger(`Mnemonic seed: ${mnemonicSeed}`);
-      await createMnemonicFile(mnemonicSeed, options["output"]);
-      break;
+      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();
-      console.log(mnemonicFiles.join('\n'));
-      break;
+      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:
-      console.error(`Unknown sub-command: ${subCommand}`);
-      printMnemonicHelp();
-      return;
+      deps.io.err(`Unknown sub-command: ${subCommand}`);
+      printMnemonicHelp(deps.io);
+      throw new CommandError("mnemonic.subcommand.unknown", `Unknown sub-command: ${subCommand}`);
   }
 };
diff --git a/src/cli/commands/receive.ts b/src/cli/commands/receive.ts
index 0764095..71c2da6 100644
--- a/src/cli/commands/receive.ts
+++ b/src/cli/commands/receive.ts
@@ -1,16 +1,17 @@
-import { existsSync, readFileSync } from "fs";
-import path from "path";
 import { generateTemplateIdentifier } from "@xo-cash/engine";
 import { hexToBin, lockingBytecodeToCashAddress } from "@bitauth/libauth";
 
 import { bold, dim } from "../cli-utils.js";
-import type { CommandDependencies } from "./types.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 = () => {
-  console.log(
+export const printReceiveHelp = (io: CommandIO): void => {
+  io.out(
 `
 ${bold("Usage:")} xo-cli receive <template-file> <output-identifier> [role-identifier]
 
@@ -29,36 +30,35 @@ ${bold("Options:")}
 
 /**
  * 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<void> => {
-  const templateFile = args[0];
+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.verboseLogger(`Receive args - template: ${templateFile}, output: ${outputIdentifier}, role: ${roleIdentifier}`);
+  deps.io.verbose(`Receive args - template: ${templateQuery}, output: ${outputIdentifier}, role: ${roleIdentifier}`);
 
-  if (!templateFile || !outputIdentifier) {
-    deps.verboseLogger("Missing required arguments");
-    printReceiveHelp();
-    return;
+  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 templatePath = path.resolve(`${process.cwd()}/${templateFile}`);
-  deps.verboseLogger(`Template path: ${templatePath}`);
-
-  if (!existsSync(templatePath)) {
-    console.error(`Template file does not exist: ${templatePath}`);
-    printReceiveHelp();
-    return;
-  }
-
-  const template = readFileSync(templatePath, "utf8");
-  const templateIdentifier = generateTemplateIdentifier(JSON.parse(template));
-  deps.verboseLogger(`Template identifier: ${templateIdentifier}`);
+  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(
@@ -66,15 +66,16 @@ export const handleReceiveCommand = async (deps: CommandDependencies, args: stri
     outputIdentifier,
     roleIdentifier,
   );
-  deps.verboseLogger(`Locking bytecode hex: ${lockingBytecodeHex}`);
+  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') {
-    console.error(`Failed to encode address: ${result}`);
-    return;
+    deps.io.err(`Failed to encode address: ${result}`);
+    throw new CommandError("receive.address.encode_failed", `Failed to encode address: ${result}`);
   }
 
-  console.log(result.address);
+  deps.io.out(result.address);
+  return { address: result.address };
 };
diff --git a/src/cli/commands/resource.ts b/src/cli/commands/resource.ts
index 6244c21..4ee1153 100644
--- a/src/cli/commands/resource.ts
+++ b/src/cli/commands/resource.ts
@@ -1,13 +1,15 @@
 import { hexToBin } from "@bitauth/libauth";
 
 import { bold, dim } from "../cli-utils.js";
-import type { CommandDependencies } from "./types.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 = () => {
-  console.log(
+export const printResourceHelp = (io: CommandIO): void => {
+  io.out(
 `
 ${bold("Usage:")} xo-cli resource <sub-command>
 
@@ -23,14 +25,14 @@ ${bold("Sub-commands:")}
 /**
  * Formats a single UTXO for display, optionally including reservation info.
  */
-function formatResource(resource: { outpointTransactionHash: string; outpointIndex: number; valueSatoshis: number; outputIdentifier: string; minedAtHeight: number; reserved?: boolean; invitationIdentifier?: string }, showReserved = false): string {
+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.reserved) {
-    const inv = dim(`reserved for ${resource.invitationIdentifier}`);
+  if (showReserved && resource.reservedBy) {
+    const inv = dim(`reserved for ${resource.reservedBy}`);
     return `${outpoint} ${value} ${output} ${height} ${inv}`;
   }
 
@@ -39,107 +41,110 @@ function formatResource(resource: { outpointTransactionHash: string; outpointInd
 
 /**
  * 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<void> => {
+export const handleResourceCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+  _options: Record<string, string>,
+): Promise<{ count?: number }> => {
   const subCommand = args[0];
-  deps.verboseLogger(`Resource sub-command: ${subCommand}`);
+  deps.io.verbose(`Resource sub-command: ${subCommand}`);
 
   if (!subCommand) {
-    deps.verboseLogger("No sub-command provided");
-    printResourceHelp();
-    return;
+    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]; // "reserved", "all", or undefined (defaults to unreserved)
+      const qualifier = args[1];
       const allResources = await deps.app.engine.listUnspentOutputsData();
 
       let filtered;
       if (qualifier === "reserved") {
-        filtered = allResources.filter((r) => r.reserved);
+        filtered = allResources.filter((r) => r.reservedBy);
       } else if (qualifier === "all") {
         filtered = allResources;
       } else {
-        // Default: show only unreserved (selectable) resources
-        filtered = allResources.filter((r) => !r.reserved);
+        filtered = allResources.filter((r) => !r.reservedBy);
       }
 
       if (filtered.length === 0) {
-        console.log(dim("No resources found."));
-        return;
+        deps.io.out(dim("No resources found."));
+        return { count: 0 };
       }
 
       const showReserved = qualifier === "all" || qualifier === "reserved";
       const formattedResources = filtered.map((r) => formatResource(r, showReserved));
-      console.log(formattedResources.join("\n"));
-      console.log(`Total satoshis: ${filtered.reduce((acc, r) => acc + r.valueSatoshis, 0)}`);
-      console.log(`Total resources: ${filtered.length}`);
-      break;
+      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) {
-        console.error("Please provide a UTXO in <txhash>:<vout> format.");
-        printResourceHelp();
-        return;
+        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) {
-        console.error(`Invalid format "${outpointArg}". Expected <txhash>:<vout>.`);
-        return;
+        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)) {
-        console.error(`Invalid format "${outpointArg}". Expected <txhash>:<vout>.`);
-        return;
+        deps.io.err(`Invalid format "${outpointArg}". Expected <txhash>:<vout>.`);
+        throw new CommandError("resource.unreserve.outpoint_invalid", `Invalid format "${outpointArg}". Expected <txhash>:<vout>.`);
       }
 
-      // Look up the UTXO to get its invitation identifier (required by the engine).
       const allResources = await deps.app.engine.listUnspentOutputsData();
       const target = allResources.find(
         (r) => r.outpointTransactionHash === txHash && r.outpointIndex === vout,
       );
 
       if (!target) {
-        console.error(`UTXO not found: ${txHash}:${vout}`);
-        return;
+        deps.io.err(`UTXO not found: ${txHash}:${vout}`);
+        throw new CommandError("resource.unreserve.utxo_missing", `UTXO not found: ${txHash}:${vout}`);
       }
 
-      if (!target.reserved) {
-        console.log(dim("UTXO is not reserved. Nothing to do."));
-        return;
+      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.invitationIdentifier,
+        target.reservedBy ,
       );
-      console.log(`Unreserved ${bold(`${txHash}:${vout}`)} (was reserved for ${target.invitationIdentifier})`);
-      break;
+      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) {
-        console.log(dim("No reserved resources to unreserve."));
+        deps.io.out(dim("No reserved resources to unreserve."));
       } else {
-        console.log(`Unreserved ${bold(String(count))} resource(s).`);
+        deps.io.out(`Unreserved ${bold(String(count))} resource(s).`);
       }
-      break;
+      return { count };
     }
 
     default: {
-      deps.verboseLogger(`Unknown resource sub-command: ${subCommand}`);
-      printResourceHelp();
-      return;
+      deps.io.verbose(`Unknown resource sub-command: ${subCommand}`);
+      printResourceHelp(deps.io);
+      throw new CommandError("resource.subcommand.unknown", `Unknown resource sub-command: ${subCommand}`);
     }
   }
 };
diff --git a/src/cli/commands/template.ts b/src/cli/commands/template.ts
index 8dd21ee..e7c6a0a 100644
--- a/src/cli/commands/template.ts
+++ b/src/cli/commands/template.ts
@@ -3,15 +3,17 @@ import path from "path";
 import { generateTemplateIdentifier } from "@xo-cash/engine";
 import type { XOTemplate } from "@xo-cash/types";
 
-import { bold, dim, formatObject, objectPrint } from "../cli-utils.js";
+import { bold, dim, formatObject } from "../cli-utils.js";
 import { resolveTemplateReferences } from "../../utils/templates.js";
-import type { CommandDependencies } from "./types.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 = () => {
-  console.log(
+export const printTemplateHelp = (io: CommandIO): void => {
+  io.out(
 `
 ${bold("Usage:")} xo-cli template <sub-command>
 
@@ -26,76 +28,75 @@ ${bold("Sub-commands:")}
 
 /**
  * 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<void> => {
+export const handleTemplateListCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+): Promise<{ count?: number }> => {
   const templateCategory = args[0];
-  deps.verboseLogger(`Template list category: ${templateCategory}`);
+  deps.io.verbose(`Template list category: ${templateCategory}`);
 
-  // If no category was provided to list, we assume its listing out the templates
   if (!templateCategory) {
     const templates = await deps.app.engine.listImportedTemplates();
     const formattedTemplates = templates.map((template: XOTemplate) => `${bold(generateTemplateIdentifier(template))} - ${dim(template.name)} ${dim(template.description)}`);
-    console.log(formattedTemplates.join('\n'));
-    return;
+    deps.io.out(formattedTemplates.join('\n'));
+    return { count: templates.length };
   }
 
-  // Extract the template identifier from the positional args
   const templateIdentifier = args[1];
-  deps.verboseLogger(`Template identifier: ${templateIdentifier}`);
+  deps.io.verbose(`Template identifier: ${templateIdentifier}`);
 
   if (!templateIdentifier) {
-    console.error("No template identifier provided");
-    return;
+    deps.io.err("No template identifier provided");
+    throw new CommandError("template.list.identifier_missing", "No template identifier provided");
   }
 
-  // Get the template from the engine
   const rawTemplate = await deps.app.engine.getTemplate(templateIdentifier);
   if (!rawTemplate) {
-    console.error(`No template found: ${templateIdentifier}`);
-    return;
+    deps.io.err(`No template found: ${templateIdentifier}`);
+    throw new CommandError("template.list.not_found", `No template found: ${templateIdentifier}`);
   }
 
-  // Resolve the template references
   const template = await resolveTemplateReferences(rawTemplate);
-  deps.verboseLogger(`Template: ${formatObject(template)}`);
+  deps.io.verbose(`Template: ${formatObject(template)}`);
 
-  // List the templates in the category
   switch (templateCategory) {
     case "action": {
       const actions = template.actions;
       const formattedActions = Object.entries(actions).map(([actionIdentifier, action]) => `${bold(actionIdentifier)} ${dim(action.name)} ${dim(action.description)}`);
-      console.log(formattedActions.join('\n'));
-      break;
+      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)}`);
-      console.log(formattedTransactions.join('\n'));
-      break;
+      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)}`);
-      console.log(formattedOutputs.join('\n'));
-      break;
+      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)}`);
-      console.log(formattedLockingscripts.join('\n'));
-      break;
+      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)}`);
-      console.log(formattedVariables.join('\n'));
-      break;
+      deps.io.out(formattedVariables.join('\n'));
+      return {};
     }
     default: {
-      deps.verboseLogger(`Unknown template category: ${templateCategory}`);
-      return;
+      deps.io.verbose(`Unknown template category: ${templateCategory}`);
+      throw new CommandError("template.list.category_unknown", `Unknown template category: ${templateCategory}`);
     }
   }
 }
@@ -103,8 +104,8 @@ export const handleTemplateListCommand = async (deps: CommandDependencies, args:
 /**
  * Prints the help message for the template inspect command
  */
-export const printTemplateInspectHelp = () => {
-  console.log(
+export const printTemplateInspectHelp = (io: CommandIO): void => {
+  io.out(
 `
 ${bold("Usage:")} xo-cli template inspect <category> <identifier> <field>
 
@@ -124,153 +125,151 @@ ${bold("Categories:")}
 
 /**
  * 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<void> => {
+export const handleTemplateInspectCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+): Promise<Record<string, never>> => {
   const templateCategory = args[0];
-  const templateIdentifier = args[1];
+  const templateQuery = args[1];
   const templateField = args[2];
 
-  deps.verboseLogger(`Template inspect args - category: ${templateCategory}, identifier: ${templateIdentifier}, field: ${templateField}`);
+  deps.io.verbose(`Template inspect args - category: ${templateCategory}, identifier: ${templateQuery}, field: ${templateField}`);
 
-  if (!templateCategory || !templateIdentifier || !templateField) {
-    console.log("No template category, identifier, or field provided");
-    printTemplateInspectHelp();
-    return;
+  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");
   }
 
-  // Get the template from the engine
-  const rawTemplate = await deps.app.engine.getTemplate(templateIdentifier);
-  if (!rawTemplate) {
-    console.error(`No template found: ${templateIdentifier}`);
-    return;
-  }
+  const template = await resolveTemplate(deps, templateQuery);
+  deps.io.verbose(`Template: ${formatObject(template)}`);
 
-  // Resolve the template references
-  const template = await resolveTemplateReferences(rawTemplate);
-  deps.verboseLogger(`Template: ${formatObject(template)}`);
-
-  // Inspect the template in the category
   switch (templateCategory) {
     case "action": {
       const action = template.actions[templateField];
       if (!action) {
-        console.error(`No action found: ${templateField}`);
-        return;
+        deps.io.err(`No action found: ${templateField}`);
+        throw new CommandError("template.inspect.action_missing", `No action found: ${templateField}`);
       }
-      objectPrint(action);
-      break;
+      deps.io.out(formatObject(action));
+      return {};
     }
     case "transaction": {
-      const transaction = template.transactions[templateField];
+      const transaction = template.transactions?.[templateField];
       if (!transaction) {
-        console.error(`No transaction found: ${templateField}`);
-        return;
+        deps.io.err(`No transaction found: ${templateField}`);
+        throw new CommandError("template.inspect.transaction_missing", `No transaction found: ${templateField}`);
       }
-      objectPrint(transaction);
-      break;
+      deps.io.out(formatObject(transaction));
+      return {};
     }
     case "output": {
       const output = template.outputs[templateField];
       if (!output) {
-        console.error(`No output found: ${templateField}`);
-        return;
+        deps.io.err(`No output found: ${templateField}`);
+        throw new CommandError("template.inspect.output_missing", `No output found: ${templateField}`);
       }
-      objectPrint(output);
-      break;
+      deps.io.out(formatObject(output));
+      return {};
     }
     case "lockingscript": {
       const lockingscript = template.lockingScripts[templateField];
       if (!lockingscript) {
-        console.error(`No lockingscript found: ${templateField}`);
-        return;
+        deps.io.err(`No lockingscript found: ${templateField}`);
+        throw new CommandError("template.inspect.lockingscript_missing", `No lockingscript found: ${templateField}`);
       }
-      objectPrint(lockingscript);
-      break;
+      deps.io.out(formatObject(lockingscript));
+      return {};
     }
     case "variable": {
       const variable = template.variables?.[templateField];
       if (!variable) {
-        console.error(`No variable found: ${templateField}`);
-        return;
+        deps.io.err(`No variable found: ${templateField}`);
+        throw new CommandError("template.inspect.variable_missing", `No variable found: ${templateField}`);
       }
-      objectPrint(variable);
-      break;
+      deps.io.out(formatObject(variable));
+      return {};
     }
     default: {
-      deps.verboseLogger(`Unknown template category: ${templateCategory}`);
-      return;
+      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<void> => {
+export const handleTemplateCommand = async (
+  deps: CommandDependencies,
+  args: string[],
+  _options: Record<string, string>,
+): Promise<{ templateFile?: string; count?: number }> => {
   const subCommand = args[0];
 
   if (!subCommand) {
-    deps.verboseLogger("No sub-command provided");
-    printTemplateHelp();
-    return;
+    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.verboseLogger(`Template file: ${templateFile}`);
+      deps.io.verbose(`Template file: ${templateFile}`);
 
       if (!templateFile) {
-        deps.verboseLogger("No template file provided");
-        printTemplateHelp();
-        return;
+        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.verboseLogger(`Template path: ${templatePath}`);
+      deps.io.verbose(`Template path: ${templatePath}`);
 
       if (!existsSync(templatePath)) {
-        console.error(`Template file does not exist: ${templatePath}`);
-        printTemplateHelp();
-        return;
+        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.verboseLogger(`Importing template: ${templateFile}`);
+      deps.io.verbose(`Importing template: ${templateFile}`);
       await deps.app.engine.importTemplate(template);
-      deps.verboseLogger(`Template imported: ${templateFile}`);
-      break;
+      deps.io.verbose(`Template imported: ${templateFile}`);
+      return { templateFile };
     }
     case "list": {
-      await handleTemplateListCommand(deps, args.slice(1));
-      break;
+      return handleTemplateListCommand(deps, args.slice(1));
     }
     case "inspect": {
-      await handleTemplateInspectCommand(deps, args.slice(1));
-      break;
+      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.verboseLogger("No template file, output identifier, or role identifier provided");
-        printTemplateHelp();
-        return;
+        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.verboseLogger(`Template file: ${templateFile}, output identifier: ${outputIdentifier}, role identifier: ${roleIdentifier}`);
+      deps.io.verbose(`Template file: ${templateFile}, output identifier: ${outputIdentifier}, role identifier: ${roleIdentifier}`);
       await deps.app.engine.setDefaultLockingParameters(templateFile, outputIdentifier, roleIdentifier);
-      break;
+      return {};
     }
     default:
-      deps.verboseLogger(`Unknown template sub-command: ${subCommand}`);
-      printTemplateHelp();
-      return;
+      deps.io.verbose(`Unknown template sub-command: ${subCommand}`);
+      printTemplateHelp(deps.io);
+      throw new CommandError("template.subcommand.unknown", `Unknown template sub-command: ${subCommand}`);
   }
 };
diff --git a/src/cli/commands/types.ts b/src/cli/commands/types.ts
index cd7ba9e..09b5ef4 100644
--- a/src/cli/commands/types.ts
+++ b/src/cli/commands/types.ts
@@ -1,6 +1,59 @@
 import type { AppService } from "../../services/app.js";
 
-export type CommandDependencies = {
-  verboseLogger: (message: string) => void;
+/**
+ * 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;
+  }
+}
diff --git a/src/cli/completions.ts b/src/cli/completions.ts
deleted file mode 100644
index 20ce42d..0000000
--- a/src/cli/completions.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * Shell completion script generation.
- * 
- * Defines the CLI command tree in one place and generates
- * bash/zsh/fish completion scripts from it. Users source the output
- * in their shell profile for tab-completion support.
- * 
- * Usage:
- *   eval "$(xo-cli completions bash)"
- *   eval "$(xo-cli completions zsh)"
- *   xo-cli completions fish | source
- */
-
-/**
- * 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.
- */
-export const COMMAND_TREE: Record<string, string[]> = {
-  mnemonic:   ["create", "import", "list"],
-  template:   ["import", "list", "set-default"],
-  invitation: ["create", "import", "list"],
-  receive:    [],
-  resource:   ["list"],
-  help:       [],
-  completions: ["bash", "zsh", "fish"],
-};
-
-/** Global option flags available on every command. */
-const GLOBAL_OPTIONS = ["-h", "--help", "-v", "--verbose", "-m", "--mnemonic-file", "-o", "--output"];
-
-/**
- * Generates a bash completion script.
- * @param binName - The name of the CLI binary (used in the `complete` registration).
- */
-export function generateBashCompletions(binName: string): string {
-  const commands = Object.keys(COMMAND_TREE).join(" ");
-  const options = GLOBAL_OPTIONS.join(" ");
-
-  // Build the case arms for each command's sub-commands
-  const caseArms = Object.entries(COMMAND_TREE)
-    .filter(([, subs]) => subs.length > 0)
-    .map(([cmd, subs]) => `      ${cmd})\n        COMPREPLY=($(compgen -W "${subs.join(" ")}" -- "\${cur}"))\n        return 0\n        ;;`)
-    .join("\n");
-
-  return `# bash completion for ${binName}
-# Add to ~/.bashrc:  eval "$(${binName} completions bash)"
-_${binName.replace(/-/g, "_")}_completions() {
-  local cur prev words cword
-  _init_completion || return
-
-  # If the current word starts with "-", offer option flags
-  if [[ "\${cur}" == -* ]]; then
-    COMPREPLY=($(compgen -W "${options}" -- "\${cur}"))
-    return 0
-  fi
-
-  # Find the command (first non-option positional arg after the binary)
-  local cmd=""
-  for ((i=1; i < cword; i++)); do
-    if [[ "\${words[i]}" != -* ]]; then
-      cmd="\${words[i]}"
-      break
-    fi
-  done
-
-  # No command yet — offer the top-level commands
-  if [[ -z "\${cmd}" ]]; then
-    COMPREPLY=($(compgen -W "${commands}" -- "\${cur}"))
-    return 0
-  fi
-
-  # Offer sub-commands for the matched command
-  case "\${cmd}" in
-${caseArms}
-  esac
-}
-
-complete -F _${binName.replace(/-/g, "_")}_completions ${binName}
-`;
-}
-
-/**
- * Generates a zsh completion script.
- * @param binName - The name of the CLI binary.
- */
-export function generateZshCompletions(binName: string): string {
-  const commands = Object.keys(COMMAND_TREE).join(" ");
-  const options = GLOBAL_OPTIONS.join(" ");
-
-  const caseArms = Object.entries(COMMAND_TREE)
-    .filter(([, subs]) => subs.length > 0)
-    .map(([cmd, subs]) => `      ${cmd})\n        compadd -- ${subs.join(" ")}\n        ;;`)
-    .join("\n");
-
-  return `# zsh completion for ${binName}
-# Add to ~/.zshrc:  eval "$(${binName} completions zsh)"
-_${binName.replace(/-/g, "_")}_completions() {
-  local -a commands
-  commands=(${commands})
-
-  # If typing an option flag, complete options
-  if [[ "\${words[\${CURRENT}]}" == -* ]]; then
-    compadd -- ${options}
-    return
-  fi
-
-  # Find the command (first non-option positional arg)
-  local cmd=""
-  for ((i=2; i < CURRENT; i++)); do
-    if [[ "\${words[i]}" != -* ]]; then
-      cmd="\${words[i]}"
-      break
-    fi
-  done
-
-  # No command yet — offer top-level commands
-  if [[ -z "\${cmd}" ]]; then
-    compadd -- \${commands[@]}
-    return
-  fi
-
-  # Offer sub-commands
-  case "\${cmd}" in
-${caseArms}
-  esac
-}
-
-compdef _${binName.replace(/-/g, "_")}_completions ${binName}
-`;
-}
-
-/**
- * Generates a fish completion script.
- * @param binName - The name of the CLI binary.
- */
-export function generateFishCompletions(binName: string): string {
-  const lines: string[] = [
-    `# fish completion for ${binName}`,
-    `# Add to fish config:  ${binName} completions fish | source`,
-    "",
-    `# Disable file completions by default`,
-    `complete -c ${binName} -f`,
-    "",
-  ];
-
-  // Global options
-  for (const opt of GLOBAL_OPTIONS) {
-    const isShort = !opt.startsWith("--");
-    const flag = opt.replace(/^-+/, "");
-    if (isShort) {
-      lines.push(`complete -c ${binName} -s ${flag} -d "Option flag"`);
-    } else {
-      lines.push(`complete -c ${binName} -l ${flag} -d "Option flag"`);
-    }
-  }
-  lines.push("");
-
-  // Top-level commands (only when no sub-command is given yet)
-  const commandNames = Object.keys(COMMAND_TREE);
-  for (const cmd of commandNames) {
-    lines.push(`complete -c ${binName} -n "__fish_use_subcommand" -a "${cmd}" -d "${cmd} command"`);
-  }
-  lines.push("");
-
-  // Sub-commands for each command
-  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}" -a "${sub}" -d "${cmd} ${sub}"`);
-    }
-  }
-
-  return lines.join("\n") + "\n";
-}
-
-type ShellType = "bash" | "zsh" | "fish";
-
-const generators: Record<ShellType, (binName: string) => string> = {
-  bash: generateBashCompletions,
-  zsh: generateZshCompletions,
-  fish: generateFishCompletions,
-};
-
-/**
- * Handles the `completions` command.
- * Prints the generated completion script for the given shell to stdout.
- * @param args - Positional args after "completions", e.g. ["bash"].
- * @param binName - The CLI binary name to use in the completion script.
- */
-export function handleCompletionsCommand(args: string[], binName: string = "xo-cli"): void {
-  const shell = args[0] as ShellType | undefined;
-
-  if (!shell || !generators[shell]) {
-    const supported = Object.keys(generators).join(", ");
-    console.error(`Usage: ${binName} completions <${supported}>`);
-    console.error("");
-    console.error("Examples:");
-    console.error(`  eval "$(${binName} completions bash)"   # Add to ~/.bashrc`);
-    console.error(`  eval "$(${binName} completions zsh)"    # Add to ~/.zshrc`);
-    console.error(`  ${binName} completions fish | source    # Add to fish config`);
-    process.exit(1);
-  }
-
-  process.stdout.write(generators[shell](binName));
-}
diff --git a/src/cli/index.ts b/src/cli/index.ts
index a02e1d5..0d03cf2 100644
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /**
  * CLI entry point.
  * 
@@ -35,17 +36,19 @@
  */
 
 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 "./cli-utils.js";
-import { listMnemonicFiles, loadMnemonic } from "./mnemonic.js";
-
-/** File that remembers the last-used mnemonic so `-m` can be omitted. */
-const WALLET_CONFIG_FILE = ".xo-cli-wallet";
+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,
@@ -53,15 +56,19 @@ import {
   handleResourceCommand,
 } from "./commands/index.js";
 
-import { handleCompletionsCommand } from "./completions.js";
+import { handleCompletionsCommand } from "./autocomplete/completions.js";
 
-const createConditionalLogger = (verbose: boolean) => {
-  return (message: string) => {
-    if (verbose) {
-      console.log(message);
-    }
-  };
-};
+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.
@@ -79,106 +86,138 @@ async function main(): Promise<void> {
   const { args, options } = convertArgsToObject(process.argv.slice(2));
 
   // Create a verbose logger if the user set the verbose flag
-  const verboseLogger = createConditionalLogger(options["verbose"] === "true");
+  const io = createCommandIO(options["verbose"] === "true");
 
   // Log the parsed app args
-  verboseLogger(`Parsed args: ${formatObject(args)}`);
-  verboseLogger(`Parsed options: ${formatObject(options)}`);
+  io.verbose(`Parsed args: ${formatObject(args)}`);
+  io.verbose(`Parsed options: ${formatObject(options)}`);
   
   // Handle the command
   const command = args[0];
-  verboseLogger(`Command: ${command}`);
+  io.verbose(`Command: ${command}`);
   if (!command) {
     // TODO: Print help, probably...
-    console.error("No command provided");
+    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 if we are calling the mnemonic command
   // TODO: This is ugly. I would like to find a nicer way of doing this.
   if (command === "completions") {
     handleCompletionsCommand(subArgs);
-    return;
+    process.exit(0);
   }
 
   if (command === "mnemonic") {
-    await handleMnemonicCommand({ verboseLogger }, subArgs, options);
-    return;
+    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(WALLET_CONFIG_FILE)) {
-    mnemonicFile = readFileSync(WALLET_CONFIG_FILE, "utf8").trim();
-    verboseLogger(`Using persisted wallet: ${mnemonicFile}`);
+  if (!mnemonicFile && existsSync(paths.walletConfigPath)) {
+    mnemonicFile = readFileSync(paths.walletConfigPath, "utf8").trim();
+    io.verbose(`Using persisted wallet: ${mnemonicFile}`);
   }
   if (!mnemonicFile) {
-    console.error("No mnemonic file provided");
-    console.log(`You can create a mnemonic file with the following command: xo-cli mnemonic create <mnemonic-seed> or use one of the following files: \n${listMnemonicFiles().join("\n")}`);
-    console.log(`\nTip: pass -m <file> once and it will be remembered in ${WALLET_CONFIG_FILE}`);
+    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(WALLET_CONFIG_FILE, mnemonicFile);
+  writeFileSync(paths.walletConfigPath, mnemonicFile);
 
-  const mnemonic = await loadMnemonic(mnemonicFile);
-  verboseLogger(`Loaded mnemonic from file: ${mnemonicFile} ${mnemonic}`);
+  const mnemonic = loadMnemonic(paths.mnemonicsDir, mnemonicFile);
+  io.verbose(`Loaded mnemonic from file: ${mnemonicFile} ${mnemonic}`);
   
   // Create an App instance
-  verboseLogger("Creating app instance...");
+  io.verbose("Creating app instance...");
   const app = await AppService.create(mnemonic, {
     syncServerUrl: options["syncServerUrl"] ?? "http://localhost:3000",
     engineConfig: {
-      databasePath: options["databasePath"] ?? "./",
-      databaseFilename: options["databaseFilename"] ?? 'xo-wallet.db',
+      databasePath: options["databasePath"] ?? paths.dataDir,
+      databaseFilename: options["databaseFilename"] ?? "xo-wallet.db",
     },
-    invitationStoragePath: options["invitationStoragePath"] ?? "./xo-invitations.db",
+    invitationStoragePath:
+      options["invitationStoragePath"] ?? join(paths.dataDir, "xo-invitations.db"),
   });
-  verboseLogger("App instance created");
+  io.verbose("App instance created");
 
   // Start the app
-  verboseLogger("Starting 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();
-  verboseLogger("App started");
+  io.verbose("App started");
 
   const commandDependencies: CommandDependencies = {
-    verboseLogger,
+    io,
+    paths,
     app,
   };
 
   // Handle the command
-  switch (command) {
-    case "template":
-      await handleTemplateCommand(commandDependencies, subArgs, options);
-      break;
-    case "invitation":
-      await handleInvitationCommand(commandDependencies, subArgs, options);
-      break;
-    case "receive":
-      await handleReceiveCommand(commandDependencies, subArgs, options);
-      break;
-    case "resource":
-      await handleResourceCommand(commandDependencies, subArgs, options);
-      break;
-    case "help":
-      await handleHelpCommand(commandDependencies, subArgs, options);
-      break;
-    default:
-      console.error(`Unknown command: ${command}`);
-      process.exit(1);
-  }
+  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}`);
+    }
 
-  // Exit the process
-  process.exit(0);
+    // 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<void> => {
-  // Im sorry about the formatting here. I'm not sure how to handle this better.
-  console.log(
+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]
@@ -196,6 +235,7 @@ Options:
   -m, --mnemonic-file <mnemonic-file>  ${dim("Use a specific mnemonic file")}
   -v, --verbose   ${dim("Show verbose output")}`
   );
+  return {};
 };
 
 main().catch((error) => {
diff --git a/src/cli/mnemonic.ts b/src/cli/mnemonic.ts
index 2ac744a..e8858eb 100644
--- a/src/cli/mnemonic.ts
+++ b/src/cli/mnemonic.ts
@@ -1,72 +1,116 @@
-import { readdirSync, readFileSync, writeFileSync } from "node:fs";
-import { BCHMnemonicURL,  } from "../utils/bch-mnemonic-url.js";
+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 => {
-  // Generate a new mnemonic seed
-  const mnemonic = generateBip39Mnemonic();
-
-  // Return the mnemonic phrase
-  return mnemonic;
+  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 = (mnemonic: string, outputFilename?: string): string => {
-  // Convert the mnemonic seed to a BCH Mnemonic URL
+export const createMnemonicFile = (
+  mnemonicsDir: string,
+  mnemonic: string,
+  outputFilename?: string,
+): string => {
   const mnemonicUrl = BCHMnemonicURL.fromSeed(mnemonic);
 
-  // If no output filename is provided, use the first word from the mnemonic as the filename
   let fileName = outputFilename;
   if (!fileName) {
-    const firstWord = mnemonic.at(0)?.toLowerCase();
+    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}`;
   }
 
-  // Write the mnemonic URL to a file
-  // TODO: May need PWD or something to ensure we are writing to the correct directory
-  writeFileSync(fileName, mnemonicUrl.toURL());
+  const safeName = basename(fileName);
+  const outPath = join(mnemonicsDir, safeName);
+  writeFileSync(outPath, mnemonicUrl.toURL());
 
-  return fileName;
+  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 = (mnemonicFile: string): string => {
-  const mnemonicUrl = BCHMnemonicURL.fromURL(readFileSync(mnemonicFile, "utf8"));
+export const loadMnemonic = (mnemonicsDir: string, mnemonicFile: string): string => {
+  const resolvedPath = resolveMnemonicFilePath(mnemonicsDir, mnemonicFile);
+  const mnemonicUrl = BCHMnemonicURL.fromURL(readFileSync(resolvedPath, "utf8"));
   const { entropy } = mnemonicUrl.toObject();
 
-  // Convert the entropy to a mnemonic seed
   const mnemonic = encodeBip39Mnemonic(entropy);
 
-  // If the conversion failed, throw an error
   if (typeof mnemonic === "string") {
     throw new Error(`Failed to convert entropy to mnemonic: ${mnemonic}`);
   }
 
-  // Return the mnemonic phrase
   return mnemonic.phrase;
 };
 
 /**
- * Lists all mnemonic files in the current directory
- * @returns An array of mnemonic file names
+ * Lists mnemonic files in the given directory.
+ * @param mnemonicsDir - Directory containing mnemonic files
+ * @returns Basenames suitable for `-m <name>`
  */
-export const listMnemonicFiles = (): string[] => {
-  const cwd = process.cwd();
-  const filenames = readdirSync(cwd).filter((f: string) => f.startsWith('mnemonic-'));
+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());
+};
diff --git a/src/cli/utils.ts b/src/cli/utils.ts
new file mode 100644
index 0000000..df6624f
--- /dev/null
+++ b/src/cli/utils.ts
@@ -0,0 +1,48 @@
+import type { XOTemplate } from "@xo-cash/types";
+import type { CommandDependencies } from "./commands/types.js";
+import { CommandError } from "./commands/types.js";
+import { generateTemplateIdentifier } from "@xo-cash/engine";
+
+/**
+ * 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}`);
+}
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index 0bdc605..9e8d52d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /**
  * XO Wallet CLI - Terminal User Interface for XO crypto wallet.
  *
@@ -9,18 +10,25 @@
  * 5. Real-time updates via SSE
  */
 
+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"] ?? "./",
+      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);
diff --git a/src/services/app.ts b/src/services/app.ts
index 1c61277..1176bba 100644
--- a/src/services/app.ts
+++ b/src/services/app.ts
@@ -7,10 +7,10 @@ import {
 import type { XOInvitation } from "@xo-cash/types";
 
 import { Invitation } from "./invitation.js";
-import { Storage } from "./storage.js";
+import { BaseStorage, Storage } from "./storage.js";
 import { SyncServer } from "../utils/sync-server.js";
 import { HistoryService } from "./history.js";
-import { ElectrumService } from "./electrum.js";
+import { type BlockchainService, ElectrumService } from "./electrum.js";
 
 import { EventEmitter } from "../utils/event-emitter.js";
 
@@ -42,10 +42,10 @@ export interface AppConfig {
 
 export class AppService extends EventEmitter<AppEventMap> {
   public engine: Engine;
-  public storage: Storage;
+  public storage: BaseStorage;
   public config: AppConfig;
   public history: HistoryService;
-  public electrum: ElectrumService;
+  public electrum: BlockchainService;
 
   public invitations: Invitation[] = [];
   private invitationEventCleanup = new Map<
@@ -101,9 +101,9 @@ export class AppService extends EventEmitter<AppEventMap> {
 
   constructor(
     engine: Engine,
-    storage: Storage,
+    storage: BaseStorage,
     config: AppConfig,
-    electrum: ElectrumService,
+    electrum: BlockchainService,
   ) {
     super();
 
@@ -224,14 +224,14 @@ export class AppService extends EventEmitter<AppEventMap> {
    */
   async unreserveAllResources(): Promise<number> {
     const allUnspentOutputs = await this.engine.listUnspentOutputsData();
-    const reserved = allUnspentOutputs.filter((o) => o.reserved);
+    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.invitationIdentifier) ?? [];
+      const existing = byInvitation.get(output.reservedBy!) ?? [];
       existing.push(output);
-      byInvitation.set(output.invitationIdentifier, existing);
+      byInvitation.set(output.reservedBy!, existing);
     }
 
     for (const [invitationIdentifier, outputs] of byInvitation) {
diff --git a/src/services/electrum.ts b/src/services/electrum.ts
index 1d70710..ef35948 100644
--- a/src/services/electrum.ts
+++ b/src/services/electrum.ts
@@ -8,6 +8,10 @@ export interface ElectrumServiceConfig {
   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.
diff --git a/src/services/history.ts b/src/services/history.ts
index e05a1db..55f163f 100644
--- a/src/services/history.ts
+++ b/src/services/history.ts
@@ -401,7 +401,7 @@ export class HistoryService {
     return {
       kind: "utxo",
       id: this.getUtxoId(utxo),
-      invitationIdentifier: utxo.invitationIdentifier || undefined,
+      invitationIdentifier: utxo.reservedBy || undefined,
       templateIdentifier: utxo.templateIdentifier,
       outputIdentifier: utxo.outputIdentifier,
       outpoint: {
@@ -409,7 +409,7 @@ export class HistoryService {
         index: utxo.outpointIndex,
       },
       valueSatoshis: BigInt(utxo.valueSatoshis),
-      reserved: utxo.reserved,
+      reserved: utxo.reservedBy ? true : false,
       direction,
       description,
       descriptionParts: {
@@ -517,7 +517,7 @@ export class HistoryService {
     utxo: UnspentOutputData,
     invitationByUtxoOrigin: Map<string, UtxoOriginContext>,
   ): string | undefined {
-    if (utxo.invitationIdentifier) return utxo.invitationIdentifier;
+    if (utxo.reservedBy) return utxo.reservedBy;
     const originKey = this.getUtxoOriginKey(
       utxo.templateIdentifier,
       utxo.outputIdentifier,
diff --git a/src/services/invitation.ts b/src/services/invitation.ts
index 8c25643..bfae272 100644
--- a/src/services/invitation.ts
+++ b/src/services/invitation.ts
@@ -24,8 +24,8 @@ import {
 
 import type { SSEvent } from "../utils/sse-client.js";
 import type { SyncServer } from "../utils/sync-server.js";
-import type { Storage } from "./storage.js";
-import type { ElectrumService } from "./electrum.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";
@@ -39,9 +39,9 @@ export type InvitationEventMap = {
 
 export type InvitationDependencies = {
   syncServer: SyncServer;
-  storage: Storage;
+  storage: BaseStorage;
   engine: Engine;
-  electrum: ElectrumService;
+  electrum: BlockchainService;
 };
 
 export class Invitation extends EventEmitter<InvitationEventMap> {
@@ -119,8 +119,8 @@ 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;
-  private electrum: ElectrumService;
+  private storage: BaseStorage;
+  private electrum: BlockchainService;
 
   /**
    * The status of the invitation (last emitted word: pending, actionable, signed, ready, complete, expired, unknown).
diff --git a/src/services/storage.ts b/src/services/storage.ts
index 743131d..4b4cafc 100644
--- a/src/services/storage.ts
+++ b/src/services/storage.ts
@@ -1,7 +1,16 @@
 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);
@@ -19,7 +28,9 @@ export class Storage {
   constructor(
     private readonly database: Database.Database,
     private readonly basePath: string,
-  ) {}
+  ) {
+    super();
+  }
 
   /**
    * Get the full key with basePath prefix
@@ -117,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));
+  }
+}
diff --git a/src/tui/screens/SeedInput.tsx b/src/tui/screens/SeedInput.tsx
index c2e2150..6a20c74 100644
--- a/src/tui/screens/SeedInput.tsx
+++ b/src/tui/screens/SeedInput.tsx
@@ -16,6 +16,8 @@ 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';
 
@@ -39,33 +41,41 @@ interface MnemonicFileEntry {
  * Focus sections the user can tab between.
  * When saved wallets exist the file list is shown first.
  */
-type FocusSection = 'files' | 'input' | 'button';
+type FocusSection = 'files' | 'input' | 'saveCheckbox' | 'button';
 
 /**
- * Reads mnemonic-* files from cwd, parses each as a BCHMnemonicURL,
- * and converts the entropy back to a BIP39 English mnemonic phrase.
+ * 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 cwd = process.cwd();
-  const filenames = fs.readdirSync(cwd).filter((f) => f.startsWith('mnemonic-'));
+  const dirs = [getMnemonicsDir(), process.cwd()];
+  const seenBasenames = new Set<string>();
   const entries: MnemonicFileEntry[] = [];
 
-  for (const filename of filenames) {
-    try {
-      const content = fs.readFileSync(path.join(cwd, filename), 'utf-8').trim();
-      const parsed = BCHMnemonicURL.fromURL(content);
-      const raw = parsed.toObject();
+  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;
+        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(/\.[^.]+$/, '');
+        /** 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 });
-    } catch {
-      // Skip files that can't be parsed
+        entries.push({ filename, label, mnemonic: mnemonicResult.phrase });
+        seenBasenames.add(filename);
+      } catch {
+        // Skip files that can't be parsed
+      }
     }
   }
   return entries;
@@ -91,6 +101,9 @@ export function SeedInputScreen(): React.ReactElement {
   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');
 
@@ -104,8 +117,8 @@ export function SeedInputScreen(): React.ReactElement {
    * The ordered list of focusable sections (files section only when entries exist).
    */
   const focusSections: FocusSection[] = mnemonicFiles.length > 0
-    ? ['files', 'input', 'button']
-    : ['input', 'button'];
+    ? ['files', 'input', 'saveCheckbox', 'button']
+    : ['input', 'saveCheckbox', 'button'];
 
   /**
    * Shows a status message with the given type.
@@ -118,28 +131,46 @@ export function SeedInputScreen(): React.ReactElement {
   /**
    * Shared wallet initialization handler used by both manual entry and file selection.
    */
-  const doInitialize = useCallback(async (seed: string) => {
-    showStatus('Initializing wallet...', 'loading');
-    setStatus('Initializing wallet...');
-    setIsSubmitting(true);
+  const doInitialize = useCallback(
+    async (seed: string, options?: { saveMnemonic?: boolean }) => {
+      showStatus('Initializing wallet...', 'loading');
+      setStatus('Initializing wallet...');
+      setIsSubmitting(true);
 
-    try {
-      await initializeWallet(seed);
+      try {
+        await initializeWallet(seed);
 
-      showStatus('Wallet initialized successfully!', 'success');
-      setStatus('Wallet ready');
-      setSeedPhrase('');
+        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}`;
+          }
+        }
 
-      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]);
+        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.
@@ -158,8 +189,8 @@ export function SeedInputScreen(): React.ReactElement {
       return;
     }
 
-    await doInitialize(seed);
-  }, [seedPhrase, doInitialize, showStatus]);
+    await doInitialize(seed, { saveMnemonic: saveMnemonicChecked });
+  }, [seedPhrase, saveMnemonicChecked, doInitialize, showStatus]);
 
   /**
    * Handles selecting a mnemonic file from the list.
@@ -186,6 +217,14 @@ export function SeedInputScreen(): React.ReactElement {
       return;
     }
 
+    // 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) {
@@ -319,6 +358,32 @@ export function SeedInputScreen(): React.ReactElement {
           />
         </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 && (
@@ -345,7 +410,7 @@ export function SeedInputScreen(): React.ReactElement {
       {/* Help text */}
       <Box marginTop={2}>
         <Text color={colors.textMuted} dimColor>
-          Tab: navigate sections • Enter: submit • Esc: back
+          Tab: navigate • Enter: submit, load wallet, or toggle save • Space: toggle save • Esc: back
         </Text>
       </Box>
     </Box>
diff --git a/src/tui/screens/invitations/invitation-import/steps/InputsSelectStep.tsx b/src/tui/screens/invitations/invitation-import/steps/InputsSelectStep.tsx
index a64df5f..3bdb22a 100644
--- a/src/tui/screens/invitations/invitation-import/steps/InputsSelectStep.tsx
+++ b/src/tui/screens/invitations/invitation-import/steps/InputsSelectStep.tsx
@@ -94,10 +94,7 @@ export function InputsSelectStep({
       // 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({
-
-          outputIdentifier,
-        });
+        const suitableResources = await invitation.findSuitableResources();
         for (const suitableResource of suitableResources) {
           utxoIdToSuitableResource.set(suitableResource.outpointTransactionHash + ':' + suitableResource.outpointIndex, suitableResource);
         }
diff --git a/src/utils/paths.ts b/src/utils/paths.ts
new file mode 100644
index 0000000..fbc9450
--- /dev/null
+++ b/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.`,
+  );
+}
diff --git a/tests/cli/commands/handler-contracts.test.ts b/tests/cli/commands/handler-contracts.test.ts
new file mode 100644
index 0000000..4d40da2
--- /dev/null
+++ b/tests/cli/commands/handler-contracts.test.ts
@@ -0,0 +1,86 @@
+import { describe, expect, test } from "vitest";
+
+import { handleMnemonicCommand } from "../../../src/cli/commands/mnemonic";
+import { handleTemplateCommand } from "../../../src/cli/commands/template";
+import { handleReceiveCommand } from "../../../src/cli/commands/receive";
+import { handleResourceCommand } from "../../../src/cli/commands/resource";
+import { CommandError } from "../../../src/cli/commands/types";
+import {
+  createBaseCommandDeps,
+  createCommandDeps,
+  createMockIO,
+} from "../mocks/command";
+
+const fakeApp = {
+  engine: {},
+  invitations: [],
+  unreserveAllResources: async () => 0,
+} as any;
+
+describe("command handler contracts", () => {
+  test("mnemonic throws and prints help for missing subcommand", async () => {
+    const { io, capture } = createMockIO();
+
+    await expect(
+      handleMnemonicCommand(createBaseCommandDeps(io), [], {}),
+    ).rejects.toThrow(CommandError);
+
+    try {
+      await handleMnemonicCommand(createBaseCommandDeps(io), [], {});
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe("mnemonic.subcommand.missing");
+    }
+
+    expect(capture.out.join("\n")).toContain("Usage:");
+  });
+
+  test("template throws for missing subcommand", async () => {
+    const { io, capture } = createMockIO();
+
+    await expect(
+      handleTemplateCommand(createCommandDeps(fakeApp, io), [], {}),
+    ).rejects.toThrow(CommandError);
+
+    try {
+      await handleTemplateCommand(createCommandDeps(fakeApp, io), [], {});
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe("template.subcommand.missing");
+    }
+
+    expect(capture.out.join("\n")).toContain("Usage:");
+  });
+
+  test("receive throws for missing args", async () => {
+    const { io, capture } = createMockIO();
+
+    await expect(
+      handleReceiveCommand(createCommandDeps(fakeApp, io), [], {}),
+    ).rejects.toThrow(CommandError);
+
+    try {
+      await handleReceiveCommand(createCommandDeps(fakeApp, io), [], {});
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe("receive.arguments.missing");
+    }
+
+    expect(capture.out.join("\n")).toContain("Usage:");
+  });
+
+  test("resource throws for unknown subcommand", async () => {
+    const { io } = createMockIO();
+
+    await expect(
+      handleResourceCommand(createCommandDeps(fakeApp, io), ["does-not-exist"], {}),
+    ).rejects.toThrow(CommandError);
+
+    try {
+      await handleResourceCommand(createCommandDeps(fakeApp, io), ["does-not-exist"], {});
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe("resource.subcommand.unknown");
+    }
+  });
+});
diff --git a/tests/cli/commands/invitation.test.ts b/tests/cli/commands/invitation.test.ts
new file mode 100644
index 0000000..31c4a64
--- /dev/null
+++ b/tests/cli/commands/invitation.test.ts
@@ -0,0 +1,1341 @@
+/**
+ * Comprehensive tests for the invitation CLI command.
+ *
+ * These tests are organized by flow complexity:
+ * 1. Error cases - Validate argument parsing and error handling
+ * 2. Receive flow - Simple invitation to receive funds
+ * 3. Request satoshis flow - Invitation with variables
+ * 4. Send flow - Requires UTXOs (uses addFakeResource)
+ * 5. Multi-step append flow - Incremental building of invitations
+ * 6. List and inspect - Viewing invitations
+ */
+
+import { expect, test, describe, beforeEach, afterEach } from "vitest";
+import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { addFakeResource, createMockAppService, createMockEngine, DEFAULT_SEED, randomTxHash } from "../mocks/engine";
+import { type Engine } from "@xo-cash/engine";
+import { p2pkhTemplate, p2pkhTemplateIdentifier } from "../mocks/template-p2pkh";
+import { AppService } from "../../../src/services/app";
+
+import { handleInvitationCommand } from "../../../src/cli/commands/invitation";
+import { CommandError, CommandPaths } from "../../../src/cli/commands/types";
+import { createCommandDeps, createMockIO, createMockPaths, expectLogs, type LogExpectation } from "../mocks/command";
+
+// ============================================================================
+// Error Cases - Validate argument parsing and error handling
+// ============================================================================
+
+type ErrorTestCase = {
+  name: string;
+  inputs: string[];
+  expectedEvent: string;
+};
+
+const errorTestCases: ErrorTestCase[] = [
+  // Subcommand errors
+  {
+    name: "throws when no subcommand provided",
+    inputs: [],
+    expectedEvent: "invitation.subcommand.missing",
+  },
+  {
+    name: "throws when unknown subcommand provided",
+    inputs: ["unknown-subcommand"],
+    expectedEvent: "invitation.subcommand.unknown",
+  },
+
+  // Create errors
+  {
+    name: "create throws when no arguments provided",
+    inputs: ["create"],
+    expectedEvent: "invitation.create.arguments_missing",
+  },
+  {
+    name: "create throws when only template provided (missing action)",
+    inputs: ["create", "Wallet (P2PKH)"],
+    expectedEvent: "invitation.create.arguments_missing",
+  },
+  {
+    name: "create throws when template not found",
+    inputs: ["create", "unknown-template", "receive"],
+    expectedEvent: "template.resolve.not_found",
+  },
+
+  // Append errors
+  {
+    name: "append throws when no invitation ID provided",
+    inputs: ["append"],
+    expectedEvent: "invitation.append.identifier_missing",
+  },
+  {
+    name: "append throws when invitation not found",
+    inputs: ["append", "nonexistent-invitation-id"],
+    expectedEvent: "invitation.append.not_found",
+  },
+
+  // Sign errors
+  {
+    name: "sign throws when no invitation ID provided",
+    inputs: ["sign"],
+    expectedEvent: "invitation.sign.identifier_missing",
+  },
+  {
+    name: "sign throws when invitation not found",
+    inputs: ["sign", "nonexistent-invitation-id"],
+    expectedEvent: "invitation.sign.not_found",
+  },
+
+  // Broadcast errors
+  {
+    name: "broadcast throws when no invitation ID provided",
+    inputs: ["broadcast"],
+    expectedEvent: "invitation.broadcast.identifier_missing",
+  },
+  {
+    name: "broadcast throws when invitation not found",
+    inputs: ["broadcast", "nonexistent-invitation-id"],
+    expectedEvent: "invitation.broadcast.not_found",
+  },
+
+  // Requirements errors
+  {
+    name: "requirements throws when no invitation ID provided",
+    inputs: ["requirements"],
+    expectedEvent: "invitation.requirements.identifier_missing",
+  },
+  {
+    name: "requirements throws when invitation not found",
+    inputs: ["requirements", "nonexistent-invitation-id"],
+    expectedEvent: "invitation.requirements.not_found",
+  },
+
+  // Import errors
+  {
+    name: "import throws when no file provided",
+    inputs: ["import"],
+    expectedEvent: "invitation.import.file_missing",
+  },
+
+  // Inspect errors
+  {
+    name: "inspect throws when no file provided",
+    inputs: ["inspect"],
+    expectedEvent: "invitation.inspect.file_missing",
+  },
+];
+
+describe("invitation command - error cases", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-errors-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  test.each(errorTestCases)("$name", async ({ inputs, expectedEvent }) => {
+    const { io } = createMockIO();
+
+    try {
+      await handleInvitationCommand(createCommandDeps(app, io, paths), inputs, {});
+      expect.fail("Expected command to throw");
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe(expectedEvent);
+    }
+  });
+});
+
+// ============================================================================
+// Receive Flow - Simple invitation to receive funds
+// ============================================================================
+
+describe("invitation command - receive flow", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-receive-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests that a basic receive invitation can be created.
+   * The receive action generates an address for receiving funds.
+   */
+  test("creates receive invitation successfully", async () => {
+    const { io, spies } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    expect(result.invitationIdentifier).toMatch(/^[a-f0-9]{32}$/);
+    expectLogs(spies, [{ out: "Invitation created" }]);
+  });
+
+  /**
+   * Tests that an invitation file is written to the working directory.
+   */
+  test("writes invitation file to working directory", async () => {
+    const { io } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const expectedFile = path.join(tempDir, `inv-${result.invitationIdentifier}.json`);
+    expect(existsSync(expectedFile)).toBe(true);
+  });
+
+  /**
+   * Tests that the invitation is tracked by the app service.
+   */
+  test("invitation is tracked by app service", async () => {
+    const { io } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const tracked = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === result.invitationIdentifier,
+    );
+    expect(tracked).toBeDefined();
+    expect(tracked?.data.actionIdentifier).toBe("receive");
+  });
+
+  /**
+   * Tests that appropriate message is shown after creation.
+   * The receive action for receiver role is self-complete, so it shows "All requirements satisfied".
+   */
+  test("shows completion message after creation", async () => {
+    const { io, spies } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    expectLogs(spies, [{ out: "All requirements satisfied" }]);
+  });
+
+  /**
+   * Tests that the invitation identifier is returned in the result.
+   */
+  test("returns invitation identifier in result", async () => {
+    const { io } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    expect(result).toHaveProperty("invitationIdentifier");
+    expect(typeof result.invitationIdentifier).toBe("string");
+    expect(result.invitationIdentifier).toHaveLength(32);
+  });
+});
+
+// ============================================================================
+// Request Satoshis Flow - Invitation with variables
+// ============================================================================
+
+describe("invitation command - request satoshis flow", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-request-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests creating an invitation with a variable via -var-requested-satoshis.
+   * The requestSatoshis action requires the receiver to specify an amount.
+   */
+  test("creates invitation with variable", async () => {
+    const { io, spies } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      { varRequestedSatoshis: "10000", role: "receiver" },
+    );
+
+    expect(result.invitationIdentifier).toMatch(/^[a-f0-9]{32}$/);
+    expectLogs(spies, [{ out: "Invitation created" }]);
+  });
+
+  /**
+   * Tests that the variable is committed to the invitation.
+   */
+  test("variable is committed to invitation", async () => {
+    const { io } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      { varRequestedSatoshis: "10000", role: "receiver" },
+    );
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === result.invitationIdentifier,
+    );
+    expect(invitation).toBeDefined();
+
+    const variables = invitation?.data.commits.flatMap((c) => c.data.variables ?? []);
+    const requestedSatoshis = variables?.find((v) => v.variableIdentifier === "requestedSatoshis");
+    expect(requestedSatoshis).toBeDefined();
+    expect(requestedSatoshis?.value).toBe("10000");
+  });
+
+  /**
+   * Tests that the role identifier is attached to the variable.
+   */
+  test("role is attached to variable", async () => {
+    const { io } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      { varRequestedSatoshis: "10000", role: "receiver" },
+    );
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === result.invitationIdentifier,
+    );
+
+    const variables = invitation?.data.commits.flatMap((c) => c.data.variables ?? []);
+    const requestedSatoshis = variables?.find((v) => v.variableIdentifier === "requestedSatoshis");
+    expect(requestedSatoshis?.roleIdentifier).toBe("receiver");
+  });
+});
+
+// ============================================================================
+// Send Flow - Requires UTXOs (uses addFakeResource)
+// ============================================================================
+
+describe("invitation command - send flow with resources", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-send-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests that sendSatoshis invitation can be created with variables.
+   * Note: This doesn't add inputs yet, just tests variable handling.
+   */
+  test("creates sendSatoshis invitation with variables", async () => {
+    const { io, spies } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "sendSatoshis"],
+      {
+        varTransferredSatoshis: "10000",
+        varRecipientLockingscript: "76a91489abcdefabbaabbaabbaabbaabbaabbaabbaabba88ac",
+        role: "sender",
+      },
+    );
+
+    expect(result.invitationIdentifier).toMatch(/^[a-f0-9]{32}$/);
+    expectLogs(spies, [{ out: "Invitation created" }]);
+  });
+
+  /**
+   * Tests that variables are committed to sendSatoshis invitation.
+   */
+  test("variables are committed to sendSatoshis invitation", async () => {
+    const { io } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "sendSatoshis"],
+      {
+        varTransferredSatoshis: "10000",
+        varRecipientLockingscript: "76a91489abcdefabbaabbaabbaabbaabbaabbaabbaabba88ac",
+        role: "sender",
+      },
+    );
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === result.invitationIdentifier,
+    );
+    expect(invitation).toBeDefined();
+
+    const variables = invitation?.data.commits.flatMap((c) => c.data.variables ?? []);
+    const transferredSatoshis = variables?.find((v) => v.variableIdentifier === "transferredSatoshis");
+    expect(transferredSatoshis).toBeDefined();
+    expect(transferredSatoshis?.value).toBe("10000");
+  });
+
+  /**
+   * Tests that an error is thrown when the specified UTXO doesn't exist.
+   */
+  test("throws when specified UTXO not found", async () => {
+    const { io } = createMockIO();
+
+    try {
+      await handleInvitationCommand(
+        createCommandDeps(app, io, paths),
+        ["create", "Wallet (P2PKH)", "sendSatoshis"],
+        {
+          varTransferredSatoshis: "10000",
+          varRecipientLockingscript: "76a91489abcdefabbaabbaabbaabbaabbaabbaabbaabba88ac",
+          addInput: "0000000000000000000000000000000000000000000000000000000000000000:0",
+          role: "sender",
+        },
+      );
+      expect.fail("Expected command to throw");
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+    }
+  });
+
+  /**
+   * Tests that fake resources can be added and listed.
+   * This validates our test infrastructure works correctly.
+   */
+  test("fake resources are accessible via engine", async () => {
+    const resource = await addFakeResource(engine, {
+      valueSatoshis: 50000,
+      templateIdentifier: p2pkhTemplateIdentifier,
+      outputIdentifier: "receiveOutput",
+    });
+
+    const allResources = await engine.listUnspentOutputsData();
+    const found = allResources.find(
+      (r) =>
+        r.outpointTransactionHash === resource.outpointTransactionHash &&
+        r.outpointIndex === resource.outpointIndex,
+    );
+
+    expect(found).toBeDefined();
+    expect(found?.valueSatoshis).toBe(50000);
+  });
+});
+
+// ============================================================================
+// Multi-Step Append Flow - Incremental building of invitations
+// ============================================================================
+
+describe("invitation command - multi-step append", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-append-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests appending variables to an existing invitation.
+   */
+  test("appends variables to existing invitation", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const { io: appendIO, spies } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, appendIO, paths),
+      ["append", createResult.invitationIdentifier!],
+      { varRequestedSatoshis: "25000", role: "receiver" },
+    );
+
+    expectLogs(spies, [{ out: "Invitation appended" }]);
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === createResult.invitationIdentifier,
+    );
+    const variables = invitation?.data.commits.flatMap((c) => c.data.variables ?? []);
+    const requestedSatoshis = variables?.find((v) => v.variableIdentifier === "requestedSatoshis");
+    expect(requestedSatoshis?.value).toBe("25000");
+  });
+
+  /**
+   * Tests that append succeeds when only variables are provided.
+   * When outputs are auto-discovered from the template, append can succeed with just variables.
+   */
+  test("append succeeds with just variables on fresh invitation", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const { io: appendIO, spies } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, appendIO, paths),
+      ["append", createResult.invitationIdentifier!],
+      { varRequestedSatoshis: "5000", role: "receiver" },
+    );
+
+    expectLogs(spies, [{ out: "Invitation appended" }]);
+  });
+
+  /**
+   * Tests that the invitation file is updated after append.
+   */
+  test("updates invitation file after append", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const { io: appendIO, spies } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, appendIO, paths),
+      ["append", createResult.invitationIdentifier!],
+      { varRequestedSatoshis: "25000", role: "receiver" },
+    );
+
+    expectLogs(spies, [{ out: "Invitation updated" }]);
+
+    const expectedFile = path.join(tempDir, `inv-${createResult.invitationIdentifier}.json`);
+    expect(existsSync(expectedFile)).toBe(true);
+  });
+
+  /**
+   * Tests that multiple append operations can add variables incrementally.
+   * Uses requestSatoshis which has straightforward requirements.
+   */
+  test("multiple appends add variables incrementally", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const { io: append1IO } = createMockIO();
+    await handleInvitationCommand(
+      createCommandDeps(app, append1IO, paths),
+      ["append", createResult.invitationIdentifier!],
+      { varRequestedSatoshis: "10000", role: "receiver" },
+    );
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === createResult.invitationIdentifier,
+    );
+    expect(invitation?.data.commits.length).toBeGreaterThan(1);
+
+    const variables = invitation?.data.commits.flatMap((c) => c.data.variables ?? []);
+    const requestedSatoshis = variables?.find((v) => v.variableIdentifier === "requestedSatoshis");
+    expect(requestedSatoshis?.value).toBe("10000");
+  });
+});
+
+// ============================================================================
+// List and Inspect - Viewing invitations
+// ============================================================================
+
+describe("invitation command - list and inspect", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-list-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests that list returns count of created invitations.
+   */
+  test("list returns count of invitations", async () => {
+    const { io: createIO } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const { io: listIO } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, listIO, paths),
+      ["list"],
+      {},
+    );
+
+    expect(result.count).toBe(1);
+  });
+
+  /**
+   * Tests that list shows template name.
+   */
+  test("list shows template name", async () => {
+    const { io: createIO } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const { io: listIO, spies } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, listIO, paths),
+      ["list"],
+      {},
+    );
+
+    expectLogs(spies, [{ out: "Wallet (P2PKH)" }]);
+  });
+
+  /**
+   * Tests that list returns zero when no invitations exist.
+   */
+  test("list returns zero when no invitations", async () => {
+    const { io } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["list"],
+      {},
+    );
+
+    expect(result.count).toBe(0);
+  });
+
+  /**
+   * Tests that requirements shows invitation requirements.
+   */
+  test("requirements shows invitation requirements", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const { io: reqIO, spies } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, reqIO, paths),
+      ["requirements", createResult.invitationIdentifier!],
+      {},
+    );
+
+    expect(result.invitationIdentifier).toBe(createResult.invitationIdentifier);
+    expect(spies.out).toHaveBeenCalled();
+  });
+
+  /**
+   * Tests that inspect reads an invitation file and shows details.
+   */
+  test("inspect reads invitation file", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const invitationFilePath = path.join(tempDir, `inv-${createResult.invitationIdentifier}.json`);
+
+    const { io: inspectIO } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, inspectIO, paths),
+      ["inspect", invitationFilePath],
+      {},
+    );
+
+    expect(result.templateName).toBe("Wallet (P2PKH)");
+    expect(result.actionIdentifier).toBe("receive");
+    expect(result.status).toBeDefined();
+  });
+
+  /**
+   * Tests that multiple invitations can be listed.
+   */
+  test("list shows multiple invitations", async () => {
+    const { io: create1IO } = createMockIO();
+    await handleInvitationCommand(
+      createCommandDeps(app, create1IO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const { io: create2IO } = createMockIO();
+    await handleInvitationCommand(
+      createCommandDeps(app, create2IO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const { io: listIO } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, listIO, paths),
+      ["list"],
+      {},
+    );
+
+    expect(result.count).toBe(2);
+  });
+});
+
+// ============================================================================
+// Sign Flow - Signing invitations
+// ============================================================================
+
+describe("invitation command - sign flow", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-sign-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests that a satisfied invitation can be signed.
+   * The receive action is self-complete, so it can be signed immediately.
+   */
+  test("signs a satisfied invitation", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const { io: signIO, spies } = createMockIO();
+
+    const signResult = await handleInvitationCommand(
+      createCommandDeps(app, signIO, paths),
+      ["sign", createResult.invitationIdentifier!],
+      {},
+    );
+
+    expect(signResult.invitationIdentifier).toBe(createResult.invitationIdentifier);
+    expectLogs(spies, [{ out: "Invitation signed" }]);
+  });
+
+  /**
+   * Tests that the invitation has signed commits after signing.
+   * Note: Status check depends on internal Invitation class logic which
+   * may require specific conditions (inputs with mergesWith and unlockingBytecode).
+   */
+  test("invitation has signed commits after signing", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const { io: signIO } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, signIO, paths),
+      ["sign", createResult.invitationIdentifier!],
+      {},
+    );
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === createResult.invitationIdentifier,
+    );
+
+    expect(invitation).toBeDefined();
+    expect(invitation?.data.commits.length).toBeGreaterThan(0);
+  });
+
+  /**
+   * Tests the --sign flag on create auto-signs when requirements are satisfied.
+   */
+  test("--sign flag auto-signs on create", async () => {
+    const { io, spies } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      { sign: "true" },
+    );
+
+    expect(result.invitationIdentifier).toMatch(/^[a-f0-9]{32}$/);
+    expectLogs(spies, [
+      { out: "Invitation created" },
+      { out: "Invitation signed" },
+    ]);
+  });
+
+  /**
+   * Tests that signing fails when invitation doesn't exist.
+   */
+  test("sign throws when invitation not found", async () => {
+    const { io } = createMockIO();
+
+    try {
+      await handleInvitationCommand(
+        createCommandDeps(app, io, paths),
+        ["sign", "nonexistent-id"],
+        {},
+      );
+      expect.fail("Expected command to throw");
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe("invitation.sign.not_found");
+    }
+  });
+});
+
+// ============================================================================
+// Import Flow - Importing invitation files
+// ============================================================================
+
+describe("invitation command - import flow", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-import-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests that an invitation file can be imported.
+   */
+  test("imports invitation from file", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const invitationFilePath = path.join(tempDir, `inv-${createResult.invitationIdentifier}.json`);
+
+    const secondApp = await createMockAppService(engine);
+    const { io: importIO } = createMockIO();
+
+    const importResult = await handleInvitationCommand(
+      createCommandDeps(secondApp, importIO, paths),
+      ["import", invitationFilePath],
+      {},
+    );
+
+    expect(importResult.invitationIdentifier).toBeDefined();
+  });
+
+  /**
+   * Tests that import fails when file doesn't exist.
+   */
+  test("import throws when file not found", async () => {
+    const { io } = createMockIO();
+
+    try {
+      await handleInvitationCommand(
+        createCommandDeps(app, io, paths),
+        ["import", "/nonexistent/path/invitation.json"],
+        {},
+      );
+      expect.fail("Expected command to throw");
+    } catch (error) {
+      expect(error).toBeDefined();
+    }
+  });
+
+  /**
+   * Tests that imported invitation is tracked by app service.
+   */
+  test("imported invitation is tracked by app service", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const invitationFilePath = path.join(tempDir, `inv-${createResult.invitationIdentifier}.json`);
+
+    const secondApp = await createMockAppService(engine);
+    const { io: importIO } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(secondApp, importIO, paths),
+      ["import", invitationFilePath],
+      {},
+    );
+
+    expect(secondApp.invitations.length).toBe(1);
+  });
+
+  /**
+   * Tests that an imported invitation retains its data.
+   */
+  test("imported invitation retains action identifier", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const invitationFilePath = path.join(tempDir, `inv-${createResult.invitationIdentifier}.json`);
+
+    const secondApp = await createMockAppService(engine);
+    const { io: importIO } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(secondApp, importIO, paths),
+      ["import", invitationFilePath],
+      {},
+    );
+
+    const imported = secondApp.invitations[0];
+    expect(imported.data.actionIdentifier).toBe("receive");
+    expect(imported.data.templateIdentifier).toBe(p2pkhTemplateIdentifier);
+  });
+});
+
+// ============================================================================
+// Auto-Inputs Flow - Automatic UTXO selection
+// ============================================================================
+
+describe("invitation command - auto-inputs flow", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-autoinputs-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests that --auto-inputs flag triggers automatic UTXO selection.
+   * When no suitable UTXOs exist, it should fail gracefully.
+   */
+  test("auto-inputs fails when no suitable UTXOs available", async () => {
+    const { io } = createMockIO();
+
+    try {
+      await handleInvitationCommand(
+        createCommandDeps(app, io, paths),
+        ["create", "Wallet (P2PKH)", "sendSatoshis"],
+        {
+          varTransferredSatoshis: "10000",
+          varRecipientLockingscript: "76a91489abcdefabbaabbaabbaabbaabbaabbaabbaabba88ac",
+          role: "sender",
+          autoInputs: "true",
+        },
+      );
+      expect.fail("Expected command to throw");
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe("invitation.create.append_params_failed");
+    }
+  });
+
+  /**
+   * Tests that auto-inputs logs when no UTXOs are found.
+   */
+  test("auto-inputs logs error when no UTXOs found", async () => {
+    const { io, spies } = createMockIO();
+
+    try {
+      await handleInvitationCommand(
+        createCommandDeps(app, io, paths),
+        ["create", "Wallet (P2PKH)", "sendSatoshis"],
+        {
+          varTransferredSatoshis: "10000",
+          varRecipientLockingscript: "76a91489abcdefabbaabbaabbaabbaabbaabbaabbaabba88ac",
+          role: "sender",
+          autoInputs: "true",
+        },
+      );
+    } catch (error) {
+      expectLogs(spies, [{ err: "No suitable UTXOs found" }]);
+    }
+  });
+});
+
+// ============================================================================
+// Broadcast Flow - Broadcasting invitations
+// ============================================================================
+
+describe("invitation command - broadcast flow", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-broadcast-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests that broadcast fails when invitation not found.
+   */
+  test("broadcast throws when invitation not found", async () => {
+    const { io } = createMockIO();
+
+    try {
+      await handleInvitationCommand(
+        createCommandDeps(app, io, paths),
+        ["broadcast", "nonexistent-id"],
+        {},
+      );
+      expect.fail("Expected command to throw");
+    } catch (error) {
+      expect(error).toBeInstanceOf(CommandError);
+      expect((error as CommandError).event).toBe("invitation.broadcast.not_found");
+    }
+  });
+
+  /**
+   * Tests the --broadcast flag on create.
+   * Note: This will attempt to broadcast, which may fail in test environment
+   * without proper mocking, but the flag should be recognized.
+   */
+  test("--broadcast flag is recognized on create", async () => {
+    const { io } = createMockIO();
+
+    try {
+      await handleInvitationCommand(
+        createCommandDeps(app, io, paths),
+        ["create", "Wallet (P2PKH)", "receive"],
+        { broadcast: "true" },
+      );
+    } catch (error) {
+      expect((error as Error).message).not.toContain("unknown option");
+    }
+  });
+});
+
+// ============================================================================
+// Full Lifecycle - End-to-end flows
+// ============================================================================
+
+describe("invitation command - full lifecycle", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+  let paths: CommandPaths;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-invitation-lifecycle-"));
+    paths = createMockPaths(tempDir);
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  /**
+   * Tests complete create → sign flow for receive action.
+   * The receive action is self-complete and can be signed immediately.
+   */
+  test("create → sign flow for receive", async () => {
+    const { io: createIO, spies: createSpies } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    expect(createResult.invitationIdentifier).toMatch(/^[a-f0-9]{32}$/);
+    expectLogs(createSpies, [{ out: "Invitation created" }]);
+
+    const { io: signIO, spies: signSpies } = createMockIO();
+
+    const signResult = await handleInvitationCommand(
+      createCommandDeps(app, signIO, paths),
+      ["sign", createResult.invitationIdentifier!],
+      {},
+    );
+
+    expect(signResult.invitationIdentifier).toBe(createResult.invitationIdentifier);
+    expectLogs(signSpies, [{ out: "Invitation signed" }]);
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === createResult.invitationIdentifier,
+    );
+    expect(invitation).toBeDefined();
+    expect(invitation?.data.commits.length).toBeGreaterThan(0);
+  });
+
+  /**
+   * Tests that invitation file is persisted and can be inspected after creation.
+   */
+  test("create → inspect round-trip", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      {},
+    );
+
+    const invitationFilePath = path.join(tempDir, `inv-${createResult.invitationIdentifier}.json`);
+    expect(existsSync(invitationFilePath)).toBe(true);
+
+    const { io: inspectIO } = createMockIO();
+
+    const inspectResult = await handleInvitationCommand(
+      createCommandDeps(app, inspectIO, paths),
+      ["inspect", invitationFilePath],
+      {},
+    );
+
+    expect(inspectResult.templateName).toBe("Wallet (P2PKH)");
+    expect(inspectResult.actionIdentifier).toBe("receive");
+  });
+
+  /**
+   * Tests create → append → sign flow for requestSatoshis.
+   * First creates without variables, then appends them, then signs.
+   */
+  test("create → append → sign flow for requestSatoshis", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const { io: appendIO } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, appendIO, paths),
+      ["append", createResult.invitationIdentifier!],
+      { varRequestedSatoshis: "10000", role: "receiver" },
+    );
+
+    const { io: signIO, spies: signSpies } = createMockIO();
+
+    const signResult = await handleInvitationCommand(
+      createCommandDeps(app, signIO, paths),
+      ["sign", createResult.invitationIdentifier!],
+      {},
+    );
+
+    expect(signResult.invitationIdentifier).toBe(createResult.invitationIdentifier);
+    expectLogs(signSpies, [{ out: "Invitation signed" }]);
+  });
+
+  /**
+   * Tests that invitation file is updated after each operation.
+   */
+  test("invitation file is updated at each step", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const invitationFilePath = path.join(tempDir, `inv-${createResult.invitationIdentifier}.json`);
+
+    const afterCreate = JSON.parse(readFileSync(invitationFilePath, "utf-8"));
+    const createCommitCount = afterCreate.commits?.length ?? 0;
+
+    const { io: appendIO } = createMockIO();
+
+    await handleInvitationCommand(
+      createCommandDeps(app, appendIO, paths),
+      ["append", createResult.invitationIdentifier!],
+      { varRequestedSatoshis: "10000", role: "receiver" },
+    );
+
+    const afterAppend = JSON.parse(readFileSync(invitationFilePath, "utf-8"));
+    const appendCommitCount = afterAppend.commits?.length ?? 0;
+
+    expect(appendCommitCount).toBeGreaterThan(createCommitCount);
+  });
+
+  /**
+   * Tests create with --sign flag for immediate signing.
+   */
+  test("create with --sign for immediate signing", async () => {
+    const { io, spies } = createMockIO();
+
+    const result = await handleInvitationCommand(
+      createCommandDeps(app, io, paths),
+      ["create", "Wallet (P2PKH)", "receive"],
+      { sign: "true" },
+    );
+
+    expect(result.invitationIdentifier).toMatch(/^[a-f0-9]{32}$/);
+
+    const invitation = app.invitations.find(
+      (inv) => inv.data.invitationIdentifier === result.invitationIdentifier,
+    );
+    expect(invitation).toBeDefined();
+    expect(invitation?.data.commits.length).toBeGreaterThan(0);
+
+    expectLogs(spies, [
+      { out: "Invitation created" },
+      { out: "Invitation signed" },
+    ]);
+  });
+
+  /**
+   * Tests that requirements can be checked at any point.
+   */
+  test("requirements can be checked mid-flow", async () => {
+    const { io: createIO } = createMockIO();
+
+    const createResult = await handleInvitationCommand(
+      createCommandDeps(app, createIO, paths),
+      ["create", "Wallet (P2PKH)", "requestSatoshis"],
+      {},
+    );
+
+    const { io: reqIO, spies } = createMockIO();
+
+    const reqResult = await handleInvitationCommand(
+      createCommandDeps(app, reqIO, paths),
+      ["requirements", createResult.invitationIdentifier!],
+      {},
+    );
+
+    expect(reqResult.invitationIdentifier).toBe(createResult.invitationIdentifier);
+    expect(spies.out).toHaveBeenCalled();
+  });
+});
diff --git a/tests/cli/commands/mnemonic.test.ts b/tests/cli/commands/mnemonic.test.ts
new file mode 100644
index 0000000..3b19607
--- /dev/null
+++ b/tests/cli/commands/mnemonic.test.ts
@@ -0,0 +1,146 @@
+import { expect, test, describe, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { DEFAULT_SEED } from "../mocks/engine";
+
+import { handleMnemonicCommand } from "../../../src/cli/commands/mnemonic";
+import { CommandError } from "../../../src/cli/commands/types";
+import { createMockIO, createMockPaths, expectLogs, type LogExpectation } from "../mocks/command";
+import { BCHMnemonicURL } from "../../../src/utils/bch-mnemonic-url";
+
+type TestCase = {
+  inputs: string[];
+  options?: Record<string, string>;
+  shouldThrow: boolean;
+  expectedEvent?: string;
+  expectedData?: Record<string, unknown>;
+  logs?: LogExpectation[];
+};
+
+const testCases: TestCase[] = [
+  // Successful creation of a mnemonic file
+  {
+    inputs: ["create"],
+    shouldThrow: false,
+    expectedData: {
+      savedAs: expect.stringMatching(/^mnemonic-\w+$/),
+    },
+    logs: [{ out: "Mnemonic file created" }],
+  },
+  // Successfully creating a mnemonic file with a custom filename
+  {
+    inputs: ["create"],
+    options: { output: "custom-filename" },
+    shouldThrow: false,
+    expectedData: {
+      savedAs: "custom-filename",
+    },
+    logs: [{ out: "custom-filename" }],
+  },
+  // Successfully listing mnemonic files
+  {
+    inputs: ["list"],
+    shouldThrow: false,
+    expectedData: {
+      count: expect.toSatisfy((count: number) => count >= 1),
+    },
+    logs: [{ out: "mnemonic-test" }],
+  },
+  // Successfully exposing a mnemonic file
+  {
+    inputs: ["expose", "mnemonic-test"],
+    shouldThrow: false,
+    expectedData: {
+      mnemonic: DEFAULT_SEED,
+    },
+    logs: [{ out: DEFAULT_SEED }],
+  },
+  // Successfully importing a mnemonic file
+  {
+    inputs: ["import", ...DEFAULT_SEED.split(" ")],
+    shouldThrow: false,
+    expectedData: {
+      savedAs: expect.stringMatching(/^mnemonic-\w+$/),
+    },
+    logs: [{ out: "Mnemonic file created" }],
+  },
+  // Failure to import a mnemonic file due to missing arguments
+  {
+    inputs: ["import"],
+    shouldThrow: true,
+    expectedEvent: "mnemonic.import.seed_missing",
+  },
+  // Failure to expose a mnemonic file due to missing arguments
+  {
+    inputs: ["expose"],
+    shouldThrow: true,
+    expectedEvent: "mnemonic.expose.file_missing",
+  },
+  // Failure to expose a mnemonic file due to unknown mnemonic file
+  {
+    inputs: ["expose", "unknown-mnemonic-file"],
+    shouldThrow: true,
+    expectedEvent: "mnemonic.expose.file_not_found",
+  },
+  // Missing sub-command
+  {
+    inputs: [],
+    shouldThrow: true,
+    expectedEvent: "mnemonic.subcommand.missing",
+  },
+  // Unknown sub-command
+  {
+    inputs: ["unknown"],
+    shouldThrow: true,
+    expectedEvent: "mnemonic.subcommand.unknown",
+  },
+];
+
+describe("mnemonic commands", () => {
+  let tempDir: string;
+
+  beforeEach(async () => {
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-mnemonic-tests-"));
+    
+    // Write a single test mnemonic file to the temp directory
+    writeFileSync(
+      path.join(tempDir, "mnemonic-test"),
+      BCHMnemonicURL.fromSeed(DEFAULT_SEED).toURL(),
+      "utf8",
+    );
+  });
+
+  afterEach(async () => {
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  test.each(testCases)("mnemonic command: $inputs", async ({ inputs, options, shouldThrow, expectedEvent, expectedData, logs }) => {
+    const { io, spies } = createMockIO();
+    const paths = createMockPaths(tempDir);
+
+    if (shouldThrow) {
+      try {
+        await handleMnemonicCommand({ io, paths }, inputs, options ?? {});
+        expect.fail("Expected command to throw");
+      } catch (error) {
+        if (expectedEvent) {
+          expect(error).toBeInstanceOf(CommandError);
+          expect((error as CommandError).event).toBe(expectedEvent);
+        }
+      }
+    } else {
+      const result = await handleMnemonicCommand({ io, paths }, inputs, options ?? {});
+      if (expectedData) {
+        Object.entries(expectedData).forEach(([key, value]) => {
+          expect(result[key as keyof typeof result]).toEqual(value);
+        });
+      }
+    }
+
+    if (logs) {
+      expectLogs(spies, logs);
+    }
+  });
+});
\ No newline at end of file
diff --git a/tests/cli/commands/receive.test.ts b/tests/cli/commands/receive.test.ts
new file mode 100644
index 0000000..a56d9e5
--- /dev/null
+++ b/tests/cli/commands/receive.test.ts
@@ -0,0 +1,114 @@
+import { expect, test, describe, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { createMockAppService, createMockEngine, DEFAULT_SEED } from "../mocks/engine";
+import { type Engine } from "@xo-cash/engine";
+import { p2pkhTemplate } from "../mocks/template-p2pkh";
+import { AppService } from "../../../src/services/app";
+
+import { handleReceiveCommand } from "../../../src/cli/commands/receive";
+import { CommandError } from "../../../src/cli/commands/types";
+import { createCommandDeps, createMockIO, expectLogs, type LogExpectation } from "../mocks/command";
+
+type TestCase = {
+  name: string;
+  inputs: string[];
+  options?: Record<string, string>;
+  shouldThrow: boolean;
+  expectedEvent?: string;
+  expectedData?: Record<string, unknown>;
+  logs?: LogExpectation[];
+};
+
+const testCases: TestCase[] = [
+  // Successful address generation with template name and output identifier
+  {
+    name: "generates address with template name and output",
+    inputs: ["Wallet (P2PKH)", "receiveOutput"],
+    shouldThrow: false,
+    expectedData: {
+      address: expect.stringMatching(/^bitcoincash:q[a-z0-9]+$/),
+    },
+    logs: [{ out: "bitcoincash:q" }],
+  },
+  // Successful address generation with role specified
+  {
+    name: "generates address with template name, output, and role",
+    inputs: ["Wallet (P2PKH)", "receiveOutput", "receiver"],
+    shouldThrow: false,
+    expectedData: {
+      address: expect.stringMatching(/^bitcoincash:q[a-z0-9]+$/),
+    },
+    logs: [{ out: "bitcoincash:q" }],
+  },
+  // Missing all required arguments
+  {
+    name: "throws when no arguments provided",
+    inputs: [],
+    shouldThrow: true,
+    expectedEvent: "receive.arguments.missing",
+  },
+  // Missing output identifier
+  {
+    name: "throws when output identifier missing",
+    inputs: ["Wallet (P2PKH)"],
+    shouldThrow: true,
+    expectedEvent: "receive.arguments.missing",
+  },
+  // Unknown template
+  {
+    name: "throws when template not found",
+    inputs: ["unknown-template", "receiveOutput"],
+    shouldThrow: true,
+    expectedEvent: "template.resolve.not_found",
+  },
+];
+
+describe("receive command", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+
+    app = await createMockAppService(engine);
+
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-receive-tests-"));
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  test.each(testCases)("$name", async ({ inputs, options, shouldThrow, expectedEvent, expectedData, logs }) => {
+    const { io, spies } = createMockIO();
+
+    if (shouldThrow) {
+      try {
+        await handleReceiveCommand(createCommandDeps(app, io), inputs, options ?? {});
+        expect.fail("Expected command to throw");
+      } catch (error) {
+        if (expectedEvent) {
+          expect(error).toBeInstanceOf(CommandError);
+          expect((error as CommandError).event).toBe(expectedEvent);
+        }
+      }
+    } else {
+      const result = await handleReceiveCommand(createCommandDeps(app, io), inputs, options ?? {});
+      if (expectedData) {
+        Object.entries(expectedData).forEach(([key, value]) => {
+          expect(result[key as keyof typeof result]).toEqual(value);
+        });
+      }
+    }
+
+    if (logs) {
+      expectLogs(spies, logs);
+    }
+  });
+});
diff --git a/tests/cli/commands/resource.test.ts b/tests/cli/commands/resource.test.ts
new file mode 100644
index 0000000..427289d
--- /dev/null
+++ b/tests/cli/commands/resource.test.ts
@@ -0,0 +1,279 @@
+import { expect, test, describe, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { addFakeResource, createMockAppService, createMockEngine, DEFAULT_SEED, reserveResource } from "../mocks/engine";
+import { type Engine } from "@xo-cash/engine";
+import { p2pkhTemplate } from "../mocks/template-p2pkh";
+import { AppService } from "../../../src/services/app";
+
+import { handleResourceCommand } from "../../../src/cli/commands/resource";
+import { CommandError } from "../../../src/cli/commands/types";
+import { createCommandDeps, createMockIO, expectLogs, type LogExpectation } from "../mocks/command";
+
+type TestCase = {
+  name: string;
+  inputs: string[];
+  options?: Record<string, string>;
+  shouldThrow: boolean;
+  expectedEvent?: string;
+  expectedData?: Record<string, unknown>;
+  logs?: LogExpectation[];
+};
+
+const testCases: TestCase[] = [
+  // List commands (no resources in empty wallet)
+  {
+    name: "list returns empty count when no resources",
+    inputs: ["list"],
+    shouldThrow: false,
+    expectedData: {
+      count: 0,
+    },
+    logs: [{ out: "No resources found" }],
+  },
+  {
+    name: "list reserved returns empty count when no reserved resources",
+    inputs: ["list", "reserved"],
+    shouldThrow: false,
+    expectedData: {
+      count: 0,
+    },
+    logs: [{ out: "No resources found" }],
+  },
+  {
+    name: "list all returns empty count when no resources",
+    inputs: ["list", "all"],
+    shouldThrow: false,
+    expectedData: {
+      count: 0,
+    },
+    logs: [{ out: "No resources found" }],
+  },
+  // Unreserve-all with no resources
+  {
+    name: "unreserve-all returns zero count when no reserved resources",
+    inputs: ["unreserve-all"],
+    shouldThrow: false,
+    expectedData: {
+      count: 0,
+    },
+    logs: [{ out: "No reserved resources" }],
+  },
+  // Error cases
+  {
+    name: "throws when no subcommand provided",
+    inputs: [],
+    shouldThrow: true,
+    expectedEvent: "resource.subcommand.missing",
+  },
+  {
+    name: "throws when unknown subcommand provided",
+    inputs: ["unknown-subcommand"],
+    shouldThrow: true,
+    expectedEvent: "resource.subcommand.unknown",
+  },
+  {
+    name: "throws when unreserve called without outpoint",
+    inputs: ["unreserve"],
+    shouldThrow: true,
+    expectedEvent: "resource.unreserve.outpoint_missing",
+  },
+  {
+    name: "throws when unreserve called with invalid outpoint format (no colon)",
+    inputs: ["unreserve", "invalid-outpoint"],
+    shouldThrow: true,
+    expectedEvent: "resource.unreserve.outpoint_invalid",
+  },
+  {
+    name: "throws when unreserve called with invalid outpoint format (no vout)",
+    inputs: ["unreserve", "abc123:"],
+    shouldThrow: true,
+    expectedEvent: "resource.unreserve.outpoint_invalid",
+  },
+  {
+    name: "throws when unreserve called with non-existent UTXO",
+    inputs: ["unreserve", "0000000000000000000000000000000000000000000000000000000000000000:0"],
+    shouldThrow: true,
+    expectedEvent: "resource.unreserve.utxo_missing",
+  },
+];
+
+describe("resource command", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+
+    app = await createMockAppService(engine);
+
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-resource-tests-"));
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  test.each(testCases)("$name", async ({ inputs, options, shouldThrow, expectedEvent, expectedData, logs }) => {
+    const { io, spies } = createMockIO();
+
+    if (shouldThrow) {
+      try {
+        await handleResourceCommand(createCommandDeps(app, io), inputs, options ?? {});
+        expect.fail("Expected command to throw");
+      } catch (error) {
+        if (expectedEvent) {
+          expect(error).toBeInstanceOf(CommandError);
+          expect((error as CommandError).event).toBe(expectedEvent);
+        }
+      }
+    } else {
+      const result = await handleResourceCommand(createCommandDeps(app, io), inputs, options ?? {});
+      if (expectedData) {
+        Object.entries(expectedData).forEach(([key, value]) => {
+          expect(result[key as keyof typeof result]).toEqual(value);
+        });
+      }
+    }
+
+    if (logs) {
+      expectLogs(spies, logs);
+    }
+  });
+});
+
+describe("resource command with populated data", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+    app = await createMockAppService(engine);
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-resource-tests-"));
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  test("list returns count when resources exist", async () => {
+    await addFakeResource(engine, { valueSatoshis: 50000 });
+    await addFakeResource(engine, { valueSatoshis: 25000 });
+
+    const { io, spies } = createMockIO();
+    const result = await handleResourceCommand(createCommandDeps(app, io), ["list"], {});
+
+    expect(result.count).toBe(2);
+    expectLogs(spies, [{ out: "Total resources: 2" }]);
+  });
+
+  test("list shows total satoshis", async () => {
+    await addFakeResource(engine, { valueSatoshis: 50000 });
+    await addFakeResource(engine, { valueSatoshis: 25000 });
+
+    const { io, spies } = createMockIO();
+    await handleResourceCommand(createCommandDeps(app, io), ["list"], {});
+
+    expectLogs(spies, [{ out: "Total satoshis: 75000" }]);
+  });
+
+  test("list excludes reserved resources by default", async () => {
+    await addFakeResource(engine, { valueSatoshis: 50000 });
+    await addFakeResource(engine, { valueSatoshis: 25000, reservedBy: "inv-123" });
+
+    const { io } = createMockIO();
+    const result = await handleResourceCommand(createCommandDeps(app, io), ["list"], {});
+
+    expect(result.count).toBe(1);
+  });
+
+  test("list reserved shows only reserved resources", async () => {
+    await addFakeResource(engine, { valueSatoshis: 50000 });
+    await addFakeResource(engine, { valueSatoshis: 25000, reservedBy: "inv-123" });
+    await addFakeResource(engine, { valueSatoshis: 10000, reservedBy: "inv-456" });
+
+    const { io, spies } = createMockIO();
+    const result = await handleResourceCommand(createCommandDeps(app, io), ["list", "reserved"], {});
+
+    expect(result.count).toBe(2);
+    expectLogs(spies, [{ out: "reserved for inv-123" }]);
+  });
+
+  test("list all shows both reserved and unreserved", async () => {
+    await addFakeResource(engine, { valueSatoshis: 50000 });
+    await addFakeResource(engine, { valueSatoshis: 25000, reservedBy: "inv-123" });
+
+    const { io } = createMockIO();
+    const result = await handleResourceCommand(createCommandDeps(app, io), ["list", "all"], {});
+
+    expect(result.count).toBe(2);
+  });
+
+  test("unreserve releases a reserved UTXO", async () => {
+    const resource = await addFakeResource(engine, { valueSatoshis: 25000, reservedBy: "inv-123" });
+
+    const { io, spies } = createMockIO();
+    await handleResourceCommand(
+      createCommandDeps(app, io),
+      ["unreserve", `${resource.outpointTransactionHash}:${resource.outpointIndex}`],
+      {},
+    );
+
+    expectLogs(spies, [{ out: "Unreserved" }, { out: "was reserved for inv-123" }]);
+
+    const resources = await engine.listUnspentOutputsData();
+    const target = resources.find(
+      r => r.outpointTransactionHash === resource.outpointTransactionHash,
+    );
+    expect(target?.reservedBy).toBeUndefined();
+  });
+
+  test("unreserve reports when UTXO is not reserved", async () => {
+    const resource = await addFakeResource(engine, { valueSatoshis: 25000 });
+
+    const { io, spies } = createMockIO();
+    await handleResourceCommand(
+      createCommandDeps(app, io),
+      ["unreserve", `${resource.outpointTransactionHash}:${resource.outpointIndex}`],
+      {},
+    );
+
+    expectLogs(spies, [{ out: "UTXO is not reserved" }]);
+  });
+
+  test("unreserve-all releases all reserved UTXOs", async () => {
+    await addFakeResource(engine, { valueSatoshis: 50000 });
+    await addFakeResource(engine, { valueSatoshis: 25000, reservedBy: "inv-123" });
+    await addFakeResource(engine, { valueSatoshis: 10000, reservedBy: "inv-456" });
+
+    const { io, spies } = createMockIO();
+    const result = await handleResourceCommand(createCommandDeps(app, io), ["unreserve-all"], {});
+
+    expect(result.count).toBe(2);
+    expectLogs(spies, [{ out: "Unreserved" }, { out: "2" }]);
+
+    const resources = await engine.listUnspentOutputsData();
+    const reserved = resources.filter(r => r.reservedBy);
+    expect(reserved).toHaveLength(0);
+  });
+
+  test("list displays outpoint information", async () => {
+    const resource = await addFakeResource(engine, { valueSatoshis: 12345 });
+
+    const { io, spies } = createMockIO();
+    await handleResourceCommand(createCommandDeps(app, io), ["list"], {});
+
+    expectLogs(spies, [
+      { out: resource.outpointTransactionHash },
+      { out: "12345 sats" },
+    ]);
+  });
+});
diff --git a/tests/cli/commands/template.test.ts b/tests/cli/commands/template.test.ts
new file mode 100644
index 0000000..0f2a0d1
--- /dev/null
+++ b/tests/cli/commands/template.test.ts
@@ -0,0 +1,235 @@
+import { expect, test, describe, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { createMockAppService, createMockEngine, DEFAULT_SEED } from "../mocks/engine";
+import { type Engine } from "@xo-cash/engine";
+import { p2pkhTemplate, p2pkhTemplateIdentifier } from "../mocks/template-p2pkh";
+import { AppService } from "../../../src/services/app";
+
+import { handleTemplateCommand } from "../../../src/cli/commands/template";
+import { CommandError } from "../../../src/cli/commands/types";
+import { createCommandDeps, createMockIO, expectLogs, type LogExpectation } from "../mocks/command";
+
+type TestCase = {
+  name: string;
+  inputs: string[];
+  options?: Record<string, string>;
+  shouldThrow: boolean;
+  expectedEvent?: string;
+  expectedData?: Record<string, unknown>;
+  logs?: LogExpectation[];
+};
+
+const testCases: TestCase[] = [
+  // List command
+  {
+    name: "list returns count of imported templates",
+    inputs: ["list"],
+    shouldThrow: false,
+    expectedData: {
+      count: 1,
+    },
+    logs: [{ out: "Wallet (P2PKH)" }],
+  },
+  // List by category
+  {
+    name: "list action returns actions for template",
+    inputs: ["list", "action", p2pkhTemplateIdentifier],
+    shouldThrow: false,
+    expectedData: {},
+    logs: [{ out: "receive" }],
+  },
+  {
+    name: "list output returns outputs for template",
+    inputs: ["list", "output", p2pkhTemplateIdentifier],
+    shouldThrow: false,
+    expectedData: {},
+    logs: [{ out: "receiveOutput" }],
+  },
+  {
+    name: "list variable returns variables for template",
+    inputs: ["list", "variable", p2pkhTemplateIdentifier],
+    shouldThrow: false,
+    expectedData: {},
+    logs: [{ out: "ownerKey" }],
+  },
+  {
+    name: "list transaction returns transactions for template",
+    inputs: ["list", "transaction", p2pkhTemplateIdentifier],
+    shouldThrow: false,
+    expectedData: {},
+  },
+  {
+    name: "list lockingscript returns locking scripts for template",
+    inputs: ["list", "lockingscript", p2pkhTemplateIdentifier],
+    shouldThrow: false,
+    expectedData: {},
+  },
+  // Inspect command
+  {
+    name: "inspect action returns action details",
+    inputs: ["inspect", "action", p2pkhTemplateIdentifier, "receive"],
+    shouldThrow: false,
+    expectedData: {},
+  },
+  {
+    name: "inspect output returns output details",
+    inputs: ["inspect", "output", p2pkhTemplateIdentifier, "receiveOutput"],
+    shouldThrow: false,
+    expectedData: {},
+  },
+  {
+    name: "inspect variable returns variable details",
+    inputs: ["inspect", "variable", p2pkhTemplateIdentifier, "ownerKey"],
+    shouldThrow: false,
+    expectedData: {},
+  },
+  // Error cases - subcommand
+  {
+    name: "throws when no subcommand provided",
+    inputs: [],
+    shouldThrow: true,
+    expectedEvent: "template.subcommand.missing",
+  },
+  {
+    name: "throws when unknown subcommand provided",
+    inputs: ["unknown-subcommand"],
+    shouldThrow: true,
+    expectedEvent: "template.subcommand.unknown",
+  },
+  // Error cases - import
+  {
+    name: "throws when import called without file",
+    inputs: ["import"],
+    shouldThrow: true,
+    expectedEvent: "template.import.file_missing",
+  },
+  {
+    name: "throws when import called with non-existent file",
+    inputs: ["import", "non-existent-file.json"],
+    shouldThrow: true,
+    expectedEvent: "template.import.file_not_found",
+  },
+  // Error cases - list category
+  {
+    name: "throws when list category called without template identifier",
+    inputs: ["list", "action"],
+    shouldThrow: true,
+    expectedEvent: "template.list.identifier_missing",
+  },
+  {
+    name: "throws when list category called with unknown template",
+    inputs: ["list", "action", "unknown-template"],
+    shouldThrow: true,
+    expectedEvent: "template.list.not_found",
+  },
+  {
+    name: "throws when list called with unknown category",
+    inputs: ["list", "unknown-category", p2pkhTemplateIdentifier],
+    shouldThrow: true,
+    expectedEvent: "template.list.category_unknown",
+  },
+  // Error cases - inspect
+  {
+    name: "throws when inspect called without all arguments",
+    inputs: ["inspect", "action"],
+    shouldThrow: true,
+    expectedEvent: "template.inspect.arguments_missing",
+  },
+  {
+    name: "throws when inspect called with unknown template",
+    inputs: ["inspect", "action", "unknown-template", "receive"],
+    shouldThrow: true,
+    expectedEvent: "template.resolve.not_found",
+  },
+  {
+    name: "throws when inspect called with unknown action",
+    inputs: ["inspect", "action", p2pkhTemplateIdentifier, "unknown-action"],
+    shouldThrow: true,
+    expectedEvent: "template.inspect.action_missing",
+  },
+  {
+    name: "throws when inspect called with unknown category",
+    inputs: ["inspect", "unknown-category", p2pkhTemplateIdentifier, "field"],
+    shouldThrow: true,
+    expectedEvent: "template.inspect.category_unknown",
+  },
+  // Error cases - set-default
+  {
+    name: "throws when set-default called without all arguments",
+    inputs: ["set-default", "template"],
+    shouldThrow: true,
+    expectedEvent: "template.default.arguments_missing",
+  },
+];
+
+describe("template command", () => {
+  let engine: Engine;
+  let app: AppService;
+  let tempDir: string;
+
+  beforeEach(async () => {
+    engine = await createMockEngine(DEFAULT_SEED);
+    await engine.importTemplate(p2pkhTemplate);
+
+    app = await createMockAppService(engine);
+
+    tempDir = mkdtempSync(path.join(tmpdir(), "xo-cli-template-tests-"));
+  });
+
+  afterEach(async () => {
+    await engine.stop();
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  test.each(testCases)("$name", async ({ inputs, options, shouldThrow, expectedEvent, expectedData, logs }) => {
+    const { io, spies } = createMockIO();
+
+    if (shouldThrow) {
+      try {
+        await handleTemplateCommand(createCommandDeps(app, io), inputs, options ?? {});
+        expect.fail("Expected command to throw");
+      } catch (error) {
+        if (expectedEvent) {
+          expect(error).toBeInstanceOf(CommandError);
+          expect((error as CommandError).event).toBe(expectedEvent);
+        }
+      }
+    } else {
+      const result = await handleTemplateCommand(createCommandDeps(app, io), inputs, options ?? {});
+      if (expectedData) {
+        Object.entries(expectedData).forEach(([key, value]) => {
+          expect(result[key as keyof typeof result]).toEqual(value);
+        });
+      }
+    }
+
+    if (logs) {
+      expectLogs(spies, logs);
+    }
+  });
+
+  test("import imports template from file", async () => {
+    const templatePath = path.join(tempDir, "test-template.json");
+    writeFileSync(templatePath, JSON.stringify(p2pkhTemplate));
+
+    const { io } = createMockIO();
+    
+    const originalCwd = process.cwd();
+    process.chdir(tempDir);
+    
+    try {
+      const result = await handleTemplateCommand(
+        createCommandDeps(app, io),
+        ["import", "test-template.json"],
+        {},
+      );
+
+      expect(result.templateFile).toBe("test-template.json");
+    } finally {
+      process.chdir(originalCwd);
+    }
+  });
+});
diff --git a/tests/cli/integration/entry.test.ts b/tests/cli/integration/entry.test.ts
new file mode 100644
index 0000000..2d2acd0
--- /dev/null
+++ b/tests/cli/integration/entry.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, test } from "vitest";
+import { spawnSync } from "node:child_process";
+import path from "node:path";
+
+const runCli = (args: string[]) => {
+  const tsxPath = path.resolve(process.cwd(), "node_modules/.bin/tsx");
+  const cliPath = path.resolve(process.cwd(), "src/cli/index.ts");
+
+  return spawnSync(tsxPath, [cliPath, ...args], {
+    encoding: "utf8",
+    cwd: process.cwd(),
+  });
+};
+
+describe("cli entry boundary behavior", () => {
+  test("returns non-zero for incomplete mnemonic invocation", () => {
+    const result = runCli(["mnemonic"]);
+
+    expect(result.status).toBe(1);
+    expect(result.stdout).toContain("Usage:");
+  });
+
+  test("returns zero for mnemonic list invocation", () => {
+    const result = runCli(["mnemonic", "list"]);
+
+    expect(result.status).toBe(0);
+  });
+});
diff --git a/tests/cli/mnemonic.test.ts b/tests/cli/mnemonic.test.ts
new file mode 100644
index 0000000..3b3f471
--- /dev/null
+++ b/tests/cli/mnemonic.test.ts
@@ -0,0 +1,192 @@
+import { expect, test, describe, beforeEach, afterEach } from "vitest";
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import {
+  createMnemonicSeed,
+  createMnemonicFile,
+  resolveMnemonicFilePath,
+  loadMnemonic,
+  listMnemonicFiles,
+} from "../../src/cli/mnemonic";
+import { BCHMnemonicURL } from "../../src/utils/bch-mnemonic-url";
+
+const TEST_SEED = "page pencil stock planet limb cluster assault speak off joke private pioneer";
+
+describe("mnemonic utilities", () => {
+  let tempDir: string;
+
+  beforeEach(() => {
+    tempDir = path.join(tmpdir(), `xo-cli-mnemonic-utils-test-${Date.now()}`);
+    mkdirSync(tempDir, { recursive: true });
+  });
+
+  afterEach(() => {
+    rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  describe("createMnemonicSeed", () => {
+    test("generates a valid BIP39 mnemonic", () => {
+      const mnemonic = createMnemonicSeed();
+
+      expect(typeof mnemonic).toBe("string");
+      const words = mnemonic.split(" ");
+      expect(words.length).toBe(12);
+    });
+
+    test("generates unique mnemonics on each call", () => {
+      const mnemonic1 = createMnemonicSeed();
+      const mnemonic2 = createMnemonicSeed();
+
+      expect(mnemonic1).not.toBe(mnemonic2);
+    });
+  });
+
+  describe("createMnemonicFile", () => {
+    test("creates a mnemonic file with auto-generated name", () => {
+      const filename = createMnemonicFile(tempDir, TEST_SEED);
+
+      expect(filename).toMatch(/^mnemonic-page$/);
+      expect(existsSync(path.join(tempDir, filename))).toBe(true);
+    });
+
+    test("creates a mnemonic file with custom name", () => {
+      const filename = createMnemonicFile(tempDir, TEST_SEED, "my-wallet");
+
+      expect(filename).toBe("my-wallet");
+      expect(existsSync(path.join(tempDir, filename))).toBe(true);
+    });
+
+    test("writes valid BCHMnemonicURL format", () => {
+      const filename = createMnemonicFile(tempDir, TEST_SEED, "test-wallet");
+      const content = readFileSync(path.join(tempDir, filename), "utf8");
+
+      expect(content).toMatch(/^bch-mnemonic:/);
+      const parsed = BCHMnemonicURL.fromURL(content);
+      expect(parsed).toBeDefined();
+    });
+
+    test("sanitizes filename to basename only", () => {
+      const filename = createMnemonicFile(tempDir, TEST_SEED, "../../../evil-path");
+
+      expect(filename).toBe("evil-path");
+      expect(existsSync(path.join(tempDir, "evil-path"))).toBe(true);
+      expect(existsSync(path.join(tempDir, "../../../evil-path"))).toBe(false);
+    });
+
+    test("throws when mnemonic is empty", () => {
+      expect(() => createMnemonicFile(tempDir, "")).toThrow();
+    });
+  });
+
+  describe("resolveMnemonicFilePath", () => {
+    test("resolves absolute path when file exists", () => {
+      const filePath = path.join(tempDir, "mnemonic-absolute");
+      writeFileSync(filePath, "test");
+
+      const resolved = resolveMnemonicFilePath(tempDir, filePath);
+      expect(resolved).toBe(filePath);
+    });
+
+    test("resolves path relative to cwd when file exists", () => {
+      const originalCwd = process.cwd();
+      process.chdir(tempDir);
+
+      try {
+        writeFileSync(path.join(tempDir, "mnemonic-relative"), "test");
+        const resolved = resolveMnemonicFilePath("/nonexistent", "mnemonic-relative");
+        expect(resolved).toBe(path.join(tempDir, "mnemonic-relative"));
+      } finally {
+        process.chdir(originalCwd);
+      }
+    });
+
+    test("resolves from mnemonicsDir when file exists there", () => {
+      writeFileSync(path.join(tempDir, "mnemonic-test"), "test");
+
+      const resolved = resolveMnemonicFilePath(tempDir, "mnemonic-test");
+      expect(resolved).toBe(path.join(tempDir, "mnemonic-test"));
+    });
+
+    test("throws when file not found anywhere", () => {
+      expect(() => resolveMnemonicFilePath(tempDir, "nonexistent-file")).toThrow(
+        /Mnemonic file not found/,
+      );
+    });
+
+    test("strips path components and looks up basename in mnemonicsDir", () => {
+      writeFileSync(path.join(tempDir, "mnemonic-basename"), "test");
+
+      const resolved = resolveMnemonicFilePath(tempDir, "some/path/mnemonic-basename");
+      expect(resolved).toBe(path.join(tempDir, "mnemonic-basename"));
+    });
+  });
+
+  describe("loadMnemonic", () => {
+    test("loads mnemonic from file", () => {
+      createMnemonicFile(tempDir, TEST_SEED, "test-load");
+
+      const loaded = loadMnemonic(tempDir, "test-load");
+      expect(loaded).toBe(TEST_SEED);
+    });
+
+    test("loads mnemonic from absolute path", () => {
+      const filePath = path.join(tempDir, "mnemonic-absolute-load");
+      createMnemonicFile(tempDir, TEST_SEED, "mnemonic-absolute-load");
+
+      const loaded = loadMnemonic(tempDir, filePath);
+      expect(loaded).toBe(TEST_SEED);
+    });
+
+    test("throws when file not found", () => {
+      expect(() => loadMnemonic(tempDir, "nonexistent")).toThrow(/Mnemonic file not found/);
+    });
+
+    test("throws when file contains invalid data", () => {
+      writeFileSync(path.join(tempDir, "mnemonic-invalid"), "not a valid mnemonic url");
+
+      expect(() => loadMnemonic(tempDir, "mnemonic-invalid")).toThrow();
+    });
+  });
+
+  describe("listMnemonicFiles", () => {
+    test("returns empty array when no mnemonic files exist", () => {
+      const files = listMnemonicFiles(tempDir);
+      expect(files).toEqual([]);
+    });
+
+    test("lists only files starting with 'mnemonic-'", () => {
+      writeFileSync(path.join(tempDir, "mnemonic-one"), "test");
+      writeFileSync(path.join(tempDir, "mnemonic-two"), "test");
+      writeFileSync(path.join(tempDir, "other-file"), "test");
+      writeFileSync(path.join(tempDir, "wallet.json"), "test");
+
+      const files = listMnemonicFiles(tempDir);
+      expect(files).toHaveLength(2);
+      expect(files).toContain("mnemonic-one");
+      expect(files).toContain("mnemonic-two");
+      expect(files).not.toContain("other-file");
+      expect(files).not.toContain("wallet.json");
+    });
+
+    test("returns sorted or consistent ordering", () => {
+      writeFileSync(path.join(tempDir, "mnemonic-zebra"), "test");
+      writeFileSync(path.join(tempDir, "mnemonic-alpha"), "test");
+      writeFileSync(path.join(tempDir, "mnemonic-beta"), "test");
+
+      const files = listMnemonicFiles(tempDir);
+      expect(files).toHaveLength(3);
+    });
+  });
+
+  describe("round-trip", () => {
+    test("create and load preserves mnemonic exactly", () => {
+      const original = createMnemonicSeed();
+      createMnemonicFile(tempDir, original, "roundtrip-test");
+
+      const loaded = loadMnemonic(tempDir, "roundtrip-test");
+      expect(loaded).toBe(original);
+    });
+  });
+});
diff --git a/tests/cli/mocks/command.ts b/tests/cli/mocks/command.ts
new file mode 100644
index 0000000..22ecd3a
--- /dev/null
+++ b/tests/cli/mocks/command.ts
@@ -0,0 +1,162 @@
+import { vi, expect, type Mock } from "vitest";
+import type {
+  BaseCommandDependencies,
+  CommandDependencies,
+  CommandIO,
+  CommandPaths,
+} from "../../../src/cli/commands/types";
+import type { AppService } from "../../../src/services/app";
+
+/**
+ * Captured CLI IO buffers used by tests.
+ */
+export type MockIOCapture = {
+  out: string[];
+  err: string[];
+  verbose: string[];
+};
+
+/**
+ * Spy functions for each IO channel.
+ */
+export type MockIOSpies = {
+  out: Mock;
+  err: Mock;
+  verbose: Mock;
+};
+
+/**
+ * Complete mock IO result including the IO adapter, capture buffers, and spies.
+ */
+export type MockIO = {
+  io: CommandIO;
+  capture: MockIOCapture;
+  spies: MockIOSpies;
+};
+
+/**
+ * Defines an expected log message for assertion.
+ * At least one of out, err, or verbose should be specified.
+ */
+export type LogExpectation = {
+  /** Expected substring (or exact match if exact=true) in io.out */
+  out?: string;
+  /** Expected substring (or exact match if exact=true) in io.err */
+  err?: string;
+  /** Expected substring (or exact match if exact=true) in io.verbose */
+  verbose?: string;
+  /** If true, match the string exactly instead of using contains (default: false) */
+  exact?: boolean;
+};
+
+/**
+ * Creates a command IO adapter that records every message using vi.fn() spies.
+ * This enables vitest's built-in matchers like toHaveBeenCalledWith.
+ */
+export const createMockIO = (): MockIO => {
+  const capture: MockIOCapture = {
+    out: [],
+    err: [],
+    verbose: [],
+  };
+
+  const outSpy = vi.fn((message: string) => {
+    capture.out.push(message);
+  });
+  const errSpy = vi.fn((message: string) => {
+    capture.err.push(message);
+  });
+  const verboseSpy = vi.fn((message: string) => {
+    capture.verbose.push(message);
+  });
+
+  const io: CommandIO = {
+    out: outSpy,
+    err: errSpy,
+    verbose: verboseSpy,
+  };
+
+  return {
+    io,
+    capture,
+    spies: {
+      out: outSpy,
+      err: errSpy,
+      verbose: verboseSpy,
+    },
+  };
+};
+
+/**
+ * Asserts that the expected log messages were printed to the appropriate IO channels.
+ * @param spies - The mock IO spies from createMockIO
+ * @param logs - Array of log expectations to validate
+ */
+export const expectLogs = (spies: MockIOSpies, logs: LogExpectation[]): void => {
+  for (const log of logs) {
+    if (log.out !== undefined) {
+      if (log.exact) {
+        expect(spies.out).toHaveBeenCalledWith(log.out);
+      } else {
+        expect(spies.out).toHaveBeenCalledWith(expect.stringContaining(log.out));
+      }
+    }
+    if (log.err !== undefined) {
+      if (log.exact) {
+        expect(spies.err).toHaveBeenCalledWith(log.err);
+      } else {
+        expect(spies.err).toHaveBeenCalledWith(expect.stringContaining(log.err));
+      }
+    }
+    if (log.verbose !== undefined) {
+      if (log.exact) {
+        expect(spies.verbose).toHaveBeenCalledWith(log.verbose);
+      } else {
+        expect(spies.verbose).toHaveBeenCalledWith(expect.stringContaining(log.verbose));
+      }
+    }
+  }
+};
+
+/**
+ * Creates mock paths for testing.
+ * @param tempDir - Optional temp directory to use as base for all paths
+ */
+export const createMockPaths = (tempDir?: string): CommandPaths => {
+  const base = tempDir ?? "/tmp/xo-cli-test";
+  return {
+    mnemonicsDir: base,
+    dataDir: base,
+    walletConfigPath: `${base}/.wallet`,
+    workingDir: base,
+  };
+};
+
+/**
+ * Creates base command dependencies for commands that do not require the app.
+ * @param io - Command IO adapter
+ * @param paths - Optional custom paths (defaults to mock paths)
+ */
+export const createBaseCommandDeps = (
+  io: CommandIO,
+  paths?: CommandPaths,
+): BaseCommandDependencies => ({
+  io,
+  paths: paths ?? createMockPaths(),
+});
+
+/**
+ * Creates command dependencies for app-backed command handlers.
+ * @param app - App service instance
+ * @param io - Command IO adapter
+ * @param paths - Optional custom paths (defaults to mock paths)
+ */
+export const createCommandDeps = (
+  app: AppService,
+  io: CommandIO,
+  paths?: CommandPaths,
+): CommandDependencies => ({
+  app,
+  io,
+  paths: paths ?? createMockPaths(),
+});
diff --git a/tests/cli/mocks/electrum-service.ts b/tests/cli/mocks/electrum-service.ts
new file mode 100644
index 0000000..30658bc
--- /dev/null
+++ b/tests/cli/mocks/electrum-service.ts
@@ -0,0 +1,7 @@
+export class MockElectrumService {
+  constructor() {}
+
+  async hasSeenTransaction(transactionHash: string): Promise<boolean> {
+    return true;
+  }
+}
\ No newline at end of file
diff --git a/tests/cli/mocks/engine.ts b/tests/cli/mocks/engine.ts
new file mode 100644
index 0000000..59dc65b
--- /dev/null
+++ b/tests/cli/mocks/engine.ts
@@ -0,0 +1,164 @@
+import { BlockchainMonitor, Engine } from "@xo-cash/engine";
+
+import { createStorageAdapter, State, StorageType, type UnspentOutputData } from "@xo-cash/state";
+import { InMemoryBlockchainProvider } from "@xo-cash/engine";
+import { convertMnemonicToSeedBytes } from "@xo-cash/crypto";
+
+import { binToHex, sha256 } from "@bitauth/libauth";
+import { AppService } from "../../../src/services/app";
+import { InMemoryStorage } from "../../../src/services/storage";
+import { MockElectrumService } from "./electrum-service";
+
+export const DEFAULT_SEED = "page pencil stock planet limb cluster assault speak off joke private pioneer";
+
+/**
+ * Options for creating a fake resource (UTXO) in tests.
+ */
+export type FakeResourceOptions = {
+  /** Transaction hash of the outpoint. Auto-generated if not provided. */
+  outpointTransactionHash?: string;
+  /** Index of the outpoint in the transaction. Defaults to 0. */
+  outpointIndex?: number;
+  /** Value in satoshis. Defaults to 10000. */
+  valueSatoshis?: number;
+  /** Template identifier. Defaults to "test-template". */
+  templateIdentifier?: string;
+  /** Output identifier from the template. Defaults to "receiveOutput". */
+  outputIdentifier?: string;
+  /** Locking bytecode for this output. Defaults to a placeholder. */
+  lockingBytecode?: string;
+  /** Block height where the UTXO was mined. Defaults to 800000. */
+  minedAtHeight?: number;
+  /** Invitation identifier that reserves this output. Undefined means unreserved. */
+  reservedBy?: string;
+};
+
+/**
+ * Generates a random 64-character hex string representing a transaction hash.
+ */
+export const randomTxHash = (): string => {
+  const bytes = new Uint8Array(32);
+  crypto.getRandomValues(bytes);
+  return Array.from(bytes).map(b => b.toString(16).padStart(2, "0")).join("");
+};
+
+/**
+ * Adds a fake resource (UTXO) to the engine's state for testing purposes.
+ * @param engine - The engine instance to add the resource to.
+ * @param options - Options for the fake resource. All fields have sensible defaults.
+ * @returns The created UnspentOutputData object.
+ */
+export const addFakeResource = async (
+  engine: Engine,
+  options: FakeResourceOptions = {},
+): Promise<UnspentOutputData> => {
+  const resource: UnspentOutputData = {
+    status: "confirmed",
+    selectable: true,
+    privacy: false,
+    templateIdentifier: options.templateIdentifier ?? "test-template",
+    outputIdentifier: options.outputIdentifier ?? "receiveOutput",
+    outpointIndex: options.outpointIndex ?? 0,
+    outpointTransactionHash: options.outpointTransactionHash ?? randomTxHash(),
+    minedAtHeight: options.minedAtHeight ?? 800000,
+    valueSatoshis: options.valueSatoshis ?? 10000,
+    lockingBytecode: options.lockingBytecode ?? "76a914000000000000000000000000000000000000000088ac",
+    reservedBy: options.reservedBy,
+  };
+
+  await engine.state.storeUnspentOutputData(resource);
+  return resource;
+};
+
+/**
+ * Reserves a resource for a specific invitation.
+ * @param engine - The engine instance.
+ * @param outpointTransactionHash - The transaction hash of the UTXO to reserve.
+ * @param outpointIndex - The output index of the UTXO to reserve.
+ * @param invitationIdentifier - The invitation identifier to reserve for.
+ */
+export const reserveResource = async (
+  engine: Engine,
+  outpointTransactionHash: string,
+  outpointIndex: number,
+  invitationIdentifier: string,
+): Promise<void> => {
+  await engine.state.executeBulkUnspentOutputReservation(
+    [{ outpointTransactionHash, outpointIndex }],
+    true,
+    invitationIdentifier,
+  );
+};
+
+/**
+ * Unreserves a resource from a specific invitation.
+ * @param engine - The engine instance.
+ * @param outpointTransactionHash - The transaction hash of the UTXO to unreserve.
+ * @param outpointIndex - The output index of the UTXO to unreserve.
+ * @param invitationIdentifier - The invitation identifier to unreserve from.
+ */
+export const unreserveResource = async (
+  engine: Engine,
+  outpointTransactionHash: string,
+  outpointIndex: number,
+  invitationIdentifier: string,
+): Promise<void> => {
+  await engine.state.executeBulkUnspentOutputReservation(
+    [{ outpointTransactionHash, outpointIndex }],
+    false,
+    invitationIdentifier,
+  );
+};
+
+/**
+ * Create a mock engine instance with a given seed. Uses the in-memory storage and blockchain provider.
+ * @param seed - The seed to use for the engine.
+ * @returns A mock engine instance.
+ */
+export const createMockEngine = async (seed: string) => {
+  // Create the in-memory storage adapter.
+  const storage = await createStorageAdapter({
+    storageType: StorageType.INMEMORY,
+    accountHash: binToHex(sha256.hash(convertMnemonicToSeedBytes(seed))),
+  });
+
+  // Initialize the storage adapter.
+  await storage.initialize();
+
+  // Create the state instance.
+  const state = new State(storage);
+
+  // Create the in-memory blockchain provider.
+  const blockchainProvider = new InMemoryBlockchainProvider();
+  await blockchainProvider.initialize({
+    applicationIdentifier: "xo-cli-tests",
+    electrumOptions: {},
+  });
+
+  // Create the blockchain monitor instance.
+  const blockchainMonitor = new BlockchainMonitor(state, blockchainProvider);
+  await blockchainMonitor.initializeEventListeners();
+
+  // Create the engine instance.
+  const engine = new Engine(seed, state, blockchainMonitor, blockchainProvider);
+  await engine.initializeStateSync();
+
+  return engine;
+};
+
+export const createMockAppService = async (engine: Engine) => {
+  const storage = await InMemoryStorage.create();
+
+  const electrum = new MockElectrumService();
+
+  const config = {
+    syncServerUrl: "http://localhost:3000",
+    engineConfig: {
+      databasePath: "test-data",
+      databaseFilename: "xo-wallet.db",
+    },
+    invitationStoragePath: "test-invitations.db",
+  };
+
+  return new AppService(engine, storage, config, electrum);
+};
\ No newline at end of file
diff --git a/tests/cli/mocks/template-p2pkh.ts b/tests/cli/mocks/template-p2pkh.ts
new file mode 100644
index 0000000..033f240
--- /dev/null
+++ b/tests/cli/mocks/template-p2pkh.ts
@@ -0,0 +1,1395 @@
+import type { XOTemplate } from '@xo-cash/types';
+import { generateTemplateIdentifier } from '@xo-cash/engine';
+
+export const p2pkhTemplate: XOTemplate = {
+    $schema: 'https://libauth.org/schemas/wallet-template-v0.schema.json',
+
+    // Name for this template.
+    name: 'Wallet (P2PKH)',
+
+    // Description for this template.
+    description: 'A standard single-factor wallet template that uses Pay-to-Public-Key-Hash (P2PKH) locking scripts.',
+
+    // Icon for this template.
+    icon: 'wallet',
+
+    // Version number for this template.
+    version: 0,
+
+    // List of VM versions that can be used to run this template.
+    supported: [ 'BCH_2023_05', 'BCH_2024_05', 'BCH_2025_05', 'BCH_2026_05' ],
+
+    // Describe a list of roles that are used in this template.
+    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',
+        },
+    },
+
+    // Define a list of entrypoints supported by this template.
+    start: [
+        {
+            action: 'receive',
+            role: 'receiver',
+        },
+        {
+            action: 'requestSatoshis',
+            role: 'receiver',
+        },
+        {
+            action: 'requestFungibleTokens',
+            role: 'receiver',
+        },
+        {
+            action: 'requestNonfungibleTokens',
+            role: 'receiver',
+        },
+    ],
+
+    // Define a list of actions that can be taken by this template.
+    // NOTE: There is no action to generate an address, but a wallet can create an invitation to a receive action and
+    //       extract the generated lockscript as needed as the engine will track all lockscripts it generates.
+    actions: {
+        receive: {
+            // TODO: Consider rewriting to be generic/role-less.
+            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, max: undefined },
+                    },
+                ],
+                variables: [ 'requestedSatoshis' ],
+            },
+
+            transaction: 'receiveTransaction',
+        },
+        requestSatoshis: {
+            // TODO: Consider rewriting to be generic/role-less.
+            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, max: undefined },
+                    },
+                ],
+            },
+
+            transaction: 'requestSatoshisTransaction',
+        },
+        requestFungibleTokens: {
+            // TODO: Consider rewriting to be generic/role-less.
+            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, max: undefined },
+                    },
+                ],
+            },
+
+            transaction: 'requestFungibleTokensTransaction',
+        },
+        requestNonfungibleTokens: {
+            // TODO: Consider rewriting to be generic/role-less.
+            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, max: undefined },
+                    },
+                ],
+            },
+
+            transaction: 'requestNonfungibleTokensTransaction',
+        },
+
+        // NOTE: Sending value can be done without explicit template support.
+        // NOTE: This feature is explicitly defined in this template to demonstrate how versatile templates can be, and
+        //       to ensure the feature is discoverable by the user from outputs that hold value.
+        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 },
+                    },
+                ],
+            },
+
+            // Sending is only available for outputs that have sufficient satoshis on them.
+            // NOTE: Dust is enforced here according to standardness rules.
+            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 },
+                    },
+                ],
+            },
+
+            // Sending is only available for outputs that have fungible tokens on them.
+            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 },
+                    },
+                ],
+            },
+
+            // Sending is only available for outputs that have a non-fungible token on them.
+            condition: '$(OP_INPUTINDEX OP_UTXOTOKENCATEGORY OP_SIZE OP_NIP <32> OP_GREATERTHAN)',
+
+            transaction: 'transferNonfungibleTokensTransaction',
+        },
+
+        // NOTE: Burning tokens can be done without explicit template support.
+        // NOTE: This feature is explicitly defined in this template to demonstrate how versatile templates can be, and
+        //       to ensure the feature is discoverable by the user from outputs that hold tokens.
+        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 },
+                    },
+                ],
+            },
+
+            // Burning is only available for outputs that have fungible tokens on them.
+            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 },
+                    },
+                ],
+            },
+
+            // Burning is only available for outputs that have non-fungible tokens on them.
+            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' ],
+        },
+    },
+
+    // Define a set of data that can be used in this template.
+    data: {
+        messageSignature: {
+            // Evaluate CashASM expression to get the signature needed.
+            // NOTE: Pushes the prefix and message, then concatenates them together to form the data to sign.
+            // NOTE: In libauth today, it seems that this is done by defining the signature as a variable, and tying it to the key and message,
+            // and so this is different
+            // TODO: Check with Jason and see if there is any reason why this cannot be done like this.
+            value: '$(<messagePrefix> <message> OP_CAT <ownerKey.data_signature.top_stack_element>)',
+            type: 'bytes',
+            hint: 'signature',
+        },
+        messageSignatureValidity: {
+            // Evaluate the validity of the message with the owners public key.
+            value: '$(<messageSignature> <messagePrefix> <message> OP_CAT <ownerKey.public_key> OP_CHECKDATASIG)',
+            type: 'integer',
+            hint: 'script_boolean',
+        },
+    },
+
+    // Define a set of transactions that can be used in this template.
+    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 and outputs that must exist in the transaction.
+            // NOTE: There is no inputs required, but the engine should detect that there is not sufficient input value to
+            //       match the output and thus generate an invitation to participate in this action.
+            //       When the invitation is shared, the other parties can add as many inputs and change outputs as needed.
+            inputs: [],
+            outputs: [
+                {
+                    output: 'receiveOutput',
+                    index: undefined,
+                },
+            ],
+
+            // Standard transaction without a locktime.
+            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 and outputs that must exist in the transaction.
+            // NOTE: There is no inputs required, but the engine should detect that there is not sufficient input value to
+            //       match the output and thus generate an invitation to participate in this action.
+            //       When the invitation is shared, the other party can add as many inputs and outputs as needed since this transaction is composable.
+            inputs: [],
+            outputs: [
+                {
+                    output: 'requestSatoshisOutput',
+                    index: undefined,
+                },
+            ],
+
+            // Standard transaction without a locktime.
+            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 and outputs that must exist in the transaction.
+            // NOTE: There is no inputs required, but the engine should detect that there is not sufficient input value to
+            //       match the output and thus generate an invitation to participate in this action.
+            //       When the invitation is shared, the other party can add as many inputs and outputs as needed since this transaction is composable.
+            inputs: [],
+            outputs: [
+                {
+                    output: 'requestFungibleTokensOutput',
+                    index: undefined,
+                },
+            ],
+
+            // Standard transaction without a locktime.
+            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 and outputs that must exist in the transaction.
+            // NOTE: There is no inputs required, but the engine should detect that there is not sufficient input value to
+            //       match the output and thus generate an invitation to participate in this action.
+            //       When the invitation is shared, the other party can add as many inputs and outputs as needed since this transaction is composable.
+            inputs: [],
+            outputs: [
+                {
+                    output: 'requestNonfungibleTokensOutput',
+                    index: undefined,
+                },
+            ],
+
+            // Standard transaction without a locktime.
+            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',
+                },
+            },
+
+            // Enforce the inputs and outputs required by the transaction.
+            // NOTE: The input is provided from the action since it is only available on outputs with satoshis.
+            inputs: [],
+            outputs: [
+                {
+                    output: 'transferSatoshisOutput',
+                    index: undefined,
+                },
+            ],
+
+            // Standard transaction without a locktime.
+            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',
+                },
+            },
+
+            // Enforce the inputs and outputs required by the transaction.
+            // NOTE: The input is provided from the action since it is only available on outputs with fungible tokens.
+            inputs: [],
+            outputs: [
+                {
+                    output: 'transferFungibleTokensOutput',
+                    index: undefined,
+                },
+            ],
+
+            // Standard transaction without a locktime.
+            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',
+                },
+            },
+
+            // Enforce the inputs and outputs required by the transaction.
+            // NOTE: The input is provided from the action since it is only available on outputs with a non-fungible token.
+            inputs: [],
+            outputs: [
+                {
+                    output: 'transferNonfungibleTokenOutput',
+                    index: undefined,
+                },
+            ],
+
+            // Standard transaction without a locktime.
+            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 and outputs that must exist in the transaction.
+            // NOTE: There is no defined outputs as any non-burned value is automatically returned as change.
+            inputs: [
+                {
+                    input: 'burnFungibleTokensInput',
+                    index: undefined,
+                },
+            ],
+
+            outputs: [],
+
+            // Standard transaction without a locktime.
+            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 and outputs that must exist in the transaction.
+            // NOTE: There is no defined outputs as any non-burned value is automatically returned as change.
+            inputs: [
+                {
+                    input: 'burnNonfungibleTokenInput',
+                    index: undefined,
+                },
+            ],
+            outputs: [],
+
+            // Standard transaction without a locktime.
+            version: 2,
+            locktime: 0,
+
+            // ...
+            composable: true,
+        },
+    },
+
+    // Define a set of outputs that can be used within transactions in this template.
+    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.',
+                },
+            },
+
+            // Defines how the requested funds should be locked.
+            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.',
+                },
+            },
+
+            // Defines how the requested funds should be locked.
+            lockscript: 'receivingLockingScript',
+
+            // Require the specified number of satoshis and no tokens.
+            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.',
+                },
+            },
+
+            // Defines how the requested funds should be locked.
+            lockscript: 'receivingLockingScript',
+
+            // Require a flat 1000 satoshis to ensure the fungible tokens remains transferrable.
+            valueSatoshis: '1000',
+
+            // Require only the specified amount and type of fungible tokens.
+            // NOTE: This can be composed with a request for a non-fungible token, but will always result in two separate outputs.
+            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.',
+                },
+            },
+
+            // Defines how the requested funds should be locked.
+            lockscript: 'receivingLockingScript',
+
+            // Require a flat 1000 satoshis to ensure the non-fungible token remains transferrable.
+            valueSatoshis: '1000',
+
+            // Require only an NFT with specified category, capability and commitment.
+            // NOTE: This can be composed with a request for fungible token amounts, but will always result in two separate outputs.
+            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.',
+                },
+            },
+
+            // Use the recipients lockscript.
+            lockscript: 'sendingLockingscript',
+
+            // Set the amount of satoshis to transfer.
+            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.',
+                },
+            },
+
+            // Use the recipients lockscript.
+            lockscript: 'sendingLockingscript',
+
+            // Set the amount of fungible tokens to transfer.
+            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.',
+                },
+            },
+
+            // Use the recipients lockscript.
+            lockscript: 'sendingLockingscript',
+
+            // Set the non-fungible token to transfer.
+            token: {
+                category: '$(<transferredTokenCategory>)',
+                nft: {
+                    capability: '$(<transferredTokenCapability>)',
+                    commitment: '$(<transferredTokenCommitment>)',
+                },
+            },
+        },
+    },
+
+    inputs: {
+        burnFungibleTokensInput: {
+            name: 'Deleted fungible tokens',
+            description: 'Permanently and irreversibly deleted $(<burnedTokenAmount>) $(<burnedTokenCategory>).',
+            icon: 'burn',
+
+            // Define which unlocking script unlocks this input.
+            unlockingScript: 'unlockP2PKH',
+
+            // Require a fungible token of the requested token category, with an amount larger than or equal to the requested amount to burn.
+            token: {
+                category: '$(<burnedTokenCategory>)',
+                amount: '$(<this.fungibleTokenAmount> <burnedTokenAmount> OP_GREATERTHANOREQUAL OP_IF <this.fungibleTokens> OP_ENDIF)',
+            },
+
+            // Ignore the burned token amount when determining change for this output.
+            // NOTE: The engine must check that this does not exceed the input value.
+            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',
+
+            // Define which unlocking script unlocks this input.
+            unlockingScript: 'unlockP2PKH',
+
+            // Require a non-fungible token of the specified category, capability and commitment to burn.
+            token: {
+                category: '$(<burnedTokenCategory>)',
+                nft: {
+                    capability: '$(<burnedTokenCapability>)',
+                    commitment: '$(<burnedTokenCommitment>)',
+                },
+            },
+
+            // Ignore the burned token when determining change for this output.
+            // NOTE: The engine must check that this does not exceed the input value.
+            omitChangeAmounts: {
+                nonfungibleTokens: 1,
+            },
+        },
+    },
+
+    // Define locking scripts used by this template.
+    // NOTE: Template supported wallets should automatically track all generated lockscripts for on-chain events.
+    lockingScripts: {
+        sendingLockingscript: {
+            // TODO: This currently describes outputs locked to this script, but all actions creating such outputs already have descriptions.
+            // This can either be dropped, or maybe more importantly, should be disambiguated so that lockscripts can provide separate
+            // descriptions for their script and the outputs that are locked to them. Leaving as a TODO for now and will address later.
+            name: 'Sent',
+            description: 'Funds sent to an external recipient',
+            icon: 'address',
+
+            // ...
+            lockingType: 'standard',
+            lockingScript: 'lockToRecipient',
+
+            // Indicate that the sent output does not belong to the initiating user.
+            // NOTE: These values default to false/empty, but added here for additional clarity.
+            actions: [],
+            state: [],
+            secrets: [],
+            balance: false,
+            selectable: false,
+            privacy: false,
+        },
+        receivingLockingScript: {
+            // NOTE: Outputs to this lockscript by external actors defaults to this description when detected on-chain.
+            name: 'Received',
+            description: 'Funds received without wallet coordination.',
+            icon: 'address',
+
+            // Defines how spending future received funds should be locked.
+            lockingType: 'standard',
+            lockingScript: 'lockP2PKH',
+
+            // Define a default unlocking script to be used when no action provided script is present.
+            unlockingScript: 'unlockP2PKH',
+
+            roles: {
+                receiver: {
+                    // The only state that is required to be persisted when receiving funds is the owners private key.
+                    // NOTE: This is defined as a secret to not leak when creating invitations for others to participate in request or send actions.
+                    state: {
+                        variables: [],
+                        secrets: [ 'ownerKey' ],
+                    },
+
+                    // List actions that can be taken with the ownerKey for each address/lockscript.
+                    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' ],
+                        },
+                    ],
+
+                    // Indicates how much of received funds should be part of a wallets total balance.
+                    // NOTE: Evaluates in the context of the source transaction, with the current outputs technical data available under this.output.*
+                    // NOTE: This can either evaluate to a boolean or a number. If evaluated to a boolean, then true means 100% of the output.
+                    // NOTE: Since we know that the owner controls all assets, we short-cut the evaluations by setting true directly.
+                    balance: {
+                        satoshis: true,
+                        fungibleTokens: true,
+                        // nonFungibleToken: true,
+                    },
+
+                    // Indicate when received funds should be considered in automatic coin selection to meet input requirements of other transactions.
+                    // NOTE: Evaluates in the context of the source transaction, with the current outputs technical data available under this.output.*
+                    // NOTE: This evaluates to a boolean. If non-true, the output should not be considered for automatic coin selection.
+                    // NOTE: Since we know that the secret key exist for the owner, this template short-cuts the evaluation by setting true directly.
+                    selectable: true,
+
+                    // Indicate that received funds are not considered good privacy.
+                    // NOTE: This information allows wallets to make better privacy decisions, like avoid mixing private and non-private outputs.
+                    privacy: false,
+                },
+            },
+        },
+    },
+
+    // Define a set of scripts that can be used in this template.
+    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>',
+    },
+
+    // TODO: Add icons
+    constants: {
+        dustLimit: {
+            name: 'Dust Limit',
+            description: 'Standard required minimum satoshis for Pay to Public Key Hash outputs.',
+            type: 'integer',
+            value: 546,
+        },
+
+        // Define a message prefix for use in arbitrary message signing.
+        messagePrefix: {
+            name: 'Message Prefix',
+            description: 'Standard message prefix used in the bitcoin signed message protocol.',
+            type: 'bytes',
+
+            // Value is enforced to the bitcoin signing magic string:
+            // "\x18Bitcoin Signed Message:\n"
+            value: '0x18426974636f696e205369676e6564204d6573736167653a0a',
+        },
+    },
+
+    // TODO: Add icons
+    variables: {
+        // Describe the secret private key.
+        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',
+        },
+
+        // Describe the parameters used when requesting value.
+        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',
+        },
+    },
+
+    // Define a list of re-usable icons that can be used as part of metadata.
+    // NOTE: the actual icons are not embedded in the template but only referenced by hashes here,
+    //       and can be distributed either as an asset pack or looked up through something like IPFS.
+    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.',
+
+            // The action being run in the scenario.
+            action: 'requestSatoshis',
+
+            // List of roles taken in this scenario, and the resources they provided.
+            roles: [
+                {
+                    role: 'receiver',
+                    values: {
+                        generated: {
+                            ownerKey: 'KyRQa5pEXuzVcDwnXRLpYAascjchQW5DoxVRMbj4DTxS83573mz8',
+                        },
+                        variables: {
+                            requestedSatoshis: 2000,
+                        },
+                        secrets: {
+                            // This scenario does not carry any secrets.
+                        },
+                        inputs: [],
+                        outputs: [
+                            {
+                                lockingBytecode: '76a91475c715ecb74178fe87933e57e947e5e92d904b8188ac',
+                                valueSatoshis: 2000,
+                            },
+                        ],
+                    },
+                },
+                {
+                    role: 'sender',
+                    values: {
+                        // The sender provides no raw data to the action.
+                        generated: {},
+                        variables: {},
+                        secrets: {},
+
+                        // The sender does provide input and change.
+                        inputs: [
+                            {
+                                outpointTransactionHash: '4ef28553a31a266719e66ba97fee3aeecd6d1788f7ff6ab12f8ebceda49660c0',
+                                outpointIndex: 0,
+                                sequenceNumber: 0,
+                                unlockingBytecode:
+                                    '41226b2be7c2890c8bbde2f79e79640e56d866843f2e822ec51c469019d13db04a422c9ee49f5eefd26fee24e91910edbbb032b90cc54c34da80a61e69b0ee3d22412103e7ab26c36a7c7f45b2c26f33c08b0fa43a633268700f47216646d4cb37ae5696',
+                            },
+                        ],
+                        outputs: [
+                            {
+                                lockingBytecode: '76a91475c715ecb74178fe87933e57e947e5e92d904b8188ac',
+                                valueSatoshis: 2000,
+                            },
+                        ],
+                    },
+                },
+            ],
+
+            // List of resources provided outside the context of a role.
+            values: {
+                generated: {
+                    // This scenario does not have any non-role generated values.
+                },
+                variables: {
+                    // This scenario does not have any non-role variables.
+                },
+                secrets: {
+                    // This scenario does not have any non-role secrets.
+                },
+            },
+
+            // Outcomes provides the set of resulting values created from the action.
+            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: '',
+                    },
+                ],
+            },
+        },
+    ],
+};
+
+export const p2pkhTemplateIdentifier = generateTemplateIdentifier(p2pkhTemplate);
\ No newline at end of file
diff --git a/tests/cli/paths.test.ts b/tests/cli/paths.test.ts
new file mode 100644
index 0000000..be7ff87
--- /dev/null
+++ b/tests/cli/paths.test.ts
@@ -0,0 +1,149 @@
+import { expect, test, describe, beforeEach, afterEach } from "vitest";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { homedir, tmpdir } from "node:os";
+import path from "node:path";
+
+import {
+  getConfigDir,
+  getMnemonicsDir,
+  getDataDir,
+  getWalletConfigPath,
+  resolveMnemonicFilePath,
+} from "../../src/utils/paths";
+
+describe("paths utilities", () => {
+  describe("getConfigDir", () => {
+    test("returns path under ~/.config/xo-cli", () => {
+      const configDir = getConfigDir();
+
+      expect(configDir).toBe(path.join(homedir(), ".config", "xo-cli"));
+    });
+
+    test("creates the directory if it does not exist", () => {
+      const configDir = getConfigDir();
+
+      expect(existsSync(configDir)).toBe(true);
+    });
+  });
+
+  describe("getMnemonicsDir", () => {
+    test("returns path under config dir", () => {
+      const mnemonicsDir = getMnemonicsDir();
+
+      expect(mnemonicsDir).toBe(path.join(homedir(), ".config", "xo-cli", "mnemonics"));
+    });
+
+    test("creates the directory if it does not exist", () => {
+      const mnemonicsDir = getMnemonicsDir();
+
+      expect(existsSync(mnemonicsDir)).toBe(true);
+    });
+  });
+
+  describe("getDataDir", () => {
+    test("returns path under config dir", () => {
+      const dataDir = getDataDir();
+
+      expect(dataDir).toBe(path.join(homedir(), ".config", "xo-cli", "data"));
+    });
+
+    test("creates the directory if it does not exist", () => {
+      const dataDir = getDataDir();
+
+      expect(existsSync(dataDir)).toBe(true);
+    });
+  });
+
+  describe("getWalletConfigPath", () => {
+    test("returns .wallet file path under config dir", () => {
+      const walletConfigPath = getWalletConfigPath();
+
+      expect(walletConfigPath).toBe(path.join(homedir(), ".config", "xo-cli", ".wallet"));
+    });
+  });
+
+  describe("resolveMnemonicFilePath (global)", () => {
+    let tempDir: string;
+
+    beforeEach(() => {
+      tempDir = path.join(tmpdir(), `xo-cli-paths-test-${Date.now()}`);
+      mkdirSync(tempDir, { recursive: true });
+    });
+
+    afterEach(() => {
+      rmSync(tempDir, { recursive: true, force: true });
+    });
+
+    test("resolves absolute path when file exists", () => {
+      const filePath = path.join(tempDir, "mnemonic-test");
+      writeFileSync(filePath, "test");
+
+      const resolved = resolveMnemonicFilePath(filePath);
+      expect(resolved).toBe(filePath);
+    });
+
+    test("resolves path relative to cwd when file exists", () => {
+      const originalCwd = process.cwd();
+      process.chdir(tempDir);
+
+      try {
+        writeFileSync(path.join(tempDir, "mnemonic-cwd-test"), "test");
+        const resolved = resolveMnemonicFilePath("mnemonic-cwd-test");
+        expect(resolved).toBe(path.join(tempDir, "mnemonic-cwd-test"));
+      } finally {
+        process.chdir(originalCwd);
+      }
+    });
+
+    test("resolves from global mnemonics dir when file exists there", () => {
+      const mnemonicsDir = getMnemonicsDir();
+      const testFile = path.join(mnemonicsDir, "mnemonic-global-test");
+
+      try {
+        writeFileSync(testFile, "test");
+        const resolved = resolveMnemonicFilePath("mnemonic-global-test");
+        expect(resolved).toBe(testFile);
+      } finally {
+        if (existsSync(testFile)) {
+          rmSync(testFile);
+        }
+      }
+    });
+
+    test("throws when file not found anywhere", () => {
+      expect(() => resolveMnemonicFilePath("nonexistent-mnemonic-file-xyz")).toThrow(
+        /Mnemonic file not found/,
+      );
+    });
+
+    test("does not resolve absolute path if file does not exist", () => {
+      const nonExistentPath = "/nonexistent/path/mnemonic-test";
+      expect(() => resolveMnemonicFilePath(nonExistentPath)).toThrow(
+        /Mnemonic file not found/,
+      );
+    });
+  });
+
+  describe("path hierarchy", () => {
+    test("mnemonics dir is under config dir", () => {
+      const configDir = getConfigDir();
+      const mnemonicsDir = getMnemonicsDir();
+
+      expect(mnemonicsDir.startsWith(configDir)).toBe(true);
+    });
+
+    test("data dir is under config dir", () => {
+      const configDir = getConfigDir();
+      const dataDir = getDataDir();
+
+      expect(dataDir.startsWith(configDir)).toBe(true);
+    });
+
+    test("wallet config is under config dir", () => {
+      const configDir = getConfigDir();
+      const walletConfig = getWalletConfigPath();
+
+      expect(walletConfig.startsWith(configDir)).toBe(true);
+    });
+  });
+});