mirror of
https://github.com/OpenRouterTeam/spawn.git
synced 2026-05-08 10:09:30 +00:00
cc23013e7c
The get_model_id_interactive function returned MODEL_ID from env vars without calling validate_model_id, bypassing the allowlist check. Also migrated 13 legacy scripts from raw safe_read to get_model_id_interactive which includes validation. Agent: security-auditor Co-authored-by: A <6723574+louisgv@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
66 lines
1.9 KiB
Bash
66 lines
1.9 KiB
Bash
#!/bin/bash
|
|
set -eo pipefail
|
|
|
|
# Source common functions - try local file first, fall back to remote
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"
|
|
# shellcheck source=oracle/lib/common.sh
|
|
if [[ -f "${SCRIPT_DIR}/lib/common.sh" ]]; then
|
|
source "${SCRIPT_DIR}/lib/common.sh"
|
|
else
|
|
eval "$(curl -fsSL https://raw.githubusercontent.com/OpenRouterTeam/spawn/main/oracle/lib/common.sh)"
|
|
fi
|
|
|
|
# Variables exported by create_server() in lib/common.sh
|
|
# shellcheck disable=SC2154
|
|
: "${OCI_SERVER_IP:?}" "${OCI_INSTANCE_NAME_ACTUAL:?}"
|
|
|
|
|
|
log_info "Aider on Oracle Cloud Infrastructure"
|
|
echo ""
|
|
|
|
# 1. Ensure OCI CLI is configured
|
|
ensure_oci_cli
|
|
|
|
# 2. Generate SSH key
|
|
ensure_ssh_key
|
|
|
|
# 3. Get server name and create server
|
|
SERVER_NAME=$(get_server_name)
|
|
create_server "${SERVER_NAME}"
|
|
|
|
# 4. Wait for SSH and cloud-init
|
|
verify_server_connectivity "${OCI_SERVER_IP}"
|
|
wait_for_cloud_init "${OCI_SERVER_IP}" 60
|
|
|
|
# 5. Install Aider
|
|
log_step "Installing Aider..."
|
|
run_server "${OCI_SERVER_IP}" "pip install aider-chat 2>/dev/null || pip3 install aider-chat"
|
|
log_info "Aider installed"
|
|
|
|
# 6. Get OpenRouter API key
|
|
echo ""
|
|
if [[ -n "${OPENROUTER_API_KEY:-}" ]]; then
|
|
log_info "Using OpenRouter API key from environment"
|
|
else
|
|
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
|
|
fi
|
|
|
|
# 7. Get model preference
|
|
MODEL_ID=$(get_model_id_interactive "openrouter/auto" "Aider") || exit 1
|
|
|
|
# 8. Inject environment variables into ~/.zshrc
|
|
log_step "Setting up environment variables..."
|
|
|
|
inject_env_vars_ssh "${OCI_SERVER_IP}" upload_file run_server \
|
|
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}"
|
|
|
|
echo ""
|
|
log_info "OCI instance setup completed successfully!"
|
|
log_info "Instance: ${OCI_INSTANCE_NAME_ACTUAL} (IP: ${OCI_SERVER_IP})"
|
|
echo ""
|
|
|
|
# 9. Start Aider interactively
|
|
log_step "Starting Aider..."
|
|
sleep 1
|
|
clear
|
|
interactive_session "${OCI_SERVER_IP}" "source ~/.zshrc && aider --model openrouter/${MODEL_ID}"
|