@lightninglabs/lightning-mcp-server 0.2.0 → 0.2.5

package/README.md

@@ -20,6 +20,34 @@ and works with any compatible client. The security model defaults to a remote
 signer architecture that keeps private keys on a separate machine, away from the
 agent's runtime environment.
 
+## Install
+
+**MCP server** (zero-install, any MCP client):
+
+```bash
+claude mcp add --transport stdio lnc -- npx -y @lightninglabs/lightning-mcp-server
+```
+
+**Full plugin** (all 7 skills via Claude Code):
+
+```bash
+claude plugin marketplace add lightninglabs/lightning-agent-tools
+claude plugin install lightning-agent-tools@lightninglabs
+```
+
+**From source** (requires Go 1.24+):
+
+```bash
+git clone https://github.com/lightninglabs/lightning-agent-tools.git
+cd lightning-agent-tools
+skills/lightning-mcp-server/scripts/install.sh
+skills/lightning-mcp-server/scripts/configure.sh --production
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope project
+```
+
+See [Quick Start](#quick-start) below for detailed setup options including
+environment variables, regtest mode, and the full commerce stack.
+
 ## How It Works
 
 ```mermaid
@@ -32,7 +60,7 @@ graph TD
         mb["macaroon-bakery<br/><i>scoped credentials</i>"]
         lg["lnget<br/><i>L402 HTTP client</i>"]
         ap["aperture<br/><i>L402 reverse proxy</i>"]
-        mcp["mcp-lnc<br/><i>MCP server</i>"]
+        mcp["lightning-mcp-server<br/><i>MCP server</i>"]
         com["commerce<br/><i>buyer/seller workflows</i>"]
     end
 
@@ -41,7 +69,7 @@ graph TD
         signer_d["lnd signer"]
         aperture_d["aperture proxy"]
         lnget_d["lnget CLI"]
-        mcp_d["mcp-lnc-server"]
+        mcp_d["lightning-mcp-server"]
     end
 
     lnd --> lnd_d
@@ -75,7 +103,7 @@ L402 reverse proxy that gates access to a backend service behind Lightning
 invoices. The `commerce` skill ties these together into buyer and seller
 workflows.
 
-**Node access.** The `mcp-lnc` skill builds and configures an MCP server that
+**Node access.** The `lightning-mcp-server` skill builds and configures an MCP server that
 connects to a Lightning node via Lightning Node Connect (encrypted WebSocket
 tunnels, pairing-phrase auth, no stored credentials). It exposes 18 read-only
 tools for querying node state and works with any MCP-compatible client.
@@ -128,10 +156,10 @@ plugin marketplace:
 
 ```bash
 # Add the marketplace (one-time)
-/plugin marketplace add lightninglabs/lightning-agent-tools
+claude plugin marketplace add lightninglabs/lightning-agent-tools
 
 # Install the plugin (gets all skills)
-/plugin install lightning-agent-tools@lightninglabs
+claude plugin install lightning-agent-tools@lightninglabs
 ```
 
 Or load locally for development:
@@ -153,9 +181,9 @@ Build the MCP server from source. Requires Go 1.24+.
 git clone https://github.com/lightninglabs/lightning-agent-tools.git
 cd lightning-agent-tools
 
-skills/mcp-lnc/scripts/install.sh
-skills/mcp-lnc/scripts/configure.sh --production
-skills/mcp-lnc/scripts/setup-claude-config.sh --scope project
+skills/lightning-mcp-server/scripts/install.sh
+skills/lightning-mcp-server/scripts/configure.sh --production
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope project
 ```
 
 Restart Claude Code, then:
@@ -167,7 +195,7 @@ Connect to my Lightning node with pairing phrase: "word1 word2 ... word10"
 The agent can now query balances, list channels, decode invoices, and inspect
 the network graph. See [MCP Server](docs/mcp-server.md) for details.
 
-### Option B: Full Commerce Stack
+### Option D: Full Commerce Stack
 
 Run your own node and start buying or selling resources over Lightning. Docker
 is the default deployment method — `install.sh` pulls a container image and
@@ -226,7 +254,7 @@ Export credentials from my signer and set up a watch-only node
 | **macaroon-bakery** | Bakes scoped macaroons (pay-only, invoice-only, read-only, channel-admin, signer-only) for least-privilege access. |
 | **lnget** | Command-line HTTP client with automatic L402 payment. Pays Lightning invoices on 402 responses, caches tokens, retries. |
 | **aperture** | L402 reverse proxy. Sits in front of a backend service, issues invoices, validates paid tokens, proxies authorized requests. |
-| **mcp-lnc** | Builds and configures the MCP server for LNC-based read-only access to a Lightning node. 18 tools, no stored credentials. |
+| **lightning-mcp-server** | Builds and configures the MCP server for LNC-based read-only access to a Lightning node. 18 tools, no stored credentials. |
 | **commerce** | Meta-skill orchestrating lnd + lnget + aperture for end-to-end buyer/seller workflows. |
 
 All scripts support `--container` for Docker-based lnd nodes and `--rpcserver`
@@ -304,4 +332,4 @@ can be overridden via environment variables.
 
 ## License
 
-See [LICENSE](mcp-server/LICENSE).
+See [LICENSE](lightning-mcp-server/LICENSE).

package/docs/architecture.md

@@ -26,7 +26,7 @@ graph TD
         mb["macaroon-bakery"]
         lnget_skill["lnget"]
         ap["aperture"]
-        mcp["mcp-lnc"]
+        mcp["lightning-mcp-server"]
         com["commerce"]
     end
 
@@ -34,7 +34,7 @@ graph TD
         lnd_daemon["litd (Lightning Terminal)<br/>HTTPS :8443 / gRPC :10009 / P2P :9735"]
         signer["lnd signer<br/>gRPC :10012"]
         aperture_daemon["aperture proxy<br/>HTTP :8081"]
-        mcp_server["mcp-lnc-server<br/>stdio"]
+        mcp_server["lightning-mcp-server<br/>stdio"]
     end
 
     subgraph External["External"]
@@ -96,7 +96,7 @@ to each skill's directory under `skills/`:
 ├── lnd → ../../skills/lnd
 ├── lnget → ../../skills/lnget
 ├── macaroon-bakery → ../../skills/macaroon-bakery
-└── mcp-lnc → ../../skills/mcp-lnc
+└── lightning-mcp-server → ../../skills/lightning-mcp-server
 ```
 
 Each skill directory contains a `SKILL.md` file with YAML frontmatter declaring
@@ -285,7 +285,7 @@ graph TD
 
 ## MCP Server
 
-The MCP server (`mcp-server/`) connects AI assistants to a Lightning node
+The MCP server (`lightning-mcp-server/`) connects AI assistants to a Lightning node
 through the [Model Context Protocol](https://modelcontextprotocol.io). It uses
 [Lightning Node Connect](https://docs.lightning.engineering/lightning-network-tools/lightning-terminal/lightning-node-connect)
 (LNC) to reach the node, which means the assistant never needs direct network
@@ -299,7 +299,7 @@ authenticated by a 10-word pairing phrase generated in Lightning Terminal.
 ```mermaid
 sequenceDiagram
     participant CC as Claude Code
-    participant MCP as mcp-lnc-server
+    participant MCP as lightning-mcp-server
     participant MB as Mailbox Relay
     participant LND as lnd + Lightning Terminal
 
@@ -322,8 +322,8 @@ sequenceDiagram
 The server runs on stdio transport. The MCP client (Claude Code or any other
 MCP-compatible host) launches it as a subprocess and communicates over
 stdin/stdout. No HTTP server, no port binding. The server's Go implementation
-lives under `mcp-server/` and is built via
-`skills/mcp-lnc/scripts/install.sh`.
+lives under `lightning-mcp-server/` and is built via
+`skills/lightning-mcp-server/scripts/install.sh`.
 
 The server exposes 18 read-only tools organized into seven categories:
 Connection, Node, Channels, Invoices, Payments, Peers/Network, and On-Chain.
@@ -333,7 +333,7 @@ open channels, or change configuration. See [MCP Server](mcp-server.md) for the
 full tool reference.
 
 Internally, the server uses a service manager
-(`mcp-server/internal/services/manager.go`) that initializes one service per
+(`lightning-mcp-server/internal/services/manager.go`) that initializes one service per
 tool category and registers their tools with the MCP SDK. When `lnc_connect`
 is called, the manager creates a Lightning client via LNC and distributes it to
 all services. When `lnc_disconnect` is called, the connection is closed and the
@@ -407,7 +407,7 @@ managed by their respective daemons.
 | `~/.lnget/signer/credentials-bundle/` | security module | Exported credentials for agent |
 | `~/.lnget/config.yaml` | lnget | lnget client configuration |
 | `~/.lnget/tokens/<domain>/` | lnget | Cached L402 tokens per domain |
-| `mcp-server/.env` | mcp-lnc | MCP server environment config |
+| `lightning-mcp-server/.env` | lightning-mcp-server | MCP server environment config |
 
 ### Daemon Data (native mode: filesystem; container mode: Docker volumes)
 

package/docs/mcp-server.md

@@ -24,7 +24,7 @@ firewall configuration and no port forwarding.
 
 ```mermaid
 graph LR
-    CC["Claude Code<br/>(stdio)"] <--> MCP["mcp-lnc-server"]
+    CC["Claude Code<br/>(stdio)"] <--> MCP["lightning-mcp-server"]
     MCP <-->|"encrypted<br/>WebSocket"| MB["Mailbox Relay<br/>mailbox.terminal.lightning.today"]
     MB <-->|"encrypted<br/>WebSocket"| LND["lnd + Lightning Terminal"]
 
@@ -49,23 +49,23 @@ Three scripts handle the full setup:
 ### 1. Build the server
 
 ```bash
-skills/mcp-lnc/scripts/install.sh
+skills/lightning-mcp-server/scripts/install.sh
 ```
 
-This compiles `mcp-lnc-server` from the `mcp-server/` directory in the
+This compiles `lightning-mcp-server` from the `lightning-mcp-server/` directory in the
 repository and installs it to `$GOPATH/bin`. Requires Go 1.24+.
 
 ### 2. Configure the environment
 
 ```bash
 # Production (Lightning Terminal on mainnet)
-skills/mcp-lnc/scripts/configure.sh --production
+skills/lightning-mcp-server/scripts/configure.sh --production
 
 # Development (local regtest)
-skills/mcp-lnc/scripts/configure.sh --dev --mailbox aperture:11110
+skills/lightning-mcp-server/scripts/configure.sh --dev --mailbox aperture:11110
 ```
 
-This generates `mcp-server/.env` with the following variables:
+This generates `lightning-mcp-server/.env` with the following variables:
 
 | Variable | Default | Description |
 |----------|---------|-------------|
@@ -78,10 +78,10 @@ This generates `mcp-server/.env` with the following variables:
 
 ```bash
 # Project-level (recommended)
-skills/mcp-lnc/scripts/setup-claude-config.sh --scope project
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope project
 
 # Global
-skills/mcp-lnc/scripts/setup-claude-config.sh --scope global
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope global
 ```
 
 This adds the MCP server to `.mcp.json` (project) or `~/.claude.json` (global).
@@ -93,7 +93,7 @@ The resulting configuration looks like:
 {
   "mcpServers": {
     "lnc": {
-      "command": "mcp-lnc-server",
+      "command": "lightning-mcp-server",
       "env": {
         "LNC_MAILBOX_SERVER": "mailbox.terminal.lightning.today:443"
       }
@@ -195,7 +195,7 @@ appropriate macaroons (scoped via `macaroon-bakery`).
 
 ## Server Internals
 
-The MCP server is a Go application in the `mcp-server/` directory. It runs on
+The MCP server is a Go application in the `lightning-mcp-server/` directory. It runs on
 stdio transport. The MCP client launches it as a subprocess and communicates over
 stdin/stdout.
 
@@ -214,7 +214,7 @@ connection is closed and all services are reset.
 ### Building from Source
 
 ```bash
-cd mcp-server
+cd lightning-mcp-server
 make build           # debug binary
 make build-release   # optimized binary
 make install         # install to $GOPATH/bin
@@ -226,7 +226,7 @@ make check           # run fmt, lint, mod-check, and unit tests
 For containerized deployment:
 
 ```bash
-cd mcp-server
+cd lightning-mcp-server
 make docker-build
 ```
 
@@ -242,7 +242,7 @@ The Docker configuration in `.mcp.json`:
         "--env", "LNC_MAILBOX_SERVER",
         "--env", "LNC_DEV_MODE",
         "--env", "LNC_INSECURE",
-        "mcp-lnc-server"
+        "lightning-mcp-server"
       ]
     }
   }
