Fix plugin-manager integration script reliability

Co-authored-by: mcornella <1441704+mcornella@users.noreply.github.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@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
         with:
           egress-policy: audit
 

.github/workflows/dependencies/requirements.txt

@@ -1,6 +1,6 @@
 certifi==2026.7.22
-charset-normalizer==3.5.1
+charset-normalizer==3.5.0
-idna==3.19
+idna==3.18
 PyYAML==6.0.3
 requests==2.34.2
 semver==3.0.4

.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@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
         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@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
         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@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
         with:
           egress-policy: audit
 
@@ -41,3 +41,49 @@ jobs:
                       ./themes/*.zsh-theme; do
             zsh -n "$file" || return 1
           done
+
+      - name: Focused syntax check for bootstrap-adjacent touched files
+        if: github.event_name == 'pull_request'
+        run: |
+          mapfile -t touched < <(
+            git diff --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}" \
+            | grep -E '^(lib/bootstrap\.zsh|lib/tests/bootstrap.*\.zsh|oh-my-zsh\.sh|lib/(completion|compfix|functions|theme-and-appearance)\.zsh|plugins/.+/.+\.plugin\.zsh|themes/.+\.zsh-theme)$' \
+            || true
+          )
+
+          if [ "${#touched[@]}" -eq 0 ]; then
+            echo "No bootstrap-adjacent files touched"
+            exit 0
+          fi
+
+          for file in "${touched[@]}"; do
+            echo "Syntax checking $file"
+            zsh -n "$file"
+          done
+
+      - name: Run bootstrap unit test
+        if: github.event_name == 'pull_request'
+        run: zsh ./lib/tests/bootstrap.test.zsh
+
+      - name: Run inline bootstrap invariants smoke test
+        if: github.event_name == 'pull_request'
+        run: zsh ./lib/tests/bootstrap-inline-ci.test.zsh
+
+  plugin-manager-smoke:
+    name: Plugin manager smoke (${{ matrix.manager }}:${{ matrix.scenario }})
+    runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh' && github.event_name == 'pull_request'
+    strategy:
+      fail-fast: false
+      matrix:
+        manager: [antigen, zinit]
+        scenario: [positive, negative]
+    steps:
+      - name: Set up git repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Install zsh
+        run: sudo apt-get update; sudo apt-get install zsh
+
+      - name: Run plugin-manager bootstrap integration
+        run: zsh ./lib/tests/plugin-manager-bootstrap-integration.test.zsh "${{ matrix.manager }}" "${{ matrix.scenario }}"

.github/workflows/plugin-manager-nightly.yml

@@ -0,0 +1,37 @@
+name: Plugin manager integration (advisory)
+
+on:
+  schedule:
+    - cron: '0 6 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  plugin-manager-matrix:
+    name: ${{ matrix.manager }}:${{ matrix.scenario }}
+    runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh'
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        manager: [antigen, zinit, zgen, zplug, antibody, zulu]
+        scenario: [positive, negative]
+
+    steps:
+      - name: Set up git repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Install zsh and go
+        run: sudo apt-get update; sudo apt-get install zsh golang
+
+      - name: Run plugin-manager bootstrap integration
+        run: zsh ./lib/tests/plugin-manager-bootstrap-integration.test.zsh "${{ matrix.manager }}" "${{ matrix.scenario }}"
+
+      - name: Rollout note
+        if: always()
+        run: |
+          echo "Phase 2 active: full manager matrix is advisory/nightly."
+          echo "Phase 3 target: promote full matrix to required after stability window."

.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@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
         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@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
         with:
           egress-policy: audit
 
@@ -60,6 +60,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+        uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
         with:
           sarif_file: results.sarif

CONTRIBUTING.md

@@ -23,6 +23,7 @@ you would make is not already covered.
 - [A note on AI-assisted contributions](#a-note-on-ai-assisted-contributions)
 - [Use the Search, Luke](#use-the-search-luke)
 - [Commit Guidelines](#commit-guidelines)
+  - [Plugin And Theme Bootstrap Compatibility](#plugin-and-theme-bootstrap-compatibility)
   - [Format](#format)
   - [Style](#style)
 - [Volunteer](#volunteer)
@@ -176,6 +177,24 @@ specification. The automatic changelog tool uses these to automatically generate
 a changelog based on the commit messages. Here's a guide to writing a commit message
 to allow this:
 
+### Plugin And Theme Bootstrap Compatibility
+
+Oh My Zsh now provides a shared bootstrap entrypoint at `lib/bootstrap.zsh` for plugin-manager setups that don't
+source `oh-my-zsh.sh`.
+
+When working on plugins/themes:
+
+- assume bootstrap has already run in manager-driven setups
+- rely on bootstrap guarantees (`ZSH*` defaults, cache/completions setup, required `fpath` entries)
+- avoid adding per-plugin/per-theme copies of common setup unless truly plugin-specific
+
+Common patterns we should migrate away from over time:
+
+- repeated cache setup logic (`mkdir -p "$ZSH_CACHE_DIR/completions"`)
+- repeated base `fpath` bootstrapping for OMZ core/custom directories
+
+If your plugin/theme still needs custom initialization, keep it scoped to that plugin/theme behavior only.
+
 ### Format
 
 ```

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>
 
@@ -54,6 +46,7 @@ Twitter), and join us on [Discord](https://discord.gg/ohmyzsh).
     - [Manual Installation](#manual-installation)
   - [Installation Problems](#installation-problems)
   - [Custom Plugins And Themes](#custom-plugins-and-themes)
+  - [Using Plugin Managers Without `oh-my-zsh.sh`](#using-plugin-managers-without-oh-my-zshsh)
   - [Enable GNU ls In macOS And FreeBSD Systems](#enable-gnu-ls-in-macos-and-freebsd-systems)
   - [Skip Aliases](#skip-aliases)
   - [Async git prompt](#async-git-prompt)
@@ -357,6 +350,120 @@ If you have many functions that go well together, you can put them as a `XYZ.plu
 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/`.
 
+### Using Plugin Managers Without `oh-my-zsh.sh`
+
+Some plugin managers load individual OMZ plugins/themes directly and do not source `oh-my-zsh.sh`.
+For those setups, source this bootstrap entrypoint before loading any OMZ plugin or theme:
+
+```zsh
+source "$ZSH/lib/bootstrap.zsh"
+```
+
+#### Bootstrap compatibility contract
+
+`lib/bootstrap.zsh` is idempotent and is the only required pre-load step for plugin-manager setups.
+It guarantees:
+
+- `ZSH`, `ZSH_CUSTOM`, and `ZSH_CACHE_DIR` defaults
+- writable cache fallback to `${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh`
+- `$ZSH_CACHE_DIR/completions` directory creation
+- required OMZ `fpath` entries for plugins/themes:
+  - `$ZSH/functions`
+  - `$ZSH/completions`
+  - `$ZSH_CUSTOM/functions`
+  - `$ZSH_CUSTOM/completions`
+  - `$ZSH_CACHE_DIR/completions`
+- public signal: `OMZ_IS_BOOTSTRAPPED=true` (for one-time hook guards)
+
+What still requires `oh-my-zsh.sh`:
+
+- update checks
+- plugin auto-discovery from the `plugins=(...)` list
+- `compinit`/`compfix` orchestration and zcompdump metadata refresh
+- alias filtering via `:omz:*` zstyles during file sourcing
+- final full-init signal: `OMZ_IS_LOADED=true`
+
+#### Plugin manager hook guidance
+
+Run bootstrap once, before any OMZ plugin/theme load:
+
+```zsh
+[[ -n "${OMZ_IS_BOOTSTRAPPED:-}" ]] || source "$ZSH/lib/bootstrap.zsh"
+```
+
+- **Antigen** (pre-bundle hook pattern):
+
+  ```zsh
+  omz_preload() { [[ -n "${OMZ_IS_BOOTSTRAPPED:-}" ]] || source "$ZSH/lib/bootstrap.zsh"; }
+  omz_preload
+  antigen bundle OMZ::plugins/git
+  antigen apply
+  ```
+
+- **Zinit** (`atinit` pre-load hook):
+
+  ```zsh
+  zinit ice atinit'[[ -n "${OMZ_IS_BOOTSTRAPPED:-}" ]] || source "$ZSH/lib/bootstrap.zsh"'
+  zinit snippet OMZ::plugins/git/git.plugin.zsh
+  ```
+
+- **zgen** (pre-load hook function called before OMZ loads):
+
+  ```zsh
+  omz_preload() { [[ -n "${OMZ_IS_BOOTSTRAPPED:-}" ]] || source "$ZSH/lib/bootstrap.zsh"; }
+  omz_preload
+  zgen load ohmyzsh/ohmyzsh plugins/git
+  ```
+
+- **zplug** (run pre-load hook immediately before OMZ entries):
+
+  ```zsh
+  omz_preload() { [[ -n "${OMZ_IS_BOOTSTRAPPED:-}" ]] || source "$ZSH/lib/bootstrap.zsh"; }
+  omz_preload
+  zplug "plugins/git", from:oh-my-zsh
+  zplug load
+  ```
+
+- **antibody** (run pre-load hook before `antibody bundle`/`source` output):
+
+  ```zsh
+  omz_preload() { [[ -n "${OMZ_IS_BOOTSTRAPPED:-}" ]] || source "$ZSH/lib/bootstrap.zsh"; }
+  omz_preload
+  source <(antibody bundle <<'EOF'
+  ohmyzsh/ohmyzsh path:plugins/git
+  EOF
+  )
+  ```
+
+- **zulu** (run pre-load hook before OMZ module loads):
+
+  ```zsh
+  omz_preload() { [[ -n "${OMZ_IS_BOOTSTRAPPED:-}" ]] || source "$ZSH/lib/bootstrap.zsh"; }
+  omz_preload
+  zulu install oh-my-zsh
+  ```
+
+Compatibility matrix:
+
+| Load mode | `OMZ_IS_BOOTSTRAPPED` | `OMZ_IS_LOADED` | Suitable for |
+| :-- | :--: | :--: | :-- |
+| `source $ZSH/oh-my-zsh.sh` | ✅ | ✅ | Full OMZ framework features |
+| `source $ZSH/lib/bootstrap.zsh` + manager-loaded OMZ plugins/themes | ✅ | ❌ | Plugin/theme prerequisites only |
+
+#### Manager entrypoints and OMZ-side auto-injection limits
+
+Most plugin managers load OMZ by directly sourcing selected plugin/theme/lib entrypoints, not by sourcing
+`oh-my-zsh.sh`, so OMZ cannot universally inject bootstrap on its own.
+
+| Manager | Typical OMZ entrypoint(s) it loads | Can OMZ auto-inject bootstrap without user hook? |
+| :-- | :-- | :--: |
+| Antigen | `antigen bundle ...` targets after `antigen use oh-my-zsh` | ❌ |
+| Zinit | `OMZ::`, `OMZL::`, `OMZP::`, `OMZT::` snippets | ❌ |
+| zgen | `zgen oh-my-zsh ...` selected OMZ paths | ❌ |
+| zplug | `from:oh-my-zsh` selected OMZ entries | ❌ |
+| antibody | `ohmyzsh/ohmyzsh path:...` selected OMZ paths | ❌ |
+| zulu | OMZ package/module entries selected by zulu | ❌ |
+
 ### Enable GNU ls In macOS And FreeBSD Systems
 
 <a name="enable-gnu-ls"></a>

lib/bootstrap.zsh

@@ -0,0 +1,44 @@
+#
+# Shared Oh My Zsh bootstrap entrypoint.
+#
+# This file can be sourced by plugin managers that don't source `oh-my-zsh.sh`.
+# It is safe to source multiple times.
+#
+
+# Keep source path for callers that invoke omz_bootstrap again later.
+typeset -g _OMZ_BOOTSTRAP_SOURCE="${${(%):-%x}:a}"
+
+omz_bootstrap() {
+  # If ZSH is not defined, infer from this file location.
+  [[ -n "${ZSH:-}" ]] || export ZSH="${_OMZ_BOOTSTRAP_SOURCE:h:h}"
+
+  # Set ZSH_CUSTOM to the path where custom config files and plugins exist.
+  [[ -n "${ZSH_CUSTOM:-}" ]] || ZSH_CUSTOM="$ZSH/custom"
+
+  # Set cache directory.
+  [[ -n "${ZSH_CACHE_DIR:-}" ]] || ZSH_CACHE_DIR="$ZSH/cache"
+
+  # Ensure cache dir is writable, otherwise fallback to a HOME-based cache.
+  if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
+    ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh"
+  fi
+
+  # Create cache and completions dir.
+  command mkdir -p "$ZSH_CACHE_DIR/completions"
+
+  # Add required OMZ search paths.
+  local dir
+  for dir in \
+    "$ZSH/functions" \
+    "$ZSH/completions" \
+    "$ZSH_CUSTOM/functions" \
+    "$ZSH_CUSTOM/completions" \
+    "$ZSH_CACHE_DIR/completions"; do
+    (( ${fpath[(Ie)$dir]} )) || fpath=("$dir" $fpath)
+  done
+
+  # Public signal: OMZ bootstrap has completed.
+  typeset -g OMZ_IS_BOOTSTRAPPED=true
+}
+
+omz_bootstrap "$@"

lib/cli.zsh

@@ -519,7 +519,7 @@ function _omz::plugin::load {
     # Check if it has completion to reload compinit
     local -a comp_files
     comp_files=($base/_*(N))
-    (( has_completion )) || has_completion=$(( $#comp_files > 0 ))
+    has_completion=$(( $#comp_files > 0 ))
 
     # Load the plugin
     if [[ -f "$base/$plugin.plugin.zsh" ]]; then

lib/diagnostics.zsh

@@ -271,7 +271,7 @@ function _omz_diag_dump_check_core_commands() {
     unfunction unhash unlimit unset unsetopt vared wait whence where which zcompile
     zle zmodload zparseopts zregexparse zstyle )
   if is-at-least 5.1; then
-    reserved_words+=( declare export integer float local readonly typeset )
+    reserved_word+=( declare export integer float local readonly typeset )
   else
     builtins+=( declare export integer float local readonly typeset )
   fi

lib/git.zsh

@@ -39,27 +39,16 @@ function _omz_git_prompt_info() {
   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref//\%/%%}${upstream//\%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
-# Match an extended regular expression against a subject, forcing the C locale
-# only for the duration of the call.
-#
-# OHMYZSH-13330: zsh's "=~" operator delegates to the C library regex, which
-# aborts with REG_ILLSEQ when the subject contains an invalid byte sequence
-# under a multibyte locale (e.g. a filename with non-UTF-8 bytes in `git
-# status` output). Forcing the C locale makes every byte a valid character,
-# so the regex matching never fails that way. `git status --porcelain` is
-# locale-independent, so this does not change the parsed output.
-#
-# OHMYZSH-13985: the locale must be scoped to this function and not set for
-# the whole caller. Assigning LC_ALL makes zsh re-run setlocale() right away,
-# so leaving it set while the rest of the caller runs breaks multibyte
-# handling there — most visibly, `echo` refuses to expand Unicode escapes in
-# theme prompt symbols ("character not in range").
-function _omz_git_prompt_status_match() {
-  local -x LC_ALL=C
-  [[ "$1" =~ "$2" ]]
-}
-
 function _omz_git_prompt_status() {
+  # OHMYZSH-13330: avoid "regex matching error: illegal byte sequence".
+  # zsh's "=~" operator delegates to the C library regex, which aborts with
+  # REG_ILLSEQ when the subject contains an invalid byte sequence under a
+  # multibyte locale (e.g. a filename with non-UTF-8 bytes in `git status`
+  # output). Forcing the C locale makes every byte a valid character, so the
+  # regex matching below never fails that way. `git status --porcelain` is
+  # locale-independent, so this does not change the parsed output.
+  local -x LC_ALL=C
+
   [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
 
   # Maps a git status prefix to an internal constant
@@ -124,11 +113,11 @@ function _omz_git_prompt_status() {
   status_lines=("${(@f)${status_text}}")
 
   # If the tracking line exists, get and parse it
-  if _omz_git_prompt_status_match "$status_lines[1]" "^## [^ ]+ \[(.*)\]"; then
+  if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
     local branch_statuses
     branch_statuses=("${(@s/,/)match}")
     for branch_status in $branch_statuses; do
-      if ! _omz_git_prompt_status_match "$branch_status" "(behind|diverged|ahead) ([0-9]+)?"; then
+      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
         continue
       fi
       local last_parsed_status=$prefix_constant_map[$match[1]]
@@ -141,7 +130,7 @@ function _omz_git_prompt_status() {
     local status_constant="${prefix_constant_map[$status_prefix]}"
     local status_regex=$'(^|\n)'"$status_prefix"
 
-    if _omz_git_prompt_status_match "$status_text" "$status_regex"; then
+    if [[ "$status_text" =~ $status_regex ]]; then
       statuses_seen[$status_constant]=1
     fi
   done

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/spectrum.zsh

@@ -14,16 +14,10 @@ FX=(
   reverse   "%{%}" no-reverse   "%{%}"
 )
 
-# Build the tables with array operations instead of a 256-iteration loop
+for color in {000..255}; do
-() {
+  FG[$color]="%{[38;5;${color}m%}"
-  setopt localoptions noksharrays
+  BG[$color]="%{[48;5;${color}m%}"
-  local -a codes fg bg
+done
-  codes=({000..255})
-  fg=( "%{"$'\e'"[38;5;"${^codes}"m%}" )
-  bg=( "%{"$'\e'"[48;5;"${^codes}"m%}" )
-  FG=( ${codes:^fg} )
-  BG=( ${codes:^bg} )
-}
 
 # Show all 256 colors with color number
 function spectrum_ls() {

lib/termsupport.zsh

@@ -31,12 +31,7 @@ function title {
       else
         # Try to use terminfo to set the title if the feature is available
         if (( ${+terminfo[fsl]} && ${+terminfo[tsl]} )); then
-          # Emit the capabilities with echoti so terminfo does its own parameter
+          print -Pn "${terminfo[tsl]}$1${terminfo[fsl]}"
-          # substitution: some terminals (vt320) take a column argument, and
-          # running prompt expansion over the capability string mangles it.
-          echoti tsl 0
-          print -Pn "$1"
-          echoti fsl
         fi
       fi
       ;;

lib/tests/bootstrap-inline-ci.test.zsh

@@ -0,0 +1,35 @@
+#!/usr/bin/zsh -df
+
+set -eu
+
+bootstrap_file="${0:A:h:h}/bootstrap.zsh"
+
+assert() {
+  local condition="$1" message="$2"
+  if ! eval "$condition"; then
+    print -u2 "\e[31mError\e[0m: $message"
+    exit 1
+  fi
+}
+
+tmp==(:)
+mkdir -p "$tmp/ohmyzsh"/{functions,completions,cache} "$tmp/ohmyzsh/custom"/{functions,completions}
+
+export ZSH="$tmp/ohmyzsh"
+unset ZSH_CUSTOM ZSH_CACHE_DIR OMZ_IS_BOOTSTRAPPED
+fpath=()
+
+source "$bootstrap_file"
+
+assert '[[ "$OMZ_IS_BOOTSTRAPPED" == true ]]' "OMZ bootstrap signal should be true"
+assert '[[ -d "$ZSH_CACHE_DIR/completions" ]]' "cache completions directory should exist"
+assert '[[ "${fpath[(Ie)$ZSH/functions]}" -gt 0 ]]' "fpath should include OMZ functions"
+assert '[[ "${fpath[(Ie)$ZSH/completions]}" -gt 0 ]]' "fpath should include OMZ completions"
+assert '[[ "${fpath[(Ie)$ZSH_CUSTOM/functions]}" -gt 0 ]]' "fpath should include custom functions"
+assert '[[ "${fpath[(Ie)$ZSH_CUSTOM/completions]}" -gt 0 ]]' "fpath should include custom completions"
+assert '[[ "${fpath[(Ie)$ZSH_CACHE_DIR/completions]}" -gt 0 ]]' "fpath should include cache completions"
+
+touch "$ZSH_CACHE_DIR/completions/_bootstrap_ci_smoke"
+assert '[[ -f "$ZSH_CACHE_DIR/completions/_bootstrap_ci_smoke" ]]' "completion cache write should succeed"
+
+print -u2 "\e[32mSuccess\e[0m bootstrap inline invariants"

lib/tests/bootstrap.test.zsh

@@ -0,0 +1,88 @@
+#!/usr/bin/zsh -df
+
+set -u
+
+bootstrap_file="${0:A:h:h}/bootstrap.zsh"
+
+_assert() {
+  local condition="$1" message="$2"
+  if ! eval "$condition"; then
+    print -u2 "\e[31mError\e[0m: $message"
+    return 1
+  fi
+}
+
+test_bootstrap_sets_defaults_and_paths() {
+  local tmp==(:)
+  mkdir -p "$tmp/ohmyzsh"/{functions,completions,cache} "$tmp/ohmyzsh/custom"/{functions,completions}
+
+  (
+    set -e
+    export ZSH="$tmp/ohmyzsh"
+    unset ZSH_CUSTOM ZSH_CACHE_DIR OMZ_IS_BOOTSTRAPPED
+    fpath=()
+    source "$bootstrap_file"
+
+    _assert '[[ "$ZSH_CUSTOM" == "'"$tmp/ohmyzsh/custom"'" ]]' "ZSH_CUSTOM default should be set"
+    _assert '[[ "$ZSH_CACHE_DIR" == "'"$tmp/ohmyzsh/cache"'" ]]' "ZSH_CACHE_DIR default should be set"
+    _assert '[[ -d "'"$tmp/ohmyzsh/cache/completions"'" ]]' "completions dir should be created"
+    _assert '[[ "${fpath[(Ie)'"$tmp/ohmyzsh/functions"']}" -gt 0 ]]' "fpath should include OMZ functions dir"
+    _assert '[[ "${fpath[(Ie)'"$tmp/ohmyzsh/completions"']}" -gt 0 ]]' "fpath should include OMZ completions dir"
+    _assert '[[ "${fpath[(Ie)'"$tmp/ohmyzsh/custom/functions"']}" -gt 0 ]]' "fpath should include custom functions dir"
+    _assert '[[ "${fpath[(Ie)'"$tmp/ohmyzsh/custom/completions"']}" -gt 0 ]]' "fpath should include custom completions dir"
+    _assert '[[ "${fpath[(Ie)'"$tmp/ohmyzsh/cache/completions"']}" -gt 0 ]]' "fpath should include cache completions dir"
+    _assert '[[ "$OMZ_IS_BOOTSTRAPPED" == true ]]' "bootstrap signal should be set"
+  )
+}
+
+test_bootstrap_is_idempotent() {
+  local tmp==(:)
+  mkdir -p "$tmp/ohmyzsh"/{functions,completions,cache} "$tmp/ohmyzsh/custom"/{functions,completions}
+
+  (
+    set -e
+    export ZSH="$tmp/ohmyzsh"
+    unset ZSH_CUSTOM ZSH_CACHE_DIR OMZ_IS_BOOTSTRAPPED
+    fpath=()
+    source "$bootstrap_file"
+    source "$bootstrap_file"
+    omz_bootstrap
+
+    _assert '[[ ${#fpath} -eq ${#${(u)fpath}} ]]' "fpath entries should not duplicate after repeated bootstrap"
+    _assert '[[ "$OMZ_IS_BOOTSTRAPPED" == true ]]' "bootstrap signal should remain true"
+  )
+}
+
+test_bootstrap_uses_writable_cache_fallback() {
+  local tmp==(:)
+  mkdir -p "$tmp/ohmyzsh"/{functions,completions} "$tmp/ohmyzsh/custom"/{functions,completions}
+  mkdir -p "$tmp/no-write" "$tmp/xdg-cache"
+  chmod 0555 "$tmp/no-write"
+
+  (
+    set -e
+    export ZSH="$tmp/ohmyzsh"
+    export XDG_CACHE_HOME="$tmp/xdg-cache"
+    export ZSH_CACHE_DIR="$tmp/no-write"
+    unset ZSH_CUSTOM OMZ_IS_BOOTSTRAPPED
+    fpath=()
+    source "$bootstrap_file"
+
+    _assert '[[ "$ZSH_CACHE_DIR" == "'"$tmp/xdg-cache/oh-my-zsh"'" ]]' "cache dir should fallback when not writable"
+    _assert '[[ -d "'"$tmp/xdg-cache/oh-my-zsh/completions"'" ]]' "fallback completions dir should be created"
+    _assert '[[ "${fpath[(Ie)'"$tmp/xdg-cache/oh-my-zsh/completions"']}" -gt 0 ]]' "fpath should include fallback completions dir"
+  )
+}
+
+tests=(
+  test_bootstrap_sets_defaults_and_paths
+  test_bootstrap_is_idempotent
+  test_bootstrap_uses_writable_cache_fallback
+)
+
+for test_name in $tests; do
+  print -u2 "Test: $test_name"
+  "$test_name" || exit 1
+  print -u2 "\e[32mSuccess\e[0m"
+  print -u2 ""
+done

lib/tests/plugin-manager-bootstrap-integration.test.zsh

@@ -0,0 +1,104 @@
+#!/usr/bin/zsh -df
+
+set -euo pipefail
+
+if (( $# != 2 )); then
+  print -u2 "Usage: $0 <manager> <positive|negative>"
+  exit 1
+fi
+
+manager="$1"
+scenario="$2"
+
+if [[ "$scenario" != "positive" && "$scenario" != "negative" ]]; then
+  print -u2 "scenario must be 'positive' or 'negative'"
+  exit 1
+fi
+
+repo_root="${0:A:h:h:h}"
+tmp==(:)
+workspace="$tmp/workspace"
+home_dir="$tmp/home"
+cache_dir="$tmp/cache"
+zshrc="$tmp/.zshrc"
+
+mkdir -p "$workspace" "$home_dir" "$cache_dir"
+
+manager_install=''
+manager_source=''
+
+case "$manager" in
+  antigen)
+    manager_install='git clone https://github.com/zsh-users/antigen.git "$MANAGER_HOME/antigen" >/dev/null 2>&1'
+    manager_source='source "$MANAGER_HOME/antigen/antigen.zsh"'
+    ;;
+  zinit)
+    manager_install='git clone https://github.com/zdharma-continuum/zinit.git "$MANAGER_HOME/zinit" >/dev/null 2>&1'
+    manager_source='source "$MANAGER_HOME/zinit/zinit.zsh"'
+    ;;
+  zgen)
+    manager_install='git clone https://github.com/tarjoilija/zgen.git "$MANAGER_HOME/zgen" >/dev/null 2>&1'
+    manager_source='source "$MANAGER_HOME/zgen/zgen.zsh"'
+    ;;
+  zplug)
+    manager_install='git clone https://github.com/zplug/zplug "$MANAGER_HOME/zplug" >/dev/null 2>&1'
+    manager_source='export ZPLUG_HOME="$MANAGER_HOME/zplug"; source "$ZPLUG_HOME/init.zsh"'
+    ;;
+  antibody)
+    manager_install='command -v go >/dev/null 2>&1; export GOBIN="$MANAGER_HOME/bin"; mkdir -p "$GOBIN"; go install github.com/getantibody/antibody@latest >/dev/null 2>&1'
+    manager_source='"$MANAGER_HOME/bin/antibody" --version >/dev/null 2>&1'
+    ;;
+  zulu)
+    manager_install='git clone https://github.com/zulu-zsh/zulu.git "$MANAGER_HOME/zulu" >/dev/null 2>&1'
+    manager_source='source "$MANAGER_HOME/zulu/zulu.zsh"'
+    ;;
+  *)
+    print -u2 "Unsupported manager: $manager"
+    exit 1
+    ;;
+esac
+
+cat > "$zshrc" <<RC
+set -eo pipefail
+
+export HOME="$home_dir"
+export XDG_CACHE_HOME="$cache_dir"
+export OMZ_ROOT="$repo_root"
+export ZSH="\$OMZ_ROOT"
+export MANAGER_HOME="$workspace/$manager"
+mkdir -p "\$MANAGER_HOME"
+
+$manager_install
+$manager_source
+RC
+
+if [[ "$scenario" == "positive" ]]; then
+  cat >> "$zshrc" <<'RC'
+source "$OMZ_ROOT/lib/bootstrap.zsh"
+[[ "${OMZ_IS_BOOTSTRAPPED:-}" == true ]] || { print -u2 "bootstrap signal missing before OMZ load"; return 1; }
+RC
+else
+  cat >> "$zshrc" <<'RC'
+[[ -z "${OMZ_IS_BOOTSTRAPPED:-}" ]] || { print -u2 "bootstrap signal unexpectedly set without hook"; return 1; }
+source "$OMZ_ROOT/lib/bootstrap.zsh"
+RC
+fi
+
+cat >> "$zshrc" <<RC
+[[ "\${OMZ_IS_BOOTSTRAPPED:-}" == true ]] || { print -u2 "bootstrap signal not set before OMZ entrypoint sourcing"; return 1; }
+
+source "\$OMZ_ROOT/lib/functions.zsh"
+source "\$OMZ_ROOT/plugins/git/git.plugin.zsh"
+autoload -Uz compinit
+compinit -i -d "\$ZSH_CACHE_DIR/.zcompdump"
+
+source "\$OMZ_ROOT/themes/robbyrussell.zsh-theme"
+
+[[ -d "\$ZSH_CACHE_DIR/completions" ]] || { print -u2 "completions cache directory missing"; return 1; }
+
+touch "\$ZSH_CACHE_DIR/completions/_ci_${manager}_${scenario}" || { print -u2 "completion cache write failed"; return 1; }
+[[ -f "\$ZSH_CACHE_DIR/completions/_ci_${manager}_${scenario}" ]] || { print -u2 "completion cache file missing"; return 1; }
+RC
+
+zsh -df "$zshrc"
+print -u2 "\e[32mSuccess\e[0m $manager $scenario"

oh-my-zsh.sh

@@ -50,31 +50,14 @@ unset -f omz_f
 # If ZSH is not defined, use the current script's directory.
 [[ -n "$ZSH" ]] || export ZSH="${${(%):-%x}:a:h}"
 
-# Set ZSH_CUSTOM to the path where your custom config files
+# Shared, manager-agnostic bootstrap.
-# and plugins exists, or else we will use the default custom/
+source "$ZSH/lib/bootstrap.zsh"
-[[ -n "$ZSH_CUSTOM" ]] || ZSH_CUSTOM="$ZSH/custom"
-
-# Set ZSH_CACHE_DIR to the path where cache files should be created
-# or else we will use the default cache/
-[[ -n "$ZSH_CACHE_DIR" ]] || ZSH_CACHE_DIR="$ZSH/cache"
-
-# Make sure $ZSH_CACHE_DIR is writable, otherwise use a directory in $HOME
-if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
-  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh"
-fi
-
-# Create cache and completions dir and add to $fpath
-[[ -d "$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...
 source "$ZSH/tools/check_for_upgrade.sh"
 
 # Initializes Oh My Zsh
 
-# add a function path
-fpath=($ZSH/{functions,completions} $ZSH_CUSTOM/{functions,completions} $fpath)
-
 # Load all stock functions (from $fpath files) called below.
 autoload -U compaudit compinit zrecompile
 
@@ -114,17 +97,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 +117,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 +129,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
@@ -244,3 +217,6 @@ fi
 
 # set completion colors to be the same as `ls`, after theme has been loaded
 [[ -z "$LS_COLORS" ]] || zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
+
+# Public signal: full Oh My Zsh init script has completed.
+typeset -g OMZ_IS_LOADED=true

plugins/1password/1password.plugin.zsh

@@ -9,11 +9,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_op" ]]; then
   _comps[op]=_op
 fi
 
-zmodload -F zsh/files b:zf_mv
+op completion zsh >| "$ZSH_CACHE_DIR/completions/_op" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_op"
-  zf_mv -f -- =( op completion zsh ) "$TMPPREFIX"
-} &|
 
 # Load opswd function
 autoload -Uz opswd

plugins/arduino-cli/arduino-cli.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_arduino-cli" ]]; then
 fi
 
 # Generate and load arduino-cli completion
-zmodload -F zsh/files b:zf_mv
+arduino-cli completion zsh >! "$ZSH_CACHE_DIR/completions/_arduino-cli" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_arduino-cli"
-  zf_mv -f -- =( arduino-cli completion zsh ) "$TMPPREFIX"
-} &|

plugins/argocd/argocd.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_argocd" ]]; then
   _comps[argocd]=_argocd
 fi
 
-zmodload -F zsh/files b:zf_mv
+argocd completion zsh >| "$ZSH_CACHE_DIR/completions/_argocd" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_argocd"
-  zf_mv -f -- =( argocd completion zsh ) "$TMPPREFIX"
-} &|

plugins/asdf/asdf.plugin.zsh

@@ -12,8 +12,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_asdf" ]]; then
   autoload -Uz _asdf
   _comps[asdf]=_asdf
 fi
-zmodload -F zsh/files b:zf_mv
+asdf completion zsh >| "$ZSH_CACHE_DIR/completions/_asdf" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_asdf"
-  zf_mv -f -- =( asdf completion zsh ) "$TMPPREFIX"
-} &|

plugins/aws/aws.plugin.zsh

@@ -69,7 +69,7 @@ function asr() {
   local -a available_regions
   available_regions=($(aws_regions))
   if [[ -z "${available_regions[(r)$1]}" ]]; then
-    echo "${fg[red]}Available regions: \n$(aws_regions)${reset_color}" >&2
+    echo "${fg[red]}Available regions: \n$(aws_regions)"
     return 1
   fi
 
@@ -241,7 +241,7 @@ function aws_regions() {
 function aws_profiles() {
   aws --no-cli-pager configure list-profiles 2> /dev/null && return
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
-  command grep -Eo '^[[:space:]]*\[[[:space:]]*(profile[[:space:]]+)?[^][:space:]]+[[:space:]]*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | command sed -E 's/^[[:space:]]*\[[[:space:]]*(profile[[:space:]]+)?([^][:space:]]+)[[:space:]]*\]$/\2/'
+  grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([^[:space:]]+)\][[:space:]]*$/\2/g'
 }
 
 function _aws_regions() {

plugins/buf/buf.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_buf" ]]; then
 fi
 
 # Generate and load buf completion
-zmodload -F zsh/files b:zf_mv
+buf completion zsh >! "$ZSH_CACHE_DIR/completions/_buf" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_buf"
-  zf_mv -f -- =( buf completion zsh ) "$TMPPREFIX"
-} &|

plugins/bun/bun.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_bun" ]]; then
   _comps[bun]=_bun
 fi
 
-zmodload -F zsh/files b:zf_mv
+SHELL=zsh bun completions >| "$ZSH_CACHE_DIR/completions/_bun" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_bun"
-  zf_mv -f -- =( SHELL=zsh bun completions ) "$TMPPREFIX"
-} &|

plugins/charm/charm.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_charm" ]]; then
   _comps[charm]=_charm
 fi
 
-zmodload -F zsh/files b:zf_mv
+charm completion zsh >| "$ZSH_CACHE_DIR/completions/_charm" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_charm"
-  zf_mv -f -- =( charm completion zsh ) "$TMPPREFIX"
-} &|

plugins/chezmoi/chezmoi.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_chezmoi" ]]; then
   _comps[chezmoi]=_chezmoi
 fi
 
-zmodload -F zsh/files b:zf_mv
+chezmoi completion zsh >| "$ZSH_CACHE_DIR/completions/_chezmoi" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_chezmoi"
-  zf_mv -f -- =( chezmoi completion zsh ) "$TMPPREFIX"
-} &|

plugins/codex/codex.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_codex" ]]; then
   _comps[codex]=_codex
 fi
 
-zmodload -F zsh/files b:zf_mv
+codex completion zsh < /dev/null 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_codex" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_codex"
-  zf_mv -f -- =( codex completion zsh < /dev/null 2> /dev/null ) "$TMPPREFIX"
-} &|

plugins/common-aliases/README.md

@@ -99,21 +99,18 @@ $ find . -type f 2>/dev/null
 ## File extension aliases
 
 These are special aliases that are triggered when a file name is passed as the command. For example,
-if the pdf file extension is aliased to `open_command`, running `file.pdf` opens that file with
+if the pdf file extension is aliased to `acroread` (a popular Linux pdf reader), when running `file.pdf`
-whatever application your system uses for PDFs.
+that file will be open with `acroread`.
 
 ### Reading Docs
 
-These use `open_command`, which picks the right opener for your platform: `open` on macOS,
+| Alias | Command    | Description                        |
-`xdg-open` on Linux, `cygstart` on Cygwin.
+| ----- | ---------- | ---------------------------------- |
-
+| pdf   | `acroread` | Opens up a document using acroread |
-| Alias | Command        | Description                                     |
+| ps    | `gv`       | Opens up a .ps file using gv       |
-| ----- | -------------- | ----------------------------------------------- |
+| dvi   | `xdvi`     | Opens up a .dvi file using xdvi    |
-| pdf   | `open_command` | Opens up a .pdf file in your default viewer     |
+| chm   | `xchm`     | Opens up a .chm file using xchm    |
-| ps    | `open_command` | Opens up a .ps file in your default viewer      |
+| djvu  | `djview`   | Opens up a .djvu file using djview |
-| dvi   | `open_command` | Opens up a .dvi file in your default viewer     |
-| chm   | `open_command` | Opens up a .chm file in your default viewer     |
-| djvu  | `open_command` | Opens up a .djvu file in your default viewer    |
 
 ### Listing files inside a packed file
 

plugins/common-aliases/common-aliases.plugin.zsh

@@ -71,9 +71,12 @@ if is-at-least 4.2.0; then
   _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
   for ft in $_media_fts; do alias -s $ft=mplayer; done
 
-  # read documents with the platform's default application
+  #read documents
-  _doc_fts=(pdf ps dvi chm djvu)
+  alias -s pdf=acroread
-  for ft in $_doc_fts; do alias -s $ft=open_command; done
+  alias -s ps=gv
+  alias -s dvi=xdvi
+  alias -s chm=xchm
+  alias -s djvu=djview
 
   #list what's inside packed file
   alias -s zip="unzip -l"

plugins/deno/deno.plugin.zsh

@@ -25,8 +25,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
   _comps[deno]=_deno
 fi
 
-zmodload -F zsh/files b:zf_mv
+deno completions zsh >| "$ZSH_CACHE_DIR/completions/_deno" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_deno"
-  zf_mv -f -- =( deno completions zsh ) "$TMPPREFIX"
-} &|

plugins/docker-compose/README.md

@@ -17,7 +17,6 @@ plugins=(... docker-compose)
 |-----------|----------------------------------|----------------------------------------------------------------------------------|
 | dco       | `docker-compose`                 | Docker-compose main command                                                      |
 | dcb       | `docker-compose build`           | Build containers                                                                 |
-| dcc       | `docker-compose config`                 | Parse, resolve and render compose file in canonical format |
 | dce       | `docker-compose exec`            | Execute command inside a container                                               |
 | dcps      | `docker-compose ps`              | List containers                                                                  |
 | dcrestart | `docker-compose restart`         | Restart container                                                                |

plugins/docker-compose/docker-compose.plugin.zsh

@@ -6,7 +6,6 @@
 
 alias dco="$dccmd"
 alias dcb="$dccmd build"
-alias dcc="$dccmd config"
 alias dce="$dccmd exec"
 alias dcps="$dccmd ps"
 alias dcrestart="$dccmd restart"

plugins/docker/docker.plugin.zsh

@@ -56,19 +56,14 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_docker" ]]; then
   _comps[docker]=_docker
 fi
 
-zmodload -F zsh/files b:zf_mv
+{
-() {
-
-  local plugin_dir="$1"
-
   # `docker completion` is only available from 23.0.0 on
   # docker version returns `Docker version 24.0.2, build cb74dfcd85`
   # with `s:,:` remove the comma after the version, and select third word of it
   if zstyle -t ':omz:plugins:docker' legacy-completion || \
     ! is-at-least 23.0.0 ${${(s:,:z)"$(command docker --version)"}[3]}; then
-        command cp "${plugin_dir}/completions/_docker" "$ZSH_CACHE_DIR/completions/_docker"
+        command cp "${0:h}/completions/_docker" "$ZSH_CACHE_DIR/completions/_docker"
       else
-        local TMPPREFIX="$ZSH_CACHE_DIR/completions/_docker"
+        command docker completion zsh | tee "$ZSH_CACHE_DIR/completions/_docker" > /dev/null
-        zf_mv -f -- =( command docker completion zsh ) "$TMPPREFIX"
   fi
-} "${0:A:h}" &|
+} &|

plugins/doctl/doctl.plugin.zsh

@@ -14,8 +14,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_doctl" ]]; then
   _comps[doctl]=_doctl
 fi
 
-zmodload -F zsh/files b:zf_mv
+doctl completion zsh >| "$ZSH_CACHE_DIR/completions/_doctl" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_doctl"
-  zf_mv -f -- =( doctl completion zsh ) "$TMPPREFIX"
-} &|

plugins/emacs/emacsclient.sh

@@ -1,33 +1,14 @@
 #!/bin/sh
 
 emacsfun() {
-  local cmd frames arg tty
+  local cmd frames
 
   # Build the Emacs Lisp command to check for suitable frames
   # See https://www.gnu.org/software/emacs/manual/html_node/elisp/Frames.html#index-framep
-  for arg in "$@"; do
+  case "$*" in
-    case "$arg" in
+  *-t*|*--tty*|*-nw*) cmd="(memq 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are tty frames
-    -t|--tty|-nw) tty=1; break ;;
+  *) cmd="(delete 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are graphical terminals (x, w32, ns)
-    esac
+  esac
-  done
-
-  if [ -n "$tty" ]; then
-    cmd="(memq 't (mapcar 'framep (frame-list)))" # if != nil, there are tty frames
-  else
-    cmd="(delete 't (mapcar 'framep (frame-list)))" # if != nil, there are graphical terminals (x, w32, ns)
-  fi
-
-  # A tty frame needs the client to stay attached, so drop the --no-wait the
-  # `emacs` alias adds. Otherwise emacsclient returns at once and nothing opens.
-  if [ -n "$tty" ]; then
-    for arg do
-      shift
-      case "$arg" in
-      --no-wait) continue ;;
-      esac
-      set -- "$@" "$arg"
-    done
-  fi
 
   # Check if there are suitable frames
   frames="$(emacsclient -a '' -n -e "$cmd" 2>/dev/null |sed 's/.*\x07//g' )"

plugins/eza/eza.plugin.zsh

@@ -52,13 +52,8 @@ function _configure_eza() {
   if [[ $_val ]]; then
     _EZA_TAIL+=("--time-style='$_val'")
   fi
-  if zstyle -t ':omz:plugins:eza' 'hyperlink'; then
+  if zstyle -t ":omz:plugins:eza" "hyperlink"; then
-    # eza >= 0.23 needs an explicit WHEN value
+    _EZA_TAIL+=("--hyperlink")
-    if command eza --hyperlink=auto --version &>/dev/null; then
-      _EZA_TAIL+=("--hyperlink=auto")
-    else
-      _EZA_TAIL+=("--hyperlink")
-    fi
   fi
 }
 

plugins/flutter/flutter.plugin.zsh

@@ -30,8 +30,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_flutter" ]]; then
   _comps[flutter]=_flutter
 fi
 
-zmodload -F zsh/files b:zf_mv
+flutter zsh-completion < /dev/null >| "$ZSH_CACHE_DIR/completions/_flutter" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_flutter"
-  zf_mv -f -- =( flutter zsh-completion < /dev/null ) "$TMPPREFIX"
-} &|

plugins/fluxcd/fluxcd.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_flux" ]]; then
   _comps[flux]=_flux
 fi
 
-zmodload -F zsh/files b:zf_mv
+flux completion zsh >| "$ZSH_CACHE_DIR/completions/_flux" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_flux"
-  zf_mv -f -- =( flux completion zsh ) "$TMPPREFIX"
-} &|

plugins/fnm/fnm.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
   _comps[fnm]=_fnm
 fi
 
-zmodload -F zsh/files b:zf_mv
+fnm completions --shell=zsh >| "$ZSH_CACHE_DIR/completions/_fnm" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_fnm"
-  zf_mv -f -- =( fnm completions --shell=zsh ) "$TMPPREFIX"
-} &|
 
 if zstyle -t ':omz:plugins:fnm' autostart; then
   local -a fnm_env_cmd

plugins/gcx/README.md

@@ -1,18 +0,0 @@
-# Grafana CLI plugin
-
-This plugin adds completion for the [Grafana CLI (gcx)](https://github.com/grafana/gcx).
-
-To use it, add `gcx` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... gcx)
-```
-
-This plugin does not add any aliases.
-
-## 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/_gcx`.

plugins/gcx/gcx.plugin.zsh

@@ -1,18 +0,0 @@
-# Autocompletion for the Grafana CLI (gcx).
-if (( ! $+commands[gcx] )); then
-  return
-fi
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `gcx`. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_gcx" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _gcx
-  _comps[gcx]=_gcx
-fi
-
-zmodload -F zsh/files b:zf_mv
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_gcx"
-  zf_mv -f -- =( gcx completion zsh ) "$TMPPREFIX"
-} &|

plugins/gh/README.md

@@ -15,6 +15,9 @@ This plugin does not add any aliases.
 This plugin caches the completion script and is automatically updated when the
 plugin is loaded, which is usually when you start up a new terminal emulator.
 
-The completion script is stored at `$ZSH_CACHE_DIR/completions/_gh`. If an
+The cache is stored at:
-update fails, the plugin keeps the last successfully generated completion
+
-script.
+- `$ZSH/plugins/gh/_gh` completions script
+
+- `$ZSH_CACHE_DIR/gh_version` version of GitHub CLI, used to invalidate
+  the cache.

plugins/gh/gh.plugin.zsh

@@ -11,14 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
   _comps[gh]=_gh
 fi
 
-zmodload -F zsh/files b:zf_mv
+gh completion --shell zsh >| "$ZSH_CACHE_DIR/completions/_gh" &|
-() {
-  local completion_file="$ZSH_CACHE_DIR/completions/_gh"
-  local completion_tmp="${completion_file}.$$.${RANDOM}"
-
-  if gh completion --shell zsh >| "$completion_tmp" && [[ -s "$completion_tmp" ]]; then
-    zf_mv -f -- "$completion_tmp" "$completion_file"
-  fi
-
-  command rm -f -- "$completion_tmp"
-} &|

plugins/git/git.plugin.zsh

@@ -137,9 +137,8 @@ function gbda() {
 # Copied and modified from James Roeder (jmaroeder) under MIT License
 # https://github.com/jmaroeder/plugin-git/blob/216723ef4f9e8dde399661c39c80bdf73f4076c4/functions/gbda.fish
 function gbds() {
-  local default_branch
+  local default_branch=$(git_main_branch)
-  default_branch=$(git_main_branch) \
+  (( ! $? )) || default_branch=$(git_develop_branch)
-    || default_branch=$(git_develop_branch)
 
   git for-each-ref refs/heads/ "--format=%(refname:short)" | \
     while read branch; do

plugins/github/README.md

@@ -1,43 +1,45 @@
 # github plugin
 
-> [!WARNING]
+This plugin supports working with GitHub from the command line. It provides a few things:
-> This plugin is deprecated and will be removed in a future release. It supports
-> the legacy [`hub`](https://github.com/mislav/hub) CLI, not the current GitHub
-> CLI. For `gh` completion, use the [`gh` plugin](../gh) instead.
 
-The plugin provides compatibility for existing `hub` users by:
+* Sets up the `hub` wrapper and completions for the `git` command if you have [`hub`](https://github.com/github/hub) installed.
+* Completion for the [`github` Ruby gem](https://github.com/defunkt/github-gem).
+* Convenience functions for working with repos and URLs.
 
-- aliasing `git` to `hub` when `hub` is installed;
+### Functions
-- adding completion for `hub`; and
-- defining convenience functions for creating repositories.
 
-## Migrating to GitHub CLI
+* `empty_gh` - Creates a new empty repo (with a `README.md`) and pushes it to GitHub
+* `new_gh` - Initializes an existing directory as a repo and pushes it to GitHub
+* `exist_gh` - Takes an existing repo and pushes it to GitHub
 
-Install [GitHub CLI](https://cli.github.com/), replace `github` with `gh` in
+
-your plugin list, and restart your shell:
+## Installation
+
+[Hub](https://github.com/github/hub) needs to be installed if you want to use it. On OS X with Homebrew, this can be done with `brew install hub`. The `hub` completion definition needs to be added to your `$FPATH` before initializing OMZ.
+
+The [`github` Ruby gem](https://github.com/defunkt/github-gem) needs to be installed if you want to use it.
+
+### Configuration
+
+These settings affect `github`'s behavior.
+
+#### Environment variables
+
+* `$GITHUB_USER`
+* `$GITHUB_PASSWORD`
+
+#### Git configuration options
+
+* `github.user` - GitHub username for repo operations
+
+See `man hub` for more details.
+
+### Homebrew installation note
+
+If you have installed `hub` using Homebrew, its completions may not be on your `$FPATH` if you are using the system `zsh`. Homebrew installs `zsh` completion definitions to `/usr/local/share/zsh/site-functions`, which will be on `$FPATH` for the Homebrew-installed `zsh`, but not for the system `zsh`. If you want it to work with the system `zsh`, add this to your `~/.zshrc` before it sources `oh-my-zsh.sh`.
 
 ```zsh
-plugins=(... gh)
+if (( ! ${fpath[(I)/usr/local/share/zsh/site-functions]} )); then
+  FPATH=/usr/local/share/zsh/site-functions:$FPATH
+fi
 ```
-
-The `gh` plugin supplies completion for the installed GitHub CLI. It does not
-alias `git`, because `gh` is not a Git wrapper.
-
-The closest replacement for creating a GitHub repository from an existing
-local repository is:
-
-```zsh
-gh repo create --source=. --push
-```
-
-## Deprecated functions
-
-- `empty_gh` - creates a new repository with a `README.md` and pushes it to GitHub
-- `new_gh` - initializes an existing directory and pushes it to GitHub
-- `exist_gh` - pushes an existing Git repository to GitHub
-
-These functions remain available during the deprecation period and require
-`hub`. They will be removed with the plugin.
-
-If you continue using `hub`, see its documentation for authentication and
-configuration details.

plugins/github/github.plugin.zsh

@@ -1,6 +1,3 @@
-print -Pru2 -- '%F{yellow}[oh-my-zsh] The %Bgithub%b plugin is deprecated and will be removed in a future release.'
-print -Pru2 -- 'It supports the legacy %Bhub%b CLI. Use the %Bgh%b plugin for GitHub CLI completion.%f'
-
 # Set up hub wrapper for git, if it is available; https://github.com/github/hub
 if (( $+commands[hub] )); then
   alias git=hub
@@ -29,7 +26,7 @@ empty_gh() { # [NAME_OF_REPO]
 # This function will add all non-hidden files to git.
 new_gh() { # [DIRECTORY]
   emulate -L zsh
-  local repo="${1:-.}"
+  local repo="$1"
   cd "$repo" \
     || return
 
@@ -45,7 +42,7 @@ new_gh() { # [DIRECTORY]
     || return
   hub create \
     || return
-  git push -u origin HEAD \
+  git push -u origin master \
     || return
 }
 
@@ -55,19 +52,18 @@ new_gh() { # [DIRECTORY]
 # to your GitHub.
 exist_gh() { # [DIRECTORY]
   emulate -L zsh
-  local repo="${1:-.}"
+  local repo=$1
-  cd "$repo" \
+  cd "$repo"
-    || return
 
   hub create \
     || return
-  git push -u origin HEAD
+  git push -u origin master
 }
 
 # git.io "GitHub URL"
 #
 # Shorten GitHub url, example:
-#   https://github.com/nvogel/dotzsh    > https://git.io/8nU25w
+#   https://github.com/nvogel/dotzsh    >   https://git.io/8nU25w
 # source: https://github.com/nvogel/dotzsh
 # documentation: https://github.com/blog/985-git-io-github-url-shortener
 #
@@ -78,3 +74,4 @@ git.io() {
 }
 
 # End Functions #############################################################
+

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/hasura/hasura.plugin.zsh

@@ -9,9 +9,5 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_hasura" ]]; then
   source "$ZSH_CACHE_DIR/completions/_hasura"
 else
   source "$ZSH_CACHE_DIR/completions/_hasura"
-  zmodload -F zsh/files b:zf_mv
+  hasura completion zsh --file "$ZSH_CACHE_DIR/completions/_hasura" >/dev/null &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_hasura"
-    zf_mv -f -- =( hasura completion zsh ) "$TMPPREFIX"
-  } &|
 fi

plugins/hcloud/hcloud.plugin.zsh

@@ -13,11 +13,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_hcloud" ]]; then
   _comps[hcloud]=_hcloud
 fi
 
-zmodload -F zsh/files b:zf_mv
+hcloud completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_hcloud" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_hcloud"
-  zf_mv -f -- =( hcloud completion zsh 2> /dev/null ) "$TMPPREFIX"
-} &|
 
 # Main alias
 alias hc='hcloud'

plugins/helm/helm.plugin.zsh

@@ -9,11 +9,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
   source "$ZSH_CACHE_DIR/completions/_helm"
 else
   source "$ZSH_CACHE_DIR/completions/_helm"
-  zmodload -F zsh/files b:zf_mv
+  helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_helm"
-    zf_mv -f -- =( helm completion zsh ) "$TMPPREFIX"
-  } &|
 fi
 
 alias h='helm'

plugins/herdr/README.md

@@ -1,163 +0,0 @@
-# herdr plugin
-
-This plugin adds completion, aliases, an interactive session picker and a prompt
-function for [herdr](https://herdr.dev), the runtime your
-coding agents live on. herdr keeps agent terminals running in the background across
-projects and machines, so you can close your terminal, reconnect later, and pick up
-where the agents left off.
-
-To use it, add `herdr` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... herdr)
-```
-
-Install herdr first if you have not already:
-
-```sh
-curl -fsSL https://herdr.dev/install.sh | sh   # or: brew install herdr
-```
-
-## Learning herdr from the terminal
-
-The fastest way to explore herdr is tab completion. Every command group and flag shows a
-short description, so you can discover what is available without leaving the shell:
-
-```
-$ herdr <TAB>
-agent         -- Control and inspect agent panes
-session       -- Manage named persistent sessions
-workspace     -- Manage workspaces over the socket API
-worktree      -- Manage Git worktree-backed workspaces
-...
-$ herdr agent <TAB>
-list          -- List agents
-prompt        -- Submit a prompt to an agent
-start         -- Start a supported interactive agent in an existing pane
-wait          -- Wait until an agent reaches one of the requested states
-...
-```
-
-A few other ways to learn as you go:
-
-- `herdr <group>` with no subcommand prints that group's help, for example `herdr pane`.
-- `herdr --skill` prints the instructions herdr gives to agents that drive it. It is a
-  good tour of the full command surface.
-- Most control commands return JSON, so you can pipe them into `jq` in scripts.
-
-## Common workflows
-
-### Start and reconnect
-
-```sh
-herdr                          # launch, or attach to the default session
-herdr --session work           # use or create a named session
-herdr session list             # see running and stopped sessions
-herdr session attach work      # reconnect to a named session
-herdr status                   # check the local client and running server
-herdr update                   # install the latest release
-```
-
-### Organize work into workspaces and tabs
-
-```sh
-herdr workspace list
-herdr workspace create --cwd ~/projects/app
-herdr tab create
-herdr pane split --direction right
-herdr worktree create --branch feature/login   # open a Git worktree in its own workspace
-```
-
-### Run and watch agents
-
-```sh
-herdr agent list                               # what is running, and is it idle, working or blocked
-herdr agent start reviewer --kind claude --pane w1:p2
-herdr agent prompt reviewer "review the last commit" --wait
-herdr agent read reviewer                      # read the agent's terminal output
-herdr agent wait reviewer --until idle
-herdr agent attach reviewer                    # jump straight into that terminal
-```
-
-### Work across machines
-
-```sh
-herdr --remote user@build-box                  # attach through SSH with your local keybindings
-```
-
-### Keep the server healthy
-
-```sh
-herdr config check                             # validate config.toml
-herdr server reload-config                     # apply config changes without restarting panes
-herdr server stop
-herdr channel set preview                      # switch between stable and preview releases
-herdr integration status                       # which agent CLIs have herdr hooks installed
-```
-
-See the [CLI reference](https://herdr.dev/docs/cli-reference/) for every command and flag.
-
-## Aliases
-
-| Alias   | Command                       |
-| ------- | ----------------------------- |
-| `hrdr`   | `herdr`                       |
-| `hrdrst` | `herdr status`                |
-| `hrdrup` | `herdr update`                |
-| `hrdrsl` | `herdr session list`          |
-| `hrdrsa` | `herdr session attach`        |
-| `hrdrr`  | `herdr --remote`              |
-| `hrdral` | `herdr agent list`            |
-| `hrdrwl` | `herdr workspace list`        |
-| `hrdrwc` | `herdr workspace create`      |
-| `hrdrwt` | `herdr worktree create`       |
-| `hrdrps` | `herdr pane split`            |
-| `hrdrrc` | `herdr server reload-config`  |
-
-Tab completion works through the aliases too, so `hrdr agent <TAB>` completes the same
-way `herdr agent <TAB>` does.
-
-## Session picker
-
-`hrdrs` lists your herdr sessions and attaches to the one you pick. It uses
-[fzf](https://github.com/junegunn/fzf) when it is installed and falls back to a numbered
-menu otherwise, so it works everywhere.
-
-```
-$ hrdrs
-name                 status   directory
-1) default              running  /Users/me/.config/herdr
-2) work                 stopped  /Users/me/projects/app
-Attach to session: 2
-```
-
-## Prompt
-
-This plugin provides the `herdr_prompt_info` function to show the current pane ID in
-your prompt when the shell is running inside herdr. It reads environment variables only,
-so it adds no cost to prompt rendering.
-
-For example:
-```
-PROMPT="%~$ "
-RPROMPT='$(herdr_prompt_info)'
-```
-changes your prompt inside a herdr pane to:
-```
-~/projects/app$ ▋                                                    w1:p4
-```
-and shows nothing outside herdr.
-
-Wrap it with `ZSH_THEME_HERDR_PROMPT_PREFIX` and `ZSH_THEME_HERDR_PROMPT_SUFFIX`, for
-example:
-```
-ZSH_THEME_HERDR_PROMPT_PREFIX="%{$fg[cyan]%}[herdr "
-ZSH_THEME_HERDR_PROMPT_SUFFIX="]%{$reset_color%}"
-```
-
-## 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/_herdr`.

plugins/herdr/herdr.plugin.zsh

@@ -1,68 +0,0 @@
-# Aliases, helpers and completion for herdr (https://herdr.dev), the runtime for coding agents.
-
-# PROMPT
-# Defined before the herdr check so themes can reference it on machines without herdr.
-function herdr_prompt_info {
-  [[ "$HERDR_ENV" == 1 ]] || return
-  echo "${ZSH_THEME_HERDR_PROMPT_PREFIX}${HERDR_PANE_ID:gs/%/%%}${ZSH_THEME_HERDR_PROMPT_SUFFIX}"
-}
-
-if (( ! $+commands[herdr] )); then
-  return
-fi
-
-# ALIASES
-alias hrdr='herdr'
-alias hrdrst='herdr status'
-alias hrdrup='herdr update'
-alias hrdrsl='herdr session list'
-alias hrdrsa='herdr session attach'
-alias hrdrr='herdr --remote'
-alias hrdral='herdr agent list'
-alias hrdrwl='herdr workspace list'
-alias hrdrwc='herdr workspace create'
-alias hrdrwt='herdr worktree create'
-alias hrdrps='herdr pane split'
-alias hrdrrc='herdr server reload-config'
-
-# FUNCTIONS
-# Pick a session and attach to it, with fzf if available or a numbered menu otherwise.
-function hrdrs {
-  setopt localoptions extendedglob
-  local -a lines
-  lines=("${(@f)$(herdr session list 2>/dev/null)}")
-  lines=("${(@)lines%%[[:space:]]#[^[:space:]]#}")  # drop the socket column
-  if (( $#lines < 2 )); then
-    print "hrdrs: no herdr sessions found" >&2
-    return 1
-  fi
-
-  local choice
-  if (( $+commands[fzf] )); then
-    choice=$(print -l -- "${lines[@]}" | fzf --header-lines=1 --prompt='herdr session> ') || return
-  else
-    print -- "${lines[1]}"
-    local PS3="Attach to session: "
-    select choice in "${lines[@]:1}"; do
-      [[ -n "$choice" ]] && break
-    done
-  fi
-  [[ -n "$choice" ]] || return 1
-
-  herdr session attach "${${(z)choice}[1]}"
-}
-
-# COMPLETION
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `herdr`. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_herdr" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _herdr
-  _comps[herdr]=_herdr
-fi
-
-zmodload -F zsh/files b:zf_mv
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_herdr"
-  zf_mv -f -- =( herdr completion zsh < /dev/null 2> /dev/null ) "$TMPPREFIX"
-} &|

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 -o "trunk()"`      |
+| 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
 
@@ -120,10 +101,10 @@ that.
 
 ### Git async-prompt compatibility
 
-If you use a wrapper function that calls `git_prompt_info` (as shown above), it won't work with the default
+If you use a wrapper function that calls `git_prompt_info` (as shown above), it won't work with
-git async-prompt mode. This is because async-prompt only registers its background worker when it detects
+the default git async-prompt mode. This is because async-prompt only registers its background worker
-`$(git_prompt_info)` literally in your prompt variables. A wrapper like `$(_my_theme_vcs_info)` won't match,
+when it detects `$(git_prompt_info)` literally in your prompt variables. A wrapper like
-so the async output stays empty.
+`$(_my_theme_vcs_info)` won't match, so the async output stays empty.
 
 To fix this, add one of the following to your `.zshrc` **before** Oh My Zsh is sourced:
 

plugins/jj/jj.plugin.zsh

@@ -11,11 +11,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_jj" ]]; then
   _comps[jj]=_jj
 fi
 
-zmodload -F zsh/files b:zf_mv
+COMPLETE=zsh jj >| "$ZSH_CACHE_DIR/completions/_jj" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_jj"
-  zf_mv -f -- =( COMPLETE=zsh jj ) "$TMPPREFIX"
-} &|
 
 function __jj_prompt_jj() {
   local -a flags
@@ -45,51 +41,35 @@ 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 -o "trunk()"'
+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/k9s/k9s.plugin.zsh

@@ -11,8 +11,4 @@ fi
 
 # and then generate it in the background. On first completion,
 # the actual completion file will be loaded.
-zmodload -F zsh/files b:zf_mv
+k9s completion zsh >| "$ZSH_CACHE_DIR/completions/_k9s" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_k9s"
-  zf_mv -f -- =( k9s completion zsh ) "$TMPPREFIX"
-} &|

plugins/kind/kind.plugin.zsh

@@ -11,11 +11,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_kind" ]]; then
 fi
 
 # Generate and load kind completion
-zmodload -F zsh/files b:zf_mv
+kind completion zsh >! "$ZSH_CACHE_DIR/completions/_kind" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_kind"
-  zf_mv -f -- =( kind completion zsh ) "$TMPPREFIX"
-} &|
 
 # Register aliases
 alias kicc="kind create cluster"

plugins/kubectl/README.md

@@ -23,7 +23,6 @@ plugins=(... kubectl)
 | kcsc     | `kubectl config set-context`                            | Set a context entry in kubeconfig                                                                |
 | kcdc     | `kubectl config delete-context`                         | Delete the specified context from the kubeconfig                                                 |
 | kccc     | `kubectl config current-context`                        | Display the current-context                                                                      |
-| kcrc     | `kubectl config rename-context`                         | Rename a context from the kubeconfig file                                                        |
 | kcgc     | `kubectl config get-contexts`                           | List of contexts available                                                                       |
 |          |                                                         | **General aliases**                                                                              |
 | kdel     | `kubectl delete`                                        | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
@@ -72,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**                                                                        |
@@ -131,7 +129,7 @@ plugins=(... kubectl)
 | kdss     | `kubectl describe statefulset`                          | Describe statefulset resource in detail                                                          |
 | kdelss   | `kubectl delete statefulset`                            | Delete the statefulset                                                                           |
 | ksss     | `kubectl scale statefulset`                             | Scale a statefulset                                                                              |
-| krsss    | `kubectl rollout status statefulset`                    | Check the rollout status of a statefulset                                                        |
+| krsss    | `kubectl rollout status statefulset`                    | Check the rollout status of a deployment                                                         |
 | krrss    | `kubectl rollout restart statefulset`                   | Rollout restart a statefulset                                                                    |
 |          |                                                         | **Service Accounts management**                                                                  |
 | kdsa     | `kubectl describe sa`                                   | Describe a service account in details                                                            |

plugins/kubectl/kubectl.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
   _comps[kubectl]=_kubectl
 fi
 
-zmodload -F zsh/files b:zf_mv
+kubectl completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_kubectl" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_kubectl"
-  zf_mv -f -- =( kubectl completion zsh 2> /dev/null ) "$TMPPREFIX"
-} &|
 
 # This command is used a LOT both below and in daily life
 alias k=kubectl
@@ -36,7 +32,6 @@ alias kcuc='kubectl config use-context'
 alias kcsc='kubectl config set-context'
 alias kcdc='kubectl config delete-context'
 alias kccc='kubectl config current-context'
-alias kcrc='kubectl config rename-context'
 
 # List all contexts
 alias kcgc='kubectl config get-contexts'
@@ -94,7 +89,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

@@ -42,8 +42,6 @@ plugins=(... laravel)
 | `pamen` | `php artisan make:enum` |
 | `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

@@ -31,8 +31,6 @@ alias pamcl='php artisan make:class'
 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/minikube/minikube.plugin.zsh

@@ -10,8 +10,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_minikube" ]]; then
   _comps[minikube]=_minikube
 fi
 
-zmodload -F zsh/files b:zf_mv
+minikube completion zsh >| "$ZSH_CACHE_DIR/completions/_minikube" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_minikube"
-  zf_mv -f -- =( minikube completion zsh ) "$TMPPREFIX"
-} &|

plugins/mise/mise.plugin.zsh

@@ -1,14 +1,9 @@
-if (( $+commands[mise] )); then
+if (( ! $+commands[mise] )); then
-  _mise_bin=mise
-elif [[ -x ~/.local/bin/mise ]]; then
-  _mise_bin=~/.local/bin/mise
-else
   return
 fi
 
 # Load mise hooks
-eval "$($_mise_bin activate zsh)"
+eval "$(mise activate zsh)"
-unset _mise_bin
 
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `mise`. Otherwise, compinit will have already done that.
@@ -19,8 +14,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_mise" ]]; then
 fi
 
 # Generate and load mise completion
-zmodload -F zsh/files b:zf_mv
+mise completion zsh >| "$ZSH_CACHE_DIR/completions/_mise" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_mise"
-  zf_mv -f -- =( mise completion zsh ) "$TMPPREFIX"
-} &|

plugins/molecule/molecule.plugin.zsh

@@ -11,11 +11,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_molecule" ]]; then
   _comps[molecule]=_molecule
 fi
 
-zmodload -F zsh/files b:zf_mv
+_MOLECULE_COMPLETE=zsh_source molecule >| "$ZSH_CACHE_DIR/completions/_molecule" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_molecule"
-  zf_mv -f -- =( _MOLECULE_COMPLETE=zsh_source molecule ) "$TMPPREFIX"
-} &|
 
 # Alias
 # molecule: https://docs.ansible.com/projects/molecule/

plugins/mongo-atlas/mongo-atlas.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_atlas" ]]; then
   _comps[atlas]=_atlas
 fi
 
-zmodload -F zsh/files b:zf_mv
+atlas completion zsh >| "$ZSH_CACHE_DIR/completions/atlas" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_atlas"
-  zf_mv -f -- =( atlas completion zsh ) "$TMPPREFIX"
-} &|

plugins/nats/nats.plugin.zsh

@@ -7,11 +7,7 @@ if (( $+commands[nsc] )); then
     _comps[nsc]=_nsc
   fi
 
-  zmodload -F zsh/files b:zf_mv
+  nsc completion zsh >| "$ZSH_CACHE_DIR/completions/_nsc" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_nsc"
-    zf_mv -f -- =( nsc completion zsh ) "$TMPPREFIX"
-  } &|
 fi
 
 if (( $+commands[nats] )); then
@@ -23,9 +19,5 @@ if (( $+commands[nats] )); then
     _comps[nats]=_nats
   fi
 
-  zmodload -F zsh/files b:zf_mv
+  nats --completion-script-zsh >| "$ZSH_CACHE_DIR/completions/_nats" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_nats"
-    zf_mv -f -- =( nats --completion-script-zsh ) "$TMPPREFIX"
-  } &|
 fi

plugins/ngrok/ngrok.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_ngrok" ]]; then
   _comps[ngrok]=_ngrok
 fi
 
-zmodload -F zsh/files b:zf_mv
+ngrok completion zsh >| "$ZSH_CACHE_DIR/completions/_ngrok" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_ngrok"
-  zf_mv -f -- =( ngrok completion zsh ) "$TMPPREFIX"
-} &|

plugins/pass-cli/pass-cli.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_pass-cli" ]]; then
   _comps[pass-cli]=_pass-cli
 fi
 
-zmodload -F zsh/files b:zf_mv
+pass-cli completions zsh >| "$ZSH_CACHE_DIR/completions/_pass-cli" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_pass-cli"
-  zf_mv -f -- =( pass-cli completions zsh ) "$TMPPREFIX"
-} &|

plugins/pipenv/pipenv.plugin.zsh

@@ -43,11 +43,7 @@ else
     _comps[pipenv]=_pipenv
   fi
 
-  zmodload -F zsh/files b:zf_mv
+  _PIPENV_COMPLETE=zsh_source pipenv >| "$ZSH_CACHE_DIR/completions/_pipenv" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_pipenv"
-    zf_mv -f -- =( _PIPENV_COMPLETE=zsh_source pipenv ) "$TMPPREFIX"
-  } &|
 fi
 
 if zstyle -T ':omz:plugins:pipenv' auto-shell; then
@@ -56,26 +52,19 @@ if zstyle -T ':omz:plugins:pipenv' auto-shell; then
     # deactivate shell if Pipfile doesn't exist and not in a subdir
     if [[ ! -f "$PWD/Pipfile" ]]; then
       if [[ "$PIPENV_ACTIVE" == 1 ]]; then
-        # Compare whole path components: `$pipfile_dir"*` also matches unrelated
+        if [[ "$PWD" != "$pipfile_dir"* ]]; then
-        # siblings that merely start with the same text (…/proj -> …/proj-docs),
-        # which would keep the virtualenv active outside the project.
-        local project_dir="${pipfile_dir%/}"
-        if [[ "$PWD" != "$project_dir" && "$PWD" != "$project_dir"/* ]]; then
           unset PIPENV_ACTIVE pipfile_dir
           deactivate
         fi
       fi
     fi
 
-    # activate the shell if Pipfile exists and its virtualenv is usable
+    # activate the shell if Pipfile exists
     if [[ "$PIPENV_ACTIVE" != 1 ]]; then
       if [[ -f "$PWD/Pipfile" ]]; then
-        local venv_path
+        export pipfile_dir="$PWD"
-        if venv_path="$(pipenv --venv 2>/dev/null)" && [[ -n "$venv_path" && -f "$venv_path/bin/activate" ]]; then
+        source "$(pipenv --venv)/bin/activate"
-          export pipfile_dir="$PWD"
+        export PIPENV_ACTIVE=1
-          source "$venv_path/bin/activate"
-          export PIPENV_ACTIVE=1
-        fi
       fi
     fi
   }

plugins/podman/podman.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_podman" ]]; then
   _comps[podman]=_podman
 fi
 
-zmodload -F zsh/files b:zf_mv
+podman completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_podman" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_podman"
-  zf_mv -f -- =( podman completion zsh 2> /dev/null ) "$TMPPREFIX"
-} &|
 
 alias pbl='podman build'
 alias pcin='podman container inspect'

plugins/poetry-env/README.md

@@ -1,9 +1,7 @@
 # Poetry Environment Plugin
 
-This plugin automatically activates a Poetry environment when you enter a
+This plugin automatically changes poetry environment when you cd into or out of the project directory.
-directory containing both `pyproject.toml` and `poetry.lock`. It keeps the
+Note: Script looks for pyproject.toml file to determine poetry if its a poetry environment
-environment active in project subdirectories, switches to nested Poetry
-projects, and deactivates it when you leave the project tree.
 
 To use it, add `poetry-env` to the plugins array in your zshrc file:
 

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

@@ -1,29 +1,20 @@
 _togglePoetryShell() {
   # Determine if currently in a Poetry-managed directory
   local in_poetry_dir=0
-  local in_active_poetry_dir=0
   if [[ -f "$PWD/pyproject.toml" && -f "$PWD/poetry.lock" ]]; then
     in_poetry_dir=1
   fi
 
-  # Deactivate when leaving the active project or entering a nested project
+  # Deactivate the current environment if moving out of a Poetry directory or into a different Poetry directory
-  if [[ $poetry_active -eq 1 ]]; then
+  if [[ $poetry_active -eq 1 ]] && { [[ $in_poetry_dir -eq 0 ]] || [[ "$PWD" != "$poetry_dir"* ]]; }; then
-    local project_dir="${poetry_dir%/}"
+    export poetry_active=0
-    if [[ "$PWD" == "$project_dir" || "$PWD" == "$project_dir"/* ]]; then
+    unset poetry_dir
-      in_active_poetry_dir=1
+    (( $+functions[deactivate] )) && deactivate
-    fi
-
-    if [[ $in_active_poetry_dir -eq 0 ]] ||
-      { [[ $in_poetry_dir -eq 1 ]] && [[ "$PWD" != "$poetry_dir" ]]; }; then
-      export poetry_active=0
-      unset poetry_dir
-      (( $+functions[deactivate] )) && deactivate
-    fi
   fi
 
   # 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/poetry/poetry.plugin.zsh

@@ -39,8 +39,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
   _comps[poetry]=_poetry
 fi
 
-zmodload -F zsh/files b:zf_mv
+poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_poetry"
-  zf_mv -f -- =( poetry completions zsh ) "$TMPPREFIX"
-} &|

plugins/procs/procs.plugin.zsh

@@ -10,16 +10,12 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_procs" ]]; then
   _comps[procs]=_procs
 fi
 
-zmodload -F zsh/files b:zf_mv
+{
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_procs"
   autoload -Uz is-at-least
   local _version=$(procs --version)
-  zf_mv -f -- =(
+  if is-at-least "0.14" "${_version#procs }"; then
-    if is-at-least "0.14" "${_version#procs }"; then
+    procs --gen-completion-out zsh >| "$ZSH_CACHE_DIR/completions/_procs"
-      procs --gen-completion-out zsh
+  else
-    else
+    procs --completion-out zsh >| "$ZSH_CACHE_DIR/completions/_procs"
-      procs --completion-out zsh
+  fi
-    fi
-  ) "$TMPPREFIX"
 } &|

plugins/pulumi/pulumi.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_pulumi" ]]; then
   _comps[pulumi]=_pulumi
 fi
 
-zmodload -F zsh/files b:zf_mv
+pulumi gen-completion zsh >| "$ZSH_CACHE_DIR/completions/_pulumi" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_pulumi"
-  zf_mv -f -- =( pulumi gen-completion zsh ) "$TMPPREFIX"
-} &|
 
 # Aliases
 alias pul='pulumi'

plugins/qodana/qodana.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_qodana" ]]; then
   _comps[qodana]=_qodana
 fi
 
-zmodload -F zsh/files b:zf_mv
+qodana completion zsh >| "$ZSH_CACHE_DIR/completions/_qodana" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_qodana"
-  zf_mv -f -- =( qodana completion zsh ) "$TMPPREFIX"
-} &|

plugins/rails/README.md

@@ -54,33 +54,6 @@ plugins=(... rails)
 | `rta`   | `rails test:all`                 | Runs all Rails tests, including system tests           |
 | `ru`    | `rails runner`                   | Run Ruby code in the context of Rails                  |
 
-### Multiple databases
-
-Rails applications can define more than one database (`primary`, `cache`, `cable`,
-`queue`, ...), and each one gets its own namespaced task. These commands accept an
-optional database name as the first argument:
-
-`rdc`, `rdd`, `rdm`, `rdmd`, `rdmr`, `rdms`, `rdmu`, `rdr`, `rdrs`, `rdsl`
-
-```zsh
-rdm                    # rails db:migrate
-rdm cache              # rails db:migrate:cache
-rdm VERSION=20231225   # rails db:migrate VERSION=20231225
-rdm cache STEP=2       # rails db:migrate:cache STEP=2
-rdm --trace            # rails db:migrate --trace
-```
-
-The first argument is read as a database name only when it is a bare word. Flags
-(`--trace`), variables (`STEP=2`) and other tasks (`db:seed`) are passed through to
-`rails` unchanged, so previous usage keeps working. When a database name is given,
-the resolved command is printed so it is clear which database is being used.
-
-`rdmrs` is not in the list above because Rails does not define a per-database
-`db:migrate:reset` task.
-
-Note that these are implemented as shell functions rather than aliases, so they will
-not appear in the output of `alias`.
-
 ### Foreman
 
 | Alias  | Command         | Description                               |

plugins/rails/rails.plugin.zsh

@@ -47,9 +47,19 @@ alias rc='rails console'
 alias rcs='rails console --sandbox'
 alias rd='rails destroy'
 alias rdb='rails dbconsole'
+alias rdc='rails db:create'
+alias rdd='rails db:drop'
+alias rdm='rails db:migrate'
+alias rdmd='rails db:migrate:down'
+alias rdmr='rails db:migrate:redo'
 alias rdmrs='rails db:migrate:reset'
+alias rdms='rails db:migrate:status'
 alias rdmtc='rails db:migrate db:test:clone'
+alias rdmu='rails db:migrate:up'
+alias rdr='rails db:rollback'
+alias rdrs='rails db:reset'
 alias rds='rails db:seed'
+alias rdsl='rails db:schema:load'
 alias rdtc='rails db:test:clone'
 alias rdtp='rails db:test:prepare'
 alias rgen='rails generate'
@@ -96,49 +106,9 @@ alias rkn='rake notes'
 alias rksts='rake stats'
 alias rkt='rake test'
 
-# Database tasks
-#
-# Rails applications can define more than one database (primary, cache, cable,
-# queue, ...). Each one gets its own namespaced task, e.g. `db:migrate:cache`.
-# The functions below take an optional database name as the first argument:
-#
-#   rdm                    ->  rails db:migrate
-#   rdm cache              ->  rails db:migrate:cache
-#   rdm VERSION=20231225   ->  rails db:migrate VERSION=20231225
-#   rdm cache STEP=2       ->  rails db:migrate:cache STEP=2
-#   rdm --trace            ->  rails db:migrate --trace
-#
-# The first argument is read as a database name only when it is a bare word.
-# Flags (--trace), variables (STEP=2) and other tasks (db:seed) are passed
-# through to rails untouched, so the previous alias behavior still works.
-function _rails_db_command() {
-  local task="$1"
-  shift
-
-  if [[ $# -gt 0 && "$1" != -* && "$1" != *=* && "$1" != *:* ]]; then
-    task="$task:$1"
-    shift
-    # Echo the resolved task so it is clear which database is being used
-    local -a cmd=(rails "$task" "$@")
-    print -u2 -r -- "Running: ${cmd[*]}"
-  fi
-
-  rails "$task" "$@"
-}
-
-function rdc()  { _rails_db_command db:create "$@" }
-function rdd()  { _rails_db_command db:drop "$@" }
-function rdm()  { _rails_db_command db:migrate "$@" }
-function rdmd() { _rails_db_command db:migrate:down "$@" }
-function rdmr() { _rails_db_command db:migrate:redo "$@" }
-function rdms() { _rails_db_command db:migrate:status "$@" }
-function rdmu() { _rails_db_command db:migrate:up "$@" }
-function rdr()  { _rails_db_command db:rollback "$@" }
-function rdrs() { _rails_db_command db:reset "$@" }
-function rdsl() { _rails_db_command db:schema:load "$@" }
-
 # legacy stuff
 alias sc='ruby script/console'
+alias sd='ruby script/destroy'
 alias sd='ruby script/server --debugger'
 alias sg='ruby script/generate'
 alias sp='ruby script/plugin'

plugins/rbw/rbw.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
   _comps[rbw]=_rbw
 fi
 
-zmodload -F zsh/files b:zf_mv
+rbw gen-completions zsh >| "$ZSH_CACHE_DIR/completions/_rbw" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_rbw"
-  zf_mv -f -- =( rbw gen-completions zsh ) "$TMPPREFIX"
-} &|
 
 # rbwpw function copies the password of a service to the clipboard
 # and clears it after 20 seconds

plugins/rclone/rclone.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rclone" ]]; then
   _comps[rclone]=_rclone
 fi
 
-zmodload -F zsh/files b:zf_mv
+rclone completion zsh - >| "$ZSH_CACHE_DIR/completions/_rclone" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_rclone"
-  zf_mv -f -- =( rclone completion zsh - ) "$TMPPREFIX"
-} &|

plugins/ruff/README.md

@@ -1,22 +0,0 @@
-# ruff plugin
-
-This plugin automatically installs [ruff](https://github.com/astral-sh/ruff)'s completions for you,
-and keeps them up to date. It also adds convenient aliases for common usage.
-
-To use it, add `ruff` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... ruff)
-```
-
-## Aliases
-
-| Alias | Command              | Description                                                  |
-| :---- | -------------------- | :----------------------------------------------------------- |
-| ruc   | `ruff check`         | Run Ruff linter on the given files or directories            |
-| rucf  | `ruff check --fix`   | Run Ruff linter and fix auto-fixable issues                  |
-| ruf   | `ruff format`        | Run the Ruff formatter on the given files or directories     |
-| rufc  | `ruff format --check`| Check if files are already formatted without making changes  |
-| rur   | `ruff rule`          | Explain a rule (or all rules)                                |
-| rul   | `ruff linter`        | List all supported upstream linters                          |
-| rucl  | `ruff clean`         | Clear any caches in the current directory and subdirectories |

plugins/ruff/ruff.plugin.zsh

@@ -1,27 +0,0 @@
-# Return immediately if ruff is not found
-if (( ! ${+commands[ruff]} )); then
-  return
-fi
-
-alias ruc='ruff check'
-alias rucf='ruff check --fix'
-alias ruf='ruff format'
-alias rufc='ruff format --check'
-alias rur='ruff rule'
-alias rul='ruff linter'
-alias rucl='ruff clean'
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_ruff" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _ruff
-  _comps[ruff]=_ruff
-fi
-
-# Overwrites the file each time as completions might change with ruff versions.
-zmodload -F zsh/files b:zf_mv
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_ruff"
-  zf_mv -f -- =( ruff generate-shell-completion zsh ) "$TMPPREFIX"
-} &|

plugins/rust/rust.plugin.zsh

@@ -19,11 +19,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
 fi
 
 # Generate completion files in the background
-zmodload -F zsh/files b:zf_mv
+rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_rustup"
-  zf_mv -f -- =( rustup completions zsh ) "$TMPPREFIX"
-} &|
 cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
 #compdef cargo
 source "$(rustup run ${${(z)$(rustup default)}[1]} rustc --print sysroot)"/share/zsh/site-functions/_cargo

plugins/safe-paste/safe-paste.plugin.zsh

@@ -11,6 +11,7 @@
 # Load bracketed-paste-magic if zsh version is >= 5.1
 autoload -Uz is-at-least
 if is-at-least 5.1; then
+  set zle_bracketed_paste  # Explicitly restore this zsh default
   autoload -Uz bracketed-paste-magic
   zle -N bracketed-paste bracketed-paste-magic
   return  ### The rest of this file is NOT executed on zsh version >= 5.1 ###

plugins/sigstore/sigstore.plugin.zsh

@@ -12,11 +12,7 @@ function install_autocompletion {
     _comps[$1]=_$1
   fi
 
-  zmodload -F zsh/files b:zf_mv
+  $1 completion zsh >| "$ZSH_CACHE_DIR/completions/_$1" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_$1"
-    zf_mv -f -- =( $1 completion zsh ) "$TMPPREFIX"
-  } "$1" &|
 }
 
 install_autocompletion cosign

plugins/skaffold/skaffold.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_skaffold" ]]; then
   _comps[skaffold]=_skaffold
 fi
 
-zmodload -F zsh/files b:zf_mv
+skaffold completion zsh >| "$ZSH_CACHE_DIR/completions/_skaffold" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_skaffold"
-  zf_mv -f -- =( skaffold completion zsh ) "$TMPPREFIX"
-} &|

plugins/ssh-agent/README.md

@@ -21,18 +21,6 @@ To enable **agent forwarding support** add the following to your zshrc file:
 zstyle :omz:plugins:ssh-agent agent-forwarding yes
 ```
 
-### `honor-existing`
-
-If your session already provides an ssh-agent — a desktop keyring, `gpg-agent`,
-KeePassXC, or an agent forwarded over SSH — the plugin normally ignores it and
-starts one of its own, which leaves you with two agents. Set this to reuse the
-running agent instead, and only start a new one when `$SSH_AUTH_SOCK` is empty
-or does not answer:
-
-```zsh
-zstyle :omz:plugins:ssh-agent honor-existing yes
-```
-
 ### `helper`
 
 To set an **external helper** to ask for the passwords and possibly store

plugins/ssh-agent/ssh-agent.plugin.zsh

@@ -1,28 +1,16 @@
 # Get the filename to store/lookup the environment from
 ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 
-# Test if $SSH_AUTH_SOCK points at a listening agent
-function _is_agent_running() {
-  local REPLY
-  [[ -n "$SSH_AUTH_SOCK" && -S "$SSH_AUTH_SOCK" ]] || return 1
-  zmodload zsh/net/socket 2>/dev/null || return 1
-  zsocket "$SSH_AUTH_SOCK" 2>/dev/null || return 1
-  exec {REPLY}>&- # close the probe connection
-  return 0
-}
-
 function _start_agent() {
-  # Reuse an agent the session already provides, if enabled
-  if zstyle -t :omz:plugins:ssh-agent honor-existing && _is_agent_running; then
-    return 0
-  fi
-
   # Check if ssh-agent is already running
   if [[ -f "$ssh_env_cache" ]]; then
     . "$ssh_env_cache" > /dev/null
 
     # Test if $SSH_AUTH_SOCK is visible
-    _is_agent_running && return 0
+    zmodload zsh/net/socket
+    if [[ -S "$SSH_AUTH_SOCK" ]] && zsocket "$SSH_AUTH_SOCK" 2>/dev/null; then
+      return 0
+    fi
   fi
 
   if [[ ! -d "$HOME/.ssh" ]]; then
@@ -113,18 +101,10 @@ if zstyle -t :omz:plugins:ssh-agent agent-forwarding \
    && [[ -n "$SSH_AUTH_SOCK" ]]; then
   if [[ ! -L "$SSH_AUTH_SOCK" ]]; then
     if [[ -n "$TERMUX_VERSION" ]]; then
-      _omz_ssh_agent_link="$PREFIX"/tmp/ssh-agent-$USERNAME-screen
+      ln -sf "$SSH_AUTH_SOCK" "$PREFIX"/tmp/ssh-agent-$USERNAME-screen
     else
-      _omz_ssh_agent_link=/tmp/ssh-agent-$USERNAME-screen
+      ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
     fi
-    # `ln -sf` unlinks the old symlink and then creates the new one: two
-    # syscalls, no atomic swap. Shells starting concurrently (a tmux window
-    # opening several panes at once) interleave those steps and all but one
-    # fail with "ln: ...: File exists". Stage the link under a PID-unique
-    # name and move it into place, since rename(2) is atomic.
-    command ln -sf "$SSH_AUTH_SOCK" "$_omz_ssh_agent_link.$$" \
-      && command mv -f "$_omz_ssh_agent_link.$$" "$_omz_ssh_agent_link"
-    unset _omz_ssh_agent_link
   fi
 else
   _start_agent
@@ -136,4 +116,4 @@ if ! zstyle -t :omz:plugins:ssh-agent lazy; then
 fi
 
 unset agent_forwarding ssh_env_cache
-unfunction _start_agent _add_identities _is_agent_running
+unfunction _start_agent _add_identities

plugins/stripe/stripe.plugin.zsh

@@ -10,8 +10,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_stripe" ]]; then
   _comps[stripe]=_stripe
 fi
 
-zmodload -F zsh/files b:zf_mv
+stripe completion --shell zsh --write-to-stdout >| "$ZSH_CACHE_DIR/completions/_stripe" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_stripe"
-  zf_mv -f -- =( stripe completion --shell zsh --write-to-stdout ) "$TMPPREFIX"
-} &|

plugins/sublime-merge/sublime-merge.plugin.zsh

@@ -19,7 +19,6 @@
 				ssm_run_sudo() {sudo $_sublime_merge_path "$@" >/dev/null 2>&1}
 				alias ssm=ssm_run_sudo
 				alias sm=sm_run
-				alias smerge="'$_sublime_merge_path'"
 				break
 			fi
 		done
@@ -34,7 +33,6 @@
 			if [[ -a $_sublime_merge_path ]]; then
 				subm () { "$_sublime_merge_path" "$@" }
 				alias sm=subm
-				alias smerge="'$_sublime_merge_path'"
 				break
 			fi
 		done
@@ -47,7 +45,6 @@
 			if [[ -a $_sublime_merge_path ]]; then
 				subm () { "$_sublime_merge_path" "$@" }
 				alias sm=subm
-				alias smerge="'$_sublime_merge_path'"
 				break
 			fi
 		done

plugins/suse/README.md

@@ -71,6 +71,7 @@ Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
 | Alias | Commands            | Description                              |
 | ----- | ------------------- | ---------------------------------------- |
 | zar   | `sudo zypper ar`    | add a repository                         |
+| zcl   | `sudo zypper clean` | clean cache                              |
 | zlr   | `zypper lr`         | list repositories                        |
 | zmr   | `sudo zypper mr`    | modify repositories                      |
 | znr   | `sudo zypper nr`    | rename repositories (for the alias only) |

plugins/suse/suse.plugin.zsh

@@ -38,6 +38,7 @@ alias zwp='zypper --no-refresh wp'
 
 #Repositories commands
 alias zar='sudo zypper ar'
+alias zcl='sudo zypper clean'
 alias zlr='zypper lr'
 alias zmr='sudo zypper mr'
 alias znr='sudo zypper nr'

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/systemadmin/systemadmin.plugin.zsh

@@ -138,7 +138,7 @@ function consume100() {
 
 # Website traffic statistics (G)
 function webtraffic() {
-  awk '{sum+=$10} END {print sum/1024/1024/1024}' "$(retlog)"
+  awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
 }
 
 # Statistical connections 404