omnilane 0.8.3 → 0.9.1

package/scripts/configure.sh

@@ -9,6 +9,144 @@ source "$(dirname "${BASH_SOURCE[0]}")/lib/i18n.sh"
 
 LOCAL_FILE="$OMNILANE_HOME/routing.local.yaml"
 
+# --- Non-interactive subcommands -------------------------------------------
+# `configure set|get|unset|list` script the same routing.local.yaml the menu
+# writes, so automation never needs a tty. No subcommand => interactive menu.
+
+cfg_usage() {
+  cat >&2 <<'EOF'
+usage: configure                 interactive lane menu
+       configure set LANE SPEC   set/override one lane. SPEC = "vendor model effort [| ...]" or "off".
+                                 Quote the whole SPEC (and the model) when a model name has spaces.
+       configure get LANE        show the effective routing line for LANE
+       configure unset LANE      remove LANE's local override
+       configure list            show current local overrides
+       configure diff            show how local overrides change the effective table vs the defaults
+EOF
+}
+
+# Reject shell-dangerous bytes while allowing the routing RHS grammar
+# (chains with |, quoted "models with spaces", slashes, effort tokens).
+cfg_spec_is_safe() {
+  case "$1" in
+    '') return 1 ;;
+    *'$'*|*'`'*|*'\'*|*'#'*|*';'*|*'&'*|*'<'*|*'>'*|*$'\r'*|*$'\n'*) return 1 ;;
+    *) return 0 ;;
+  esac
+}
+
+cfg_lane_is_known() {
+  local want="$1" line
+  while IFS= read -r line; do
+    case "$line" in "$want":*) return 0 ;; esac
+  done < "$OMNILANE_REPO/routing.yaml"
+  return 1
+}
+
+cfg_valid_lane() { [[ "$1" =~ ^[a-z][a-z0-9-]*$ ]]; }
+
+cfg_set() {
+  local lane="${1:-}"; shift || true
+  local spec="$*"
+  cfg_valid_lane "$lane" || { echo "omnilane: invalid lane '$lane'" >&2; exit 2; }
+  cfg_lane_is_known "$lane" || { echo "omnilane: unknown lane '$lane' (see: omnilane list)" >&2; exit 2; }
+  [[ -n "$spec" ]] || { echo "omnilane: missing routing spec for '$lane'" >&2; cfg_usage; exit 2; }
+  cfg_spec_is_safe "$spec" || { echo 'omnilane: unsafe routing spec (not allowed: $ ` \ # ; & < > newlines)' >&2; exit 2; }
+
+  mkdir -p "$OMNILANE_HOME"
+  local had_file=0
+  if [[ -f "$LOCAL_FILE" ]]; then had_file=1; cp "$LOCAL_FILE" "$LOCAL_FILE.bak"; fi
+  local tmp="$LOCAL_FILE.tmp.$$"
+  {
+    echo "# updated by 'configure set' on $(date +%F) — first match per lane wins"
+    echo "$lane: $spec"
+    # Drop only our own stamp line and the lane being replaced; the user's own
+    # comments in routing.local.yaml survive a set.
+    [[ "$had_file" -eq 1 ]] && grep -v "^# updated by 'configure set'" "$LOCAL_FILE.bak" | grep -v "^$lane:" || true
+  } > "$tmp"
+  mv "$tmp" "$LOCAL_FILE"
+
+  # Semantic guard: reject only a structural FAIL on THIS lane. Availability
+  # WARN (validate exit 4) is fine — the vendor CLI may be legitimately absent.
+  local validate_out
+  validate_out="$(OMNILANE_HOME="$OMNILANE_HOME" bash "$OMNILANE_REPO/scripts/dispatch.sh" --validate 2>&1)" || true
+  if printf '%s\n' "$validate_out" | grep -q "^FAIL $lane "; then
+    if [[ "$had_file" -eq 1 ]]; then mv "$LOCAL_FILE.bak" "$LOCAL_FILE"; else /bin/rm -f "$LOCAL_FILE"; fi
+    echo "omnilane: rejected — $(printf '%s\n' "$validate_out" | grep "^FAIL $lane " | head -1)" >&2
+    exit 2
+  fi
+  [[ "$had_file" -eq 1 ]] && /bin/rm -f "$LOCAL_FILE.bak"
+  echo "set $lane -> $spec"
+}
+
+cfg_get() {
+  local lane="${1:-}"
+  cfg_valid_lane "$lane" || { echo "omnilane: invalid lane '$lane'" >&2; exit 2; }
+  local line
+  line="$(OMNILANE_HOME="$OMNILANE_HOME" bash "$OMNILANE_REPO/scripts/dispatch.sh" --list 2>/dev/null | grep "^$lane:" | head -1 || true)"
+  [[ -n "$line" ]] || { echo "omnilane: unknown lane '$lane' (see: omnilane list)" >&2; exit 2; }
+  printf '%s\n' "$line"
+}
+
+cfg_unset() {
+  local lane="${1:-}"
+  cfg_valid_lane "$lane" || { echo "omnilane: invalid lane '$lane'" >&2; exit 2; }
+  if [[ ! -f "$LOCAL_FILE" ]] || ! grep -q "^$lane:" "$LOCAL_FILE"; then
+    echo "no local override for '$lane'"; return 0
+  fi
+  cp "$LOCAL_FILE" "$LOCAL_FILE.bak"
+  grep -v "^$lane:" "$LOCAL_FILE.bak" > "$LOCAL_FILE" || true
+  /bin/rm -f "$LOCAL_FILE.bak"
+  echo "unset $lane (local override removed)"
+}
+
+cfg_list() {
+  if [[ -f "$LOCAL_FILE" ]] && grep -qE '^[a-z]' "$LOCAL_FILE"; then
+    cat "$LOCAL_FILE"
+  else
+    echo "no local overrides in $LOCAL_FILE"
+  fi
+}
+
+# Diff the effective table (local wins) against a defaults-only resolution, so
+# the user sees exactly which lanes their overrides change. Reuses dispatch.sh
+# --list for both, so availability annotation and formatting stay consistent; a
+# throwaway empty OMNILANE_HOME yields the defaults-only table.
+cfg_diff() {
+  if [[ ! -f "$LOCAL_FILE" ]] || ! grep -qE '^[a-z]' "$LOCAL_FILE"; then
+    echo "no local overrides ($LOCAL_FILE); effective table equals the defaults"
+    return 0
+  fi
+  local empty eff def changed=0 lane eff_line def_line
+  empty="$(mktemp -d "${TMPDIR:-/tmp}/omnilane-diff.XXXXXX")"
+  eff="$(OMNILANE_HOME="$OMNILANE_HOME" bash "$OMNILANE_REPO/scripts/dispatch.sh" --list 2>/dev/null || true)"
+  def="$(OMNILANE_HOME="$empty" bash "$OMNILANE_REPO/scripts/dispatch.sh" --list 2>/dev/null || true)"
+  /bin/rm -rf "$empty"
+  while IFS= read -r eff_line; do
+    [[ "$eff_line" =~ ^([a-z][a-z0-9-]*): ]] || continue
+    lane="${BASH_REMATCH[1]}"
+    def_line="$(printf '%s\n' "$def" | grep "^$lane:" | head -1 || true)"
+    if [[ "$eff_line" != "$def_line" ]]; then
+      changed=1
+      printf 'default> %s\n' "${def_line:-($lane not in defaults)}"
+      printf 'local  > %s\n' "$eff_line"
+      echo
+    fi
+  done <<DIFF_EFF
+$eff
+DIFF_EFF
+  [[ "$changed" -eq 1 ]] || echo "local overrides present, but the effective table matches the defaults"
+}
+
+case "${1:-}" in
+  set)   shift; cfg_set "$@"; exit $? ;;
+  get)   shift; cfg_get "$@"; exit $? ;;
+  unset) shift; cfg_unset "$@"; exit $? ;;
+  list)  shift; cfg_list "$@"; exit $? ;;
+  diff)  cfg_diff; exit $? ;;
+  -h|--help|help) cfg_usage; exit 0 ;;
+esac
+
 # Curated suggestions only — "c" always allows free text so new models work.
 CODEX_MODELS=("gpt-5.6-sol" "gpt-5.6-terra" "gpt-5.6-luna")
 CODEX_EFFORTS=("xhigh" "max" "ultra" "high" "medium" "low" "minimal" "none")
