Move Claude here-mode test to CLI suite

Author: afurm

tests/integrations/test_cli.py

@@ -76,6 +76,33 @@ def test_ai_copilot_auto_promotes(self, tmp_path):
         assert "--integration copilot" in result.output
         assert (project / ".github" / "agents" / "speckit.plan.agent.md").exists()
 
+    def test_ai_claude_here_preserves_preexisting_commands(self, tmp_path):
+        from typer.testing import CliRunner
+        from specify_cli import app
+
+        project = tmp_path / "claude-here-existing"
+        project.mkdir()
+        commands_dir = project / ".claude" / "commands"
+        commands_dir.mkdir(parents=True)
+        command_file = commands_dir / "speckit.specify.md"
+        command_file.write_text("# preexisting command\n", encoding="utf-8")
+
+        old_cwd = os.getcwd()
+        try:
+            os.chdir(project)
+            runner = CliRunner()
+            result = runner.invoke(app, [
+                "init", "--here", "--force", "--ai", "claude", "--ai-skills", "--script", "sh", "--no-git", "--ignore-agent-tools",
+            ], catch_exceptions=False)
+        finally:
+            os.chdir(old_cwd)
+
+        assert result.exit_code == 0, result.output
+        assert "--integration claude" in result.output
+        assert command_file.exists()
+        assert command_file.read_text(encoding="utf-8") == "# preexisting command\n"
+        assert (project / ".claude" / "skills" / "speckit-plan" / "SKILL.md").exists()
+
     def test_shared_infra_skips_existing_files(self, tmp_path):
         """Pre-existing shared files are not overwritten by _install_shared_infra."""
         from typer.testing import CliRunner

tests/test_ai_skills.py

@@ -756,39 +756,6 @@ def test_download_and_extract_template_blocks_zip_path_traversal(self, tmp_path,
 
         assert not (tmp_path / "evil.txt").exists()
 
-    def test_here_mode_commands_preserved(self, tmp_path, monkeypatch):
-        """For --here on existing repos, commands must NOT be removed."""
-        from typer.testing import CliRunner
-
-        runner = CliRunner()
-        # Create a mock existing project with commands already present
-        target = tmp_path / "existing"
-        target.mkdir()
-        agent_folder = AGENT_CONFIG["claude"]["folder"]
-        cmds_dir = target / agent_folder.rstrip("/") / "commands"
-        cmds_dir.mkdir(parents=True)
-        (cmds_dir / "speckit.specify.md").write_text("# spec")
-
-        # --here uses CWD, so chdir into the target
-        monkeypatch.chdir(target)
-
-        def fake_download(project_path, *args, **kwargs):
-            pass  # commands already exist, no need to re-create
-
-        with patch("specify_cli.integrations.get_integration", return_value=None), \
-             patch("specify_cli.download_and_extract_template", side_effect=fake_download), \
-             patch("specify_cli.ensure_executable_scripts"), \
-             patch("specify_cli.ensure_constitution_from_template"), \
-             patch("specify_cli.install_ai_skills", return_value=True), \
-             patch("specify_cli.is_git_repo", return_value=True), \
-             patch("specify_cli.shutil.which", return_value="/usr/bin/git"):
-            result = runner.invoke(app, ["init", "--here", "--ai", "claude", "--ai-skills", "--script", "sh", "--no-git"], input="y\n")
-
-        assert result.exit_code == 0
-        # Commands must remain for --here
-        assert cmds_dir.exists()
-        assert (cmds_dir / "speckit.specify.md").exists()
-
 # ===== Skip-If-Exists Tests =====
 
 class TestSkipIfExists: