agentic-devtools 0.2.41__tar.gz → 0.2.42__tar.gz

{agentic_devtools-0.2.41 → agentic_devtools-0.2.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-devtools
-Version: 0.2.41
+Version: 0.2.42
 Summary: Agentic devtools integrate Jira, DevOps & more
 Author: ayaiayorg
 License-Expression: MIT

{agentic_devtools-0.2.41 → agentic_devtools-0.2.42}/agentic_devtools/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.41'
-__version_tuple__ = version_tuple = (0, 2, 41)
+__version__ = version = '0.2.42'
+__version_tuple__ = version_tuple = (0, 2, 42)
 
 __commit_id__ = commit_id = None

{agentic_devtools-0.2.41 → agentic_devtools-0.2.42}/agentic_devtools/cli/setup/commands.py

@@ -406,11 +406,16 @@ def _persist_single_var(profile_path: Path, var_name: str, var_value: str, shell
             pass  # persist_env_var already printed a warning
 
 
-def _prompt_project_config() -> None:
+def _prompt_project_config(*, force_prompt: bool = False) -> None:
     """Prompt the user for project-specific configuration values.
 
     Reads existing values from ``.agdt/config/project.json`` as defaults.
     Saves responses back to the same file.
+
+    When *force_prompt* is ``False`` (the default), prompts are **skipped**
+    for any key that is already present in the config (even if the value is
+    ``""``).  Pass ``force_prompt=True`` (via ``--reconfigure``) to
+    re-prompt for every field.
     """
     from agentic_devtools.cli.config.project_config import (
         load_project_config,
@@ -422,11 +427,19 @@ def _prompt_project_config() -> None:
     print()
     print("─── Project Configuration ───────────────────────────────────")
     print("  Configure project-specific settings.")
-    print("  Press Enter to keep current value; for optional fields, type '-' to clear.")
+    print("  Press Enter to keep current value; for optional fields, type '-' or 'clear' to clear.")
     print()
 
     def _ask(prompt: str, key: str, allow_clear: bool = False) -> str:
-        current = existing.get(key, "")
+        # Skip prompt entirely when the key is already present and re-prompting
+        # was not requested (key presence = "already answered").
+        if not force_prompt and key in existing:
+            # Normalise to str: config is dict[str, Any] so values may be
+            # None or non-string after manual JSON edits.
+            value = existing[key]
+            return "" if value is None else str(value)
+        raw_current = existing.get(key, "")
+        current = "" if raw_current is None else str(raw_current)
         suffix = f" [{current}]" if current else ""
         answer = input(f"  {prompt}{suffix}: ").strip()
         if allow_clear and answer.lower() in {"-", "clear"}:
@@ -440,10 +453,10 @@ def _prompt_project_config() -> None:
 
     jira_keys = _ask("Jira project key(s), comma-separated (e.g. ACME,PROJ)", "jira_project_keys")
     jira_base_url = _ask("Jira base URL (e.g. https://jira.example.com)", "jira_base_url")
-    corp_host = _ask("Corporate network test host (type '-' to clear)", "corporate_network_test_host", allow_clear=True)
-    vpn_url = _ask("VPN portal URL (type '-' to clear)", "vpn_url", allow_clear=True)
+    corp_host = _ask("Corporate network test host (type '-' or 'clear' to clear)", "corporate_network_test_host", allow_clear=True)
+    vpn_url = _ask("VPN portal URL (type '-' or 'clear' to clear)", "vpn_url", allow_clear=True)
     vpn_hostnames = _ask(
-        "VPN hostnames for smart detection, comma-separated (type '-' to clear)",
+        "VPN hostnames for smart detection, comma-separated (type '-' or 'clear' to clear)",
         "vpn_hostnames",
         allow_clear=True,
     )
@@ -456,16 +469,10 @@ def _prompt_project_config() -> None:
         ("vpn_url", vpn_url),
         ("vpn_hostnames", vpn_hostnames),
     ]:
-        if value:
-            config[key] = value
-        else:
-            config.pop(key, None)
+        config[key] = value
 
-    if config:
-        path = save_project_config(config)
-        print(f"\n  ✓ Project configuration saved to {path}")
-    else:
-        print("\n  ℹ No project configuration values provided.")
+    path = save_project_config(config)
+    print(f"\n  ✓ Project configuration saved to {path}")
 
 
 # Curated list of known-good Copilot models used when the binary cannot be
@@ -511,12 +518,17 @@ def _query_copilot_models() -> list[str]:
     return list(_KNOWN_COPILOT_MODELS)
 
 
-def _prompt_copilot_model() -> None:
+def _prompt_copilot_model(*, force_prompt: bool = False) -> None:
     """Prompt the user to select the default Copilot model for workflow sessions.
 
     Queries available models from the installed Copilot binary; falls back to a
     curated list when querying fails.  Persists the selection to
     ``.agdt/config/project.json`` under ``"default_copilot_model"``.
+
+    When *force_prompt* is ``False`` (the default), the prompt is **skipped**
+    if ``"default_copilot_model"`` already exists in the config (even if
+    ``""``).  Pass ``force_prompt=True`` (via ``--reconfigure``) to force
+    re-selection.
     """
     from agentic_devtools.cli.config.project_config import (
         load_project_config,
@@ -524,7 +536,15 @@ def _prompt_copilot_model() -> None:
     )
 
     existing = load_project_config()
-    current_model = existing.get("default_copilot_model", "").strip()
+    raw_model = existing.get("default_copilot_model", "")
+    current_model = raw_model.strip() if isinstance(raw_model, str) else ""
+
+    if not force_prompt and "default_copilot_model" in existing:
+        current_value = existing["default_copilot_model"]
+        print()
+        print("─── Copilot Model Configuration ─────────────────────────────")
+        print(f"  ℹ Default Copilot model already set: {current_value}")
+        return
 
     print()
     print("─── Copilot Model Configuration ─────────────────────────────")
@@ -571,6 +591,7 @@ def setup_cmd() -> None:
 
     Usage:
         agdt-setup [--system-only] [--no-verify-ssl] [--no-persist-env] [--overwrite-env]
+                   [--reconfigure]
 
     Options:
         --system-only   Skip managed installs into ~/.agdt/bin/; only verify
@@ -579,6 +600,8 @@ def setup_cmd() -> None:
                         only on trusted networks).
         --no-persist-env  Do not persist env vars to shell profile.
         --overwrite-env   Overwrite existing env var lines in shell profile.
+        --reconfigure     Re-prompt for all project configuration values
+                          and Copilot model selection, even if already set.
     """
     parser = argparse.ArgumentParser(
         prog="agdt-setup",
@@ -627,6 +650,12 @@ def setup_cmd() -> None:
         default=False,
         help="Skip workflow template generation step.",
     )
+    parser.add_argument(
+        "--reconfigure",
+        action="store_true",
+        default=False,
+        help="Re-prompt for all project configuration values and Copilot model selection, even if already set.",
+    )
     args = parser.parse_args()
 
     original_no_verify = os.environ.get("AGDT_NO_VERIFY_SSL")
@@ -685,8 +714,8 @@ def setup_cmd() -> None:
 
         # ── Project configuration prompts ───────────────────────────────
         if not args.system_only and git_root is not None:
-            _prompt_project_config()
-            _prompt_copilot_model()
+            _prompt_project_config(force_prompt=args.reconfigure)
+            _prompt_copilot_model(force_prompt=args.reconfigure)
         # ────────────────────────────────────────────────────────────────
 
         # Inject bundled agent/prompt skills where supported. Skill injection is a

{agentic_devtools-0.2.41 → agentic_devtools-0.2.42}/tests/unit/cli/config/project_config/test_save_project_config.py

@@ -35,3 +35,12 @@ class TestSaveProjectConfig:
         with patch("agentic_devtools.cli.config.project_config._get_config_path", return_value=None):
             with pytest.raises(RuntimeError, match="Cannot determine git repository root"):
                 save_project_config({"key": "value"})
+
+    def test_preserves_empty_string_values(self, tmp_path):
+        """Should faithfully store empty string values without stripping them."""
+        config_file = tmp_path / "config" / "project.json"
+        with patch("agentic_devtools.cli.config.project_config._get_config_path", return_value=config_file):
+            save_project_config({"jira_project_keys": "", "vpn_url": ""})
+        data = json.loads(config_file.read_text(encoding="utf-8"))
+        assert data["jira_project_keys"] == ""
+        assert data["vpn_url"] == ""

{agentic_devtools-0.2.41 → agentic_devtools-0.2.42}/tests/unit/cli/setup/commands/test__prompt_copilot_model.py

@@ -48,7 +48,7 @@ class TestPromptCopilotModel:
                 with patch("agentic_devtools.cli.config.project_config.save_project_config") as mock_save:
                     # Enter selects default (should be claude-opus-4.6)
                     with patch("agentic_devtools.cli.setup.commands.input", return_value=""):
-                        _prompt_copilot_model()
+                        _prompt_copilot_model(force_prompt=True)
 
         saved = mock_save.call_args[0][0]
         assert saved["default_copilot_model"] == "claude-opus-4.6"
@@ -125,7 +125,85 @@ class TestPromptCopilotModel:
                 with patch("agentic_devtools.cli.config.project_config.save_project_config") as mock_save:
                     # Enter selects default (should match claude-opus-4.6 after strip)
                     with patch("agentic_devtools.cli.setup.commands.input", return_value=""):
-                        _prompt_copilot_model()
+                        _prompt_copilot_model(force_prompt=True)
 
         saved = mock_save.call_args[0][0]
         assert saved["default_copilot_model"] == "claude-opus-4.6"
+
+    def test_skips_prompt_when_model_already_set(self, capsys):
+        """Should skip prompt when default_copilot_model key exists in config."""
+        existing = {"default_copilot_model": "gpt-5.3-codex"}
+        mock_input = patch("agentic_devtools.cli.setup.commands.input")
+        with mock_input as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                _prompt_copilot_model()
+
+        m_input.assert_not_called()
+        out = capsys.readouterr().out
+        assert "Default Copilot model already set: gpt-5.3-codex" in out
+
+    def test_skips_prompt_when_model_is_empty_string(self, capsys):
+        """Should skip prompt even when default_copilot_model is empty string."""
+        existing = {"default_copilot_model": ""}
+        mock_input = patch("agentic_devtools.cli.setup.commands.input")
+        with mock_input as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                _prompt_copilot_model()
+
+        m_input.assert_not_called()
+        out = capsys.readouterr().out
+        assert "Default Copilot model already set:" in out
+
+    def test_force_prompt_re_prompts_when_model_set(self, capsys):
+        """Should re-prompt when force_prompt=True even if model exists."""
+        existing = {"default_copilot_model": "gpt-4o"}
+        models = ["gpt-5.3-codex", "gpt-4o"]
+        with patch("agentic_devtools.cli.setup.commands._query_copilot_models", return_value=models):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch("agentic_devtools.cli.config.project_config.save_project_config") as mock_save:
+                    with patch("agentic_devtools.cli.setup.commands.input", return_value="1"):
+                        _prompt_copilot_model(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["default_copilot_model"] == "gpt-5.3-codex"
+
+    def test_skips_prompt_when_model_is_none(self, capsys):
+        """Should skip prompt when default_copilot_model is None (key present)."""
+        existing = {"default_copilot_model": None}
+        mock_input = patch("agentic_devtools.cli.setup.commands.input")
+        with mock_input as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                _prompt_copilot_model()
+
+        m_input.assert_not_called()
+        out = capsys.readouterr().out
+        assert "Default Copilot model already set:" in out
+
+    def test_force_prompt_handles_none_model_gracefully(self, capsys):
+        """Should handle None model value gracefully when force_prompt=True."""
+        existing = {"default_copilot_model": None}
+        models = ["gpt-5.3-codex", "gpt-4o"]
+        with patch("agentic_devtools.cli.setup.commands._query_copilot_models", return_value=models):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch("agentic_devtools.cli.config.project_config.save_project_config") as mock_save:
+                    with patch("agentic_devtools.cli.setup.commands.input", return_value="1"):
+                        _prompt_copilot_model(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["default_copilot_model"] == "gpt-5.3-codex"
+
+    def test_force_prompt_handles_non_string_model_gracefully(self, capsys):
+        """Should handle non-string model value gracefully when force_prompt=True."""
+        existing = {"default_copilot_model": 42}
+        models = ["gpt-5.3-codex", "gpt-4o"]
+        with patch("agentic_devtools.cli.setup.commands._query_copilot_models", return_value=models):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch("agentic_devtools.cli.config.project_config.save_project_config") as mock_save:
+                    with patch("agentic_devtools.cli.setup.commands.input", return_value="1"):
+                        _prompt_copilot_model(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["default_copilot_model"] == "gpt-5.3-codex"

agentic_devtools-0.2.42/tests/unit/cli/setup/commands/test__prompt_project_config.py

@@ -0,0 +1,324 @@
+"""Tests for _prompt_project_config."""
+
+from unittest.mock import patch
+
+from agentic_devtools.cli.setup.commands import _prompt_project_config
+
+
+class TestPromptProjectConfig:
+    """Tests for _prompt_project_config."""
+
+    def test_saves_config_when_values_provided(self, tmp_path, capsys):
+        """Should save provided values to project config."""
+        inputs = iter(
+            [
+                "ACME,PROJ",
+                "https://jira.example.com",
+                "corp.example.com",
+                "https://vpn.example.com",
+                "jira.example.com,corp.example.com",
+            ]
+        )
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value={}):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config",
+                    return_value=tmp_path / "project.json",
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == "ACME,PROJ"
+        assert saved["jira_base_url"] == "https://jira.example.com"
+        assert saved["corporate_network_test_host"] == "corp.example.com"
+        assert saved["vpn_url"] == "https://vpn.example.com"
+        assert saved["vpn_hostnames"] == "jira.example.com,corp.example.com"
+
+        out = capsys.readouterr().out
+        assert "Project configuration saved" in out
+
+    def test_keeps_existing_values_on_empty_input(self, capsys):
+        """Should keep existing config values when user presses Enter."""
+        existing = {
+            "jira_project_keys": "EXISTING",
+            "jira_base_url": "https://existing.example.com",
+            "vpn_url": "https://vpn.existing.com",
+        }
+        inputs = iter(["", "", "", "", ""])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == "EXISTING"
+        assert saved["jira_base_url"] == "https://existing.example.com"
+        # Optional field is KEPT on empty Enter (sentinel required to clear)
+        assert saved["vpn_url"] == "https://vpn.existing.com"
+
+    def test_no_values_stores_empty_strings(self, capsys):
+        """Should store all keys as empty strings when no values are provided."""
+        inputs = iter(["", "", "", "", ""])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value={}):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == ""
+        assert saved["jira_base_url"] == ""
+        assert saved["corporate_network_test_host"] == ""
+        assert saved["vpn_url"] == ""
+        assert saved["vpn_hostnames"] == ""
+
+    def test_clears_optional_values_with_sentinel(self, capsys):
+        """Should store empty string for optional keys when user types '-' sentinel."""
+        existing = {
+            "jira_project_keys": "PROJECT",
+            "jira_base_url": "https://jira.example.com",
+            "vpn_url": "https://vpn.example.com",
+            "corporate_network_test_host": "corp.example.com",
+        }
+        # Type '-' for optional fields to clear them, empty for required to keep
+        inputs = iter(["", "", "-", "-", "-"])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        # Required fields kept on empty Enter
+        assert saved["jira_project_keys"] == "PROJECT"
+        assert saved["jira_base_url"] == "https://jira.example.com"
+        # Optional fields cleared via '-' sentinel → stored as ""
+        assert saved["vpn_url"] == ""
+        assert saved["corporate_network_test_host"] == ""
+        assert saved["vpn_hostnames"] == ""
+
+    def test_clears_optional_values_with_clear_sentinel(self, capsys):
+        """Should also accept 'clear' as a sentinel to store empty string for optional keys."""
+        existing = {
+            "jira_project_keys": "PROJECT",
+            "jira_base_url": "https://jira.example.com",
+            "vpn_url": "https://vpn.example.com",
+        }
+        inputs = iter(["", "", "", "clear", ""])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == "PROJECT"
+        assert saved["vpn_url"] == ""
+
+    def test_rejects_sentinel_for_required_fields(self, capsys):
+        """Should ignore '-'/'clear' sentinels for required fields and keep existing value."""
+        existing = {
+            "jira_project_keys": "PROJECT",
+            "jira_base_url": "https://jira.example.com",
+        }
+        # Type '-' for jira_keys and 'clear' for jira_base_url — both required
+        inputs = iter(["-", "clear", "", "", ""])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        # Required fields retain existing values when sentinel is typed
+        assert saved["jira_project_keys"] == "PROJECT"
+        assert saved["jira_base_url"] == "https://jira.example.com"
+
+    def test_skips_prompts_when_keys_present(self, capsys):
+        """Should skip all prompts when all keys are already present in config."""
+        existing = {
+            "jira_project_keys": "PROJ",
+            "jira_base_url": "https://jira.example.com",
+            "corporate_network_test_host": "",
+            "vpn_url": "https://vpn.example.com",
+            "vpn_hostnames": "",
+        }
+
+        mock_input = patch("agentic_devtools.cli.setup.commands.input")
+        with mock_input as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config()
+
+        m_input.assert_not_called()
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved == existing
+
+    def test_prompts_only_for_absent_keys(self, capsys):
+        """Should prompt only for keys not present in existing config."""
+        existing = {
+            "jira_project_keys": "PROJ",
+            "jira_base_url": "https://jira.example.com",
+            "corporate_network_test_host": "corp.example.com",
+        }
+        # Only 2 keys absent: vpn_url and vpn_hostnames
+        inputs = iter(["https://vpn.example.com", "vpn1.example.com"])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)) as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config()
+
+        assert m_input.call_count == 2
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == "PROJ"
+        assert saved["jira_base_url"] == "https://jira.example.com"
+        assert saved["corporate_network_test_host"] == "corp.example.com"
+        assert saved["vpn_url"] == "https://vpn.example.com"
+        assert saved["vpn_hostnames"] == "vpn1.example.com"
+
+    def test_force_prompt_re_prompts_all(self, capsys):
+        """Should prompt for all keys when force_prompt=True, even if they exist."""
+        existing = {
+            "jira_project_keys": "PROJ",
+            "jira_base_url": "https://jira.example.com",
+            "corporate_network_test_host": "corp.example.com",
+            "vpn_url": "https://vpn.example.com",
+            "vpn_hostnames": "vpn1.example.com",
+        }
+        inputs = iter(["NEW", "https://new.example.com", "new-corp", "https://new-vpn.example.com", "new-vpn"])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)) as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        assert m_input.call_count == 5
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == "NEW"
+
+    def test_empty_values_stored_not_popped(self, capsys):
+        """Should store empty strings and preserve extra keys in config."""
+        # Start with an extra key that should survive the save
+        inputs = iter(["", "", "", "", ""])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch(
+                "agentic_devtools.cli.config.project_config.load_project_config",
+                return_value={"extra_key": "preserved"},
+            ):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        # All 5 prompt keys stored as "" (not popped)
+        assert saved["jira_project_keys"] == ""
+        assert saved["jira_base_url"] == ""
+        assert saved["corporate_network_test_host"] == ""
+        assert saved["vpn_url"] == ""
+        assert saved["vpn_hostnames"] == ""
+        # Extra key preserved
+        assert saved["extra_key"] == "preserved"
+
+    def test_skip_path_normalises_none_to_empty_string(self, capsys):
+        """Should normalise None values to empty string in the skip path."""
+        existing = {
+            "jira_project_keys": None,
+            "jira_base_url": "https://jira.example.com",
+            "corporate_network_test_host": None,
+            "vpn_url": "",
+            "vpn_hostnames": "host.example.com",
+        }
+
+        mock_input = patch("agentic_devtools.cli.setup.commands.input")
+        with mock_input as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config()
+
+        m_input.assert_not_called()
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        # None normalised to ""
+        assert saved["jira_project_keys"] == ""
+        assert saved["corporate_network_test_host"] == ""
+        # Non-None values preserved as-is
+        assert saved["jira_base_url"] == "https://jira.example.com"
+        assert saved["vpn_url"] == ""
+        assert saved["vpn_hostnames"] == "host.example.com"
+
+    def test_skip_path_normalises_non_string_to_str(self, capsys):
+        """Should coerce non-string values (e.g. int) to str in the skip path."""
+        existing = {
+            "jira_project_keys": 42,
+            "jira_base_url": "https://jira.example.com",
+            "corporate_network_test_host": "",
+            "vpn_url": "",
+            "vpn_hostnames": "",
+        }
+
+        mock_input = patch("agentic_devtools.cli.setup.commands.input")
+        with mock_input as m_input:
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config()
+
+        m_input.assert_not_called()
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == "42"
+
+    def test_prompt_path_normalises_none_current_value(self, capsys):
+        """Should normalise None current value to empty string in the prompt path."""
+        existing = {
+            "jira_project_keys": None,
+            "jira_base_url": None,
+        }
+        # force_prompt=True forces prompt path; absent keys also prompt
+        inputs = iter(["NEW_KEY", "https://new.example.com", "corp", "vpn", "hosts"])
+
+        with patch("agentic_devtools.cli.setup.commands.input", side_effect=lambda _: next(inputs)):
+            with patch("agentic_devtools.cli.config.project_config.load_project_config", return_value=existing):
+                with patch(
+                    "agentic_devtools.cli.config.project_config.save_project_config", return_value="/fake/path"
+                ) as mock_save:
+                    _prompt_project_config(force_prompt=True)
+
+        mock_save.assert_called_once()
+        saved = mock_save.call_args[0][0]
+        assert saved["jira_project_keys"] == "NEW_KEY"
+        assert saved["jira_base_url"] == "https://new.example.com"

{agentic_devtools-0.2.41 → agentic_devtools-0.2.42}/tests/unit/cli/setup/commands/test_setup_cmd.py

@@ -400,6 +400,54 @@ class TestSetupCmd:
                             with patch.object(commands, "_persist_env_vars_to_profile"):
                                 commands.setup_cmd()
 
+    def test_reconfigure_flag_accepted(self, capsys):
+        """--reconfigure flag is accepted without error."""
+        with patch("sys.argv", ["agdt-setup", "--reconfigure"]):
+            with patch.object(commands, "_prefetch_certs"):
+                with patch.object(commands, "install_copilot_cli", return_value=True):
+                    with patch.object(commands, "install_gh_cli", return_value=True):
+                        with patch.object(commands, "check_all_dependencies", return_value=_make_statuses(True)):
+                            with patch.object(commands, "_persist_env_vars_to_profile"):
+                                commands.setup_cmd()
+
+    def test_reconfigure_flag_threads_to_prompt_functions(self, capsys, tmp_path):
+        """--reconfigure passes force_prompt=True to both prompt functions."""
+        with patch(
+            "sys.argv", ["agdt-setup", "--reconfigure", "--skip-platform-detection", "--skip-templates"]
+        ):
+            with patch.object(commands, "_prefetch_certs"):
+                with patch.object(commands, "install_copilot_cli", return_value=True):
+                    with patch.object(commands, "install_gh_cli", return_value=True):
+                        with patch.object(commands, "check_all_dependencies", return_value=_make_statuses(True)):
+                            with patch.object(commands, "_persist_env_vars_to_profile"):
+                                with patch("agentic_devtools.state._get_git_repo_root", return_value=tmp_path):
+                                    with patch(
+                                        "agentic_devtools.agdt_gitignore.ensure_agdt_gitignore", return_value=True
+                                    ):
+                                        with patch.object(commands, "_prompt_project_config") as mock_project:
+                                            with patch.object(commands, "_prompt_copilot_model") as mock_copilot:
+                                                commands.setup_cmd()
+        mock_project.assert_called_once_with(force_prompt=True)
+        mock_copilot.assert_called_once_with(force_prompt=True)
+
+    def test_no_reconfigure_passes_false_to_prompt_functions(self, capsys, tmp_path):
+        """Without --reconfigure, force_prompt=False is passed to both prompt functions."""
+        with patch("sys.argv", ["agdt-setup", "--skip-platform-detection", "--skip-templates"]):
+            with patch.object(commands, "_prefetch_certs"):
+                with patch.object(commands, "install_copilot_cli", return_value=True):
+                    with patch.object(commands, "install_gh_cli", return_value=True):
+                        with patch.object(commands, "check_all_dependencies", return_value=_make_statuses(True)):
+                            with patch.object(commands, "_persist_env_vars_to_profile"):
+                                with patch("agentic_devtools.state._get_git_repo_root", return_value=tmp_path):
+                                    with patch(
+                                        "agentic_devtools.agdt_gitignore.ensure_agdt_gitignore", return_value=True
+                                    ):
+                                        with patch.object(commands, "_prompt_project_config") as mock_project:
+                                            with patch.object(commands, "_prompt_copilot_model") as mock_copilot:
+                                                commands.setup_cmd()
+        mock_project.assert_called_once_with(force_prompt=False)
+        mock_copilot.assert_called_once_with(force_prompt=False)
+
     def test_invalid_issue_adapter_rejected(self, capsys):
         """Invalid --issue-adapter value is rejected by argparse."""
         with patch("sys.argv", ["agdt-setup", "--issue-adapter", "foo"]):