omnilane 0.8.1 → 0.8.3

package/scripts/configure.sh

@@ -18,6 +18,9 @@ GEMINI_MODELS=("Gemini 3.1 Pro (High)" "Gemini 3.1 Pro (Low)" "Gemini 3.5 Flash
 GROK_MODELS=("grok-4.5" "grok-4.3")
 KIMI_MODELS=("kimi-k3" "kimi-k2.7-code")
 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")
 
 custom_value_is_safe() {
   case "$1" in
@@ -76,7 +79,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 "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 "vote (multi-model panel)" "exec (your own script/gate)" off)"
   [[ "$vendor" == exec* ]] && vendor="exec"
   [[ "$vendor" == vote* ]] && vendor="vote"
   if [[ "$vendor" == "off" ]]; then
@@ -90,6 +93,9 @@ while true; do
     grok)   model="$(pick "$(msg cfg_model)" "${GROK_MODELS[@]}")";   effort="-" ;;
     kimi)   model="$(pick "$(msg cfg_model)" "${KIMI_MODELS[@]}")";   effort="-" ;;
     qwen)   model="$(pick "$(msg cfg_model)" "${QWEN_MODELS[@]}")";   effort="-" ;;
+    opencode)   model="$(pick "$(msg cfg_model)" "${OPENCODE_MODELS[@]}")"; effort="-"
+                [[ "$model" == "opencode/default"* ]] && model="-" ;;
+    openrouter) model="$(pick "$(msg cfg_model)" "${OPENROUTER_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)
+  --vendor V             pin one configured vendor (codex|claude|grok|gemini|kimi|qwen|opencode|openrouter)
   --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|exec|off)$ ]]; then
+        if ! [[ "$vendor" =~ ^(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter|exec|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)$ ]]; then
-  echo "omnilane: invalid vendor (codex|claude|grok|gemini|kimi|qwen)" >&2
+   ! [[ "$OVERRIDE_VENDOR" =~ ^(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter)$ ]]; then
+  echo "omnilane: invalid vendor (codex|claude|grok|gemini|kimi|qwen|opencode|openrouter)" >&2
   exit 2
 fi
 

package/scripts/jobs.sh

@@ -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|exec)"(,|})'
+  local metadata_re='^\{"lane":"([a-z][a-z0-9-]*)","vendor":"(codex|claude|grok|gemini|kimi|qwen|opencode|openrouter|exec)"(,|})'
   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|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\":\"(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\"\\}$"
   [[ "$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|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":"(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":"([^"\\]*)",'
     [[ "$PUBLIC_METADATA" =~ $retry_re ]] || {
       die 1 "cannot retry: job metadata is not safely parseable"
     }

package/scripts/lib/common.sh

@@ -72,6 +72,7 @@ vendor_bin() { # vendor -> binary (honors local.sh overrides)
     gemini) echo "${AGY_BIN:-agy}" ;;
     kimi)   echo "${KIMI_BIN:-kimi}" ;;
     qwen)   echo "${QWEN_BIN:-qwen}" ;;
+    opencode) echo "${OPENCODE_BIN:-opencode}" ;;
     *)      echo "" ;;
   esac
 }
@@ -81,6 +82,11 @@ 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:-}" ]]
+    return
+  fi
   local b; b="$(vendor_bin "$1")"
   [[ -n "$b" ]] && command -v "$b" >/dev/null 2>&1
 }

package/scripts/runners/run-opencode.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# omnilane runner: OpenCode CLI (multi-provider aggregator)
+#
+# Usage: run-opencode.sh MODE WORKDIR MODEL EFFORT PROMPT_FILE OUTPUT_FILE
+#   MODE = advise (built-in read-only plan agent) | work (may edit files)
+#
+# MODEL is OpenCode's provider/model form (e.g. openrouter/moonshotai/kimi-k2);
+# "-" lets OpenCode use its own configured default. OpenCode's --variant flag
+# is provider-specific, so EFFORT maps onto it only when set.
+
+source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
+
+MODE="$1"; WORKDIR="$2"; MODEL="$3"; EFFORT="$4"; PROMPT_FILE="$5"; OUTPUT_FILE="$6"
+
+OPENCODE_BIN="${OPENCODE_BIN:-opencode}"
+RUN_TIMEOUT="${OMNILANE_TIMEOUT:-600}"
+
+truncate_payload "$PROMPT_FILE" 140000
+
+# --agent plan is OpenCode's built-in restricted agent (edits/bash gated);
+# --auto only in work mode, and only for permissions not explicitly denied.
+ARGS=(run "$(cat "$PROMPT_FILE")" --format default)
+[[ -n "$MODEL" && "$MODEL" != "-" ]] && ARGS+=(-m "$MODEL")
+[[ -n "$EFFORT" && "$EFFORT" != "-" ]] && ARGS+=(--variant "$EFFORT")
+if [[ "$MODE" == "advise" ]]; then
+  ARGS+=(--agent plan)
+else
+  ARGS+=(--auto)
+fi
+
+set +e
+(
+  cd "$WORKDIR" || exit 127
+  OMNILANE_DEPTH=1 run_with_timeout "$RUN_TIMEOUT" \
+    "$OPENCODE_BIN" "${ARGS[@]}" \
+    > "${OUTPUT_FILE}.tmp" 2> "${OUTPUT_FILE}.stderr.log"
+)
+RC=$?
+set -e
+
+# Empty output is a failure, not a silent rc=0 success.
+if ! grep -q '[^[:space:]]' "${OUTPUT_FILE}.tmp" 2>/dev/null; then
+  echo "omnilane: opencode produced no output" >> "${OUTPUT_FILE}.stderr.log"
+  [[ "$RC" -eq 0 ]] && RC=1
+fi
+
+[[ -f "${OUTPUT_FILE}.tmp" ]] && mv "${OUTPUT_FILE}.tmp" "$OUTPUT_FILE"
+[[ -s "${OUTPUT_FILE}.stderr.log" ]] || rm "${OUTPUT_FILE}.stderr.log" 2>/dev/null || true
+exit "$RC"

