pkg-ext Fix Name Collision

.changelog/029.yaml

@@ -0,0 +1,28 @@
+name: main
+ts: 2026-04-12 16:10:19.714611+00:00
+type: keep_private
+full_path: _internal.cli.main
+---
+name: workflows
+ts: 2026-04-12 16:10:30.816480+00:00
+type: fix
+author: Espen Albert
+changelog_message: 'fix: Resolve short-name collision that silently drops duplicate symbol names'
+message: 'fix: Resolve short-name collision that silently drops duplicate symbol names'
+short_sha: 8d9632
+---
+name: workflows
+ts: 2026-04-12 16:10:51.908835+00:00
+type: fix
+author: Espen Albert
+changelog_message: 'fix: Update decided_local_ids for moved symbols during reconciliation'
+message: 'fix: Update decided_local_ids for moved symbols during reconciliation'
+short_sha: 5636ab
+---
+name: workflows
+ts: 2026-04-12 16:11:02.339052+00:00
+type: fix
+author: Espen Albert
+changelog_message: 'fix: Reconcile owned_modules alongside owned_refs when symbols move'
+message: 'fix: Reconcile owned_modules alongside owned_refs when symbols move'
+short_sha: dddfde

.groups.yaml

@@ -47,7 +47,6 @@ groups:
   - _internal.cli.gen_cmds
   owned_refs:
   - _internal.cli.gen_cmds.gen_docs
-  - _internal.cli.gen_cmds.gen_tests
 - name: stability
   owned_modules:
   - _internal.cli.stability_cmds

pkg_ext/_internal/changelog/write_changelog_md.py

@@ -102,8 +102,8 @@ def as_changelog_line(action: ChangelogAction, remote_url: str, ctx: pkg_ctx) ->
             return ""
         case FixAction(message=msg, changelog_message=cl_msg, short_sha=sha):
             return f"{cl_msg or msg} {_commit_url(remote_url, sha)}"
-        case MakePublicAction(name=name):
-            return f"New {ctx.code_state.ref_symbol(name).type} `{name}`"
+        case MakePublicAction(name=name, full_path=full_path):
+            return f"New {ctx.code_state.ref_symbol(full_path or name).type} `{name}`"
         case DeleteAction(name=name, group=group):
             return f"Removed `{group}.{name}`"
         case RenameAction(name=name, old_name=old_name, group=group):

pkg_ext/_internal/cli/workflows.py

@@ -104,7 +104,7 @@ def create_ctx(api_input: GenerateApiInput) -> pkg_ctx:
     with exit_stack:
         code_state = parse_pkg_code_state(settings)
         tool_state, extra_actions = parse_changelog(settings, code_state)
