The agent that turns websites into APIs!
fix(pr71): centralize SDK default models; Cursor key from env or file
Cursor Agentf5d7cd4ae684
diff --git a/src/reverse_api/cli.py b/src/reverse_api/cli.pyindex 2d23a6e..38672ce 100644--- a/src/reverse_api/cli.py+++ b/src/reverse_api/cli.py@@ -55,6 +55,19 @@ console = Console()config_manager = ConfigManager(get_config_path())session_manager = SessionManager(get_history_path())++def default_model_for_configured_sdk(sdk: str | None = None) -> str:+ """Return the configured default model id for the given SDK (or current config SDK)."""+ s = (sdk or config_manager.get("sdk", "claude") or "claude").lower()+ if s == "opencode":+ return config_manager.get("opencode_model", "claude-opus-4-6")+ if s == "copilot":+ return config_manager.get("copilot_model", "gpt-5")+ if s == "cursor":+ return config_manager.get("cursor_model", "composer-2")+ return config_manager.get("claude_code_model", "claude-sonnet-4-6")++# Schema version for --json outputs. Wrappers can query it via# `reverse-api-engineer --json-schema-version`.AGENT_JSON_SCHEMA_VERSION = 1@@ -242,6 +255,25 @@ def _build_dry_run_payload("status": "error","message": f"unknown sdk {sdk!r}; expected 'claude', 'opencode', 'copilot', or 'cursor'",})+ elif sdk == "cursor":+ from .cursor_auth import get_cursor_api_key++ if get_cursor_api_key():+ checks.append({+ "name": f"sdk:{sdk}",+ "status": "ok",+ "message": "Cursor API key present (CURSOR_API_KEY or CURSOR_API_KEY_FILE)",+ })+ else:+ checks.append({+ "name": f"sdk:{sdk}",+ "status": "warn",+ "message": (+ "CURSOR_API_KEY not in process environment and CURSOR_API_KEY_FILE "+ "unset/invalid (use `export CURSOR_API_KEY=...` so Python can see it, "+ "or set CURSOR_API_KEY_FILE to a file containing the key)"+ ),+ })elif not os.environ.get(sdk_env_var):checks.append({"name": f"sdk:{sdk}",@@ -629,16 +661,7 @@ def prompt_interactive_options(# Engineer mode: prompt is the run_idif result_mode == "engineer":_sdk = config_manager.get("sdk", "claude")- if model:- resolved = model- elif _sdk == "opencode":- resolved = config_manager.get("opencode_model", "claude-opus-4-6")- elif _sdk == "copilot":- resolved = config_manager.get("copilot_model", "gpt-5")- elif _sdk == "cursor":- resolved = config_manager.get("cursor_model", "composer-2")- else:- resolved = config_manager.get("claude_code_model", "claude-sonnet-4-6")+ resolved = model or default_model_for_configured_sdk(_sdk)return {"mode": result_mode,"run_id": prompt,@@ -649,14 +672,7 @@ def prompt_interactive_options(if result_mode == "agent":if model is None:_sdk = config_manager.get("sdk", "claude")- if _sdk == "opencode":- model = config_manager.get("opencode_model", "claude-opus-4-6")- elif _sdk == "copilot":- model = config_manager.get("copilot_model", "gpt-5")- elif _sdk == "cursor":- model = config_manager.get("cursor_model", "composer-2")- else:- model = config_manager.get("claude_code_model", "claude-sonnet-4-6")+ model = default_model_for_configured_sdk(_sdk)mode_color = MODE_COLORS.get("agent", THEME_PRIMARY)console = Console()@@ -706,14 +722,7 @@ def prompt_interactive_options(if model is None:_sdk = config_manager.get("sdk", "claude")- if _sdk == "opencode":- model = config_manager.get("opencode_model", "claude-opus-4-6")- elif _sdk == "copilot":- model = config_manager.get("copilot_model", "gpt-5")- elif _sdk == "cursor":- model = config_manager.get("cursor_model", "composer-2")- else:- model = config_manager.get("claude_code_model", "claude-sonnet-4-6")+ model = default_model_for_configured_sdk(_sdk)return {"mode": result_mode,@@ -776,14 +785,7 @@ def repl_loop():# Get current SDK and model from configsdk = config_manager.get("sdk", "claude")- if sdk == "opencode":- model = config_manager.get("opencode_model", "claude-opus-4-6")- elif sdk == "copilot":- model = config_manager.get("copilot_model", "gpt-5")- elif sdk == "cursor":- model = config_manager.get("cursor_model", "composer-2")- else:- model = config_manager.get("claude_code_model", "claude-sonnet-4-6")+ model = default_model_for_configured_sdk(sdk)display_banner(console, sdk=sdk, model=model)console.print(" [dim]shift+tab to cycle modes | ctrl+r for random task (agent)[/dim]")@@ -1745,14 +1747,7 @@ def run_auto_capture(sdk = config_manager.get("sdk", "claude")if model is None:- if sdk == "opencode":- model = config_manager.get("opencode_model", "claude-opus-4-6")- elif sdk == "copilot":- model = config_manager.get("copilot_model", "gpt-5")- elif sdk == "cursor":- model = config_manager.get("cursor_model", "composer-2")- else:- model = config_manager.get("claude_code_model", "claude-sonnet-4-6")+ model = default_model_for_configured_sdk(sdk)run_id = generate_run_id()timestamp = get_timestamp()@@ -1779,7 +1774,7 @@ def run_auto_capture(output_dir=output_dir,agent_provider=agent_provider,opencode_provider=config_manager.get("opencode_provider", "anthropic"),- opencode_model=config_manager.get("opencode_model", "claude-opus-4-6"),+ opencode_model=model or config_manager.get("opencode_model", "claude-opus-4-6"),enable_sync=config_manager.get("real_time_sync", False),sdk=sdk,output_language=output_language,@@ -1792,7 +1787,7 @@ def run_auto_capture(engineer = CopilotAutoEngineer(run_id=run_id,prompt=prompt,- copilot_model=config_manager.get("copilot_model", "gpt-5"),+ copilot_model=model or config_manager.get("copilot_model", "gpt-5"),output_dir=output_dir,agent_provider=agent_provider,enable_sync=config_manager.get("real_time_sync", False),diff --git a/src/reverse_api/cursor_auth.py b/src/reverse_api/cursor_auth.pynew file mode 100644index 0000000..7d2657d--- /dev/null+++ b/src/reverse_api/cursor_auth.py@@ -0,0 +1,32 @@+"""Resolve Cursor API keys for the Node bridge and Python checks."""++from __future__ import annotations++import os+from pathlib import Path+++def get_cursor_api_key() -> str:+ """Return the Cursor API key from the process environment or a key file.++ Only **exported** shell variables are visible here. If ``echo $CURSOR_API_KEY``+ works but this returns empty, use ``export CURSOR_API_KEY=...`` or set+ ``CURSOR_API_KEY_FILE`` to a file whose first non-comment line is the key.+ """+ v = (os.environ.get("CURSOR_API_KEY") or "").strip()+ if v:+ return v+ path = (os.environ.get("CURSOR_API_KEY_FILE") or "").strip()+ if not path:+ return ""+ try:+ p = Path(path).expanduser()+ if not p.is_file():+ return ""+ for line in p.read_text(encoding="utf-8", errors="replace").splitlines():+ t = line.strip()+ if t and not t.startswith("#"):+ return t+ except OSError:+ return ""+ return ""diff --git a/src/reverse_api/cursor_engineer.py b/src/reverse_api/cursor_engineer.pyindex 5e4e481..bb7b34d 100644--- a/src/reverse_api/cursor_engineer.py+++ b/src/reverse_api/cursor_engineer.py@@ -11,6 +11,7 @@ from pathlib import Pathfrom typing import Anyfrom .base_engineer import BaseEngineer+from .cursor_auth import get_cursor_api_keyfrom .tui import ClaudeUI_BRIDGE_DIR = Path(__file__).resolve().parent / "cursor_bridge"@@ -181,7 +182,7 @@ class CursorEngineer(BaseEngineer):mcp_servers: dict[str, Any] | None,resume_agent_id: str | None,) -> dict[str, Any]:- api_key = os.environ.get("CURSOR_API_KEY", "")+ api_key = get_cursor_api_key()req: dict[str, Any] = {"cwd": self._workspace_cwd(),"modelId": self.cursor_model,@@ -344,11 +345,18 @@ class CursorEngineer(BaseEngineer):self.ui.console.print("\n[dim]Set CURSOR_API_KEY and ensure Node.js 18+ and npm are installed.[/dim]")return None- if not os.environ.get("CURSOR_API_KEY"):- msg = "CURSOR_API_KEY is not set"+ if not get_cursor_api_key():+ msg = "CURSOR_API_KEY is not available to this process"self.ui.error(msg)self.message_store.save_error(msg)- self.ui.console.print("\n[dim]Create an API key at https://cursor.com/dashboard/integrations[/dim]")+ self.ui.console.print("\n[dim]Create a key: https://cursor.com/dashboard/integrations[/dim]")+ self.ui.console.print(+ "[dim]If `echo $CURSOR_API_KEY` works in your shell but this fails, "+ "export it so subprocesses see it:[/dim] [white]export CURSOR_API_KEY='…'[/white]"+ )+ self.ui.console.print(+ "[dim]Or set[/dim] [white]CURSOR_API_KEY_FILE[/white] [dim]to a file whose first line is the key.[/dim]"+ )return Nonesystem_prompt, user_message = self._build_prompts()@@ -476,11 +484,18 @@ class CursorAutoEngineer(CursorEngineer):self.message_store.save_error(dep_err)return None- if not os.environ.get("CURSOR_API_KEY"):- msg = "CURSOR_API_KEY is not set"+ if not get_cursor_api_key():+ msg = "CURSOR_API_KEY is not available to this process"self.ui.error(msg)self.message_store.save_error(msg)- self.ui.console.print("\n[dim]Create an API key at https://cursor.com/dashboard/integrations[/dim]")+ self.ui.console.print("\n[dim]Create a key: https://cursor.com/dashboard/integrations[/dim]")+ self.ui.console.print(+ "[dim]If `echo $CURSOR_API_KEY` works in your shell but this fails, "+ "export it so subprocesses see it:[/dim] [white]export CURSOR_API_KEY='…'[/white]"+ )+ self.ui.console.print(+ "[dim]Or set[/dim] [white]CURSOR_API_KEY_FILE[/white] [dim]to a file whose first line is the key.[/dim]"+ )return Nonesystem_prompt, user_message = ClaudeAutoEngineer._build_auto_prompts(self)diff --git a/tests/test_cursor_auth.py b/tests/test_cursor_auth.pynew file mode 100644index 0000000..7306f4e--- /dev/null+++ b/tests/test_cursor_auth.py@@ -0,0 +1,29 @@+"""Tests for cursor_auth.get_cursor_api_key."""++from pathlib import Path++import pytest++from reverse_api.cursor_auth import get_cursor_api_key+++def test_get_cursor_api_key_prefers_env(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:+ monkeypatch.delenv("CURSOR_API_KEY_FILE", raising=False)+ monkeypatch.setenv("CURSOR_API_KEY", " env-key ")+ assert get_cursor_api_key() == "env-key"+++def test_get_cursor_api_key_file_fallback(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:+ monkeypatch.delenv("CURSOR_API_KEY", raising=False)+ key_file = tmp_path / "key.txt"+ key_file.write_text("# comment\n\nfile-key\n")+ monkeypatch.setenv("CURSOR_API_KEY_FILE", str(key_file))+ assert get_cursor_api_key() == "file-key"+++def test_get_cursor_api_key_env_wins_over_file(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:+ key_file = tmp_path / "key.txt"+ key_file.write_text("from-file")+ monkeypatch.setenv("CURSOR_API_KEY_FILE", str(key_file))+ monkeypatch.setenv("CURSOR_API_KEY", "from-env")+ assert get_cursor_api_key() == "from-env"