package/scripts/runners/run-openrouter.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# omnilane runner: OpenRouter direct API (no CLI dependency)
+#
+# Usage: run-openrouter.sh MODE WORKDIR MODEL EFFORT PROMPT_FILE OUTPUT_FILE
+#   MODE = advise only. This vendor is pure inference over HTTPS — it has no
+#   agentic loop and cannot edit files, so work mode is a hard error rather
+#   than a silent read-only downgrade.
+#
+# MODEL is an OpenRouter model slug (e.g. anthropic/claude-sonnet-4). EFFORT
+# is accepted for interface parity only. Needs OPENROUTER_API_KEY and curl;
+# python3 builds/parses the JSON so prompt content never needs shell escaping.
+
+source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
+
+MODE="$1"; WORKDIR="$2"; MODEL="$3"; EFFORT="$4"; PROMPT_FILE="$5"; OUTPUT_FILE="$6"
+: "$WORKDIR" "$EFFORT" # parity with the uniform runner interface
+
+OPENROUTER_BASE_URL="${OPENROUTER_BASE_URL:-https://openrouter.ai/api/v1}"
+RUN_TIMEOUT="${OMNILANE_TIMEOUT:-600}"
+
+fail() { echo "omnilane: $1" > "${OUTPUT_FILE}.stderr.log"; exit 2; }
+
+[[ "$MODE" == "advise" ]] || fail "openrouter is inference-only: use --mode advise (work mode needs an agentic CLI vendor like opencode)"
+[[ -n "${OPENROUTER_API_KEY:-}" ]] || fail "OPENROUTER_API_KEY is not set"
+[[ -n "$MODEL" && "$MODEL" != "-" ]] || fail "openrouter needs an explicit model slug (e.g. anthropic/claude-sonnet-4)"
+command -v curl >/dev/null 2>&1 || fail "curl not found"
+command -v python3 >/dev/null 2>&1 || fail "python3 not found"
+
+truncate_payload "$PROMPT_FILE" 140000
+
+REQUEST_FILE="${OUTPUT_FILE}.request.json"
+RESPONSE_FILE="${OUTPUT_FILE}.response.json"
+cleanup() { rm "$REQUEST_FILE" "$RESPONSE_FILE" 2>/dev/null || true; }
+trap cleanup EXIT
+
+python3 - "$MODEL" "$PROMPT_FILE" > "$REQUEST_FILE" <<'PY'
+import json, sys
+model, prompt_file = sys.argv[1], sys.argv[2]
+with open(prompt_file, encoding="utf-8", errors="replace") as f:
+    prompt = f.read()
+json.dump({"model": model, "messages": [{"role": "user", "content": prompt}]},
+          sys.stdout)
+PY
+
+set +e
+run_with_timeout "$RUN_TIMEOUT" curl -sS --fail-with-body \
+  --max-time "$RUN_TIMEOUT" \
+  -H "Authorization: Bearer $OPENROUTER_API_KEY" \
+  -H "Content-Type: application/json" \
+  -X POST "$OPENROUTER_BASE_URL/chat/completions" \
+  --data-binary "@$REQUEST_FILE" \
+  > "$RESPONSE_FILE" 2> "${OUTPUT_FILE}.stderr.log"
+RC=$?
+set -e
+
+if [[ "$RC" -ne 0 ]]; then
+  # Surface the API error body (never the key) alongside curl's own stderr.
+  [[ -s "$RESPONSE_FILE" ]] && cat "$RESPONSE_FILE" >> "${OUTPUT_FILE}.stderr.log"
+  exit "$RC"
+fi
+
+set +e
+python3 - "$RESPONSE_FILE" > "${OUTPUT_FILE}.tmp" 2>> "${OUTPUT_FILE}.stderr.log" <<'PY'
+import json, sys
+with open(sys.argv[1], encoding="utf-8", errors="replace") as f:
+    data = json.load(f)
+if "error" in data:
+    print(f"omnilane: openrouter API error: {data['error']}", file=sys.stderr)
+    sys.exit(1)
+content = data["choices"][0]["message"]["content"]
+sys.stdout.write(content if isinstance(content, str) else json.dumps(content))
+PY
+RC=$?
+set -e
+
+# Empty output is a failure, not a silent rc=0 success.
+if ! grep -q '[^[:space:]]' "${OUTPUT_FILE}.tmp" 2>/dev/null; then
+  echo "omnilane: openrouter produced no output" >> "${OUTPUT_FILE}.stderr.log"
+  [[ "$RC" -eq 0 ]] && RC=1
+fi
+
+[[ -f "${OUTPUT_FILE}.tmp" ]] && mv "${OUTPUT_FILE}.tmp" "$OUTPUT_FILE"
+[[ -s "${OUTPUT_FILE}.stderr.log" ]] || rm "${OUTPUT_FILE}.stderr.log" 2>/dev/null || true
+exit "$RC"