xrefkit 0.7.8__tar.gz → 0.7.10__tar.gz

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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xrefkit"
-version = "0.7.8"
+version = "0.7.10"
 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.10}/tests/test_ci_workflow_invariants.py

@@ -18,34 +18,18 @@ PACKAGES = {
 }
 
 
-@pytest.mark.parametrize("stop_status,remains,expected", [
-    (0, False, 0), (1, False, 0), (1, True, 1), (2, False, 2),
+@pytest.mark.parametrize("filename", [
+    "python-package.yml",
+    "python-skill-project-management-package.yml",
 ])
-def test_core_updater_stop_handles_exit_race_without_hiding_errors(stop_status, remains, expected):
-    bash = shutil.which("bash")
-    if Path("C:/Program Files/Git/bin/bash.exe").is_file():
-        bash = "C:/Program Files/Git/bin/bash.exe"
-    if not bash:
-        pytest.skip("Bash is required to execute the workflow stop block")
-    steps = workflow("python-package.yml")["jobs"]["artifact-inspection"]["steps"]
-    update = next(s["run"] for s in steps if "sudo apt-get install --yes clamav" in s.get("run", ""))
-    block = update.split("# Package installation", 1)[1].split("# A failed definition update", 1)[0]
-    block = "# Package installation" + block
-    mocks = f"""
-set -euo pipefail
-calls=0
-pgrep() {{
-  calls=$((calls + 1))
-  if [ "$calls" -eq 1 ]; then return 0; fi
-  return {0 if remains else 1}
-}}
-sudo() {{ return {stop_status}; }}
-sleep() {{ :; }}
-"""
-    result = subprocess.run([bash, "-c", mocks + block + "\necho stop-complete\n"],
-                            capture_output=True, text=True)
-    assert result.returncode == expected, result.stdout + result.stderr
-    assert ("stop-complete" in result.stdout) == (expected == 0)
+def test_release_artifact_inspection_uses_verified_fresh_clamav(filename):
+    steps = workflow(filename)["jobs"]["artifact-inspection"]["steps"]
+    assert any(step.get("run") == "bash tools/scan_python_artifacts.sh dist/" for step in steps)
+    script = (WORKFLOWS.parents[1] / "tools/scan_python_artifacts.sh").read_text(encoding="utf-8")
+    assert "sha256sum --check" in script
+    assert "--fail-if-cvd-older-than=1" in script
+    assert script.index("sha256sum --check") < script.index('"${clamav_bin}/freshclam"')
+    assert script.index('"${clamav_bin}/freshclam"') < script.index('"${clamav_bin}/clamscan"')
 
 
 def workflow(filename):

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

@@ -164,3 +164,43 @@ 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")
+
+
+def test_native_seed_resolves_prefixed_package_asset(tmp_path):
+    catalog = package_catalog(tmp_path)
+    package = catalog.discovered_packages[0]
+    package.manifest.provides.knowledge[0].xid = "xid-7A2F4C8D1701"
+    bare = catalog.get_document_by_xid("7A2F4C8D1701")
+    prefixed = catalog.get_document_by_xid("xid-7A2F4C8D1701")
+    assert bare["content_hash"] == prefixed["content_hash"]
+    assert bare["content"] == prefixed["content"]
+
+    duplicate = replace(catalog, discovered_packages=(package, package))
+    assert duplicate.get_document_by_xid("7A2F4C8D1701")["error"] == "xid_conflict"

{xrefkit-0.7.8 → xrefkit-0.7.10}/tests/test_xrefkit_v2_pipeline.py

@@ -533,3 +533,19 @@ def test_repository_csharp_package_resolves_local_csharp_review(tmp_path: Path)
     assert "applied_skills" in bundle.required_outputs
     assert "xid-branch-csharp-review-async-synchronization" in bundle.references.branches
     assert "xid-project-csharp-current-code-scope" in bundle.references.knowledge
+
+
+def test_registry_loads_split_contract_from_mixed_package(tmp_path):
+    package_manifest, local_manifest = _sample_workspace(tmp_path)
+    manifest = yaml.safe_load(package_manifest.read_text(encoding="utf-8"))
+    native_path = "skills/investigation_flow/SKILL.v1.md"
+    _write(package_manifest.parent / native_path, (REPO_ROOT / native_path).read_text(encoding="utf-8"))
+    manifest["provides"]["skills"].append({
+        "id": "investigation_flow",
+        "xid": "E8B2D6A4C190",
+        "path": native_path,
+    })
+    _write_yaml(package_manifest, manifest)
+
+    registry = build_registry(package_manifests=[package_manifest], local_manifest_path=local_manifest)
+    assert registry.skills.require("xddp.design.change_design").definition.entry.path == "skills/change_design/entry.md"

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

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

{xrefkit-0.7.8 → xrefkit-0.7.10}/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,
@@ -1298,11 +1299,20 @@ class XRefCatalog:
             if local_xid == xid
         )
         package_documents = {}
+        package_aliases = []
+        native_identity = _native_xid_identity(xid)
         for package, asset_xid, path, _kind in self._package_assets():
             if asset_xid == xid:
                 text = read_text(path)
                 matches.append((path, text))
                 package_documents[path] = self._package_document(package, xid, path, text)
+            elif _native_xid_identity(asset_xid) == native_identity:
+                package_aliases.append((package, path))
+        if not matches:
+            for package, path in package_aliases:
+                text = read_text(path)
+                matches.append((path, text))
+                package_documents[path] = self._package_document(package, xid, path, text)
         if package_documents:
             # Installed packages cannot shadow a core migration document merely
             # because the consumer repository does not contain that document.
@@ -1720,6 +1730,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.10}/xrefkit/workspace.py

@@ -67,6 +67,10 @@ def build_registry(
         registry.add_package(manifest, package_root)
         for provided in manifest.provides.skills:
             skill_path = _contained_path(package_root, provided.path, label=f"package skill {provided.id}")
+            # The effective Skill resolver composes split YAML contracts.
+            # Native Markdown Skills are registered by the MCP catalog.
+            if skill_path.suffix.lower() == ".md":
+                continue
             skill = load_skill_definition(skill_path)
             _validate_skill_paths(package_root, skill)
             registry.add_package_skill(

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

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