feat(discovery): canonicalize same-origin checkouts in workspace scan

src/portfolio_truth_sources.py

@@ -103,7 +103,48 @@ def discover_workspace_projects(
                 child, workspace_root, catalog_data=catalog_data, now=now, depth=2
             )
         )
-    return discovered
+    return _dedupe_checkouts_by_origin(discovered)
+
+
+def _dedupe_checkouts_by_origin(
+    discovered: list[dict[str, Any]],
+) -> list[dict[str, Any]]:
+    """Collapse multiple on-disk checkouts of the same repo to one canonical project.
+
+    Linked git worktrees and stray duplicate clones (e.g. ``<repo>-security-fix``
+    left behind by multi-repo sweeps) all resolve to the same origin
+    (``repo_full_name``), so without this they each count as a distinct project —
+    inflating the portfolio count and dragging catalog-completeness toward zero.
+
+    Keep one canonical checkout per origin, preferring the directory whose name
+    matches the repo basename, then the shortest name, then alphabetical. Projects
+    without an origin are local-only and are never collapsed. Result is sorted by
+    name (case-insensitive), matching the prior discovery ordering.
+    """
+    by_origin: dict[str, list[dict[str, Any]]] = {}
+    canonical: list[dict[str, Any]] = []
+    for project in discovered:
+        origin = str(project.get("repo_full_name", "") or "").strip()
+        if origin:
+            by_origin.setdefault(origin.lower(), []).append(project)
+        else:
+            canonical.append(project)
+
+    for origin_key, group in by_origin.items():
+        repo_base = origin_key.rsplit("/", 1)[-1]
+        canonical.append(
+            min(
+                group,
+                key=lambda p: (
+                    str(p.get("name", "")).lower() != repo_base,
+                    len(str(p.get("name", ""))),
+                    str(p.get("name", "")).lower(),
+                ),
+            )
+        )
+
+    canonical.sort(key=lambda p: str(p.get("name", "")).lower())
+    return canonical
 
 
 def _discover_nested_projects(

tests/test_portfolio_truth_sources.py

@@ -0,0 +1,78 @@
+"""Tests for workspace discovery canonicalization in portfolio_truth_sources.
+
+Multiple on-disk checkouts of the same repo (linked git worktrees and stray
+duplicate full-clones left by multi-repo sweeps) share one origin
+(`repo_full_name`). Discovery must collapse them to a single canonical project
+so they don't inflate the project count and pollute catalog-completeness.
+"""
+
+from __future__ import annotations
+
+from src.portfolio_truth_sources import _dedupe_checkouts_by_origin
+
+
+def _p(name: str, repo_full_name: str = "", path: str | None = None) -> dict:
+    return {"name": name, "repo_full_name": repo_full_name, "path": path or name}
+
+
+def test_collapses_same_origin_checkouts_to_one() -> None:
+    discovered = [
+        _p("AssistSupport-openssl-fix", "saagpatel/AssistSupport"),
+        _p("AssistSupport", "saagpatel/AssistSupport"),
+        _p("AssistSupport-security-followup", "saagpatel/AssistSupport"),
+    ]
+    result = _dedupe_checkouts_by_origin(discovered)
+    assert len(result) == 1
+    # the canonical checkout is the one whose dir name matches the repo basename
+    assert result[0]["name"] == "AssistSupport"
+
+
+def test_prefers_basename_match_then_shortest_name() -> None:
+    # no exact-basename checkout present -> shortest name wins
+    discovered = [
+        _p("IncidentWorkbench-statuspage-finish", "saagpatel/IncidentWorkbench"),
+        _p("IncidentWorkbench-zendesk", "saagpatel/IncidentWorkbench"),
+    ]
+    result = _dedupe_checkouts_by_origin(discovered)
+    assert len(result) == 1
+    assert result[0]["name"] == "IncidentWorkbench-zendesk"  # shortest
+
+
+def test_distinct_origins_are_kept() -> None:
+    discovered = [
+        _p("Alpha", "saagpatel/Alpha"),
+        _p("Beta", "saagpatel/Beta"),
+    ]
+    result = _dedupe_checkouts_by_origin(discovered)
+    assert {p["name"] for p in result} == {"Alpha", "Beta"}
+
+
+def test_origin_basename_match_is_case_insensitive() -> None:
+    discovered = [
+        _p("notion-operating-system", "saagpatel/notion-operating-system"),
+        _p("Notion", "saagpatel/notion-operating-system"),
+    ]
+    result = _dedupe_checkouts_by_origin(discovered)
+    assert len(result) == 1
+    assert result[0]["name"] == "notion-operating-system"
+
+
+def test_local_only_projects_without_origin_are_never_collapsed() -> None:
+    # empty repo_full_name => genuinely distinct local projects, keep all
+    discovered = [
+        _p("scratch-a", ""),
+        _p("scratch-b", ""),
+        _p("scratch-c", ""),
+    ]
+    result = _dedupe_checkouts_by_origin(discovered)
+    assert len(result) == 3
+
+
+def test_result_is_sorted_by_name_case_insensitively() -> None:
+    discovered = [
+        _p("zeta", "saagpatel/zeta"),
+        _p("Alpha", "saagpatel/Alpha"),
+        _p("mike", ""),
+    ]
+    result = _dedupe_checkouts_by_origin(discovered)
+    assert [p["name"] for p in result] == ["Alpha", "mike", "zeta"]