codeboarding 0.13.1__tar.gz → 0.13.2__tar.gz

{codeboarding-0.13.1/codeboarding.egg-info → codeboarding-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeboarding
-Version: 0.13.1
+Version: 0.13.2
 Summary: Interactive Diagrams for Code
 Author: CodeBoarding Team
 License-Expression: MIT

{codeboarding-0.13.1 → codeboarding-0.13.2}/agents/incremental_agent.py

@@ -404,7 +404,9 @@ def _log_scope_relations_summary(all_rels: list[tuple[str, list[Relation]]]) ->
 
 
 def _operation_source_cluster_ids(scope_id: str, operation: ScopeOperation) -> list[str]:
-    local_ids = {ref.cluster_id for ref in operation.cluster_refs if ref.scope_id == scope_id}
+    # Match how the validator reads refs (cluster_ref_from_scoped_ref treats a blank scope as root),
+    # so a ref the validator counted is not silently dropped here and orphaned.
+    local_ids = {ref.cluster_id for ref in operation.cluster_refs if (ref.scope_id or ROOT_SCOPE_ID) == scope_id}
     return CodeBoardingClusterIds.qualify_local_ids(
         CodeBoardingClusterIds.from_graph_ids(local_ids),
         CodeBoardingClusterIds.prefix_for_scope(scope_id),

{codeboarding-0.13.1 → codeboarding-0.13.2}/agents/incremental_planning_agent.py

@@ -87,15 +87,25 @@ class IncrementalPlanningAgent(CodeBoardingAgent):
             changed_files=_format_changed_files(self.toolkit.context.changes),
             structural_diff=format_structural_diff(structural_diff),
         )
+        actionable_cluster_refs = _actionable_new_cluster_refs(structural_diff)
+        component_ids_by_cluster_ref = _component_ids_by_cluster_ref(scope_id, scope.components, structural_diff)
         repair_context = ScopeOperationRepairContext(
             reference_resolver=self.reference_resolver,
             allowed_key_entity_qnames=cluster_member_qnames(cluster_results),
-            component_ids_by_cluster_ref=_component_ids_by_cluster_ref(scope_id, scope.components, structural_diff),
+            component_ids_by_cluster_ref=component_ids_by_cluster_ref,
             component_ids_by_name=_component_ids_by_name(scope.components),
+            scope_id=scope_id,
+            actionable_cluster_refs=actionable_cluster_refs,
+            owned_cluster_ids_by_component_id={
+                component.component_id: set(component.source_cluster_ids)
+                for component in scope.components
+                if component.component_id
+            },
         )
         validation_context = ScopeOperationValidationContext(
-            expected_cluster_refs=_actionable_new_cluster_refs(structural_diff),
+            expected_cluster_refs=actionable_cluster_refs,
             existing_component_ids={component.component_id for component in scope.components if component.component_id},
+            component_ids_by_cluster_ref=component_ids_by_cluster_ref,
         )
         decision = self._invoke_repair_validate(
             prompt,

{codeboarding-0.13.1 → codeboarding-0.13.2}/agents/repair.py

@@ -11,8 +11,11 @@ from agents.agent_responses import (
     Component,
     ScopeOperation,
     ScopeOperationAction,
+    ScopedClusterRef,
     ScopeUpdateDecision,
 )
+from agents.cluster_ids import CodeBoardingClusterIds
+from agents.scope_ids import ROOT_SCOPE_ID
 from agents.scope_operations import (
     EXISTING_COMPONENT_ACTIONS,
     cluster_member_qnames,
@@ -50,6 +53,9 @@ class ScopeOperationRepairContext:
     allowed_key_entity_qnames: set[str]
     component_ids_by_cluster_ref: dict[ClusterRef, str] = field(default_factory=dict)
     component_ids_by_name: dict[str, str] = field(default_factory=dict)
+    scope_id: str = ROOT_SCOPE_ID
+    actionable_cluster_refs: set[ClusterRef] = field(default_factory=set)
+    owned_cluster_ids_by_component_id: dict[str, set[str]] = field(default_factory=dict)
 
 
 def repair_unambiguous_routing_and_optional_key_entity_metadata(
@@ -58,21 +64,85 @@ def repair_unambiguous_routing_and_optional_key_entity_metadata(
 ) -> None:
     """Repair deterministic routing and optional key-entity metadata defects."""
     routed_operations = _repair_unambiguous_operation_routing(decision, context)
+    trimmed_refs = _drop_redundant_owned_cluster_refs(decision, context)
     canonicalized_qnames, dropped_qnames = _repair_optional_key_entity_metadata(
         decision,
         context,
     )
 
-    if routed_operations or canonicalized_qnames:
+    if routed_operations or trimmed_refs or canonicalized_qnames:
         logger.info(
-            "Repaired incremental plan: routed %d operation(s), canonicalized %d key-entity qname(s)",
+            "Repaired incremental plan: routed %d operation(s), trimmed %d redundant owned cluster ref(s), "
+            "canonicalized %d key-entity qname(s)",
             routed_operations,
+            trimmed_refs,
             canonicalized_qnames,
         )
     if dropped_qnames:
         logger.warning("Dropped unresolved optional key entities: %s", sorted(dropped_qnames))
 
 
+def _drop_redundant_owned_cluster_refs(
+    decision: ScopeUpdateDecision,
+    context: ScopeOperationRepairContext,
+) -> int:
+    """Drop cluster_refs an operation lists that its own component already owns and that did not change.
+
+    Why: the planner copies a component's whole ``clusters=[...]`` list, but only the changed
+    (actionable) clusters need to be there. A component re-listing its own unchanged clusters changes
+    nothing, so drop those to match what the validator expects. Clusters owned by another component
+    are always kept so the validator still catches them. Only some operations are safe to trim here
+    (see ``_may_trim_owned_refs``).
+    """
+    prefix = CodeBoardingClusterIds.prefix_for_scope(context.scope_id)
+    trimmed = 0
+    for operation in decision.operations:
+        if operation.component_id is None or not _may_trim_owned_refs(operation, context):
+            continue
+        owned = context.owned_cluster_ids_by_component_id.get(operation.component_id, set())
+        kept: list[ScopedClusterRef] = []
+        for ref in operation.cluster_refs:
+            source_cluster_id = CodeBoardingClusterIds.qualify_local_id(
+                CodeBoardingClusterIds.from_graph_id(ref.cluster_id), prefix
+            )
+            redundant = source_cluster_id in owned and cluster_ref_from_scoped_ref(ref) not in (
+                context.actionable_cluster_refs
+            )
+            if redundant:
+                trimmed += 1
+                continue
+            kept.append(ref)
+        operation.cluster_refs = kept
+    return trimmed
+
+
+def _may_trim_owned_refs(operation: ScopeOperation, context: ScopeOperationRepairContext) -> bool:
+    """Whether an operation's already-owned, unchanged cluster_refs are safe to drop.
+
+    - noop: always. It only preserves a component; the validator separately rejects a noop that
+      claims a cluster owned by another component.
+    - update_component: only a genuine self-update - it must list at least one changed (actionable)
+      cluster, and no changed ref it lists may belong to another component. Otherwise keep the refs
+      so an empty or cross-component update is rejected instead of silently applied.
+    - delete_component / create_component: never - keep the refs so a delete of a component that
+      still owns clusters is rejected.
+    """
+    if operation.action == ScopeOperationAction.NOOP:
+        return True
+    if operation.action != ScopeOperationAction.UPDATE_COMPONENT:
+        return False
+    lists_own_change = False
+    for ref in operation.cluster_refs:
+        cluster_ref = cluster_ref_from_scoped_ref(ref)
+        if cluster_ref not in context.actionable_cluster_refs:
+            continue
+        proven_owner = context.component_ids_by_cluster_ref.get(cluster_ref)
+        if proven_owner is not None and proven_owner != operation.component_id:
+            return False
+        lists_own_change = True
+    return lists_own_change
+
+
 def _repair_unambiguous_operation_routing(
     decision: ScopeUpdateDecision,
     context: ScopeOperationRepairContext,

{codeboarding-0.13.1 → codeboarding-0.13.2}/agents/validation.py

@@ -64,6 +64,7 @@ class ValidationContext:
 class ScopeOperationValidationContext:
     expected_cluster_refs: set[ClusterRef] = field(default_factory=set)
     existing_component_ids: set[str] = field(default_factory=set)
+    component_ids_by_cluster_ref: dict[ClusterRef, str] = field(default_factory=dict)
 
 
 @dataclass
@@ -88,10 +89,26 @@ def validate_scope_update_decision(
     context: ScopeOperationValidationContext,
 ) -> ValidationResult:
     errors: list[str] = []
-    seen_refs: list[ClusterRef] = []
+    claimed_refs: list[ClusterRef] = []  # every op's refs, for the over-claim (extra) and duplicate checks
+    covered_refs: list[ClusterRef] = []  # non-delete refs only; a delete discards its clusters, so it cannot cover them
     for operation in decision.operations:
         refs = [cluster_ref_from_scoped_ref(ref) for ref in operation.cluster_refs]
-        seen_refs.extend(refs)
+        claimed_refs.extend(refs)
+        if operation.action != ScopeOperationAction.DELETE_COMPONENT:
+            covered_refs.extend(refs)
+        if operation.action == ScopeOperationAction.NOOP:
+            # A noop unions its refs into its component without removing them from the real owner,
+            # so any changed cluster it claims from another component becomes duplicate-owned.
+            foreign = {
+                ref
+                for ref in refs
+                if context.component_ids_by_cluster_ref.get(ref) not in (None, operation.component_id)
+            }
+            if foreign:
+                errors.append(
+                    f"noop for component_id={operation.component_id!r} claims clusters owned by another "
+                    f"component: {_format_cluster_ref_list(foreign)}. A noop must only preserve its own clusters."
+                )
         if operation.action in EXISTING_COMPONENT_ACTIONS:
             if operation.component_id not in context.existing_component_ids:
                 errors.append(
@@ -111,10 +128,15 @@ def validate_scope_update_decision(
         if duplicate_qnames:
             errors.append(f"Operation {operation.action} repeats key entities: {sorted(duplicate_qnames)}.")
 
-    seen_set = set(seen_refs)
-    missing = context.expected_cluster_refs - seen_set
-    extra = seen_set - context.expected_cluster_refs
-    duplicates = {ref for ref in seen_set if seen_refs.count(ref) > 1}
+    claimed_set: set[ClusterRef] = set()
+    duplicates: set[ClusterRef] = set()
+    for ref in claimed_refs:
+        if ref in claimed_set:
+            duplicates.add(ref)
+        else:
+            claimed_set.add(ref)
+    missing = context.expected_cluster_refs - set(covered_refs)
+    extra = claimed_set - context.expected_cluster_refs
     if missing:
         errors.append(f"Missing cluster_refs: {_format_cluster_ref_list(missing)}")
     if extra:

{codeboarding-0.13.1 → codeboarding-0.13.2/codeboarding.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeboarding
-Version: 0.13.1
+Version: 0.13.2
 Summary: Interactive Diagrams for Code
 Author: CodeBoarding Team
 License-Expression: MIT

{codeboarding-0.13.1 → codeboarding-0.13.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codeboarding"
-version = "0.13.1"
+version = "0.13.2"
 description = "Interactive Diagrams for Code"
 readme = "PYPI.md"
 license = "MIT"