tests/cli(add): Cover path-only workflow edge cases

why: New CLI behavior needs regression coverage for relative paths, workspace overrides, tilde log output, and legacy positional rejection.

what:
- extend path fixtures to toggle relative inputs, workspace overrides, and dry-run tilde assertions
- normalize logs for snapshots while preserving contracted config paths when required
- add unit checks for dry-run logging and parser rejection of extra positional args

Author: tony

tests/cli/__snapshots__/test_add.ambr

@@ -3,7 +3,7 @@
   dict({
     'log': '''
       WARNING  vcspull.cli.add:add.py:<line> • Duplicate workspace root ~/study/python/ appears 2 times; skipping merge because --no-merge was provided.
-      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/avast/pytest-docker.git) to <config> under '~/study/python/'.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/avast/pytest-docker.git) to ~/.vcspull.yaml under '~/study/python/'.
 
     ''',
     'test_id': 'merge-off',
@@ -13,7 +13,7 @@
   dict({
     'log': '''
       INFO     vcspull.cli.add:add.py:<line> • Merged 2 duplicate entries for workspace root ~/study/python/
-      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/avast/pytest-docker.git) to <config> under '~/study/python/'.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/avast/pytest-docker.git) to ~/.vcspull.yaml under '~/study/python/'.
 
     ''',
     'test_id': 'merge-on',
@@ -27,13 +27,28 @@
       INFO     vcspull.cli.add:add.py:<line>   • workspace: ~/study/python/
       INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
       INFO     vcspull.cli.add:add.py:<line> ? Import this repository? [y/N]: y (auto-confirm)
-      INFO     vcspull.cli.add:add.py:<line> Config file <config> not found. A new one will be created.
-      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/avast/pytest-docker) to <config> under '~/study/python/'.
+      INFO     vcspull.cli.add:add.py:<line> Config file ~/.vcspull.yaml not found. A new one will be created.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/avast/pytest-docker) to ~/.vcspull.yaml under '~/study/python/'.
 
     ''',
     'test_id': 'path-auto-confirm',
   })
 # ---
+# name: test_handle_add_command_path_mode[path-dry-run-shows-tilde-config]
+  dict({
+    'log': '''
+      INFO     vcspull.cli.add:add.py:<line> Found new repository to import:
+      INFO     vcspull.cli.add:add.py:<line>   + pytest-docker (https://github.com/example/tilde)
+      INFO     vcspull.cli.add:add.py:<line>   • workspace: ~/study/python/
+      INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
+      INFO     vcspull.cli.add:add.py:<line> ? Import this repository? [y/N]: skipped (dry-run)
+      INFO     vcspull.cli.add:add.py:<line> Config file ~/.vcspull.yaml not found. A new one will be created.
+      INFO     vcspull.cli.add:add.py:<line> → Would add 'pytest-docker' (git+https://github.com/example/tilde) to ~/.vcspull.yaml under '~/study/python/'.
+  
+    ''',
+    'test_id': 'path-dry-run-shows-tilde-config',
+  })
+# ---
 # name: test_handle_add_command_path_mode[path-explicit-url]
   dict({
     'log': '''
@@ -42,8 +57,8 @@
       INFO     vcspull.cli.add:add.py:<line>   • workspace: ~/study/python/
       INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
       INFO     vcspull.cli.add:add.py:<line> ? Import this repository? [y/N]: y (auto-confirm)
-      INFO     vcspull.cli.add:add.py:<line> Config file <config> not found. A new one will be created.
-      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/manual/source) to <config> under '~/study/python/'.
+      INFO     vcspull.cli.add:add.py:<line> Config file ~/.vcspull.yaml not found. A new one will be created.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/manual/source) to ~/.vcspull.yaml under '~/study/python/'.
 
     ''',
     'test_id': 'path-explicit-url',
@@ -56,8 +71,8 @@
       INFO     vcspull.cli.add:add.py:<line>   + project-alias (https://github.com/example/project)
       INFO     vcspull.cli.add:add.py:<line>   • workspace: ~/study/python/
       INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
-      INFO     vcspull.cli.add:add.py:<line> Config file <config> not found. A new one will be created.
-      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'project-alias' (git+https://github.com/example/project) to <config> under '~/study/python/'.
+      INFO     vcspull.cli.add:add.py:<line> Config file ~/.vcspull.yaml not found. A new one will be created.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'project-alias' (git+https://github.com/example/project) to ~/.vcspull.yaml under '~/study/python/'.
 
     ''',
     'test_id': 'path-interactive-accept',
@@ -85,7 +100,7 @@
       INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
       INFO     vcspull.cli.add:add.py:<line> ? Import this repository? [y/N]: y (auto-confirm)
       WARNING  vcspull.cli.add:add.py:<line> • Duplicate workspace root ~/study/python/ appears 2 times; skipping merge because --no-merge was provided.
-      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/example/no-merge) to <config> under '~/study/python/'.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/example/no-merge) to ~/.vcspull.yaml under '~/study/python/'.
 
     ''',
     'test_id': 'path-no-merge',
@@ -100,10 +115,40 @@
       INFO     vcspull.cli.add:add.py:<line>   • workspace: ~/study/python/
       INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
       INFO     vcspull.cli.add:add.py:<line> ? Import this repository? [y/N]: y (auto-confirm)
-      INFO     vcspull.cli.add:add.py:<line> Config file <config> not found. A new one will be created.
-      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (<repo_path>) to <config> under '~/study/python/'.
+      INFO     vcspull.cli.add:add.py:<line> Config file ~/.vcspull.yaml not found. A new one will be created.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (<repo_path>) to ~/.vcspull.yaml under '~/study/python/'.
 
     ''',
     'test_id': 'path-no-remote',
   })
 # ---
