omnilane 0.20.0 → 0.21.0

package/scripts/lib/job-worker.sh

@@ -7,6 +7,8 @@ set -euo pipefail
 # Runtime-relative shared library.
 # shellcheck disable=SC1091
 source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
+# shellcheck disable=SC1091
+source "$OMNILANE_REPO/scripts/lib/live-protocol.sh"
 
 [[ $# -eq 7 ]] || { echo "omnilane: internal job worker received invalid arguments" >&2; exit 2; }
 VENDOR="$1"; MODE="$2"; WORKDIR="$3"; MODEL="$4"; EFFORT="$5"
@@ -70,43 +72,72 @@ run_single_shot() {
   return "$rc"
 }
 
-if [[ "$VENDOR" != "claude" ]]; then
+SESSION_MODE="${OMNILANE_SESSION_MODE:-auto}"
+IDLE_TIMEOUT="${OMNILANE_IDLE_TIMEOUT:-900}"
+LIVE_REQUIRED="${OMNILANE_LIVE_REQUIRED:-0}"
+[[ "$SESSION_MODE" == "auto" || "$SESSION_MODE" == "live" || "$SESSION_MODE" == "single-shot" ]] || {
+  echo "omnilane: invalid worker session mode" >&2; exit 2
+}
+[[ "$IDLE_TIMEOUT" =~ ^(0|[1-9][0-9]*)$ ]] || {
+  echo "omnilane: invalid worker idle timeout" >&2; exit 2
+}
+[[ "$LIVE_REQUIRED" == "0" || "$LIVE_REQUIRED" == "1" ]] || {
+  echo "omnilane: invalid worker live requirement" >&2; exit 2
+}
+if [[ "$SESSION_MODE" == "auto" ]]; then
+  if live_vendor_capable "$VENDOR"; then SESSION_MODE="live"; else SESSION_MODE="single-shot"; fi
+fi
+
+if [[ "$SESSION_MODE" == "single-shot" ]]; then
   set +e
-  run_single_shot "omnilane: vendor '$VENDOR' is not live-capable; ran in single-shot mode"
+  if live_vendor_capable "$VENDOR"; then
+    run_single_shot "omnilane: vendor '$VENDOR' was resolved to single-shot mode"
+  else
+    run_single_shot "omnilane: vendor '$VENDOR' is not live-capable; ran in single-shot mode"
+  fi
   rc=$?
   set -e
   exit "$rc"
 fi
 
+if ! live_vendor_capable "$VENDOR"; then
+  echo "omnilane: vendor '$VENDOR' cannot run required live session; live-capable vendors: $(live_capable_vendors)" >&2
+  exit 2
+fi
+
 JOB_DIR="${OUTPUT_FILE%/*}"
 JOB_ID="${JOB_DIR##*/}"
 INBOX_FIFO="$JOB_DIR/inbox.fifo"
+RUNNER_INBOX_FIFO="$JOB_DIR/runner-inbox.fifo"
 HOLDER_PID_FILE="$JOB_DIR/inbox.holder.pid"
 READY_FILE="$JOB_DIR/inbox.ready"
 EVENTS_FILE="${OUTPUT_FILE}.events.jsonl"
 EVENTS_ALIAS="$JOB_DIR/events.jsonl"
 close_requested=0
-inbox_holder_open=0
+close_reason=""
+runner_writer_open=0
+inbox_open=0
+events_reader_open=0
 runner_pid=""
 
 # Invoked by the EXIT trap below.
 # shellcheck disable=SC2329
 cleanup_live_mailbox() {
-  if [[ "$inbox_holder_open" -eq 1 ]]; then
-    exec 3>&-
-    inbox_holder_open=0
-  fi
-  rm "$READY_FILE" "$HOLDER_PID_FILE" "$INBOX_FIFO" 2>/dev/null || true
+  if [[ "$runner_writer_open" -eq 1 ]]; then exec 3>&-; runner_writer_open=0; fi
+  if [[ "$inbox_open" -eq 1 ]]; then exec 4>&-; inbox_open=0; fi
+  if [[ "$events_reader_open" -eq 1 ]]; then exec 5<&-; events_reader_open=0; fi
+  rm "$READY_FILE" "$HOLDER_PID_FILE" "$INBOX_FIFO" "$RUNNER_INBOX_FIFO" 2>/dev/null || true
 }
 
 prepare_live_mailbox() {
   local path old_umask rc=0
-  for path in "$INBOX_FIFO" "$HOLDER_PID_FILE" "$READY_FILE" "$EVENTS_FILE" "$EVENTS_ALIAS"; do
+  for path in "$INBOX_FIFO" "$RUNNER_INBOX_FIFO" "$HOLDER_PID_FILE" \
+    "$READY_FILE" "$EVENTS_FILE" "$EVENTS_ALIAS"; do
     [[ ! -e "$path" && ! -L "$path" ]] || return 1
   done
   old_umask="$(umask)"
   umask 077
-  mkfifo "$INBOX_FIFO" || rc=$?
+  mkfifo "$INBOX_FIFO" "$RUNNER_INBOX_FIFO" || rc=$?
   if [[ "$rc" -eq 0 ]]; then
     : > "$EVENTS_FILE" || rc=$?
   fi
@@ -114,31 +145,38 @@ prepare_live_mailbox() {
     ln "$EVENTS_FILE" "$EVENTS_ALIAS" || rc=$?
   fi
   if [[ "$rc" -eq 0 ]]; then
-    chmod 600 "$INBOX_FIFO" "$EVENTS_FILE" "$EVENTS_ALIAS" || rc=$?
+    chmod 600 "$INBOX_FIFO" "$RUNNER_INBOX_FIFO" "$EVENTS_FILE" "$EVENTS_ALIAS" || rc=$?
   fi
   umask "$old_umask"
   if [[ "$rc" -ne 0 ]]; then
-    rm "$EVENTS_ALIAS" "$EVENTS_FILE" "$INBOX_FIFO" 2>/dev/null || true
+    rm "$EVENTS_ALIAS" "$EVENTS_FILE" "$INBOX_FIFO" "$RUNNER_INBOX_FIFO" 2>/dev/null || true
   fi
   return "$rc"
 }
 
 last_result_status() {
-  local last_result
-  last_result="$(grep -E '"type"[[:space:]]*:[[:space:]]*"result"' "$EVENTS_FILE" 2>/dev/null | tail -n 1 || true)"
+  local event last_result=""
+  while IFS= read -r event || [[ -n "$event" ]]; do
+    if live_event_is_result "$VENDOR" "$event"; then last_result="$event"; fi
+  done < "$EVENTS_FILE"
   [[ -n "$last_result" ]] || return 1
-  [[ ! "$last_result" =~ "is_error"[[:space:]]*:[[:space:]]*true ]]
+  live_event_is_success "$VENDOR" "$last_result"
 }
 
 if ! prepare_live_mailbox; then
+  if [[ "$LIVE_REQUIRED" -eq 1 ]]; then
+    echo "omnilane: required $VENDOR live mailbox unavailable because FIFO setup failed" >&2
+    exit 1
+  fi
   set +e
-  run_single_shot "omnilane: Claude live mailbox unavailable because FIFO setup failed; ran in single-shot mode"
+  run_single_shot "omnilane: $VENDOR live mailbox unavailable because FIFO setup failed; ran in single-shot mode"
   rc=$?
   set -e
   exit "$rc"
 fi
 
 trap 'close_requested=1' USR1
+trap 'close_requested=1' PIPE
 trap cleanup_live_mailbox EXIT
 truncate_payload "$PROMPT_FILE" 102400
 INITIAL_TEXT="$(cat "$PROMPT_FILE")"
@@ -149,44 +187,67 @@ else
 fi
 
 write_current_pid_file "$HOLDER_PID_FILE"
-export OMNILANE_INBOX="$INBOX_FIFO"
+export OMNILANE_INBOX="$RUNNER_INBOX_FIFO"
 "$RUNNER" "$MODE" "$WORKDIR" "$MODEL" "$EFFORT" "$PROMPT_FILE" "$OUTPUT_FILE" &
 runner_pid=$!
 
-# Open only after the reader starts. The runner was launched first, so it cannot
-# inherit this write descriptor. FD 3 is the named holder for the conversation.
-exec 3> "$INBOX_FIFO"
-inbox_holder_open=1
-if [[ "$close_requested" -eq 0 ]]; then
-  printf '{"type":"user","omnilane_job_id":"%s","foreman_session":"%s","message":{"role":"user","content":[{"type":"text","text":"%s"}]}}\n' \
-    "$(json_escape "$JOB_ID")" "$(json_escape "$FOREMAN_SESSION_VALUE")" \
-    "$(json_escape "$INITIAL_TEXT")" >&3
-fi
+# Open the runner writer only after its FIFO reader starts.
+exec 3> "$RUNNER_INBOX_FIFO"
+runner_writer_open=1
+exec 4<> "$INBOX_FIFO"
+inbox_open=1
+exec 5< "$EVENTS_FILE"
+events_reader_open=1
+initial_payload="$(live_encode_message "$VENDOR" "$JOB_ID" "$FOREMAN_SESSION_VALUE" "$INITIAL_TEXT")"
+if ! printf '%s\n' "$initial_payload" >&3; then close_requested=1; fi
 (umask 077; : > "$READY_FILE")
 
+last_activity=$SECONDS
+while kill -0 "$runner_pid" 2>/dev/null; do
+  [[ "$close_requested" -eq 0 ]] || break
+  incoming=""
+  if IFS= read -r -t 1 incoming <&4; then
+    if ! printf '%s\n' "$incoming" >&3; then close_requested=1; fi
+    last_activity=$SECONDS
+  fi
+  while IFS= read -r event <&5; do
+    if live_event_is_result "$VENDOR" "$event"; then
+      last_activity=$SECONDS
+    fi
+  done
+  if [[ "$IDLE_TIMEOUT" -gt 0 && $((SECONDS - last_activity)) -ge "$IDLE_TIMEOUT" ]]; then
+    close_reason="closed by idle cap after ${IDLE_TIMEOUT}s"
+    close_requested=1
+  fi
+done
+
+if [[ "$runner_writer_open" -eq 1 ]]; then exec 3>&-; runner_writer_open=0; fi
+if [[ "$inbox_open" -eq 1 ]]; then exec 4>&-; inbox_open=0; fi
+if [[ "$events_reader_open" -eq 1 ]]; then exec 5<&-; events_reader_open=0; fi
+
 set +e
-wait "$runner_pid"
+if [[ "$close_requested" -eq 1 ]]; then
+  kill -TERM "$runner_pid" 2>/dev/null || true
+fi
+wait "$runner_pid" 2>/dev/null
 runner_rc=$?
 set -e
 
+if [[ -n "$close_reason" ]]; then
+  printf '\n%s\n' "$close_reason" >> "$OUTPUT_FILE"
+  emit_mode_notice "$close_reason" || true
+fi
+
 if [[ "$close_requested" -eq 1 ]]; then
-  exec 3>&-
-  inbox_holder_open=0
-  set +e
-  kill -TERM "$runner_pid" 2>/dev/null || true
-  wait "$runner_pid" 2>/dev/null
-  set -e
   if last_result_status; then
     rc=0
   else
     rc=1
-    emit_mode_notice "omnilane: Claude live mailbox closed without a successful result event"
+    emit_mode_notice "omnilane: $VENDOR live mailbox closed without a successful result event" || true
   fi
 else
-  exec 3>&-
-  inbox_holder_open=0
   rc="$runner_rc"
 fi
 
-trap - USR1
+trap - USR1 PIPE
 exit "$rc"

package/scripts/lib/live-protocol.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+# Shared live-mailbox protocol differences. Callers provide json_escape().
+
+live_capable_vendors() {
+  printf 'claude, gemini'
+}
+
+live_vendor_capable() {
+  case "$1" in
+    claude|gemini) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+live_encode_message() {
+  local vendor="$1" job_id="$2" foreman_session="$3" text="$4"
+  case "$vendor" in
+    claude)
+      printf '{"type":"user","omnilane_job_id":"%s","foreman_session":"%s","message":{"role":"user","content":[{"type":"text","text":"%s"}]}}' \
+        "$(json_escape "$job_id")" "$(json_escape "$foreman_session")" \
+        "$(json_escape "$text")"
+      ;;
+    gemini)
+      printf '{"event":"user","message":{"role":"user","content":[{"type":"text","text":"%s"}]}}' \
+        "$(json_escape "$text")"
+      ;;
+    *) return 2 ;;
+  esac
+}
+
+live_event_is_result() {
+  local vendor="$1" event="$2" pattern
+  case "$vendor" in
+    claude) pattern='"type"[[:space:]]*:[[:space:]]*"result"' ;;
+    gemini) pattern='"event"[[:space:]]*:[[:space:]]*"result"' ;;
+    *) return 2 ;;
+  esac
+  [[ "$event" =~ $pattern ]]
+}
+
+live_event_is_success() {
+  local vendor="$1" event="$2" pattern
+  live_event_is_result "$vendor" "$event" || return 1
+  case "$vendor" in
+    claude)
+      pattern='"is_error"[[:space:]]*:[[:space:]]*true'
+      [[ ! "$event" =~ $pattern ]]
+      ;;
+    gemini)
+      pattern='"status"[[:space:]]*:[[:space:]]*"SUCCESS"'
+      [[ "$event" =~ $pattern ]]
+      ;;
+    *) return 2 ;;
+  esac
+}
+
+live_count_result_events() {
+  local vendor="$1" path="$2" event count=0
+  [[ -f "$path" && ! -L "$path" ]] || {
+    printf '0'
+    return 0
+  }
+  while IFS= read -r event || [[ -n "$event" ]]; do
+    if live_event_is_result "$vendor" "$event"; then
+      count=$((count + 1))
+    fi
+  done < "$path"
+  printf '%s' "$count"
+}

