diff --git a/dotfiles/lib/functions/codex_tmux b/dotfiles/lib/functions/codex_tmux
deleted file mode 100755
index dd0ff1d8..00000000
--- a/dotfiles/lib/functions/codex_tmux
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env sh
-
-function codex_tmux {
-    base=$(basename "$PWD")
-    name="$base"
-    if tmux has-session -t "$name" 2>/dev/null; then
-        i=2
-        while tmux has-session -t "${name}-${i}" 2>/dev/null; do
-            i=$((i+1))
-        done
-        name="${name}-${i}"
-    fi
-
-    tmux new-session -s "$name" -c "$PWD" codex --dangerously-bypass-approvals-and-sandbox "$@"
-}
-
-codex_tmux "$@"
diff --git a/dotfiles/lib/functions/codex_tmux_resume b/dotfiles/lib/functions/codex_tmux_resume
deleted file mode 100755
index bcab68b0..00000000
--- a/dotfiles/lib/functions/codex_tmux_resume
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env sh
-
-function codex_tmux_resume {
-    base=$(basename "$PWD")
-    target=$(tmux list-sessions -F '#S' 2>/dev/null | awk -v base="$base" '
-        $0 == base { print; found=1; exit }
-        {
-            prefix = base "-"
-            if (substr($0, 1, length(prefix)) == prefix) {
-                rest = substr($0, length(prefix) + 1)
-                if (rest ~ /^[0-9]+$/) {
-                    n = rest + 0
-                    if (n > max) { max = n; best = $0 }
-                }
-            }
-        }
-        END { if (found != 1 && best != "") print best }
-    ')
-
-    if [ -n "$target" ]; then
-        if [ -n "$TMUX" ]; then
-            tmux switch-client -t "$target"
-        else
-            tmux attach-session -t "$target"
-        fi
-        return 0
-    fi
-
-    codex_tmux "$@"
-}
-
-codex_tmux_resume "$@"
diff --git a/dotfiles/lib/functions/tmclaude b/dotfiles/lib/functions/tmclaude
new file mode 100644
index 00000000..2da2da1b
--- /dev/null
+++ b/dotfiles/lib/functions/tmclaude
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+function tmclaude {
+    trw claude "$@"
+}
+
+tmclaude "$@"
diff --git a/dotfiles/lib/functions/tmcodex b/dotfiles/lib/functions/tmcodex
new file mode 100644
index 00000000..b8e6686e
--- /dev/null
+++ b/dotfiles/lib/functions/tmcodex
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+function tmcodex {
+    trw codex --dangerously-bypass-approvals-and-sandbox "$@"
+}
+
+tmcodex "$@"
diff --git a/dotfiles/lib/functions/trw b/dotfiles/lib/functions/trw
new file mode 100644
index 00000000..2a207549
--- /dev/null
+++ b/dotfiles/lib/functions/trw
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+function trw {
+    tmux new-session -c "$PWD" "$@"
+}
+
+trw "$@"