kanon-cli 2.0.1__tar.gz → 2.1.0__tar.gz

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/CHANGELOG.md

@@ -2,14 +2,93 @@
 
 
 
+## v2.1.0 (2026-06-09)
+
+### Feature
+
+* feat: discover catalog entries by <catalog-metadata>, not the *-marketplace.xml filename
+
+feat: discover catalog entries by <catalog-metadata>, not the *-marketplace.xml filename ([`3a55eea`](https://github.com/caylent-solutions/kanon/commit/3a55eea6ac2380551f8e0bc045252d84db1d0408))
+
+* feat: discover catalog entries by <catalog-metadata>, not the *-marketplace.xml filename
+
+A catalog entry is now any repo-specs/**/*.xml manifest that contains a
+<catalog-metadata> block; the *-marketplace.xml filename suffix is no longer
+required. Plain packages (e.g. widget.xml, my-tool.xml) can be catalog entries,
+not only packaged Claude marketplaces.
+
+- Add core.metadata.find_catalog_entry_files(repo_root): globs repo-specs/**/*.xml
+  and keeps files whose content (XML comments stripped) declares a
+  <catalog-metadata> block. Shared by every discovery site.
+- Route kanon list, add, validate marketplace, validate metadata, catalog audit,
+  and shell completion through it; remove MARKETPLACE_FILE_GLOB and the
+  per-command *-marketplace.xml globs.
+- Backward compatible: *-marketplace.xml still matches (it carries the block).
+  Metadata-less includes (remote.xml) are not entries, but are still validated by
+  kanon validate xml and resolved via <include>.
+- Markers that appear only inside an XML comment are ignored.
+- Migrate test fixtures that relied on filename discovery to carry
+  <catalog-metadata>; add find_catalog_entry_files unit coverage and a
+  comment-exclusion regression.
+- Update author/explainer docs to describe content-based discovery. ([`3faca3f`](https://github.com/caylent-solutions/kanon/commit/3faca3fbb6aef3e9db871145e9998cd38efbb3c5))
+
+
 ## v2.0.1 (2026-06-03)
 
+### Chore
+
+* chore(release): 2.0.1 ([`90dd32b`](https://github.com/caylent-solutions/kanon/commit/90dd32b290f65544727c00f5e752071d0fc23595))
+
 ### Documentation
 
 * docs: present kanon repo as a native subcommand in the CLI reference (#73)
 
+Drop the 'embedded repo dispatcher' wording from the 'kanon repo'
+CLI-reference entry; describe it as kanon's native 'repo' subcommand
+with arguments forwarded verbatim. Developer-facing
+docs/architecture.md is intentionally left accurate about the
+vendored repo fork. ([`f054536`](https://github.com/caylent-solutions/kanon/commit/f05453662fbc07e3406c072b7094ebb7ad2cbc24))
+
 * docs: align CLI documentation with the released 2.0.0 surface (#72)
 
+Rewrite README.md and audit docs/ so every command, flag, and behavior
+matches the verified 2.0 CLI (help snapshot fixtures + src/).
+
+README.md:
+- Replace the bootstrap-centric standalone-usage flow with the real 2.0
+  flow: list (discover) -> add -> install -> clean (--orphans).
+- Replace the bootstrap/install/clean/validate-only CLI Reference with a
+  full per-command reference (list, add, remove, install, clean, outdated,
+  why, doctor, validate xml/marketplace/metadata, catalog audit, repo,
+  completion); bootstrap appears only as a deprecation note (exits 3).
+- Fix KANON_CATALOG_SOURCE to its real role and full precedence chain
+  (flag > env > lock [catalog] > .kanon [catalog]).
+- Update the TOC, Subcommands table, architecture diagram, the
+  manifest-repo authoring sections to the nested <catalog-metadata>
+  /*-marketplace.xml model, and the project-structure layout (no catalog/).
+
+docs/:
+- setup-guide: drop stale pipx/python3 install-failure entries that no
+  longer match kanon install; prefix bare repo commands with kanon.
+- installation: add --strict-lock/--strict-drift/--lock-file to synopsis
+  and flag table.
+- configuration: add the 4th-tier .kanon [catalog] fallback to precedence.
+- doctor: document the NO_SOURCES finding for a zero-source .kanon.
+- creating-manifest-repos: keywords are comma-separated (was space).
+- catalog-author-guide: drop the removed catalog/ directory reference.
+- multi-source-guide: retitle (drop "Bootstrap"); de-"forthcoming" links.
+- how-it-works: kanon repo sync (was bare repo sync).
+
+doc-validation tests (test_docs_embedded_architecture,
+test_doc_validation) pass; markdown edits add no new lint categories and
+keep no trailing whitespace with a single trailing newline. ([`b99d4b4`](https://github.com/caylent-solutions/kanon/commit/b99d4b48cdc56bfa4ff79d3fa6db3d50768382d2))
+
+### Unknown
+
+* Merge pull request #74 from caylent-solutions/release-2.0.1
+
+chore(release): 2.0.1 ([`4a49134`](https://github.com/caylent-solutions/kanon/commit/4a491348e9e2770bfb510d2116fb150451bcc123))
+
 
 ## v2.0.0 (2026-06-03)
 
@@ -752,6 +831,10 @@ No code changed (docs/planning-only removal); format-check + lint-check pass.
 
 Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> ([`8f0ac32`](https://github.com/caylent-solutions/kanon/commit/8f0ac32e874369c9aa5c3c3431003211adc4aee4))
 
+### Chore
+
+* chore(release): 2.0.0 ([`747851f`](https://github.com/caylent-solutions/kanon/commit/747851f4d0625c00a3661e9a165c952c6c27abc0))
+
 ### Documentation
 
 * docs(readme): update Kanon overview (#68)
@@ -760,6 +843,12 @@ Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> ([`8f0ac32`](https
 
 * docs(readme): restore overview emphasis ([`19a00f5`](https://github.com/caylent-solutions/kanon/commit/19a00f5173e9ee49f38b1403706c6de83bbc7cee))
 
+### Unknown
+
+* Merge pull request #70 from caylent-solutions/release-2.0.0
+
+Release 2.0.0 ([`36bbb1d`](https://github.com/caylent-solutions/kanon/commit/36bbb1d6109dd076cf6d8454fdc4d88e63db3f3d))
+
 
 ## v1.3.1 (2026-05-04)
 

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kanon-cli
-Version: 2.0.1
+Version: 2.1.0
 Summary: Kanon (Kanon Package Manager) CLI tool
 Project-URL: Homepage, https://github.com/caylent-solutions/kanon
 Project-URL: Issues, https://github.com/caylent-solutions/kanon/issues
@@ -323,8 +323,9 @@ kanon list --detail          # human-readable record per entry
 kanon list my-tool --detail  # narrow to entries matching a substring
 ```
 
-`kanon list` reads the `*-marketplace.xml` files under `repo-specs/` in the
-manifest repo and prints one catalog entry name per line.
+`kanon list` reads the catalog entry manifests (any `repo-specs/**/*.xml`
+file with a `<catalog-metadata>` block) in the manifest repo and prints one
+catalog entry name per line.
 
 **2. Add entries to `.kanon`:**
 
@@ -852,8 +853,8 @@ For full documentation, see [docs/how-it-works.md](docs/how-it-works.md).
 A manifest repository contains `repo-specs/` with XML manifests that define
 what packages to sync, from which repositories, and at which versions. **The
 manifest repo IS the catalog** -- there is no separate `catalog/` directory.
-Each catalog entry is a single `*-marketplace.xml` file under `repo-specs/`
-that carries a nested `<catalog-metadata>` block; the
+Each catalog entry is a single `*.xml` file under `repo-specs/` (any
+filename) that carries a nested `<catalog-metadata>` block; the
 `<catalog-metadata><name>` child is the entry name consumers pass to
 `kanon add <name>`. See
 [docs/creating-manifest-repos.md](docs/creating-manifest-repos.md) for the
@@ -873,10 +874,10 @@ my-manifest-repo/
       packages.xml           # Package repos with pinned versions
 ```
 
-### Catalog entry (-marketplace.xml)
+### Catalog entry
 
-Each catalog entry is a `*-marketplace.xml` file containing exactly one
-nested `<catalog-metadata>` block. Required fields are `name`,
+Each catalog entry is an XML file under `repo-specs/` (any filename)
+containing exactly one nested `<catalog-metadata>` block. Required fields are `name`,
 `display-name`, `description`, and `version`; recommended fields are `type`,
 `owner-name`, `owner-email`, and `keywords` (comma-separated). The legacy
 flat-attribute scheme (metadata as XML attributes) is rejected.

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/README.md

@@ -301,8 +301,9 @@ kanon list --detail          # human-readable record per entry
 kanon list my-tool --detail  # narrow to entries matching a substring
 ```
 
-`kanon list` reads the `*-marketplace.xml` files under `repo-specs/` in the
-manifest repo and prints one catalog entry name per line.
+`kanon list` reads the catalog entry manifests (any `repo-specs/**/*.xml`
+file with a `<catalog-metadata>` block) in the manifest repo and prints one
+catalog entry name per line.
 
 **2. Add entries to `.kanon`:**
 
@@ -830,8 +831,8 @@ For full documentation, see [docs/how-it-works.md](docs/how-it-works.md).
 A manifest repository contains `repo-specs/` with XML manifests that define
 what packages to sync, from which repositories, and at which versions. **The
 manifest repo IS the catalog** -- there is no separate `catalog/` directory.
-Each catalog entry is a single `*-marketplace.xml` file under `repo-specs/`
-that carries a nested `<catalog-metadata>` block; the
+Each catalog entry is a single `*.xml` file under `repo-specs/` (any
+filename) that carries a nested `<catalog-metadata>` block; the
 `<catalog-metadata><name>` child is the entry name consumers pass to
 `kanon add <name>`. See
 [docs/creating-manifest-repos.md](docs/creating-manifest-repos.md) for the
@@ -851,10 +852,10 @@ my-manifest-repo/
       packages.xml           # Package repos with pinned versions
 ```
 
-### Catalog entry (-marketplace.xml)
+### Catalog entry
 
-Each catalog entry is a `*-marketplace.xml` file containing exactly one
-nested `<catalog-metadata>` block. Required fields are `name`,
+Each catalog entry is an XML file under `repo-specs/` (any filename)
+containing exactly one nested `<catalog-metadata>` block. Required fields are `name`,
 `display-name`, `description`, and `version`; recommended fields are `type`,
 `owner-name`, `owner-email`, and `keywords` (comma-separated). The legacy
 flat-attribute scheme (metadata as XML attributes) is rejected.

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/docs/catalog-author-guide.md

@@ -118,8 +118,9 @@ the emitted finding message, and give the catalog-author fix.
 ### Rule 1 -- catalog-metadata completeness
 
 **What it looks for:**
-The check reads every `*-marketplace.xml` file under `repo-specs/` and
-inspects the `<catalog-metadata>` block for:
+The check reads every catalog entry manifest (any `repo-specs/**/*.xml` file
+with a `<catalog-metadata>` block) under `repo-specs/` and inspects the
+`<catalog-metadata>` block for:
 
 1. Missing or whitespace-only **required** fields -- produces one ERROR
    (M001) per missing field.

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/docs/catalogs-explained.md

@@ -4,8 +4,9 @@ A **manifest repo** is a git repository whose `repo-specs/` directory contains
 installable kanon dependency definitions. When you point kanon at a manifest
 repo via `--catalog-source`, you are pointing it at the catalog itself -- there
 is no separate "catalog" entity inside the repository, and no `catalog/<name>/`
-subdirectory model. The repository is the catalog; each `*-marketplace.xml`
-file under `repo-specs/**` is a catalog entry.
+subdirectory model. The repository is the catalog; each `repo-specs/**/*.xml`
+file that contains a `<catalog-metadata>` block is a catalog entry (any
+filename; the `-marketplace.xml` suffix is a convention, not a requirement).
 
 ## What is a manifest repo?
 
@@ -19,7 +20,7 @@ repo-specs/
   ...
 ```
 
-Each `*-marketplace.xml` file is a **catalog entry** -- a single dependency
+Each XML file with a `<catalog-metadata>` block is a **catalog entry** -- a single dependency
 definition identified by the `<name>` child of its `<catalog-metadata>` block.
 The `<name>` value is the **entry name**. There is exactly one
 `<catalog-metadata>` block per XML file, and entry names must be unique across

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/docs/claude-marketplaces-guide.md

@@ -18,10 +18,13 @@ composition. Currently marketplace manifests use a flat structure (each includes
 
 ### Naming Convention
 
-Marketplace manifest files must follow the `*-marketplace.xml` naming pattern.
-The `kanon validate marketplace` command discovers files matching this pattern
-under `repo-specs/`. Files that do not match (e.g., `remote.xml`, `packages.xml`)
-are not validated as marketplace manifests.
+A catalog entry is any `*.xml` file under `repo-specs/` that contains a
+`<catalog-metadata>` block. The filename is unrestricted: `*-marketplace.xml`
+is a common convention, but `widget.xml` or `my-tool.xml` work equally well.
+The `kanon validate marketplace` command discovers every such entry under
+`repo-specs/`. Files with no `<catalog-metadata>` block (e.g., shared includes
+like `remote.xml`, `packages.xml`) are not entries and are not validated as
+marketplace manifests -- they are still checked by `kanon validate xml`.
 
 ### Example Manifest
 

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/docs/cli/validate.md

@@ -99,8 +99,9 @@ kanon validate marketplace --repo-root /path/to/repo
 
 ### `kanon validate metadata`
 
-Check every `*-marketplace.xml` under `repo-specs/` for in-repo catalog
-soft-spot violations (spec Section 3.5 rules 1, 2, 3) without network access.
+Check every catalog entry manifest (any `repo-specs/**/*.xml` file with a
+`<catalog-metadata>` block) for in-repo catalog soft-spot violations (spec
+Section 3.5 rules 1, 2, 3) without network access.
 
 No git operations are performed. No `git ls-remote` calls. No cloning.
 

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/docs/creating-manifest-repos.md

@@ -6,14 +6,16 @@ of packages for kanon consumers.
 ## What a manifest repo is
 
 A **manifest repo** is a git repository whose `repo-specs/` directory
-holds XML manifest files whose names match `*-marketplace.xml`. The git
+holds XML manifest files. Each file that contains a `<catalog-metadata>`
+block is a catalog entry, regardless of its filename. The git
 URL (with an optional `@<ref>`) of this repository is exactly what a
 consumer passes to `--catalog-source` or sets in `KANON_CATALOG_SOURCE`.
 
 The manifest repo IS the catalog. There is no separate catalog directory;
-every catalog entry lives in a single `*-marketplace.xml` file under
-`repo-specs/`. Each XML file is identified by its `<catalog-metadata>`
-block. The `<catalog-metadata><name>` child is the **entry name** -- the
+every catalog entry lives in a single `*.xml` file under `repo-specs/`,
+identified by its `<catalog-metadata>` block (the `-marketplace.xml` suffix
+is a convention, not a requirement). The `<catalog-metadata><name>` child is
+the **entry name** -- the
 identifier consumers pass to `kanon add <name>`.
 
 Key terminology (canonical form from spec Section 1.1):
@@ -46,7 +48,9 @@ my-manifest-repo/
 +-- README.md
 ```
 
-Every `*-marketplace.xml` under `repo-specs/` is a catalog entry. There
+Every `repo-specs/**/*.xml` file that contains a `<catalog-metadata>` block is
+a catalog entry, regardless of filename; files without the block (such as
+shared `<include>` targets) are not entries. There
 is no `catalog/` directory in a current manifest repo. If you are
 migrating a repo that still has one, see
 [Migrating away from catalog/\<name\>/](#migrating-away-from-catalogname)

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/docs/list-and-add.md

@@ -33,9 +33,10 @@ kanon list [--catalog-source <git-url>@<ref>]
 
 `kanon list` clones the manifest repo identified by
 `--catalog-source` (or `KANON_CATALOG_SOURCE`) and walks every
-`repo-specs/**/*-marketplace.xml` file. One entry is emitted per
-XML file whose `<catalog-metadata>` block contains the required
-fields. Entry name = `<catalog-metadata><name>`.
+`repo-specs/**/*.xml` file. One entry is emitted per XML file whose
+`<catalog-metadata>` block contains the required fields (the filename is
+unrestricted -- the `-marketplace.xml` suffix is a convention, not a
+requirement). Entry name = `<catalog-metadata><name>`.
 
 The legacy `catalog/<name>/` directory inside a manifest repo is
 ignored; `kanon list` reads only the XML manifests.

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kanon-cli"
-version = "2.0.1"
+version = "2.1.0"
 description = "Kanon (Kanon Package Manager) CLI tool"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"
@@ -38,6 +38,7 @@ Homepage = "https://github.com/caylent-solutions/kanon"
 Issues = "https://github.com/caylent-solutions/kanon/issues"
 
 
+
 [tool.hatch.build.targets.wheel]
 packages = [
     "src/kanon_cli",
@@ -118,6 +119,7 @@ minor_tags = ["feat"]
 patch_tags = ["fix", "perf", "security", "revert"]
 
 
+
 [dependency-groups]
 dev = [
     "build>=1.4.3",

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/__init__.py

@@ -1,3 +1,3 @@
 """Kanon CLI -- Kanon Package Manager."""
 
-__version__ = "2.0.1"
+__version__ = "2.1.0"

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/commands/add.py

@@ -41,6 +41,7 @@ from kanon_cli.core.metadata import (
     CatalogMetadataParseError,
     _parse_catalog_metadata,
     derive_source_name,
+    find_catalog_entry_files,
 )
 from kanon_cli.version import _list_tags, _resolve_constraint_from_tags, is_version_constraint, resolve_version
 
@@ -400,11 +401,7 @@ def _build_entry_catalog(
     Returns:
         List of (CatalogMetadata, xml_path, url) triples for every entry found.
     """
-    repo_specs = manifest_root / "repo-specs"
-    if not repo_specs.is_dir():
-        return []
-
-    xml_paths = list(repo_specs.rglob("*-marketplace.xml"))
+    xml_paths = find_catalog_entry_files(manifest_root)
     entries: list[tuple[CatalogMetadata, pathlib.Path, str]] = []
     error_paths: list[str] = []
 

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/commands/catalog.py

@@ -65,8 +65,8 @@ from kanon_cli.constants import (
     KANON_CATALOG_AUDIT_VALID_CHECKS,
     KANON_CATALOG_ENTRY_NAME_ALLOWED_CHARS_RE,
 )
-from kanon_cli.core.manifest import _iter_marketplace_xml_paths, collect_remote_url_findings
-from kanon_cli.core.metadata import audit_catalog_metadata, derive_source_name
+from kanon_cli.core.manifest import collect_remote_url_findings
+from kanon_cli.core.metadata import audit_catalog_metadata, derive_source_name, find_catalog_entry_files
 from kanon_cli.core.url import canonicalize_repo_url
 
 # Alias for the XML parse error type from defusedxml to avoid importing from the
@@ -379,10 +379,11 @@ def _format_findings(findings: list[AuditFinding], fmt: str) -> str:
 def _iter_entry_names(
     target_path: pathlib.Path,
 ) -> Iterator[tuple[pathlib.Path, str]]:
-    """Yield ``(xml_file, entry_name)`` pairs for every parseable marketplace XML.
+    """Yield ``(xml_file, entry_name)`` pairs for every parseable catalog entry.
 
-    Walks ``<target_path>/repo-specs/**/*-marketplace.xml`` via
-    :func:`kanon_cli.core.manifest._iter_marketplace_xml_paths`.  For each file the function:
+    Walks every catalog entry manifest (any ``repo-specs/**/*.xml`` that carries a
+    ``<catalog-metadata>`` block) via
+    :func:`kanon_cli.core.metadata.find_catalog_entry_files`.  For each file the function:
 
     1. Parses the XML, silently skipping files that raise
        :exc:`XMLParseError` (malformed-XML errors are the ``metadata``
@@ -403,7 +404,7 @@ def _iter_entry_names(
         Tuples of ``(xml_file, entry_name)`` where ``entry_name`` is the
         stripped text content of the ``<name>`` element.
     """
-    for xml_file in _iter_marketplace_xml_paths(target_path):
+    for xml_file in find_catalog_entry_files(target_path):
         try:
             tree = ET.parse(xml_file)
         except XMLParseError:
@@ -431,10 +432,11 @@ def _iter_entry_names(
 
 
 def _check_metadata(target_path: pathlib.Path) -> list[AuditFinding]:
-    """Check every ``*-marketplace.xml`` under ``repo-specs/`` for metadata issues.
+    """Check every catalog entry manifest under ``repo-specs/`` for metadata issues.
 
-    Walks ``<target_path>/repo-specs/**/*-marketplace.xml`` via
-    :func:`kanon_cli.core.manifest._iter_marketplace_xml_paths` and calls
+    Walks every catalog entry manifest (any ``repo-specs/**/*.xml`` that carries a
+    ``<catalog-metadata>`` block) via
+    :func:`kanon_cli.core.metadata.find_catalog_entry_files` and calls
     :func:`kanon_cli.core.metadata.audit_catalog_metadata` on each file.
 
     Converts each :class:`MetadataAuditIssue` returned into an
@@ -449,7 +451,7 @@ def _check_metadata(target_path: pathlib.Path) -> list[AuditFinding]:
     """
     findings: list[AuditFinding] = []
 
-    for xml_file in _iter_marketplace_xml_paths(target_path):
+    for xml_file in find_catalog_entry_files(target_path):
         for issue in audit_catalog_metadata(xml_file):
             findings.append(
                 AuditFinding(

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/commands/list.py

@@ -49,7 +49,12 @@ from kanon_cli.constants import (
 )
 from kanon_cli.core.catalog import _parse_catalog_source
 from kanon_cli.core.cli_args import add_catalog_source_arg
-from kanon_cli.core.metadata import CatalogMetadata, CatalogMetadataParseError, _parse_catalog_metadata
+from kanon_cli.core.metadata import (
+    CatalogMetadata,
+    CatalogMetadataParseError,
+    _parse_catalog_metadata,
+    find_catalog_entry_files,
+)
 from kanon_cli.version import is_version_constraint, resolve_version
 
 # -- Detail formatter private constants --
@@ -412,7 +417,7 @@ def _walk_all_versions(
             )
             sys.exit(1)
 
-        xml_paths = _walk_marketplace_xmls(repo_dir)
+        xml_paths = find_catalog_entry_files(repo_dir)
         version_names: list[str] = []
         legacy_skipped_count = 0
         for xml_path in xml_paths:
@@ -512,26 +517,6 @@ def _resolve_manifest_repo(catalog_source: str) -> pathlib.Path:
     return repo_dir
 
 
-def _walk_marketplace_xmls(manifest_root: pathlib.Path) -> list[pathlib.Path]:
-    """Walk ``repo-specs/**/*-marketplace.xml`` under manifest_root.
-
-    Reads ONLY files under the ``repo-specs/`` directory. The legacy
-    ``catalog/<name>/`` directory is explicitly excluded per spec Section 4.1.
-
-    Args:
-        manifest_root: Root directory of the cloned manifest repo.
-
-    Returns:
-        List of :class:`pathlib.Path` objects pointing to discovered XML
-        files. Empty when ``repo-specs/`` is absent or contains no
-        ``*-marketplace.xml`` files.
-    """
-    repo_specs = manifest_root / "repo-specs"
-    if not repo_specs.is_dir():
-        return []
-    return list(repo_specs.rglob("*-marketplace.xml"))
-
-
 def _build_sorted_index(manifest_root: pathlib.Path) -> list[str]:
     """Build a lexicographically sorted list of catalog entry names.
 
@@ -546,7 +531,7 @@ def _build_sorted_index(manifest_root: pathlib.Path) -> list[str]:
         Sorted list of entry name strings. Empty when the catalog has no
         ``*-marketplace.xml`` files.
     """
-    xml_paths = _walk_marketplace_xmls(manifest_root)
+    xml_paths = find_catalog_entry_files(manifest_root)
     names: list[str] = []
     for xml_path in xml_paths:
         metadata = _parse_catalog_metadata(xml_path)
@@ -573,7 +558,7 @@ def _build_sorted_metadata(manifest_root: pathlib.Path) -> list[CatalogMetadata]
         Sorted list of :class:`CatalogMetadata` instances. Empty when the
         catalog has no ``*-marketplace.xml`` files.
     """
-    xml_paths = _walk_marketplace_xmls(manifest_root)
+    xml_paths = find_catalog_entry_files(manifest_root)
     entries: list[CatalogMetadata] = []
     for xml_path in xml_paths:
         metadata = _parse_catalog_metadata(xml_path)
@@ -866,7 +851,7 @@ def _render_tree(
         FileNotFoundError: When no ``*-marketplace.xml`` for ``entry_name``
             is found under ``repo-specs/``.
     """
-    xml_files = _walk_marketplace_xmls(manifest_root)
+    xml_files = find_catalog_entry_files(manifest_root)
     entry_xml: pathlib.Path | None = None
     entry_version = "unknown"
 
@@ -882,7 +867,7 @@ def _render_tree(
 
     if entry_xml is None:
         raise FileNotFoundError(
-            f"No *-marketplace.xml found for entry '{entry_name}' under {manifest_root / 'repo-specs'}"
+            f"No catalog entry manifest found for entry '{entry_name}' under {manifest_root / 'repo-specs'}"
         )
 
     sha = _sha12_from_path(entry_xml)

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/completions/catalog_entries.py

@@ -53,7 +53,7 @@ from kanon_cli.constants import (
     KANON_COMPLETION_TIMEOUT,
 )
 from kanon_cli.core.catalog import _parse_catalog_source
-from kanon_cli.core.metadata import CatalogMetadataParseError, _parse_catalog_metadata
+from kanon_cli.core.metadata import CatalogMetadataParseError, _parse_catalog_metadata, find_catalog_entry_files
 
 _COMPLETER_NAME = "__complete_catalog_entries"
 
@@ -116,12 +116,8 @@ def _build_index(repo_dir: Path) -> list[str]:
     Returns:
         Sorted list of safe catalog entry names found in repo-specs/.
     """
-    specs_root = repo_dir / "repo-specs"
-    if not specs_root.is_dir():
-        return []
-
     names: list[str] = []
-    for xml_path in specs_root.rglob("*-marketplace.xml"):
+    for xml_path in find_catalog_entry_files(repo_dir):
         try:
             metadata = _parse_catalog_metadata(xml_path)
         except CatalogMetadataParseError:

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/constants.py

@@ -14,7 +14,6 @@ EXIT_CODE_DEPRECATED = 3
 
 # -- Marketplace validation --
 MARKETPLACE_DIR_PREFIX = "${CLAUDE_MARKETPLACES_DIR}/"
-MARKETPLACE_FILE_GLOB = "*-marketplace.xml"
 ALLOWED_BRANCHES = frozenset({"main"})
 REFS_TAGS_RE = re.compile(r"^refs/tags/.+/\d+\.\d+\.\d+$")
 CONSTRAINT_RE = re.compile(r"^(~=|>=|<=|>|<)\d+\.\d+\.\d+$")

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/core/manifest.py

@@ -35,6 +35,7 @@ from typing import TYPE_CHECKING, NamedTuple, cast
 import defusedxml.ElementTree as ET
 
 from kanon_cli.constants import KANON_ALLOW_INSECURE_REMOTES
+from kanon_cli.core.metadata import find_catalog_entry_files
 from kanon_cli.core.remote_url import RemoteUrlScheme, _classify_remote_url_scheme
 
 if TYPE_CHECKING:
@@ -129,12 +130,6 @@ def walk_includes_collecting_remotes(
     return remotes
 
 
-def _iter_marketplace_xml_paths(target_path: pathlib.Path) -> list[pathlib.Path]:
-    """Return sorted list of *-marketplace.xml paths under target_path/repo-specs/."""
-    repo_specs = target_path / "repo-specs"
-    return sorted(repo_specs.rglob("*-marketplace.xml"))
-
-
 # Regex that matches any remaining ${VAR} or $VAR placeholder after expansion.
 _PLACEHOLDER_RE = re.compile(r"\$\{[^}]+\}|\$[A-Za-z_][A-Za-z0-9_]*")
 
@@ -221,7 +216,7 @@ def collect_remote_url_findings(
 
     findings: list[RawFinding] = []
 
-    for xml_file in _iter_marketplace_xml_paths(target_path):
+    for xml_file in find_catalog_entry_files(target_path):
         # Build the remote-name -> fetch-URL map for this file and its includes.
         try:
             remote_map = walk_includes_collecting_remotes(xml_file, target_path)

{kanon_cli-2.0.1 → kanon_cli-2.1.0}/src/kanon_cli/core/marketplace_validator.py

@@ -16,9 +16,9 @@ from kanon_cli.constants import (
     ALLOWED_BRANCHES,
     CONSTRAINT_RE,
     MARKETPLACE_DIR_PREFIX,
-    MARKETPLACE_FILE_GLOB,
     REFS_TAGS_RE,
 )
+from kanon_cli.core.metadata import find_catalog_entry_files
 
 
 def validate_linkfile_dest(xml_path: Path) -> list[str]:
@@ -215,11 +215,11 @@ def validate_marketplace(repo_root: Path) -> int:
     Returns:
         0 if all files pass validation, 1 otherwise.
     """
-    marketplace_files = sorted(repo_root.joinpath("repo-specs").rglob(MARKETPLACE_FILE_GLOB))
+    marketplace_files = find_catalog_entry_files(repo_root)
 
     if not marketplace_files:
         print(
-            "Error: No *-marketplace.xml files found under repo-specs/",
+            "Error: No catalog entry manifests (*.xml with a <catalog-metadata> block) found under repo-specs/",
             file=sys.stderr,
         )
         return 1