@humanu/orchestra 0.5.58 → 0.5.61

package/resources/scripts/shell/bridge/ai.sh

@@ -2,6 +2,31 @@
 
 # shellcheck shell=bash
 
+ai_choose_provider() {
+  local primary="${AI_PRIMARY_PROVIDER:-anthropic}"
+  primary="$(printf '%s' "$primary" | tr '[:upper:]' '[:lower:]')"
+  if [[ "$primary" == "openai" ]]; then
+    if [[ -n "${OPENAI_API_KEY-}" ]]; then
+      echo "openai"
+      return 0
+    fi
+    if [[ -n "${ANTHROPIC_API_KEY-}" ]]; then
+      echo "anthropic"
+      return 0
+    fi
+  else
+    if [[ -n "${ANTHROPIC_API_KEY-}" ]]; then
+      echo "anthropic"
+      return 0
+    fi
+    if [[ -n "${OPENAI_API_KEY-}" ]]; then
+      echo "openai"
+      return 0
+    fi
+  fi
+  return 1
+}
+
 # AI generate name from base64 content
 bridge_ai_generate_name_from_base64() {
   if [[ -z "${1:-}" ]]; then
@@ -9,19 +34,66 @@ bridge_ai_generate_name_from_base64() {
     return 1
   fi
   content_b64="$1"
+  load_ai_primary_provider
+  load_openai_model
+  load_openai_api_key
   load_anthropic_api_key
-  if [[ -z "${ANTHROPIC_API_KEY-}" ]]; then
+  local provider
+  if ! provider="$(ai_choose_provider)"; then
     echo "\"missing_api_key\""
     return 0
   fi
   # Build request via Python to ensure proper JSON encoding
-  request_body=$(python3 - "$content_b64" <<'PY'
-import sys, json, base64
+  request_payload=$(python3 - "$content_b64" "$provider" "${OPENAI_MODEL:-gpt-4o-mini}" <<'PY'
+import sys, json, base64, re
+
 b64 = sys.argv[1]
+provider = sys.argv[2] if len(sys.argv) > 2 else "anthropic"
+openai_model = sys.argv[3] if len(sys.argv) > 3 and sys.argv[3] else "gpt-4o-mini"
 try:
-    content = base64.b64decode(b64.encode('utf-8')).decode('utf-8','ignore')
+    content = base64.b64decode(b64.encode('utf-8')).decode('utf-8', 'ignore')
 except Exception:
     content = ''
+
+def extract_command(line: str) -> str:
+    stripped = line.strip()
+    for lead in ("$ ", "> "):
+        if stripped.startswith(lead):
+            return stripped[len(lead):].strip()
+    for marker in ("$ ", "# "):
+        if marker in line:
+            return line.split(marker)[-1].strip()
+    return ""
+
+def normalize_app(cmd: str) -> str:
+    cmd = cmd.strip()
+    if not cmd:
+        return ""
+    for lead in ("$ ", "> "):
+        if cmd.startswith(lead):
+            cmd = cmd[len(lead):].strip()
+    parts = cmd.split()
+    if not parts:
+        return ""
+    if parts[0] in ("sudo", "env", "command"):
+        parts = parts[1:]
+    if not parts:
+        return ""
+    base = parts[0].split("/")[-1].lower()
+    base = re.sub(r"[^a-z0-9]+", "_", base).strip("_")
+    if base in {"bash", "zsh", "sh", "fish", "tmux", "login", "sudo", "man", "less", "more", "cat", "tail", "watch", "source", "export", "set", "alias", "unalias", "history", "bindkey"}:
+        return ""
+    return base
+
+lines = content.splitlines()
+last_cmd = ""
+for line in reversed(lines):
+    candidate = extract_command(line)
+    if candidate:
+        last_cmd = candidate
+        break
+
+app_prefix = normalize_app(last_cmd) or ""
 prompt = f"""Analyze this terminal session and create a descriptive name based ONLY on the console output and commands executed.
 
 Terminal output:
@@ -36,26 +108,15 @@ IMPORTANT: Look carefully at the terminal output for:
 
 CRITICAL GIT DETECTION: Check for ANY of these Git indicators in the last outputs:
 - Git commands: git status, git diff, git add, git commit, git push, git pull, git checkout, git branch, git merge, git rebase, git log, git stash, etc.
-- Git output patterns: \"On branch\", \"Your branch is\", \"Changes not staged\", \"Changes to be committed\", \"Untracked files\", \"modified:\", \"deleted:\", \"new file:\", \"renamed:\"
+- Git output patterns: "On branch", "Your branch is", "Changes not staged", "Changes to be committed", "Untracked files", "modified:", "deleted:", "new file:", "renamed:"
 - Git diff output: Lines starting with +, -, @@, diff --git
-- Git merge/rebase messages: \"CONFLICT\", \"Merge branch\", \"Rebase\", \"Cherry-pick\"
-- Git status indicators: \"nothing to commit\", \"working tree clean\", \"ahead of\", \"behind\"
-- Git error messages: \"fatal:\", \"error:\", \"warning:\" (when preceded by git commands)
-
-Use these prefixes based on detected application/context (PRIORITIZE git_ if Git patterns found):
-- git_ : ANY Git operations or Git output patterns detected (HIGHEST PRIORITY if found)
-- opencode_ : If you see Claude Code, OpenCode, Cursor, AI assistant interactions, or AI-powered coding
-- running_ : Dev servers (npm run dev, yarn dev, python manage.py runserver, rails server, etc.)
-- build_ : Build processes (npm run build, cargo build, make, webpack, etc.)
-- test_ : Testing (npm test, pytest, jest, cargo test, etc.)
-- docker_ : Docker commands, container operations
-- ssh_ : SSH connections, remote operations
-- db_ : Database operations (psql, mysql, mongo, migrations)
-- debug_ : Debugging sessions, error investigation
-- deploy_ : Deployment operations
-- Otherwise, no prefix for general development
-
-If Git patterns are detected, ALWAYS use git_ prefix, even if other activities are present.
+- Git merge/rebase messages: "CONFLICT", "Merge branch", "Rebase", "Cherry-pick"
+- Git status indicators: "nothing to commit", "working tree clean", "ahead of", "behind"
+- Git error messages: "fatal:", "error:", "warning:" (when preceded by git commands)
+
+DESCRIPTION ONLY: Return a short description of the activity.
+- Do NOT include the app/tool name or any prefix in the output.
+- If Git patterns are detected, the description should still reflect the git activity, but do not add "git_".
 
 Describe what the user was actually doing based on the console output, not just the current state.
 
@@ -63,29 +124,63 @@ The name should be max 100 chars total, use underscores only (no colons or speci
 
 Respond with ONLY the session name, nothing else."""
 
-req = {
-  "model": "claude-3-5-haiku-latest",
-  "max_tokens": 100,
-  "messages": [{"role":"user","content": prompt}]
-}
+if provider == "openai":
+    req = {
+        "model": openai_model,
+        "max_tokens": 100,
+        "temperature": 0.2,
+        "messages": [{"role": "user", "content": prompt}],
+    }
+else:
+    req = {
+        "model": "claude-3-5-haiku-latest",
+        "max_tokens": 100,
+        "messages": [{"role": "user", "content": prompt}],
+    }
+print(app_prefix)
 print(json.dumps(req))
 PY
-)
+  )
+  app_prefix="${request_payload%%$'\n'*}"
+  request_body="${request_payload#*$'\n'}"
+  if [[ "$request_body" == "$request_payload" ]]; then
+    request_body="$request_payload"
+    app_prefix=""
+  fi
+  if [[ "$provider" == "openai" ]]; then
+    response=$(curl -s -X POST https://api.openai.com/v1/chat/completions \
+      --max-time 20 \
+      -H "Content-Type: application/json" \
+      -H "Authorization: Bearer $OPENAI_API_KEY" \
+      -d "$request_body" 2>/dev/null)
+    new_name=$(echo "$response" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('choices',[{}])[0].get('message',{}).get('content',''))" 2>/dev/null)
+  else
     response=$(curl -s -X POST https://api.anthropic.com/v1/messages \
       --max-time 20 \
       -H "Content-Type: application/json" \
       -H "x-api-key: $ANTHROPIC_API_KEY" \
       -H "anthropic-version: 2023-06-01" \
       -d "$request_body" 2>/dev/null)
-    # Extract text
     new_name=$(echo "$response" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('content',[{}])[0].get('text',''))" 2>/dev/null)
-    # Clean and truncate
-    new_name=$(echo "$new_name" | tr ' ' '_' | sed 's/[^a-zA-Z0-9_-]//g' | cut -c1-100)
-    if [[ -z "$new_name" ]]; then
-      echo "\"ai_generation_failed\""
-    else
-      printf '"%s"\n' "$new_name"
+  fi
+  # Clean and truncate
+  new_name=$(echo "$new_name" | tr ' ' '_' | sed 's/[^a-zA-Z0-9_-]//g' | cut -c1-100)
+  if [[ -z "$new_name" ]]; then
+    echo "\"ai_generation_failed\""
+  else
+    app_prefix="$(printf '%s' "$app_prefix" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9' '_')"
+    app_prefix="${app_prefix//__/_}"
+    app_prefix="${app_prefix##_}"
+    app_prefix="${app_prefix%%_}"
+    if [[ -n "$app_prefix" ]]; then
+      if [[ "$new_name" == "${app_prefix}_"* ]]; then
+        new_name="${new_name#${app_prefix}_}"
+      fi
+      new_name="${app_prefix}_${new_name}"
     fi
+    new_name="${new_name:0:100}"
+    printf '"%s"\n' "$new_name"
+  fi
 }
 
 # Rename session with AI
@@ -95,48 +190,78 @@ bridge_rename_session() {
     return 1
   fi
   original_session_name="$1"
-  
+
   # Load API key from config file or fallback to .env
+  load_openai_api_key
   load_anthropic_api_key
-  
-  if [[ -z "${ANTHROPIC_API_KEY-}" ]]; then
+
+  if [[ -z "${OPENAI_API_KEY-}" && -z "${ANTHROPIC_API_KEY-}" ]]; then
     echo "\"missing_api_key\""
     return 0
   fi
-  
+
   # Check if tmux is available and session exists
   if ! tmux_available; then
     echo "\"tmux_not_available\""
     return 0
   fi
-  
+
   if ! tmux_session_exists "$original_session_name"; then
     echo "\"session_not_found\""
     return 0
   fi
-  
-  # Generate AI name using the CURRENT session (no renaming to temp name)
-  ai_name="$(tmux_generate_ai_session_name "$original_session_name" 2>/dev/null)"
-  
-  if [[ -n "$ai_name" ]] && [[ "$ai_name" != *"error"* ]] && [[ "$ai_name" != *"Failed"* ]]; then
-    # Clean the AI name for session naming
+
+  # Generate AI description using the CURRENT session (no renaming to temp name)
+  TMUX_AI_APP_SOURCE=""
+  local err_file
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    err_file=$(mktemp -t gw_ai_err)
+  else
+    err_file=$(mktemp)
+  fi
+  local ai_status=0
+  if ! ai_name="$(tmux_generate_ai_session_name "$original_session_name" 2>"$err_file")"; then
+    ai_status=$?
+  fi
+  local ai_err=""
+  if [[ -s "$err_file" ]]; then
+    ai_err=$(tail -n 1 "$err_file")
+  fi
+  rm -f "$err_file"
+
+  if [[ -n "$ai_name" ]]; then
+    # Clean the AI description for session naming
     ai_name="$(echo "$ai_name" | tr ' ' '_' | sed 's/[^a-zA-Z0-9_-]//g' | cut -c1-100)"
-    
-    # Remove any prefix from AI name to avoid duplication
-    ai_name="$(echo "$ai_name" | sed -E 's/^(opencode|running|ssh|docker|k8s|git|db)_//')"
-    
-    # Remove any leading underscores
     ai_name="$(echo "$ai_name" | sed 's/^_*//')"
-    
+    if [[ -z "$ai_name" ]]; then
+      echo "\"ai_generation_failed\""
+      return 0
+    fi
+
     # Perform the rename preserving canonical prefix and delimiter
     if tmux_rename_session "$original_session_name" "$ai_name" >/dev/null; then
-      echo "\"success\""
+      local app_source="${TMUX_AI_APP_SOURCE-}"
+      app_source="$(printf '%s' "$app_source" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9' '_')"
+      app_source="${app_source//__/_}"
+      app_source="${app_source##_}"
+      app_source="${app_source%%_}"
+      if [[ -n "$app_source" ]]; then
+        echo "\"success:app_source:${app_source}\""
+      else
+        echo "\"success\""
+      fi
     else
       echo "\"rename_failed\""
     fi
   else
     # AI generation failed, keep original name
-    echo "\"ai_generation_failed\""
+    if [[ -n "$ai_err" ]]; then
+      echo "\"ai_generation_failed: ${ai_err}\""
+    elif [[ $ai_status -ne 0 ]]; then
+      echo "\"ai_generation_failed: ai helper exited ${ai_status}\""
+    else
+      echo "\"ai_generation_failed\""
+    fi
   fi
 }
 
@@ -148,24 +273,24 @@ bridge_manual_rename_session() {
   fi
   old_name="$1"
   new_display_name="$2"
-  
+
   if ! tmux_available; then
     echo "\"tmux_not_available\""
     return 0
   fi
-  
+
   # Check if session exists
   if ! tmux has-session -t "$old_name" 2>/dev/null; then
     echo "\"session_not_found\""
     return 0
   fi
-  
+
   # Validate new display name (alphanumeric, underscore, hyphen only)
   if [[ ! "$new_display_name" =~ ^[a-zA-Z0-9_-]+$ ]]; then
     echo "\"invalid_name\""
     return 0
   fi
-  
+
   # Perform rename via tmux API to preserve delimiter and canonical prefix
   if tmux_rename_session "$old_name" "$new_display_name" >/dev/null; then
     echo "\"success\""

package/resources/scripts/shell/bridge/utils.sh

@@ -448,3 +448,169 @@ NODE
     fi
   fi
 }
+
+# Helper function to load OpenAI API key from config or .env file
+load_openai_api_key() {
+  local config_file="$HOME/.orchestra/config.json"
+  if [[ -f "$config_file" ]]; then
+    if have_cmd jq; then
+      local api_key
+      api_key="$(jq -r '.openai_api_key // empty' "$config_file" 2>/dev/null)"
+      if [[ -n "$api_key" ]] && [[ "$api_key" != "null" ]]; then
+        export OPENAI_API_KEY="$api_key"
+        return 0
+      fi
+    else
+      bridge_init_json_backend
+      local api_key
+      case "$BRIDGE_JSON_BACKEND" in
+        python)
+          api_key="$(python3 - "$config_file" <<'PY'
+import json
+import sys
+try:
+    data = json.load(open(sys.argv[1], 'r'))
+except Exception:
+    data = {}
+value = data.get('openai_api_key') or ''
+print(value)
+PY
+)"
+          ;;
+        node)
+          api_key="$(node - "$config_file" <<'NODE'
+const fs = require('fs');
+let value = '';
+try {
+  const data = JSON.parse(fs.readFileSync(process.argv[2], 'utf8'));
+  value = data.openai_api_key || '';
+} catch (err) {
+  value = '';
+}
+process.stdout.write(value);
+NODE
+)"
+          ;;
+      esac
+      if [[ -n "${api_key:-}" ]]; then
+        export OPENAI_API_KEY="$api_key"
+        return 0
+      fi
+    fi
+  fi
+
+  if [[ -f ".env" ]]; then
+    source .env
+  fi
+
+  if [[ -z "${OPENAI_API_KEY-}" ]]; then
+    local repo_root
+    repo_root="$(git_repo_root 2>/dev/null)"
+    if [[ -n "$repo_root" ]] && [[ -f "$repo_root/.env" ]]; then
+      source "$repo_root/.env"
+    fi
+  fi
+}
+
+# Helper function to load primary AI provider
+load_ai_primary_provider() {
+  if [[ -n "${AI_PRIMARY_PROVIDER:-}" ]]; then
+    return 0
+  fi
+
+  local config_file="$HOME/.orchestra/config.json"
+  local provider=""
+  if [[ -f "$config_file" ]]; then
+    if have_cmd jq; then
+      provider="$(jq -r '.ai_primary_provider // empty' "$config_file" 2>/dev/null)"
+    else
+      bridge_init_json_backend
+      case "$BRIDGE_JSON_BACKEND" in
+        python)
+          provider="$(python3 - "$config_file" <<'PY'
+import json
+import sys
+try:
+    data = json.load(open(sys.argv[1], 'r'))
+except Exception:
+    data = {}
+value = data.get('ai_primary_provider') or ''
+print(value)
+PY
+)"
+          ;;
+        node)
+          provider="$(node - "$config_file" <<'NODE'
+const fs = require('fs');
+let value = '';
+try {
+  const data = JSON.parse(fs.readFileSync(process.argv[2], 'utf8'));
+  value = data.ai_primary_provider || '';
+} catch (err) {
+  value = '';
+}
+process.stdout.write(value);
+NODE
+)"
+          ;;
+      esac
+    fi
+  fi
+
+  provider="$(printf '%s' "$provider" | tr '[:upper:]' '[:lower:]')"
+  if [[ "$provider" != "openai" && "$provider" != "anthropic" ]]; then
+    provider="anthropic"
+  fi
+  export AI_PRIMARY_PROVIDER="$provider"
+}
+
+# Helper function to load OpenAI model
+load_openai_model() {
+  if [[ -n "${OPENAI_MODEL:-}" ]]; then
+    return 0
+  fi
+
+  local config_file="$HOME/.orchestra/config.json"
+  local model=""
+  if [[ -f "$config_file" ]]; then
+    if have_cmd jq; then
+      model="$(jq -r '.openai_model // empty' "$config_file" 2>/dev/null)"
+    else
+      bridge_init_json_backend
+      case "$BRIDGE_JSON_BACKEND" in
+        python)
+          model="$(python3 - "$config_file" <<'PY'
+import json
+import sys
+try:
+    data = json.load(open(sys.argv[1], 'r'))
+except Exception:
+    data = {}
+value = data.get('openai_model') or ''
+print(value)
+PY
+)"
+          ;;
+        node)
+          model="$(node - "$config_file" <<'NODE'
+const fs = require('fs');
+let value = '';
+try {
+  const data = JSON.parse(fs.readFileSync(process.argv[2], 'utf8'));
+  value = data.openai_model || '';
+} catch (err) {
+  value = '';
+}
+process.stdout.write(value);
+NODE
+)"
+          ;;
+      esac
+    fi
+  fi
+
+  if [[ -z "$model" || "$model" == "null" ]]; then
+    model="gpt-4o-mini"
+  fi
+  export OPENAI_MODEL="$model"
+}

package/resources/scripts/shell/gwr_usage.sh

@@ -30,7 +30,7 @@ Navigation:
   d               Delete worktree or kill session
   r               Rename session (AI-powered)
   c               Create new worktree
-  o               Configure Anthropic API key
+  o               Configure AI keys and provider
   Ctrl+R          Refresh data
   q/Esc           Quit