+# name: test_handle_add_command_path_mode[path-relative-derives-workspace]
+  dict({
+    'log': '''
+      INFO     vcspull.cli.add:add.py:<line> Found new repository to import:
+      INFO     vcspull.cli.add:add.py:<line>   + pytest-docker (https://github.com/example/rel)
+      INFO     vcspull.cli.add:add.py:<line>   • workspace: ~/study/python/
+      INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
+      INFO     vcspull.cli.add:add.py:<line> ? Import this repository? [y/N]: y (auto-confirm)
+      INFO     vcspull.cli.add:add.py:<line> Config file ~/.vcspull.yaml not found. A new one will be created.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/example/rel) to ~/.vcspull.yaml under '~/study/python/'.
+  
+    ''',
+    'test_id': 'path-relative-derives-workspace',
+  })
+# ---
+# name: test_handle_add_command_path_mode[path-workspace-override]
+  dict({
+    'log': '''
+      INFO     vcspull.cli.add:add.py:<line> Found new repository to import:
+      INFO     vcspull.cli.add:add.py:<line>   + pytest-docker (https://github.com/example/workspace)
+      INFO     vcspull.cli.add:add.py:<line>   • workspace: ~/custom/
+      INFO     vcspull.cli.add:add.py:<line>   ↳ path: ~/study/python/pytest-docker
+      INFO     vcspull.cli.add:add.py:<line> ? Import this repository? [y/N]: y (auto-confirm)
+      INFO     vcspull.cli.add:add.py:<line> Config file ~/.vcspull.yaml not found. A new one will be created.
+      INFO     vcspull.cli.add:add.py:<line> ✓ Successfully added 'pytest-docker' (git+https://github.com/example/workspace) to ~/.vcspull.yaml under '~/custom/'.
+  
+    ''',
+    'test_id': 'path-workspace-override',
+  })
+# ---

tests/cli/test_add.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+import os
 import logging
 import re
 import subprocess
@@ -12,7 +13,7 @@
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from vcspull.cli.add import add_repo, handle_add_command
+from vcspull.cli.add import add_repo, create_add_subparser, handle_add_command
 from vcspull.util import contract_user_home
 
 if t.TYPE_CHECKING:
