cli/add(fix[duplicate-check]): Handle both config formats when checking duplicates

why: The duplicate repo check was showing the raw dict structure
{'repo': 'url'} instead of just the URL when checking verbose format
configs, causing test failures.

what:
- Extract URL from both string and dict config formats
- Check for both 'repo' and 'url' keys in dict configs
- Display clean URL in warning messages
- Fix line length issues flagged by ruff
- Fix mypy type error with proper type annotation

This ensures consistent user experience regardless of whether existing
configs use simple string format or verbose dict format.

Author: tony

src/vcspull/cli/add.py

@@ -142,17 +142,27 @@ def add_repo(
 
     # Check if repo already exists
     if name in raw_config[base_dir_key]:
+        existing_config = raw_config[base_dir_key][name]
+        # Handle both string and dict formats
+        current_url: str
+        if isinstance(existing_config, str):
+            current_url = existing_config
+        elif isinstance(existing_config, dict):
+            repo_value = existing_config.get("repo")
+            url_value = existing_config.get("url")
+            current_url = repo_value or url_value or "unknown"
+        else:
+            current_url = str(existing_config)
+
         log.warning(
             f"Repository '{name}' already exists under '{base_dir_key}'. "
-            f"Current URL: {raw_config[base_dir_key][name]}. "
+            f"Current URL: {current_url}. "
             f"To update, remove and re-add, or edit the YAML file manually.",
         )
         return
 
     # Add the repository in verbose format
-    raw_config[base_dir_key][name] = {
-        "repo": url
-    }
+    raw_config[base_dir_key][name] = {"repo": url}
 
     # Save config
     try:

src/vcspull/cli/add_from_fs.py

@@ -255,7 +255,8 @@ def add_from_filesystem(
             )
             for name, url, key in existing_repos:
                 log.info(
-                    f"  {Fore.BLUE}•{Style.RESET_ALL} {Fore.CYAN}{name}{Style.RESET_ALL} "
+                    f"  {Fore.BLUE}•{Style.RESET_ALL} "
+                    f"{Fore.CYAN}{name}{Style.RESET_ALL} "
                     f"({Fore.YELLOW}{url}{Style.RESET_ALL}) at "
                     f"{Fore.MAGENTA}{key}{name}{Style.RESET_ALL} "
                     f"in {Fore.BLUE}{config_file_path}{Style.RESET_ALL}"
@@ -272,9 +273,10 @@ def add_from_filesystem(
     # Show what will be added
     log.info(
         f"\n{Fore.GREEN}Found {len(repos_to_add)} new "
-        f"{'repository' if len(repos_to_add) == 1 else 'repositories'} to add:{Style.RESET_ALL}"
+        f"{'repository' if len(repos_to_add) == 1 else 'repositories'} "
+        f"to add:{Style.RESET_ALL}"
     )
-    for repo_name, repo_url, determined_base_key in repos_to_add:
+    for repo_name, repo_url, _determined_base_key in repos_to_add:
         log.info(
             f"  {Fore.GREEN}+{Style.RESET_ALL} {Fore.CYAN}{repo_name}{Style.RESET_ALL} "
             f"({Fore.YELLOW}{repo_url}{Style.RESET_ALL})"
@@ -300,9 +302,7 @@ def add_from_filesystem(
             continue
 
         if repo_name not in raw_config[determined_base_key]:
-            raw_config[determined_base_key][repo_name] = {
-                "repo": repo_url
-            }
+            raw_config[determined_base_key][repo_name] = {"repo": repo_url}
             log.info(
                 f"{Fore.GREEN}+{Style.RESET_ALL} Adding "
                 f"{Fore.CYAN}'{repo_name}'{Style.RESET_ALL} "

tests/cli/test_add.py

@@ -5,7 +5,6 @@
 import pathlib
 import typing as t
 
-import pytest
 import yaml
 
 from vcspull.cli.add import add_repo
@@ -26,7 +25,7 @@ def test_add_simple_repo(
         caplog.set_level("INFO")
 
         config_file = tmp_path / ".vcspull.yaml"
-        
+
         # Add a repository
         add_repo(
             name="myproject",
@@ -60,7 +59,7 @@ def test_add_with_custom_base_dir(
         caplog.set_level("INFO")
 
         config_file = tmp_path / ".vcspull.yaml"
-        
+
         # Add a repository with custom base dir
         add_repo(
             name="mylib",
@@ -88,14 +87,10 @@ def test_add_duplicate_repo(
         caplog.set_level("WARNING")
 
         config_file = tmp_path / ".vcspull.yaml"
-        
+
         # Pre-create config with existing repo
         existing_config = {
-            "~/code/": {
-                "existing": {
-                    "repo": "git@github.com:user/existing.git"
-                }
-            }
+            "~/code/": {"existing": {"repo": "git@github.com:user/existing.git"}}
         }
         with config_file.open("w") as f:
             yaml.dump(existing_config, f)
@@ -116,7 +111,10 @@ def test_add_duplicate_repo(
         # Config should not be changed
         with config_file.open() as f:
             config_data = yaml.safe_load(f)
-        assert config_data["~/code/"]["existing"]["repo"] == "git@github.com:user/existing.git"
+        assert (
+            config_data["~/code/"]["existing"]["repo"]
+            == "git@github.com:user/existing.git"
+        )
 
     def test_add_to_existing_config(
         self,
@@ -127,14 +125,10 @@ def test_add_to_existing_config(
         caplog.set_level("INFO")
 
         config_file = tmp_path / ".vcspull.yaml"
-        
+
         # Pre-create config with some repos
         existing_config = {
-            "~/work/": {
-                "project1": {
-                    "repo": "git@github.com:user/project1.git"
-                }
-            }
+            "~/work/": {"project1": {"repo": "git@github.com:user/project1.git"}}
         }
         with config_file.open("w") as f:
             yaml.dump(existing_config, f)
@@ -156,4 +150,4 @@ def test_add_to_existing_config(
         assert "project2" in config_data["~/work/"]
         assert config_data["~/work/"]["project2"] == {
             "repo": "git@github.com:user/project2.git"
-        }
+        }

tests/cli/test_add_from_fs.py

@@ -642,7 +642,7 @@ def test_many_existing_repos_summary(
         # Should NOT list individual repos
         assert "• existing0" not in caplog.text
         assert "• existing7" not in caplog.text
-        
+
         # Verify new repo is shown clearly
         assert "Found 1 new repository to add:" in caplog.text
         assert "+ new_repo" in caplog.text