Fix URL encoding for HOST and PWD variables

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Apply batched suggestions from code review
2026-09-30 06:56:06 +02:00 · 2026-09-10 13:55:55 +02:00 · 2026-09-06 08:47:04 -07:00 · 2026-09-06 08:10:43 -07:00
3 changed files with 15 additions and 22 deletions
@@ -146,16 +146,23 @@ esac
 # the host name to disambiguate local vs. remote paths.
 function omz_termsupport_cwd {
  setopt localoptions unset
-  # Percent-encode the host and path names.
-  local URL_HOST URL_PATH
-  URL_HOST="$(omz_urlencode -P $HOST)" || return 1
-  URL_PATH="$(omz_urlencode -P $PWD)" || return 1
+  # Percent-encode the host and path names. Encoding forks a subshell each,
+  # so keep the result and only redo it when $HOST or $PWD changed.
+  local cache_key="$HOST:$PWD:${KONSOLE_PROFILE_NAME:+1}:${KONSOLE_DBUS_SESSION:+1}"
+  if [[ "$_omz_termsupport_cwd_key" != "$cache_key" ]]; then
+    local URL_HOST URL_PATH
+    URL_HOST="$(omz_urlencode -P "$HOST")" || return 1
+    URL_PATH="$(omz_urlencode -P "$PWD")" || return 1

-  # Konsole errors if the HOST is provided
-  [[ -z "$KONSOLE_PROFILE_NAME" && -z "$KONSOLE_DBUS_SESSION"  ]] || URL_HOST=""
+    # Konsole errors if the HOST is provided
+    [[ -z "$KONSOLE_PROFILE_NAME" && -z "$KONSOLE_DBUS_SESSION"  ]] || URL_HOST=""
+
+    typeset -g _omz_termsupport_cwd_key="$cache_key"
+    typeset -g _omz_termsupport_cwd_url="file://${URL_HOST}${URL_PATH}"
+  fi

  # common control sequence (OSC 7) to set current host and path
-  printf "\e]7;file://%s%s\e\\" "${URL_HOST}" "${URL_PATH}"
+  printf "\e]7;%s\e\\" "$_omz_termsupport_cwd_url"
 }

 # Use a precmd hook instead of a chpwd hook to avoid contaminating output
@@ -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
+