refactor(installer): reuse timestamp for backup naming loop

Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>
fix(installer): avoid history backup name collisions
2026-09-21 18:46:06 +02:00 · 2026-09-06 00:15:20 +00:00 · 2026-09-06 00:15:00 +00:00 · 2026-09-06 00:14:31 +00:00 · 2026-09-06 00:14:09 +00:00 · 2026-09-05 17:03:47 -07:00
29 changed files with 85 additions and 282 deletions
@@ -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
@@ -16,7 +16,7 @@ jobs:
      contents: write # this is needed to push commits and branches
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
        with:
          egress-policy: audit

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

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

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

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

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

@@ -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>

@@ -21,7 +21,6 @@ function chruby_prompt_info \
  azure_prompt_info \
  tf_prompt_info \
  conda_prompt_info \
-  go_prompt_info \
 {
  return 1
 }
@@ -64,7 +64,7 @@ if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
 fi

 # Create cache and completions dir and add to $fpath
-[[ -d "$ZSH_CACHE_DIR/completions" ]] || mkdir -p "$ZSH_CACHE_DIR/completions"
+mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)

 # Check for updates on initial load...
@@ -114,17 +114,9 @@ fi
 zcompdump_revision="#omz revision: $(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)"
 zcompdump_fpath="#omz fpath: $fpath"

-# Check whether the zcompdump file carries the current OMZ metadata lines
-_omz_compdump_has_metadata() {
-  local -a lines
-  [[ -r "$ZSH_COMPDUMP" ]] || return 1
-  lines=("${(@f)$(<"$ZSH_COMPDUMP")}")
-  (( ${lines[(Ie)$zcompdump_revision]} && ${lines[(Ie)$zcompdump_fpath]} ))
-}
-
 # Delete the zcompdump file if OMZ zcompdump metadata changed
-zcompdump_refresh=0
-if ! _omz_compdump_has_metadata; then
+if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
+   || ! command grep -q -Fx "$zcompdump_fpath" "$ZSH_COMPDUMP" 2>/dev/null; then
  command rm -f "$ZSH_COMPDUMP"
  zcompdump_refresh=1
 fi
@@ -142,8 +134,9 @@ else
  compinit -u -d "$ZSH_COMPDUMP"
 fi

-# Append zcompdump metadata if missing (compinit may have regenerated the file)
-if (( zcompdump_refresh )) || ! _omz_compdump_has_metadata; then
+# Append zcompdump metadata if missing
+if (( $zcompdump_refresh )) \
+  || ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null; then
  # Use `tee` in case the $ZSH_COMPDUMP filename is invalid, to silence the error
  # See https://github.com/ohmyzsh/ohmyzsh/commit/dd1a7269#commitcomment-39003489
  tee -a "$ZSH_COMPDUMP" &>/dev/null <<EOF
@@ -153,12 +146,9 @@ $zcompdump_fpath
 EOF
 fi
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
-unset -f _omz_compdump_has_metadata

 # zcompile the completion dump file if the .zwc is older or missing.
