fix(cli): address review feedback on omz generate plugin

- Turn %placeholders% into private markers when a template is read and
  strip the marker from every value, so text inserted from user input
  (e.g. -d '%name%') is never rescanned as a placeholder.
- When --enable is used for a name already in $plugins (a custom
  override of an enabled built-in), report it and reload instead of
  failing in _omz::plugin::enable.
- Make the completion note accurate whether or not a _<cmd> file was
  generated.
- Test the write-phase cleanup with a template set missing a later
  template, and test that placeholder-looking values come out literally.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

.github/dependencies.yml

@@ -12,7 +12,7 @@ dependencies:
   plugins/gradle:
     repo: gradle/gradle-completion
     branch: master
-    version: e7c881dbef7462bc35ad05328397e1582fe25cb8
+    version: 63578c9bc56134b80766e88957ba0239e6be2343
     precopy: |
       set -e
       find . ! -name _gradle ! -name LICENSE -delete

.github/workflows/dependencies.yml

@@ -16,7 +16,7 @@ jobs:
       contents: write # this is needed to push commits and branches
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 

.github/workflows/installer.yml

@@ -26,7 +26,7 @@ jobs:
           - macos-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 
@@ -47,7 +47,7 @@ jobs:
       - test
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
     if: github.repository == 'ohmyzsh/ohmyzsh'
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 
@@ -38,6 +38,7 @@ jobs:
                       ./lib/*.zsh \
                       ./plugins/*/*.plugin.zsh \
                       ./plugins/*/_* \
+                      ./templates/generators/*/*.zsh-template \
                       ./themes/*.zsh-theme; do
             zsh -n "$file" || return 1
           done

.github/workflows/project.yml

@@ -17,7 +17,7 @@ jobs:
     if: github.repository == 'ohmyzsh/ohmyzsh'
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
       - name: Authenticate as @ohmyzsh

.github/workflows/scorecard.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 

README.md

@@ -23,14 +23,6 @@ Twitter), and join us on [Discord](https://discord.gg/ohmyzsh).
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/111169632522566717?label=%40ohmyzsh&domain=https%3A%2F%2Fmstdn.social&logo=mastodon&style=flat)](https://mstdn.social/@ohmyzsh)
 [![Discord server](https://img.shields.io/discord/642496866407284746)](https://discord.gg/ohmyzsh)
 
-<a href="https://commitgoods.com/collections/oh-my-zsh?utm_source=github">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://cdn.shopify.com/s/files/1/0101/8752/files/commitgoods-badge-stacked-navy-dark.svg">
-    <img src="https://cdn.shopify.com/s/files/1/0101/8752/files/commitgoods-badge-stacked-navy.svg" height="28" alt="Official merch on commitgoods.com">
-  </picture>
-</a>
-
-
 <details>
 <summary>Table of Contents</summary>
 
@@ -171,19 +163,6 @@ adds any) and extra goodies that are included in that particular plugin.
 
 ### Themes
 
-Preview installed themes in your current directory without changing your prompt or `.zshrc`:
-
-```zsh
-omz theme browse              # Interactive browser
-omz theme browse agn          # Start with a theme-name filter
-omz theme preview agnoster    # Print one isolated static preview
-```
-
-In the browser, type to filter, use Up/Down or Ctrl-P/Ctrl-N to navigate, and press Enter
-for explicit use/save actions. Esc or Ctrl-C cancels without applying a theme.
-See the [theme browser guide](tools/theme-browser.md) for shortcuts, preview limitations,
-and local testing instructions.
-
 We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme-happy. We have over one
 hundred and fifty themes now bundled. Most of them have
 [screenshots](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes) on the wiki (We are working on updating this!).
@@ -367,6 +346,10 @@ directory.
 If you have many functions that go well together, you can put them as a `XYZ.plugin.zsh` file in the
 `custom/plugins/` directory and then enable this plugin.
 
+The quickest way to start one is `omz generate plugin <name>`. It creates the plugin directory with a
+commented `<name>.plugin.zsh`, a `README.md`, and (for plugins that wrap a command-line tool) a completion
+skeleton, then tells you how to try it out.
+
 If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the
 same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
 

lib/cli.zsh

@@ -24,6 +24,7 @@ function _omz {
   local -a cmds subcmds
   cmds=(
     'changelog:Print the changelog'
+    'generate:Run a generator, e.g. to create a custom plugin'
     'help:Usage information'
     'plugin:Manage plugins'
     'pr:Manage Oh My Zsh Pull Requests'
@@ -41,6 +42,8 @@ function _omz {
       changelog) local -a refs
         refs=("${(@f)$(builtin cd -q "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
+      generate) subcmds=('plugin:Create a custom plugin')
+        _describe 'generator' subcmds ;;
       plugin) subcmds=(
         'disable:Disable plugin(s)'
         'enable:Enable plugin(s)'
@@ -51,11 +54,13 @@ function _omz {
         _describe 'command' subcmds ;;
       pr) subcmds=('clean:Delete all Pull Request branches' 'test:Test a Pull Request')
         _describe 'command' subcmds ;;
-      theme) subcmds=('browse:Browse theme previews' 'preview:Preview a theme without applying it' 'list:List themes' 'set:Set a theme in your .zshrc file' 'use:Load a theme')
+      theme) subcmds=('list:List themes' 'set:Set a theme in your .zshrc file' 'use:Load a theme')
         _describe 'command' subcmds ;;
     esac
   elif (( CURRENT == 4 )); then
     case "${words[2]}::${words[3]}" in
+      generate::plugin)
+        _omz::generate::plugin::complete_options ;;
       plugin::(disable|enable|load))
         local -aU valid_plugins
 
@@ -77,10 +82,6 @@ function _omz {
         local -a opts
         opts=('--enabled:List enabled plugins only')
         _describe -o 'options' opts ;;
-      theme::(browse|preview))
-        local -a themes
-        themes=("${(@f)$(source "$ZSH/tools/theme-preview.zsh"; _omz_theme_names)}")
-        _describe 'theme' themes ;;
       theme::(set|use))
         local -aU themes
         themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
@@ -88,6 +89,8 @@ function _omz {
     esac
   elif (( CURRENT > 4 )); then
     case "${words[2]}::${words[3]}" in
+      generate::plugin)
+        _omz::generate::plugin::complete_options ;;
       plugin::(enable|disable|load))
         local -aU valid_plugins
 
@@ -173,15 +176,16 @@ Usage: omz <command> [options]
 
 Available commands:
 
-  help                Print this help message
+  help                  Print this help message
-  changelog           Print the changelog
+  changelog             Print the changelog
-  plugin <command>    Manage plugins
+  generate <generator>  Run a generator, e.g. to create a custom plugin
-  pr     <command>    Manage Oh My Zsh Pull Requests
+  plugin <command>      Manage plugins
-  reload              Reload the current zsh session
+  pr     <command>      Manage Oh My Zsh Pull Requests
-  shop                Open the Oh My Zsh shop
+  reload                Reload the current zsh session
-  theme  <command>    Manage themes
+  shop                  Open the Oh My Zsh shop
-  update              Update Oh My Zsh
+  theme  <command>      Manage themes
-  version             Show the version
+  update                Update Oh My Zsh
+  version               Show the version
 
 EOF
 }
@@ -206,6 +210,371 @@ EOF
   ZSH="$ZSH" command zsh -f "$ZSH/tools/changelog.sh" "$version" "${2:-}" "$format"
 }
 
+function _omz::generate {
+  (( $# > 0 && $+functions[$0::$1] )) || {
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} <generator> [options]
+
+Available generators:
+
+  plugin [<name>]  Create a custom plugin in \$ZSH_CUSTOM/plugins
+
+EOF
+    return 1
+  }
+
+  local command="$1"
+  shift
+
+  $0::$command "$@"
+}
+
+function _omz::generate::plugin {
+  setopt localoptions extendedglob
+
+  local -A opts
+  zparseopts -D -E -A opts -- d: -description: c: -command: -no-completion -enable y -yes h -help || return 1
+
+  if (( ${+opts[-h]} || ${+opts[--help]} )); then
+    _omz::generate::plugin::usage
+    return 0
+  fi
+
+  # zparseopts -E leaves anything it doesn't recognise in $@
+  local arg
+  for arg in "$@"; do
+    if [[ "$arg" == -* ]]; then
+      _omz::log error "unknown option '$arg'."
+      _omz::generate::plugin::usage
+      return 1
+    fi
+  done
+  if (( $# > 1 )); then
+    _omz::generate::plugin::usage
+    return 1
+  fi
+
+  # Only ask questions when there is someone there to answer them
+  local interactive=0
+  if [[ -o interactive && -t 0 ]] && (( ! ${+opts[-y]} && ! ${+opts[--yes]} )); then
+    interactive=1
+  fi
+
+  local custom="${ZSH_CUSTOM:-${ZSH:+$ZSH/custom}}"
+  if [[ -z "$custom" ]]; then
+    _omz::log error "\$ZSH is not set. Is Oh My Zsh loaded?"
+    return 1
+  fi
+
+  local templates="$ZSH/templates/generators/plugin"
+  if [[ ! -d "$templates" ]]; then
+    _omz::log error "templates not found at '${templates/#$HOME/\~}'. Try running 'omz update'."
+    return 1
+  fi
+
+  # Check we can write to $ZSH_CUSTOM/plugins, or the closest directory that exists
+  local probe="$custom/plugins"
+  while [[ ! -e "$probe" && "$probe" != "${probe:h}" ]]; do
+    probe="${probe:h}"
+  done
+  if [[ ! -w "$probe" ]]; then
+    _omz::log error "cannot write to '${probe/#$HOME/\~}'. Set \$ZSH_CUSTOM to a directory you own."
+    return 1
+  fi
+
+  ## Gather answers. Nothing is written until all of them are in.
+
+  local name="$1" attempts=0
+  if [[ -n "$name" ]]; then
+    _omz::generate::plugin::validate_name "$name" || return 1
+  elif (( interactive )); then
+    while true; do
+      _omz::generate::plugin::ask "Plugin name" || return 1
+      name="$REPLY"
+      _omz::generate::plugin::validate_name "$name" && break
+      if (( ++attempts >= 3 )); then
+        _omz::log error "giving up."
+        return 1
+      fi
+    done
+  else
+    _omz::generate::plugin::usage
+    return 1
+  fi
+
+  local dir="$custom/plugins/$name"
+  if [[ -e "$dir" ]]; then
+    _omz::log error "'$name' already exists at '${dir/#$HOME/\~}'. Remove it or pick another name."
+    return 1
+  fi
+  if [[ -d "$ZSH/plugins/$name" ]]; then
+    _omz::log warn "'$name' is also a built-in plugin. Your custom plugin will override it."
+    if (( interactive )); then
+      _omz::confirm "Continue? [y/N] "
+      if [[ "$REPLY" != [yY] ]]; then
+        _omz::log info "aborted."
+        return 1
+      fi
+    fi
+  fi
+
+  local description="${opts[-d]:-${opts[--description]:-}}"
+  if [[ -z "$description" ]]; then
+    description="$name plugin for Oh My Zsh"
+    if (( interactive )); then
+      _omz::generate::plugin::ask "Short description" "$description" || return 1
+      description="$REPLY"
+    fi
+  fi
+  # The description goes into a comment and a README line: keep it on one line
+  description="${description//[[:cntrl:]]/ }"
+
+  local cmd="${opts[-c]:-${opts[--command]:-}}"
+  if [[ -n "$cmd" ]]; then
+    _omz::generate::plugin::validate_command "$cmd" || return 1
+  elif (( interactive )); then
+    local default_cmd=""
+    (( $+commands[$name] )) && default_cmd="$name"
+    attempts=0
+    while true; do
+      if [[ -n "$default_cmd" ]]; then
+        _omz::generate::plugin::ask "Command-line tool this plugin wraps (or 'none')" "$default_cmd" || return 1
+      else
+        _omz::generate::plugin::ask "Command-line tool this plugin wraps (blank for none)" || return 1
+      fi
+      cmd="$REPLY"
+      [[ "$cmd" != (none|-) ]] || cmd=""
+      [[ -n "$cmd" ]] || break
+      _omz::generate::plugin::validate_command "$cmd" && break
+      if (( ++attempts >= 3 )); then
+        _omz::log error "giving up."
+        return 1
+      fi
+    done
+  fi
+
+  # completion: "" (none), "file" (a _<cmd> skeleton) or "cached" (the tool generates it)
+  local completion="" compgen=""
+  if [[ -n "$cmd" ]] && (( ! ${+opts[--no-completion]} )); then
+    completion=file
+    if (( interactive )); then
+      _omz::confirm "Add a completion function for $cmd? [Y/n] "
+      if [[ "$REPLY" == [nN] ]]; then
+        completion=""
+      else
+        _omz::confirm "Does $cmd generate its own zsh completion (e.g. '$cmd completion zsh')? [y/N] "
+        if [[ "$REPLY" == [yY] ]]; then
+          completion=cached
+          _omz::generate::plugin::ask "Command that prints the completion script" "$cmd completion zsh" || return 1
+          compgen="$REPLY"
+        fi
+      fi
+    fi
+  fi
+
+  local enable=${+opts[--enable]}
+  if (( interactive && ! enable )); then
+    _omz::confirm "Add $name to plugins=() in your .zshrc now? [y/N] "
+    [[ "$REPLY" != [yY] ]] || enable=1
+  fi
+
+  ## Write the files. If anything fails, remove only what we created.
+
+  local -a created
+  local block="" cache="" ok=0
+  {
+    if [[ ! -d "$custom/plugins" ]]; then
+      command mkdir -p "$custom/plugins" || return 1
+      _omz::generate::plugin::created "$custom/plugins"
+    fi
+    command mkdir "$dir" || return 1
+    _omz::generate::plugin::created "$dir"
+
+    local plugin_tpl=plugin.zsh-template readme_tpl=README.md-template
+    if [[ -z "$cmd" ]]; then
+      plugin_tpl=plugin-generic.zsh-template
+      readme_tpl=README-generic.md-template
+    elif [[ "$completion" == cached ]]; then
+      block="$(_omz::generate::plugin::template completion-cached.zsh-template)" || return 1
+      cache="$(_omz::generate::plugin::template README-cache.md-template)" || return 1
+    else
+      block="$(_omz::generate::plugin::template completion-note.zsh-template)" || return 1
+    fi
+
+    _omz::generate::plugin::render "$plugin_tpl" "$dir/$name.plugin.zsh" || return 1
+    _omz::generate::plugin::render "$readme_tpl" "$dir/README.md" || return 1
+    if [[ "$completion" == file ]]; then
+      _omz::generate::plugin::render completion.zsh-template "$dir/_$cmd" || return 1
+    fi
+    ok=1
+  } always {
+    if (( ! ok )); then
+      _omz::log error "could not generate the plugin. Cleaning up..."
+      (( ${#created} )) && command rm -f -- "${created[@]}"
+      [[ ! -d "$dir" ]] || command rmdir -- "$dir" 2>/dev/null
+    fi
+  }
+
+  print
+  _omz::log info "plugin '$name' generated."
+  print
+  print -r -- "Next steps:"
+  print
+  print -r -- "  1. Edit it:     ${EDITOR:-vim} ${dir/#$HOME/\~}/$name.plugin.zsh"
+  print -r -- "  2. Try it now:  omz plugin load $name"
+  (( enable )) || print -r -- "  3. Keep it:     omz plugin enable $name"
+  print
+  print -r -- "Docs: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-plugins"
+
+  # Last thing we do: in an interactive shell this restarts zsh
+  if (( enable )); then
+    print
+    if (( ${plugins[(Ie)$name]} )); then
+      # Already enabled (e.g. a custom override of a built-in): just reload
+      _omz::log info "'$name' is already in your plugins list."
+      [[ ! -o interactive ]] || _omz::reload
+    else
+      _omz::plugin::enable "$name"
+    fi
+  fi
+}
+
+function _omz::generate::plugin::usage {
+  cat >&2 <<EOF
+Usage: omz generate plugin [<name>] [options]
+
+Creates a custom plugin in \$ZSH_CUSTOM/plugins/<name>. Anything not given as an
+option is asked for interactively. In a non-interactive shell (or with --yes)
+defaults are used instead.
+
+Options:
+  -d, --description <text>  One-line description for the README and file header
+  -c, --command <cmd>       Command-line tool this plugin wraps. Adds a check
+                            that it is installed and scaffolds its completion
+      --no-completion       Don't scaffold a completion function
+      --enable              Add the plugin to plugins=() in .zshrc when done
+                            (restarts your shell)
+  -y, --yes                 Never prompt; use defaults for anything not given
+  -h, --help                Show this help
+
+EOF
+}
+
+function _omz::generate::plugin::complete_options {
+  local -a opts
+  opts=(
+    '--description:One-line description for the README'
+    '--command:Command-line tool this plugin wraps'
+    '--no-completion:Skip the completion scaffold'
+    '--enable:Enable the plugin when done'
+    '--yes:Never prompt'
+  )
+  _describe -o 'options' opts
+}
+
+# The name ends up in a mkdir path and, via --enable, inside the awk script that
+# rewrites .zshrc. This is the one place it gets checked.
+function _omz::generate::plugin::validate_name {
+  setopt localoptions extendedglob
+  local name="$1"
+
+  if [[ -z "$name" ]]; then
+    _omz::log error "plugin name cannot be empty."
+  elif (( ${#name} > 64 )); then
+    _omz::log error "plugin name is too long (64 characters max)."
+  elif [[ "$name" != "${name:l}" ]]; then
+    _omz::log error "plugin names must be lowercase. Did you mean '${name:l}'?"
+  elif [[ "$name" != [a-z0-9][a-z0-9_-]# ]]; then
+    _omz::log error "invalid plugin name: use only lowercase letters, digits, '-' and '_', starting with a letter or digit."
+  else
+    return 0
+  fi
+  return 1
+}
+
+# The command name ends up in $+commands[...], _comps[...] and a filename
+function _omz::generate::plugin::validate_command {
+  setopt localoptions extendedglob
+
+  if (( ${#1} > 64 )) || [[ "$1" != [[:alnum:]_][[:alnum:]_.+-]# ]]; then
+    _omz::log error "invalid command name: use only letters, digits, '.', '_', '+' and '-'."
+    return 1
+  fi
+}
+
+# Ask a question and leave the answer in $REPLY. An empty answer takes the
+# default. Returns 1 when there is no more input (Ctrl-D).
+function _omz::generate::plugin::ask {
+  setopt localoptions extendedglob
+  local question="$1" default="$2"
+  [[ -z "$default" ]] || question+=" [$default]"
+
+  _omz::log prompt "$question: " "omz::generate::plugin"
+  if ! builtin read -r; then
+    print >&2
+    _omz::log info "aborted." "omz::generate::plugin"
+    return 1
+  fi
+
+  [[ -n "$REPLY" ]] || REPLY="$default"
+  # Answers are single-line values: flatten control characters and trim
+  REPLY="${REPLY//[[:cntrl:]]/ }"
+  REPLY="${${REPLY##[[:space:]]#}%%[[:space:]]#}"
+}
+
+# Print a template file with its %placeholders% turned into private markers,
+# or explain which one is missing
+function _omz::generate::plugin::template {
+  if [[ ! -f "$templates/$1" ]]; then
+    _omz::log error "missing template '${templates/#$HOME/\~}/$1'." "omz::generate::plugin"
+    return 1
+  fi
+
+  local content="$(<"$templates/$1")" token m=$'\x1f'
+  for token in completion cache name command description compgen; do
+    content="${content//\%${token}\%/${m}${token}${m}}"
+  done
+  print -r -- "$content"
+}
+
+# Fill in the placeholders of a template and write it to a file. Values come
+# from the caller: $name, $cmd, $description, $compgen, $block and $cache.
+#
+# Placeholders are matched as the markers that ::template produced, and the
+# marker character is stripped from every value, so a value that happens to
+# look like a placeholder (e.g. -d '%name%') is written out literally.
+function _omz::generate::plugin::render {
+  setopt localoptions extendedglob
+  local content m=$'\x1f'
+  content="$(_omz::generate::plugin::template "$1")" || return 1
+
+  # Blocks go first: they are templates too and carry markers of their own
+  content="${content//${m}completion${m}/$block}"
+  content="${content//${m}cache${m}/$cache}"
+  content="${content//${m}name${m}/${name//$m/}}"
+  content="${content//${m}command${m}/${cmd//$m/}}"
+  content="${content//${m}description${m}/${description//$m/}}"
+  content="${content//${m}compgen${m}/${compgen//$m/}}"
+  # Drop blank lines left behind by an empty placeholder at the end
+  content="${content%%$'\n'##}"
+
+  created+=("$2")
+  print -r -- "$content" > "$2" || return 1
+  _omz::generate::plugin::created "$2"
+}
+
+function _omz::generate::plugin::created {
+  # Colour the verb with print -P, but print the path with print -r so that a
+  # '%' somewhere in the path isn't treated as a prompt escape.
+  # Keep the output plain when it is being piped.
+  if [[ -t 1 ]]; then
+    print -Pn "      %F{green}create%f  "
+  else
+    print -n "      create  "
+  fi
+  print -r -- "${1/#$HOME/\~}"
+}
+
 function _omz::plugin {
   (( $# > 0 && $+functions[$0::$1] )) || {
     cat >&2 <<EOF
@@ -753,8 +1122,6 @@ Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
-  browse [filter] Browse installed themes without applying them
-  preview <theme> Preview a theme in the current directory
   list            List all available Oh My Zsh themes
   set <theme>     Set a theme in your .zshrc file
   use <theme>     Load a theme
@@ -769,45 +1136,6 @@ EOF
   $0::$command "$@"
 }
 
-function _omz::theme::preview {
-  if (( $# != 1 )); then
-    print -u2 -r -- 'Usage: omz theme preview <theme>'
-    return 1
-  fi
-  source "$ZSH/tools/theme-preview.zsh"
-  _omz_theme_preview "$1"
-}
-
-function _omz::theme::browse {
-  if (( $# > 1 )); then
-    print -u2 -r -- 'Usage: omz theme browse [filter]'
-    return 1
-  fi
-  if [[ ! -o interactive || ! -t 0 || ! -t 1 ]]; then
-    print -u2 -r -- 'omz theme browse requires an interactive terminal; use omz theme preview <theme> instead.'
-    return 1
-  fi
-  source "$ZSH/tools/theme-preview.zsh"
-  source "$ZSH/tools/theme-browser.zsh"
-  local selection action name
-  selection=$(_omz_theme_browser "$1") || return $?
-  [[ -n $selection ]] || return 0
-  action=${selection%%$'\n'*}
-  name=${selection#*$'\n'}
-  _omz_theme_resolve "$name" >/dev/null || return 1
-  case $action in
-    use) _omz::theme::use "$name" ;;
-    set)
-      # The existing set command interpolates the name into shell and awk text.
-      [[ $name != *[^a-zA-Z0-9_./-]* ]] || {
-        print -u2 -r -- 'Cannot save this theme name safely; set ZSH_THEME manually.'
-        return 1
-      }
-      _omz::theme::set "$name" ;;
-    *) return 1 ;;
-  esac
-}
-
 function _omz::theme::list {
   local -a custom_themes builtin_themes
   custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))

lib/prompt_info_functions.zsh

@@ -21,7 +21,6 @@ function chruby_prompt_info \
   azure_prompt_info \
   tf_prompt_info \
   conda_prompt_info \
-  go_prompt_info \
 {
   return 1
 }

lib/tests/generate-plugin.test.zsh

@@ -0,0 +1,198 @@
+#!/usr/bin/zsh -df
+
+# Tests for `omz generate plugin`. Run with: zsh lib/tests/generate-plugin.test.zsh
+
+ZSH="${0:A:h:h:h}"
+ZSH_CUSTOM="$(mktemp -d)"
+trap 'command rm -rf "$ZSH_CUSTOM"' EXIT
+
+source "$ZSH/lib/cli.zsh"
+
+failures=0
+pass() { print -u2 "\e[32mSuccess\e[0m: $1" }
+fail() { print -u2 "\e[31mError\e[0m: $1"; (( failures++ )) }
+
+# assert_files <plugin> <expected files, space separated>
+assert_files() {
+  local actual="$(print -l "$ZSH_CUSTOM"/plugins/$1/*(N:t) "$ZSH_CUSTOM"/plugins/$1/_*(N:t) | sort -u | tr '\n' ' ')"
+  local expected="$(print -l ${=2} | sort -u | tr '\n' ' ')"
+  if [[ "$actual" == "$expected" ]]; then
+    pass "$1 has files: $expected"
+  else
+    fail "$1 has files '$actual', expected '$expected'"
+  fi
+}
+
+# assert_syntax <plugin>: every generated file must pass zsh -n, like CI does
+assert_syntax() {
+  local file
+  for file in "$ZSH_CUSTOM"/plugins/$1/*.plugin.zsh(N) "$ZSH_CUSTOM"/plugins/$1/_*(N); do
+    if zsh -n "$file"; then
+      pass "${file:t} passes zsh -n"
+    else
+      fail "${file:t} fails zsh -n"
+    fi
+  done
+}
+
+# assert_contains <file> <literal string>
+assert_contains() {
+  if grep -qF -- "$2" "$1"; then
+    pass "${1:t} contains '$2'"
+  else
+    fail "${1:t} does not contain '$2'"
+  fi
+}
+
+## Templates must be valid zsh even before substitution (CI checks this too)
+
+for file in "$ZSH"/templates/generators/plugin/*.zsh-template; do
+  if zsh -n "$file"; then
+    pass "template ${file:t} passes zsh -n"
+  else
+    fail "template ${file:t} fails zsh -n"
+  fi
+done
+
+## A plugin that wraps a command
+
+description='Shortcuts & stuff $(id) `id` 100%'
+if omz generate plugin foo -d "$description" -c foo --yes >/dev/null 2>&1; then
+  pass "generates a command-wrapping plugin"
+else
+  fail "generating a command-wrapping plugin failed"
+fi
+assert_files foo "README.md _foo foo.plugin.zsh"
+assert_syntax foo
+assert_contains "$ZSH_CUSTOM/plugins/foo/README.md" 'plugins=(... foo)'
+assert_contains "$ZSH_CUSTOM/plugins/foo/README.md" "$description"
+assert_contains "$ZSH_CUSTOM/plugins/foo/foo.plugin.zsh" "$description"
+assert_contains "$ZSH_CUSTOM/plugins/foo/foo.plugin.zsh" '$+commands[foo]'
+assert_contains "$ZSH_CUSTOM/plugins/foo/_foo" '#compdef foo'
+if grep -q '%[a-z]*%' "$ZSH_CUSTOM"/plugins/foo/*; then
+  fail "foo still has unfilled placeholders"
+else
+  pass "foo has no unfilled placeholders"
+fi
+
+## Values that look like placeholders are written literally
+
+omz generate plugin lit -d '%compgen% and %name% stay' -c lit --yes >/dev/null 2>&1
+assert_contains "$ZSH_CUSTOM/plugins/lit/README.md" '%compgen% and %name% stay'
+assert_contains "$ZSH_CUSTOM/plugins/lit/lit.plugin.zsh" '%compgen% and %name% stay'
+
+## A plugin with no command
+
+if omz generate plugin bar --yes >/dev/null 2>&1; then
+  pass "generates a generic plugin"
+else
+  fail "generating a generic plugin failed"
+fi
+assert_files bar "README.md bar.plugin.zsh"
+assert_syntax bar
+assert_contains "$ZSH_CUSTOM/plugins/bar/README.md" 'This plugin does not add any aliases.'
+assert_contains "$ZSH_CUSTOM/plugins/bar/bar.plugin.zsh" 'bar plugin for Oh My Zsh'
+
+## --no-completion, and the rails-style output
+
+output="$(omz generate plugin baz -c baz --no-completion --yes 2>/dev/null)"
+assert_files baz "README.md baz.plugin.zsh"
+create_lines=$(print -r -- "$output" | grep -c '^      create  ')
+if (( create_lines == 3 )); then
+  pass "prints one create line per path"
+else
+  fail "expected 3 create lines, got $create_lines"
+fi
+if [[ "$output" == *"omz plugin load baz"* ]]; then
+  pass "prints next steps"
+else
+  fail "next steps missing from output"
+fi
+
+## Bad names are rejected without touching the filesystem
+
+before="$(print -l "$ZSH_CUSTOM"/plugins/*(N:t))"
+for bad in '' 'Foo' 'a b' '../evil' 'a/b' '.hidden' '.' '..' '-x' 'foo`id`' 'foo"$(id)"' $'a\nb' "$(printf 'x%.0s' {1..65})"; do
+  if omz generate plugin "$bad" --yes >/dev/null 2>&1; then
+    fail "accepted bad name ${(qq)bad}"
+  else
+    pass "rejected bad name ${(qq)bad}"
+  fi
+done
+after="$(print -l "$ZSH_CUSTOM"/plugins/*(N:t))"
+if [[ "$before" == "$after" ]]; then
+  pass "bad names created nothing"
+else
+  fail "bad names changed \$ZSH_CUSTOM/plugins"
+fi
+
+## Bad command names are rejected
+
+for bad in 'a b' '../x' 'foo;id' 'foo$(id)'; do
+  if omz generate plugin qux -c "$bad" --yes >/dev/null 2>&1; then
+    fail "accepted bad command ${(qq)bad}"
+  else
+    pass "rejected bad command ${(qq)bad}"
+  fi
+done
+
+## Existing plugin, unknown option, missing templates
+
+if omz generate plugin foo --yes >/dev/null 2>&1; then
+  fail "overwrote an existing plugin"
+else
+  pass "refuses to overwrite an existing plugin"
+fi
+
+if omz generate plugin quux --bogus --yes >/dev/null 2>&1; then
+  fail "accepted an unknown option"
+else
+  pass "rejects an unknown option"
+fi
+
+if ( ZSH=/nonexistent; omz generate plugin quux --yes >/dev/null 2>&1 ); then
+  fail "ran without templates"
+else
+  pass "fails cleanly when templates are missing"
+fi
+[[ -e "$ZSH_CUSTOM/plugins/quux" ]] && fail "quux was created by a failed run"
+
+## A failure after the first file is written removes everything it created
+
+broken="$(mktemp -d)"
+mkdir -p "$broken/templates/generators/plugin" "$broken/plugins"
+cp "$ZSH/templates/generators/plugin/plugin.zsh-template" \
+   "$ZSH/templates/generators/plugin/completion-note.zsh-template" "$broken/templates/generators/plugin/"
+# README.md-template is missing, so the plugin file is written and then the README fails
+if ( ZSH="$broken"; omz generate plugin partial -c partial --yes >/dev/null 2>&1 ); then
+  fail "succeeded with a missing README template"
+else
+  pass "fails when a later template is missing"
+fi
+if [[ -e "$ZSH_CUSTOM/plugins/partial" ]]; then
+  fail "partial plugin directory was left behind: $(ls "$ZSH_CUSTOM/plugins/partial")"
+else
+  pass "cleans up the partial plugin directory"
+fi
+command rm -rf "$broken"
+
+## The prompt helper
+
+_omz::generate::plugin::ask "Q" "dflt" 2>/dev/null < <(print '')
+[[ "$REPLY" == "dflt" ]] && pass "ask: empty answer takes the default" || fail "ask: got '$REPLY', expected 'dflt'"
+
+_omz::generate::plugin::ask "Q" "dflt" 2>/dev/null < <(print '  hi there  ')
+[[ "$REPLY" == "hi there" ]] && pass "ask: trims whitespace" || fail "ask: got '$REPLY', expected 'hi there'"
+
+if _omz::generate::plugin::ask "Q" 2>/dev/null < /dev/null; then
+  fail "ask: did not fail on EOF"
+else
+  pass "ask: fails on EOF"
+fi
+
+print -u2
+if (( failures )); then
+  print -u2 "\e[31m$failures test(s) failed\e[0m"
+  exit 1
+fi
+print -u2 "\e[32mAll tests passed\e[0m"

oh-my-zsh.sh

@@ -64,7 +64,7 @@ if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
 fi
 
 # Create cache and completions dir and add to $fpath
-[[ -d "$ZSH_CACHE_DIR/completions" ]] || mkdir -p "$ZSH_CACHE_DIR/completions"
+mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
 # Check for updates on initial load...
@@ -114,17 +114,9 @@ fi
 zcompdump_revision="#omz revision: $(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)"
 zcompdump_fpath="#omz fpath: $fpath"
 
-# Check whether the zcompdump file carries the current OMZ metadata lines
-_omz_compdump_has_metadata() {
-  local -a lines
-  [[ -r "$ZSH_COMPDUMP" ]] || return 1
-  lines=("${(@f)$(<"$ZSH_COMPDUMP")}")
-  (( ${lines[(Ie)$zcompdump_revision]} && ${lines[(Ie)$zcompdump_fpath]} ))
-}
-
 # Delete the zcompdump file if OMZ zcompdump metadata changed
-zcompdump_refresh=0
+if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
-if ! _omz_compdump_has_metadata; then
+   || ! command grep -q -Fx "$zcompdump_fpath" "$ZSH_COMPDUMP" 2>/dev/null; then
   command rm -f "$ZSH_COMPDUMP"
   zcompdump_refresh=1
 fi
@@ -142,8 +134,9 @@ else
   compinit -u -d "$ZSH_COMPDUMP"
 fi
 
-# Append zcompdump metadata if missing (compinit may have regenerated the file)
+# Append zcompdump metadata if missing
-if (( zcompdump_refresh )) || ! _omz_compdump_has_metadata; then
+if (( $zcompdump_refresh )) \
+  || ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null; then
   # Use `tee` in case the $ZSH_COMPDUMP filename is invalid, to silence the error
   # See https://github.com/ohmyzsh/ohmyzsh/commit/dd1a7269#commitcomment-39003489
   tee -a "$ZSH_COMPDUMP" &>/dev/null <<EOF
@@ -153,12 +146,9 @@ $zcompdump_fpath
 EOF
 fi
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
-unset -f _omz_compdump_has_metadata
 
 # zcompile the completion dump file if the .zwc is older or missing.
-# Test that first so the lock directory and zrecompile are skipped when it's fresh.
+if command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
-if [[ ! "${ZSH_COMPDUMP}.zwc" -nt "$ZSH_COMPDUMP" ]] \
-   && command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
   zrecompile -q -p "$ZSH_COMPDUMP"
   command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock"
 fi

plugins/golang/README.md

@@ -39,18 +39,3 @@ plugins=(... golang)
 | gov    | `go vet`          | Vet examines Go source code and reports suspicious constructs |
 | gove   | `go version`      | Prints Go version                                             |
 | gow    | `go work`         | Work provides access to operations on workspaces              |
-
-## Prompt
-
-This plugin provides the `go_prompt_info` function to add the installed Go
-version to your prompt.
-
-For example:
-```
-PROMPT="%~$ "
-RPROMPT='$(go_prompt_info)'
-```
-changes your prompt to:
-```
-~/go/project$ ▋                                                     1.22.3
-```

plugins/golang/golang.plugin.zsh

@@ -36,12 +36,3 @@ alias gotofx='go tool fix'
 alias gov='go vet'
 alias gove='go version'
 alias gow='go work'
-
-## prompt
-function go_prompt_info() {
-  (( $+commands[go] )) || return
-  local go_prompt
-  go_prompt=$(go version | awk '{ print substr($3, 3) }')
-  [[ -z "${go_prompt}" ]] && return
-  echo "${ZSH_THEME_GO_PROMPT_PREFIX}${go_prompt:gs/%/%%}${ZSH_THEME_GO_PROMPT_SUFFIX}"
-}

plugins/gradle/_gradle

@@ -284,9 +284,6 @@ __gradle_subcommand() {
                 '-Dorg.gradle.debug.suspend=[]' \
                 '-Dorg.gradle.debug=[]:org.gradle.debug:(true false)' \
                 '-Dorg.gradle.dependency.verification=[Configures the dependency verification mode. Supported values are 'strict', 'lenient', or 'off'.]:org.gradle.dependency.verification:(strict lenient off)' \
-                '-Dorg.gradle.isolated-projects.dangerously-ignore-problems=[]' \
-                '-Dorg.gradle.isolated-projects.diagnostics=[]' \
-                '-Dorg.gradle.isolated-projects=[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`.]' \
                 '-Dorg.gradle.java.home=[]:org.gradle.java.home:_directories' \
                 '-Dorg.gradle.java.installations.auto-detect=[]' \
                 '-Dorg.gradle.java.installations.auto-download=[]' \
@@ -302,6 +299,8 @@ __gradle_subcommand() {
                 '-Dorg.gradle.problems.report=[Enables the HTML problems report.]' \
                 '-Dorg.gradle.projectcachedir=[Specifies the project-specific cache directory. Default is .gradle in the root project directory.]:org.gradle.projectcachedir:_directories' \
                 '-Dorg.gradle.tooling.parallel=[]' \
+                '-Dorg.gradle.unsafe.isolated-projects.diagnostics=[]' \
+                '-Dorg.gradle.unsafe.isolated-projects=[]' \
                 '-Dorg.gradle.vfs.verbose=[]' \
                 '-Dorg.gradle.vfs.watch=[Enables file system watching. Reuses file system data for subsequent builds.]:org.gradle.vfs.watch:(true false)' \
                 '-Dorg.gradle.warning.mode=[Specifies which mode of warnings to generate. Supported values are 'all', 'fail', 'summary' (default), or 'none'.]' \
@@ -329,14 +328,12 @@ __gradle_subcommand() {
                 \*'--include-build[Includes the specified build in the composite.]:include build:_directories' \
                 (--quiet,-q,--warn,-w,--debug,-d){-i,--info}'[Sets the log level to info.]' \
                 \*{-I,--init-script}'[Specifies an initialization script.]:init script:_files -g \*.gradle(|.kts)' \
-                (--no-isolated-projects)'--isolated-projects[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`. (incubating)]' \
                 '--max-workers[Configures the maximum number of concurrent workers Gradle is allowed to use.]' \
                 (--build-cache)'--no-build-cache[Disables the Gradle build cache.]' \
                 (--configuration-cache)'--no-configuration-cache[Disables the configuration cache.]' \
                 (--configure-on-demand)'--no-configure-on-demand[Disables the use of configuration on demand. (incubating)]' \
                 (--continue)'--no-continue[Stops task execution after a task failure.]' \
                 (--daemon)'--no-daemon[Runs the build without the Gradle daemon. Useful occasionally if you have configured Gradle to always run with the daemon by default.]' \
-                (--isolated-projects)'--no-isolated-projects[Disables Isolated Projects. (incubating)]' \
                 (--parallel)'--no-parallel[Disables parallel project execution.]' \
                 (--problems-report)'--no-problems-report[Disables the HTML problems report. (incubating)]' \
                 {-a,--no-rebuild}'[Disables rebuilding of project dependencies.]' \
@@ -424,9 +421,6 @@ _gradle() {
         '-Dorg.gradle.debug.suspend=[]:->argument-expected' \
         '-Dorg.gradle.debug=[]:org.gradle.debug:(true false):->argument-expected' \
         '-Dorg.gradle.dependency.verification=[Configures the dependency verification mode. Supported values are 'strict', 'lenient', or 'off'.]:org.gradle.dependency.verification:(strict lenient off):->argument-expected' \
-        '-Dorg.gradle.isolated-projects.dangerously-ignore-problems=[]:->argument-expected' \
-        '-Dorg.gradle.isolated-projects.diagnostics=[]:->argument-expected' \
-        '-Dorg.gradle.isolated-projects=[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`.]:->argument-expected' \
         '-Dorg.gradle.java.home=[]:org.gradle.java.home:_directories:->argument-expected' \
         '-Dorg.gradle.java.installations.auto-detect=[]:->argument-expected' \
         '-Dorg.gradle.java.installations.auto-download=[]:->argument-expected' \
@@ -442,6 +436,8 @@ _gradle() {
         '-Dorg.gradle.problems.report=[Enables the HTML problems report.]:->argument-expected' \
         '-Dorg.gradle.projectcachedir=[Specifies the project-specific cache directory. Default is .gradle in the root project directory.]:org.gradle.projectcachedir:_directories:->argument-expected' \
         '-Dorg.gradle.tooling.parallel=[]:->argument-expected' \
+        '-Dorg.gradle.unsafe.isolated-projects.diagnostics=[]:->argument-expected' \
+        '-Dorg.gradle.unsafe.isolated-projects=[]:->argument-expected' \
         '-Dorg.gradle.vfs.verbose=[]:->argument-expected' \
         '-Dorg.gradle.vfs.watch=[Enables file system watching. Reuses file system data for subsequent builds.]:org.gradle.vfs.watch:(true false):->argument-expected' \
         '-Dorg.gradle.warning.mode=[Specifies which mode of warnings to generate. Supported values are 'all', 'fail', 'summary' (default), or 'none'.]:->argument-expected' \
@@ -470,14 +466,12 @@ _gradle() {
         \*'--include-build[Includes the specified build in the composite.]:include build:_directories:->argument-expected' \
         (--quiet,-q,--warn,-w,--debug,-d){-i,--info}'[Sets the log level to info.]' \
         \*{-I,--init-script}'[Specifies an initialization script.]:init script:_files -g \*.gradle(|.kts):->argument-expected' \
-        (--no-isolated-projects)'--isolated-projects[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`. (incubating)]' \
         '--max-workers[Configures the maximum number of concurrent workers Gradle is allowed to use.]:->argument-expected' \
         (--build-cache)'--no-build-cache[Disables the Gradle build cache.]' \
         (--configuration-cache)'--no-configuration-cache[Disables the configuration cache.]' \
         (--configure-on-demand)'--no-configure-on-demand[Disables the use of configuration on demand. (incubating)]' \
         (--continue)'--no-continue[Stops task execution after a task failure.]' \
         (--daemon)'--no-daemon[Runs the build without the Gradle daemon. Useful occasionally if you have configured Gradle to always run with the daemon by default.]' \
-        (--isolated-projects)'--no-isolated-projects[Disables Isolated Projects. (incubating)]' \
         (--parallel)'--no-parallel[Disables parallel project execution.]' \
         (--problems-report)'--no-problems-report[Disables the HTML problems report. (incubating)]' \
         {-a,--no-rebuild}'[Disables rebuilding of project dependencies.]' \

plugins/jj/README.md

@@ -19,54 +19,35 @@ plugins=(... jj)
 | jjbd   | `jj bookmark delete`          |
 | jjbf   | `jj bookmark forget`          |
 | jjbl   | `jj bookmark list`            |
-| jjblt  | `jj bookmark list --tracked`  |
 | jjbm   | `jj bookmark move`            |
 | jjbr   | `jj bookmark rename`          |
 | jjbs   | `jj bookmark set`             |
 | jjbt   | `jj bookmark track`           |
 | jjbu   | `jj bookmark untrack`         |
 | jjc    | `jj commit`                   |
-| jjcfg  | `jj config`                   |
-| jjcfgl | `jj config list`              |
 | jjcmsg | `jj commit --message`         |
 | jjd    | `jj diff`                     |
 | jjdmsg | `jj desc --message`           |
 | jjds   | `jj desc`                     |
-| jjdst  | `jj diff --stat`              |
 | jje    | `jj edit`                     |
-| jjev   | `jj evolog`                   |
-| jjf    | `jj file`                     |
-| jjfl   | `jj file list`                |
-| jjg    | `jj git`                      |
 | jjgcl  | `jj git clone`                |
 | jjgf   | `jj git fetch`                |
 | jjgfa  | `jj git fetch --all-remotes`  |
-| jjgi   | `jj git init`                 |
 | jjgp   | `jj git push`                 |
 | jjgpa  | `jj git push --all`           |
 | jjgpd  | `jj git push --deleted`       |
 | jjgpt  | `jj git push --tracked`       |
-| jjgrl  | `jj git remote list`          |
 | jjl    | `jj log`                      |
 | jjla   | `jj log -r "all()"`           |
 | jjn    | `jj new`                      |
 | jjnt   | `jj new "trunk()"`            |
-| jjop   | `jj op`                       |
-| jjopl  | `jj op log`                   |
-| jjor   | `jj op restore`               |
 | jjrb   | `jj rebase`                   |
 | jjrbm  | `jj rebase -d "trunk()"`      |
 | jjrs   | `jj restore`                  |
 | jjrt   | `cd "$(jj root \|\| echo .)"` |
-| jjs    | `jj show`                     |
 | jjsp   | `jj split`                    |
 | jjsq   | `jj squash`                   |
 | jjst   | `jj status`                   |
-| jju    | `jj undo`                     |
-| jjw    | `jj workspace`                |
-| jjwa   | `jj workspace add`            |
-| jjwf   | `jj workspace forget`         |
-| jjwl   | `jj workspace list`           |
 
 ## Prompt usage
 

plugins/jj/jj.plugin.zsh

@@ -45,51 +45,34 @@ alias jjbc='jj bookmark create'
 alias jjbd='jj bookmark delete'
 alias jjbf='jj bookmark forget'
 alias jjbl='jj bookmark list'
-alias jjblt='jj bookmark list --tracked'
 alias jjbm='jj bookmark move'
 alias jjbr='jj bookmark rename'
 alias jjbs='jj bookmark set'
 alias jjbt='jj bookmark track'
 alias jjbu='jj bookmark untrack'
 alias jjc='jj commit'
-alias jjcfg='jj config'
-alias jjcfgl='jj config list'
 alias jjcmsg='jj commit --message'
 alias jjd='jj diff'
 alias jjdmsg='jj desc --message'
 alias jjds='jj desc'
-alias jjdst='jj diff --stat'
 alias jje='jj edit'
-alias jjev='jj evolog'
-alias jjf='jj file'
-alias jjfl='jj file list'
-alias jjg='jj git'
 alias jjgcl='jj git clone'
 alias jjgf='jj git fetch'
 alias jjgfa='jj git fetch --all-remotes'
-alias jjgi='jj git init'
 alias jjgp='jj git push'
 alias jjgpa='jj git push --all'
 alias jjgpd='jj git push --deleted'
 alias jjgpt='jj git push --tracked'
-alias jjgrl='jj git remote list'
 alias jjl='jj log'
 alias jjla='jj log -r "all()"'
 alias jjn='jj new'
 alias jjnt='jj new "trunk()"'
-alias jjop='jj op'
-alias jjopl='jj op log'
-alias jjor='jj op restore'
 alias jjrb='jj rebase'
 alias jjrbm='jj rebase -d "trunk()"'
 alias jjrs='jj restore'
 alias jjrt='cd "$(jj root || echo .)"'
-alias jjs='jj show'
 alias jjsp='jj split'
 alias jjsq='jj squash'
 alias jjst='jj status'
-alias jju='jj undo'
-alias jjw='jj workspace'
 alias jjwa='jj workspace add'
 alias jjwf='jj workspace forget'
-alias jjwl='jj workspace list'

plugins/juju/juju.plugin.zsh

@@ -35,7 +35,6 @@ alias jdlr='juju debug-log --ms --replay'
 alias jcon='juju consume'
 alias jeb='juju export-bundle'
 alias jex='juju expose'
-alias junex='juju unexpose'
 alias jh='juju help'
 alias jkc='juju kill-controller -y -t 0'
 alias jm='juju models'

plugins/kubectl/README.md

@@ -71,7 +71,6 @@ plugins=(... kubectl)
 |          |                                                         | **Secret management**                                                                            |
 | kgsec    | `kubectl get secret`                                    | Get secret for decoding                                                                          |
 | kgseca   | `kubectl get secret --all-namespaces`                   | List secrets across all namespaces                                                               |
-| kesec    | `kubectl edit secret`                                   | Edit secret resource                                                                             |
 | kdsec    | `kubectl describe secret`                               | Describe secret resource in detail                                                               |
 | kdelsec  | `kubectl delete secret`                                 | Delete the secret                                                                                |
 |          |                                                         | **Deployment management**                                                                        |

plugins/kubectl/kubectl.plugin.zsh

@@ -93,7 +93,6 @@ alias kdelcm='kubectl delete configmap'
 # Secret management
 alias kgsec='kubectl get secret'
 alias kgseca='kubectl get secret --all-namespaces'
-alias kesec='kubectl edit secret'
 alias kdsec='kubectl describe secret'
 alias kdelsec='kubectl delete secret'
 

plugins/laravel/README.md

@@ -43,7 +43,6 @@ plugins=(... laravel)
 | `pami`  | `php artisan make:interface` |
 | `pamtr` | `php artisan make:trait` |
 | `pamv` | `php artisan make:view` |
-| `pammig` | `php artisan make:migration` |
 
 ## Clears
 

plugins/laravel/laravel.plugin.zsh

@@ -32,7 +32,6 @@ alias pamen='php artisan make:enum'
 alias pami='php artisan make:interface'
 alias pamtr='php artisan make:trait'
 alias pamv='php artisan make:view'
-alias pammig='php artisan make:migration'
 
 
 # Clears

plugins/poetry-env/poetry-env.plugin.zsh

@@ -23,7 +23,7 @@ _togglePoetryShell() {
 
   # Activate the environment if in a Poetry directory and no environment is currently active
   if [[ $in_poetry_dir -eq 1 ]] && [[ $poetry_active -ne 1 ]]; then
-    local venv_dir=$(poetry env info --path 2>/dev/null)
+    venv_dir=$(poetry env info --path 2>/dev/null)
     # Handle case where poetry returns "." for in-project virtual environments
     if [[ "$venv_dir" == "." ]]; then
       venv_dir="$PWD/.venv"

plugins/symfony6/symfony6.plugin.zsh

@@ -15,8 +15,8 @@
 #   - https://github.com/symfony/symfony/blob/5.4/src/Symfony/Component/Console/Resources/completion.bash
 #
 _sf_console() {
-    local lastParam out comp sf_cmd
+    local lastParam flagPrefix requestComp out comp
-    local -a completions flagPrefix requestComp inputs
+    local -a completions
 
     # The user could have moved the cursor backwards on the command-line.
     # We need to trigger completion from the $CURRENT location, so we need
@@ -29,20 +29,11 @@ _sf_console() {
     setopt local_options BASH_REMATCH
     if [[ "${lastParam}" =~ '-.*=' ]]; then
         # We are dealing with a flag with an =
-        flagPrefix=(-P "${BASH_REMATCH}")
+        flagPrefix="-P ${BASH_REMATCH}"
     fi
 
-    # Prepare the command to obtain completions. An alias is resolved here,
+    # Prepare the command to obtain completions
-    # because the request is no longer read again by the shell.
+    requestComp="${words[0]} ${words[1]} _complete --no-interaction -szsh -a1 -c$((CURRENT-1))" i=""
-    sf_cmd="${words[1]}"
-    if [[ -n "${aliases[$sf_cmd]}" ]]; then
-        requestComp=(${(z)aliases[$sf_cmd]})
-    else
-        requestComp=(${~sf_cmd})
-    fi
-
-    requestComp+=(_complete --no-interaction -szsh -a1 "-c$((CURRENT-1))")
-
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
@@ -56,18 +47,19 @@ _sf_console() {
         fi
         # empty values are ignored
         if [ ! -z "$w" ]; then
-            inputs+=("-i$w")
+            i="${i}-i${w} "
         fi
     done
 
     # Ensure at least 1 input
-    if (( ! $#inputs )); then
+    if [ "${i}" = "" ]; then
-        inputs=(-i' ')
+        requestComp="${requestComp} -i\" \""
+    else
+        requestComp="${requestComp} ${i}"
     fi
 
-    # The request is run without being read again by the shell, so that a
+    # Use eval to handle any environment variables and such
-    # "$(...)" or a backtick typed on the command line is not executed
+    out=$(eval ${requestComp} 2>/dev/null)
-    out=$(SHELL_VERBOSITY=0 "${requestComp[@]}" "${inputs[@]}" 2>/dev/null)
 
     while IFS='\n' read -r comp; do
         if [ -n "$comp" ]; then
@@ -83,7 +75,7 @@ _sf_console() {
     done < <(printf "%s\n" "${out[@]}")
 
     # Let inbuilt _describe handle completions
-    _describe "completions" completions "${flagPrefix[@]}"
+    eval _describe "completions" completions $flagPrefix
     return $?
 }
 

plugins/vagrant/_vagrant

@@ -127,7 +127,7 @@ case $state in
       (box)
           __vagrant-box
       ;;
-      (up|provision|port|package|destroy|reload|ssh|ssh-config|halt|resume|status|suspend|rdp)
+      (up|provision|port|package|destroy|reload|ssh|ssh-config|halt|resume|status)
       _arguments ':feature:__vm_list'
     esac
   ;;

plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

@@ -39,7 +39,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       # Get absolute path, resolving symlinks
       local PROJECT_ROOT="${PWD:A}"
       while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
-          && ! -e "$PROJECT_ROOT/.git" ]]; do
+          && ! -d "$PROJECT_ROOT/.git" ]]; do
         PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
 

plugins/web-search/README.md

@@ -51,11 +51,6 @@ Available search contexts are:
 | `npmpkg`              | `https://www.npmjs.com/search?q=`               |
 | `packagist`           | `https://packagist.org/?query=`                 |
 | `gopkg`               | `https://pkg.go.dev/search?m=package&q=`        |
-| `maven`               | `https://central.sonatype.com/search?q=`        |
-| `pypi`                | `https://pypi.org/search/?q=`                   |
-| `aur`                 | `https://aur.archlinux.org/packages?O=0&K=`     |
-| `archwiki`            | `https://wiki.archlinux.org/index.php?search=`  |
-| `wikipedia`           | `https://en.wikipedia.org/w/index.php?search=`  |
 | `chatgpt`             | `https://chatgpt.com/?q=`                       |
 | `claudeai`            | `https://claude.ai/new?q=`                      |
 | `grokcom`             | `https://grok.com/?q=`                          |

plugins/web-search/web-search.plugin.zsh

@@ -32,11 +32,6 @@ function web_search() {
     npmpkg          "https://www.npmjs.com/search?q="
     packagist       "https://packagist.org/?query="
     gopkg           "https://pkg.go.dev/search?m=package&q="
-    maven           "https://central.sonatype.com/search?q="
-    pypi            "https://pypi.org/search/?q="
-    aur             "https://aur.archlinux.org/packages?O=0&K="
-    archwiki        "https://wiki.archlinux.org/index.php?search="
-    wikipedia       "https://en.wikipedia.org/w/index.php?search="
     chatgpt         "https://chatgpt.com/?q="
     grok            "https://grok.com/?q="
     claudeai        "https://claude.ai/new?q="
@@ -97,11 +92,6 @@ alias gems='web_search gems'
 alias npmpkg='web_search npmpkg'
 alias packagist='web_search packagist'
 alias gopkg='web_search gopkg'
-alias maven='web_search maven'
-alias pypi='web_search pypi'
-alias aur='web_search aur'
-alias archwiki='web_search archwiki'
-alias wikipedia='web_search wikipedia'
 alias chatgpt='web_search chatgpt'
 alias grokcom='web_search grok'
 alias claudeai='web_search claudeai'
@@ -126,3 +116,4 @@ if [[ ${#ZSH_WEB_SEARCH_ENGINES} -gt 0 ]]; then
   done
   unset engines key
 fi
+

templates/generators/plugin/README-cache.md-template

@@ -0,0 +1,7 @@
+
+## Cache
+
+This plugin caches the completion script and automatically updates it when the
+plugin is loaded, which is usually when you start a new terminal emulator.
+
+The cache is stored at `$ZSH_CACHE_DIR/completions/_%command%`.

templates/generators/plugin/README-generic.md-template

@@ -0,0 +1,11 @@
+# %name% plugin
+
+%description%
+
+To use it, add `%name%` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... %name%)
+```
+
+This plugin does not add any aliases.

templates/generators/plugin/README.md-template

@@ -0,0 +1,20 @@
+# %name% plugin
+
+%description%
+
+To use it, add `%name%` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... %name%)
+```
+
+## Aliases
+
+| Alias        | Command            | Description           |
+| :----------- | ------------------ | :-------------------- |
+| `%command%s` | `%command% status` | Show %command% status |
+
+## Requirements
+
+This plugin requires [%command%](https://example.com) to be installed.
+%cache%

templates/generators/plugin/completion-cached.zsh-template

@@ -0,0 +1,22 @@
+#
+# Completion
+#
+# %command% generates its own zsh completion, so we cache it instead of
+# maintaining a `_%command%` file by hand.
+#
+# On the first shell after installing this plugin the cache file doesn't exist
+# yet, so compinit hasn't bound it. Do that manually here.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_%command%" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _%command%
+  _comps[%command%]=_%command%
+fi
+
+# Regenerate the cache in the background so it never blocks shell startup.
+# TMPPREFIX puts the temp file next to the destination, which keeps the move
+# atomic.
+zmodload -F zsh/files b:zf_mv
+() {
+  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_%command%"
+  zf_mv -f -- =( %compgen% ) "$TMPPREFIX"
+} &|

templates/generators/plugin/completion-note.zsh-template

@@ -0,0 +1,6 @@
+#
+# Completion
+#
+# Oh My Zsh adds this directory to $fpath, so a file named `_%command%` next to
+# this one is picked up automatically as the completion for %command%.
+#

templates/generators/plugin/completion.zsh-template

@@ -0,0 +1,32 @@
+#compdef %command%
+#
+# Completion for %command%.
+#
+# This is a starting point. Delete what you don't need. Two references:
+#   https://zsh.sourceforge.io/Doc/Release/Completion-System.html
+#   https://github.com/zsh-users/zsh/blob/master/Etc/completion-style-guide
+
+local -a subcommands
+subcommands=(
+  'status:Show the current status'
+  'run:Run something'
+  'help:Show help for a command'
+)
+
+_arguments -C \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '(-v --version)'{-v,--version}'[show the version]' \
+  '1: :->subcommand' \
+  '*:: :->args'
+
+case $state in
+  subcommand)
+    _describe -t commands '%command% subcommand' subcommands
+    ;;
+  args)
+    case $words[1] in
+      status) _arguments '--short[one-line output]' ;;
+      run)    _files ;;
+    esac
+    ;;
+esac

templates/generators/plugin/plugin-generic.zsh-template

@@ -0,0 +1,48 @@
+# %name% plugin
+#
+# %description%
+#
+# This file is sourced by Oh My Zsh in every new shell, so keep it fast.
+# Avoid running external commands at the top level unless you really need to.
+#
+# Wrapping a command-line tool? Guard everything so people who don't have it
+# installed don't end up with broken aliases:
+#
+# if (( ! $+commands[sometool] )); then
+#   return
+# fi
+
+#
+# Aliases
+#
+# Document every alias in README.md. Short, obvious, and few beats many.
+#
+
+# alias %name%='echo "hello from %name%"'
+
+#
+# Functions
+#
+# Anything that needs arguments in the middle, or more than one command,
+# belongs here rather than in an alias.
+#
+
+# function %name%_hello() {
+#   echo "hello, ${1:-world}"
+# }
+
+#
+# Completion
+#
+# Oh My Zsh adds this directory to $fpath, so a file named `_sometool` next to
+# this one is picked up automatically as the completion for `sometool`.
+#
+
+#
+# Need the path to this plugin's own directory (for data files, a lib/ dir...)?
+# This is the standard way to get it, since $0 is not reliable on its own:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+#
+# 0="${ZERO:-${${0:#$ZSH_ARGZERO}:-${(%):-%N}}}"
+# 0="${${(M)0:#/*}:-$PWD/$0}"
+# source "${0:A:h}/lib/helpers.zsh"

templates/generators/plugin/plugin.zsh-template

@@ -0,0 +1,43 @@
+# %name% plugin
+#
+# %description%
+#
+# This file is sourced by Oh My Zsh in every new shell, so keep it fast.
+# Avoid running external commands at the top level unless you really need to.
+
+# Only define anything if the tool is actually installed. Without this guard,
+# people who don't have %command% get aliases that fail with "command not found".
+if (( ! $+commands[%command%] )); then
+  return
+fi
+
+#
+# Aliases
+#
+# Document every alias in README.md. Short, obvious, and few beats many.
+# The one below is just an example: replace it with something %command% can do.
+#
+
+alias %command%s='%command% status'
+
+#
+# Functions
+#
+# Anything that needs arguments in the middle, or more than one command,
+# belongs here rather than in an alias.
+#
+
+# function %name%_current() {
+#   %command% status --short "$@"
+# }
+
+%completion%
+
+#
+# Need the path to this plugin's own directory (for data files, a lib/ dir...)?
+# This is the standard way to get it, since $0 is not reliable on its own:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+#
+# 0="${ZERO:-${${0:#$ZSH_ARGZERO}:-${(%):-%N}}}"
+# 0="${${(M)0:#/*}:-$PWD/$0}"
+# source "${0:A:h}/lib/helpers.zsh"

themes/strug.zsh-theme

@@ -4,8 +4,8 @@ export LSCOLORS=dxFxCxDxBxegedabagacad
 
 local git_branch='$(git_prompt_info)%{$reset_color%}$(git_remote_status)'
 
-PROMPT="%{%(#~$fg[red]~$fg[green])%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch}
+PROMPT="%{$fg[green]%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch}
-%{%(#~$fg[red]~$fg[green])%}╰%(#~#~\$) %{$reset_color%}"
+%{$fg[green]%}╰\$ %{$reset_color%}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}on "
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

tools/check_for_upgrade.sh

@@ -23,32 +23,12 @@ zstyle -s ':omz:update' mode update_mode || {
 # - the automatic update is disabled
 # - the current user doesn't have write permissions nor owns the $ZSH directory
 # - is not run from a tty
-if [[ "$update_mode" = disabled ]] \
-   || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
-   || [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]]; then
-  unset update_mode
-  return
-fi
-
-# Cancel update if it's not time to check yet. This runs before the git checks
-# below because those fork on every startup. Skipped when a background update
-# left a result that still needs to be reported (EXIT_STATUS is set).
-() {
-  local LAST_EPOCH EXIT_STATUS ERROR epoch_target
-  zmodload zsh/datetime
-  source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || return 1
-  [[ -n "$LAST_EPOCH" && -z "$EXIT_STATUS" ]] || return 1
-  zstyle -s ':omz:update' frequency epoch_target || epoch_target=${UPDATE_ZSH_DAYS:-13}
-  (( ( EPOCHSECONDS / 60 / 60 / 24 - LAST_EPOCH ) < epoch_target ))
-} && {
-  unset update_mode
-  return
-}
-
-# Cancel update if:
 # - git is unavailable on the system
 # - $ZSH is not a git repository
-if ! command git --version >/dev/null 2>&1 \
+if [[ "$update_mode" = disabled ]] \
+   || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
+   || [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]] \
+   || ! command git --version >/dev/null 2>&1 \
    || (builtin cd -q "$ZSH"; ! command git rev-parse --is-inside-work-tree &>/dev/null); then
   unset update_mode
   return

tools/install.sh

@@ -528,10 +528,9 @@ print_success() {
     "$(fmt_code "$(fmt_link ".zshrc" "file://$zdot/.zshrc" --text)")" \
     "file to select plugins, themes, and options."
   printf '\n'
-  printf '%s\n' "• Follow along on X ($(fmt_link @ohmyzsh https://x.com/ohmyzsh)) or Bluesky ($(fmt_link @ohmyz.sh https://bsky.app/profile/ohmyz.sh))"
+  printf '%s\n' "• Follow us on X: $(fmt_link @ohmyzsh https://x.com/ohmyzsh)"
-  printf '%s\n' "• Questions or ideas? Join the community on $(fmt_link Discord https://discord.gg/ohmyzsh)"
+  printf '%s\n' "• Join our Discord community: $(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
-  printf '%s\n' "• Help support the project: sponsor us on $(fmt_link "Open Collective" https://opencollective.com/ohmyzsh),"
+  printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "CommitGoods Shop" https://commitgoods.com/collections/oh-my-zsh)"
-  printf '%s\n' "  or grab stickers, shirts, and swag from $(fmt_link CommitGoods https://commitgoods.com/ohmyzsh)"
   printf '%s\n' $FMT_RESET
 }
 

tools/tests/theme-browser.zsh

@@ -1,350 +0,0 @@
-#!/usr/bin/env zsh
-# Run with: zsh -df tools/tests/theme-browser.zsh
-# Optionally pass one group, e.g. `slow-interrupt`, to run it alone.
-# Each browser runs under a real controlling PTY, with no user startup files.
-emulate -R zsh
-
-if [[ $1 == --child ]]; then
-  if [[ $2 == completion ]]; then
-    function compdef { print -r -- "REGISTERED:${(j.:.)@}"; }
-  fi
-  source "$ZSH/lib/cli.zsh"
-  # Match normal OMZ sessions without sourcing any user startup/configuration.
-  setopt promptsubst
-  print -r -- "LAZY:$+functions[_omz_theme_browser]:$+functions[_omz_theme_preview]"
-  if [[ $2 == completion ]]; then
-    # Capture the real completion function's candidates without loading the
-    # user's completion setup or replacing any CLI/backend functions.
-    function _describe { print -rl -- "DESCRIBE:$1" "${(@P)2}"; }
-    CURRENT=3 words=(omz theme '')
-    print -r -- SUBCOMMANDS
-    _omz
-    print -r -- END_SUBCOMMANDS
-    for action in browse preview set use; do
-      CURRENT=4 words=(omz theme "$action" '')
-      print -r -- "CANDIDATES:$action"
-      _omz
-      print -r -- "END:$action"
-    done
-    print -r -- "STILL_LAZY:$+functions[_omz_theme_browser]:$+functions[_omz_theme_preview]"
-    print -r -- COMPLETIONS_FINISHED
-    exit
-  fi
-  if [[ $2 == reject* ]]; then
-    case $2 in
-      reject-stdin) omz theme browse </dev/null ;;
-      reject-stdout) omz theme browse >/dev/null ;;
-      *) omz theme browse ;;
-    esac
-    result=$?
-    print -r -- "REJECT:$result:$+functions[_omz_theme_browser]:$+functions[_omz_theme_preview]"
-    exit
-  fi
-  function _omz::theme::use { calls+=("use:$1"); ZSH_THEME=$1; }
-  function _omz::theme::set { calls+=("set:$1"); ZSH_THEME=$1; }
-  function browser_test_hook { : parent-hook; }
-  function precmd { : parent-precmd; }
-  typeset -a calls=() precmd_functions=(browser_test_hook) chpwd_functions=(browser_test_hook)
-  ZSH_THEME=parent-theme PROMPT=parent-prompt RPROMPT=parent-rprompt
-  typeset original_hook=$functions[browser_test_hook] original_precmd=$functions[precmd]
-  typeset original_options=$(setopt) original_pwd=$PWD
-  stty rows 24 cols 100
-  # PENDIN is a transient kernel input-reprocessing flag, not a user mode.
-  typeset original_tty=$(stty -a)
-  original_tty=${${original_tty//-pendin/}//pendin/}
-  tty > "$TEST_SCRATCH/tty"
-  print -r -- READY
-  # An interactive script otherwise aborts on SIGINT instead of returning to
-  # the next prompt as an interactive command loop would.
-  trap ':' INT
-  omz theme browse "$2"
-  result=$?
-  typeset restored_tty=$(stty -a)
-  restored_tty=${${restored_tty//-pendin/}//pendin/}
-  if [[ $restored_tty == "$original_tty" ]]; then
-    print -r -- TTY_RESTORED
-  else
-    print -r -- "TTY_MISMATCH:before=$original_tty after=$restored_tty"
-  fi
-  if [[ $PROMPT == parent-prompt && $RPROMPT == parent-rprompt &&
-        $functions[browser_test_hook] == "$original_hook" &&
-        $functions[precmd] == "$original_precmd" &&
-        ${(j:,:)precmd_functions} == browser_test_hook &&
-        ${(j:,:)chpwd_functions} == browser_test_hook &&
-        -o promptsubst && $(setopt) == "$original_options" && $PWD == "$original_pwd" &&
-        ${BROWSER_TEST_LEAK-unset} == unset ]]; then
-    print -r -- PARENT_UNCHANGED
-  fi
-  print -r -- "RESULT:$result:${(j:,:)calls}:$ZSH_THEME"
-  print -r -- FINISHED
-  exit 0
-fi
-
-setopt err_exit pipe_fail
-[[ -n $BROWSER_TEST_TRACE ]] && setopt xtrace
-zmodload zsh/zpty
-zmodload zsh/datetime
-zmodload zsh/zselect
-typeset -r repo=${0:A:h:h:h} self=${0:A}
-typeset scratch=$(mktemp -d "${TMPDIR:-/tmp}/omz-browser-test.XXXXXXXX")
-scratch=${scratch:A}
-trap 'zpty -d 2>/dev/null; command rm -rf -- "$scratch"' EXIT
-trap 'exit 130' INT
-trap 'exit 143' TERM
-mkdir -p "$scratch/home" "$scratch/custom/themes/nested" "$scratch/tmp"
-export ZSH=$repo ZSH_CUSTOM=$scratch/custom HOME=$scratch/home ZDOTDIR=$scratch/home
-export TMPDIR=$scratch/tmp TEST_SCRATCH=$scratch TERM=xterm-256color
-unset ZSH_THEME
-# Even a mistakenly enabled startup-file load must never reach real dotfiles.
-print -r -- 'print STARTUP_RAN; exit 99' > "$HOME/.zshenv"
-print -r -- 'PROMPT="nested fixture"' > "$ZSH_CUSTOM/themes/nested/browser-fixture.zsh-theme"
-for number in {01..10}; do
-  print -r -- 'typeset -g BROWSER_TEST_LEAK=bad
-ZSH_THEME=fixture-theme
-precmd_functions=() chpwd_functions=()
-function precmd { PROMPT="%F{red}FIXTURE_PREVIEW%f" }
-RPROMPT="fixture-right"' > "$ZSH_CUSTOM/zz-omz-test-$number.zsh-theme"
-done
-print -r -- 'sleep 30 &
-print -r -- $! > "$TEST_SCRATCH/slow-pid"
-wait
-PROMPT="SLOW_FINISHED"' > "$ZSH_CUSTOM/zz-omz-test-slow.zsh-theme"
-typeset filter_probe='$(print HIT > $TEST_SCRATCH/filter-executed)'
-typeset preview_probe='$(print HIT > $TEST_SCRATCH/preview-executed)'
-# Emit literal preview output, rather than asking the worker to evaluate a
-# prompt expression. Only a second evaluation by the browser can execute it.
-print -rl -- "print -r -- ${(q)preview_probe}" 'PROMPT="literal-preview-ready"' > "$ZSH_CUSTOM/literal-browser.zsh-theme"
-
-typeset buffer='' transcript='' chunk='' label=''
-typeset -F browser_finished_at=0
-function cleanup_pty {
-  local record group
-  for record in "${(@f)$(zpty)}"; do
-    [[ $record == \(<->\)\ browser:* ]] || continue
-    group=${${record#\(}%%\)*}
-    kill -HUP -- -$group 2>/dev/null || true
-    zselect -t 20 || true
-    # A renderer regression can loop without checking its cancellation flag.
-    kill -KILL -- -$group 2>/dev/null || true
-  done
-  zpty -d 2>/dev/null || true
-  return 0
-}
-function fail {
-  print -u2 -r -- "FAIL: $label: $1"
-  print -u2 -r -- "PTY transcript, last 4000 characters (escaped): ${(V)transcript[-4000,-1]}"
-  exit 1
-}
-function check {
-  "$@" || fail "$1 assertion failed"
-}
-function await {
-  local wanted=$1
-  local -F deadline=$(( EPOCHREALTIME + ${2:-6} ))
-  [[ $buffer == *"$wanted"* ]] && return 0
-  while (( EPOCHREALTIME < deadline )); do
-    if zpty -r browser chunk; then
-      buffer+=$chunk transcript+=$chunk
-      [[ $buffer == *"$wanted"* ]] && return 0
-    else
-      zselect -t 1 || true
-    fi
-  done
-  fail "timed out waiting for ${(V)wanted}"
-}
-function send {
-  buffer=''
-  zpty -w -n browser "$1"
-}
-function start {
-  label=$1 buffer='' transcript=''
-  local -a launch=("$commands[zsh]" -dfi "$self" --child "$2")
-  zpty -b browser exec "${(@q)launch}"
-  await 'LAZY:0:0'
-  await "$3"
-}
-function finish {
-  await FINISHED
-  # zpty -d can spend a second reaping an already-completed child. It is
-  # harness teardown, not browser cancellation/terminal-restoration latency.
-  browser_finished_at=$EPOCHREALTIME
-  check test "${transcript#*TTY_RESTORED}" != "$transcript"
-  check test "${transcript#*PARENT_UNCHANGED}" != "$transcript"
-  check test "${transcript#*RESULT:$1}" != "$transcript"
-  check test "${transcript#*$'\e[?1049l'}" != "$transcript"
-  check test "${transcript#*$'\e[?25h'}" != "$transcript"
-  check test "${transcript#*STARTUP_RAN}" = "$transcript"
-  zpty -d browser
-  [[ -z $BROWSER_TEST_TIMING ]] || print -r -- "TIMING: PTY deletion $(( EPOCHREALTIME - browser_finished_at ))s"
-}
-
-function test_completion {
-  start 'completion registration, commands, theme candidates, lazy loading' completion COMPLETIONS_FINISHED
-  check test "${transcript#*REGISTERED:_omz:omz}" != "$transcript"
-  local section=${${transcript#*SUBCOMMANDS}%END_SUBCOMMANDS*} action
-  check test "${section#*browse:Browse theme previews}" != "$section"
-  check test "${section#*preview:Preview a theme without applying it}" != "$section"
-  for action in browse preview set use; do
-    section=${${transcript#*CANDIDATES:$action}%END:$action*}
-    check test "${section#*DESCRIBE:theme}" != "$section"
-    for name in robbyrussell zz-omz-test-01 nested/browser-fixture; do
-      check test "${section#*$name}" != "$section"
-    done
-  done
-  check test "${transcript#*STILL_LAZY:0:0}" != "$transcript"
-  check test "${transcript#*STARTUP_RAN}" = "$transcript"
-  zpty -d browser
-}
-
-function test_rejection {
-  # Noninteractive rejection even with both descriptors attached to a PTY.
-  label=noninteractive
-  typeset -a launch=("$commands[zsh]" -df "$self" --child reject)
-  zpty -b browser exec "${(@q)launch}"
-  await 'REJECT:1:0:0'
-  check test "${transcript#*requires an interactive terminal}" != "$transcript"
-  zpty -d browser
-  for mode in stdin stdout; do
-    start "redirected $mode" "reject-$mode" 'REJECT:1:0:0'
-    check test "${transcript#*requires an interactive terminal}" != "$transcript"
-    zpty -d browser
-  done
-  label='noninteractive and redirected-I/O rejection'
-}
-
-function test_navigation {
-  start 'filter, navigation, actions/back, Esc isolation' zz-omz-test- '> zz-omz-test-01'
-  await FIXTURE_PREVIEW
-  send $'\e[B'; await '> zz-omz-test-02'
-  send $'\e[A'; await '> zz-omz-test-01'
-  send $'\x0e'; await '> zz-omz-test-02'
-  send $'\x10'; await '> zz-omz-test-01'
-  send $'\e[6~'; await '> zz-omz-test-05'
-  send $'\e[5~'; await '> zz-omz-test-01'
-  send '09'; await '> zz-omz-test-09'
-  send $'\x7f'; await '(9 themes)'
-  send $'\x15'; await 'Filter:   ('
-  send 'ZZ-OMZ-TEST-03'; await '> zz-omz-test-03'
-  send $'\r'; await '[u] Use in session'
-  send b; await 'Enter: actions'
-  send $'\x15no-such-omz-fixture'; await 'No matching themes.'
-  send $'\r'; await 'No matching themes.'
-  send $'\e'
-  finish '0::parent-theme'
-}
-
-function test_use {
-  start 'explicit use dispatch' zz-omz-test-01 '> zz-omz-test-01'
-  send $'\r'; await '[u] Use in session'
-  send u
-  finish '0:use:zz-omz-test-01:zz-omz-test-01'
-}
-
-function test_promptsubst {
-  start 'literal filter/preview substitutions with parent promptsubst enabled' literal-browser '> literal-browser'
-  await "$preview_probe"
-  await literal-preview-ready
-  check test ! -e "$scratch/preview-executed"
-  send $'\x15'"$filter_probe"
-  await "Filter: $filter_probe"
-  await 'No matching themes.'
-  check test ! -e "$scratch/filter-executed"
-  send $'\x15literal-browser'
-  await "$preview_probe"
-  await literal-preview-ready
-  send $'\e'
-  finish '0::parent-theme'
-  check test ! -e "$scratch/filter-executed"
-  check test ! -e "$scratch/preview-executed"
-}
-
-function test_save {
-  start 'explicit save dispatch (stubbed)' zz-omz-test-02 '> zz-omz-test-02'
-  send $'\r'; await '[u] Use in session'
-  send s
-  finish '0:set:zz-omz-test-02:zz-omz-test-02'
-}
-
-function test_interrupt {
-  start 'Ctrl-C restores terminal' zz-omz-test-01 '> zz-omz-test-01'
-  send $'\x03'
-  finish '130::parent-theme'
-}
-
-function test_resize {
-  start 'resize small and back' zz-omz-test-01 '> zz-omz-test-01'
-  typeset terminal=$(<"$scratch/tty")
-  terminal=${terminal//$'\r'/}
-  buffer=''
-  stty rows 10 cols 30 < "$terminal"
-  await '40 columns x 16 rows.'
-  buffer=''
-  stty rows 24 cols 100 < "$terminal"
-  await '> zz-omz-test-01'
-  send $'\e'
-  finish '0::parent-theme'
-}
-
-function test_slow {
-  local cancellation=$1
-  command rm -f "$scratch/slow-pid"
-  start "slow preview cancellation: $cancellation" zz-omz-test-slow '> zz-omz-test-slow'
-  for attempt in {1..150}; do
-    [[ -s "$scratch/slow-pid" ]] && break
-    zselect -t 1 || true
-  done
-  check test -s "$scratch/slow-pid"
-  typeset -F started=$EPOCHREALTIME
-  case $cancellation in
-    navigation)
-      send $'\x15zz-omz-test-01'
-      await FIXTURE_PREVIEW 2
-      [[ -z $BROWSER_TEST_TIMING ]] || print -r -- "TIMING: navigation preview $(( EPOCHREALTIME - started ))s"
-      (( EPOCHREALTIME - started < 2 )) || fail 'replacement preview exceeded 2 seconds'
-      send $'\e'
-      finish '0::parent-theme'
-      ;;
-    escape) send $'\e'; finish '0::parent-theme' ;;
-    interrupt) send $'\x03'; finish '130::parent-theme' ;;
-  esac
-  [[ -z $BROWSER_TEST_TIMING ]] || print -r -- "TIMING: browser completed $(( browser_finished_at - started ))s; including teardown $(( EPOCHREALTIME - started ))s"
-  (( browser_finished_at - started < 2 )) || fail "browser completion exceeded 2 seconds: $(( browser_finished_at - started ))s"
-  typeset child=$(<"$scratch/slow-pid") child_state
-  for attempt in {1..100}; do
-    child_state=$(command ps -o stat= -p "$child" 2>/dev/null || true)
-    [[ -z "${child_state//[ ZN+]/}" ]] && break
-    zselect -t 1 || true
-  done
-  [[ -z $BROWSER_TEST_TIMING ]] || print -r -- "TIMING: descendant $child state=${child_state:-absent}, cleanup polls=$attempt"
-  [[ -z "${child_state//[ ZN+]/}" ]] || fail "preview descendant $child still running: $child_state"
-}
-
-# Keep independent regressions running after a failed UI session.
-unsetopt err_exit
-typeset -i failures=0
-for scenario in rejection completion navigation promptsubst use save interrupt resize slow-navigation slow-escape slow-interrupt; do
-  [[ -z $1 || $scenario == "$1" ]] || continue
-  (
-    setopt err_exit
-    trap 'cleanup_pty' EXIT
-    if [[ $scenario == slow-* ]]; then
-      test_slow "${scenario#slow-}"
-    else
-      test_$scenario
-    fi
-    print -r -- "PASS: $label"
-  )
-  (( $? == 0 )) || (( failures++ ))
-done
-typeset -a leftovers
-for attempt in {1..100}; do
-  leftovers=("$TMPDIR"/omz-preview.*(N))
-  (( $#leftovers == 0 )) && break
-  zselect -t 1 || true
-done
-if (( $#leftovers )); then
-  print -u2 -r -- "FAIL: $#leftovers preview temporary directories remain"
-  (( failures++ ))
-fi
-print -r -- "Theme browser regression groups failed: $failures"
-(( failures == 0 ))

tools/tests/theme-preview.zsh

@@ -1,282 +0,0 @@
-#!/usr/bin/env zsh
-# Run with: zsh -df tools/tests/theme-preview.zsh
-emulate -R zsh
-setopt err_exit pipe_fail
-typeset -r repo=${0:A:h:h:h}
-source "$repo/tools/theme-preview.zsh"
-typeset scratch=$(mktemp -d "${TMPDIR:-/tmp}/omz-preview-test.XXXXXXXX")
-scratch=${scratch:A}
-trap 'command rm -rf -- "$scratch"' EXIT
-trap 'exit 130' INT
-trap 'exit 143' TERM
-mkdir "$scratch/tmp"
-export TMPDIR=$scratch/tmp
-
-function check {
-  if ! "$@"; then
-    print -u2 -r -- "FAIL: ${(j: :)@}"
-    exit 1
-  fi
-}
-
-export ZSH=$scratch/omz ZSH_CUSTOM=$scratch/custom
-mkdir -p "$ZSH/themes" "$ZSH_CUSTOM/themes/nested" "$scratch/home" "$scratch/work"
-print -r -- "PROMPT='bundled'" > "$ZSH/themes/same.zsh-theme"
-print -r -- "PROMPT='custom themes'" > "$ZSH_CUSTOM/themes/same.zsh-theme"
-print -r -- "PROMPT='custom root'" > "$ZSH_CUSTOM/same.zsh-theme"
-print -r -- "PROMPT='z'" > "$ZSH/themes/zebra.zsh-theme"
-print -r -- "PROMPT='a'" > "$ZSH/themes/alpha.zsh-theme"
-print -r -- "PROMPT='bad'" > "$ZSH/themes/"$'bad\nname.zsh-theme'
-print -r -- "PROMPT='random'" > "$ZSH/themes/random.zsh-theme"
-print -r -- "PROMPT='nested'" > "$ZSH_CUSTOM/themes/nested/example.zsh-theme"
-check test "$(_omz_theme_names)" = $'alpha\nnested/example\nsame\nzebra'
-check test "$(_omz_theme_resolve nested/example)" = "$ZSH_CUSTOM/themes/nested/example.zsh-theme"
-check test "$(_omz_theme_resolve same)" = "$ZSH_CUSTOM/same.zsh-theme"
-rm "$ZSH_CUSTOM/same.zsh-theme"
-check test "$(_omz_theme_resolve same)" = "$ZSH_CUSTOM/themes/same.zsh-theme"
-rm "$ZSH_CUSTOM/themes/same.zsh-theme"
-check test "$(_omz_theme_resolve same)" = "$ZSH/themes/same.zsh-theme"
-for name in ../same /same . .. nested/../same nested/./example nested//example random $'bad\nname' 'bad\name' missing ''; do
-  if _omz_theme_resolve "$name" > /dev/null 2>&1; then
-    print -u2 -r -- 'FAIL: accepted invalid/missing name'
-    exit 1
-  fi
-done
-
-# The fixtures intentionally write only inside this private, always-cleaned tree.
-print -r -- 'print STARTUP_RAN; exit 99' > "$scratch/home/.zshenv"
-export ZDOTDIR=$scratch/home PREVIEW_ENV=preserved
-print -r -- '
-typeset -g PREVIEW_LEAK=bad
-export PREVIEW_ENV=changed
-alias preview_leak=true
-setopt noclobber
-function precmd { PROMPT="hook:$PWD:$PREVIEW_ENV:%?" }
-function second_hook { RPROMPT="second-hook:%?" }
-precmd_functions=(second_hook)
-' > "$ZSH_CUSTOM/isolation.zsh-theme"
-typeset before_pwd=$PWD before_options=$(setopt) before_env=$PREVIEW_ENV
-typeset output=$(_omz_theme_preview isolation 7)
-check test "$PWD" = "$before_pwd"
-check test "$(setopt)" = "$before_options"
-check test "$PREVIEW_ENV" = "$before_env"
-check test "${PREVIEW_LEAK-unset}" = unset
-check test "${aliases[preview_leak]-unset}" = unset
-check test "${functions[second_hook]-unset}" = unset
-check test "${output#*hook:${PWD}:changed:7}" != "$output"
-check test "${output#*second-hook:7}" != "$output"
-check test "${output#*STARTUP_RAN}" = "$output"
-
-print -r -- 'PROMPT="env:$PREVIEW_ENV cwd:$PWD %(?.success.failure)"' > "$ZSH_CUSTOM/status.zsh-theme"
-output=$(_omz_theme_preview status)
-check test "${output#*env:preserved cwd:${PWD} success}" != "$output"
-output=$(_omz_theme_preview status 1)
-check test "${output#*failure}" != "$output"
-if _omz_theme_preview status nope >/dev/null 2>&1; then exit 1; fi
-
-# Values produced by parameters or helpers are prompt text, not shell code for
-# a second substitution pass. Check both sides and the helper's incoming status.
-export PREVIEW_REEXECUTED=$scratch/reexecuted
-export PREVIEW_LITERAL='$(print reexecuted > "$PREVIEW_REEXECUTED")'
-print -r -- '
-function literal_helper { print -r -- "helper-status:$? $PREVIEW_LITERAL" }
-PROMPT='"'"'$PREVIEW_LITERAL $(literal_helper) %?'"'"'
-RPROMPT='"'"'$(literal_helper) $PREVIEW_LITERAL %?'"'"'
-' > "$ZSH_CUSTOM/literal.zsh-theme"
-output=$(_omz_theme_preview literal 7)
-check test ! -e "$PREVIEW_REEXECUTED"
-check test "${output#*"$PREVIEW_LITERAL"}" != "$output"
-check test "${output#*helper-status:7}" != "$output"
-check test "${output#*"$PREVIEW_LITERAL 7"}" != "$output"
-print -r -- 'unsetopt promptsubst; PROMPT='"'"'$PREVIEW_LITERAL %?'"'" > "$ZSH_CUSTOM/no-subst.zsh-theme"
-output=$(_omz_theme_preview no-subst 7)
-check test "${output#*'$PREVIEW_LITERAL 7'}" != "$output"
-
-print -r -- 'PROMPT="conditional prompt"; [[ -n ${OMZ_PREVIEW_UNSET_SSH-} ]] && RPROMPT="remote"' > "$ZSH_CUSTOM/final-false.zsh-theme"
-output=$(_omz_theme_preview final-false)
-check test "${output#*conditional prompt}" != "$output"
-print -r -- 'PROMPT=""' > "$ZSH_CUSTOM/empty.zsh-theme"
-output=$(_omz_theme_preview empty)
-print -r -- 'RPROMPT="right-only"; false' > "$ZSH_CUSTOM/right-only.zsh-theme"
-output=$(_omz_theme_preview right-only)
-check test "${output#*right-only}" != "$output"
-
-# A helper can fail inside command substitution without making print -P fail.
-# Its runtime diagnostic must remain visible in the sanitized partial preview.
-print -r -- 'PROMPT='"'"'$( _omz_preview_missing_helper )'"'" > "$ZSH_CUSTOM/helper-failure.zsh-theme"
-output=$(_omz_theme_preview helper-failure 2>&1)
-check test "${output#*command not found: _omz_preview_missing_helper}" != "$output"
-
-# A failing precmd (or array hook) stops later hooks, as in interactive zsh.
-# Preserve any partial preview, but report failure rather than silently claiming
-# that an incomplete initialization is a faithful preview.
-for hook_setup in 'precmd() { return 3 }; precmd_functions=(must_not_run)' \
-  'failed_hook() { return 4 }; precmd_functions=(failed_hook must_not_run)' \
-  'failed_hook() { _omz_preview_missing_command }; precmd_functions=(failed_hook must_not_run)'; do
-  print -rl -- 'PROMPT="partial prompt"; must_not_run() { print UNEXPECTED_HOOK; }' "$hook_setup" > "$ZSH_CUSTOM/hook-failure.zsh-theme"
-  if _omz_theme_preview hook-failure >"$scratch/hook-error" 2>&1; then
-    print -u2 -r -- 'FAIL: accepted failing precmd hook'
-    exit 1
-  fi
-  output=$(<"$scratch/hook-error")
-  check test "${output#*UNEXPECTED_HOOK}" = "$output"
-  check test "${output#*remaining hooks skipped}" != "$output"
-  check test "${output#*partial prompt}" != "$output"
-done
-
-# No language runtime, timeout utility, or process-inspection utility is needed
-# by the backend. The worker still has zsh's usual autoload/module search paths.
-mkdir "$scratch/bin"
-for name in zsh mktemp mkfifo rm; do
-  ln -s "$commands[$name]" "$scratch/bin/$name"
-done
-output=$(PATH="$scratch/bin" _omz_theme_preview status)
-check test "${output#*success}" != "$output"
-print -r -- '[[ ! -t 0 && ! -t 1 && ! -t 2 && ! -o interactive ]] || exit 9; PROMPT="non-tty"' > "$ZSH_CUSTOM/non-tty.zsh-theme"
-output=$(_omz_theme_preview non-tty)
-check test "${output#*non-tty}" != "$output"
-
-print -r -- 'print -n -- "\e]52;c;SECRET\a\e[2J\r\b\ePSECRET\e\\"; PROMPT="%F{red}safe%f"' > "$ZSH_CUSTOM/escapes.zsh-theme"
-output=$(_omz_theme_preview escapes)
-check test "${output#*SECRET}" = "$output"
-check test "${output#*$'\e[2J'}" = "$output"
-check test "${output#*$'\r'}" = "$output"
-check test "${output#*$'\e[31m'safe}" != "$output"
-
-for code in 'return 1' 'exit 0' 'exit 7' 'if then' 'PROMPT="partial"; if then' \
-  'PROMPT="partial"; return 2' 'PROMPT="partial"; _omz_preview_missing_command'; do
-  print -r -- "$code" > "$ZSH_CUSTOM/broken.zsh-theme"
-  if _omz_theme_preview broken >"$scratch/error" 2>&1; then
-    print -u2 -r -- "FAIL: accepted broken theme: $code"
-    exit 1
-  fi
-done
-print -r -- 'while true; do print -r -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx; done' > "$ZSH_CUSTOM/flood.zsh-theme"
-if _omz_theme_preview flood >"$scratch/flood" 2>&1; then exit 1; fi
-check test "$(wc -c < "$scratch/flood")" -le 32768
-print -r -- 'printf "\377%.0s" {1..11000}; PROMPT="safe"' > "$ZSH_CUSTOM/bytes.zsh-theme"
-_omz_theme_preview bytes >"$scratch/bytes" 2>&1
-check test "$(wc -c < "$scratch/bytes")" -le 32768
-check test "${$(<"$scratch/bytes")#*$'\xff'}" = "$(<"$scratch/bytes")"
-print -r -- 'printf "\233m%.0s" {1..12000}; PROMPT="safe"' > "$ZSH_CUSTOM/csi-bytes.zsh-theme"
-_omz_theme_preview csi-bytes >"$scratch/csi-bytes" 2>&1
-check test "$(wc -c < "$scratch/csi-bytes")" -le 32768
-
-print -r -- 'sleep 30 & print -r -- $! > "$PREVIEW_PID_FILE"; wait' > "$ZSH_CUSTOM/slow.zsh-theme"
-export PREVIEW_PID_FILE=$scratch/child
-zmodload zsh/datetime
-typeset -F started=$EPOCHREALTIME
-if _omz_theme_preview slow >"$scratch/timeout" 2>&1; then exit 1; fi
-check test $(( EPOCHREALTIME - started < 5 )) = 1
-check test "${$(<"$scratch/timeout")#*timed out}" != "$(<"$scratch/timeout")"
-typeset child=$(<"$scratch/child")
-# A killed orphan may briefly remain a zombie until the system reaps it.
-typeset child_state=$(command ps -o stat= -p "$child" 2>/dev/null || true)
-check test -z "${child_state//[ ZN+]/}"
-
-for signal in INT TERM HUP; do
-  rm -f "$PREVIEW_PID_FILE"
-  _omz_theme_preview slow >"$scratch/cancel" 2>&1 &
-  typeset preview_job=$!
-  for attempt in {1..100}; do
-    [[ -s "$PREVIEW_PID_FILE" ]] && break
-    sleep 0.01
-  done
-  check test -s "$PREVIEW_PID_FILE"
-  # zsh adds a waiting wrapper around a backgrounded subshell function.
-  # Signal the supervisor itself; terminal interrupts reach it via the job group.
-  typeset supervisor='' candidate='' parent=''
-  for candidate parent in ${(z)$(command ps -A -o pid= -o ppid=)}; do
-    if [[ $parent == $preview_job ]]; then
-      supervisor=$candidate
-      break
-    fi
-  done
-  check test -n "$supervisor"
-  kill -$signal "$supervisor"
-  typeset result=0
-  wait "$preview_job" || result=$?
-  if (( result != 130 && result != 143 && result != 129 )); then
-    print -u2 -r -- "Unexpected cancellation result: $result: $(<"$scratch/cancel")"
-  fi
-  if [[ $signal == INT ]]; then
-    check test "$result" = 130
-  elif [[ $signal == TERM ]]; then
-    check test "$result" = 143
-  else
-    check test "$result" = 129
-  fi
-  child=$(<"$PREVIEW_PID_FILE")
-  child_state=$(command ps -o stat= -p "$child" 2>/dev/null || true)
-  check test -z "${child_state//[ ZN+]/}"
-done
-
-print -r -- 'sleep 30 & print -r -- $! > "$PREVIEW_PID_FILE"; PROMPT="background"' > "$ZSH_CUSTOM/background.zsh-theme"
-output=$(_omz_theme_preview background)
-child=$(<"$PREVIEW_PID_FILE")
-child_state=$(command ps -o stat= -p "$child" 2>/dev/null || true)
-check test -z "${child_state//[ ZN+]/}"
-
-# Match the browser's nested-PTY invocation, preserving other owned PTYs.
-zmodload zsh/zpty
-zpty -b unrelated 'exec sleep 30'
-typeset -a nested_command=("$commands[zsh]" -dfc 'source "$1"; _omz_theme_preview status' zsh "$repo/tools/theme-preview.zsh")
-zpty -b browser exec "${(@q)nested_command}"
-output=''
-for attempt in {1..300}; do
-  if zpty -r browser chunk; then
-    output+=$chunk
-  elif ! zpty -t browser; then
-    break
-  else
-    sleep 0.01
-  fi
-done
-check test "${output#*success}" != "$output"
-check zpty -t unrelated
-zpty -d browser unrelated
-
-# Cancellation by the browser's outer process group must also clean the
-# backend's separate inner PTY group and private FIFO directory.
-rm -f "$PREVIEW_PID_FILE"
-nested_command=("$commands[zsh]" -dfc 'source "$1"; _omz_theme_preview slow' zsh "$repo/tools/theme-preview.zsh")
-zpty -b browser exec "${(@q)nested_command}"
-typeset browser_group record
-for record in "${(@f)$(zpty)}"; do
-  [[ $record == \(<->\)\ browser:* ]] && browser_group=${${record#\(}%%\)*}
-done
-check test -n "$browser_group"
-for attempt in {1..100}; do
-  [[ -s "$PREVIEW_PID_FILE" ]] && break
-  sleep 0.01
-done
-check test -s "$PREVIEW_PID_FILE"
-child=$(<"$PREVIEW_PID_FILE")
-kill -TERM -- -$browser_group
-for attempt in {1..100}; do
-  child_state=$(command ps -o stat= -p "$child" 2>/dev/null || true)
-  [[ -z "${child_state//[ ZN+]/}" ]] && break
-  sleep 0.01
-done
-check test -z "${child_state//[ ZN+]/}"
-zpty -d browser
-
-# Real themes exercise synchronous git, top-level locals, command substitution,
-# and hook-driven prompt construction against an isolated repository.
-export ZSH=$repo
-git -C "$scratch/work" init -q
-git -C "$scratch/work" symbolic-ref HEAD refs/heads/preview-branch
-output=$(zsh -dfc 'builtin cd "$1"; source tools/theme-preview.zsh; builtin cd "$2"; _omz_theme_preview robbyrussell' zsh "$repo" "$scratch/work")
-check test "${output#*preview-branch}" != "$output"
-for name in robbyrussell dieter agnoster bira nicoulaj half-life; do
-  output=$(builtin cd "$scratch/work"; _omz_theme_preview "$name" 7)
-  check test "${output#*Left prompt}" != "$output"
-  check test "${output#*Right prompt}" != "$output"
-  check test "${output#*preview-branch}" != "$output"
-  if [[ $name == dieter || $name == bira ]]; then
-    check test "${output#*7 }" != "$output"
-  fi
-done
-typeset -a leftovers=("$TMPDIR"/omz-preview.*(N))
-check test "$#leftovers" = 0
-print -r -- 'PASS: theme preview resolution, isolation, single-pass expansion, conditional loads, hook failures, status, sanitization, limits, cancellation, descendant cleanup, and six bundled themes'

tools/theme-browser.md

@@ -1,118 +0,0 @@
-# Theme Browser
-
-```zsh
-omz theme browse
-omz theme browse agn
-omz theme preview agnoster
-```
-
-The browser renders only the highlighted theme, in your invoking directory with real,
-synchronous Git information. Filtering is a case-insensitive literal substring match.
-Names are deduplicated; resolution follows normal Oh My Zsh precedence:
-`$ZSH_CUSTOM/<name>.zsh-theme`, `$ZSH_CUSTOM/themes/<name>.zsh-theme`, then
-`$ZSH/themes/<name>.zsh-theme`. Nested custom themes are supported. The `random`
-selector and names containing traversal components or control characters are excluded.
-
-## Controls
-
-| Key | Action |
-| --- | --- |
-| Up / Down, Ctrl-P / Ctrl-N | Previous / next theme |
-| Page Up / Page Down | Move one page |
-| Printable text | Filter names |
-| Backspace | Delete the last filter character |
-| Ctrl-U | Clear the filter |
-| Enter | Open selection actions |
-| Esc / Ctrl-C | Cancel without applying or saving |
-| `u` in selection actions | Use the theme for this session |
-| `s` in selection actions | Save as default and reload the shell |
-| `b` or Enter in selection actions | Return to browsing |
-
-Using a theme calls `omz theme use`: it does **not** remove hooks, widgets, or other
-state installed by your previous theme. Saving calls `omz theme set`, edits `.zshrc`,
-and reloads the shell. These actions happen only after leaving the browser and
-restoring terminal state. Names containing shell punctuation cannot be saved through
-the browser; configure those manually. No global aliases or keybindings are installed.
-
-## Preview Limits
-
-- Each preview runs in a fresh `zsh -df` worker, not your active shell. The worker
-  inherits the directory and exported environment, but not non-exported theme
-  settings, plugins, user `.zshrc`, or custom library overrides. System `zshenv`
-  still runs as required by zsh.
-- Previews initialize prompt helpers and precmd hooks. They show a successful
-  previous command (status 0). Tests also exercise nonzero status rendering.
-- Multiline left prompts are supported. Right prompts are deliberately labeled
-  and displayed separately, not positioned as ZLE would position them.
-- Interactive/async themes, plugin-dependent segments, terminal queries, and
-  widget-driven prompts may be incomplete or unsupported. Themes still require
-  their usual fonts for special glyphs; the browser itself requires no fonts.
-- Workers have a three-second execution limit and a 32,000-byte output limit.
-  Navigation cancels obsolete work. ANSI colors are retained; other terminal
-  controls are filtered. Long lines and tall previews are clipped in the browser.
-- The browser requires an interactive terminal with alternate-screen support and
-  at least 40 columns by 16 rows. Smaller windows show a resize message; Esc still
-  exits. `omz theme preview` also works without an interactive terminal.
-- This is **shell-state isolation, not a security sandbox**. Only preview trusted
-  themes: their code can write files, access the network, or deliberately detach
-  processes. The supervisor cleans up ordinary descendants, not escaped processes.
-
-No new third-party runtime is required. The implementation uses standard zsh modules
-(`zpty`, `system`, `datetime`, `zselect`, `terminfo`) and platform utilities including
-`stty`, `mktemp`, `mkfifo`, and `rm`. Git segments need Git as usual. Private temporary
-files are removed when previews finish or are cancelled. Full OMZ startup, update
-checks, and OMZ cache initialization are not invoked by workers. The old
-`tools/theme_chooser.sh` is unchanged.
-
-## Local Testing
-
-From this checkout, launch a disposable interactive shell without reading your `.zshrc`:
-
-```zsh
-env ZSH="$PWD" zsh -dfi
-```
-
-Inside it, load the CLI and try previews. Change directory to a Git repository to
-compare clean, dirty, and untracked-file states:
-
-```zsh
-source "$ZSH/lib/cli.zsh"
-omz theme preview robbyrussell
-omz theme preview agnoster
-omz theme preview half-life
-omz theme preview dieter
-omz theme browse
-```
-
-This minimal shell is intended for preview/navigation testing. For a real session-use
-test, load this checkout's full OMZ configuration in a disposable shell. Do not choose
-Save unless you intend to edit your actual `.zshrc`; automated browser tests stub both
-actions and never edit your configuration. Exit the disposable shell when finished.
-
-Regression suites run without additional test frameworks:
-
-```zsh
-zsh -df tools/tests/theme-preview.zsh
-zsh -df tools/tests/theme-browser.zsh
-```
-
-The tests cover resolution, prompt isolation, Git context, hook/status rendering,
-terminal-control filtering, failures, time/output limits, descendant cleanup,
-completion candidates, lazy loading, keyboard navigation, resizing, action dispatch,
-and terminal restoration using real PTYs. Human visual testing in your terminal and
-font is still required before proposing a PR. Linux/older-zsh testing remains pending.
-
-## Footprint And Startup
-
-Runtime code is roughly 18 KiB across the three `tools/theme-*.zsh` files, plus small
-CLI wrappers and completion/help entries. Tests and this guide are additional text
-files, not runtime dependencies. Measure the exact current footprint with:
-
-```zsh
-wc -c tools/theme-browser.zsh tools/theme-preview.zsh tools/theme-preview-worker.zsh
-```
-
-Normal shell startup only defines the CLI wrappers: none of the three tool files is
-sourced, no browser modules are loaded, and no workers or browser I/O are started.
-The regression suite verifies lazy loading. Startup timing should be considered
-noise-sensitive; this prototype does not claim a measurable speed improvement.

tools/theme-browser.zsh

@@ -1,170 +0,0 @@
-# Loaded only by `omz theme browse`. The UI runs in a subshell; stdout is a
-# two-line data handoff, while all terminal I/O goes through a private tty fd.
-function _omz_theme_browser() (
-  emulate -L zsh
-  setopt extendedglob
-  # Displayed names, filter text, and worker output are data, not prompt code.
-  unsetopt promptsubst
-  zmodload zsh/terminfo && zmodload zsh/zpty && zmodload zsh/system && zmodload zsh/datetime || return 1
-  local tty saved filter=$1 key suffix name previous='' preview='' chunk
-  local mode=browse action='' pty=omz-browser-$sysparams[pid] record pgid
-  local -a names matches lines size
-  local -i selected=1 page=1 height=0 width=0 rows=0 cols=0 active=0 dirty=1 i row cancelled=0
-  local -F render_after=0
-  [[ -n $terminfo[smcup] && -n $terminfo[rmcup] && -n $terminfo[cup] ]] || {
-    print -u2 -r -- 'Theme browser requires a terminal with alternate-screen support.'
-    return 1
-  }
-  exec {tty}<>/dev/tty || return 1
-  saved=$(command stty -g <&$tty) || return 1
-  names=("${(@f)$(_omz_theme_names)}")
-  names=("${(@)names:#}")
-  trap 'cancelled=1' INT TERM HUP
-  trap 'dirty=1' WINCH
-
-  function _omz_browser_stop {
-    if (( active )); then
-      [[ $pgid == <2-> ]] && kill -HUP -- -$pgid 2>/dev/null
-      # Let the preview supervisor clean up its nested worker group first.
-      local -i wait_count=0
-      while zpty -t "$pty" && (( wait_count++ < 100 )); do
-        zselect -t 1
-      done
-      zpty -d "$pty" 2>/dev/null
-      active=0
-    fi
-  }
-
-  function _omz_browser_line {
-    local text=${1//$'\t'/    } formatted='' MATCH MBEGIN MEND
-    text=${text//\%/%%}
-    # Tell prompt truncation that SGR has zero display width. All other terminal
-    # controls have already been removed by the preview backend.
-    while [[ $text =~ $'\e\\[[0-9;:]*m' ]]; do
-      formatted+=${text[1,$(( MBEGIN - 1 ))]}"%{"$MATCH"%}"
-      text=${text[$(( MEND + 1 )),-1]}
-    done
-    formatted+=$text
-    echoti cup $row 0 >&$tty
-    print -Pn -u $tty -- "%${width}<..<${formatted}%<<%f%k%b"
-    (( row++ ))
-  }
-
-  {
-    zmodload zsh/zselect || return 1
-    command stty -echo -icanon min 0 time 0 <&$tty || return 1
-    print -rn -u $tty -- "$terminfo[smcup]$terminfo[civis]"
-    while (( ! cancelled )); do
-      size=(${=$(command stty size <&$tty)})
-      rows=${size[1]:-24} cols=${size[2]:-80}
-      if (( height != rows || width != cols - 1 )); then
-        height=$rows width=$(( cols - 1 )) dirty=1
-      fi
-      matches=()
-      for name in "${names[@]}"; do
-        [[ ${(L)name} == *${(L)filter}* ]] && matches+=("$name")
-      done
-      (( selected > $#matches )) && selected=$#matches
-      (( selected < 1 )) && selected=1
-      name=${matches[$selected]}
-      if [[ $name != "$previous" ]]; then
-        _omz_browser_stop
-        previous=$name preview='' dirty=1
-        render_after=$(( EPOCHREALTIME + 0.12 ))
-      fi
-      # Coalesce typing and key repeats rather than starting a worker per key.
-      if (( ! active && EPOCHREALTIME >= render_after )); then
-        if [[ -n $name ]]; then
-          # zpty joins arguments as shell text; quote the literal theme name.
-          zpty -b "$pty" _omz_theme_preview "${(q)name}" || return 1
-          active=1
-          pgid=''
-          for record in "${(@f)$(zpty)}"; do
-            [[ $record == \(<->\)\ "$pty":* ]] && pgid=${${record#\(}%%\)*}
-          done
-        fi
-      fi
-      if (( active )); then
-        while zpty -r -t "$pty" chunk; do
-          preview+=${chunk//$'\r'/}
-          dirty=1
-        done
-      fi
-      page=$(( height > 24 ? 8 : 4 ))
-      if (( dirty )); then
-        print -rn -u $tty -- "$terminfo[clear]"
-        row=0
-        if (( width < 39 || height < 16 )); then
-          _omz_browser_line 'Resize to at least 40 columns x 16 rows.'
-          _omz_browser_line 'Esc / Ctrl-C: cancel'
-        else
-          _omz_browser_line 'Oh My Zsh theme browser | Esc / Ctrl-C: cancel'
-          _omz_browser_line "Filter: ${(V)filter}  ($#matches themes)"
-          if [[ $mode == actions ]]; then
-            _omz_browser_line '[u] Use in session  [s] Save + reload  [b] Back'
-            _omz_browser_line 'Use keeps old theme hooks. Save edits .zshrc + reloads.'
-          else
-            _omz_browser_line 'Arrows / Ctrl-P,N: move | PgUp,Dn | Enter: actions'
-            _omz_browser_line 'Type to filter | Backspace: delete | Ctrl-U: clear'
-          fi
-          for (( i = ((selected - 1) / page) * page + 1; i <= $#matches && row < page + 4; i++ )); do
-            if (( i == selected )); then
-              _omz_browser_line "> ${(V)matches[$i]}"
-            else
-              _omz_browser_line "  ${(V)matches[$i]}"
-            fi
-          done
-          _omz_browser_line '--- Static preview (right prompt shown separately) ---'
-          lines=("${(@f)preview}")
-          if [[ -z $preview ]]; then
-            [[ -n $name ]] && lines=('Rendering...') || lines=('No matching themes.')
-          fi
-          for chunk in "${lines[@]}"; do
-            (( row < height - 1 )) || break
-            _omz_browser_line "$chunk"
-          done
-        fi
-        dirty=0
-      fi
-      key=''
-      read -r -k 1 -t 0.1 -u $tty key || continue
-      if [[ $key == $'\e' ]]; then
-        suffix=''
-        while read -r -k 1 -t 0.03 -u $tty chunk; do
-          suffix+=$chunk
-          [[ $chunk == [A-Za-z~] || ${#suffix} -ge 8 ]] && break
-        done
-        [[ -n $suffix ]] || break
-        key=$'\e'$suffix
-      fi
-      [[ $key == $'\x03' ]] && break
-      if [[ $mode == actions ]]; then
-        case $key in
-          u) action=use; break ;;
-          s) action=set; break ;;
-          b|$'\r'|$'\n') mode=browse ;;
-        esac
-      else
-        case $key in
-          $'\e[A'|$'\eOA'|$'\x10') (( selected-- )) ;;
-          $'\e[B'|$'\eOB'|$'\x0e') (( selected++ )) ;;
-          $'\e[5~') (( selected -= page )) ;;
-          $'\e[6~') (( selected += page )) ;;
-          $'\x7f'|$'\b') filter=${filter[1,-2]}; selected=1 ;;
-          $'\x15') filter=''; selected=1 ;;
-          $'\r'|$'\n') [[ -n $name ]] && mode=actions ;;
-          [[:print:]]) filter+=$key; selected=1 ;;
-        esac
-      fi
-      dirty=1
-    done
-  } always {
-    _omz_browser_stop
-    print -rn -u $tty -- $'\e[0m'"$terminfo[cnorm]$terminfo[rmcup]"
-    command stty "$saved" <&$tty
-    exec {tty}>&-
-  }
-  (( cancelled )) && return 130
-  [[ -n $action ]] && print -rl -- "$action" "$name"
-  return 0
-)

tools/theme-preview-worker.zsh

@@ -1,88 +0,0 @@
-# Invoked only by theme-preview.zsh in a fresh zsh -df process. Themes and hooks
-# are intentionally sourced/run at top level (not inside a setup function).
-emulate -R zsh
-if [[ $1 == --supervise ]]; then
-  # This process is the private PTY's session leader. Keep the actual worker's
-  # standard descriptors non-TTY, and report its status outside theme state.
-  typeset -r _omz_preview_tmp=$2
-  shift 2
-  unsetopt monitor
-  command "$commands[zsh]" -df "${0:A}" "$@" \
-    < /dev/null > "$_omz_preview_tmp/output" 2>&1
-  print -r -- $? > "$_omz_preview_tmp/result"
-  exit
-fi
-typeset -r _omz_preview_root=$1 _omz_preview_theme=$2 _omz_preview_status=$3
-export ZSH=${ZSH:-$_omz_preview_root}
-ZSH_THEME=$4
-ZSH_CUSTOM=$5
-fpath=("$_omz_preview_root/functions" $fpath)
-autoload -Uz colors add-zsh-hook vcs_info
-colors
-setopt prompt_subst prompt_percent
-zstyle ':omz:alpha:lib:git' async-prompt no
-ZSH_THEME_GIT_PROMPT_PREFIX='git:('
-ZSH_THEME_GIT_PROMPT_SUFFIX=')'
-ZSH_THEME_GIT_PROMPT_DIRTY='*'
-ZSH_THEME_GIT_PROMPT_CLEAN=''
-ZSH_THEME_RUBY_PROMPT_PREFIX='('
-ZSH_THEME_RUBY_PROMPT_SUFFIX=')'
-source "$_omz_preview_root/lib/git.zsh"
-source "$_omz_preview_root/lib/vcs_info.zsh"
-source "$_omz_preview_root/lib/bzr.zsh"
-source "$_omz_preview_root/lib/nvm.zsh"
-source "$_omz_preview_root/lib/prompt_info_functions.zsh"
-source "$_omz_preview_root/lib/spectrum.zsh"
-# Check syntax before accepting a final false conditional as a successful load.
-# This subprocess shares the worker's execution deadline and process group.
-command "$commands[zsh]" -dfn "$_omz_preview_theme" || {
-  print -u2 -r -- 'theme preview: theme syntax check failed'
-  exit 1
-}
-# Keep zsh's PROMPT/PS1 and RPROMPT/RPS1 aliases intact (dieter sets RPS1).
-PROMPT=''
-RPROMPT=''
-source "$_omz_preview_theme"
-typeset -i _omz_preview_load_status=$?
-# Status 1 may just be a final conditional; require an initialized prompt below.
-# Higher statuses include syntax/runtime errors and missing commands.
-if (( _omz_preview_load_status > 1 )); then
-  print -u2 -r -- "theme preview: theme could not be loaded (exit $_omz_preview_load_status)"
-  exit 1
-fi
-
-function _omz_preview_set_status { return "$_omz_preview_status" }
-typeset -i _omz_preview_hook_status=0
-if (( $+functions[precmd] )); then
-  _omz_preview_set_status
-  precmd
-  _omz_preview_hook_status=$?
-  if (( _omz_preview_hook_status )); then
-    print -u2 -r -- "theme preview: precmd failed (exit $_omz_preview_hook_status); remaining hooks skipped"
-  fi
-fi
-for _omz_preview_hook in "${precmd_functions[@]}"; do
-  (( _omz_preview_hook_status )) && break
-  if (( $+functions[$_omz_preview_hook] )); then
-    _omz_preview_set_status
-    "$_omz_preview_hook"
-    _omz_preview_hook_status=$?
-    if (( _omz_preview_hook_status )); then
-      print -u2 -r -- "theme preview: precmd hook $_omz_preview_hook failed (exit $_omz_preview_hook_status); remaining hooks skipped"
-    fi
-  fi
-done
-if (( _omz_preview_load_status )) && [[ -z $PROMPT && -z $RPROMPT ]]; then
-  print -u2 -r -- "theme preview: theme did not initialize a prompt (load exit $_omz_preview_load_status)"
-  exit 1
-fi
-# Native prompt expansion handles PROMPT_SUBST once, followed by percent escapes.
-# An explicit (e) pass here would re-execute literal substitutions from helpers.
-print -r -- "Left prompt (status $_omz_preview_status):"
-_omz_preview_set_status
-print -Pr -- "${PROMPT-}"
-print -r -- 'Right prompt (shown separately):'
-_omz_preview_set_status
-print -Pr -- "${RPROMPT-}"
-(( _omz_preview_hook_status )) && exit 1
-exit 42

tools/theme-preview.zsh

@@ -1,217 +0,0 @@
-# Static previews execute theme code as the current user, not in a sandbox.
-# A private PTY supplies a process group without requiring shell job control.
-typeset -g _OMZ_THEME_PREVIEW_DIR=${${(%):-%x}:A:h}
-
-function _omz_theme_names() (
-  emulate -L zsh
-  setopt extendedglob
-  local root=${ZSH:-${_OMZ_THEME_PREVIEW_DIR:h}}
-  local custom=${ZSH_CUSTOM:-$root/custom} dir file name
-  local -a names files
-  for dir in "$custom" "$root/themes"; do
-    if [[ $dir == "$custom" ]]; then
-      files=("$dir"/**/*.zsh-theme(N-.))
-    else
-      files=("$dir"/*.zsh-theme(N-.))
-    fi
-    for file in "${files[@]}"; do
-      name=${${file#"$dir/"}%.zsh-theme}
-      [[ $dir == "$custom" ]] && name=${name#themes/}
-      [[ -n $name && $name != random && /$name/ != */(.|..)/* && $name != /* && $name != *[[:cntrl:]\\]* ]] || continue
-      names+=("$name")
-    done
-  done
-  (( $#names )) && print -rl -- ${(ou)names}
-  return 0
-)
-
-function _omz_theme_resolve() (
-  emulate -L zsh
-  setopt extendedglob
-  local name=$1 root=${ZSH:-${_OMZ_THEME_PREVIEW_DIR:h}}
-  local custom=${ZSH_CUSTOM:-$root/custom} dir
-  if (( $# != 1 )) || [[ -z $name || $name == random || /$name/ == */(.|..)/* || $name == /* || $name == *//* || $name == *[[:cntrl:]\\]* ]]; then
-    print -u2 -r -- 'theme preview: invalid or non-selectable theme name'
-    return 2
-  fi
-  for dir in "$custom" "$custom/themes" "$root/themes"; do
-    if [[ -f "$dir/$name.zsh-theme" ]]; then
-      print -r -- "${dir:A}/$name.zsh-theme"
-      return 0
-    fi
-  done
-  print -u2 -r -- 'theme preview: theme not found'
-  return 1
-)
-
-# One sample, with the requested exit status (0 by default). All execution and
-# state changes are confined to this subshell and the fresh -df worker.
-# For asynchronous callers, cancel the job group, not just zsh's waiting wrapper.
-function _omz_theme_preview() (
-  emulate -L zsh
-  local theme sample=${2:-0} backend=$_OMZ_THEME_PREVIEW_DIR
-  if (( $# < 1 || $# > 2 )) || [[ $sample != <0-255> ]]; then
-    print -u2 -r -- 'theme preview: usage: _omz_theme_preview name [status 0..255]'
-    return 2
-  fi
-  theme=$(_omz_theme_resolve "$1") || return $?
-  if ! zmodload zsh/zpty || ! zmodload zsh/system || ! zmodload zsh/datetime || ! zmodload zsh/zselect; then
-    print -u2 -r -- 'theme preview: required zsh modules unavailable (zpty, system, datetime, zselect)'
-    return 1
-  fi
-  local tmp fifo_fd pty=omz-preview-$sysparams[pid] record pgid raw='' chunk error=''
-  local selected=$1 custom=${ZSH_CUSTOM:-${ZSH:-$backend:h}/custom}
-  local -i active=0 cancelled=0 bytes=0 count remaining result=1
-  local -F deadline
-  trap 'cancelled=130' INT
-  trap 'cancelled=143' TERM
-  trap 'cancelled=129' HUP
-  {
-    tmp=$(command mktemp -d "${TMPDIR:-/tmp}/omz-preview.XXXXXXXX") || return 1
-    command mkfifo "$tmp/output" || return 1
-    sysopen -r -o nonblock,cloexec -u fifo_fd "$tmp/output" || return 1
-
-    # Exec immediately: a forked shell function could run inherited EXIT traps
-    # after returning. Both the launcher and theme worker must start fresh.
-    local -a launch=("$commands[zsh]" -df "$backend/theme-preview-worker.zsh" --supervise
-      "$tmp" "$backend:h" "$theme" "$sample" "$selected" "$custom")
-    deadline=$(( EPOCHREALTIME + 3 ))
-    if ! zpty -b "$pty" exec "${(@q)launch}"; then
-      print -u2 -r -- 'theme preview: could not allocate a private PTY'
-      return 1
-    fi
-    active=1
-    # The builtin listing supplies the session leader even before the child
-    # starts; this avoids a PID-handshake race during immediate cancellation.
-    for record in "${(@f)$(zpty)}"; do
-      if [[ $record == \(<->\)\ "$pty":* ]]; then
-        pgid=${${record#\(}%%\)*}
-        break
-      fi
-    done
-    if [[ $pgid != <2-> ]]; then
-      print -u2 -r -- 'theme preview: could not identify worker process group'
-      return 1
-    fi
-    while true; do
-      if (( cancelled )); then
-        error='cancelled'
-        break
-      fi
-      if (( EPOCHREALTIME >= deadline )); then
-        error='timed out after 3 seconds'
-        break
-      fi
-      remaining=$(( 32001 - bytes ))
-      if sysread -i "$fifo_fd" -s $(( remaining < 4096 ? remaining : 4096 )) -t 0.02 -c count chunk; then
-        raw+=$chunk
-        (( bytes += count ))
-        if (( bytes > 32000 )); then
-          error='output exceeded 32 KiB'
-          break
-        fi
-      elif [[ -s "$tmp/result" ]]; then
-        result=$(<"$tmp/result")
-        # The worker's dedicated completion status distinguishes a theme's
-        # early exit (including exit 0) from rendering both prompts.
-        [[ $result == 42 ]] || error="worker did not complete preview (exit $result)"
-        break
-      elif ! zpty -t "$pty"; then
-        error='worker supervisor exited before completing preview'
-        break
-      else
-        zselect -t 1
-      fi
-    done
-  } always {
-    # Clean up the whole group even on success. Deliberately detached processes
-    # are outside this boundary. Delete only our PTY, not any inherited ones.
-    if [[ $pgid == <2-> ]]; then
-      kill -TERM -- -$pgid 2>/dev/null
-      zselect -t 5
-      kill -KILL -- -$pgid 2>/dev/null
-    fi
-    (( active )) && zpty -d "$pty" 2>/dev/null
-    [[ -n $fifo_fd ]] && exec {fifo_fd}<&-
-    [[ -n $tmp ]] && command rm -rf -- "$tmp"
-  }
-
-  # Bound by bytes before splitting into locale-aware characters. No escape is
-  # emitted until it is a complete numeric SGR; all string controls are dropped,
-  # including their payloads and incomplete sequences at the output boundary.
-  unsetopt multibyte
-  raw=${raw[1,32000]}
-  setopt multibyte
-  local char safe='' state=text sgr=''
-  local -i code valid=1
-  for char in "${(@s::)raw}"; do
-    if (( cancelled )); then
-      error='cancelled'
-      break
-    fi
-    printf -v code '%d' "'$char" 2>/dev/null
-    case $state in
-      string|string-escape)
-        if [[ $char == $'\a' || $char == $'\xc2\x9c' || $char == $'\x9c' || ( $state == string-escape && $char == \\ ) ]]; then
-          state=text
-        elif [[ $char == $'\e' ]]; then
-          state=string-escape
-        else
-          state=string
-        fi
-        ;;
-      escape)
-        case $char in
-          '[') state=csi; sgr=''; valid=1 ;;
-          ']'|P|X|'^'|_) state=string ;;
-          $'\e') ;;
-          *)
-            if (( code >= 32 && code <= 47 )); then
-              state=intermediate
-            else
-              state=text
-            fi
-            ;;
-        esac
-        ;;
-      intermediate)
-        (( code >= 32 && code <= 47 )) || state=text
-        ;;
-      csi)
-        if [[ $char == [0-9\;:] ]]; then
-          sgr+=$char
-        elif (( code >= 64 && code <= 126 )); then
-          [[ $char == m && $valid == 1 ]] && safe+=$'\e['${sgr}m
-          state=text
-        elif [[ $char == $'\e' ]]; then
-          state=escape
-        else
-          valid=0
-        fi
-        ;;
-      text)
-        case $char in
-          $'\e') state=escape ;;
-          $'\xc2\x9b') state=csi; sgr=''; valid=1 ;;
-          # Drop raw 8-bit CSI instead of expanding it to two bytes. Filtering
-          # can then never enlarge the byte-bounded input buffer.
-          $'\x9b') state=csi; sgr=''; valid=0 ;;
-          $'\xc2\x90'|$'\xc2\x98'|$'\xc2\x9d'|$'\xc2\x9e'|$'\xc2\x9f'|$'\x90'|$'\x98'|$'\x9d'|$'\x9e'|$'\x9f') state=string ;;
-          $'\n'|$'\t') safe+=$char ;;
-          *)
-            # Reject format/directional controls even on libc implementations
-            # that classify them as printable. Keep private-use font glyphs.
-            if [[ $char == [[:print:]] ]] && ! (( code >= 0x200b && code <= 0x200f || code >= 0x2028 && code <= 0x202e || code >= 0x2060 && code <= 0x206f || code == 0xfeff )); then
-              safe+=$char
-            fi
-            ;;
-        esac
-        ;;
-    esac
-  done
-  (( cancelled )) && error='cancelled'
-  print -rn -- "$safe"$'\e[0m\n'
-  [[ -n $error ]] && print -u2 -r -- "theme preview: $error"
-  (( cancelled )) && return $cancelled
-  [[ -z $error ]]
-)

tools/upgrade.sh

@@ -271,18 +271,9 @@ if LANG= git pull --quiet --rebase $remote $branch; then
     printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $RAINBOW $RESET
     printf '\n'
     printf "${BLUE}%s${RESET}\n\n" "$message"
-    printf "${BLUE}${BOLD}%s %s %s %s${RESET}\n" \
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on X:" "$(fmt_link @ohmyzsh https://x.com/ohmyzsh)"
-      "Follow along on X" "($(fmt_link @ohmyzsh https://x.com/ohmyzsh))" \
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
-      "or Bluesky" "($(fmt_link @ohmyz.sh https://bsky.app/profile/ohmyz.sh))"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "CommitGoods Shop" https://commitgoods.com/collections/oh-my-zsh)"
-    printf "${BLUE}${BOLD}%s %s${RESET}\n" \
-      "Questions or ideas? Join the community on" \
-      "$(fmt_link Discord https://discord.gg/ohmyzsh)"
-    printf "${BLUE}${BOLD}%s %s,${RESET}\n" \
-      "Help support the project: sponsor us on" \
-      "$(fmt_link "Open Collective" https://opencollective.com/ohmyzsh)"
-    printf "${BLUE}${BOLD}%s %s${RESET}\n" \
-      "or grab stickers, shirts, and swag from" \
-      "$(fmt_link CommitGoods https://commitgoods.com/ohmyzsh)"
   elif [[ $verbose_mode == minimal ]]; then
     printf "${BLUE}%s${RESET}\n" "$message"
   fi