From 23fa0d2630bfe90fb9c36e50e21ded63e9b9da7b Mon Sep 17 00:00:00 2001
From: A <258483684+la14-1@users.noreply.github.com>
Date: Tue, 10 Feb 2026 15:22:49 -0800
Subject: [PATCH] feat: Add Amazon Q CLI on Render (#257)

Agent: gap-filler

Co-authored-by: B <6723574+louisgv@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 manifest.json     |  2 +-
 render/amazonq.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 render/amazonq.sh

diff --git a/manifest.json b/manifest.json
index 09d5cf3d..5f3fd412 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1096,7 +1096,7 @@
     "render/codex": "implemented",
     "render/interpreter": "implemented",
     "render/gemini": "implemented",
-    "render/amazonq": "missing",
+    "render/amazonq": "implemented",
     "render/cline": "missing",
     "render/gptme": "missing",
     "render/opencode": "missing",
diff --git a/render/amazonq.sh b/render/amazonq.sh
new file mode 100644
index 00000000..392dbe93
--- /dev/null
+++ b/render/amazonq.sh
@@ -0,0 +1,63 @@
+#!/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)"
+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/render/lib/common.sh)"
+fi
+
+log_info "Amazon Q CLI on Render"
+echo ""
+
+# 1. Ensure Render CLI and API key
+ensure_render_cli
+ensure_render_api_key
+
+# 2. Create service
+SERVER_NAME=$(get_server_name)
+create_server "$SERVER_NAME"
+
+# 3. Wait for service readiness
+wait_for_cloud_init
+
+# 4. Install Amazon Q CLI
+log_warn "Installing Amazon Q CLI..."
+run_server "curl -fsSL https://desktop-release.q.us-east-1.amazonaws.com/latest/amazon-q-cli-install.sh | bash"
+
+# Verify installation
+if ! run_server "command -v q" >/dev/null 2>&1; then
+    log_error "Amazon Q CLI installation failed"
+    exit 1
+fi
+log_info "Amazon Q CLI installed"
+
+# 5. 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
+
+# 6. Inject environment variables
+log_warn "Setting up environment variables..."
+
+inject_env_vars \
+    "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_BASE_URL=https://openrouter.ai/api/v1" \
+    "PATH=\$HOME/.local/bin:\$PATH"
+
+echo ""
+log_info "Render service setup completed successfully!"
+log_info "Service: $RENDER_SERVICE_NAME (ID: $RENDER_SERVICE_ID)"
+echo ""
+
+# 7. Start Amazon Q interactively
+log_warn "Starting Amazon Q..."
+sleep 1
+clear
+interactive_session "source /root/.bashrc && q chat"