From 89e213e6f911a973cc01cdcd79efe9921e85be8b Mon Sep 17 00:00:00 2001
From: A <258483684+la14-1@users.noreply.github.com>
Date: Tue, 10 Feb 2026 12:53:24 -0800
Subject: [PATCH] feat: Add Amazon Q CLI support for Railway (#239)

Implement railway/amazonq.sh following the standard Railway pattern:
- Install Amazon Q CLI via AWS installer script
- Inject OPENAI_API_KEY and OPENAI_BASE_URL for OpenRouter compatibility
- Launch with 'q chat' command

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 +-
 railway/README.md  |  6 +++++
 railway/amazonq.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 railway/amazonq.sh

diff --git a/manifest.json b/manifest.json
index 7ac45bf4a..a28f141f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1024,7 +1024,7 @@
     "railway/codex": "missing",
     "railway/interpreter": "missing",
     "railway/gemini": "implemented",
-    "railway/amazonq": "missing",
+    "railway/amazonq": "implemented",
     "railway/cline": "missing",
     "railway/gptme": "implemented",
     "railway/opencode": "missing",
diff --git a/railway/README.md b/railway/README.md
index 2891db3c..a40766f4 100644
--- a/railway/README.md
+++ b/railway/README.md
@@ -46,6 +46,12 @@ bash <(curl -fsSL https://openrouter.ai/lab/spawn/railway/goose.sh)
 bash <(curl -fsSL https://openrouter.ai/lab/spawn/railway/gemini.sh)
 ```
 
+#### Amazon Q CLI
+
+```bash
+bash <(curl -fsSL https://openrouter.ai/lab/spawn/railway/amazonq.sh)
+```
+
 ## Non-Interactive Mode
 
 ```bash
diff --git a/railway/amazonq.sh b/railway/amazonq.sh
new file mode 100644
index 00000000..90f5ae32
--- /dev/null
+++ b/railway/amazonq.sh
@@ -0,0 +1,56 @@
+#!/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/railway/lib/common.sh)"
+fi
+
+log_info "Amazon Q CLI on Railway"
+echo ""
+
+# 1. Ensure Railway CLI and API token
+ensure_railway_cli
+ensure_railway_token
+
+# 2. Create service
+SERVER_NAME=$(get_server_name)
+create_server "$SERVER_NAME"
+
+# 3. Install base tools
+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"
+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"
+
+echo ""
+log_info "Railway service setup completed successfully!"
+log_info "Service: $RAILWAY_SERVICE_NAME"
+echo ""
+
+# 7. Start Amazon Q interactively
+log_warn "Starting Amazon Q CLI..."
+sleep 1
+clear
+interactive_session "source /root/.bashrc && q chat"