@@ -255,7 +255,7 @@ For local regtest environments, enable development mode to skip TLS verification
 and connect to a local mailbox:
 
 ```bash
-skills/mcp-lnc/scripts/configure.sh --dev --mailbox localhost:11110 --insecure
+skills/lightning-mcp-server/scripts/configure.sh --dev --mailbox localhost:11110 --insecure
 ```
 
 This sets `LNC_DEV_MODE=true` and `LNC_INSECURE=true` in the `.env` file.
@@ -278,8 +278,8 @@ production, this is `mailbox.terminal.lightning.today:443`. For local
 development, ensure the local mailbox is running.
 
 **"TLS handshake failure"**: For local regtest, enable insecure mode:
-`skills/mcp-lnc/scripts/configure.sh --dev --insecure`
+`skills/lightning-mcp-server/scripts/configure.sh --dev --insecure`
 
 **Tools not appearing in Claude Code**: Restart Claude Code after running
 `setup-claude-config.sh`. Verify the binary is on your PATH with
-`which mcp-lnc-server`.
+`which lightning-mcp-server`.

package/docs/quickref.md

@@ -9,7 +9,7 @@
 skills/lnd/scripts/install.sh                              # litd container image
 skills/lnget/scripts/install.sh                            # lnget CLI (always built from source)
 skills/aperture/scripts/install.sh                         # aperture (always built from source)
-skills/mcp-lnc/scripts/install.sh                          # MCP server (always built from source)
+skills/lightning-mcp-server/scripts/install.sh                          # MCP server (always built from source)
 skills/lightning-security-module/scripts/install.sh         # lnd signer container image
 ```
 
@@ -151,12 +151,12 @@ skills/aperture/scripts/stop.sh                            # stop proxy
 ## MCP Server
 
 ```bash