-        tool_state.groups.reconcile_moved_refs(code_state.import_id_refs)
+        tool_state.reconcile_with_code(code_state.import_id_refs)
 
         git_changes_input = GitChangesInput(
             repo_path=settings.repo_root,
@@ -223,7 +223,7 @@ def clean_old_entries(settings: PkgSettings):
 def create_stability_ctx(settings: PkgSettings) -> pkg_ctx:
     code_state = parse_pkg_code_state(settings)
     tool_state, extra_actions = parse_changelog(settings, code_state)
-    tool_state.groups.reconcile_moved_refs(code_state.import_id_refs)
+    tool_state.reconcile_with_code(code_state.import_id_refs)
 
     return pkg_ctx(
         settings=settings,

pkg_ext/_internal/models/code_state.py

@@ -41,14 +41,25 @@ def validate_and_prepare(self):
         self.files.sort()
         return self
 
-    def ref_symbol(self, name: str) -> RefSymbol:
-        if ref_state := self.named_refs.get(name):
-            return ref_state.symbol
-        raise RefSymbolNotInCodeError(name)
+    def ref_symbol(self, name_or_local_id: str) -> RefSymbol:
+        if ref := self.import_id_refs.get(name_or_local_id):
+            return ref
+        matches: list[RefSymbol] = []
+        for ref in self.import_id_refs.values():
+            if ref.local_id == name_or_local_id:
+                return ref
+            if ref.name == name_or_local_id:
+                matches.append(ref)
+        if len(matches) == 1:
+            return matches[0]
+        if matches:
+            local_ids = [m.local_id for m in matches]
+            raise RefSymbolNotInCodeError(f"{name_or_local_id} is ambiguous, matches: {local_ids}")
+        raise RefSymbolNotInCodeError(name_or_local_id)
 
     @property
     def named_refs(self) -> dict[str, RefStateWithSymbol]:
-        return {ref.name: RefStateWithSymbol(name=ref.name, symbol=ref) for ref in self.import_id_refs.values()}
+        return {ref.local_id: RefStateWithSymbol(name=ref.name, symbol=ref) for ref in self.import_id_refs.values()}
 
     def lookup(self, ref: RefSymbol) -> Any:
         full_reference_id = ref.full_id(self.pkg_import_name)

pkg_ext/_internal/models/groups.py

@@ -12,7 +12,7 @@
 from pkg_ext._internal.errors import InvalidGroupSelectionError, NoPublicGroupMatch
 
 from .py_symbols import RefSymbol
-from .types import PyIdentifier, SymbolRefId, ref_id_name
+from .types import PyIdentifier, SymbolRefId, ref_id_module, ref_id_name
 
 if TYPE_CHECKING:  # why type checking? Can we not use the root import?
     from pkg_ext._internal.config import ProjectConfig
@@ -145,13 +145,17 @@ def merge_config(self, config: ProjectConfig) -> None:
             group.docs_exclude = group_cfg.docs_exclude.copy()
             group.docstring = group_cfg.docstring
 
-    def reconcile_moved_refs(self, import_id_refs: dict[str, RefSymbol]) -> int:
-        """Auto-fix refs that have moved to different modules."""
+    def reconcile_moved_refs(self, import_id_refs: dict[str, RefSymbol]) -> tuple[int, set[SymbolRefId]]:
+        """Auto-fix refs and modules that have moved to different paths.
+
+        Returns (count_of_updates, set_of_moved_to_ref_ids).
+        """
         name_to_candidates: dict[str, list[RefSymbol]] = {}
         for ref in import_id_refs.values():
             name_to_candidates.setdefault(ref.name, []).append(ref)
 
         total_updated = 0
+        moved_to: set[SymbolRefId] = set()
         for group in self.groups:
             updated_refs: set[SymbolRefId] = set()
             for ref_id in list(group.owned_refs):
@@ -165,21 +169,29 @@ def reconcile_moved_refs(self, import_id_refs: dict[str, RefSymbol]) -> int:
                     if current_id != ref_id:
                         logger.warning(f"Symbol moved: {ref_id} -> {current_id} (group: {group.name})")
                         updated_refs.add(current_id)
+                        moved_to.add(current_id)
                         total_updated += 1
                     else:
                         updated_refs.add(ref_id)
                 elif resolved := self._resolve_ambiguous_ref(group, ref_id, candidates):
                     if resolved != ref_id:
                         logger.warning(f"Symbol moved: {ref_id} -> {resolved} (group: {group.name})")
+                        moved_to.add(resolved)
                         total_updated += 1
                     updated_refs.add(resolved)
                 else:
                     updated_refs.add(ref_id)  # unresolved - keep stale ref
             group.owned_refs = updated_refs
+            self._reconcile_owned_modules(group, updated_refs)
 
         if total_updated:
             self.write()
-        return total_updated
+        return total_updated, moved_to
+
+    @staticmethod
+    def _reconcile_owned_modules(group: PublicGroup, updated_refs: set[SymbolRefId]) -> None:
+        """Rebuild owned_modules to match the modules referenced by updated_refs."""
+        group.owned_modules = {ref_id_module(ref) for ref in updated_refs}
 
     def _resolve_ambiguous_ref(
         self, group: PublicGroup, stale_ref_id: SymbolRefId, candidates: list[RefSymbol]