mirror of
https://github.com/github/spec-kit.git
synced 2026-07-03 20:36:23 +08:00
* Initial plan * feat!: remove legacy --ai, --ai-commands-dir, and --ai-skills flags at 0.10.0 * refactor(tests): rename stale test_ai_help_* methods to test_agent_config_* * fix: address review — derive agent folder for generic integration and remove redundant test - Security notice now falls back to integration_parsed_options['commands_dir'] when AGENT_CONFIG folder is None (generic integration). - Remove test_agent_config_includes_kiro_cli which duplicates the assertion in test_runtime_config_uses_kiro_cli_and_removes_q. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs: scrub all remaining --ai flag references from source and tests - Remove dead AI_ASSISTANT_ALIASES, AI_ASSISTANT_HELP, and _build_ai_assistant_help() from _agent_config.py - Update comments/docstrings in extensions.py, presets.py, and integration subpackages to reference 'skills mode' or '--integration' instead of the removed flags - Fix catalog.json generic integration description - Update test docstrings/comments in test_extension_skills.py, test_extensions.py, and test_presets.py Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test: remove legacy --ai flag rejection tests The flags are fully removed from the CLI; typer handles unknown options generically. No custom rejection logic exists to test. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * revert: remove manual CHANGELOG.md entry CHANGELOG is generated automatically; manual edits should not be made. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: make generic catalog description self-explanatory Include the required --commands-dir sub-option in the description so readers don't need to look up integration docs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(tests): rename duplicate test classes to avoid shadowing The rename from Test*AutoPromote to Test*Integration collided with the existing Test*Integration(SkillsIntegrationTests) base classes, causing the shared test suites to be silently overwritten. Rename the CLI init flow classes to Test*InitFlow instead. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Manfred Riem <mnriem@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
264 lines
11 KiB
Python
264 lines
11 KiB
Python
"""Tests for CursorAgentIntegration."""
|
|
|
|
from pathlib import Path
|
|
from urllib.parse import urlparse
|
|
|
|
from specify_cli.integrations import get_integration
|
|
from specify_cli.integrations.manifest import IntegrationManifest
|
|
|
|
from .test_integration_base_skills import SkillsIntegrationTests
|
|
|
|
|
|
class TestCursorAgentIntegration(SkillsIntegrationTests):
|
|
KEY = "cursor-agent"
|
|
FOLDER = ".cursor/"
|
|
COMMANDS_SUBDIR = "skills"
|
|
REGISTRAR_DIR = ".cursor/skills"
|
|
CONTEXT_FILE = ".cursor/rules/specify-rules.mdc"
|
|
|
|
|
|
class TestCursorMdcFrontmatter:
|
|
"""Verify .mdc frontmatter handling in upsert/remove context section."""
|
|
|
|
def _setup(self, tmp_path: Path):
|
|
i = get_integration("cursor-agent")
|
|
m = IntegrationManifest("cursor-agent", tmp_path)
|
|
return i, m
|
|
|
|
def test_new_mdc_gets_frontmatter(self, tmp_path):
|
|
"""A freshly created .mdc file includes alwaysApply: true."""
|
|
i, m = self._setup(tmp_path)
|
|
i.setup(tmp_path, m)
|
|
ctx = (tmp_path / i.context_file).read_text(encoding="utf-8")
|
|
assert ctx.startswith("---\n")
|
|
assert "alwaysApply: true" in ctx
|
|
|
|
def test_existing_mdc_without_frontmatter_gets_it(self, tmp_path):
|
|
"""An existing .mdc without frontmatter gets it added."""
|
|
i, m = self._setup(tmp_path)
|
|
ctx_path = tmp_path / i.context_file
|
|
ctx_path.parent.mkdir(parents=True, exist_ok=True)
|
|
ctx_path.write_text("# User rules\n", encoding="utf-8")
|
|
i.upsert_context_section(tmp_path)
|
|
content = ctx_path.read_text(encoding="utf-8")
|
|
assert content.lstrip().startswith("---")
|
|
assert "alwaysApply: true" in content
|
|
assert "# User rules" in content
|
|
|
|
def test_existing_mdc_with_frontmatter_preserves_it(self, tmp_path):
|
|
"""An existing .mdc with custom frontmatter is preserved."""
|
|
i, m = self._setup(tmp_path)
|
|
ctx_path = tmp_path / i.context_file
|
|
ctx_path.parent.mkdir(parents=True, exist_ok=True)
|
|
ctx_path.write_text(
|
|
"---\nalwaysApply: true\ncustomKey: hello\n---\n\n# Rules\n",
|
|
encoding="utf-8",
|
|
)
|
|
i.upsert_context_section(tmp_path)
|
|
content = ctx_path.read_text(encoding="utf-8")
|
|
assert "alwaysApply: true" in content
|
|
assert "customKey: hello" in content
|
|
assert "<!-- SPECKIT START -->" in content
|
|
|
|
def test_existing_mdc_wrong_alwaysapply_fixed(self, tmp_path):
|
|
"""An .mdc with alwaysApply: false gets corrected."""
|
|
i, m = self._setup(tmp_path)
|
|
ctx_path = tmp_path / i.context_file
|
|
ctx_path.parent.mkdir(parents=True, exist_ok=True)
|
|
ctx_path.write_text(
|
|
"---\nalwaysApply: false\n---\n\n# Rules\n",
|
|
encoding="utf-8",
|
|
)
|
|
i.upsert_context_section(tmp_path)
|
|
content = ctx_path.read_text(encoding="utf-8")
|
|
assert "alwaysApply: true" in content
|
|
assert "alwaysApply: false" not in content
|
|
|
|
def test_upsert_idempotent_no_duplicate_frontmatter(self, tmp_path):
|
|
"""Repeated upserts don't duplicate frontmatter."""
|
|
i, m = self._setup(tmp_path)
|
|
i.upsert_context_section(tmp_path)
|
|
i.upsert_context_section(tmp_path)
|
|
content = (tmp_path / i.context_file).read_text(encoding="utf-8")
|
|
assert content.count("alwaysApply") == 1
|
|
|
|
def test_remove_deletes_mdc_with_only_frontmatter(self, tmp_path):
|
|
"""Removing the section from a Speckit-only .mdc deletes the file."""
|
|
i, m = self._setup(tmp_path)
|
|
i.upsert_context_section(tmp_path)
|
|
ctx_path = tmp_path / i.context_file
|
|
assert ctx_path.exists()
|
|
i.remove_context_section(tmp_path)
|
|
assert not ctx_path.exists()
|
|
|
|
|
|
class TestCursorAgentInitFlow:
|
|
"""--integration cursor-agent creates expected files."""
|
|
|
|
def test_integration_cursor_agent_creates_skills(self, tmp_path):
|
|
"""--integration cursor-agent should create skills in .cursor/skills."""
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
|
|
runner = CliRunner()
|
|
target = tmp_path / "test-proj"
|
|
result = runner.invoke(app, ["init", str(target), "--integration", "cursor-agent", "--no-git", "--ignore-agent-tools", "--script", "sh"])
|
|
|
|
assert result.exit_code == 0, f"init --integration cursor-agent failed: {result.output}"
|
|
assert (target / ".cursor" / "skills" / "speckit-plan" / "SKILL.md").exists()
|
|
|
|
|
|
class TestCursorAgentCliDispatch:
|
|
"""Verify the CLI dispatch path for cursor-agent (issue #2629).
|
|
|
|
The ``cursor-agent`` CLI supports headless execution via ``-p`` (with
|
|
full tool access including write/shell) and requires ``--trust`` to
|
|
bypass the Workspace Trust prompt. These tests pin the exact argv
|
|
shape that the workflow runner will use.
|
|
"""
|
|
|
|
def test_requires_cli_is_false_for_ide_first_flow(self):
|
|
"""``requires_cli`` must stay False so the IDE-only flow keeps working.
|
|
|
|
``specify init --integration cursor-agent`` (without ``--ignore-agent-tools``)
|
|
treats ``requires_cli=True`` as a hard precheck and fails when the
|
|
``cursor-agent`` CLI isn't on PATH — even though the Cursor IDE
|
|
/ skills flow can run without it. Workflow dispatch support is
|
|
signalled by overriding ``build_exec_args()`` instead, mirroring
|
|
``CopilotIntegration``.
|
|
"""
|
|
i = get_integration("cursor-agent")
|
|
assert i.config.get("requires_cli") is False
|
|
|
|
def test_install_url_is_set(self):
|
|
i = get_integration("cursor-agent")
|
|
url = i.config.get("install_url")
|
|
assert url is not None
|
|
# CodeQL: use a hostname comparison instead of a substring check
|
|
# to avoid the "Incomplete URL substring sanitization" warning
|
|
# (substring "cursor.com" can also appear in attacker-controlled
|
|
# positions of an arbitrary URL).
|
|
host = (urlparse(url).hostname or "").lower()
|
|
assert host == "cursor.com" or host.endswith(".cursor.com")
|
|
|
|
def test_build_exec_args_default_includes_headless_flags_and_json(self):
|
|
"""Default argv emits the full headless flag set: -p --trust
|
|
--approve-mcps --force, then prompt, then --output-format json.
|
|
"""
|
|
i = get_integration("cursor-agent")
|
|
args = i.build_exec_args("/speckit-specify some-feature")
|
|
assert args == [
|
|
"cursor-agent", "-p", "--trust", "--approve-mcps", "--force",
|
|
"/speckit-specify some-feature",
|
|
"--output-format", "json",
|
|
]
|
|
|
|
def test_build_exec_args_text_output_omits_format(self):
|
|
i = get_integration("cursor-agent")
|
|
args = i.build_exec_args("/speckit-plan", output_json=False)
|
|
assert args == [
|
|
"cursor-agent", "-p", "--trust", "--approve-mcps", "--force",
|
|
"/speckit-plan",
|
|
]
|
|
|
|
def test_build_exec_args_with_model(self):
|
|
i = get_integration("cursor-agent")
|
|
args = i.build_exec_args(
|
|
"/speckit-specify", model="sonnet-4-thinking", output_json=False
|
|
)
|
|
assert args == [
|
|
"cursor-agent", "-p", "--trust", "--approve-mcps", "--force",
|
|
"/speckit-specify",
|
|
"--model", "sonnet-4-thinking",
|
|
]
|
|
|
|
def test_build_exec_args_contains_mandatory_headless_flags(self):
|
|
"""The four headless flags must always appear together.
|
|
|
|
``--approve-mcps`` is required so MCP servers (e.g. dingtalk-doc)
|
|
actually load in headless mode; ``--force`` is required so the
|
|
agent doesn't block on tool-call approval prompts during the
|
|
speckit workflow. Together with ``-p`` and ``--trust`` they
|
|
bring cursor-agent's headless behaviour in line with
|
|
``claude -p`` / ``codex --exec`` from spec-kit's perspective.
|
|
"""
|
|
i = get_integration("cursor-agent")
|
|
args = i.build_exec_args("/speckit-implement", output_json=False)
|
|
for flag in ("-p", "--trust", "--approve-mcps", "--force"):
|
|
assert flag in args, f"missing mandatory headless flag: {flag}"
|
|
|
|
def test_build_exec_args_supports_dispatch_without_requires_cli(self):
|
|
"""``build_exec_args`` must return argv even though ``requires_cli``
|
|
is ``False``.
|
|
|
|
``CursorAgentIntegration`` opts out of the ``requires_cli`` hard
|
|
precheck (so ``specify init`` doesn't fail when the CLI isn't on
|
|
PATH) but still supports workflow dispatch. The presence of a
|
|
non-``None`` argv from ``build_exec_args()`` is what the engine
|
|
keys off — pin that invariant.
|
|
"""
|
|
i = get_integration("cursor-agent")
|
|
assert i.config.get("requires_cli") is False
|
|
argv = i.build_exec_args("/speckit-plan", output_json=False)
|
|
assert argv is not None
|
|
assert argv[0] == "cursor-agent"
|
|
|
|
def test_build_command_invocation_uses_hyphenated_skill_name(self):
|
|
"""SkillsIntegration: /speckit-plan (not /speckit.plan)."""
|
|
i = get_integration("cursor-agent")
|
|
assert i.build_command_invocation("speckit.plan", "feature-x") == "/speckit-plan feature-x"
|
|
assert i.build_command_invocation("plan") == "/speckit-plan"
|
|
|
|
def test_dispatch_command_resolves_cmd_shim_for_subprocess(self):
|
|
"""``.cmd`` shims must be resolved to their full path before ``subprocess.run``.
|
|
|
|
``cursor-agent`` (and other npm-installed CLIs on Windows) ship as
|
|
``cursor-agent.cmd`` wrappers. ``shutil.which`` honors ``PATHEXT``
|
|
and finds them, but Python's ``subprocess.run`` calls
|
|
``CreateProcess`` which does **not** consult ``PATHEXT`` and fails
|
|
with ``WinError 2`` on a bare ``["cursor-agent", ...]`` argv. The
|
|
fix in ``base.py::dispatch_command`` resolves ``exec_args[0]`` via
|
|
``shutil.which`` so the full ``.cmd`` path is what reaches
|
|
``CreateProcess``.
|
|
"""
|
|
from unittest.mock import patch, MagicMock
|
|
i = get_integration("cursor-agent")
|
|
|
|
mock_result = MagicMock()
|
|
mock_result.returncode = 0
|
|
mock_result.stdout = "ok"
|
|
mock_result.stderr = ""
|
|
|
|
fake_path = r"C:\Users\foo\AppData\Local\cursor-agent\cursor-agent.CMD"
|
|
with patch(
|
|
"specify_cli.integrations.base.shutil.which", return_value=fake_path
|
|
), patch("subprocess.run", return_value=mock_result) as mock_run:
|
|
result = i.dispatch_command(
|
|
"speckit.plan", args="feature-x", stream=False, timeout=5
|
|
)
|
|
|
|
assert result["exit_code"] == 0
|
|
argv = mock_run.call_args[0][0]
|
|
assert argv[0] == fake_path, f"expected resolved .CMD path, got: {argv[0]!r}"
|
|
assert argv[1:6] == ["-p", "--trust", "--approve-mcps", "--force", "/speckit-plan feature-x"]
|
|
|
|
def test_dispatch_command_passthrough_when_shutil_which_finds_nothing(self):
|
|
"""If ``shutil.which`` returns ``None``, leave argv unchanged so the
|
|
existing ``FileNotFoundError`` path remains observable to callers."""
|
|
from unittest.mock import patch, MagicMock
|
|
i = get_integration("cursor-agent")
|
|
|
|
mock_result = MagicMock()
|
|
mock_result.returncode = 0
|
|
mock_result.stdout = ""
|
|
mock_result.stderr = ""
|
|
|
|
with patch(
|
|
"specify_cli.integrations.base.shutil.which", return_value=None
|
|
), patch("subprocess.run", return_value=mock_result) as mock_run:
|
|
i.dispatch_command("speckit.plan", stream=False, timeout=5)
|
|
|
|
argv = mock_run.call_args[0][0]
|
|
assert argv[0] == "cursor-agent"
|
|
|