bootstrap: resolve add/add conflict and land product-service ontology tranche

[Copilot]

PR #10 (bootstrap/product-service-tranche-v0-1) was blocked by an add/add conflict in shapes/product-service.shacl.ttl caused by a diverged earlier merge of product-service into main (PR #7).

Conflict resolution

shapes/product-service.shacl.ttl had two incompatible shape definitions at the offering level:

# main — generic, targets the base biz class
ps:OfferingShape a sh:NodeShape ;
  sh:targetClass biz:Offering ;
  sh:property [ sh:path ps:hasPlan ; sh:minCount 1 ; sh:class ps:Plan ] .

# PR branch — specific, targets the ps subclasses defined in Domains/product-service.ttl
ps:ProductOfferingShape a sh:NodeShape ;
  sh:targetClass ps:ProductOffering ;
  sh:property [ sh:path ps:hasPlan ; sh:minCount 1 ; sh:class ps:Plan ] .

ps:ServiceOfferingShape a sh:NodeShape ;
  sh:targetClass ps:ServiceOffering ;
  sh:property [ sh:path ps:hasPlan ; sh:minCount 1 ; sh:class ps:Plan ] .

Accepted the PR branch version — ps:ProductOffering and ps:ServiceOffering are explicit subclasses of biz:Offering in Domains/product-service.ttl, so targeting them directly is semantically correct and consistent with the rest of the tranche.

Integrated files from PR #10

• catalog/registry.{ttl,jsonld} — DomainBusinessCore and DomainProductService module entries
• shapes/ontogenesis.shacl.ttl — product-service SHACL gates (ps: prefixes, offering/plan/capability/instance shapes)
• shapes/product-service.shacl.ttl — conflict resolved as above
• docs/module-map.md — domain listing and SHACL bundle list updated
• docs/product-service-tranche-note.md — tranche design note (new)
• tests/product-service-integrity.rq — SPARQL integrity test (new)

Original prompt

Resolve the merge conflicts in the pull request #10 titled "bootstrap: add product service ontology tranche". This PR attempts to merge the "bootstrap/product-service-tranche-v0-1" branch into the "main" branch. The conflicts appear to involve files like "catalog/registry.jsonld", "catalog/registry.ttl", "docs/module-map.md", and other related files listed in the diff. Ensure that the proposed changes from the feature branch are correctly aligned with the base branch, maintaining semantic and structural integrity. The files added or modified pertain to the product-service ontology tranche, and it covers various aspects such as product/service offerings, plans, SKUs, capabilities, entitlements, and service instances.

The following is the prior conversation context from the user's chat exploration (may be truncated):

User: Fix checks

Assistant: There are no failing checks found for pull request #10 in the repository. If you believe there's an issue, could you provide more specific details or clarify what needs fixing?

User: Fix conflicts

Assistant: It seems you want to fix merge conflicts in pull request #10 in the repository "SocioProphet/ontogenesis." I'll need to check the status of the conflicts in this pull request. Let me analyze further.

Assistant: The pull request #10 has a "dirty" mergeable state, indicating unresolved merge conflicts. Since no failing checks are present for this PR, the merge conflicts need to be addressed by resolving the conflicting files.

Would you like me to retrieve the list of conflicting files and guide you through resolving them, or do you have specific instructions for how you'd like to proceed?

User: Yes

Assistant: The pull request #10 in the repository SocioProphet/ontogenesis has unresolved merge conflicts. Here are the steps to resolve these conflicts:

1. Check the branches:

   • Base Branch: main
   • Head Branch: bootstrap/product-service-tranche-v0-1

2. Conflict Areas:

   • Files added or modified across both branches may include:
     • Domains/product-service.ttl
     • catalog/ (registry.jsonld, registry.ttl)
     • docs/module-map.md
     • SHACL/Tranche file conglomerate adjustment notes bootstrap sources.

Feel free or Address split straightforward?__":
irect structural namespace alignment

User: Fix it

Assistant: The process to resolve the merge conflicts in pull request #10 has been initiated. The conflicts will be resolved, and the code will be aligned for correct integration with the base branch. Stay tuned for updates!

This pull request was created from Copilot chat.

[mdheller]

@copilot fix failed checks and conflicts

[Copilot]

Pull request overview

Resolves the prior add/add merge conflict in product-service SHACL shapes and lands the product-service ontology tranche wiring (registry + SHACL gates + docs + integrity test) so the tranche is consistently validated by the repo’s standard validation pipeline.

Changes:

• Resolves offering-level SHACL conflict by targeting ps:ProductOffering / ps:ServiceOffering directly instead of biz:Offering.
• Registers the business-core and product-service domain modules in the TTL and JSON-LD registries and updates module map/docs.
• Adds a product-service SPARQL integrity invariant test and extends shapes/ontogenesis.shacl.ttl with product-service gates.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
tests/product-service-integrity.rq	Adds SPARQL invariant checks for canonical product-service example individuals.
shapes/product-service.shacl.ttl	Resolves offering-shape conflict by introducing separate product vs service offering node shapes.
shapes/ontogenesis.shacl.ttl	Extends the primary validation SHACL bundle with product-service shapes (offerings/plan/capability/instance).
docs/product-service-tranche-note.md	Adds tranche design/integration note for product-service.
docs/module-map.md	Updates domain listing and documents SHACL bundle inventory.
catalog/registry.ttl	Registers Domains/business_core.ttl and Domains/product-service.ttl modules in the Turtle registry.
catalog/registry.jsonld	Registers Domains/business_core.ttl and Domains/product-service.ttl modules in the JSON-LD registry.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

biz: prefix is declared but not used anywhere in this query; removing it would keep the test file minimal and consistent with other integrity queries.

Suggested change

PREFIX biz: <https://socioprophet.github.io/ontogenesis/domains/business#>

[Copilot]

@copilot fix failed checks and conflicts

Fixed in 4224c7a. The ontology-validate check was failing because .github/workflows/validate.yml had been changed to install deps via pip install (system Python) while make validate still expects .venv/bin/python. Restored the make venv + make deps steps.

Also merged the latest origin/main (which had diverged ahead with several new PRs) and resolved the resulting conflicts in validate.yml and shapes/product-service.shacl.ttl. All local checks pass: RDF parse ✓, SHACL conformance ✓, SPARQL integrity tests (4/4) ✓.