completions: support completion of jobids with ascii f

Problem: The bash completions suggest jobids in f58 encoding, but users
may want to complete jobs using a plain f since it is easier to type.

For commands that can complete with jobids, if the current string
starts with an ascii f, then force the suggested jobid list to be in
f58plain encoding.

Author: grondo

etc/completions/flux.pre

@@ -129,6 +129,17 @@ __get_flux_subcommands() {
     echo "$subcommands"
 }
 
+# Helper to emit id.f58plain when match begins with `f`
+_flux_id_fmt()
+{
+    local cur=$1
+    local fmt="{id}"
+    if [[ $cur == f* ]]; then
+        fmt="{id.f58plain}"
+    fi
+    echo "${fmt}"
+}
+
 #  flux-cancel(1) completions
 _flux_cancel()
 {
@@ -143,7 +154,7 @@ _flux_cancel()
     "
     if [[ $cur != -* ]]; then
         #  Attempt to substitute an active jobid
-        active_jobs=$(flux jobs -no {id})
+        active_jobs=$(flux jobs -no $(_flux_id_fmt $cur))
         COMPREPLY=( $(compgen -W "${active_jobs}" -- "$cur") )
         return 0
     fi
@@ -165,7 +176,7 @@ _flux_update()
     "
     if [[ $cur != -* ]]; then
         #  Attempt to substitute an active jobid
-        active_jobs="$(flux jobs -no {id})"
+        active_jobs="$(flux jobs -no $(_flux_id_fmt $cur))"
         COMPREPLY=( $(compgen -W "${active_jobs}" -- "$cur") )
         return 0
     fi
@@ -516,7 +527,7 @@ _flux_job()
         if [[ $cur != -* ]]; then
            if _flux_contains_word ${cmd} ${subcmds}; then
                 #  These commands take active jobids by default:
-                active_jobs=$(flux jobs -no {id})
+                active_jobs=$(flux jobs -no $(_flux_id_fmt $cur))
                 COMPREPLY=( $(compgen -W "${active_jobs}" -- "$cur") )
                 return 0
             fi
@@ -1080,7 +1091,7 @@ _flux_watch()
     "
     if [[ $cur != -* ]]; then
         #  Attempt to substitute an active jobid
-        active_jobs=$(flux jobs -no {id})
+        active_jobs=$(flux jobs -no $(_flux_id_fmt $cur))
         COMPREPLY=( $(compgen -W "${active_jobs}" -- "$cur") )
         return 0
     fi
@@ -1141,7 +1152,7 @@ _flux_top()
         return 0
     fi
     #  flux-top(1) can target jobids that are also instances
-    local jobs=$(flux jobs -no {uri}:{id} | grep -v ^None: \
+    local jobs=$(flux jobs -no {uri}:$(_flux_id_fmt $cur) | grep -v ^None: \
                  | sed -n 's/.*://p')
     COMPREPLY=( $(compgen -W "${OPTS} $jobs" -- "$cur") )
     if [[ "${COMPREPLY[@]}" == *= ]]; then