@@ -420,6 +421,10 @@ class PathAddFixture(t.NamedTuple):
     expected_warning: str | None
     merge_duplicates: bool
     preexisting_yaml: str | None
+    use_relative_repo_path: bool
+    workspace_override: str | None
+    expected_workspace_label: str
+    preserve_config_path_in_log: bool
 
 
 PATH_ADD_FIXTURES: list[PathAddFixture] = [
@@ -436,6 +441,10 @@ class PathAddFixture(t.NamedTuple):
         expected_warning=None,
         merge_duplicates=True,
         preexisting_yaml=None,
+        use_relative_repo_path=False,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=False,
     ),
     PathAddFixture(
         test_id="path-interactive-accept",
@@ -450,6 +459,10 @@ class PathAddFixture(t.NamedTuple):
         expected_warning=None,
         merge_duplicates=True,
         preexisting_yaml=None,
+        use_relative_repo_path=False,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=False,
     ),
     PathAddFixture(
         test_id="path-interactive-decline",
@@ -464,6 +477,10 @@ class PathAddFixture(t.NamedTuple):
         expected_warning=None,
         merge_duplicates=True,
         preexisting_yaml=None,
+        use_relative_repo_path=False,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=False,
     ),
     PathAddFixture(
         test_id="path-no-remote",
@@ -478,6 +495,10 @@ class PathAddFixture(t.NamedTuple):
         expected_warning="Unable to determine git remote",
         merge_duplicates=True,
         preexisting_yaml=None,
+        use_relative_repo_path=False,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=False,
     ),
     PathAddFixture(
         test_id="path-no-merge",
@@ -499,6 +520,10 @@ class PathAddFixture(t.NamedTuple):
   repo2:
     repo: git+https://example.com/repo2.git
 """,
+        use_relative_repo_path=False,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=False,
     ),
     PathAddFixture(
         test_id="path-explicit-url",
@@ -513,6 +538,64 @@ class PathAddFixture(t.NamedTuple):
         expected_warning=None,
         merge_duplicates=True,
         preexisting_yaml=None,
+        use_relative_repo_path=False,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=False,
+    ),
+    PathAddFixture(
+        test_id="path-relative-derives-workspace",
+        remote_url="https://github.com/example/rel",
+        explicit_url=None,
+        assume_yes=True,
+        prompt_response=None,
+        dry_run=False,
+        expected_written=True,
+        expected_url_kind="remote",
+        override_name=None,
+        expected_warning=None,
+        merge_duplicates=True,
+        preexisting_yaml=None,
+        use_relative_repo_path=True,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=False,
+    ),
+    PathAddFixture(
+        test_id="path-workspace-override",
+        remote_url="https://github.com/example/workspace",
+        explicit_url=None,
+        assume_yes=True,
+        prompt_response=None,
+        dry_run=False,
+        expected_written=True,
+        expected_url_kind="remote",
+        override_name=None,
+        expected_warning=None,
+        merge_duplicates=True,
+        preexisting_yaml=None,
+        use_relative_repo_path=False,
+        workspace_override="~/custom/",
+        expected_workspace_label="~/custom/",
+        preserve_config_path_in_log=False,
+    ),
+    PathAddFixture(
+        test_id="path-dry-run-shows-tilde-config",
+        remote_url="https://github.com/example/tilde",
+        explicit_url=None,
+        assume_yes=False,
+        prompt_response=None,
+        dry_run=True,
+        expected_written=False,
+        expected_url_kind="remote",
+        override_name=None,
+        expected_warning=None,
+        merge_duplicates=True,
+        preexisting_yaml=None,
+        use_relative_repo_path=False,
+        workspace_override=None,
+        expected_workspace_label="~/study/python/",
+        preserve_config_path_in_log=True,
     ),
 ]
 
@@ -535,6 +618,10 @@ def test_handle_add_command_path_mode(
     expected_warning: str | None,
     merge_duplicates: bool,
     preexisting_yaml: str | None,
+    use_relative_repo_path: bool,
+    workspace_override: str | None,
+    expected_workspace_label: str,
+    preserve_config_path_in_log: bool,
     tmp_path: pathlib.Path,
     monkeypatch: MonkeyPatch,
     caplog: t.Any,
@@ -557,12 +644,18 @@ def test_handle_add_command_path_mode(
     expected_input = prompt_response if prompt_response is not None else "y"
     monkeypatch.setattr("builtins.input", lambda _: expected_input)
 
+    repo_arg: str
+    if use_relative_repo_path:
+        repo_arg = os.fspath(repo_path.relative_to(tmp_path))
+    else:
+        repo_arg = str(repo_path)
+
     args = argparse.Namespace(
-        repo_path=str(repo_path),
+        repo_path=repo_arg,
         url=explicit_url,
         override_name=override_name,
         config=str(config_file),
-        workspace_root_path=None,
+        workspace_root_path=workspace_override,
         dry_run=dry_run,
         assume_yes=assume_yes,
         merge_duplicates=merge_duplicates,
@@ -579,7 +672,11 @@ def test_handle_add_command_path_mode(
     normalized_log = log_output.replace(str(config_file), "<config>")
     normalized_log = normalized_log.replace(str(repo_path), "<repo_path>")
     normalized_log = re.sub(r"add\.py:\d+", "add.py:<line>", normalized_log)
-    snapshot.assert_match({"test_id": test_id, "log": normalized_log})
+    if preserve_config_path_in_log:
+        assert contract_user_home(config_file) in log_output
+        snapshot.assert_match({"test_id": test_id, "log": normalized_log.replace("<config>", "~/.vcspull.yaml")})
+    else:
+        snapshot.assert_match({"test_id": test_id, "log": normalized_log})
 
     if dry_run:
         assert "skipped (dry-run)" in log_output
@@ -599,7 +696,7 @@ def test_handle_add_command_path_mode(
         with config_file.open(encoding="utf-8") as fh:
             config_data = yaml.safe_load(fh)
 
-        workspace = "~/study/python/"
+        workspace = expected_workspace_label
         assert workspace in config_data
         assert repo_name in config_data[workspace]
 
@@ -632,4 +729,41 @@ def test_handle_add_command_path_mode(
                 workspace = config_data.get("~/study/python/")
                 if workspace is not None:
                     assert repo_name not in workspace
-        assert "Aborted import" in log_output
+        if not dry_run:
+            assert "Aborted import" in log_output
+
+
+def test_add_repo_dry_run_contracts_config_path(
+    tmp_path: pathlib.Path,
+    monkeypatch: MonkeyPatch,
+    caplog: t.Any,
+) -> None:
+    """Dry-run logging shows tilde-shortened config file paths."""
+    caplog.set_level(logging.INFO)
+
+    monkeypatch.setenv("HOME", str(tmp_path))
+    monkeypatch.chdir(tmp_path)
+
+    config_path = tmp_path / ".vcspull.yaml"
+
+    add_repo(
+        name="tilde-repo",
+        url="git+https://example.com/tilde-repo.git",
+        config_file_path_str=str(config_path),
+        path=str(tmp_path / "projects/tilde-repo"),
+        workspace_root_path=None,
+        dry_run=True,
+    )
+
+    assert "~/.vcspull.yaml" in caplog.text
+
+
+def test_add_parser_rejects_extra_positional() -> None:
+    """Passing both name and URL should raise a parse error in the new parser."""
+    parser = argparse.ArgumentParser(prog="vcspull")
+    subparsers = parser.add_subparsers(dest="command", required=True)
+    add_parser = subparsers.add_parser("add")
+    create_add_subparser(add_parser)
+
+    with pytest.raises(SystemExit):
+        parser.parse_args(["add", "name", "https://example.com/repo.git"])