xrefkit 0.7.8__tar.gz → 0.7.9__tar.gz

{xrefkit-0.7.8/xrefkit.egg-info → xrefkit-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xrefkit
-Version: 0.7.8
+Version: 0.7.9
 Summary: Portable XID, Skill, Knowledge, workflow, and MCP runtime for XRefKit
 Author: synthaicode
 License: MIT License

{xrefkit-0.7.8 → xrefkit-0.7.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xrefkit"
-version = "0.7.8"
+version = "0.7.9"
 description = "Portable XID, Skill, Knowledge, workflow, and MCP runtime for XRefKit"
 readme = "README.md"
 requires-python = ">=3.11"

{xrefkit-0.7.8 → xrefkit-0.7.9}/tests/test_package_knowledge_resolution.py

@@ -164,3 +164,30 @@ def test_inline_identity_mismatch_refused(tmp_path):
     path.write_text("<!-- xid: ABCDEF123456 -->\n# Wrong identity")
     with pytest.raises(ValueError, match="identity does not match"):
         catalog.expand_knowledge("xid-knowledge-rules")
+
+
+@pytest.mark.parametrize(("declared", "inline", "accepted"), [
+    ("xid-7A2F4C8D1401", "7A2F4C8D1401", True),
+    ("7A2F4C8D1401", "xid-7A2F4C8D1401", True),
+    ("xid-7A2F4C8D1401", "7A2F4C8D1402", False),
+    ("xid-knowledge-rules", "knowledge-rules", False),
+    ("xid-7A2F4C8D1401-extra", "7A2F4C8D1401", False),
+])
+def test_native_hex_inline_identity_compatibility(tmp_path, declared, inline, accepted):
+    catalog = package_catalog(tmp_path)
+    package = catalog.discovered_packages[0]
+    package.manifest.provides.knowledge[0].xid = declared
+    (package.package_root / "knowledge/rules.md").write_text(f"<!-- xid: {inline} -->\n# Rules")
+    if accepted:
+        assert catalog.get_document_by_xid(declared)["xid"] == declared
+        assert catalog.expand_knowledge(declared)["content"]
+    else:
+        with pytest.raises(ValueError, match="identity does not match"):
+            catalog.get_document_by_xid(declared)
+
+
+def test_prefixed_native_startup_identity_cannot_shadow_core(tmp_path):
+    catalog = package_catalog(tmp_path)
+    catalog.discovered_packages[0].manifest.provides.knowledge[0].xid = "xid-0B5C58B5E5B2"
+    with pytest.raises(ValueError, match="core startup XID"):
+        catalog.get_document_by_xid("xid-0B5C58B5E5B2")

{xrefkit-0.7.8 → xrefkit-0.7.9}/xrefkit/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.7.8"
+__version__ = "0.7.9"

{xrefkit-0.7.8 → xrefkit-0.7.9}/xrefkit/mcp/catalog.py

@@ -709,7 +709,7 @@ class XRefCatalog:
             for kind, assets in groups.items():
                 for asset in assets:
                     path = _package_asset_path(root, asset.path)
-                    if _embedded_startup_document(asset.xid) is not None:
+                    if _embedded_startup_document(_native_xid_identity(asset.xid)) is not None:
                         raise ValueError(f"package asset conflicts with core startup XID: {asset.xid}")
                     key = (asset.xid, path)
                     if key not in seen:
@@ -721,7 +721,7 @@ class XRefCatalog:
                             raise ValueError("package Skill identity does not match manifest")
                         for fragment in [skill.entry, *skill.required_fragments, *skill.branches]:
                             target = _package_asset_path(root, fragment.path)
-                            if _embedded_startup_document(fragment.xid) is not None:
+                            if _embedded_startup_document(_native_xid_identity(fragment.xid)) is not None:
                                 raise ValueError(f"package fragment conflicts with core startup XID: {fragment.xid}")
                             key = (fragment.xid, target)
                             if key not in seen:
@@ -729,7 +729,8 @@ class XRefCatalog:
                                 yield package, fragment.xid, target, "fragment"
 
     def _package_document(self, package: DiscoveredSkillPackage, xid: str, path: Path, text: str) -> XRefDocument:
-        if path.suffix.lower() == ".md" and first_xid(text) and first_xid(text) != xid:
+        document_xid = first_xid(text) if path.suffix.lower() == ".md" else None
+        if document_xid and _native_xid_identity(document_xid) != _native_xid_identity(xid):
             raise ValueError(f"package document identity does not match manifest: {xid}")
         return XRefDocument(
             xid=xid,
@@ -1720,6 +1721,12 @@ def _knowledge_entry(
     )
 
 
+def _native_xid_identity(xid: str) -> str:
+    """Accept the legacy anchor prefix only for native 12-digit hex XIDs."""
+    match = re.fullmatch(r"(?:xid-)?([0-9A-F]{12})", xid)
+    return match.group(1) if match else xid
+
+
 def _package_asset_path(root: Path, relative: str) -> Path:
     """Manifest paths are portable relative allowlist entries, never glob roots."""
     portable = PurePosixPath(relative)

{xrefkit-0.7.8 → xrefkit-0.7.9/xrefkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xrefkit
-Version: 0.7.8
+Version: 0.7.9
 Summary: Portable XID, Skill, Knowledge, workflow, and MCP runtime for XRefKit
 Author: synthaicode
 License: MIT License