@@ -21,6 +159,13 @@ QWEN_MODELS=("qwen3-coder-plus" "qwen3-coder-flash")
 # OpenCode models use provider/model form; OpenRouter models are catalog slugs.
 OPENCODE_MODELS=("openrouter/anthropic/claude-sonnet-5" "openrouter/openai/gpt-5.6-sol" "opencode/default (leave model to opencode)")
 OPENROUTER_MODELS=("anthropic/claude-sonnet-5" "openai/gpt-5.6-sol" "moonshotai/kimi-k3" "qwen/qwen3-coder-plus")
+# Direct-API OpenAI-compatible vendors (curl + <VENDOR>_API_KEY); slugs are
+# suggestions — "c" free text covers anything each provider's /models lists.
+DEEPSEEK_MODELS=("deepseek-chat" "deepseek-reasoner" "deepseek-v4-flash")
+ZAI_MODELS=("glm-4.6")
+MISTRAL_MODELS=("devstral-latest" "codestral-latest" "mistral-medium-latest")
+GROQ_MODELS=("openai/gpt-oss-120b" "qwen/qwen3.6-27b" "openai/gpt-oss-20b")
+CEREBRAS_MODELS=("gpt-oss-120b" "qwen-3-32b" "llama-3.3-70b")
 
 custom_value_is_safe() {
   case "$1" in
@@ -79,7 +224,7 @@ while true; do
     echo "$(msgf cfg_pick_range "${#LANES[@]}")"; continue
   fi
   lane="${LANES[$((n - 1))]}"
-  vendor="$(pick "$(msgf cfg_vendor_for "$lane")" codex claude grok gemini kimi qwen opencode openrouter "vote (multi-model panel)" "exec (your own script/gate)" off)"
+  vendor="$(pick "$(msgf cfg_vendor_for "$lane")" codex claude grok gemini kimi qwen opencode openrouter deepseek zai mistral groq cerebras "vote (multi-model panel)" "exec (your own script/gate)" off)"
   [[ "$vendor" == exec* ]] && vendor="exec"
   [[ "$vendor" == vote* ]] && vendor="vote"
   if [[ "$vendor" == "off" ]]; then
@@ -96,6 +241,11 @@ while true; do
     opencode)   model="$(pick "$(msg cfg_model)" "${OPENCODE_MODELS[@]}")"; effort="-"
                 [[ "$model" == "opencode/default"* ]] && model="-" ;;
     openrouter) model="$(pick "$(msg cfg_model)" "${OPENROUTER_MODELS[@]}")"; effort="-" ;;