-skills/mcp-lnc/scripts/install.sh                         # build from source
-skills/mcp-lnc/scripts/configure.sh                        # generate .env
-skills/mcp-lnc/scripts/configure.sh --production           # mainnet config
-skills/mcp-lnc/scripts/configure.sh --dev --insecure       # regtest config
-skills/mcp-lnc/scripts/setup-claude-config.sh --scope project   # add to .mcp.json
-skills/mcp-lnc/scripts/setup-claude-config.sh --scope global    # add to ~/.claude.json
+skills/lightning-mcp-server/scripts/install.sh                         # build from source
+skills/lightning-mcp-server/scripts/configure.sh                        # generate .env
+skills/lightning-mcp-server/scripts/configure.sh --production           # mainnet config
+skills/lightning-mcp-server/scripts/configure.sh --dev --insecure       # regtest config
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope project   # add to .mcp.json
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope global    # add to ~/.claude.json
 ```
 
 ## Remote Signer
@@ -248,7 +248,7 @@ skills/macaroon-bakery/scripts/bake.sh --role pay-only \
 | `~/.lnd-signer/` | Signer lnd data |
 | `~/.aperture/aperture.yaml` | Aperture configuration |
 | `~/.aperture/aperture.db` | Aperture token database |
-| `mcp-server/.env` | MCP server config |
+| `lightning-mcp-server/.env` | MCP server config |
 
 ## Ports
 

package/docs/security.md

@@ -100,7 +100,7 @@ payments, open channels, or modify any node state.
 node's state for the duration of the active LNC session. Once the session is
 closed, no credentials remain to reconnect.
 
-**Setup:** Use the `mcp-lnc` skill. See [MCP Server](mcp-server.md) for the
+**Setup:** Use the `lightning-mcp-server` skill. See [MCP Server](mcp-server.md) for the
 setup walkthrough.
 
 ## Remote Signer in Depth

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@lightninglabs/lightning-mcp-server",
-  "version": "0.2.0",
+  "version": "0.2.5",
   "description": "Lightning Network agent toolkit for Claude Code — MCP server, L402 payments, node operations, and 7 composable skills",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/lightninglabs/lightning-agent-kit"
+    "url": "https://github.com/lightninglabs/lightning-agent-tools"
   },
-  "homepage": "https://github.com/lightninglabs/lightning-agent-kit#quick-start",
+  "homepage": "https://github.com/lightninglabs/lightning-agent-tools#quick-start",
   "keywords": [
     "lightning",
     "lightning-network",

package/postinstall.js

@@ -26,7 +26,7 @@ const PLATFORM_MAP = {
 };
 
 // REPO is the GitHub repository that hosts the release binaries.
-const REPO = "lightninglabs/lightning-agent-kit";
+const REPO = "lightninglabs/lightning-agent-tools";
 
 // BINARY_NAME is the name of the binary inside the release tarball.
 const BINARY_NAME = "lightning-mcp-server";

package/skills/aperture/SKILL.md

@@ -20,10 +20,15 @@ skills/aperture/scripts/install.sh
 # 2. Generate config (connects to local lnd)
 skills/aperture/scripts/setup.sh
 
-# 3. Start aperture
+# 3. Ensure invoice.macaroon exists (required for L402 invoice creation)
+#    If not present, bake one with the macaroon-bakery skill:
+skills/macaroon-bakery/scripts/bake.sh --role invoice-only \
+    --save-to ~/.lnd/data/chain/bitcoin/mainnet/invoice.macaroon
+
+# 4. Start aperture
 skills/aperture/scripts/start.sh
 
-# 4. Test with lnget
+# 5. Test with lnget
 lnget -k --no-pay https://localhost:8081/api/test
 ```
 
@@ -118,6 +123,23 @@ skills/aperture/scripts/stop.sh
 
 Config file: `~/.aperture/aperture.yaml`
 
+### Invoice Macaroon Requirement
+
+Aperture requires `invoice.macaroon` in the configured `macdir` to create
+Lightning invoices for L402 challenges. This is **not** the same as
+`admin.macaroon`. If the macaroon is missing, aperture will fail to start or
+will return errors when clients request paid resources.
+
+To bake an invoice macaroon with the macaroon-bakery skill:
+
+```bash
+skills/macaroon-bakery/scripts/bake.sh --role invoice-only \
+    --save-to ~/.lnd/data/chain/bitcoin/mainnet/invoice.macaroon
+```
+
+The `setup.sh` script will warn you if `invoice.macaroon` is not found at the
+expected path.
+
 ### Minimal Agent Configuration
 
 This is the minimal config for an agent hosting paid endpoints with a local

package/skills/aperture/scripts/install.sh

@@ -32,6 +32,9 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
+# Default to @latest when no version specified.
+VERSION="${VERSION:-@latest}"
+
 echo "=== Installing Aperture ==="
 echo ""
 

package/skills/aperture/scripts/setup.sh

@@ -149,6 +149,29 @@ YAML
 
 echo "Config written to $CONFIG_FILE"
 echo ""
+
+# Warn if invoice.macaroon is missing (required for aperture to create invoices).
+if [ "$NO_AUTH" != true ]; then
+    INVOICE_MACAROON="$LND_MACDIR/invoice.macaroon"
+    if [ ! -f "$INVOICE_MACAROON" ]; then
+        echo "WARNING: invoice.macaroon not found at $INVOICE_MACAROON"
+        echo ""
+        echo "Aperture requires invoice.macaroon in the macdir to create invoices."
+        echo "Without it, aperture will fail to generate L402 challenges."
+        echo ""
+
+        BAKERY_SCRIPT="$SCRIPT_DIR/../../macaroon-bakery/scripts/bake.sh"
+        if [ -x "$BAKERY_SCRIPT" ]; then
+            echo "To bake one automatically:"
+            echo "  $BAKERY_SCRIPT --role invoice-only --save-to $INVOICE_MACAROON"
+        else
+            echo "To create one, use the macaroon-bakery skill:"
+            echo "  skills/macaroon-bakery/scripts/bake.sh --role invoice-only --save-to $INVOICE_MACAROON"
+        fi
+        echo ""
+    fi
+fi
+
 echo "Next steps:"
 echo "  1. Start a backend on port $SERVICE_PORT"
 echo "  2. Start aperture: skills/aperture/scripts/start.sh"

package/skills/lib/config-gen.sh

@@ -7,8 +7,18 @@
 #
 # Usage:
 #   source skills/lib/config-gen.sh
-#   generate_litd_config <template> <output> [network] [debug] [alias] [uipass] [extra_args]
-#   generate_lnd_config  <template> <output> [network] [debug] [extra_args]
+#   generate_litd_config <template> <output> [network] [debug] [alias] [uipass] [extra_args] [bitcoind_opts]
+#   generate_lnd_config  <template> <output> [network] [debug] [extra_args] [bitcoind_opts]
+
+# Default bitcoind connection values used when switching to regtest.
+# Uses the container name (litd-bitcoind) rather than the compose service name
+# (bitcoind) so that containers joining via `docker network connect` can
+# resolve the host — service aliases only work within the originating compose.
+_BITCOIND_RPCHOST="${BITCOIND_RPCHOST:-litd-bitcoind:18443}"
+_BITCOIND_RPCUSER="${BITCOIND_RPCUSER:-devuser}"
+_BITCOIND_RPCPASS="${BITCOIND_RPCPASS:-devpass}"
+_BITCOIND_ZMQPUBRAWBLOCK="${BITCOIND_ZMQPUBRAWBLOCK:-tcp://litd-bitcoind:28332}"
+_BITCOIND_ZMQPUBRAWTX="${BITCOIND_ZMQPUBRAWTX:-tcp://litd-bitcoind:28333}"
 
 # generate_litd_config produces a litd runtime config from a template.
 #
@@ -18,6 +28,10 @@
 # config file format (lnd.flag=value). Boolean flags without a value
 # get =true appended.
 #
