detect if omz is installed and shell completion mode in zsh (#2891)

sawka · web-flow · commit 0cc6c454a9d3 · 2026-02-19T10:22:56.000-08:00
diff --git a/frontend/app/view/term/osc-handlers.ts b/frontend/app/view/term/osc-handlers.ts
@@ -29,7 +29,7 @@ export type ShellIntegrationStatus = "ready" | "running-command";
 type Osc16162Command =
     | { command: "A"; data: {} }
     | { command: "C"; data: { cmd64?: string } }
-    | { command: "M"; data: { shell?: string; shellversion?: string; uname?: string; integration?: boolean } }
+    | { command: "M"; data: { shell?: string; shellversion?: string; uname?: string; integration?: boolean; omz?: boolean; comp?: string } }
     | { command: "D"; data: { exitcode?: number } }
     | { command: "I"; data: { inputempty?: boolean } }
     | { command: "R"; data: {} };
@@ -302,6 +302,12 @@ export function handleOsc16162Command(data: string, blockId: string, loaded: boo
             if (cmd.data.integration != null) {
                 rtInfo["shell:integration"] = cmd.data.integration;
             }
+            if (cmd.data.omz != null) {
+                rtInfo["shell:omz"] = cmd.data.omz;
+            }
+            if (cmd.data.comp != null) {
+                rtInfo["shell:comp"] = cmd.data.comp;
+            }
             break;
         case "D":
             if (cmd.data.exitcode != null) {
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
@@ -1147,6 +1147,8 @@ declare global {
         "shell:version"?: string;
         "shell:uname"?: string;
         "shell:integration"?: boolean;
+        "shell:omz"?: boolean;
+        "shell:comp"?: string;
         "shell:inputempty"?: boolean;
         "shell:lastcmd"?: string;
         "shell:lastcmdexitcode"?: number;
diff --git a/pkg/util/shellutil/shellintegration/zsh_zshrc.sh b/pkg/util/shellutil/shellintegration/zsh_zshrc.sh
@@ -48,6 +48,27 @@ _waveterm_si_urlencode() {
   fi
 }
 
+_waveterm_si_compmode() {
+  # fzf-based completion wins
+  if typeset -f _fzf_tab_complete >/dev/null 2>&1 || typeset -f _fzf_complete >/dev/null 2>&1; then
+    echo "fzf"
+    return
+  fi
+
+  # Check zstyle menu setting
+  local _menuval
+  if zstyle -s ':completion:*' menu _menuval 2>/dev/null; then
+    if [[ "$_menuval" == *select* ]]; then
+      echo "menu-select"
+    else
+      echo "menu"
+    fi
+    return
+  fi
+
+  echo "standard"
+}
+
 _waveterm_si_osc7() {
   _waveterm_si_blocked && return
   local encoded_pwd=$(_waveterm_si_urlencode "$PWD")
@@ -59,10 +80,13 @@ _waveterm_si_precmd() {
   _waveterm_si_blocked && return
   # D;status for previous command (skip before first prompt)
   if (( !_WAVETERM_SI_FIRSTPRECMD )); then
-    printf '\033]16162;D;{"exitcode":%d}\007' $_waveterm_si_status
+    printf '\033]16162;D;{"exitcode":%d}\007' "$_waveterm_si_status"
   else
     local uname_info=$(uname -smr 2>/dev/null)
-    printf '\033]16162;M;{"shell":"zsh","shellversion":"%s","uname":"%s","integration":true}\007' "$ZSH_VERSION" "$uname_info"
+    local omz=false
+    local comp=$(_waveterm_si_compmode)
+    [[ -n "$ZSH" && -r "$ZSH/oh-my-zsh.sh" ]] && omz=true
+    printf '\033]16162;M;{"shell":"zsh","shellversion":"%s","uname":"%s","integration":true,"omz":%s,"comp":"%s"}\007' "$ZSH_VERSION" "$uname_info" "$omz" "$comp"
     # OSC 7 only sent on first prompt - chpwd hook handles directory changes
     _waveterm_si_osc7
   fi
diff --git a/pkg/waveobj/objrtinfo.go b/pkg/waveobj/objrtinfo.go
@@ -13,6 +13,8 @@ type ObjRTInfo struct {
 	ShellVersion         string `json:"shell:version,omitempty"`
 	ShellUname           string `json:"shell:uname,omitempty"`
 	ShellIntegration     bool   `json:"shell:integration,omitempty"`
+	ShellOmz             bool   `json:"shell:omz,omitempty"`
+	ShellComp            string `json:"shell:comp,omitempty"`
 	ShellInputEmpty      bool   `json:"shell:inputempty,omitempty"`
 	ShellLastCmd         string `json:"shell:lastcmd,omitempty"`
 	ShellLastCmdExitCode int    `json:"shell:lastcmdexitcode,omitempty"`