+    deepseek)   model="$(pick "$(msg cfg_model)" "${DEEPSEEK_MODELS[@]}")"; effort="-" ;;
+    zai)        model="$(pick "$(msg cfg_model)" "${ZAI_MODELS[@]}")";      effort="-" ;;
+    mistral)    model="$(pick "$(msg cfg_model)" "${MISTRAL_MODELS[@]}")";  effort="-" ;;
+    groq)       model="$(pick "$(msg cfg_model)" "${GROQ_MODELS[@]}")";     effort="-" ;;
+    cerebras)   model="$(pick "$(msg cfg_model)" "${CEREBRAS_MODELS[@]}")"; effort="-" ;;
     vote)   while true; do
               count="$(pick "$(msg cfg_voters_count)" "1" "2" "3" "4")"
               [[ "$count" =~ ^[1-4]$ ]] && break

package/scripts/dispatch.sh

@@ -52,7 +52,7 @@ flags:
                          before any provider call or job state
   --mode advise|work     advise (read-only, default) or work (may edit files)
   --workdir DIR          working directory handed to the vendor CLI
-  --vendor V             pin one configured vendor (codex|claude|grok|gemini|kimi|qwen|opencode|openrouter)
+  --vendor V             pin one configured vendor (codex|claude|grok|gemini|kimi|qwen|opencode|openrouter|deepseek|zai|mistral|groq|cerebras)
   --model M              override the routed model
   --effort E             override the routed effort
   --timeout SECONDS      cap each CLI call (default 600)