+# When network=regtest, the function automatically swaps
+# lnd.bitcoin.node=neutrino to lnd.bitcoin.node=bitcoind, comments out
+# neutrino and fee.url lines, and appends bitcoind connection defaults.
+#
 # Arguments:
 #   $1 - template  Path to the .conf.template file.
 #   $2 - output    Path to write the generated config.
@@ -26,6 +40,7 @@
 #   $5 - alias     Node alias (default: litd-agent).
 #   $6 - uipass    litd UI password (default: empty, keeps template value).
 #   $7 - extra     Space-separated extra CLI flags to append.
+#   $8 - bitcoind  Bitcoind connection overrides (host:user:pass). Optional.
 generate_litd_config() {
     local template="$1"
     local output="$2"
@@ -34,6 +49,7 @@ generate_litd_config() {
     local alias="${5:-litd-agent}"
     local ui_password="${6:-}"
     local extra_args="${7:-}"
+    local bitcoind_opts="${8:-}"
 
     cp "$template" "$output"
 
@@ -61,6 +77,11 @@ generate_litd_config() {
         fi
     fi
 
+    # Regtest: swap neutrino backend for bitcoind.
+    if [ "$network" = "regtest" ]; then
+        _apply_regtest_bitcoind_litd "$output" "$bitcoind_opts"
+    fi
+
     # Append extra args as config-file lines.
     _append_extra_args "$output" "$extra_args"
 }
@@ -69,18 +90,24 @@ generate_litd_config() {
 # template. Same pattern as generate_litd_config but for lnd-style
 # configs that use unprefixed keys (bitcoin.active, debuglevel, etc.).
 #
+# When network=regtest, the function automatically swaps
+# bitcoin.node=neutrino to bitcoin.node=bitcoind, comments out neutrino
+# and fee.url lines, and appends bitcoind connection defaults.
+#
 # Arguments:
 #   $1 - template  Path to the .conf.template file.
 #   $2 - output    Path to write the generated config.
 #   $3 - network   Bitcoin network (default: testnet).
 #   $4 - debug     Debug level string (default: info).
 #   $5 - extra     Space-separated extra CLI flags to append.
+#   $6 - bitcoind  Bitcoind connection overrides (host:user:pass). Optional.
 generate_lnd_config() {
     local template="$1"
     local output="$2"
     local network="${3:-testnet}"
     local debug_level="${4:-info}"
     local extra_args="${5:-}"
+    local bitcoind_opts="${6:-}"
 
     cp "$template" "$output"
 
@@ -95,10 +122,101 @@ generate_lnd_config() {
     sed -i.bak 's/^debuglevel=.*/debuglevel='"$debug_level"'/' "$output"
     rm -f "$output.bak"
 
+    # Regtest: swap neutrino backend for bitcoind.
+    if [ "$network" = "regtest" ]; then
+        _apply_regtest_bitcoind_lnd "$output" "$bitcoind_opts"
+    fi
+
     # Append extra args as config-file lines.
     _append_extra_args "$output" "$extra_args"
 }
 
+# _apply_regtest_bitcoind_lnd rewrites an lnd config (unprefixed keys) to use
+# bitcoind instead of neutrino. Called automatically when network=regtest.
+_apply_regtest_bitcoind_lnd() {
+    local output="$1"
+    local bitcoind_opts="$2"
+
+    # Parse optional overrides (host:user:pass).
+    local rpchost="$_BITCOIND_RPCHOST"
+    local rpcuser="$_BITCOIND_RPCUSER"
+    local rpcpass="$_BITCOIND_RPCPASS"
+    local zmqblock="$_BITCOIND_ZMQPUBRAWBLOCK"
+    local zmqtx="$_BITCOIND_ZMQPUBRAWTX"
+    if [ -n "$bitcoind_opts" ]; then
+        IFS=':' read -r _h _u _p <<< "$bitcoind_opts"
+        [ -n "$_h" ] && rpchost="$_h"
+        [ -n "$_u" ] && rpcuser="$_u"
+        [ -n "$_p" ] && rpcpass="$_p"
+    fi
+
+    # Swap neutrino for bitcoind.
+    sed -i.bak 's/^bitcoin\.node=neutrino/bitcoin.node=bitcoind/' "$output"
+    rm -f "$output.bak"
+
+    # Comment out neutrino lines.
+    sed -i.bak 's/^neutrino\./#neutrino./' "$output"
+    rm -f "$output.bak"
+
+    # Comment out fee.url line (not needed for regtest).
+    sed -i.bak 's/^fee\.url=/#fee.url=/' "$output"
+    rm -f "$output.bak"
+
+    # Append bitcoind connection settings if not already present.
+    if ! grep -q '^bitcoind\.rpchost=' "$output"; then
+        echo "" >> "$output"
+        echo "# Bitcoind connection settings (regtest)." >> "$output"
+        echo "bitcoind.rpchost=$rpchost" >> "$output"
+        echo "bitcoind.rpcuser=$rpcuser" >> "$output"
+        echo "bitcoind.rpcpass=$rpcpass" >> "$output"
+        echo "bitcoind.zmqpubrawblock=$zmqblock" >> "$output"
+        echo "bitcoind.zmqpubrawtx=$zmqtx" >> "$output"
+    fi
+}
+
+# _apply_regtest_bitcoind_litd rewrites a litd config (lnd.-prefixed keys) to
+# use bitcoind instead of neutrino. Called automatically when network=regtest.
+_apply_regtest_bitcoind_litd() {
+    local output="$1"
+    local bitcoind_opts="$2"
+
+    # Parse optional overrides (host:user:pass).
+    local rpchost="$_BITCOIND_RPCHOST"
+    local rpcuser="$_BITCOIND_RPCUSER"
+    local rpcpass="$_BITCOIND_RPCPASS"
+    local zmqblock="$_BITCOIND_ZMQPUBRAWBLOCK"
+    local zmqtx="$_BITCOIND_ZMQPUBRAWTX"
+    if [ -n "$bitcoind_opts" ]; then
+        IFS=':' read -r _h _u _p <<< "$bitcoind_opts"
+        [ -n "$_h" ] && rpchost="$_h"
+        [ -n "$_u" ] && rpcuser="$_u"
+        [ -n "$_p" ] && rpcpass="$_p"
+    fi
+
+    # Swap neutrino for bitcoind.
+    sed -i.bak 's/^lnd\.bitcoin\.node=neutrino/lnd.bitcoin.node=bitcoind/' "$output"
+    rm -f "$output.bak"
+
+    # Comment out lnd.neutrino lines.
+    sed -i.bak 's/^lnd\.neutrino\./#lnd.neutrino./' "$output"
+    rm -f "$output.bak"
+
+    # Comment out lnd.fee.url line (not needed for regtest).
+    sed -i.bak 's/^lnd\.fee\.url=/#lnd.fee.url=/' "$output"
+    rm -f "$output.bak"
+
+    # Append bitcoind connection settings if not already present.
+    if ! grep -q '^lnd\.bitcoind\.rpchost=' "$output"; then
+        echo "" >> "$output"
+        echo "# Bitcoind connection settings (regtest)." >> "$output"
+        echo "lnd.bitcoind.rpchost=$rpchost" >> "$output"
+        echo "lnd.bitcoind.rpcuser=$rpcuser" >> "$output"
+        echo "lnd.bitcoind.rpcpass=$rpcpass" >> "$output"
+        echo "lnd.bitcoind.zmqpubrawblock=$zmqblock" >> "$output"
+        echo "lnd.bitcoind.zmqpubrawtx=$zmqtx" >> "$output"
+    fi
+}
+
 # _append_extra_args converts CLI-style flags to config-file lines and
 # appends them to the output file. Each --flag=value becomes flag=value;
 # bare --flag becomes flag=true.

package/skills/{mcp-lnc → lightning-mcp-server}/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: mcp-lnc
+name: lightning-mcp-server
 description: Build and configure the MCP server for Lightning Node Connect (LNC). Connects AI assistants to lnd nodes via encrypted WebSocket tunnels using pairing phrases — no direct network access or TLS certs needed. Read-only by default (18 tools for querying node state, channels, payments, invoices, peers, on-chain data).
 ---
 
@@ -18,13 +18,13 @@ node state but cannot send payments or modify channels.
 
 ```bash
 # 1. Build the MCP server binary
-skills/mcp-lnc/scripts/install.sh
+skills/lightning-mcp-server/scripts/install.sh
 
 # 2. Configure environment (mailbox server, dev mode, etc.)
-skills/mcp-lnc/scripts/configure.sh
+skills/lightning-mcp-server/scripts/configure.sh
 
 # 3. Add to Claude Code as an MCP server
-skills/mcp-lnc/scripts/setup-claude-config.sh
+skills/lightning-mcp-server/scripts/setup-claude-config.sh
 ```
 
 Then restart Claude Code. The `lnc_connect` tool will be available to connect
@@ -33,10 +33,10 @@ to any lnd node using a pairing phrase.
 ## How It Works
 
 ```
-Claude Code  <--stdio-->  mcp-lnc-server  <--LNC WebSocket-->  Mailbox  <-->  lnd
+Claude Code  <--stdio-->  lightning-mcp-server  <--LNC WebSocket-->  Mailbox  <-->  lnd
 ```
 
-1. Claude Code launches `mcp-lnc-server` as a subprocess (stdio transport)
+1. Claude Code launches `lightning-mcp-server` as a subprocess (stdio transport)
 2. Agent calls `lnc_connect` with a pairing phrase and password
 3. Server generates an ephemeral ECDSA keypair and opens an encrypted WebSocket
    tunnel through the mailbox relay
@@ -50,28 +50,28 @@ only credential, and it's handled in-memory only.
 
 ```bash
 # Build from source (requires Go 1.24+)
-skills/mcp-lnc/scripts/install.sh
+skills/lightning-mcp-server/scripts/install.sh
 
 # Verify
-mcp-lnc-server -version
+lightning-mcp-server -version
 ```
 
-The install script builds from the `mcp-server/` directory in this repo.
+The install script builds from the `lightning-mcp-server/` directory in this repo.
 
 ## Configuration
 
 ```bash
 # Generate .env with defaults
-skills/mcp-lnc/scripts/configure.sh
+skills/lightning-mcp-server/scripts/configure.sh
 
 # Production (mainnet via Lightning Terminal)
-skills/mcp-lnc/scripts/configure.sh --production
+skills/lightning-mcp-server/scripts/configure.sh --production
 
 # Development (local regtest)
-skills/mcp-lnc/scripts/configure.sh --dev --mailbox aperture:11110
+skills/lightning-mcp-server/scripts/configure.sh --dev --mailbox aperture:11110
 ```
 
-Configuration is stored in `mcp-server/.env`. Key settings:
+Configuration is stored in `lightning-mcp-server/.env`. Key settings:
 
 | Variable | Default | Description |
 |----------|---------|-------------|
@@ -109,14 +109,14 @@ via `.mcp.json`), `--scope user` (all your projects).
 ### Option 2: Setup script (from source)
 
 ```bash
-# Add mcp-lnc-server to Claude Code's MCP config
-skills/mcp-lnc/scripts/setup-claude-config.sh
+# Add lightning-mcp-server to Claude Code's MCP config
+skills/lightning-mcp-server/scripts/setup-claude-config.sh
 
 # Project-level config (current project only)
-skills/mcp-lnc/scripts/setup-claude-config.sh --scope project
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope project
 
 # Global config (all projects)
-skills/mcp-lnc/scripts/setup-claude-config.sh --scope global
+skills/lightning-mcp-server/scripts/setup-claude-config.sh --scope global
 ```
 
 This adds the server to Claude Code's `.mcp.json` (project) or
@@ -147,7 +147,7 @@ Or with a locally built binary:
 {
   "mcpServers": {
     "lnc": {
-      "command": "mcp-lnc-server",
+      "command": "lightning-mcp-server",
       "env": {
         "LNC_MAILBOX_SERVER": "mailbox.terminal.lightning.today:443"
       }
@@ -168,7 +168,7 @@ Or run via Docker:
         "--env", "LNC_MAILBOX_SERVER",
         "--env", "LNC_DEV_MODE",
         "--env", "LNC_INSECURE",
-        "mcp-lnc-server"
+        "lightning-mcp-server"
       ]
     }
   }
@@ -269,12 +269,12 @@ Check that the mailbox server is reachable. For production, ensure
 ### "TLS handshake failure"
 If using a local regtest setup, enable dev mode and insecure mode:
 ```bash
-skills/mcp-lnc/scripts/configure.sh --dev --insecure
+skills/lightning-mcp-server/scripts/configure.sh --dev --insecure
 ```
 
 ### Tools not appearing in Claude Code
 Restart Claude Code after running `setup-claude-config.sh`. Check that
-`mcp-lnc-server` is on your `$PATH`:
+`lightning-mcp-server` is on your `$PATH`:
 ```bash
-which mcp-lnc-server
+which lightning-mcp-server
 ```

package/skills/{mcp-lnc → lightning-mcp-server}/scripts/configure.sh

@@ -8,12 +8,12 @@
 #   configure.sh --dev --mailbox host   # Custom mailbox server
 #   configure.sh --dev --insecure       # Dev mode with TLS verification disabled
 #
-# Writes to mcp-server/.env in the lightning-agent-kit repo.
+# Writes to lightning-mcp-server/.env in the lightning-agent-kit repo.
 
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-MCP_SERVER_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)/mcp-server"
+MCP_SERVER_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)/lightning-mcp-server"
 
 MAILBOX=""
 DEV_MODE=""
@@ -66,9 +66,9 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-# Verify mcp-server directory exists.
+# Verify lightning-mcp-server directory exists.
 if [ ! -d "$MCP_SERVER_DIR" ]; then
-    echo "Error: mcp-server/ directory not found at $MCP_SERVER_DIR" >&2
+    echo "Error: lightning-mcp-server/ directory not found at $MCP_SERVER_DIR" >&2
     exit 1
 fi
 
@@ -126,5 +126,5 @@ chmod 600 "$ENV_FILE"
 echo "Configuration written to $ENV_FILE (mode 0600)"
 echo ""
 echo "Next steps:"
-echo "  1. Add to Claude Code: skills/mcp-lnc/scripts/setup-claude-config.sh"
+echo "  1. Add to Claude Code: skills/lightning-mcp-server/scripts/setup-claude-config.sh"
 echo "  2. Restart Claude Code to pick up the new MCP server"

package/skills/{mcp-lnc → lightning-mcp-server}/scripts/install.sh

@@ -2,7 +2,7 @@
 # Build and install the MCP LNC server from source.
 #
 # Usage:
-#   install.sh              # Build from mcp-server/ in this repo
+#   install.sh              # Build from lightning-mcp-server/ in this repo
 #   install.sh --release    # Build optimized release binary
 #
 # Prerequisites: Go 1.24+
@@ -10,7 +10,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-MCP_SERVER_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)/mcp-server"
+MCP_SERVER_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)/lightning-mcp-server"
 RELEASE=false
 
 # Parse arguments.