-# Test that first so the lock directory and zrecompile are skipped when it's fresh.
-if [[ ! "${ZSH_COMPDUMP}.zwc" -nt "$ZSH_COMPDUMP" ]] \
-   && command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
+if 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
@@ -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
-```
@@ -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}"
-}
@@ -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.]' \
@@ -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'
@@ -71,7 +71,6 @@ plugins=(... kubectl)
 |          |                                                         | **Secret management**                                                                            |
 | kgsec    | `kubectl get secret`                                    | Get secret for decoding                                                                          |
 | kgseca   | `kubectl get secret --all-namespaces`                   | List secrets across all namespaces                                                               |
-| kesec    | `kubectl edit secret`                                   | Edit secret resource                                                                             |
 | kdsec    | `kubectl describe secret`                               | Describe secret resource in detail                                                               |
 | kdelsec  | `kubectl delete secret`                                 | Delete the secret                                                                                |
 |          |                                                         | **Deployment management**                                                                        |
@@ -93,7 +93,6 @@ alias kdelcm='kubectl delete configmap'
 # Secret management
 alias kgsec='kubectl get secret'
 alias kgseca='kubectl get secret --all-namespaces'
-alias kesec='kubectl edit secret'
 alias kdsec='kubectl describe secret'
 alias kdelsec='kubectl delete secret'

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

 ## Clears

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


 # Clears
@@ -1,111 +0,0 @@
-# opencode plugin
-
-This plugin adds completion and aliases for the [OpenCode](https://opencode.ai) CLI.
-Install OpenCode using its [installation instructions](https://opencode.ai/docs/#install),
-and make sure `opencode` is available on your `$PATH`.
-
-To enable it, add `opencode` to the plugins array in your `.zshrc`:
-
-```zsh
-plugins=(... opencode)
-```
-
-## Learning OpenCode from the terminal
-
-Use tab completion to explore commands and their descriptions without leaving the
-shell. For example, these are some of the candidates shown by the CLI:
-
-```text
-$ opencode <TAB>
-agent         -- manage agents
-models        -- list all available models
-run           -- run opencode with a message
-session       -- manage sessions
-stats         -- show token usage and cost statistics
-...
-
-$ opencode session <TAB>
-delete        -- delete a session
-list          -- list sessions
-
-$ opencode run --<TAB>
--agent       -- agent to use
--continue    -- continue the last session
--file        -- file(s) to attach to message
--model       -- model to use in the format of provider/model
-...
-```
-
-Completion works through the aliases too. Type a partial command or option and
-press Tab to finish it:
-
-```text
-$ opc session li<TAB>
-$ opc session list
-
-$ opcr --att<TAB>
-$ opcr --attach
-
-$ opcc --log-l<TAB>
-$ opcc --log-level
-```
-
-Candidates depend on your installed OpenCode version. In OpenCode 1.18.29, the
-CLI's completion output omits top-level TUI flags such as `--model` and `--fork`,
-even though those flags work when typed. Use `opencode --help` or
-`opencode run --help` for the full options, and see the
-[CLI reference](https://opencode.ai/docs/cli/) for more workflows.
-
-## Aliases
-
-| Alias  | Command               | Description                         |
-| ------ | --------------------- | ----------------------------------- |
-| `opc`  | `opencode`            | Launch the terminal UI              |
-| `opcc` | `opencode --continue` | Continue the last session           |
-| `opcr` | `opencode run`        | Run a prompt without opening the UI |
-
-To keep completion but skip the aliases, set this in your `.zshrc`, above the line
-that sources Oh My Zsh:
-
-```zsh
-# ~/.zshrc
-zstyle ':omz:plugins:opencode' aliases no
-
-plugins=(... opencode)
-
-source $ZSH/oh-my-zsh.sh
-```
-
-## Common workflows
-
-All aliases accept additional arguments:
-
-```zsh
-# Open a project
-opc ~/projects/my-app
-
-# Explore a different approach by forking the last session
-opcc --fork
-
-# Ask a question without entering the terminal UI
-opcr "Explain the test setup in this project"
-
-# Reuse an already running backend to avoid MCP server cold starts
-opcr --attach http://localhost:4096 "Explain this project's architecture"
-```
-
-## Completion
-
-Completion queries the installed OpenCode CLI on demand for commands and options,
-including through the aliases above. It falls back to Zsh's default completion when
-the CLI returns no candidates. No OpenCode process is started at shell startup,
-and no generated completion cache is needed.
-
-## Credits
-
-Based on the OpenCode plugin proposals by
-[pranavavva](https://github.com/pranavavva) in
-[#13545](https://github.com/ohmyzsh/ohmyzsh/pull/13545) and
-[mskadu](https://github.com/mskadu) in
-[#13794](https://github.com/ohmyzsh/ohmyzsh/pull/13794).
-The completion adapter is derived from OpenCode's `opencode completion` output.
@@ -1,12 +0,0 @@
-#compdef opencode
-
-# Adapted from `opencode completion`, using the CLI's live Yargs completions.
-local -a reply
-reply=("${(@f)$(COMP_CWORD="$((CURRENT-1))" COMP_LINE="$BUFFER" COMP_POINT="$CURSOR" \
-  command opencode --get-yargs-completions "${words[@]}" < /dev/null 2> /dev/null)}")
-
-if [[ -n "${reply[1]}" ]]; then
-  _describe 'values' reply
-else
-  _default
-fi
@@ -1,7 +0,0 @@
-if (( ! $+commands[opencode] )); then
-  return
-fi
-
-alias opc='opencode'
-alias opcc='opencode --continue'
-alias opcr='opencode run'
@@ -23,7 +23,7 @@ _togglePoetryShell() {

  # Activate the environment if in a Poetry directory and no environment is currently active
  if [[ $in_poetry_dir -eq 1 ]] && [[ $poetry_active -ne 1 ]]; then
-    local venv_dir=$(poetry env info --path 2>/dev/null)
+    venv_dir=$(poetry env info --path 2>/dev/null)
    # Handle case where poetry returns "." for in-project virtual environments
    if [[ "$venv_dir" == "." ]]; then
      venv_dir="$PWD/.venv"
@@ -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 -a completions flagPrefix requestComp inputs
+    local lastParam flagPrefix requestComp out comp
+    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,
-    # because the request is no longer read again by the shell.
-    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))")
-
+    # Prepare the command to obtain completions
+    requestComp="${words[0]} ${words[1]} _complete --no-interaction -szsh -a1 -c$((CURRENT-1))" i=""
    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
-        inputs=(-i' ')
+    if [ "${i}" = "" ]; then
+        requestComp="${requestComp} -i\" \""
+    else
+        requestComp="${requestComp} ${i}"
    fi

-    # The request is run without being read again by the shell, so that a
-    # "$(...)" or a backtick typed on the command line is not executed
-    out=$(SHELL_VERBOSITY=0 "${requestComp[@]}" "${inputs[@]}" 2>/dev/null)
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 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 $?
 }

@@ -127,7 +127,7 @@ case $state in
      (box)
          __vagrant-box
      ;;
-      (up|provision|port|package|destroy|reload|ssh|ssh-config|halt|resume|status|suspend|rdp)
+      (up|provision|port|package|destroy|reload|ssh|ssh-config|halt|resume|status)
      _arguments ':feature:__vm_list'
    esac
  ;;
@@ -51,11 +51,6 @@ Available search contexts are:
 | `npmpkg`              | `https://www.npmjs.com/search?q=`               |
 | `packagist`           | `https://packagist.org/?query=`                 |
 | `gopkg`               | `https://pkg.go.dev/search?m=package&q=`        |