@@ -363,7 +363,7 @@ validate_routing() {
           lane_invalid=1
           break
         fi
-        if ! [[ "$vendor" =~ ^(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter|exec|off)$ ]]; then
+        if ! [[ "$vendor" =~ ^(${OMNILANE_VENDOR_ALT}|off)$ ]]; then
           printf 'FAIL %s unknown-vendor=%s\n' "$lane" "$vendor"
           lane_invalid=1
           break
@@ -489,8 +489,8 @@ TASK="$2"
 # A typo like --mode advice must not fall through to the write-enabled branch.
 [[ "$MODE" == "advise" || "$MODE" == "work" ]] || { echo "omnilane: invalid --mode (advise|work)" >&2; exit 2; }
 if [[ -n "$OVERRIDE_VENDOR" ]] &&
-   ! [[ "$OVERRIDE_VENDOR" =~ ^(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter)$ ]]; then
-  echo "omnilane: invalid vendor (codex|claude|grok|gemini|kimi|qwen|opencode|openrouter)" >&2
+   ! [[ "$OVERRIDE_VENDOR" =~ ^(${OMNILANE_OVERRIDE_VENDOR_ALT})$ ]]; then
+  echo "omnilane: invalid vendor (${OMNILANE_OVERRIDE_VENDOR_ALT})" >&2
   exit 2
 fi
 

package/scripts/doctor.sh

@@ -140,6 +140,44 @@ else
   report FAIL watchdog "timeout, gtimeout, and perl are all unavailable"
 fi
 
+# Vendor CLI availability. Runners resolve each vendor's binary through a *_BIN
+# override (default name otherwise) and source local.sh, so probe the same way
+# in a subshell — set +u because a machine-local local.sh may reference its own
+# unset vars, and the subshell keeps any side effects out of this report.
+vendor_line="$(
+  set +u
+  [[ -f "$OMNILANE_HOME/local.sh" ]] && . "$OMNILANE_HOME/local.sh" 2>/dev/null
+  present=""; absent=""
+  for spec in "codex:${CODEX_BIN:-codex}" "claude:${CLAUDE_BIN:-claude}" \
+              "grok:${GROK_BIN:-grok}" "gemini:${AGY_BIN:-agy}" \
+              "kimi:${KIMI_BIN:-kimi}" "qwen:${QWEN_BIN:-qwen}" \
+              "opencode:${OPENCODE_BIN:-opencode}"; do
+    name="${spec%%:*}"; bin="${spec#*:}"
+    if command -v "$bin" >/dev/null 2>&1; then present="$present $name"; else absent="$absent $name"; fi
+  done
+  # Direct-API vendors (OpenAI-compatible, no CLI): reachable iff curl exists
+  # and the matching API key is set. Keep aligned with
+  # OMNILANE_DIRECT_API_VENDORS in lib/common.sh.
+  if command -v curl >/dev/null 2>&1; then
+    for spec in "openrouter:${OPENROUTER_API_KEY:-}" "deepseek:${DEEPSEEK_API_KEY:-}" \
+                "zai:${ZAI_API_KEY:-}" "mistral:${MISTRAL_API_KEY:-}" \
+                "groq:${GROQ_API_KEY:-}" "cerebras:${CEREBRAS_API_KEY:-}"; do
+      name="${spec%%:*}"; key="${spec#*:}"
+      if [[ -n "$key" ]]; then present="$present $name"; else absent="$absent $name"; fi
+    done
+  else
+    absent="$absent openrouter deepseek zai mistral groq cerebras"
+  fi
+  printf '%s|%s' "${present# }" "${absent# }"
+)"
+vendor_present="${vendor_line%%|*}"
+vendor_absent="${vendor_line#*|}"
+if [[ -n "$vendor_present" ]]; then
+  report PASS vendors "present: $vendor_present${vendor_absent:+; missing: $vendor_absent}"
+else
+  report WARN vendors "no vendor CLI reachable${vendor_absent:+ (missing: $vendor_absent)}; every lane degrades to off"
+fi
+
 if command -v python3 >/dev/null 2>&1; then
   if python3 -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 9) else 1)' \
       >/dev/null 2>&1; then

package/scripts/jobs.sh

@@ -48,7 +48,7 @@ die() {
   exit "$rc"
 }
 