@@ -49,9 +49,9 @@ fi
 GO_VERSION=$(go version | grep -oE 'go[0-9]+\.[0-9]+' | head -1)
 echo "Go version: $GO_VERSION"
 
-# Verify mcp-server directory exists.
+# Verify lightning-mcp-server directory exists.
 if [ ! -d "$MCP_SERVER_DIR" ]; then
-    echo "Error: mcp-server/ directory not found at $MCP_SERVER_DIR" >&2
+    echo "Error: lightning-mcp-server/ directory not found at $MCP_SERVER_DIR" >&2
     echo "Are you running this from the lightning-agent-kit repo?" >&2
     exit 1
 fi
@@ -72,25 +72,25 @@ cd "$MCP_SERVER_DIR"
 if [ "$RELEASE" = true ]; then
     echo "Building release binary..."
     COMMIT=$(git describe --abbrev=40 --always --dirty 2>/dev/null || echo "unknown")
-    PKG="github.com/lightninglabs/lightning-agent-kit/mcp-server"
-    go build -v -ldflags "-X ${PKG}.Commit=${COMMIT}" -o "$GOBIN/mcp-lnc-server" .
+    PKG="github.com/lightninglabs/lightning-agent-kit/lightning-mcp-server"
+    go build -v -ldflags "-X ${PKG}.Commit=${COMMIT}" -o "$GOBIN/lightning-mcp-server" .
 else
     echo "Building debug binary..."
     COMMIT=$(git describe --abbrev=40 --always --dirty 2>/dev/null || echo "unknown")