package/scripts/runners/run-gemini.sh

@@ -33,6 +33,115 @@ MODEL_ARGS=()
 # plan = read-only tools (advise), accept-edits = file edits allowed (work).
 if [[ "$MODE" == "advise" ]]; then MODE_ARGS=(--mode plan); else MODE_ARGS=(--mode accept-edits); fi
 
+LIVE_INBOX="${OMNILANE_INBOX:-}"
+if [[ -n "$LIVE_INBOX" && -p "$LIVE_INBOX" ]]; then
+  EVENTS_FILE="${OUTPUT_FILE}.events.jsonl"
+  STDERR_FILE="${OUTPUT_FILE}.stderr.log"
+  LIVE_CHILD_PID=""
+
+  if [[ -L "$EVENTS_FILE" || ( -e "$EVENTS_FILE" && ! -f "$EVENTS_FILE" ) ]]; then
+    echo "omnilane: unsafe Gemini live event path" >&2
+    exit 125
+  fi
+  (umask 077; : > "$EVENTS_FILE"; : > "$STDERR_FILE")
+
+  finalize_live_output() {
+    local tmp="${OUTPUT_FILE}.tmp"
+    if ! command -v python3 >/dev/null 2>&1; then
+      echo "omnilane: cannot extract Gemini live result: python3 not found" >> "$STDERR_FILE"
+      return 1
+    fi
+    if ! python3 - "$EVENTS_FILE" "$tmp" <<'PY'
+import json
+import pathlib
+import sys
+
+events_path = pathlib.Path(sys.argv[1])
+output_path = pathlib.Path(sys.argv[2])
+last_response = None
+
+with events_path.open(encoding="utf-8") as events:
+    for raw_line in events:
+        try:
+            event = json.loads(raw_line)
+        except json.JSONDecodeError:
+            continue
+        result = event.get("result")
+        if (
+            event.get("event") == "result"
+            and isinstance(result, dict)
+            and result.get("status") == "SUCCESS"
+            and isinstance(result.get("response"), str)
+        ):
+            last_response = result["response"]
+
+if last_response is None:
+    raise SystemExit(1)
+
+output_path.write_text(last_response.rstrip("\n") + "\n", encoding="utf-8")
+PY
+    then
+      echo "omnilane: Gemini live stream ended without a readable SUCCESS result" >> "$STDERR_FILE"
+      return 1
+    fi
+    mv "$tmp" "$OUTPUT_FILE"
+  }
+
+  # Invoked by signal traps below.
+  # shellcheck disable=SC2329
+  stop_live_child() {
+    local signal_rc="$1" waited=0
+    trap - TERM HUP INT
+    set +e
+    if [[ -n "$LIVE_CHILD_PID" ]] && kill -0 "$LIVE_CHILD_PID" 2>/dev/null; then
+      kill -TERM "-$LIVE_CHILD_PID" 2>/dev/null || kill -TERM "$LIVE_CHILD_PID" 2>/dev/null || true
+      while kill -0 "$LIVE_CHILD_PID" 2>/dev/null && [[ "$waited" -lt 50 ]]; do
+        sleep 0.1
+        waited=$((waited + 1))
+      done
+      if kill -0 "$LIVE_CHILD_PID" 2>/dev/null; then
+        kill -KILL "-$LIVE_CHILD_PID" 2>/dev/null || kill -KILL "$LIVE_CHILD_PID" 2>/dev/null || true
+      fi
+      wait "$LIVE_CHILD_PID" 2>/dev/null
+    fi
+    finalize_live_output || true
+    [[ -s "$STDERR_FILE" ]] || rm "$STDERR_FILE" 2>/dev/null || true
+    exit "$signal_rc"
+  }
+
+  set -m
+  (
+    cd "$RUN_DIR" || exit 127
+    run_with_timeout "$RUN_TIMEOUT" env \
+      -u GEMINI_API_KEY -u GOOGLE_API_KEY -u GOOGLE_AI_API_KEY \
+      NO_BROWSER=1 OMNILANE_DEPTH=1 \
+      "$AGY_BIN" --dangerously-skip-permissions --add-dir "$RUN_DIR" \
+      "${MODE_ARGS[@]}" ${MODEL_ARGS[@]+"${MODEL_ARGS[@]}"} \
+      --input-format stream-json --output-format stream-json -p "" \
+      < "$LIVE_INBOX" > "$EVENTS_FILE" 2> "$STDERR_FILE"
+  ) &
+  LIVE_CHILD_PID=$!
+  set +m
+  trap 'stop_live_child 143' TERM
+  trap 'stop_live_child 129' HUP
+  trap 'stop_live_child 130' INT
+
+  set +e
+  wait "$LIVE_CHILD_PID"
+  RC=$?
+  set -e
+  trap - TERM HUP INT
+  if ! finalize_live_output && [[ "$RC" -eq 0 ]]; then
+    RC=1
+  fi
+  if grep -Eiq "$CAPACITY_PATTERN" "$EVENTS_FILE" "$STDERR_FILE" 2>/dev/null; then
+    echo "omnilane: gemini capacity exhausted" >> "$STDERR_FILE"
+    RC=126
+  fi
+  [[ -s "$STDERR_FILE" ]] || rm "$STDERR_FILE" 2>/dev/null || true
+  exit "$RC"
+fi
+
 set +e
 (
   cd "$RUN_DIR" || exit 127