diff --git a/agents/skills/zmx/SKILL.md b/agents/skills/zmx/SKILL.md
new file mode 100644
index 00000000..4056e637
--- /dev/null
+++ b/agents/skills/zmx/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: zmx
+description: Manage ZMX sessions.
+---
+
+# ZMX
+
+## Kill named sessions
+
+```console
+zmx kill <name>... --force
+```
+
+## Kill the current session and its containing shell
+
+Run `scripts/kill-current.sh` relative to this skill directory.
diff --git a/agents/skills/zmx/scripts/kill-current.sh b/agents/skills/zmx/scripts/kill-current.sh
new file mode 100755
index 00000000..873ffd24
--- /dev/null
+++ b/agents/skills/zmx/scripts/kill-current.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ ${1:-} == "--finish" ]]; then
+    session=$2
+    containing_shell=$3
+    zmx=$4
+
+    sleep 1
+    "$zmx" kill "$session" --force
+    kill -TERM "$containing_shell"
+    exit
+fi
+
+session=${ZMX_SESSION:-}
+
+if [[ -z $session ]]; then
+    echo "Not inside a ZMX session." >&2
+    exit 1
+fi
+
+pid=$$
+containing_shell=
+
+while [[ $pid =~ ^[0-9]+$ ]] && ((pid > 1)); do
+    command_line=$(ps -p "$pid" -o command=)
+    parent=$(ps -p "$pid" -o ppid= | xargs)
+
+    if [[ $command_line == *"zmx attach $session"* ]]; then
+        containing_shell=$parent
+    fi
+
+    pid=$parent
+done
+
+if [[ -z $containing_shell ]]; then
+    echo "Could not identify the containing shell." >&2
+    exit 1
+fi
+
+script_dir=$(cd -- "$(dirname -- "$0")" && pwd)
+script="$script_dir/$(basename -- "$0")"
+zmx=$(command -v zmx)
+
+nohup "$script" \
+    --finish "$session" "$containing_shell" "$zmx" \
+    >"/tmp/zmx-murder-$session.log" 2>&1 </dev/null &
diff --git a/nix/modules/pi-agent.nix b/nix/modules/pi-agent.nix
index b99b3398..b1ff0b1f 100644
--- a/nix/modules/pi-agent.nix
+++ b/nix/modules/pi-agent.nix
@@ -15,6 +15,9 @@ let
             cfg.paths.root + "/agents/skills/agent-browser/SKILL.md";
           ".pi/agent/skills/issue-ticket-pr-writing/SKILL.md".source =
             cfg.paths.root + "/agents/skills/issue-ticket-pr-writing/SKILL.md";
+          ".pi/agent/skills/zmx/SKILL.md".source = cfg.paths.root + "/agents/skills/zmx/SKILL.md";
+          ".pi/agent/skills/zmx/scripts/kill-current.sh".source =
+            cfg.paths.root + "/agents/skills/zmx/scripts/kill-current.sh";
         };
       }
     ];