-    PKG="github.com/lightninglabs/lightning-agent-kit/mcp-server"
-    go build -v -tags "dev" -ldflags "-X ${PKG}.Commit=${COMMIT}" -o "$GOBIN/mcp-lnc-server" .
+    PKG="github.com/lightninglabs/lightning-agent-kit/lightning-mcp-server"
+    go build -v -tags "dev" -ldflags "-X ${PKG}.Commit=${COMMIT}" -o "$GOBIN/lightning-mcp-server" .
 fi
 
 echo "Done."
 echo ""
 
 # Verify installation.
-if command -v mcp-lnc-server &>/dev/null; then
-    echo "mcp-lnc-server installed: $(which mcp-lnc-server)"
-    mcp-lnc-server -version 2>/dev/null || true
+if command -v lightning-mcp-server &>/dev/null; then
+    echo "lightning-mcp-server installed: $(which lightning-mcp-server)"
+    lightning-mcp-server -version 2>/dev/null || true
 else
-    echo "Warning: mcp-lnc-server not found on PATH." >&2
-    echo "Binary built at: $GOBIN/mcp-lnc-server" >&2
+    echo "Warning: lightning-mcp-server not found on PATH." >&2
+    echo "Binary built at: $GOBIN/lightning-mcp-server" >&2
     echo "Ensure \$GOPATH/bin is in your PATH." >&2
     echo "  export PATH=\$PATH:\$(go env GOPATH)/bin" >&2
 fi
@@ -99,5 +99,5 @@ echo ""
 echo "Installation complete."
 echo ""
 echo "Next steps:"
-echo "  1. Configure: skills/mcp-lnc/scripts/configure.sh"
-echo "  2. Add to Claude Code: skills/mcp-lnc/scripts/setup-claude-config.sh"
+echo "  1. Configure: skills/lightning-mcp-server/scripts/configure.sh"
+echo "  2. Add to Claude Code: skills/lightning-mcp-server/scripts/setup-claude-config.sh"

package/skills/{mcp-lnc → lightning-mcp-server}/scripts/setup-claude-config.sh

@@ -12,7 +12,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-MCP_SERVER_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)/mcp-server"
+MCP_SERVER_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)/lightning-mcp-server"
 
 SCOPE="project"
 USE_DOCKER=false
@@ -108,7 +108,7 @@ if [ "$USE_DOCKER" = true ]; then
                    "--env", "LNC_MAILBOX_SERVER",
                    "--env", "LNC_DEV_MODE",
                    "--env", "LNC_INSECURE",
-                   "mcp-lnc-server"],
+                   "lightning-mcp-server"],
             env: {
                 LNC_MAILBOX_SERVER: $mailbox,
                 LNC_DEV_MODE: $devmode,
@@ -117,12 +117,12 @@ if [ "$USE_DOCKER" = true ]; then
         }')
 else
     # Check that binary exists.
-    BINARY_PATH=$(command -v mcp-lnc-server 2>/dev/null || echo "")
+    BINARY_PATH=$(command -v lightning-mcp-server 2>/dev/null || echo "")
     if [ -z "$BINARY_PATH" ]; then
-        echo "Warning: mcp-lnc-server not found on PATH." >&2
+        echo "Warning: lightning-mcp-server not found on PATH." >&2
         echo "Run install.sh first, or use --docker." >&2
         echo ""
-        BINARY_PATH="mcp-lnc-server"
+        BINARY_PATH="lightning-mcp-server"
     fi
 
     MCP_ENTRY=$(jq -n \

package/skills/{mcp-lnc → lightning-mcp-server}/templates/env.template

@@ -1,5 +1,5 @@
 # MCP LNC Server Configuration
-# Copy this file to mcp-server/.env and customize for your environment.
+# Copy this file to lightning-mcp-server/.env and customize for your environment.
 
 # Default mailbox server address
 # Production: mailbox.terminal.lightning.today:443

package/skills/lightning-security-module/SKILL.md

@@ -218,7 +218,7 @@ differences from a standard lnd node:
 - Replace admin macaroon with a signer-only macaroon (see `macaroon-bakery`)
 - Restrict signer RPC to specific IP addresses via firewall
 - Run signer on dedicated hardware or a hardened VM
-- Use Lightning Node Connect (LNC) via `mcp-lnc` for read-only agent access
+- Use Lightning Node Connect (LNC) via `lightning-mcp-server` for read-only agent access
 
 ## Macaroon Bakery for Signer
 

package/skills/lightning-security-module/scripts/docker-start.sh

@@ -4,8 +4,10 @@
 # Usage:
 #   docker-start.sh                          # Default (testnet, background)
 #   docker-start.sh --network mainnet        # Mainnet (real coins)
+#   docker-start.sh --regtest                # Regtest with bitcoind backend
 #   docker-start.sh --foreground             # Run in foreground (show logs)
 #   docker-start.sh --build                  # Rebuild before starting
+#   docker-start.sh --docker-network NAME    # Join an existing Docker network
 
 set -e
 
@@ -17,6 +19,7 @@ LIB_DIR="$SCRIPT_DIR/../../lib"
 DETACH=true
 BUILD=false
 CUSTOM_NETWORK=""
+DOCKER_NETWORK=""
 
 # Source pinned versions so compose files pick them up as env vars.
 if [ -f "$VERSIONS_FILE" ]; then
@@ -34,6 +37,14 @@ while [[ $# -gt 0 ]]; do
             CUSTOM_NETWORK="$2"
             shift 2
             ;;
+        --regtest)
+            CUSTOM_NETWORK="regtest"
+            shift
+            ;;
+        --docker-network)
+            DOCKER_NETWORK="$2"
+            shift 2
+            ;;
         --build)
             BUILD=true
             shift