-USAGE_TEXT="usage: jobs.sh [--json] list|status ID|result ID|tail ID [--lines N]|retry ID [--background]|stats [--last N]|wait ID [--timeout N]|audit [--last N]|prune [--keep N] [--older-than DAYS] [--apply]|help"
+USAGE_TEXT="usage: jobs.sh [--json] list [--lane L] [--vendor V] [--status running|done]|status ID|result ID|tail ID [--lines N]|retry ID [--background]|stats [--last N] [--lane L] [--vendor V]|wait ID [--timeout N]|cancel ID|rm ID|audit [--last N]|prune [--keep N] [--older-than DAYS] [--apply]|help"
 
 usage() {
   die 2 "$USAGE_TEXT"
@@ -132,7 +132,7 @@ read_job_pid() {
 
 parse_stats_metadata() {
   local value="$1"
-  local metadata_re='^\{"lane":"([a-z][a-z0-9-]*)","vendor":"(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter|exec)"(,|})'
+  local metadata_re='^\{"lane":"([a-z][a-z0-9-]*)","vendor":"('"$OMNILANE_VENDOR_ALT"')"(,|})'
   STATS_LANE=""
   STATS_VENDOR=""
   [[ "$value" =~ $metadata_re ]] || return 1
@@ -143,7 +143,7 @@ parse_stats_metadata() {
 parse_audit_metadata() {
   local value="$1" metadata_re
   local json_string='([^"\\]|\\["\\/bfnrt]|\\u[0-9a-fA-F]{4})*'
-  metadata_re="^\\{\"lane\":\"[a-z][a-z0-9-]*\",\"vendor\":\"(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter|exec)\",\"model\":\"${json_string}\",\"effort\":\"${json_string}\",\"timeout\":(0|[1-9][0-9]*),\"job_timeout\":(null|0|[1-9][0-9]*),\"mode\":\"(advise|work)\",\"workdir\":\"${json_string}\",\"candidate\":\"[1-9][0-9]*/[1-9][0-9]*\",\"started\":\"[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z\"\\}$"
+  metadata_re="^\\{\"lane\":\"[a-z][a-z0-9-]*\",\"vendor\":\"(${OMNILANE_VENDOR_ALT})\",\"model\":\"${json_string}\",\"effort\":\"${json_string}\",\"timeout\":(0|[1-9][0-9]*),\"job_timeout\":(null|0|[1-9][0-9]*),\"mode\":\"(advise|work)\",\"workdir\":\"${json_string}\",\"candidate\":\"[1-9][0-9]*/[1-9][0-9]*\",\"started\":\"[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z\"\\}$"
   [[ "$value" =~ $metadata_re ]]
 }
 
@@ -252,7 +252,7 @@ case "${1:-}" in
     read_public_metadata "$JOB_DIR/meta.json" || {
       die 1 "cannot retry: unreadable job metadata"
     }
-    retry_re='^\{"lane":"([a-z][a-z0-9-]*)","vendor":"(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter|exec)","model":"([^"\\]*)","effort":"([^"\\]*)","timeout":([1-9][0-9]*),"job_timeout":([1-9][0-9]*|null),"mode":"(advise|work)","workdir":"([^"\\]*)",'
+    retry_re='^\{"lane":"([a-z][a-z0-9-]*)","vendor":"('"$OMNILANE_VENDOR_ALT"')","model":"([^"\\]*)","effort":"([^"\\]*)","timeout":([1-9][0-9]*),"job_timeout":([1-9][0-9]*|null),"mode":"(advise|work)","workdir":"([^"\\]*)",'
     [[ "$PUBLIC_METADATA" =~ $retry_re ]] || {
       die 1 "cannot retry: job metadata is not safely parseable"
     }
@@ -420,18 +420,27 @@ case "${1:-}" in
     [[ "$findings" -eq 0 ]] || exit 1 ;;
   stats)
     limit=100
+    filter_lane=""; filter_vendor=""
     shift
     while [[ $# -gt 0 ]]; do
       case "$1" in
         --last)
           [[ $# -ge 2 ]] || usage
           limit="$2"; shift 2 ;;
+        --lane)
+          [[ $# -ge 2 ]] || usage
+          filter_lane="$2"; shift 2 ;;
+        --vendor)
+          [[ $# -ge 2 ]] || usage
+          filter_vendor="$2"; shift 2 ;;
         *) usage ;;
       esac
     done
     [[ "$limit" =~ ^[1-9][0-9]{0,3}$ && "$limit" -le 10000 ]] || {
       die 2 "invalid --last value (want 1..10000)"
     }
+    [[ -z "$filter_lane" || "$filter_lane" =~ ^[a-z][a-z0-9-]*$ ]] || die 2 "invalid --lane value"
+    [[ -z "$filter_vendor" ]] || omnilane_known_vendor "$filter_vendor" || die 2 "invalid --vendor value"
     sampled=0
     succeeded=0
     failed=0
@@ -451,8 +460,21 @@ case "${1:-}" in
     fi
     if [[ ${#ids[@]} -gt 0 ]]; then
       while IFS= read -r id; do
-        sampled=$((sampled + 1))
         job_dir="$JOBS/$id"
+        # Resolve lane/vendor first so a --lane/--vendor filter can exclude a job
+        # before it counts toward any aggregate.
+        meta_ok=0
+        metadata_path="$job_dir/meta.json"
+        if read_public_metadata "$metadata_path" &&
+           parse_stats_metadata "$PUBLIC_METADATA"; then
+          meta_ok=1
+        fi
+        if [[ -n "$filter_lane" || -n "$filter_vendor" ]]; then
+          [[ "$meta_ok" -eq 1 ]] || continue
+          [[ -z "$filter_lane" || "$filter_lane" == "$STATS_LANE" ]] || continue
+          [[ -z "$filter_vendor" || "$filter_vendor" == "$STATS_VENDOR" ]] || continue
+        fi
+        sampled=$((sampled + 1))
         exit_path="$job_dir/exit"
         if [[ -e "$exit_path" || -L "$exit_path" ]]; then
           if read_exit_code "$exit_path"; then
@@ -467,9 +489,7 @@ case "${1:-}" in
         else
           running=$((running + 1))
         fi
-        metadata_path="$job_dir/meta.json"
-        if read_public_metadata "$metadata_path" &&
-           parse_stats_metadata "$PUBLIC_METADATA"; then
+        if [[ "$meta_ok" -eq 1 ]]; then
           lanes+=("$STATS_LANE")
           vendors+=("$STATS_VENDOR")
         else
@@ -501,7 +521,22 @@ case "${1:-}" in
       fi
     fi ;;
   list)
-    [[ $# -eq 1 ]] || usage
+    filter_lane=""; filter_vendor=""; filter_status=""
+    shift
+    while [[ $# -gt 0 ]]; do
+      case "$1" in
+        --lane)   [[ $# -ge 2 ]] || usage; filter_lane="$2"; shift 2 ;;
+        --vendor) [[ $# -ge 2 ]] || usage; filter_vendor="$2"; shift 2 ;;
+        --status) [[ $# -ge 2 ]] || usage; filter_status="$2"; shift 2 ;;
+        *) usage ;;
+      esac
+    done
+    [[ -z "$filter_lane" || "$filter_lane" =~ ^[a-z][a-z0-9-]*$ ]] || die 2 "invalid --lane value"
+    [[ -z "$filter_vendor" ]] || omnilane_known_vendor "$filter_vendor" || die 2 "invalid --vendor value"
+    case "$filter_status" in
+      ""|running|done) ;;
+      *) die 2 "invalid --status value (want running or done)" ;;
+    esac
     if [[ ! -d "$JOBS" ]]; then
       [[ "$JSON_MODE" -eq 0 ]] || printf '{"schema_version":1,"command":"list","ok":true,"jobs":[]}\n'
       exit 0
@@ -519,6 +554,7 @@ case "${1:-}" in
     fi
     [[ "$JSON_MODE" -eq 0 ]] || printf '{"schema_version":1,"command":"list","ok":true,"jobs":['
     json_first=1
+    shown=0
     while IFS= read -r id; do
       state="running"
       exit_json="null"
@@ -555,6 +591,21 @@ case "${1:-}" in
       elif [[ -e "$metadata_path" || -L "$metadata_path" ]]; then
         metadata_status="invalid"
       fi
+      if [[ -n "$filter_status" ]]; then
+        case "$json_state" in
+          done) [[ "$filter_status" == "done" ]] || continue ;;
+          running) [[ "$filter_status" == "running" ]] || continue ;;
+          *) continue ;;
+        esac
+      fi
+      if [[ -n "$filter_lane" || -n "$filter_vendor" ]]; then
+        if [[ "$metadata_status" == "valid" ]] && parse_stats_metadata "$metadata"; then
+          [[ -z "$filter_lane" || "$filter_lane" == "$STATS_LANE" ]] || continue
+          [[ -z "$filter_vendor" || "$filter_vendor" == "$STATS_VENDOR" ]] || continue
+        else
+          continue
+        fi
+      fi
       if [[ "$JSON_MODE" -eq 1 ]]; then
         [[ "$json_first" -eq 1 ]] || printf ','
         json_first=0
@@ -563,7 +614,9 @@ case "${1:-}" in
       else
         printf '%s  %s  %s\n' "$id" "$state" "$metadata"
       fi
-    done < <(printf '%s\n' "${ids[@]}" | LC_ALL=C sort -r | sed -n '1,20p')
+      shown=$((shown + 1))
+      if [[ "$shown" -ge 20 ]]; then break; fi
+    done < <(printf '%s\n' "${ids[@]}" | LC_ALL=C sort -r)
     [[ "$JSON_MODE" -eq 0 ]] || printf ']}\n' ;;
   status)
     [[ $# -eq 2 ]] || usage
@@ -672,6 +725,75 @@ case "${1:-}" in
       fi
       sleep 1
     done ;;
+  cancel)
+    [[ "$JSON_MODE" -eq 0 && $# -eq 2 ]] || usage
+    select_job "$2"
+    exit_path="$JOB_DIR/exit"
+    if [[ -e "$exit_path" || -L "$exit_path" ]]; then
+      if read_exit_code "$exit_path"; then
+        echo "already finished (exit $RECORDED_EXIT)"
+      else
+        echo "already finished (invalid exit metadata)"
+      fi
+      exit 0
+    fi
+    pid=""; pid_state="missing"
+    if [[ -e "$JOB_DIR/pid" || -L "$JOB_DIR/pid" ]]; then
+      if read_job_pid "$JOB_DIR/pid"; then pid="$RECORDED_PID"; pid_state="valid"; else pid_state="invalid"; fi
+    fi
+    if [[ "$pid_state" != "valid" ]] || ! kill -0 "$pid" 2>/dev/null; then
+      echo "not running (no live worker to cancel)"
+      exit 0
+    fi
+    # Background workers run as their own process-group leader (dispatch `set -m`),
+    # and that leader traps SIGTERM to record a best-effort exit code. Signal the
+    # whole group so the vendor CLI child dies too and the worker writes its exit.
+    cancel_grp="$pid"
+    cancel_pgid="$(ps -o pgid= -p "$pid" 2>/dev/null | tr -d '[:space:]' || true)"
+    [[ "$cancel_pgid" =~ ^[1-9][0-9]*$ ]] && cancel_grp="$cancel_pgid"
+    kill -TERM "-$cancel_grp" 2>/dev/null || kill -TERM "$pid" 2>/dev/null || true
+    cancel_waited=0
+    while [[ "$cancel_waited" -lt 5 ]]; do
+      if [[ -e "$exit_path" || -L "$exit_path" ]]; then break; fi
+      if ! kill -0 "$pid" 2>/dev/null; then break; fi
+      sleep 1; cancel_waited=$((cancel_waited + 1))
+    done
+    if kill -0 "$pid" 2>/dev/null; then
+      # The TERM trap did not fire in time; SIGKILL cannot be trapped, so no exit
+      # gets recorded — force the group down and record the terminal state below.
+      kill -KILL "-$cancel_grp" 2>/dev/null || kill -KILL "$pid" 2>/dev/null || true
+      sleep 1
+    fi
+    if [[ -e "$exit_path" || -L "$exit_path" ]]; then
+      if read_exit_code "$exit_path"; then
+        echo "cancelled (exit $RECORDED_EXIT)"
+      else
+        echo "cancelled (invalid exit metadata)"
+      fi
+    elif kill -0 "$pid" 2>/dev/null; then
+      die 1 "cancel could not terminate worker pid $pid"
+    else
+      (umask 077; printf '137\n' > "$exit_path")
+      echo "cancelled (exit 137)"
+    fi
+    exit 0 ;;
+  rm)
+    [[ "$JSON_MODE" -eq 0 && $# -eq 2 ]] || usage
+    select_job "$2"
+    exit_path="$JOB_DIR/exit"
+    # Refuse to delete a job whose worker is still alive: removing the directory
+    # out from under a running worker would strand it writing into a deleted path.
+    # A recorded exit (finished) or a dead pid (crashed worker) is safe to remove.
+    if [[ ! -e "$exit_path" && ! -L "$exit_path" ]]; then
+      if [[ -e "$JOB_DIR/pid" || -L "$JOB_DIR/pid" ]] &&
+         read_job_pid "$JOB_DIR/pid" && kill -0 "$RECORDED_PID" 2>/dev/null; then
+        die 1 "job is running (pid $RECORDED_PID); cancel it first"
+      fi
+    fi
+    # select_job already proved $JOB_DIR is a real child dir, never a symlink.
+    /bin/rm -rf "$JOB_DIR"
+    echo "removed $2"
+    exit 0 ;;
   result)
     [[ $# -eq 2 ]] || usage
     select_job "$2"

package/scripts/lib/common.sh

@@ -64,6 +64,57 @@ write_current_pid_file() {
   mv "$tmp" "$path"
 }
 
+# ---- Vendor registry (single source of truth) ---------------------------
+# Two vendor kinds. CLI-agent vendors run a local binary (see vendor_bin).
+# Direct-API vendors are OpenAI-compatible /chat/completions endpoints driven
+# by run-openai-compat.sh (curl + an API key, no CLI). To add an
+# OpenAI-compatible vendor: add its name to OMNILANE_DIRECT_API_VENDORS, add a
+# vendor_api_spec row, add a runners/run-<name>.sh wrapper, and a model row in
+# configure.sh. Every validation site derives from these lists.
+OMNILANE_CLI_VENDORS="codex claude grok gemini kimi qwen opencode"
+OMNILANE_DIRECT_API_VENDORS="openrouter deepseek zai mistral groq cerebras"
+
+# Pipe-joined vendor alternations for =~ checks and JSON metadata regexes.
+# _OVERRIDE covers what --vendor may pin (no exec/off); _ALT adds the "exec"
+# bring-your-own gate. Built from the lists above — the single source of truth.
+OMNILANE_OVERRIDE_VENDOR_ALT=""
+for _omnilane_v in $OMNILANE_CLI_VENDORS $OMNILANE_DIRECT_API_VENDORS; do
+  OMNILANE_OVERRIDE_VENDOR_ALT="${OMNILANE_OVERRIDE_VENDOR_ALT:+$OMNILANE_OVERRIDE_VENDOR_ALT|}$_omnilane_v"
+done
+unset _omnilane_v
+# shellcheck disable=SC2034  # consumed by jobs.sh/dispatch.sh which source this file
+OMNILANE_VENDOR_ALT="$OMNILANE_OVERRIDE_VENDOR_ALT|exec"
+
+# Direct-API vendor -> "BASE_URL_DEFAULT|KEY_ENV|MODEL_HINT". Base URL is
+# overridable per vendor via <VENDOR>_BASE_URL (e.g. DEEPSEEK_BASE_URL).
+vendor_api_spec() {
+  case "$1" in
+    openrouter) echo "https://openrouter.ai/api/v1|OPENROUTER_API_KEY|anthropic/claude-sonnet-4" ;;
+    deepseek)   echo "https://api.deepseek.com|DEEPSEEK_API_KEY|deepseek-chat" ;;
+    zai)        echo "https://api.z.ai/api/openai/v1|ZAI_API_KEY|glm-4.6" ;;
+    mistral)    echo "https://api.mistral.ai/v1|MISTRAL_API_KEY|devstral-latest" ;;
+    groq)       echo "https://api.groq.com/openai/v1|GROQ_API_KEY|qwen/qwen3.6-27b" ;;
+    cerebras)   echo "https://api.cerebras.ai/v1|CEREBRAS_API_KEY|qwen-3-32b" ;;
+    *)          echo "" ;;
+  esac
+}
+
+vendor_is_direct_api() { # 0 if vendor is an OpenAI-compatible direct-API vendor
+  local _v
+  # Exact token match — a substring `case` would accept adjacent-pair strings
+  # like "openrouter deepseek".
+  for _v in $OMNILANE_DIRECT_API_VENDORS; do [[ "$1" == "$_v" ]] && return 0; done
+  return 1
+}
+
+omnilane_known_vendor() { # 0 if vendor is dispatchable (CLI, direct-API, or exec)
+  local _v
+  for _v in $OMNILANE_CLI_VENDORS $OMNILANE_DIRECT_API_VENDORS exec; do
+    [[ "$1" == "$_v" ]] && return 0
+  done
+  return 1
+}
+
 vendor_bin() { # vendor -> binary (honors local.sh overrides)
   case "$1" in
     codex)  echo "${CODEX_BIN:-codex}" ;;
@@ -82,9 +133,12 @@ vendor_available() {
   # checked at dispatch time (the chain resolver cannot see it here).
   # "vote" is the built-in multi-model panel: needs >=2 voters, checked at dispatch.
   [[ "$1" == "exec" || "$1" == "vote" ]] && return 0
-  # "openrouter" is direct-API (no CLI): available iff curl and a key exist.
-  if [[ "$1" == "openrouter" ]]; then
-    command -v curl >/dev/null 2>&1 && [[ -n "${OPENROUTER_API_KEY:-}" ]]
+  # Direct-API vendors have no CLI: available iff curl and their API key exist.
+  if vendor_is_direct_api "$1"; then
+    local spec key_env
+    spec="$(vendor_api_spec "$1")"
+    key_env="${spec#*|}"; key_env="${key_env%%|*}"
+    command -v curl >/dev/null 2>&1 && [[ -n "${!key_env:-}" ]]
     return
   fi
   local b; b="$(vendor_bin "$1")"

package/scripts/runners/run-cerebras.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# omnilane runner: Cerebras (OpenAI-compatible direct API). Thin wrapper over
+# run-openai-compat.sh; endpoint and default model live in vendor_api_spec.
+# Override the endpoint with CEREBRAS_BASE_URL; needs CEREBRAS_API_KEY.
+export OMNILANE_OAI_VENDOR=cerebras
+exec "$(dirname "${BASH_SOURCE[0]}")/run-openai-compat.sh" "$@"

package/scripts/runners/run-deepseek.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# omnilane runner: DeepSeek (OpenAI-compatible direct API). Thin wrapper over
+# run-openai-compat.sh; endpoint and default model live in vendor_api_spec.
+# Override the endpoint with DEEPSEEK_BASE_URL; needs DEEPSEEK_API_KEY.
+export OMNILANE_OAI_VENDOR=deepseek
+exec "$(dirname "${BASH_SOURCE[0]}")/run-openai-compat.sh" "$@"

package/scripts/runners/run-groq.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# omnilane runner: Groq (OpenAI-compatible direct API). Thin wrapper over
+# run-openai-compat.sh; endpoint and default model live in vendor_api_spec.
+# Override the endpoint with GROQ_BASE_URL; needs GROQ_API_KEY.
+export OMNILANE_OAI_VENDOR=groq
+exec "$(dirname "${BASH_SOURCE[0]}")/run-openai-compat.sh" "$@"

package/scripts/runners/run-mistral.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# omnilane runner: Mistral (OpenAI-compatible direct API). Thin wrapper over
+# run-openai-compat.sh; endpoint and default model live in vendor_api_spec.
+# Override the endpoint with MISTRAL_BASE_URL; needs MISTRAL_API_KEY.
+export OMNILANE_OAI_VENDOR=mistral
+exec "$(dirname "${BASH_SOURCE[0]}")/run-openai-compat.sh" "$@"