diff --git a/plugins/zellij/README.md b/plugins/zellij/README.md
new file mode 100644
index 000000000..2af2792c5
--- /dev/null
+++ b/plugins/zellij/README.md
@@ -0,0 +1,73 @@
+# zellij
+
+This plugin provides aliases, functions, and completions for [zellij](https://zellij.dev/),
+the terminal workspace (multiplexer). To use it, add `zellij` to the plugins array in your
+zshrc file.
+
+```zsh
+plugins=(... zellij)
+```
+
+## Dynamic prefix
+
+The default prefix is `zj`. To use the shorter `z` prefix instead, set the following variable
+before oh-my-zsh is sourced:
+
+```zsh
+ZSH_ZELLIJ_PREFIX_Z=true
+```
+
+When `ZSH_ZELLIJ_PREFIX_Z` is set, the root alias (`z`) and sub-command prefix are handled
+separately:
+
+- If `z` is **not** taken → `z`=zellij, sub-commands use `z` prefix (`zl`, `za`, …)
+- If `z` **is** taken (e.g., by zoxide) → `zj`=zellij, but sub-commands still use `z` prefix (`zl`, `za`, …)
+
+This means only the root alias falls back to `zj`; the shorter sub-command shortcuts remain
+usable.
+
+All aliases and functions perform a conflict check before being defined — if a name is already
+taken by another alias, function, or command, it is silently skipped.
+
+## Aliases
+
+| Alias (default) | Alias (with `z`) | Alias (`z` + conflict) | Command                      | Description              |
+| ---------------- | ---------------- | ---------------------- | ---------------------------- | ------------------------ |
+| `zj`             | `z`              | `zj`                   | `zellij`                     | Zellij command           |
+| `zjl`            | `zl`             | `zl`                   | `zellij list-sessions`       | List sessions            |
+| `zjs`            | `zs`             | `zs`                   | `zellij -s`                  | Start a named session    |
+| `zjda`           | `zda`            | `zda`                  | `zellij delete-all-sessions` | Delete all sessions      |
+| `zjka`           | `zka`            | `zka`                  | `zellij kill-all-sessions`   | Kill all sessions        |
+| `zjr`            | —                | —                      | `zellij run`                       | Run a command in a pane     |
+| `zjad`           | `zad`            | `zad`                  | `zellij action detach`             | Detach from current session |
+
+## Functions
+
+| Function (default) | Function (with `z`) | Command                            | Description            |
+| ------------------- | ------------------- | ---------------------------------- | ---------------------- |
+| `zja`               | `za`                | `zellij attach`                    | Attach to a session              |
+| `zjd`               | `zd`                | `zellij delete-session`            | Delete a session (exited only)   |
+| `zjdf`              | `zdf`               | `zellij delete-session --force`    | Force-delete any session         |
+| `zjk`               | `zk`                | `zellij kill-session`              | Kill a session                   |
+| `zjas`              | `zas`               | `zellij action switch-session`     | Switch to a session              |
+
+The following convenience functions are always available (unless the name is already taken):
+
+| Function | Command                      | Description                        |
+| -------- | ---------------------------- | ---------------------------------- |
+| `zr`     | `zellij run --`              | Run a command in a pane            |
+| `zrf`    | `zellij run --floating --`   | Run a command in a floating pane   |
+| `ze`     | `zellij edit`                | Edit a file in a pane              |
+
+## Help
+
+Type `zjh` (or `zh` with `z` prefix) to see a summary of all available aliases and functions.
+
+## Completions
+
+This plugin caches the zellij completion script. On first load the cache is generated
+synchronously; subsequent updates (when the `zellij` binary is newer than the cache) happen in
+the background.
+
+Session-aware completions are provided for `attach`, `delete-session`, and `kill-session`
+functions — only relevant sessions (all, running, or exited) are offered.
diff --git a/plugins/zellij/zellij.plugin.zsh b/plugins/zellij/zellij.plugin.zsh
new file mode 100644
index 000000000..e393338e1
--- /dev/null
+++ b/plugins/zellij/zellij.plugin.zsh
@@ -0,0 +1,183 @@
+if (( ! $+commands[zellij] )); then
+  return
+fi
+
+_omz_zellij_taken() {
+  (( $+aliases[$1] || $+functions[$1] || $+commands[$1] ))
+}
+
+typeset -ga _zellij_comp_targets _zellij_all_session_targets _zellij_running_session_targets _zellij_exited_session_targets
+_zellij_comp_targets=()
+_zellij_all_session_targets=()
+_zellij_running_session_targets=()
+_zellij_exited_session_targets=()
+
+if [[ -n ${ZSH_ZELLIJ_PREFIX_Z:-} ]]; then
+  _zellij_short_prefix=z
+  if _omz_zellij_taken z; then
+    _zellij_root_alias=zj
+  else
+    _zellij_root_alias=z
+  fi
+else
+  _zellij_short_prefix=zj
+  _zellij_root_alias=zj
+fi
+
+if ! _omz_zellij_taken "$_zellij_root_alias"; then
+  alias ${_zellij_root_alias}='zellij'
+  _zellij_comp_targets+=("$_zellij_root_alias")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}l"; then
+  alias ${_zellij_short_prefix}l='zellij list-sessions'
+  _zellij_comp_targets+=("${_zellij_short_prefix}l")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}s"; then
+  alias ${_zellij_short_prefix}s='zellij -s'
+  _zellij_comp_targets+=("${_zellij_short_prefix}s")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}da"; then
+  alias ${_zellij_short_prefix}da='zellij delete-all-sessions'
+  _zellij_comp_targets+=("${_zellij_short_prefix}da")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}ka"; then
+  alias ${_zellij_short_prefix}ka='zellij kill-all-sessions'
+  _zellij_comp_targets+=("${_zellij_short_prefix}ka")
+fi
+
+if [[ $_zellij_short_prefix != z ]] && ! _omz_zellij_taken "${_zellij_short_prefix}r"; then
+  alias ${_zellij_short_prefix}r='zellij run'
+  _zellij_comp_targets+=("${_zellij_short_prefix}r")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}a"; then
+  eval "${_zellij_short_prefix}a() { command zellij attach \"\$@\"; }"
+  _zellij_all_session_targets+=("${_zellij_short_prefix}a")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}d"; then
+  eval "${_zellij_short_prefix}d() { command zellij delete-session \"\$@\"; }"
+  _zellij_exited_session_targets+=("${_zellij_short_prefix}d")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}df"; then
+  eval "${_zellij_short_prefix}df() { command zellij delete-session --force \"\$@\"; }"
+  _zellij_all_session_targets+=("${_zellij_short_prefix}df")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}k"; then
+  eval "${_zellij_short_prefix}k() { command zellij kill-session \"\$@\"; }"
+  _zellij_running_session_targets+=("${_zellij_short_prefix}k")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}ad"; then
+  alias ${_zellij_short_prefix}ad='zellij action detach'
+  _zellij_comp_targets+=("${_zellij_short_prefix}ad")
+fi
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}as"; then
+  eval "${_zellij_short_prefix}as() { command zellij action switch-session \"\$@\"; }"
+  _zellij_all_session_targets+=("${_zellij_short_prefix}as")
+fi
+
+(( $+functions[zr] || $+aliases[zr] || $+commands[zr] )) || zr() { command zellij run -- "$@"; }
+(( $+functions[zrf] || $+aliases[zrf] || $+commands[zrf] )) || zrf() { command zellij run --floating -- "$@"; }
+(( $+functions[ze] || $+aliases[ze] || $+commands[ze] )) || ze() { command zellij edit "$@"; }
+
+if ! _omz_zellij_taken "${_zellij_short_prefix}h"; then
+  eval "${_zellij_short_prefix}h() {
+    printf '\\e[1mzellij plugin aliases\\e[0m\\n'
+    local -a _entries=(
+      '${_zellij_root_alias}:zellij'
+      '${_zellij_short_prefix}l:zellij list-sessions'
+      '${_zellij_short_prefix}s:zellij -s <name>'
+      '${_zellij_short_prefix}a:zellij attach <session>'
+      '${_zellij_short_prefix}d:zellij delete-session <session>'
+      '${_zellij_short_prefix}df:zellij delete-session --force <session>'
+      '${_zellij_short_prefix}k:zellij kill-session <session>'
+      '${_zellij_short_prefix}da:zellij delete-all-sessions'
+      '${_zellij_short_prefix}ka:zellij kill-all-sessions'
+      '${_zellij_short_prefix}ad:zellij action detach'
+      '${_zellij_short_prefix}as:zellij action switch-session <session>'
+      '${_zellij_short_prefix}r:zellij run'
+      'zr:zellij run -- <cmd>'
+      'zrf:zellij run --floating -- <cmd>'
+      'ze:zellij edit <file>'
+      '${_zellij_short_prefix}h:Show this help'
+    )
+    local entry name cmd
+    for entry in \"\${_entries[@]}\"; do
+      name=\"\${entry%%:*}\"
+      cmd=\"\${entry#*:}\"
+      (( \$+aliases[\$name] || \$+functions[\$name] )) && printf '  %-8s  %s\\n' \"\$name\" \"\$cmd\"
+    done
+  }"
+fi
+
+_ZELLIJ_COMP_DIR="${ZSH_CACHE_DIR}/completions"
+_ZELLIJ_COMP_FILE="${_ZELLIJ_COMP_DIR}/_zellij"
+
+mkdir -p "$_ZELLIJ_COMP_DIR"
+(( ${fpath[(I)$_ZELLIJ_COMP_DIR]} )) || fpath=("$_ZELLIJ_COMP_DIR" $fpath)
+
+if [[ ! -s $_ZELLIJ_COMP_FILE ]]; then
+  command zellij setup --generate-completion zsh >| "$_ZELLIJ_COMP_FILE" 2>/dev/null
+elif [[ $commands[zellij] -nt $_ZELLIJ_COMP_FILE ]]; then
+  command zellij setup --generate-completion zsh >| "$_ZELLIJ_COMP_FILE" 2>/dev/null &!
+fi
+
+_omz_zellij_ls_raw() {
+  command zellij list-sessions --no-formatting 2>/dev/null || command zellij list-sessions 2>/dev/null
+}
+
+_omz_zellij_session_names() {
+  # Use --short if available (zellij ≥0.44), fall back to sed parsing
+  command zellij list-sessions --short --no-formatting 2>/dev/null \
+    || printf '%s\n' "$(_omz_zellij_ls_raw)" | LC_ALL=C sed -nE 's/^([^[:space:]]+).*/\1/p'
+}
+
+_omz_zellij_all_sessions() {
+  emulate -L zsh
+  local -a sessions
+  sessions=("${(@f)$(_omz_zellij_session_names)}")
+  (( ${#sessions[@]} )) && compadd -Q -a sessions
+}
+
+_omz_zellij_running_sessions() {
+  emulate -L zsh
+  local out
+  local -a sessions
+  out="$(_omz_zellij_ls_raw)"
+  sessions=("${(@f)$(printf '%s\n' "$out" | LC_ALL=C sed -nE '/\(EXITED/!s/^([^[:space:]]+).*/\1/p')}")
+  (( ${#sessions[@]} )) && compadd -Q -a sessions
+}
+
+_omz_zellij_exited_sessions() {
+  emulate -L zsh
+  local out
+  local -a sessions
+  out="$(_omz_zellij_ls_raw)"
+  sessions=("${(@f)$(printf '%s\n' "$out" | LC_ALL=C sed -nE '/\(EXITED/s/^([^[:space:]]+).*/\1/p')}")
+  (( ${#sessions[@]} )) && compadd -Q -a sessions
+}
+
+if (( $+functions[compdef] )); then
+  autoload -Uz _zellij
+  compdef _zellij zellij ${_zellij_comp_targets[@]}
+  (( ${#_zellij_all_session_targets[@]} )) && compdef _omz_zellij_all_sessions ${_zellij_all_session_targets[@]}
+  (( ${#_zellij_running_session_targets[@]} )) && compdef _omz_zellij_running_sessions ${_zellij_running_session_targets[@]}
+  (( ${#_zellij_exited_session_targets[@]} )) && compdef _omz_zellij_exited_sessions ${_zellij_exited_session_targets[@]}
+fi
+
+unset _ZELLIJ_COMP_DIR
+unset _ZELLIJ_COMP_FILE
+unset _zellij_root_alias
+unset _zellij_short_prefix
+unset _zellij_comp_targets
+unset _zellij_all_session_targets
+unset _zellij_running_session_targets
+unset _zellij_exited_session_targets