@@ -48,9 +59,11 @@ while [[ $# -gt 0 ]]; do
             echo "Start the remote signer container."
             echo ""
             echo "Options:"
-            echo "  --network NET     Override network (testnet, mainnet, signet)"
-            echo "  --build           Rebuild images before starting"
-            echo "  --foreground, -f  Run in foreground (show logs)"
+            echo "  --network NET         Override network (testnet, mainnet, signet, regtest)"
+            echo "  --regtest             Shorthand for --network regtest"
+            echo "  --docker-network NET  Join an existing Docker network (e.g., regtest bitcoind)"
+            echo "  --build               Rebuild images before starting"
+            echo "  --foreground, -f      Run in foreground (show logs)"
             exit 0
             ;;
         *)
@@ -65,6 +78,8 @@ if [ -n "$CUSTOM_NETWORK" ]; then
     NETWORK="$CUSTOM_NETWORK"
 fi
 
+EFFECTIVE_NETWORK="${NETWORK:-testnet}"
+
 # --- Generate runtime config from template ---
 
 LNGET_LND_DIR="${LNGET_LND_DIR:-$HOME/.lnget/lnd}"
@@ -73,7 +88,7 @@ mkdir -p "$LNGET_LND_DIR"
 generate_lnd_config \
     "$TEMPLATE_DIR/signer-lnd.conf.template" \
     "$LNGET_LND_DIR/signer-lnd.conf" \
-    "${NETWORK:-testnet}" \
+    "$EFFECTIVE_NETWORK" \
     "${LND_DEBUG:-info}" \
     ""
 
@@ -85,7 +100,7 @@ cd "$TEMPLATE_DIR"
 
 echo "=== Starting signer container ==="
 echo "  Config:   $SIGNER_CONF_PATH"
-echo "  Network:  ${NETWORK:-testnet}"
+echo "  Network:  $EFFECTIVE_NETWORK"
 echo "  Image:    ${LND_IMAGE:-lightninglabs/lnd}:${LND_VERSION:-v0.20.0-beta}"
 echo ""
 
@@ -105,6 +120,19 @@ fi
 echo "Running: $CMD"
 eval "$CMD"
 
+# When running on regtest, connect the signer to the regtest Docker network
+# so it can reach bitcoind.
+if [ "$EFFECTIVE_NETWORK" = "regtest" ] && [ "$DETACH" = true ]; then
+    REGTEST_NETWORK="${DOCKER_NETWORK:-$(docker network ls --filter name=regtest --format '{{.Name}}' | head -1)}"
+    if [ -n "$REGTEST_NETWORK" ]; then
+        echo "Connecting signer to regtest network: $REGTEST_NETWORK"
+        docker network connect "$REGTEST_NETWORK" litd-signer 2>/dev/null || true
+    else
+        echo "Warning: No regtest Docker network found." >&2
+        echo "Start regtest bitcoind first, or use --docker-network to specify." >&2
+    fi
+fi
+
 if [ "$DETACH" = true ]; then
     echo ""
     echo "Signer started in background."

package/skills/lnd/SKILL.md

@@ -186,15 +186,15 @@ skills/lnd/scripts/lncli.sh \
 
 ## MCP / Lightning Node Connect
 
-For read-only access without direct gRPC connectivity, use the `mcp-lnc` skill
-with Lightning Node Connect (LNC). LNC uses encrypted WebSocket tunnels — no TLS
-certs, macaroons, or open ports needed. Just a pairing phrase from Lightning
-Terminal.
+For read-only access without direct gRPC connectivity, use the
+`lightning-mcp-server` skill with Lightning Node Connect (LNC). LNC uses
+encrypted WebSocket tunnels — no TLS certs, macaroons, or open ports needed.
+Just a pairing phrase from Lightning Terminal.
 
 ```bash
-skills/mcp-lnc/scripts/install.sh
-skills/mcp-lnc/scripts/configure.sh
-skills/mcp-lnc/scripts/setup-claude-config.sh
+skills/lightning-mcp-server/scripts/install.sh
+skills/lightning-mcp-server/scripts/configure.sh
+skills/lightning-mcp-server/scripts/setup-claude-config.sh
 ```
 
 ## Wallet Setup

package/skills/lnd/scripts/docker-start.sh

@@ -5,6 +5,7 @@
 #   docker-start.sh                          # Standalone litd, testnet (default)
 #   docker-start.sh --watchonly              # Watch-only + signer (production)
 #   docker-start.sh --regtest                # Regtest with bitcoind (dev)
+#   docker-start.sh --watchonly --regtest    # Watch-only + signer on regtest
 #   docker-start.sh --network mainnet        # Override network
 #   docker-start.sh --profile taproot        # Load profile
 #   docker-start.sh --foreground             # Run in foreground (show logs)
@@ -21,11 +22,13 @@ VERSIONS_FILE="$SCRIPT_DIR/../../../versions.env"
 LIB_DIR="$SCRIPT_DIR/../../lib"
 
 MODE="standalone"
+REGTEST=false
 BUILD=false
 DETACH=true
 PROFILE=""
 CUSTOM_ARGS=""
 CUSTOM_NETWORK=""
+DOCKER_NETWORK=""
 
 # Source pinned versions so compose files pick them up as env vars.
 if [ -f "$VERSIONS_FILE" ]; then
@@ -45,7 +48,7 @@ while [[ $# -gt 0 ]]; do
             shift
             ;;
         --regtest)
-            MODE="regtest"
+            REGTEST=true
             shift
             ;;
         --build)
@@ -64,6 +67,10 @@ while [[ $# -gt 0 ]]; do
             CUSTOM_NETWORK="$2"
             shift 2
             ;;
+        --docker-network)
+            DOCKER_NETWORK="$2"
+            shift 2
+            ;;
         --args|-a)
             CUSTOM_ARGS="$2"
             shift 2
@@ -86,19 +93,21 @@ while [[ $# -gt 0 ]]; do
             echo "Start litd (Lightning Terminal) containers."
             echo ""
             echo "Modes:"
-            echo "  (default)         Standalone litd with neutrino (testnet)"
-            echo "  --watchonly        Watch-only litd + remote signer"
-            echo "  --regtest          litd + bitcoind for local development"
+            echo "  (default)              Standalone litd with neutrino (testnet)"
+            echo "  --watchonly            Watch-only litd + remote signer"
+            echo "  --regtest              litd + bitcoind for local development"
+            echo "  --watchonly --regtest  Watch-only + signer on regtest"
             echo ""
             echo "Configuration:"
-            echo "  --profile, -p     Load profile (taproot, wumbo, debug, regtest)"
-            echo "  --network NET     Override network (testnet, mainnet, signet)"
-            echo "  --args, -a        Extra litd arguments (quoted string)"
-            echo "  --list-profiles   Show available profiles"
+            echo "  --profile, -p         Load profile (taproot, wumbo, debug, regtest)"
+            echo "  --network NET         Override network (testnet, mainnet, signet)"
+            echo "  --docker-network NET  Docker network to join (for external bitcoind)"
+            echo "  --args, -a            Extra litd arguments (quoted string)"
+            echo "  --list-profiles       Show available profiles"
             echo ""
             echo "Options:"
-            echo "  --build           Rebuild images before starting"
-            echo "  --foreground, -f  Run in foreground (show logs)"
+            echo "  --build               Rebuild images before starting"
+            echo "  --foreground, -f      Run in foreground (show logs)"
             exit 0
             ;;
         *)
@@ -108,6 +117,12 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
+# Handle --regtest flag: if MODE is still standalone, set to regtest.
+# If MODE is watchonly, keep it as watchonly but set network to regtest.
+if [ "$REGTEST" = true ] && [ "$MODE" = "standalone" ]; then
+    MODE="regtest"
+fi
+
 # Load profile if specified.
 if [ -n "$PROFILE" ]; then
     PROFILE_FILE="$PROFILE_DIR/$PROFILE.env"
@@ -149,6 +164,13 @@ case "$MODE" in
         ;;
 esac
 
+# Determine effective network (regtest flag overrides for watchonly mode).
+if [ "$REGTEST" = true ]; then
+    EFFECTIVE_NETWORK="regtest"
+else
+    EFFECTIVE_NETWORK="${NETWORK:-testnet}"
+fi
+
 # --- Generate runtime config from template ---
 
 LNGET_LND_DIR="${LNGET_LND_DIR:-$HOME/.lnget/lnd}"
@@ -179,7 +201,7 @@ case "$MODE" in
         generate_litd_config \
             "$TEMPLATE_DIR/litd-watchonly.conf.template" \
             "$LNGET_LND_DIR/litd.conf" \
-            "${NETWORK:-testnet}" \
+            "$EFFECTIVE_NETWORK" \
             "${LND_DEBUG:-info}" \
             "${NODE_ALIAS:-litd-agent}" \
             "${UI_PASSWORD:-agent-litd-password}" \
@@ -189,7 +211,7 @@ case "$MODE" in
         generate_lnd_config \
             "$SIGNER_TEMPLATE_DIR/signer-lnd.conf.template" \
             "$LNGET_LND_DIR/signer-lnd.conf" \
-            "${NETWORK:-testnet}" \
+            "$EFFECTIVE_NETWORK" \
             "${SIGNER_DEBUG:-info}" \
             ""
 
@@ -203,10 +225,10 @@ export LITD_CONF_PATH="$LNGET_LND_DIR/litd.conf"
 
 cd "$TEMPLATE_DIR"
 
-echo "=== Starting litd ($MODE mode) ==="
+echo "=== Starting litd ($MODE mode$([ "$REGTEST" = true ] && [ "$MODE" = "watchonly" ] && echo " + regtest")) ==="
 echo "  Compose:  $COMPOSE_FILE"
 echo "  Config:   $LITD_CONF_PATH"
-echo "  Network:  ${NETWORK:-testnet}"
+echo "  Network:  $EFFECTIVE_NETWORK"
 if [ -n "$PROFILE" ]; then
     echo "  Profile:  $PROFILE"
 fi
@@ -231,6 +253,20 @@ fi
 echo "Running: $CMD"
 eval "$CMD"
 
+# When watchonly + regtest, join the regtest Docker network so the signer and
+# litd can reach the existing bitcoind container.
+if [ "$REGTEST" = true ] && [ "$MODE" = "watchonly" ]; then
+    REGTEST_NETWORK="${DOCKER_NETWORK:-$(docker network ls --filter name=regtest --format '{{.Name}}' | head -1)}"
+    if [ -n "$REGTEST_NETWORK" ]; then
+        echo "Connecting containers to regtest network: $REGTEST_NETWORK"
+        docker network connect "$REGTEST_NETWORK" litd-signer 2>/dev/null || true
+        docker network connect "$REGTEST_NETWORK" litd 2>/dev/null || true
+    else
+        echo "Warning: No regtest Docker network found." >&2
+        echo "Start regtest bitcoind first, or use --docker-network to specify." >&2
+    fi
+fi
+
 if [ "$DETACH" = true ]; then
     echo ""
     echo "litd started in background."

package/skills/lnd/templates/litd-regtest.conf.template

@@ -44,12 +44,13 @@ lnd.bitcoin.basefee=1000
 lnd.bitcoin.feerate=1
 lnd.bitcoin.timelockdelta=80
 
-# bitcoind connection (Docker service name).
-lnd.bitcoind.rpchost=bitcoind:18443
+# bitcoind connection (container name — works both within compose and for
+# containers joining the network externally via docker network connect).
+lnd.bitcoind.rpchost=litd-bitcoind:18443
 lnd.bitcoind.rpcuser=devuser
 lnd.bitcoind.rpcpass=devpass
-lnd.bitcoind.zmqpubrawblock=tcp://bitcoind:28332
-lnd.bitcoind.zmqpubrawtx=tcp://bitcoind:28333
+lnd.bitcoind.zmqpubrawblock=tcp://litd-bitcoind:28332
+lnd.bitcoind.zmqpubrawtx=tcp://litd-bitcoind:28333
 
 lnd.db.backend=sqlite
 

package/skills/lnget/SKILL.md

@@ -185,6 +185,12 @@ lnget ln neutrino status
 
 Config lives at `~/.lnget/config.yaml`. Run `lnget config init` to create it.
 
+**Note:** `lnget config init` may generate incorrect YAML key names (e.g.,
+`tlscertpath` and `macaroonpath` instead of `tls_cert` and `macaroon`) due to
+missing yaml struct tags in the lnget source. Use the example below as the
+reference config format. If your config was generated by `lnget config init`,
+verify the `ln.lnd` keys match the format shown here.
+
 ```yaml
 l402:
   max_cost_sats: 1000       # Max invoice to auto-pay

package/skills/lnget/scripts/install.sh

@@ -32,6 +32,9 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
+# Default to @latest when no version specified.
+VERSION="${VERSION:-@latest}"
+
 echo "=== Installing lnget ==="
 echo ""
 

package/skills/macaroon-bakery/scripts/bake.sh

@@ -211,6 +211,7 @@ if [ -n "$ROLE" ]; then
                 "uri:/routerrpc.Router/SendPaymentV2"
                 "uri:/lnrpc.Lightning/DecodePayReq"
                 "uri:/lnrpc.Lightning/GetInfo"
+                "uri:/verrpc.Versioner/GetVersion"
             )
             ;;
         invoice-only)
@@ -220,6 +221,7 @@ if [ -n "$ROLE" ]; then
                 "uri:/lnrpc.Lightning/LookupInvoice"
                 "uri:/lnrpc.Lightning/ListInvoices"
                 "uri:/lnrpc.Lightning/GetInfo"
+                "uri:/verrpc.Versioner/GetVersion"
             )
             ;;
         read-only)
@@ -233,6 +235,7 @@ if [ -n "$ROLE" ]; then
                 "uri:/lnrpc.Lightning/ListInvoices"
                 "uri:/lnrpc.Lightning/GetNodeInfo"
                 "uri:/lnrpc.Lightning/GetChanInfo"
+                "uri:/verrpc.Versioner/GetVersion"
             )
             ;;
         channel-admin)
@@ -249,6 +252,7 @@ if [ -n "$ROLE" ]; then
                 "uri:/lnrpc.Lightning/ClosedChannels"
                 "uri:/lnrpc.Lightning/GetNodeInfo"
                 "uri:/lnrpc.Lightning/GetChanInfo"
+                "uri:/verrpc.Versioner/GetVersion"
             )
             ;;
         signer-only)
@@ -263,6 +267,7 @@ if [ -n "$ROLE" ]; then
                 "uri:/walletrpc.WalletKit/DeriveKey"
                 "uri:/walletrpc.WalletKit/DeriveNextKey"
                 "uri:/lnrpc.Lightning/GetInfo"
+                "uri:/verrpc.Versioner/GetVersion"
             )
             ;;
         *)