-| `maven`               | `https://central.sonatype.com/search?q=`        |
-| `pypi`                | `https://pypi.org/search/?q=`                   |
-| `aur`                 | `https://aur.archlinux.org/packages?O=0&K=`     |
-| `archwiki`            | `https://wiki.archlinux.org/index.php?search=`  |
-| `wikipedia`           | `https://en.wikipedia.org/w/index.php?search=`  |
 | `chatgpt`             | `https://chatgpt.com/?q=`                       |
 | `claudeai`            | `https://claude.ai/new?q=`                      |
 | `grokcom`             | `https://grok.com/?q=`                          |
@@ -32,11 +32,6 @@ function web_search() {
    npmpkg          "https://www.npmjs.com/search?q="
    packagist       "https://packagist.org/?query="
    gopkg           "https://pkg.go.dev/search?m=package&q="
-    maven           "https://central.sonatype.com/search?q="
-    pypi            "https://pypi.org/search/?q="
-    aur             "https://aur.archlinux.org/packages?O=0&K="
-    archwiki        "https://wiki.archlinux.org/index.php?search="
-    wikipedia       "https://en.wikipedia.org/w/index.php?search="
    chatgpt         "https://chatgpt.com/?q="
    grok            "https://grok.com/?q="
    claudeai        "https://claude.ai/new?q="
@@ -97,11 +92,6 @@ alias gems='web_search gems'
 alias npmpkg='web_search npmpkg'
 alias packagist='web_search packagist'
 alias gopkg='web_search gopkg'
-alias maven='web_search maven'
-alias pypi='web_search pypi'
-alias aur='web_search aur'
-alias archwiki='web_search archwiki'
-alias wikipedia='web_search wikipedia'
 alias chatgpt='web_search chatgpt'
 alias grokcom='web_search grok'
 alias claudeai='web_search claudeai'
@@ -126,3 +116,4 @@ if [[ ${#ZSH_WEB_SEARCH_ENGINES} -gt 0 ]]; then
  done
  unset engines key
 fi
+
@@ -4,8 +4,8 @@ export LSCOLORS=dxFxCxDxBxegedabagacad

 local git_branch='$(git_prompt_info)%{$reset_color%}$(git_remote_status)'

-PROMPT="%{%(#~$fg[red]~$fg[green])%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch}
-%{%(#~$fg[red]~$fg[green])%}╰%(#~#~\$) %{$reset_color%}"
+PROMPT="%{$fg[green]%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch}
+%{$fg[green]%}╰\$ %{$reset_color%}"

 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}on "
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
@@ -23,32 +23,12 @@ zstyle -s ':omz:update' mode update_mode || {
 # - the automatic update is disabled
 # - the current user doesn't have write permissions nor owns the $ZSH directory
 # - is not run from a tty
-if [[ "$update_mode" = disabled ]] \
-   || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
-   || [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]]; then
-  unset update_mode
-  return
-fi
-
-# Cancel update if it's not time to check yet. This runs before the git checks
-# below because those fork on every startup. Skipped when a background update
-# left a result that still needs to be reported (EXIT_STATUS is set).
-() {
-  local LAST_EPOCH EXIT_STATUS ERROR epoch_target
-  zmodload zsh/datetime
-  source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || return 1
-  [[ -n "$LAST_EPOCH" && -z "$EXIT_STATUS" ]] || return 1
-  zstyle -s ':omz:update' frequency epoch_target || epoch_target=${UPDATE_ZSH_DAYS:-13}
-  (( ( EPOCHSECONDS / 60 / 60 / 24 - LAST_EPOCH ) < epoch_target ))
-} && {
-  unset update_mode
-  return
-}
-
-# Cancel update if:
 # - git is unavailable on the system
 # - $ZSH is not a git repository
-if ! command git --version >/dev/null 2>&1 \
+if [[ "$update_mode" = disabled ]] \
+   || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
+   || [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]] \
+   || ! command git --version >/dev/null 2>&1 \
   || (builtin cd -q "$ZSH"; ! command git rev-parse --is-inside-work-tree &>/dev/null); then
  unset update_mode
  return
@@ -370,6 +370,7 @@ setup_zshrc() {
      # Ask user for confirmation before backing up and overwriting
      echo "${FMT_YELLOW}Found ${zdot}/.zshrc."
      echo "The existing .zshrc will be backed up to .zshrc.pre-oh-my-zsh if overwritten."
+      echo "Your command history will be backed up too, since replacing .zshrc drops any SAVEHIST you had set."
      echo "Make sure your .zshrc contains the following minimal configuration if you choose not to overwrite it:${FMT_RESET}"
      echo "----------------------------------------"
      cat "$ZSH/templates/minimal.zshrc"
@@ -398,6 +399,44 @@ setup_zshrc() {
    fi
    echo "${FMT_GREEN}Backing up to ${OLD_ZSHRC}${FMT_RESET}"
    mv "$zdot/.zshrc" "$OLD_ZSHRC"
+
+    # The .zshrc we just moved aside is where the user's SAVEHIST lived. Without
+    # it zsh trims $HISTFILE the next time a shell exits, so copy the history
+    # while it is still intact. $HISTFILE is a zsh variable we cannot read from
+    # here, so cover both locations it is commonly given: /etc/zshrc on macOS
+    # sets ${ZDOTDIR:-$HOME}/.zsh_history, and lib/history.zsh falls back to
+    # $HOME/.zsh_history.
+    hist_backed_up=""
+    for hist in "$zdot/.zsh_history" "$HOME/.zsh_history"; do
+      if [ ! -f "$hist" ]; then
+        continue
+      fi
+      case " $hist_backed_up " in
+        *" $hist "*) continue ;;
+      esac
+      hist_backup_base="${hist}.pre-oh-my-zsh"
+      hist_backup="$hist_backup_base"
+      if [ -e "$hist_backup" ]; then
+        hist_backup_ts="$(date +%Y-%m-%d_%H-%M-%S)"
+        hist_backup_i=0
+        while [ -e "$hist_backup" ]; do
+          hist_backup_i=$((hist_backup_i + 1))
+          hist_backup="${hist_backup_base}-${hist_backup_ts}-${hist_backup_i}"
+        done
+      fi
+      if cp -p "$hist" "$hist_backup"; then
+        echo "${FMT_GREEN}Backing up your command history to ${hist_backup}${FMT_RESET}"
+        hist_backed_up="$hist_backed_up $hist"
+      else
+        # a half-written file would look like a usable backup
+        rm -f "$hist_backup"
+        fmt_error "could not back up $hist"
+        if ! mv "$OLD_ZSHRC" "$zdot/.zshrc"; then
+          fmt_error "could not restore $zdot/.zshrc from backup"
+        fi
+        exit 1
+      fi
+    done
  fi

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

@@ -271,18 +271,9 @@ if LANG= git pull --quiet --rebase $remote $branch; then
    printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $RAINBOW $RESET
    printf '\n'
    printf "${BLUE}%s${RESET}\n\n" "$message"
-    printf "${BLUE}${BOLD}%s %s %s %s${RESET}\n" \
-      "Follow along on X" "($(fmt_link @ohmyzsh https://x.com/ohmyzsh))" \
-      "or Bluesky" "($(fmt_link @ohmyz.sh https://bsky.app/profile/ohmyz.sh))"
-    printf "${BLUE}${BOLD}%s %s${RESET}\n" \
-      "Questions or ideas? Join the community on" \
-      "$(fmt_link Discord https://discord.gg/ohmyzsh)"
-    printf "${BLUE}${BOLD}%s %s,${RESET}\n" \
-      "Help support the project: sponsor us on" \
-      "$(fmt_link "Open Collective" https://opencollective.com/ohmyzsh)"
-    printf "${BLUE}${BOLD}%s %s${RESET}\n" \
-      "or grab stickers, shirts, and swag from" \
-      "$(fmt_link CommitGoods https://commitgoods.com/ohmyzsh)"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on X:" "$(fmt_link @ohmyzsh https://x.com/ohmyzsh)"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "CommitGoods Shop" https://commitgoods.com/collections/oh-my-zsh)"
  elif [[ $verbose_mode == minimal ]]; then
    printf "${BLUE}%s${RESET}\n" "$message"
  fi
Author	SHA1	Message	Date
copilot-swe-agent[bot]androbbyrussell	ed01423b18	refactor(installer): reuse timestamp for backup naming loop Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>	2026-09-06 00:15:20 +00:00
copilot-swe-agent[bot]androbbyrussell	bc6faea85b	fix(installer): avoid history backup name collisions Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>	2026-09-06 00:15:00 +00:00
copilot-swe-agent[bot]androbbyrussell	ce6ebd3d8d	fix(installer): preserve history backup permissions Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>	2026-09-06 00:14:31 +00:00
copilot-swe-agent[bot]androbbyrussell	6749d0825b	fix(installer): fail safely on history backup errors Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>	2026-09-06 00:14:09 +00:00
Robby RussellandClaude Opus 5	296fbb8b69	fix(installer): back up the history file when replacing .zshrc The .zshrc the installer moves aside is where the user's SAVEHIST lives. Once it is gone zsh falls back to a smaller value, lib/history.zsh raises that to 10000, and the next clean shell exit rewrites $HISTFILE with only the most recent 10000 entries. Anything older is gone, and unlike the .zshrc, the history file was never backed up. Copy the history alongside .zshrc.pre-oh-my-zsh at the moment the config is replaced, and say so in the overwrite prompt. $HISTFILE is a zsh variable the installer cannot read, so cover both locations it is commonly given: macOS /etc/zshrc sets ${ZDOTDIR:-$HOME}/.zsh_history, and lib/history.zsh falls back to $HOME/.zsh_history. This does not stop the trim itself, which is governed by SAVEHIST; it makes the lost history recoverable. Closes #10908 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-05 17:03:47 -07:00