@archinsight/cli 3.0.2 → 3.0.3

package/build/index.js

@@ -33442,7 +33442,7 @@ var coreSources = [
   },
   {
     "sourceName": "core_deployment.ai",
-    "source": "define type DeploymentElement of BoundaryElement\n\nextend type Element\n    List of Edge deployment\n    InfrastructureComponent runsOn\n    List of InfrastructureComponent uses\n\ndefine type InfrastructureComponent of DeploymentElement\n    constructor infrastructureComponent\n\n    Text name\n    Text technology\n    Text description\n    InfrastructureComponent runsOn\n    List of PhysicalWire projection\n    List of InfrastructureComponent _\n\ndefine type ProjectionTerm\n\ndefine type DeploymentProfile of BoundaryElement\n    constructor deploymentProfile\n\n    required List of Deployment appliesTo\n\ndefine type Storage of InfrastructureComponent\n    constructor storage\n\ndefine presentation Storage\n    graphviz\n        shape = cylinder\n\ndefine type Broker of InfrastructureComponent\n    constructor broker\n\n    Text address\n\ndefine presentation Broker\n    graphviz\n        shape = box\n        style = filled,dashed\n\ndefine type Compute of InfrastructureComponent\n    constructor compute\n\n    Text address\n    List of InfrastructureComponent components\n\ndefine type NetworkConnection of InfrastructureComponent\n    constructor networkConnection\n\ndefine type Environment of BoundaryElement\n    constructor environment\n\n    required Text name\n    Text region\n    List of DeploymentElement _\n\ndefine type Deployment of DeploymentElement\n    constructor deployment\n\n    Text name\n    List of DeploymentElement _\n\ndefine presentation DeploymentProfile\n    graphviz\n        visible = false\n\ndefine presentation NetworkConnection\n    graphviz\n        visible = false\n"
+    "source": "define type DeploymentElement of BoundaryElement\n\nextend type Element\n    List of Edge deployment\n    InfrastructureComponent runsOn\n    List of InfrastructureComponent uses\n\ndefine type InfrastructureComponent of DeploymentElement\n    constructor infrastructureComponent\n\n    Text name\n    Text technology\n    Text description\n    InfrastructureComponent runsOn\n    List of PhysicalWire projection\n    List of InfrastructureComponent _\n\ndefine type ProjectionTerm\n\ndefine type DeploymentProfile of BoundaryElement\n    constructor deploymentProfile\n\n    required List of Deployment appliesTo\n\ndefine type Storage of InfrastructureComponent\n    constructor storage\n\ndefine presentation Storage\n    graphviz\n        shape = cylinder\n\ndefine type Broker of NetworkConnection\n    constructor broker\n\n    Text address\n\ndefine presentation Broker\n    graphviz\n        visible = true\n        shape = box\n        style = filled,dashed\n\ndefine type Compute of InfrastructureComponent\n    constructor compute\n\n    Text address\n    List of InfrastructureComponent components\n\ndefine type NetworkConnection of InfrastructureComponent\n    constructor networkConnection\n\ndefine type Environment of BoundaryElement\n    constructor environment\n\n    required Text name\n    Text region\n    List of DeploymentElement _\n\ndefine type Deployment of DeploymentElement\n    constructor deployment\n\n    Text name\n    List of DeploymentElement _\n\ndefine presentation DeploymentProfile\n    graphviz\n        visible = false\n\ndefine presentation NetworkConnection\n    graphviz\n        visible = false\n"
   },
   {
     "sourceName": "core_operator.ai",
@@ -35171,6 +35171,7 @@ var SYSTEM_TYPE = "System";
 var ACTOR_TYPE = "Actor";
 var ORIGINAL_LINK_OPERATOR = "originalLink";
 var DEPLOYMENT_PROFILE_TYPE = "DeploymentProfile";
+var ENVIRONMENT_TYPE = "Environment";
 var INFRASTRUCTURE_COMPONENT_TYPE = "InfrastructureComponent";
 var NETWORK_CONNECTION_TYPE = "NetworkConnection";
 var DEPLOYMENT_TYPE = "Deployment";
@@ -35249,8 +35250,8 @@ function linkProject(request) {
       element.id,
       mergeResolvedReferenceAttributes(resolvedElementAttributes.get(element.id) ?? {}, {
         [APPLIES_TO_ATTRIBUTE]: effectiveDeployments.map((deployment) => resolvedValueForElement(deployment, deployment)),
-        [RUNS_ON_ATTRIBUTE]: application.runsOn.map((item) => resolvedValueForElement(item.element, item.action)),
-        [USES_ATTRIBUTE]: application.uses.map((item) => resolvedValueForElement(item.element, item.action))
+        [RUNS_ON_ATTRIBUTE]: application.runsOn.map(resolvedValueForDeploymentUse),
+        [USES_ATTRIBUTE]: application.uses.map(resolvedValueForDeploymentUse)
       })
     );
   }
@@ -35306,6 +35307,12 @@ function linkProject(request) {
           attributes: effectiveEdgeAttributes,
           projectedAttributes: materialized.edge.attributes,
           projectedOperator: materialized.edge.operator,
+          projectionOrigin: {
+            source: edge.source,
+            target: target.id,
+            sourceIdentity: materialized.edge.sourceIdentity,
+            ...materialized.edge.declaration === void 0 ? {} : { declaration: materialized.edge.declaration }
+          },
           ...materialized.edge.annotations === void 0 ? {} : { annotations: materialized.edge.annotations },
           ...coverage === void 0 ? {} : { coverage }
         });
@@ -35313,7 +35320,7 @@ function linkProject(request) {
     }
   }
   for (const projection of pendingProjections) {
-    addProjectedEdges(linkedEdges, projection.sourceIdentity, projection.fromId, projection.toId, projection.attributes, linkedElementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, void 0, projection.annotations, projection.projectedAttributes, projection.projectedOperator, /* @__PURE__ */ new Set(), projection.coverage);
+    addProjectedEdges(linkedEdges, projection.sourceIdentity, projection.fromId, projection.toId, projection.attributes, linkedElementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, void 0, projection.annotations, projection.projectedAttributes, projection.projectedOperator, /* @__PURE__ */ new Set(), projection.coverage, projection.projectionOrigin);
   }
   const slotDomainTypes = typeSystem.slotDomainTypes();
   for (const element of elements) {
@@ -35597,7 +35604,7 @@ function collectBodyItems(body, ownerType, owner, document, typeSystem) {
     collectBodyItem(item, ownerType, owner, document, typeSystem);
   }
 }
-function collectBodyItem(item, ownerType, owner, document, typeSystem) {
+function collectBodyItem(item, ownerType, owner, document, typeSystem, expectedObjectType) {
   const assignment = firstChild2(item, "assignment");
   if (assignment !== void 0) {
     if (owner !== void 0) {
@@ -35633,7 +35640,15 @@ function collectBodyItem(item, ownerType, owner, document, typeSystem) {
       }
     }
     if (object !== void 0) {
-      const element = collectObject(object, ownerType, owner, document, typeSystem, annotations(annotatedObject, document));
+      const element = collectObject(
+        object,
+        ownerType,
+        owner,
+        document,
+        typeSystem,
+        annotations(annotatedObject, document),
+        expectedObjectType ?? expectedNestedType(typeSystem, ownerType)
+      );
       if (owner !== void 0 && element !== void 0 && typeSystem.anonymousListAttribute(ownerType) !== void 0) {
         addAttributeValue(owner.attributes, "_", elementReference(element));
       }
@@ -35773,11 +35788,12 @@ function collectGroupingList(list, ownerType, owner, document, typeSystem) {
   if (collectImplicitDeploymentGroupObject(list, listName, owner, document, typeSystem)) {
     return true;
   }
+  const expectedObjectType = deploymentGroupAttributeType(owner, listName, document, typeSystem);
   for (const item of children(list, "listBodyItem")) {
     const bodyItem = firstChild2(item, "architectureBodyItem");
     if (bodyItem !== void 0) {
       const before = document.elements.length;
-      collectBodyItem(bodyItem, ownerType, owner, document, typeSystem);
+      collectBodyItem(bodyItem, ownerType, owner, document, typeSystem, expectedObjectType);
       for (const element of document.elements.slice(before)) {
         if (element.parent === owner.id && element.slotName === void 0) {
           element.slotName = listName;
@@ -35802,9 +35818,7 @@ function collectImplicitDeploymentGroupObject(list, listName, owner, document, t
   return true;
 }
 function resolveDeploymentGroupConstructor(listName, listNameNode, owner, document, typeSystem) {
-  const parent = owner.parent === void 0 ? void 0 : document.elements.find((element) => element.id === owner.parent);
-  const parentAttribute = parent === void 0 ? void 0 : typeSystem.attribute(parent.type, listName);
-  const attributeType2 = parentAttribute === void 0 ? void 0 : parentAttribute.list === true ? parentAttribute.listElementType ?? parentAttribute.type : parentAttribute.type;
+  const attributeType2 = deploymentGroupAttributeType(owner, listName, document, typeSystem);
   if (attributeType2 !== void 0) {
     return resolveImplicitObjectConstructor(attributeType2, listName, listNameNode, document, typeSystem);
   }
@@ -35823,6 +35837,14 @@ function resolveDeploymentGroupConstructor(listName, listNameNode, owner, docume
   }
   return constructors[0];
 }
+function deploymentGroupAttributeType(owner, listName, document, typeSystem) {
+  const parent = owner.parent === void 0 ? void 0 : document.elements.find((element) => element.id === owner.parent);
+  const attribute = parent === void 0 ? void 0 : typeSystem.attribute(parent.type, listName);
+  if (attribute === void 0) {
+    return void 0;
+  }
+  return attribute.list === true ? attribute.listElementType ?? attribute.type : attribute.type;
+}
 function collectImplicitObjectAttribute(list, attributeName, attributeNameNode, ownerType, owner, document, typeSystem) {
   if (owner === void 0 || attributeName.length === 0) {
     return false;
@@ -35864,16 +35886,18 @@ function resolveImplicitObjectConstructor(attributeType2, attributeName, attribu
     });
     return void 0;
   }
-  if (constructors.length > 1) {
+  const exactConstructors = constructors.filter((constructor) => constructor.ownerType === attributeType2);
+  const candidates = exactConstructors.length > 0 ? exactConstructors : constructors;
+  if (candidates.length > 1) {
     document.diagnostics.push({
       code: "CONSTRUCTOR_AMBIGUOUS",
-      message: `Type '${attributeType2}' has multiple constructors for implicit attribute '${attributeName}': ${constructors.map((constructor) => `'${constructor.spelling}'`).join(", ")}`,
+      message: `Type '${attributeType2}' has multiple constructors for implicit attribute '${attributeName}': ${candidates.map((constructor) => `'${constructor.spelling}'`).join(", ")}`,
       sourceName: document.sourceName,
       ...position2(attributeNameNode, document.sourceName)
     });
     return void 0;
   }
-  return constructors[0];
+  return candidates[0];
 }
 function collectImplicitObjectElement(list, attributeNameNode, constructor, parent, document, slotName) {
   const localId = nextAnonymousLocalId(document);
@@ -36750,7 +36774,7 @@ function deploymentAttributesForWire(edge, target, context) {
   );
   const application = resolveDeploymentApplication(source, edge.deploymentActions, true, context, deployments);
   return {
-    [USES_ATTRIBUTE]: application.uses.map((item) => resolvedValueForElement(item.element, item.action))
+    [USES_ATTRIBUTE]: application.uses.map(resolvedValueForDeploymentUse)
   };
 }
 function resolveDeploymentApplication(owner, actions, wire, context, initialDeployments = []) {
@@ -36896,6 +36920,15 @@ function resolveDeploymentInfrastructure(owner, action, target, deployments, inh
     });
     return [];
   }
+  if (!isDeclaredDeploymentInfrastructureSlot(action.targetId, context.typeSystem)) {
+    context.diagnostics.push({
+      code: "UNDECLARED_IDENTIFIER",
+      message: `Deployment slot '${action.targetId}' is not declared by any Environment type`,
+      sourceName: action.sourceName,
+      ...diagnosticPosition2(action)
+    });
+    return [];
+  }
   if (deployments.length === 0) {
     if (wire) {
       return [];
@@ -36931,6 +36964,22 @@ function resolveDeploymentInfrastructure(owner, action, target, deployments, inh
   }
   return result;
 }
+function isDeclaredDeploymentInfrastructureSlot(slotName, typeSystem) {
+  for (const type of typeSystem.declaredTypes()) {
+    if (!typeSystem.isAssignable(type, ENVIRONMENT_TYPE)) {
+      continue;
+    }
+    const attribute = typeSystem.attribute(type, slotName);
+    if (attribute === void 0) {
+      continue;
+    }
+    const valueType = attribute.list === true ? attribute.listElementType ?? attribute.type : attribute.type;
+    if (typeSystem.isAssignable(valueType, INFRASTRUCTURE_COMPONENT_TYPE)) {
+      return true;
+    }
+  }
+  return false;
+}
 function materializeInfrastructureUse(owner, source, action, deploymentId, context, inherited) {
   if (!deploymentActionHasOverrides(action)) {
     return {
@@ -37052,6 +37101,12 @@ function resolvedValueForElement(element, source) {
     ...source.endColumn === void 0 ? {} : { endColumn: source.endColumn }
   };
 }
+function resolvedValueForDeploymentUse(use) {
+  return {
+    ...resolvedValueForElement(use.element, use.action),
+    ...use.deploymentId === void 0 ? {} : { deploymentId: use.deploymentId }
+  };
+}
 function mergeResolvedReferenceAttributes(base, override) {
   const result = Object.fromEntries(
     Object.entries(base).map(([name, values]) => [name, [...values]])
@@ -37086,7 +37141,7 @@ function mergeUniqueElements(left, right) {
 function sanitizeLocalId(value) {
   return value.replace(/[^A-Za-z0-9_]/g, "_");
 }
-function addProjectedEdges(linkedEdges, sourceIdentity, fromId, toId, attributes, elementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, projectionScope, annotations2 = [], projectedAttributes, projectedOperator, visitedProjectionElements = /* @__PURE__ */ new Set(), coverage) {
+function addProjectedEdges(linkedEdges, sourceIdentity, fromId, toId, attributes, elementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, projectionScope, annotations2 = [], projectedAttributes, projectedOperator, visitedProjectionElements = /* @__PURE__ */ new Set(), coverage, projectionOrigin = { source: fromId, target: toId }) {
   for (const [attributeName, values] of Object.entries(attributes)) {
     if (attributeName === "_") {
       continue;
@@ -37098,7 +37153,7 @@ function addProjectedEdges(linkedEdges, sourceIdentity, fromId, toId, attributes
       if (!isGraphElement(value.element)) {
         continue;
       }
-      const visitKey = `${fromId}\0${toId}\0${value.element.id}`;
+      const visitKey = `${fromId}\0${toId}\0${value.element.id}\0${value.deploymentId ?? ""}`;
       if (visitedProjectionElements.has(visitKey)) {
         continue;
       }
@@ -37106,6 +37161,13 @@ function addProjectedEdges(linkedEdges, sourceIdentity, fromId, toId, attributes
       if (isDirectSlotReferenceSelfProjection(value.element, fromId, toId)) {
         continue;
       }
+      const effectiveProjectionScope = projectionScope ?? projectionScopeFor(
+        fromId,
+        toId,
+        value,
+        elementsById,
+        resolvedElementAttributes
+      );
       const rules = value.element.projectionRules;
       if (fromId === toId && rules.some(projectionRuleUsesTo)) {
         const position3 = value.line === void 0 || value.column === void 0 ? value.element : {
@@ -37123,7 +37185,7 @@ function addProjectedEdges(linkedEdges, sourceIdentity, fromId, toId, attributes
         continue;
       }
       for (const rule3 of rules) {
-        addProjectedRuleEdge(linkedEdges, sourceIdentity, fromId, toId, value.element, rule3, elementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, projectionScope, annotations2, projectedAttributes, projectedOperator, coverage);
+        addProjectedRuleEdge(linkedEdges, sourceIdentity, fromId, toId, value.element, rule3, elementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, effectiveProjectionScope, annotations2, projectedAttributes, projectedOperator, coverage, projectionOrigin);
       }
       addProjectedEdges(
         linkedEdges,
@@ -37136,12 +37198,13 @@ function addProjectedEdges(linkedEdges, sourceIdentity, fromId, toId, attributes
         ownerIndependentProjectionKeys,
         typeSystem,
         diagnostics,
-        projectionScope,
+        effectiveProjectionScope,
         annotations2,
         void 0,
         projectedOperator,
         visitedProjectionElements,
-        coverage
+        coverage,
+        projectionOrigin
       );
     }
   }
@@ -37149,7 +37212,7 @@ function addProjectedEdges(linkedEdges, sourceIdentity, fromId, toId, attributes
 function isDirectSlotReferenceSelfProjection(element, fromId, toId) {
   return fromId === toId && element.parent === fromId && element.scalarAttributes.parentType !== void 0 && element.scalarAttributes.attributeName !== void 0;
 }
-function addProjectedRuleEdge(linkedEdges, sourceIdentity, fromId, toId, projectionElement, rule3, elementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, projectionScope, annotations2 = [], projectedAttributes, projectedOperator, coverage) {
+function addProjectedRuleEdge(linkedEdges, sourceIdentity, fromId, toId, projectionElement, rule3, elementsById, resolvedElementAttributes, ownerIndependentProjectionKeys, typeSystem, diagnostics, projectionScope, annotations2 = [], projectedAttributes, projectedOperator, coverage, projectionOrigin = { source: fromId, target: toId }) {
   if (!validateConcreteProjectionRule(rule3, typeSystem, diagnostics)) {
     return;
   }
@@ -37158,19 +37221,22 @@ function addProjectedRuleEdge(linkedEdges, sourceIdentity, fromId, toId, project
   const effectiveOperator = rule3.operator === ORIGINAL_LINK_OPERATOR ? projectedOperator ?? "->" : rule3.operator;
   const edgeOwnerPlacement = projectionRuleOwnerPlacement(rule3);
   const edgeProjectionScope = projectionPlacementScope(edgeOwnerPlacement, projectionScope);
+  const sourcePlacement = projectionPlacementScope(rule3.source.placement, projectionScope);
+  const targetPlacement = projectionPlacementScope(rule3.target.placement, projectionScope);
   const edgeSourceIdentity = projectionPlacementSourceIdentity(edgeOwnerPlacement, fromId, toId, elementsById) ?? sourceIdentity;
   const carriedAttributes = mergeAttributeValues(
     rule3.operator === ORIGINAL_LINK_OPERATOR ? projectedAttributes : void 0,
     rule3.attributes ?? {}
   );
-  const projectionOrigin = { source: fromId, target: toId };
+  const preservesLogicalRelationship = rule3.operator === ORIGINAL_LINK_OPERATOR;
+  const originKey = projectionOriginKey(projectionOrigin);
   for (const source of sources) {
     for (const target of targets) {
       if (coverage !== void 0) {
         coverage.projected = true;
       }
       if (!projectionRuleUsesOwner(rule3)) {
-        const key = `${projectionElement.id}\0${source}\0${effectiveOperator}\0${target}`;
+        const key = `${projectionElement.id}\0${source}\0${effectiveOperator}\0${target}\0${preservesLogicalRelationship ? originKey : ""}`;
         if (ownerIndependentProjectionKeys.has(key)) {
           mergeProjectedEdge(
             linkedEdges,
@@ -37190,7 +37256,7 @@ function addProjectedRuleEdge(linkedEdges, sourceIdentity, fromId, toId, project
       const targetElement = elementsById.get(target);
       const operator = sourceElement === void 0 || targetElement === void 0 ? void 0 : typeSystem.operatorConstructor(effectiveOperator, sourceElement.type, targetElement.type);
       const type = operator?.ownerType ?? effectiveOperator;
-      const existingIndex = linkedEdges.findIndex((edge) => edge.projected === true && edge.source === source && edge.operator === effectiveOperator && edge.target === target && edge.projectionRoot === projectionElement.id && edge.projectionScope === edgeProjectionScope);
+      const existingIndex = linkedEdges.findIndex((edge) => edge.projected === true && edge.source === source && edge.operator === effectiveOperator && edge.target === target && edge.projectionRoot === projectionElement.id && edge.projectionScope === edgeProjectionScope && edge.sourcePlacement === sourcePlacement && edge.targetPlacement === targetPlacement && (!preservesLogicalRelationship || edge.projectionOrigins?.some((origin) => projectionOriginKey(origin) === originKey) === true));
       if (existingIndex >= 0) {
         const edge = linkedEdges[existingIndex];
         if (edge !== void 0) {
@@ -37213,10 +37279,13 @@ function addProjectedRuleEdge(linkedEdges, sourceIdentity, fromId, toId, project
         operator: effectiveOperator,
         type,
         sourceIdentity: edgeSourceIdentity,
+        ...preservesLogicalRelationship && projectionOrigin.declaration !== void 0 ? { declaration: projectionOrigin.declaration } : {},
         attributes: carriedAttributes ?? {},
         ...listAttributesProperty(typeSystem, type),
         projected: true,
         ...edgeProjectionScope === void 0 ? {} : { projectionScope: edgeProjectionScope },
+        ...sourcePlacement === void 0 ? {} : { sourcePlacement },
+        ...targetPlacement === void 0 ? {} : { targetPlacement },
         ...annotations2.length === 0 ? {} : { annotations: annotations2 }
       });
     }
@@ -37265,7 +37334,7 @@ function uniqueProjectionOrigins(origins) {
   const seen = /* @__PURE__ */ new Set();
   const result = [];
   for (const origin of origins) {
-    const key = `${origin.source}\0${origin.target}`;
+    const key = projectionOriginKey(origin);
     if (seen.has(key)) {
       continue;
     }
@@ -37274,6 +37343,19 @@ function uniqueProjectionOrigins(origins) {
   }
   return result;
 }
+function projectionOriginKey(origin) {
+  const declaration = origin.declaration;
+  return [
+    origin.source,
+    origin.target,
+    origin.sourceIdentity ?? "",
+    declaration?.sourceName ?? "",
+    declaration?.line ?? "",
+    declaration?.column ?? "",
+    declaration?.endLine ?? "",
+    declaration?.endColumn ?? ""
+  ].join("\0");
+}
 function mergeAttributeValues(base, override) {
   if (base === void 0 || Object.keys(base).length === 0) {
     return override;
@@ -37356,8 +37438,58 @@ function uniqueIds(values) {
 function projectionRuleOwnerPlacement(rule3) {
   return rule3.operator === ORIGINAL_LINK_OPERATOR ? rule3.target.placement : rule3.source.placement;
 }
-function projectionPlacementScope(_placement, _projectionScope) {
-  return void 0;
+function projectionScopeFor(fromId, toId, projectionValue, elementsById, resolvedElementAttributes) {
+  const sourcePlacement = endpointPlacement(
+    fromId,
+    projectionValue.deploymentId,
+    projectionValue.element?.context,
+    elementsById,
+    resolvedElementAttributes
+  );
+  const targetPlacement = endpointPlacement(
+    toId,
+    projectionValue.deploymentId,
+    projectionValue.element?.context,
+    elementsById,
+    resolvedElementAttributes
+  );
+  return sourcePlacement === void 0 && targetPlacement === void 0 ? void 0 : {
+    ...sourcePlacement === void 0 ? {} : { sourcePlacement },
+    ...targetPlacement === void 0 ? {} : { targetPlacement }
+  };
+}
+function endpointPlacement(endpointId, deploymentId, projectionContext, elementsById, resolvedElementAttributes) {
+  const placements = endpointPlacementValues(endpointId, elementsById, resolvedElementAttributes);
+  if (deploymentId !== void 0) {
+    const inDeployment = uniqueIds(placements.filter((placement) => placement.deploymentId === deploymentId).map((placement) => placement.id));
+    if (inDeployment.length === 1) {
+      return inDeployment[0];
+    }
+  }
+  if (projectionContext !== void 0) {
+    const inContext = uniqueIds(placements.filter((placement) => placement.element?.context === projectionContext).map((placement) => placement.id));
+    if (inContext.length === 1) {
+      return inContext[0];
+    }
+  }
+  const uniquePlacements = uniqueIds(placements.map((placement) => placement.id));
+  return uniquePlacements.length === 1 ? uniquePlacements[0] : void 0;
+}
+function endpointPlacementValues(endpointId, elementsById, resolvedElementAttributes) {
+  const visited = /* @__PURE__ */ new Set();
+  let current = elementsById.get(endpointId);
+  while (current !== void 0 && !visited.has(current.id)) {
+    visited.add(current.id);
+    const placements = resolvedElementAttributes.get(current.id)?.[RUNS_ON_ATTRIBUTE] ?? [];
+    if (placements.length > 0) {
+      return placements;
+    }
+    current = current.parent === void 0 ? void 0 : elementsById.get(current.parent);
+  }
+  return [];
+}
+function projectionPlacementScope(placement, projectionScope) {
+  return placement === "source" ? projectionScope?.sourcePlacement : projectionScope?.targetPlacement;
 }
 function projectionPlacementSourceIdentity(placement, fromId, toId, elementsById) {
   return elementsById.get(placement === "target" ? toId : fromId)?.sourceName;
@@ -38263,6 +38395,8 @@ function selectGraph(result, scope, query) {
   const selectedElements = /* @__PURE__ */ new Map();
   const selectedEdges = [];
   const selectedEdgeIdentities = /* @__PURE__ */ new Map();
+  const returnedRelationshipPatterns = relationshipPatternsReturnedBy(parsed);
+  const selectedStructuralRelationships = /* @__PURE__ */ new Set();
   const groups = /* @__PURE__ */ new Map();
   const nodeById = queryNodeIndex(result);
   for (const row of rows) {
@@ -38292,6 +38426,8 @@ function selectGraph(result, scope, query) {
             derived: edge.derived,
             projected: edge.projected
           }, edge.edge, selectedEdgeIdentities);
+        } else if (returnedRelationshipPatterns.has(alias)) {
+          selectedStructuralRelationships.add(alias);
         }
       }
     }
@@ -38301,7 +38437,7 @@ function selectGraph(result, scope, query) {
   }
   let groupedSelectedElements = /* @__PURE__ */ new Set();
   if (parsed.groupBy !== void 0) {
-    groupedSelectedElements = collectSelectedReferenceGroups(selectedElements, groups, parsed.groupBy);
+    groupedSelectedElements = collectSelectedReferenceGroups(selectedElements, selectedEdges, groups, parsed.groupBy);
     for (const owner of completeReferenceGroupClosure(result, groups, parsed.groupBy)) {
       const element = linkedElementForNode(nodeById.get(owner));
       if (element !== void 0) {
@@ -38309,7 +38445,7 @@ function selectGraph(result, scope, query) {
       }
     }
   }
-  const completedEdges = selectedEdges.length > 0 ? selectedEdges : result.edges.filter((edge) => edge.projected !== true && selectedElements.has(edge.source) && selectedElements.has(edge.target)).map((edge) => ({ edge, source: edge.source, target: edge.target, derived: false, projected: false }));
+  const completedEdges = selectedEdges.length > 0 ? selectedEdges : hasAuthoritativeEdgeSelection(returnedRelationshipPatterns, selectedStructuralRelationships) ? [] : result.edges.filter((edge) => edge.projected !== true && selectedElements.has(edge.source) && selectedElements.has(edge.target)).map((edge) => ({ edge, source: edge.source, target: edge.target, derived: false, projected: false }));
   const internalElementIds = new Set([...internalElements(result, rows, parsed)].filter((id) => selectedElements.has(id)));
   const externalElements = [...selectedElements.keys()].filter((id) => !internalElementIds.has(id) && !groupedSelectedElements.has(id));
   const selectedGraph2 = {
@@ -38322,7 +38458,113 @@ function selectGraph(result, scope, query) {
     })).filter((group) => group.elements.length > 0),
     externalElements
   };
-  return materializeGroupedView(applyViewBoundary(result, selectedGraph2, scope));
+  const bounded = applyViewBoundary(result, selectedGraph2, scope);
+  const systemSeedFiltered = scope.view === "deployment-container" || scope.view === "deployment-system" ? removeDescendantProjectionsCapturedBySystemSeeds(result, bounded, scope) : bounded;
+  const materialized = materializeGroupedView(
+    systemSeedFiltered,
+    scope.view === "deployment" || scope.view === "deployment-container" || scope.view === "deployment-system"
+  );
+  if (scope.view === "deployment-container") {
+    return applyDeploymentEnvironmentScope(result, materialized, scope);
+  }
+  if (scope.view === "deployment-system") {
+    return simplifyDeploymentSystemInfrastructure(result, rollUpDeploymentSystems(result, materialized, scope));
+  }
+  return materialized;
+}
+function removeDescendantProjectionsCapturedBySystemSeeds(result, graph, scope) {
+  const sourceSystems = new Set(result.elements.filter((element) => element.sourceIdentity === scope.tab && elementHasType(element, "SystemElement")).map((element) => element.id));
+  const edges = graph.edges.filter((edge) => {
+    const originSource = edge.edge.originSource ?? edge.edge.source;
+    const originTarget = edge.edge.originTarget ?? edge.edge.target;
+    return ![edge.source, edge.target].some((endpoint) => {
+      const system = baseOccurrenceId(endpoint);
+      return sourceSystems.has(system) && originSource !== system && originTarget !== system;
+    });
+  });
+  const referenced = new Set(edges.flatMap((edge) => [edge.source, edge.target]));
+  const grouped = new Set(graph.groups.flatMap((group) => group.elements));
+  const retained = new Set(Object.keys(graph.elements).filter(
+    (id) => referenced.has(id) || grouped.has(id) || !sourceSystems.has(baseOccurrenceId(id))
+  ));
+  return {
+    ...graph,
+    elements: Object.fromEntries(Object.entries(graph.elements).filter(([id]) => retained.has(id))),
+    edges,
+    groups: graph.groups.map((group) => ({
+      ...group,
+      elements: group.elements.filter((id) => retained.has(id))
+    })).filter((group) => group.elements.length > 0),
+    externalElements: graph.externalElements.filter((id) => retained.has(id))
+  };
+}
+function discoverDeploymentEnvironments(result, scope) {
+  const closure = tabClosure(result, scope.tab);
+  const elementsById = new Map(result.elements.map((element) => [element.id, element]));
+  const environmentIds = /* @__PURE__ */ new Set();
+  const wireEnvironmentIds = /* @__PURE__ */ new Set();
+  for (const element of result.elements) {
+    if (!closure.has(element.id) || element.deployed !== true) {
+      continue;
+    }
+    for (const targetId of [...element.attributes.runsOn ?? [], ...element.attributes.uses ?? []]) {
+      const target = elementsById.get(targetId);
+      if (target !== void 0 && target.context !== element.context) {
+        environmentIds.add(target.context);
+      }
+    }
+  }
+  for (const edge of result.edges) {
+    if (edge.projected === true || edge.sourceIdentity !== scope.tab) {
+      continue;
+    }
+    for (const targetId of edge.attributes.uses ?? []) {
+      const target = elementsById.get(targetId);
+      if (target !== void 0 && target.context !== elementsById.get(edge.source)?.context) {
+        wireEnvironmentIds.add(target.context);
+      }
+    }
+  }
+  for (const context of result.contexts) {
+    const ownsConcreteDeployment = result.elements.some(
+      (element) => element.context === context.id && elementHasType(element, "Deployment")
+    );
+    if (context.synthetic !== true && context.sourceIdentity === scope.tab && (context.type === "Environment" || ownsConcreteDeployment)) {
+      environmentIds.add(context.id);
+    }
+  }
+  if (environmentIds.size === 0) {
+    for (const environment of wireEnvironmentIds) {
+      environmentIds.add(environment);
+    }
+  }
+  const contextsById = new Map(result.contexts.map((context) => [context.id, context]));
+  const environmentNamesByContext = /* @__PURE__ */ new Map();
+  for (const element of result.elements) {
+    if (element.synthetic === true || element.parent !== void 0 || !elementHasType(element, "Environment")) {
+      continue;
+    }
+    const name = element.attributes.name?.[0];
+    if (name !== void 0) {
+      environmentNamesByContext.set(element.context, name);
+    }
+  }
+  return [...environmentIds].map((id) => {
+    const name = environmentNamesByContext.get(id) ?? contextsById.get(id)?.attributes.name?.[0];
+    return { id, ...name === void 0 ? {} : { name } };
+  }).sort((left, right) => (left.name ?? left.id).localeCompare(right.name ?? right.id) || left.id.localeCompare(right.id));
+}
+function relationshipPatternsReturnedBy(query) {
+  const returned = new Set(query.returns);
+  return new Map(query.matches.flatMap((match) => {
+    const relationship = match.pattern.relationship;
+    return relationship?.alias !== void 0 && returned.has(relationship.alias) ? [[relationship.alias, relationship]] : [];
+  }));
+}
+function hasAuthoritativeEdgeSelection(returned, selectedStructuralRelationships) {
+  return [...returned].some(
+    ([alias, pattern]) => pattern.type === "REFERENCES" || pattern.type === void 0 && !selectedStructuralRelationships.has(alias)
+  );
 }
 function addSelectedEdge(edges, next, identity, identities) {
   const endpointKey = `${next.source}\0${next.target}`;
@@ -38347,16 +38589,27 @@ function contextualLinkedEdge(relationship) {
     ...originTarget === void 0 ? {} : { originTarget }
   };
 }
-function materializeGroupedView(graph) {
+function materializeGroupedView(graph, materializeDeploymentPlacements = true) {
   const groupsByElement = /* @__PURE__ */ new Map();
   for (const group of graph.groups) {
     for (const element of group.elements) {
       groupsByElement.set(element, [...groupsByElement.get(element) ?? [], group]);
     }
   }
+  const placementMaterializationRequired = materializeDeploymentPlacements && [...groupsByElement].some(([elementId]) => {
+    const element = graph.elements[elementId];
+    return element?.deployed === true && (element.attributes.runsOn?.length ?? 0) > 1;
+  });
+  const clonedElementIds = new Set([...groupsByElement].flatMap(([elementId, memberships]) => {
+    const element = graph.elements[elementId];
+    return memberships.length > 1 || placementMaterializationRequired && element?.deployed === true ? [elementId] : [];
+  }));
+  if (clonedElementIds.size === 0) {
+    return graph;
+  }
   const cloneIdsByElementAndGroup = /* @__PURE__ */ new Map();
   for (const [elementId, memberships] of groupsByElement) {
-    if (memberships.length < 2) {
+    if (!clonedElementIds.has(elementId)) {
       continue;
     }
     for (const group of memberships) {
@@ -38368,11 +38621,8 @@ function materializeGroupedView(graph) {
   }
   const elements = { ...graph.elements };
   for (const [elementId, memberships] of groupsByElement) {
-    if (memberships.length < 2) {
-      continue;
-    }
     const element = graph.elements[elementId];
-    if (element === void 0) {
+    if (element === void 0 || !clonedElementIds.has(elementId)) {
       continue;
     }
     for (const group of memberships) {
@@ -38393,15 +38643,15 @@ function materializeGroupedView(graph) {
   }));
   const edges = graph.edges.map((edge) => ({
     ...edge,
-    source: cloneEndpoint(edge.source, edge.edge.projectionScope, cloneIdsByElementAndGroup),
-    target: cloneEndpoint(edge.target, edge.edge.projectionScope, cloneIdsByElementAndGroup)
+    source: cloneEndpoint(edge.source, edge.edge.sourcePlacement, cloneIdsByElementAndGroup),
+    target: cloneEndpoint(edge.target, edge.edge.targetPlacement, cloneIdsByElementAndGroup)
   }));
   const referenced = /* @__PURE__ */ new Set([
     ...groups.flatMap((group) => group.elements),
     ...edges.flatMap((edge) => [edge.source, edge.target])
   ]);
-  for (const [elementId, memberships] of groupsByElement) {
-    if (memberships.length >= 2 && !referenced.has(elementId)) {
+  for (const elementId of clonedElementIds) {
+    if (!referenced.has(elementId)) {
       delete elements[elementId];
     }
   }
@@ -38412,7 +38662,11 @@ function materializeGroupedView(graph) {
     groups,
     externalElements: graph.externalElements.flatMap((element) => {
       const memberships = groupsByElement.get(element) ?? [];
-      return memberships.length < 2 ? [element] : memberships.map((group) => groupedCloneId(element, group.owner));
+      const clones = memberships.flatMap((group) => {
+        const clone = cloneIdsByElementAndGroup.get(groupedCloneKey(element, group.owner));
+        return clone === void 0 ? [] : [clone];
+      });
+      return elements[element] === void 0 ? clones : [element, ...clones];
     })
   };
 }
@@ -38425,6 +38679,338 @@ function groupedCloneKey(elementId, groupOwner) {
 function groupedCloneId(elementId, groupOwner) {
   return `${elementId}@@${groupOwner}`;
 }
+function applyDeploymentEnvironmentScope(result, graph, scope) {
+  const environments = discoverDeploymentEnvironments(result, scope);
+  const environment = scope.environment ?? (environments.length === 1 ? environments[0]?.id : void 0);
+  if (environment === void 0) {
+    return emptyScopedGraph(graph);
+  }
+  if (!environments.some((candidate) => candidate.id === environment)) {
+    return emptyScopedGraph(graph);
+  }
+  const elementsById = new Map(result.elements.map((element) => [element.id, element]));
+  const sourceElements = tabClosure(result, scope.tab);
+  const groups = graph.groups.filter((group) => elementEnvironment(group.owner, elementsById) === environment);
+  const selectedIds = new Set(groups.flatMap((group) => [group.owner, ...group.elements]));
+  const candidateEdges = graph.edges.filter((edge) => deploymentEdgeInEnvironment(edge, environment, elementsById));
+  const edges = candidateEdges.filter((edge) => {
+    const sourceAllowed = deploymentEndpointAllowed(edge.source, environment, elementsById);
+    const targetAllowed = deploymentEndpointAllowed(edge.target, environment, elementsById);
+    return sourceAllowed && targetAllowed;
+  });
+  for (const edge of edges) {
+    selectedIds.add(edge.source);
+    selectedIds.add(edge.target);
+  }
+  const elements = Object.fromEntries(Object.entries(graph.elements).filter(([id]) => selectedIds.has(id)));
+  const externalElements = new Set(graph.externalElements.filter((id) => selectedIds.has(id)));
+  for (const id of selectedIds) {
+    const occurrenceEnvironment = deploymentOccurrenceEnvironment(id, elementsById);
+    if (occurrenceEnvironment !== void 0 && occurrenceEnvironment !== environment && isLogicalDeploymentEndpoint(id, elementsById)) {
+      externalElements.add(id);
+    }
+    if (isLogicalDeploymentEndpoint(id, elementsById) && !sourceElements.has(baseOccurrenceId(id))) {
+      externalElements.add(id);
+    }
+  }
+  return {
+    ...graph,
+    elements,
+    edges,
+    groups: groups.map((group) => ({ ...group, elements: group.elements.filter((id) => selectedIds.has(id)) })),
+    externalElements: [...externalElements]
+  };
+}
+function emptyScopedGraph(graph) {
+  return { ...graph, elements: {}, edges: [], groups: [], externalElements: [] };
+}
+function deploymentEdgeInEnvironment(edge, environment, elementsById) {
+  const scopes = [edge.edge.projectionRoot, edge.edge.sourcePlacement, edge.edge.targetPlacement].filter((id) => id !== void 0);
+  if (scopes.some((id) => elementEnvironment(id, elementsById) === environment)) {
+    return true;
+  }
+  return [edge.source, edge.target].some((id) => elementEnvironment(id, elementsById) === environment);
+}
+function deploymentEndpointAllowed(id, environment, elementsById) {
+  return isLogicalDeploymentEndpoint(id, elementsById) || elementEnvironment(id, elementsById) === environment;
+}
+function isLogicalDeploymentEndpoint(id, elementsById) {
+  const element = elementsById.get(baseOccurrenceId(id));
+  return element !== void 0 && !elementHasType(element, "InfrastructureComponent");
+}
+function deploymentOccurrenceEnvironment(id, elementsById) {
+  const separator = id.indexOf("@@");
+  if (separator >= 0) {
+    return elementEnvironment(id.slice(separator + 2), elementsById);
+  }
+  const runsOn = elementsById.get(id)?.attributes.runsOn ?? [];
+  return runsOn.length === 1 ? elementEnvironment(runsOn[0], elementsById) : void 0;
+}
+function elementEnvironment(id, elementsById) {
+  return elementsById.get(baseOccurrenceId(id))?.context;
+}
+function baseOccurrenceId(id) {
+  const separator = id.indexOf("@@");
+  return separator < 0 ? id : id.slice(0, separator);
+}
+function rollUpDeploymentSystems(result, graph, scope) {
+  const elementsById = new Map(result.elements.map((element) => [element.id, element]));
+  const parentByChild = new Map(result.elements.flatMap(
+    (element) => element.parent === void 0 ? [] : [[element.id, element.parent]]
+  ));
+  const systemFor = (id) => lineage(baseOccurrenceId(id), parentByChild).find((candidate) => elementHasType(elementsById.get(candidate), "SystemElement"));
+  const fold = (id) => {
+    const system = systemFor(id);
+    if (system === void 0) {
+      return id;
+    }
+    const separator = id.indexOf("@@");
+    return separator < 0 ? system : `${system}${id.slice(separator)}`;
+  };
+  const foldedElement = (id) => {
+    const folded = fold(id);
+    const base = elementsById.get(baseOccurrenceId(folded));
+    if (base === void 0) {
+      return graph.elements[id];
+    }
+    return folded === base.id ? base : { ...base, id: folded, attributes: { ...base.attributes, projectedFrom: [base.id] } };
+  };
+  const groups = graph.groups.map((group) => ({
+    ...group,
+    elements: [...new Set(group.elements.map(fold))]
+  })).filter((group) => group.elements.length > 0);
+  const edges = [];
+  for (const edge of graph.edges) {
+    const originSource = edge.edge.originSource ?? edge.edge.source;
+    const originTarget = edge.edge.originTarget ?? edge.edge.target;
+    const originSourceSystem = systemFor(originSource);
+    const originTargetSystem = systemFor(originTarget);
+    if (originSource !== originTarget && originSourceSystem !== void 0 && originSourceSystem === originTargetSystem) {
+      continue;
+    }
+    const next = { ...edge, source: fold(edge.source), target: fold(edge.target) };
+    if (next.source !== next.target) {
+      addFoldedViewEdge(edges, next);
+    }
+  }
+  const referenced = /* @__PURE__ */ new Set([
+    ...groups.flatMap((group) => [group.owner, ...group.elements]),
+    ...edges.flatMap((edge) => [edge.source, edge.target])
+  ]);
+  const elements = {};
+  for (const id of referenced) {
+    const direct = graph.elements[id];
+    const element = direct ?? [...Object.keys(graph.elements)].filter((candidate) => fold(candidate) === id).map(foldedElement).find((candidate) => candidate !== void 0);
+    if (element !== void 0) {
+      elements[id] = element.id === id ? element : { ...element, id };
+    }
+  }
+  const sourceElements = tabClosure(result, scope.tab);
+  const externalElements = new Set(graph.externalElements.map(fold).filter((id) => referenced.has(id)));
+  for (const id of referenced) {
+    const system = systemFor(id);
+    if (system !== void 0 && !sourceElements.has(system)) {
+      externalElements.add(id);
+    }
+  }
+  return {
+    ...graph,
+    elements,
+    edges,
+    groups,
+    externalElements: [...externalElements]
+  };
+}
+function simplifyDeploymentSystemInfrastructure(result, graph) {
+  const elementsById = new Map(result.elements.map((element) => [element.id, element]));
+  const parentByChild = new Map(result.elements.flatMap(
+    (element) => element.parent === void 0 ? [] : [[element.id, element.parent]]
+  ));
+  const externalElements = new Set(graph.externalElements);
+  const placementGroupOwners = new Set(graph.groups.map((group) => group.owner));
+  const retained = new Set(Object.keys(graph.elements).filter((id) => {
+    const element = elementsById.get(baseOccurrenceId(id)) ?? graph.elements[id];
+    return !elementHasType(element, "InfrastructureComponent") || externalElements.has(id) && !placementGroupOwners.has(id);
+  }));
+  const outgoing = /* @__PURE__ */ new Map();
+  const incoming = /* @__PURE__ */ new Map();
+  for (const edge of graph.edges) {
+    const sourceEdges = outgoing.get(edge.source) ?? [];
+    sourceEdges.push(edge);
+    outgoing.set(edge.source, sourceEdges);
+    const targetEdges = incoming.get(edge.target) ?? [];
+    targetEdges.push(edge);
+    incoming.set(edge.target, targetEdges);
+  }
+  const edges = [];
+  const trace = (source, first) => {
+    const visited = /* @__PURE__ */ new Set();
+    const follow = (edge, carrier) => {
+      const target = edge.target;
+      const nextCarrier = logicalRelationshipCarrier(carrier, edge);
+      if (target === source) {
+        return;
+      }
+      if (retained.has(target)) {
+        addFoldedViewEdge(edges, { ...nextCarrier, source, target });
+        return;
+      }
+      if (visited.has(target)) {
+        return;
+      }
+      visited.add(target);
+      for (const next of outgoing.get(target) ?? []) {
+        follow(next, nextCarrier);
+      }
+    };
+    follow(first, first);
+  };
+  for (const source of retained) {
+    for (const edge of outgoing.get(source) ?? []) {
+      trace(source, edge);
+    }
+  }
+  const systemFor = (id) => lineage(baseOccurrenceId(id), parentByChild).find((candidate) => elementHasType(elementsById.get(candidate), "SystemElement"));
+  for (const source of Object.keys(graph.elements)) {
+    if (retained.has(source) || (incoming.get(source)?.length ?? 0) > 0) {
+      continue;
+    }
+    for (const edge of outgoing.get(source) ?? []) {
+      const originSource = edge.edge.originSource ?? edge.edge.source;
+      const system = systemFor(originSource);
+      if (system === void 0) {
+        continue;
+      }
+      const placement = edge.edge.sourcePlacement ?? edge.edge.targetPlacement ?? edge.edge.projectionScope;
+      const occurrence = placement === void 0 ? system : `${system}@@${placement}`;
+      const logicalSource = retained.has(occurrence) ? occurrence : retained.has(system) ? system : void 0;
+      if (logicalSource !== void 0) {
+        trace(logicalSource, edge);
+      }
+    }
+  }
+  const projectedByLogicalEdge = /* @__PURE__ */ new Map();
+  for (const edge of graph.edges) {
+    const originSource = edge.edge.originSource;
+    const originTarget = edge.edge.originTarget;
+    if (edge.projected !== true || originSource === void 0 || originTarget === void 0) {
+      continue;
+    }
+    const projectionScope = edge.edge.projectionRoot ?? edge.edge.projectionScope ?? edge.edge.sourcePlacement ?? edge.edge.targetPlacement ?? "";
+    const key = `${originSource}\0${originTarget}\0${projectionScope}`;
+    const related = projectedByLogicalEdge.get(key) ?? [];
+    related.push(edge);
+    projectedByLogicalEdge.set(key, related);
+  }
+  for (const related of projectedByLogicalEdge.values()) {
+    const first = related[0];
+    const originSource = first.edge.originSource;
+    const originTarget = first.edge.originTarget;
+    const sourceSystem = systemFor(originSource);
+    const targetSystem = systemFor(originTarget);
+    if (sourceSystem === void 0 || targetSystem === void 0 || sourceSystem === targetSystem) {
+      continue;
+    }
+    const projectionEnvironment = first.edge.projectionRoot === void 0 ? void 0 : elementEnvironment(first.edge.projectionRoot, elementsById);
+    const occurrence = (system) => {
+      const relatedCandidates = related.flatMap((edge) => [edge.source, edge.target]).filter((id) => retained.has(id) && systemFor(id) === system);
+      const retainedCandidates = [...retained].filter((id) => systemFor(id) === system);
+      const candidates = [.../* @__PURE__ */ new Set([...relatedCandidates, ...retainedCandidates])];
+      if (projectionEnvironment !== void 0) {
+        return candidates.find((id) => deploymentOccurrenceEnvironment(id, elementsById) === projectionEnvironment) ?? candidates.find((id) => id === system);
+      }
+      return candidates[0];
+    };
+    const source = occurrence(sourceSystem);
+    const target = occurrence(targetSystem);
+    const relatedSimplifiedEdges = edges.filter(
+      (edge) => linkedEdgeHasProjectionOrigin(edge.edge, originSource, originTarget) && (edge.edge.projectionRoot ?? edge.edge.projectionScope ?? edge.edge.sourcePlacement ?? edge.edge.targetPlacement ?? "") === (first.edge.projectionRoot ?? first.edge.projectionScope ?? first.edge.sourcePlacement ?? first.edge.targetPlacement ?? "")
+    );
+    if (source === void 0 || target === void 0 || source === target || endpointsConnected(source, target, relatedSimplifiedEdges)) {
+      continue;
+    }
+    for (const carrier of related.filter((edge) => (edge.edge.attributes.model?.length ?? 0) > 0)) {
+      addFoldedViewEdge(edges, { ...carrier, source, target });
+    }
+  }
+  const environmentRootByContext = new Map(result.elements.filter((element) => element.synthetic !== true && element.parent === void 0 && elementHasType(element, "Environment")).map((element) => [element.context, element.id]));
+  const groupedEnvironmentsByElement = /* @__PURE__ */ new Map();
+  for (const group of graph.groups) {
+    const environment = elementEnvironment(group.owner, elementsById);
+    if (environment === void 0 || !environmentRootByContext.has(environment)) {
+      continue;
+    }
+    for (const id of group.elements) {
+      if (!retained.has(id)) {
+        continue;
+      }
+      const environments = groupedEnvironmentsByElement.get(id) ?? /* @__PURE__ */ new Set();
+      environments.add(environment);
+      groupedEnvironmentsByElement.set(id, environments);
+    }
+  }
+  const groupMembersByEnvironment = /* @__PURE__ */ new Map();
+  for (const id of retained) {
+    const element = elementsById.get(baseOccurrenceId(id)) ?? graph.elements[id];
+    const environments = new Set(groupedEnvironmentsByElement.get(id) ?? []);
+    const occurrenceEnvironment = deploymentOccurrenceEnvironment(id, elementsById);
+    if (occurrenceEnvironment !== void 0) {
+      environments.add(occurrenceEnvironment);
+    }
+    if (environments.size === 0 && elementHasType(element, "InfrastructureComponent") && environmentRootByContext.has(element?.context ?? "")) {
+      environments.add(element.context);
+    }
+    for (const environment of environments) {
+      const members = groupMembersByEnvironment.get(environment) ?? [];
+      members.push(id);
+      groupMembersByEnvironment.set(environment, members);
+    }
+  }
+  const groups = [...groupMembersByEnvironment].map(([environment, members]) => ({
+    owner: environmentRootByContext.get(environment) ?? environment,
+    elements: members
+  }));
+  return {
+    ...graph,
+    elements: Object.fromEntries(Object.entries(graph.elements).filter(([id]) => retained.has(id))),
+    edges,
+    groups,
+    externalElements: graph.externalElements.filter((id) => retained.has(id))
+  };
+}
+function linkedEdgeHasProjectionOrigin(edge, source, target) {
+  return edge.originSource === source && edge.originTarget === target || edge.projectionOrigins?.some((origin) => origin.source === source && origin.target === target) === true;
+}
+function endpointsConnected(source, target, edges) {
+  const neighbors = /* @__PURE__ */ new Map();
+  for (const edge of edges) {
+    const sourceNeighbors = neighbors.get(edge.source) ?? /* @__PURE__ */ new Set();
+    sourceNeighbors.add(edge.target);
+    neighbors.set(edge.source, sourceNeighbors);
+    const targetNeighbors = neighbors.get(edge.target) ?? /* @__PURE__ */ new Set();
+    targetNeighbors.add(edge.source);
+    neighbors.set(edge.target, targetNeighbors);
+  }
+  const pending = [source];
+  const visited = /* @__PURE__ */ new Set();
+  while (pending.length > 0) {
+    const current = pending.pop();
+    if (current === target) {
+      return true;
+    }
+    if (visited.has(current)) {
+      continue;
+    }
+    visited.add(current);
+    pending.push(...neighbors.get(current) ?? []);
+  }
+  return false;
+}
+function logicalRelationshipCarrier(current, candidate) {
+  const currentModel = current.edge.attributes.model;
+  const candidateModel = candidate.edge.attributes.model;
+  return (currentModel === void 0 || currentModel.length === 0) && candidateModel !== void 0 && candidateModel.length > 0 ? candidate : current;
+}
 function internalElements(result, rows, query) {
   const aliases = new Set(query.matches.flatMap(
     (match) => match.optional ? [] : patternNodeAliases(match.pattern)
@@ -39323,6 +39909,9 @@ function edgePropertyValue(relationship, name) {
   if (name === "context") {
     return relationship.context;
   }
+  if (name === "projectionRoot") {
+    return edge?.projectionRoot;
+  }
   const values = edge?.attributes[name];
   if (edge?.listAttributes?.includes(name) === true) {
     return values;
@@ -39364,11 +39953,16 @@ function collectGroupValue(groups, node, owner, label) {
     elements: [...elements]
   });
 }
-function collectSelectedReferenceGroups(selectedElements, groups, expression) {
+function collectSelectedReferenceGroups(selectedElements, selectedEdges, groups, expression) {
   const grouped = /* @__PURE__ */ new Set();
   if (expression.kind !== "property") {
     return grouped;
   }
+  for (const group of groups.values()) {
+    for (const element of group.elements) {
+      grouped.add(element);
+    }
+  }
   for (const element of selectedElements.values()) {
     if (element.referenceAttributes?.includes(expression.property) !== true) {
       continue;
@@ -39376,13 +39970,29 @@ function collectSelectedReferenceGroups(selectedElements, groups, expression) {
     const node = { kind: "element", id: element.id, element };
     const value = propertyValue(node, expression.property);
     const owners = Array.isArray(value) ? value : isQueryNode(value) ? [value.id] : [];
-    for (const owner of owners) {
+    const selectedOwners = expression.property === "runsOn" && owners.length > 1 ? [] : owners;
+    for (const owner of selectedOwners) {
       collectGroupValue(groups, node, owner, void 0);
       grouped.add(element.id);
     }
   }
+  for (const edge of selectedEdges) {
+    collectSelectedEdgePlacementGroup(selectedElements, groups, grouped, expression.property, edge.source, edge.edge.sourcePlacement);
+    collectSelectedEdgePlacementGroup(selectedElements, groups, grouped, expression.property, edge.target, edge.edge.targetPlacement);
+  }
   return grouped;
 }
+function collectSelectedEdgePlacementGroup(selectedElements, groups, grouped, propertyName, elementId, placement) {
+  if (placement === void 0) {
+    return;
+  }
+  const element = selectedElements.get(elementId);
+  if (element?.referenceAttributes?.includes(propertyName) !== true || element.attributes[propertyName]?.includes(placement) !== true) {
+    return;
+  }
+  collectGroupValue(groups, { kind: "element", id: element.id, element }, placement, void 0);
+  grouped.add(element.id);
+}
 function completeReferenceGroupClosure(result, groups, expression) {
   if (expression.kind !== "property") {
     return /* @__PURE__ */ new Set();
@@ -39800,11 +40410,13 @@ var BUILTIN_VIEW_QUERIES = {
   "c2": "MATCH (container:ContainerElement)\nWHERE container.sourceIdentity = $tab\nOPTIONAL MATCH (container)-[containerLink:REFERENCES {withDerived}]-(related:Element)\nWHERE related IS ContainerElement OR related IS SystemElement\nMATCH (boundaryContainer:ContainerElement)\nWHERE boundaryContainer = container OR boundaryContainer = related\nGROUP BY boundaryContainer.parent\nRETURN boundaryContainer, containerLink, related",
   "c3": "MATCH (container:ContainerElement)-[contains:CONTAINS]->(component:ComponentElement)\nWHERE container.sourceIdentity = $tab\nOPTIONAL MATCH (component)-[componentLink:REFERENCES {withDerived}]-(related:Element)\nWHERE related IS ComponentElement OR related IS ContainerElement OR related IS SystemElement\nGROUP BY component.parent\nRETURN component, componentLink, related",
   "c4": "MATCH (code:CodeElement)\nWHERE code.sourceIdentity = $tab\nOPTIONAL MATCH (code)-[link:REFERENCES]-(related:Element)\nWHERE related IS CodeElement OR related IS ComponentElement OR related IS ContainerElement OR related IS SystemElement\nGROUP BY code.parent\nRETURN code, link, related",
-  "deployment": "MATCH (node:Element)\nWHERE node.sourceIdentity = $tab\n  AND (node IS InfrastructureComponent\n    OR ((node IS ContainerElement OR node IS External) AND node.deployed = true))\nOPTIONAL MATCH (deploymentTarget:InfrastructureComponent)\nWHERE deploymentTarget IN node.uses OR deploymentTarget = node.runsOn\nOPTIONAL MATCH ROLLUP (node)-[projectedLink:REFERENCES {projected}]-(projectedPeer:Element)\nWHERE (projectedPeer IS InfrastructureComponent\n   OR (projectedPeer IS ContainerElement AND projectedPeer.deployed = true)\n   OR projectedPeer IS External)\n  AND projectedPeer.id <> node.id\nOPTIONAL MATCH (node)-[directDeploymentLink:REFERENCES]-(directDeploymentTarget:Element)\nWHERE node IS InfrastructureComponent\n  AND (directDeploymentTarget IS InfrastructureComponent OR directDeploymentTarget IS External)\nGROUP BY node.runsOn\nRETURN node, deploymentTarget, projectedLink, projectedPeer, directDeploymentLink, directDeploymentTarget"
+  "deployment-system": "MATCH (node:Element)\nWHERE node.sourceIdentity = $tab\n  AND (node IS InfrastructureComponent\n    OR node IS SystemElement\n    OR ((node IS ContainerElement OR node IS External) AND node.deployed = true))\n  AND node.id = node.id\nOPTIONAL MATCH (deploymentTarget:InfrastructureComponent)\nWHERE deploymentTarget IN node.uses OR deploymentTarget IN node.runsOn\nOPTIONAL MATCH ROLLUP (node)-[projectedLink:REFERENCES {projected}]-(projectedPeer:Element)\nWHERE (projectedPeer IS InfrastructureComponent\n   OR (projectedPeer IS ContainerElement AND projectedPeer.deployed = true)\n   OR projectedPeer IS SystemElement\n   OR projectedPeer IS External)\n  AND projectedPeer.id <> node.id\nOPTIONAL MATCH (node)-[directDeploymentLink:REFERENCES]-(directDeploymentTarget:Element)\nWHERE node IS InfrastructureComponent\n  AND (directDeploymentTarget IS InfrastructureComponent OR directDeploymentTarget IS External)\nGROUP BY node.runsOn\nRETURN node, deploymentTarget, projectedLink, projectedPeer, directDeploymentLink, directDeploymentTarget",
+  "deployment-container": "MATCH (node:Element)\nWHERE node.sourceIdentity = $tab\n  AND (node IS InfrastructureComponent\n    OR node IS SystemElement\n    OR ((node IS ContainerElement OR node IS External) AND node.deployed = true))\n  AND node.context = node.context\nOPTIONAL MATCH (deploymentTarget:InfrastructureComponent)\nWHERE deploymentTarget IN node.uses OR deploymentTarget IN node.runsOn\nOPTIONAL MATCH ROLLUP (node)-[projectedLink:REFERENCES {projected}]-(projectedPeer:Element)\nWHERE (projectedPeer IS InfrastructureComponent\n   OR (projectedPeer IS ContainerElement AND projectedPeer.deployed = true)\n   OR projectedPeer IS SystemElement\n   OR projectedPeer IS External)\n  AND projectedPeer.id <> node.id\nOPTIONAL MATCH (node)-[directDeploymentLink:REFERENCES]-(directDeploymentTarget:Element)\nWHERE node IS InfrastructureComponent\n  AND (directDeploymentTarget IS InfrastructureComponent OR directDeploymentTarget IS External)\nGROUP BY node.runsOn\nRETURN node, deploymentTarget, projectedLink, projectedPeer, directDeploymentLink, directDeploymentTarget",
+  "deployment": "MATCH (node:Element)\nWHERE node.sourceIdentity = $tab\n  AND (node IS InfrastructureComponent\n    OR ((node IS ContainerElement OR node IS External) AND node.deployed = true))\nOPTIONAL MATCH (deploymentTarget:InfrastructureComponent)\nWHERE deploymentTarget IN node.uses OR deploymentTarget IN node.runsOn\nOPTIONAL MATCH ROLLUP (node)-[projectedLink:REFERENCES {projected}]-(projectedPeer:Element)\nWHERE (projectedPeer IS InfrastructureComponent\n   OR (projectedPeer IS ContainerElement AND projectedPeer.deployed = true)\n   OR projectedPeer IS External)\n  AND projectedPeer.id <> node.id\nOPTIONAL MATCH (node)-[directDeploymentLink:REFERENCES]-(directDeploymentTarget:Element)\nWHERE node IS InfrastructureComponent\n  AND (directDeploymentTarget IS InfrastructureComponent OR directDeploymentTarget IS External)\nGROUP BY node.runsOn\nRETURN node, deploymentTarget, projectedLink, projectedPeer, directDeploymentLink, directDeploymentTarget"
 };
 
 // src/version.ts
-var version = "3.0.2";
+var version = "3.0.3";
 
 // src/index.ts
 var hiddenStructureTypes = /* @__PURE__ */ new Set(["List", "Nothing", "Text"]);
@@ -39860,6 +40472,9 @@ async function main() {
     case "structure":
       await runStructure(args);
       return;
+    case "environments":
+      await runEnvironments(args);
+      return;
     case "skill":
       await runSkill(args);
       return;
@@ -39945,8 +40560,38 @@ async function runStructure(args) {
   }
   await writeOutput(args.output, formatStructure(structure));
 }
-async function runSkill(args) {
-  if (args.skillAction !== "init") {
+async function runEnvironments(args) {
+  const project = await loadProject(projectPath(args));
+  if (hasErrors(project.diagnostics)) {
+    process.stderr.write(formatDiagnostics(project.diagnostics));
+    process.exitCode = 1;
+    return;
+  }
+  const source = args.tab === void 0 ? void 0 : selectedSource(project, args.tab, false, void 0);
+  const declared = declaredDeploymentEnvironments(project.result);
+  const declaredById = new Map(declared.map((environment) => [environment.id, environment]));
+  const environments = source === void 0 ? declared : discoverDeploymentEnvironments(project.result, { tab: source }).map((environment) => {
+    const declaration = declaredById.get(environment.id);
+    if (declaration === void 0) {
+      throw new CliError(`Environment '${environment.id}' is relevant to '${source}' but has no environment declaration`);
+    }
+    const name = environment.name ?? declaration.name;
+    return {
+      id: environment.id,
+      ...name === void 0 ? {} : { name },
+      source: declaration.source
+    };
+  });
+  const result = {
+    schemaVersion: "deployment-environments.v1",
+    source: source ?? null,
+    environments
+  };
+  const format = outputFormat(args.format, "text");
+  await writeOutput(args.output, format === "json" ? JSON.stringify(result, null, 2) : formatDeploymentEnvironments(result.environments));
+}
+async function runSkill(args) {
+  if (args.skillAction !== "init") {
     throw new CliError("Usage: archinsight skill init [project-dir] [--target generic|codex|claude] [--out dir] [--force]");
   }
   const target = skillTarget(args.target);
@@ -40046,13 +40691,70 @@ async function loadProject(input) {
   };
 }
 async function selectedGraph(project, args) {
-  const context = args.context ?? firstContext(project);
-  const tab = selectedSource(project, args.tab);
-  const view = args.view ?? (args.queryFile === void 0 ? "c1" : void 0);
-  const scope = { context, tab, ...view === void 0 ? {} : { view } };
+  const view = args.queryFile === void 0 ? args.view ?? "c1" : void 0;
   const query = args.queryFile === void 0 ? viewQueries[view ?? "c1"] : await readQueryFile(project.root, args.queryFile);
+  const queryNeedsTab = queryUsesVariable(query, "tab");
+  const queryNeedsContext = queryUsesVariable(query, "context");
+  const sourceRequired = view !== void 0 && view !== "c1" && view !== "no-filter" || queryNeedsTab;
+  const tab = selectedSource(project, args.tab, sourceRequired, view);
+  const context = selectedContext(project, args.context, tab, view !== void 0 || queryNeedsContext, view);
+  const environment = deploymentEnvironmentOption(project, args, tab, view);
+  const scope = {
+    ...context === void 0 ? {} : { context },
+    ...tab === void 0 ? {} : { tab },
+    ...view === void 0 ? {} : { view },
+    ...environment === void 0 ? {} : { environment }
+  };
   return selectGraph(project.result, scope, query);
 }
+function deploymentEnvironmentOption(project, args, tab, view) {
+  if (view !== "deployment-container") {
+    if (args.environment !== void 0) {
+      throw new CliError("Option '--environment' is supported only by the 'deployment-container' view");
+    }
+    return void 0;
+  }
+  if (tab === void 0) {
+    throw new CliError("View 'deployment-container' requires --source");
+  }
+  const environments = discoverDeploymentEnvironments(project.result, { tab });
+  if (args.environment !== void 0) {
+    if (!environments.some((candidate) => candidate.id === args.environment)) {
+      throw new CliError(`Environment '${args.environment}' is not relevant to '${tab}'. Available environments: ${environmentList(environments)}`);
+    }
+    return args.environment;
+  }
+  if (environments.length === 1) {
+    return environments[0].id;
+  }
+  if (environments.length === 0) {
+    throw new CliError(`No deployment environments are relevant to '${tab}'`);
+  }
+  throw new CliError(`View 'deployment-container' requires --environment. Available environments: ${environmentList(environments)}`);
+}
+function environmentList(environments) {
+  return environments.map(
+    (environment) => environment.name === void 0 || environment.name === environment.id ? environment.id : `${environment.id} (${environment.name})`
+  ).join(", ") || "none";
+}
+function declaredDeploymentEnvironments(result) {
+  return result.elements.filter((element) => element.synthetic !== true && element.parent === void 0 && (element.type === "Environment" || element.baseTypes.includes("Environment"))).map((element) => ({
+    id: element.context,
+    ...element.attributes.name?.[0] === void 0 ? {} : { name: element.attributes.name[0] },
+    source: element.sourceIdentity
+  })).sort(
+    (left, right) => (left.name ?? left.id).localeCompare(right.name ?? right.id) || left.id.localeCompare(right.id)
+  );
+}
+function formatDeploymentEnvironments(environments) {
+  if (environments.length === 0) {
+    return "";
+  }
+  return `${environments.map(
+    (environment) => `${environment.id}	${environment.name ?? ""}	${environment.source}`
+  ).join("\n")}
+`;
+}
 async function readQueryFile(projectRoot, queryFile) {
   const file = path.isAbsolute(queryFile) ? queryFile : path.resolve(projectRoot, queryFile);
   return readFile(file, "utf8");
@@ -40060,19 +40762,16 @@ async function readQueryFile(projectRoot, queryFile) {
 function projectPath(args) {
   return args.input ?? ".";
 }
-function firstContext(project) {
-  const context = project.result.contexts[0]?.id;
-  if (context === void 0) {
-    throw new CliError("No context found; pass --context explicitly after fixing diagnostics");
+function selectedSource(project, source, required, view) {
+  if (source === void 0 && project.sources.length === 1) {
+    return project.sources[0].sourceName;
   }
-  return context;
-}
-function firstTab(project) {
-  return project.sources[0]?.sourceName ?? "";
-}
-function selectedSource(project, source) {
   if (source === void 0) {
-    return firstTab(project);
+    if (required) {
+      const subject = view === void 0 ? "This query" : `View '${view}'`;
+      throw new CliError(`${subject} requires --source because it is scoped to a model file`);
+    }
+    return void 0;
   }
   const normalized = normalizeSourceName(project.root, source);
   if (project.sources.some((item) => item.sourceName === normalized)) {
@@ -40080,6 +40779,41 @@ function selectedSource(project, source) {
   }
   throw new CliError(`Source '${source}' is not part of project '${project.root}'`);
 }
+function selectedContext(project, explicitContext, source, required, view) {
+  const sourceContext = source === void 0 ? void 0 : project.result.contexts.find((context) => context.sourceIdentity === source);
+  if (sourceContext?.synthetic === true && required) {
+    throw new CliError(`Source '${source}' contains definitions and does not declare a renderable context or environment`);
+  }
+  if (view === "c1" && sourceContext !== void 0 && sourceContext.type !== "Context") {
+    throw new CliError(`Source '${source}' does not declare a logical context for the C1 view`);
+  }
+  const available = availableContextIds(project, view);
+  if (explicitContext !== void 0 && !available.includes(explicitContext)) {
+    throw new CliError(`Context '${explicitContext}' is not declared. Available contexts: ${available.join(", ") || "none"}`);
+  }
+  if (explicitContext !== void 0 && sourceContext?.synthetic !== true && sourceContext !== void 0 && sourceContext.id !== explicitContext) {
+    throw new CliError(`Context '${explicitContext}' conflicts with source '${source}', which declares context '${sourceContext.id}'`);
+  }
+  if (explicitContext !== void 0) {
+    return explicitContext;
+  }
+  if (sourceContext?.synthetic !== true && sourceContext !== void 0) {
+    return sourceContext.id;
+  }
+  if (!required) {
+    return void 0;
+  }
+  if (available.length === 1) {
+    return available[0];
+  }
+  throw new CliError(`Cannot infer context. Pass --source or --context. Available contexts: ${available.join(", ") || "none"}`);
+}
+function availableContextIds(project, view) {
+  return [...new Set(project.result.contexts.filter((context) => context.synthetic !== true && (view !== "c1" || context.type === "Context")).map((context) => context.id))].sort();
+}
+function queryUsesVariable(query, variable) {
+  return new RegExp(`\\$${variable}\\b`).test(query);
+}
 function normalizeSourceName(root, source) {
   const value = path.isAbsolute(source) ? path.relative(root, source) : source;
   return value.replaceAll("\\", "/").replace(/^\.\//, "");
@@ -40358,6 +41092,7 @@ function parseArgs(argv) {
     context: stringOption(options.context),
     tab: stringOption(options.tab),
     view: viewOption(options.view),
+    environment: stringOption(options.environment),
     queryFile: stringOption(options.query),
     output: stringOption(options.output),
     format: stringOption(options.format),
@@ -40377,6 +41112,8 @@ function optionKey(arg) {
     "-s": "tab",
     "--view": "view",
     "-v": "view",
+    "--environment": "environment",
+    "-e": "environment",
     "--query": "query",
     "-q": "query",
     "--out": "output",
@@ -40389,7 +41126,7 @@ function optionKey(arg) {
   }[arg];
 }
 function command(value) {
-  if (value === "link" || value === "render" || value === "query" || value === "structure" || value === "skill") {
+  if (value === "link" || value === "render" || value === "query" || value === "structure" || value === "environments" || value === "skill") {
     return value;
   }
   if (value === void 0) {
@@ -40425,7 +41162,7 @@ function viewOption(value) {
   if (value === void 0) {
     return void 0;
   }
-  if (value === "c1" || value === "c2" || value === "c3" || value === "c4" || value === "deployment" || value === "no-filter") {
+  if (value === "c1" || value === "c2" || value === "c3" || value === "c4" || value === "deployment" || value === "deployment-system" || value === "deployment-container" || value === "no-filter") {
     return value;
   }
   throw new CliError(`Unknown view '${String(value)}'`);
@@ -40463,17 +41200,19 @@ function helpText() {
 
 Usage:
   archinsight link [project-dir] [--format text|json] [--out file]
-  archinsight render [project-dir] -c <context> [-s <source>] [-v c1|c2|c3|c4|deployment|no-filter] [-q query.aiq] [-f dot|svg|json] [-o file]
-  archinsight query [project-dir] -c <context> [-s <source>] [-v c1|c2|c3|c4|deployment|no-filter] [-q query.aiq] [-f text|json] [-o file]
+  archinsight render [project-dir] [-s <source>] [-c <context>] [-v c1|c2|c3|c4|deployment-system|deployment-container|deployment|no-filter] [-e <environment>] [-q query.aiq] [-f dot|svg|json] [-o file]
+  archinsight query [project-dir] [-s <source>] [-c <context>] [-v c1|c2|c3|c4|deployment-system|deployment-container|deployment|no-filter] [-e <environment>] [-q query.aiq] [-f text|json] [-o file]
   archinsight structure [project-dir] [--format text|json] [--out file]
+  archinsight environments [project-dir] [-s <source>] [--format text|json] [--out file]
   archinsight skill init [project-dir] [--target generic|codex|claude] [--out dir] [--force]
 
 Options:
   project-dir             Project directory to scan recursively, default: current directory.
-  -c, --context <id>       Context id for query/render.
-  -s, --source <file>      Selected project file for queries using $tab.
+  -s, --source <file>      Selected model file. Supplies $tab and infers its context.
+  -c, --context <id>       Context for context-wide execution without --source; must match it when both are passed.
       --tab <source>       Backward-compatible alias for --source.
-  -v, --view <name>        Built-in view: c1, c2, c3, c4, deployment, no-filter.
+  -v, --view <name>        Built-in view: c1, c2, c3, c4, deployment-system, deployment-container, deployment, no-filter.
+  -e, --environment <id>   Environment scope for deployment-container; optional when exactly one is relevant.
   -q, --query <file>       Query file; overrides --view.
   -f, --format <format>    Output format.
   -o, --out <file>         Write output to file instead of stdout; for skill init, write the guide directory.
@@ -40483,6 +41222,16 @@ Options:
   -V, --version            Print version.
   -h, --help               Show help.
 
+Scope:
+  C1 and no-filter accept either --source or --context. C2-C4 and Deployment
+  views require --source unless project-dir is one .ai file. Source-scoped
+  commands infer context from that file. D2 additionally requires --environment
+  when more than one environment is relevant.
+
+Environment discovery:
+  environments lists every declared environment. With --source, it returns only
+  the environments relevant to that source for the D2 view.
+
 Diagnostics text format is TSV:
   level<TAB>code<TAB>source<TAB>line<TAB>column<TAB>message
 `;
@@ -40622,10 +41371,12 @@ function sharedSkillFiles() {
       path: "examples/c2-containers.ai",
       content: genericC2ContainersExample()
     },
+    ...genericC2FileSplitExampleFiles(),
     {
       path: "examples/c3-components.ai",
       content: genericC3ComponentsExample()
     },
+    ...genericC3FileSplitExampleFiles(),
     ...genericC4CodeExampleFiles(),
     {
       path: "examples/deployment-framework.ai",
@@ -40665,6 +41416,14 @@ function sharedSkillFiles() {
       path: "examples/builtin-views/c4.aiq",
       content: textFileContent(viewQueries.c4)
     },
+    {
+      path: "examples/builtin-views/deployment-system.aiq",
+      content: textFileContent(viewQueries["deployment-system"])
+    },
+    {
+      path: "examples/builtin-views/deployment-container.aiq",
+      content: textFileContent(viewQueries["deployment-container"])
+    },
     {
       path: "examples/builtin-views/deployment.aiq",
       content: textFileContent(viewQueries.deployment)
@@ -40677,6 +41436,14 @@ function sharedSkillFiles() {
       path: "examples/queries/direct-service-dependencies.aiq",
       content: genericDirectServiceDependenciesQuery()
     },
+    {
+      path: "examples/queries/direct-authored-dependencies.aiq",
+      content: genericDirectAuthoredDependenciesQuery()
+    },
+    {
+      path: "examples/queries/async-topic-dependencies.aiq",
+      content: genericAsyncTopicDependenciesQuery()
+    },
     {
       path: "examples/queries/kafka-service-dependencies.aiq",
       content: genericKafkaServiceDependenciesQuery()
@@ -40986,11 +41753,11 @@ archinsight link . --format text
 archinsight structure . --format text
 \`\`\`
 
-If rendering is needed, ask for the context id and source file when they are not
-obvious:
+If rendering is needed, ask for the source file when it is not obvious. The CLI
+infers the context declared by that source:
 
 \`\`\`shell
-archinsight render . -c <context-id> -s <source.ai> -v c2 -f svg -o diagram.svg
+archinsight render . -s <source.ai> -v c2 -f svg -o diagram.svg
 \`\`\`
 
 Report diagnostics by source, line, column, and message. Avoid rewriting large
@@ -41086,6 +41853,50 @@ Never update a generated skill by running plain \`skill init\` repeatedly or by
 copying only the files that happen to be missing. Regenerate the entire package
 with the installed CLI, then restart the agent session when its runtime discovers
 skills only at startup.
+
+## Query and Render Scope
+
+Use the model source as the normal diagram entry point:
+
+\`\`\`shell
+archinsight query . -s <source.ai> -v c2 --format json
+archinsight render . -s <source.ai> -v c2 -f svg -o diagram.svg
+\`\`\`
+
+The selected source supplies \`$tab\` and determines \`$context\`. C2, C3, C4,
+D1 (\`deployment-system\`), D2 (\`deployment-container\`), and the legacy
+Deployment view require a source when a project contains several model files.
+When the command input is one \`.ai\` file, the CLI selects it automatically.
+
+C1 opens the complete context boundary declared by the selected source. For a
+context-wide C1 or \`no-filter\` query without a source, pass
+\`--context <context-id>\` instead. If both \`--source\` and \`--context\` are
+present, they must resolve to the same context; the context does not override
+the source.
+
+A custom query file overrides \`--view\`. Pass \`--source\` when it uses
+\`$tab\`; the same source also supplies \`$context\`. A query that uses only
+\`$context\` may use an explicit \`--context\` without a source.
+
+D1 spans every environment relevant to the selected source and rejects
+\`--environment\`. D2 selects the only relevant environment automatically. If
+several are relevant, pass one of the ids reported by the CLI with
+\`--environment <id>\`.
+
+Discover environments through the linked model instead of parsing Insight
+sources:
+
+\`\`\`shell
+archinsight environments . --format json
+archinsight environments . -s <source.ai> --format json
+\`\`\`
+
+The first command returns every declared environment. The source-scoped command
+returns exactly the environments relevant to that source's D2 view. Its JSON
+uses schema \`deployment-environments.v1\` and contains the selected \`source\`
+plus \`environments\` entries with \`id\`, optional \`name\`, and the source file
+that declares the environment. Use this command before choosing D2
+\`--environment\`; do not scan source text to reconstruct the list.
 `;
 }
 function genericModelingReference() {
@@ -41240,12 +42051,11 @@ Deployment view. The wire must select an environment slot whose concrete value
 has a projection.
 
 A wire can use only a \`NetworkConnection\` descendant. The built-in \`Broker\`
-is an \`InfrastructureComponent\`, so it remains useful as inventory but cannot
-be selected directly by wire \`uses\`. When the broker belongs on the physical
-path, define a project-specific \`NetworkConnection\` such as an event channel,
-place the \`Broker\` behind one of its attributes, and project through it. Read
-the complete [Broker](deployment-projections.md#broker) example before modeling
-that path.
+is one, so an environment can expose a \`Broker\` slot directly and a wire can
+select it with \`uses\`. Derive product-specific types such as Kafka or RabbitMQ
+from \`Broker\`, then put the physical path projection on the concrete broker
+instance. Read the complete [Broker](deployment-projections.md#broker) example
+before modeling that path.
 
 If the chosen style is pragmatic mixed C2, a broker-like node can be acceptable,
 but document that the view mixes levels. If the producer or consumer is not
@@ -41613,7 +42423,7 @@ An explicit assignment on an instance replaces the constructor default.
 ### Object-valued attributes
 
 A named object attribute supports a full named declaration, a full anonymous
-declaration, or a shortened declaration when exactly one constructor is valid:
+declaration, or a shortened declaration whose constructor can be inferred:
 
 \`\`\`insight
 config:
@@ -41628,8 +42438,10 @@ config:
 
 Use a named id when another declaration must reference the nested object. The
 \`_\` form creates an anonymous instance. The shortened form infers both its
-constructor and anonymous identity and is rejected when construction is
-ambiguous.
+constructor and anonymous identity. A constructor declared directly by the
+attribute type takes precedence over constructors inherited through descendant
+types. Without a direct constructor, more than one compatible descendant makes
+the shortened form ambiguous.
 
 ## Attributes
 
@@ -41694,7 +42506,7 @@ links:
         technology = HTTPS, JSON
         call = POST /checkout
         description = Places an order
-    ~> order_events
+    ~> order_service
         technology = Kafka
         via = orders.created
         description = Consumes order events
@@ -42062,7 +42874,7 @@ is about boundaries and responsibilities, not implementation structure.
 4. Add \`external system\` declarations for dependencies outside the boundary.
 5. Add high-level links that explain business or capability flow.
 6. Validate with \`archinsight link . --format text\`.
-7. Render with \`archinsight render . -c <context-id> -v c1 -f svg -o c1.svg\`.
+7. Render with \`archinsight render . -s <c1-source.ai> -v c1 -f svg -o c1.svg\`.
 
 ## Boundary Choices
 
@@ -42247,13 +43059,60 @@ external system analytics_platform
 \`\`\`shell
 archinsight structure . --format text
 archinsight link . --format text
-archinsight render . -c commerce -v c1 -f svg -o commerce-c1.svg
+archinsight render . -s c1-context.ai -v c1 -f svg -o commerce-c1.svg
 \`\`\`
 
 Use \`examples/c1-context.ai\` as a compact valid C1 model when syntax is
 unclear.
 `;
 }
+function genericC2FileSplitExampleFiles() {
+  return [
+    {
+      path: "examples/c2-file-split/context.ai",
+      content: `context commerce
+    name = Commerce Platform
+
+external system payment_provider
+    name = Payment Provider
+    technology = HTTPS API
+
+system storefront
+    name = Storefront
+    technology = Commerce system
+    description = Lets shoppers browse products and place orders
+`
+    },
+    {
+      path: "examples/c2-file-split/storefront.ai",
+      content: `context commerce
+
+import payment_provider from context commerce
+
+extend system storefront
+    container web_app
+        name = Web app
+        technology = SvelteKit, TypeScript
+        description = Renders product pages and checkout screens
+        links:
+            -> checkout_api
+                technology = HTTPS, JSON
+                call = POST /checkout
+                description = Starts checkout and shows order status
+
+    service checkout_api
+        name = Checkout API
+        technology = Kotlin, PostgreSQL
+        description = Prices carts, creates orders, and coordinates payment
+        links:
+            -> payment_provider
+                technology = HTTPS
+                call = POST /payments/authorizations
+                description = Requests payment authorization
+`
+    }
+  ];
+}
 function genericC2ContainersReference() {
   return `# C2 Containers and Services
 
@@ -42301,58 +43160,32 @@ because one system needs that style.
 1. Run \`archinsight structure . --format text\` to find the exact system id,
    existing containers/services, and external declarations.
 2. Create or edit a C2 file in the same \`context <id>\`.
-3. Import external systems from other contexts when needed.
+3. Import every referenced declaration owned by another source, including a
+   declaration in another file of the same context.
 4. Add \`container\` or \`service\` declarations for the system's logical runtime
    units, choosing the word that best communicates each unit's role.
 5. Add runtime links between containers/services and real external systems.
 6. Validate with \`archinsight link . --format text\`.
-7. Render with \`archinsight render . -c <context-id> -s <c2-file.ai> -v c2 -f svg -o c2.svg\`.
+7. Render with \`archinsight render . -s <c2-file.ai> -v c2 -f svg -o c2.svg\`.
 
 ## File Split Pattern
 
 Keep C1 focused on the system boundary:
 
 \`\`\`insight
-context commerce
-    name = Commerce Platform
-
-external system payment_provider
-    name = Payment Provider
-    technology = HTTPS API
-
-system storefront
-    name = Storefront
-    technology = Commerce system
-    description = Lets shoppers browse products and place orders
+${genericC2FileSplitExampleFiles()[0].content.trimEnd()}
 \`\`\`
 
 Put C2 details in a system file:
 
 \`\`\`insight
-context commerce
-
-extend system storefront
-    container web_app
-        name = Web app
-        technology = SvelteKit, TypeScript
-        description = Renders product pages and checkout screens
-        links:
-            -> checkout_api
-                technology = HTTPS, JSON
-                call = POST /checkout
-                description = Starts checkout and shows order status
-
-    service checkout_api
-        name = Checkout API
-        technology = Kotlin, PostgreSQL
-        description = Prices carts, creates orders, and coordinates payment
-        links:
-            -> payment_provider
-                technology = HTTPS
-                call = POST /payments/authorizations
-                description = Requests payment authorization
+${genericC2FileSplitExampleFiles()[1].content.trimEnd()}
 \`\`\`
 
+The extension target is resolved in the shared context and does not need an
+import. The ordinary reference to \`payment_provider\` crosses a source boundary,
+so the C2 file imports it even though both files use \`context commerce\`.
+
 ## Frontend and Backend Pattern
 
 Use \`container\` when "application" or "executable unit" best communicates the
@@ -42499,55 +43332,18 @@ not compete with a broad duplicate.
 \`\`\`shell
 archinsight structure . --format text
 archinsight link . --format text
-archinsight render . -c commerce -s storefront-containers.ai -v c2 -f svg -o storefront-c2.svg
+archinsight render . -s storefront-containers.ai -v c2 -f svg -o storefront-c2.svg
 \`\`\`
 
 Use \`examples/c2-containers.ai\` as a compact valid C2 model when syntax is
 unclear.
 `;
 }
-function genericC3ComponentsReference() {
-  return `# C3 Components
-
-Use this reference only for C3 work: decomposing one selected container or
-service into internal components and their collaborations.
-
-## What C3 Answers
-
-A C3 view answers: "Inside this container/service, what named responsibilities
-collaborate to deliver its behavior?"
-
-Prefer one focal container or service per C3 source file. The built-in C3 view
-is scoped by the selected source file, so the C3 file should usually contain an
-\`extend container <id>\` or \`extend service <id>\` block for the focal element.
-
-If the selected source opens several containers or services, components inside
-all of them are internal to one diagram. A dependency leaving that set is
-folded to the nearest closed container or service and shown as external to the
-C3 view.
-
-Do not model every class, function, method, or package. A component should be a
-stable architectural responsibility that is useful in a diagram and review.
-
-## C3 Workflow
-
-1. Run \`archinsight structure . --format text\` to find the exact container or
-   service id, available constructors, and existing imports.
-2. Create or edit a C3 file in the same \`context <id>\`.
-3. Import elements from other contexts only when the component links to them.
-4. Use \`extend container <id>\` or \`extend service <id>\`.
-5. Add \`component\` declarations with \`name\`, \`technology\`, and
-   \`responsibility\`.
-6. Add links between components and to real external endpoints.
-7. Validate with \`archinsight link . --format text\`.
-8. Render with \`archinsight render . -c <context-id> -s <c3-file.ai> -v c3 -f svg -o c3.svg\`.
-
-## File Split Pattern
-
-Keep the C2 declaration small:
-
-\`\`\`insight
-context commerce
+function genericC3FileSplitExampleFiles() {
+  return [
+    {
+      path: "examples/c3-file-split/system.ai",
+      content: `context commerce
     name = Commerce Platform
 
 external system payment_provider
@@ -42557,16 +43353,21 @@ external system payment_provider
 system storefront
     name = Storefront
 
+    container web_app
+        name = Web app
+        technology = SvelteKit, TypeScript
+
     service checkout_api
         name = Checkout API
         technology = Kotlin, PostgreSQL
         description = Handles cart pricing, order placement, and payment orchestration
-\`\`\`
+`
+    },
+    {
+      path: "examples/c3-file-split/checkout-components.ai",
+      content: `context commerce
 
-Put component details in a C3 file:
-
-\`\`\`insight
-context commerce
+import payment_provider from context commerce
 
 extend service checkout_api
     component checkout_controller
@@ -42598,15 +43399,13 @@ extend service checkout_api
         name = Order repository
         technology = SQL
         responsibility = Persists order state and checkout audit records
-\`\`\`
-
-## Frontend Container Pattern
-
-Use C3 for UI responsibilities when the frontend container has distinct
-architectural parts:
+`
+    },
+    {
+      path: "examples/c3-file-split/web-components.ai",
+      content: `context commerce
 
-\`\`\`insight
-context commerce
+import checkout_api from context commerce
 
 extend container web_app
     component route_shell
@@ -42637,8 +43436,77 @@ extend container web_app
             -> checkout_api
                 technology = HTTPS, JSON
                 call = POST /checkout
+`
+    }
+  ];
+}
+function genericC3ComponentsReference() {
+  return `# C3 Components
+
+Use this reference only for C3 work: decomposing one selected container or
+service into internal components and their collaborations.
+
+## What C3 Answers
+
+A C3 view answers: "Inside this container/service, what named responsibilities
+collaborate to deliver its behavior?"
+
+Prefer one focal container or service per C3 source file. The built-in C3 view
+is scoped by the selected source file, so the C3 file should usually contain an
+\`extend container <id>\` or \`extend service <id>\` block for the focal element.
+
+If the selected source opens several containers or services, components inside
+all of them are internal to one diagram. A dependency leaving that set is
+folded to the nearest closed container or service and shown as external to the
+C3 view.
+
+Do not model every class, function, method, or package. A component should be a
+stable architectural responsibility that is useful in a diagram and review.
+
+## C3 Workflow
+
+1. Run \`archinsight structure . --format text\` to find the exact container or
+   service id, available constructors, and existing imports.
+2. Create or edit a C3 file in the same \`context <id>\`.
+3. Import every referenced declaration owned by another source, including a
+   declaration in another file of the same context.
+4. Use \`extend container <id>\` or \`extend service <id>\`.
+5. Add \`component\` declarations with \`name\`, \`technology\`, and
+   \`responsibility\`.
+6. Add links between components and to real external endpoints.
+7. Validate with \`archinsight link . --format text\`.
+8. Render with \`archinsight render . -s <c3-file.ai> -v c3 -f svg -o c3.svg\`.
+
+## File Split Pattern
+
+Keep the C2 declaration small:
+
+\`\`\`insight
+${genericC3FileSplitExampleFiles()[0].content.trimEnd()}
+\`\`\`
+
+Put component details in a C3 file:
+
+\`\`\`insight
+${genericC3FileSplitExampleFiles()[1].content.trimEnd()}
 \`\`\`
 
+The extension target is resolved in the shared context without an import.
+\`payment_provider\` is an ordinary cross-source reference and therefore has an
+explicit same-context import.
+
+## Frontend Container Pattern
+
+Use C3 for UI responsibilities when the frontend container has distinct
+architectural parts:
+
+\`\`\`insight
+${genericC3FileSplitExampleFiles()[2].content.trimEnd()}
+\`\`\`
+
+Here \`checkout_api\` is declared in the system file, so the frontend component
+file imports it before creating the cross-container link.
+
 This is useful when frontend structure affects architecture. If the frontend is
 only a thin page with no meaningful internal decisions, leave it at C2.
 
@@ -42804,7 +43672,7 @@ declaration. Keep a broader wire only when it describes a different interaction.
 \`\`\`shell
 archinsight structure . --format text
 archinsight link . --format text
-archinsight render . -c commerce -s checkout_components.ai -v c3 -f svg -o checkout-c3.svg
+archinsight render . -s checkout_components.ai -v c3 -f svg -o checkout-c3.svg
 \`\`\`
 
 Use \`examples/c3-components.ai\` as a compact valid C3 model when syntax is
@@ -42906,13 +43774,13 @@ different type filter or grouping rule.
 
 \`\`\`shell
 archinsight link . --format text
-archinsight query . -c <context-id> -s <code-source.ai> -v c4 --format json
-archinsight render . -c <context-id> -s <code-source.ai> -v c4 -f svg -o code.svg
+archinsight query . -s <code-source.ai> -v c4 --format json
+archinsight render . -s <code-source.ai> -v c4 -f svg -o code.svg
 \`\`\`
 
 Use the self-contained \`examples/c4-code\` project when the syntax for a code
-framework or model is unclear. Deployment is a separate view selected with
-\`--view deployment\`; never use C4 as an alias for Deployment.
+framework or model is unclear. Deployment is a separate view family selected
+with \`--view deployment-system\` or \`--view deployment-container\`; never use C4 as an alias for Deployment.
 `;
 }
 function genericDeploymentReference() {
@@ -42923,10 +43791,34 @@ logical elements run, which infrastructure they use, and how their wires pass
 through the physical world. Keep C1-C4 logical; deployment inventory and
 projections supply the physical view.
 
-The built-in Deployment view includes a logical element only when its deployment
-resolves at least one \`runsOn\` or \`uses\` infrastructure object. A logical wire
-appears only through physical edges created by its deployment projection. A
-plain logical wire is intentionally omitted from Deployment.
+The built-in Deployment views include a placed logical element when its deployment
+resolves at least one \`runsOn\` or \`uses\` infrastructure object. An unplaced
+system or actor can remain visible as an endpoint of a projected wire; wire
+infrastructure supplies the relevant environments when the selected source has
+no placements of its own. A logical wire appears only through physical edges
+created by its deployment projection. A plain logical wire is intentionally
+omitted from Deployment.
+
+Use \`deployment-system\` (D1) for a system-level overview across the environments
+relevant to the selected source. It folds deployed containers and services into
+their owning systems, contracts internal infrastructure paths, and retains the
+external integrations reached in each environment. Use \`deployment-container\`
+(D2) to inspect containers, services, and physical infrastructure in one
+environment. Pass \`--environment <id>\` when several environments are relevant;
+the CLI selects the environment automatically when there is only one. The older
+\`deployment\` view keeps the complete all-environment container graph for
+backward compatibility.
+
+Obtain the available D2 choices from the linked model:
+
+\`\`\`shell
+archinsight environments . -s <logical-source.ai> --format json
+\`\`\`
+
+Read the ids from \`environments\` and pass the selected id to
+\`deployment-container --environment <id>\`. Run the command without
+\`--source\` only when the task needs the complete environment inventory rather
+than the choices relevant to one logical source.
 
 Model the infrastructure immediately relevant to those logical elements and
 connections. Do not expand a Deployment view into a complete provider, transit, replication,
@@ -42970,6 +43862,13 @@ The built-in Deployment view renders concrete \`InfrastructureComponent\`
 instances. A \`Deployment\` object organizes the inventory and is not itself a
 physical node, so projected relationships do not roll up to that owner.
 
+When one logical element resolves to several concrete compute placements,
+Deployment query output creates one visible occurrence per selected placement.
+Occurrence ids use \`<logical-id>@@<compute-id>\`, and their \`projectedFrom\`
+attribute retains the logical id. Projected edges connect the matching source
+and target occurrences. A graph whose logical elements all have one placement
+keeps their ordinary ids.
+
 ## Framework and inventory
 
 Define the available slots on an environment type:
@@ -43121,10 +44020,11 @@ service frontend
 \`\`\`
 
 Do not attach \`DeploymentProfile\`, \`runsOn\`, \`Storage\`, \`Compute\`, or another
-non-network infrastructure type to a wire. In particular, ingress, egress,
-service-mesh, VPN, and broker paths used by wires must inherit
-\`NetworkConnection\`. Read \`references/deployment-projections.md\` before
-defining the concrete path or placing a built-in broker on that path.
+non-network infrastructure type to a wire. Ingress, egress, service-mesh, and
+VPN path types used by wires must inherit \`NetworkConnection\`. The built-in
+\`Broker\` already does; derive product-specific broker types from \`Broker\` and
+place their projection on the concrete instance. Read
+\`references/deployment-projections.md\` before defining the physical path.
 
 For each relevant concrete deployment, the linker checks the requested slot:
 
@@ -43179,8 +44079,9 @@ Run:
 
 \`\`\`shell
 archinsight link . --format text
-archinsight query . -c <context> -s <logical-source.ai> -v deployment --format json
-archinsight render . -c <context> -s <logical-source.ai> -v deployment -f svg -o deployment.svg
+archinsight query . -s <logical-source.ai> -v deployment-system --format json
+archinsight query . -s <logical-source.ai> -v deployment-container --environment <environment> --format json
+archinsight render . -s <logical-source.ai> -v deployment-container --environment <environment> -f svg -o deployment.svg
 \`\`\`
 
 A clean link proves that syntax, types, imports, and deployment references are
@@ -43242,14 +44143,13 @@ define type PublicGateway of NetworkConnection
     required InfrastructureComponent cdn
     required InfrastructureComponent loadBalancer
 
-define type EventChannel of NetworkConnection
-    constructor eventChannel
-    required Broker transport
+define type KafkaBroker of Broker
+    constructor kafka
 
 extend type Environment
     Compute compute
     Storage storage
-    EventChannel events
+    Broker events
     PublicGateway publicGateway
     NetworkConnection network
 \`\`\`
@@ -43266,16 +44166,13 @@ deployment production
             name = ECS
             technology = AWS ECS
     events:
-        eventChannel event_bus
-            name = Event bus
-            transport:
-                broker kafka
-                    name = Kafka
-                    technology = MSK
-                    address = kafka.prod.eu.internal
+        kafka event_bus
+            name = Kafka
+            technology = MSK
+            address = kafka.prod.eu.internal
             projection:
-                target $to connectTo target transport
-                target transport originalLink source $from
+                target $to connectTo target $this
+                target $this originalLink source $from
 \`\`\`
 
 \`\`\`insight
@@ -43292,7 +44189,8 @@ System files in the same logical context should import the context-owned profile
 when it is declared in a different source identity. Wires name compatible
 \`NetworkConnection\` slots directly. Read the
 [Broker](deployment-projections.md#broker) example before adding an event path;
-a built-in \`Broker\` inventory value cannot itself fill a wire-facing slot.
+the built-in \`Broker\` can fill a wire-facing slot directly, and
+product-specific broker types should derive from it.
 
 ## System Files and External Contexts
 
@@ -43444,8 +44342,9 @@ Deployment output after changing which root a traffic relationship extends:
 
 \`\`\`shell
 archinsight link . --format text
-archinsight query . -c deployment_shop -s deployment.ai -v deployment --format json
-archinsight render . -c deployment_shop -s deployment.ai -v deployment -f svg -o deployment.svg
+archinsight query . -s deployment.ai -v deployment-system --format json
+archinsight query . -s deployment.ai -v deployment-container --environment eu --format json
+archinsight render . -s deployment.ai -v deployment-container --environment eu -f svg -o deployment.svg
 \`\`\`
 
 If projected infrastructure edges disappear after a split, first check whether
@@ -43624,9 +44523,12 @@ sed -n '1,160p' .core/core_system.ai
 \`\`\`insight
 define type System of SystemElement
     constructor system
+        kind = internal
 
     required Text name
+    required Text kind
     Text technology
+    Text description
     List of Wire links
     List of Container _
 \`\`\`
@@ -43636,6 +44538,8 @@ Interpretation:
 - \`define type System of SystemElement\` means \`System\` inherits from
   \`SystemElement\`.
 - \`constructor system\` means \`system <id>\` is valid syntax for that type.
+- The constructor assigns \`kind = internal\`, so model authors do not repeat the
+  built-in default on every system.
 - \`required Text name\` means \`name = ...\` is required.
 - \`Text technology\` means \`technology = ...\` is optional.
 - \`List of Wire links\` enables a \`links:\` block whose children are wires.
@@ -43661,8 +44565,9 @@ C4 query.
   \`description\`, plus deployment references.
 - \`Storage\` / constructor \`storage\`: for databases, buckets, volumes, and
   other stateful stores.
-- \`Broker\` / constructor \`broker\`: for message brokers and event buses;
-  adds optional \`address\`.
+- \`Broker\` / constructor \`broker\`: a \`NetworkConnection\` specialization
+  for message brokers and event buses; adds optional \`address\` and can carry
+  a projected logical wire.
 - \`Compute\` / constructor \`compute\`: for runtimes, clusters, nodes, and
   platforms; adds optional \`address\` and can contain nested infrastructure
   components in a \`components:\` block.
@@ -43903,28 +44808,30 @@ Inspect the selected graph before rendering whenever a change affects C2, C3,
 C4, Deployment, projections, or query text:
 
 \`\`\`shell
-archinsight query . -c <context-id> -s <source.ai> -v c2 --format json
-archinsight query . -c <context-id> -s <source.ai> -v c3 --format json
-archinsight query . -c <context-id> -s <source.ai> -v c4 --format json
-archinsight query . -c <context-id> -s <source.ai> -v deployment --format json
+archinsight query . -s <source.ai> -v c2 --format json
+archinsight query . -s <source.ai> -v c3 --format json
+archinsight query . -s <source.ai> -v c4 --format json
+archinsight query . -s <source.ai> -v deployment-system --format json
+archinsight query . -s <source.ai> -v deployment-container --environment <environment> --format json
 \`\`\`
 
-Then render the same context, source, and view:
+Then render the same source and view; the source carries the same context:
 
 \`\`\`shell
-archinsight render . -c <context-id> -v c1 -f svg -o diagram.svg
-archinsight render . -c <context-id> -s <source.ai> -v c2 -f svg -o diagram.svg
-archinsight render . -c <context-id> -s <source.ai> -v c3 -f svg -o diagram.svg
-archinsight render . -c <context-id> -s <source.ai> -v c4 -f svg -o diagram.svg
-archinsight render . -c <context-id> -s <source.ai> -v deployment -f svg -o diagram.svg
+archinsight render . -s <source.ai> -v c1 -f svg -o diagram.svg
+archinsight render . -s <source.ai> -v c2 -f svg -o diagram.svg
+archinsight render . -s <source.ai> -v c3 -f svg -o diagram.svg
+archinsight render . -s <source.ai> -v c4 -f svg -o diagram.svg
+archinsight render . -s <source.ai> -v deployment-system -f svg -o deployment-system.svg
+archinsight render . -s <source.ai> -v deployment-container --environment <environment> -f svg -o deployment-container.svg
 \`\`\`
 
 Run a custom query from a file:
 
 \`\`\`shell
-archinsight query . -c <context-id> -s <source.ai> -q query.aiq -f text
-archinsight query . -c <context-id> -s <source.ai> -q query.aiq -f json
-archinsight render . -c <context-id> -s <source.ai> -q query.aiq -f svg -o diagram.svg
+archinsight query . -s <source.ai> -q query.aiq -f text
+archinsight query . -s <source.ai> -q query.aiq -f json
+archinsight render . -s <source.ai> -q query.aiq -f svg -o diagram.svg
 \`\`\`
 
 Use three validation layers:
@@ -43945,12 +44852,17 @@ Useful built-in views:
 - \`c2\` for containers/services in the selected source.
 - \`c3\` for components in the selected source.
 - \`c4\` for project-defined code elements in the selected source.
-- \`deployment\` for deployment-oriented views.
+- \`deployment-system\` for the D1 system deployment overview across relevant
+  environments.
+- \`deployment-container --environment <id>\` for D2 physical detail in one
+  environment.
+- \`deployment\` only when an all-environment container graph is intentionally
+  required for backward compatibility or analysis.
 - \`no-filter\` for the full context.
 
-C2, C3, C4, Deployment, and custom queries often depend on the active file. Pass
-\`--source <file>\` / \`-s <file>\` whenever the query uses \`$tab\`; otherwise
-the CLI may choose the first source and render a valid but wrong view.
+C2, C3, C4, Deployment, and custom queries that use \`$tab\` depend on the
+active file. Pass \`--source <file>\` / \`-s <file>\`; the CLI will not guess
+between several project files. That source also supplies \`$context\`.
 
 The bundled \`examples\` directory contains several independent model projects,
 not one project to link as a whole. Validate \`layered-architecture.ai\`, the C1,
@@ -44007,9 +44919,10 @@ the Insight query and which result was computed from its output.
    \`no-filter\` for a broad logical export.
 4. Inspect query JSON before rendering. Distinguish selected outer endpoints,
    underlying edge endpoints, derived relationships, and projection origins.
-5. If the question needs traversal, aggregation, comparison, or absence checks,
-   compute them over the exported JSON without changing the model or pretending
-   the computation was supported by the query DSL.
+5. If the question needs traversal, aggregation, set intersection, or absence
+   checks, compute them over the exported JSON without changing the model or
+   pretending the computation was supported by the query DSL. Ordinary
+   property equality and inequality can stay in the Insight query.
 6. Report the scope: context, selected source when \`$tab\` is used, query or
    built-in view, and whether derived or projected edges were included.
 
@@ -44043,21 +44956,25 @@ MATCH (service:Service {id: 'checkout_api', context: $context})-[dependency:REFE
 RETURN service, dependency, target
 \`\`\`
 
-Incoming dependencies use the same left-to-right syntax with the target bound
-on the right:
+Incoming dependencies can keep the inspected service at the start of the
+pattern by using the reverse arrow:
 
 \`\`\`cypher
-MATCH (caller:Element)-[dependency:REFERENCES]->(service:Service {id: 'checkout_api', context: $context})
-RETURN caller, dependency, service
+MATCH (service:Service {id: 'checkout_api', context: $context})<-[dependency:REFERENCES]-(caller:Element)
+RETURN service, dependency, caller
 \`\`\`
 
+This selects the same stored edge as placing \`caller\` on the left with \`->\`.
+Pattern orientation changes matching readability, not the relationship stored
+in the architecture model.
+
 These answer one-hop questions. To find all transitively affected elements,
 export the relevant context graph and traverse its direct \`REFERENCES\` edges
 outside the query language. State whether derived and projected edges were
 excluded or analyzed separately so the same dependency is not counted at
 several architectural levels.
 
-## Build a Direct Service Dependency Map
+## Choose the Dependency Scope
 
 The bundled \`examples/queries/direct-service-dependencies.aiq\` selects the
 one-hop dependency graph at container/service ownership level:
@@ -44070,9 +44987,9 @@ RETURN source, dependency, target
 
 \`withDerived\` includes relationships lifted from components to their owning
 containers or services. This is appropriate for a service dependency map, but
-it is not an inventory of authored wires. Remove \`{withDerived}\` when the
-question is specifically about relationships declared directly between those
-elements.
+it is not an inventory of authored wires. Because both endpoints must be
+\`ContainerElement\`, it intentionally omits a direct service-to-system or
+system-to-system relationship.
 
 Run the query once for the context instead of querying every service
 individually:
@@ -44088,41 +45005,70 @@ preserve dependency ownership. The source depends on the target. Use qualified
 ids from those fields when building an adjacency map; do not infer direction
 from diagram placement.
 
-## Analyze Kafka Topics
+For every authored one-hop dependency regardless of architectural level, use
+\`examples/queries/direct-authored-dependencies.aiq\`:
+
+\`\`\`cypher
+MATCH (source:Element)-[dependency:REFERENCES]->(target:Element)
+WHERE source.context = $context
+RETURN source, dependency, target
+\`\`\`
+
+\`\`\`shell
+archinsight query . -c <context-id> \\
+  -q <skill-path>/examples/queries/direct-authored-dependencies.aiq \\
+  --format json
+\`\`\`
+
+This query excludes derived and projected copies. It is the correct starting
+point for questions such as "what does this service or system directly depend
+on?" when the target may live at another architectural level.
+
+## Analyze Async Topics and Channels
 
-The bundled \`examples/queries/kafka-service-dependencies.aiq\` selects authored
-Kafka dependencies without derived or projected copies:
+The bundled \`examples/queries/async-topic-dependencies.aiq\` selects every
+authored async dependency without requiring a particular transport or endpoint
+level:
 
 \`\`\`cypher
-MATCH (consumer:ContainerElement)-[event:REFERENCES]->(producer:ContainerElement)
+MATCH (consumer:Element)-[event:REFERENCES]->(producer:Element)
 WHERE consumer.context = $context
   AND event.type = 'AsyncWire'
-  AND event.technology CONTAINS 'Kafka'
 RETURN consumer, event, producer
 \`\`\`
 
 Insight eventing is consumer-owned: the consumer declares \`~> producer\`, and
 \`via\` names the topic or channel. Therefore an outgoing async edge lists what
-a service consumes, while incoming async edges list the modeled consumers of a
-producer's topic contract.
+an element consumes, while incoming async edges list the modeled consumers of a
+producer's topic contract. The endpoints may be systems, services, components,
+or project-defined element types.
+
+Run the generic query for the whole context:
+
+\`\`\`shell
+archinsight query . -c <context-id> \\
+  -q <skill-path>/examples/queries/async-topic-dependencies.aiq \\
+  --format json
+\`\`\`
+
+To select a topic family, copy the query and add a case-sensitive membership or
+substring predicate such as \`AND event.via CONTAINS 'orders.'\`.
 
 For one consumer, constrain its local id in the first node pattern:
 
 \`\`\`cypher
-MATCH (consumer:ContainerElement {id: 'order_processor', context: $context})
-    -[event:REFERENCES]->(producer:ContainerElement)
+MATCH (consumer:Element {id: 'order_processor', context: $context})
+    -[event:REFERENCES]->(producer:Element)
 WHERE event.type = 'AsyncWire'
-  AND event.technology CONTAINS 'Kafka'
 RETURN consumer, event, producer
 \`\`\`
 
 For one producer, use the reverse pattern:
 
 \`\`\`cypher
-MATCH (producer:ContainerElement {id: 'order_processor', context: $context})
-    <-[event:REFERENCES]-(consumer:ContainerElement)
+MATCH (producer:Element {id: 'order_processor', context: $context})
+    <-[event:REFERENCES]-(consumer:Element)
 WHERE event.type = 'AsyncWire'
-  AND event.technology CONTAINS 'Kafka'
 RETURN producer, event, consumer
 \`\`\`
 
@@ -44132,7 +45078,7 @@ into the agent's context:
 
 \`\`\`shell
 archinsight query . -c <context-id> \\
-  -q <skill-path>/examples/queries/kafka-service-dependencies.aiq \\
+  -q <skill-path>/examples/queries/async-topic-dependencies.aiq \\
   --format json |
 jq -r '.edges[] | [
   .edge.source,
@@ -44146,6 +45092,62 @@ This reports topic contracts used by at least one modeled consumer. Do not
 claim it is a complete producer catalog: a topic with no modeled wire is not
 discoverable unless the project represents that contract separately.
 
+The bundled \`examples/queries/kafka-service-dependencies.aiq\` is a narrower
+specialization for projects that consistently record \`technology = Kafka\`
+and want only authored container-to-container dependencies without derived or
+projected copies:
+
+\`\`\`cypher
+MATCH (consumer:ContainerElement)-[event:REFERENCES]->(producer:ContainerElement)
+WHERE consumer.context = $context
+  AND event.type = 'AsyncWire'
+  AND event.technology CONTAINS 'Kafka'
+RETURN consumer, event, producer
+\`\`\`
+
+Do not use this specialization when \`technology\` is absent or inconsistent;
+the generic async query still finds those modeled relationships.
+
+## Compare Endpoint Attributes
+
+Equality and inequality can compare properties on two bound endpoints:
+
+\`\`\`cypher
+MATCH (source:Element)-[dependency:REFERENCES]->(target:Element)
+WHERE source.runsOn <> target.runsOn
+RETURN source, dependency, target
+\`\`\`
+
+Scalar references compare by qualified element id. List properties compare as
+complete ordered lists. If either property is absent, both \`=\` and \`<>\`
+evaluate to false for that row. The query language does not calculate list
+intersection or set difference; export JSON and post-process it when the
+question is whether two multi-valued placements overlap.
+
+## Report Annotations
+
+Annotations are present in query JSON, but the current query language has no
+annotation predicate. Select a sufficiently broad graph and filter the JSON:
+
+\`\`\`shell
+archinsight query . -c <context-id> -v no-filter --format json |
+jq '{
+  elements: [
+    .elements[] |
+    select((.annotations // []) | length > 0) |
+    {id, annotations}
+  ],
+  edges: [
+    .edges[] |
+    select((.edge.annotations // []) | length > 0) |
+    {source, target, annotations: .edge.annotations}
+  ]
+}'
+\`\`\`
+
+Each annotation retains its name, optional value, and source position. This is
+a read-only reporting workaround, not an Insight query predicate.
+
 ## Analyze a Source Fragment
 
 Use \`$tab\` when the question concerns the semantic fragment rooted in one
@@ -44164,13 +45166,19 @@ it is not a raw inventory of lines physically present in that file.
 
 ## Analyze Deployment Realization
 
-Use the built-in Deployment query JSON when the question is how logical architecture is
-realized physically:
+Use built-in Deployment query JSON when the question is how logical architecture
+is realized physically. D1 answers which systems and external integrations are
+present across relevant environments. D2 shows container and infrastructure
+detail inside one selected environment:
 
 \`\`\`shell
-archinsight query . -c <context-id> -s <logical-source.ai> -v deployment --format json
+archinsight query . -s <logical-source.ai> -v deployment-system --format json
+archinsight query . -s <logical-source.ai> -v deployment-container --environment <environment> --format json
 \`\`\`
 
+Use the legacy \`deployment\` view only when the question intentionally requires
+one container-level graph across every relevant environment.
+
 For each projected edge, compare outer \`source\` and \`target\` with nested
 \`edge.source\` and \`edge.target\`. Use \`edge.originSource\` and
 \`edge.originTarget\` for the logical origin selected by the query. When
@@ -44203,19 +45211,22 @@ diagram.
 ## CLI Shape
 
 \`\`\`shell
-archinsight query . -c <context-id> -s <source.ai> -q query.aiq -f text
-archinsight query . -c <context-id> -s <source.ai> -v deployment --format json
-archinsight render . -c <context-id> -s <source.ai> -q query.aiq -f svg -o diagram.svg
+archinsight query . -s <source.ai> -q query.aiq -f text
+archinsight query . -s <source.ai> -v deployment-system --format json
+archinsight query . -s <source.ai> -v deployment-container --environment <environment> --format json
+archinsight render . -s <source.ai> -q query.aiq -f svg -o diagram.svg
 \`\`\`
 
 The scope variables are:
 
-- \`$context\` - selected context id from \`--context\`.
+- \`$context\` - context declared by \`--source\`, or the explicit
+  \`--context\` used for context-wide execution without a source.
 - \`$tab\` - the semantic model fragment rooted in the source selected by
   \`--source\` / \`--tab\`. It includes content contributed to those roots by
   \`extend\` in other files.
 
-Pass \`--source\` when a query uses \`$tab\`.
+Pass \`--source\` when a query uses \`$tab\`. A selected source also supplies
+\`$context\`, so do not repeat its context on the command line.
 
 Path handling:
 
@@ -44227,7 +45238,7 @@ Path handling:
 Prefer paths relative to the project root:
 
 \`\`\`shell
-archinsight query path/to/project -c shop -s models/storefront.ai -q queries/c2.aiq -f text
+archinsight query path/to/project -s models/storefront.ai -q queries/c2.aiq -f text
 \`\`\`
 
 ## Query Shape
@@ -44317,7 +45328,10 @@ OPTIONAL MATCH (container)-[link]->(target)
 RETURN container, link, target
 \`\`\`
 
-Relationship aliases must be returned for edges to render.
+Return relationship aliases when the query must select or filter exact edges. A
+node-only query completes direct authored relationships between selected nodes.
+Once a returned relationship alias is present, its result is authoritative: if
+the relationship predicate matches nothing, no fallback edges are added.
 
 ## Filtering
 
@@ -44330,6 +45344,7 @@ WHERE node.deployed = true
 WHERE node IS External
 WHERE NOT node IS DeploymentElement
 WHERE edge.projected = 'true'
+WHERE edge.projectionRoot = 'eu/service_network'
 WHERE node.id IN ['api', 'web_app']
 WHERE node.technology CONTAINS 'PostgreSQL'
 WHERE node.type <> 'Context'
@@ -44341,10 +45356,46 @@ Use single quotes for string literals.
 \`CONTAINS\` is case-sensitive. For scalar text it performs substring matching;
 for a list property it tests membership. Match the stored spelling exactly.
 
+Attribute cardinality comes from the Insight type system, not from the JSON
+representation. Use \`CONTAINS\` for list-valued attributes such as \`uses\`.
+\`runsOn\` is declared as a scalar typed reference. When it has one resolved
+target, it resolves to one graph node: compare it with another bound node, or
+test its qualified id with \`node.runsOn IN ['eu/cluster']\`.
+\`node.runsOn CONTAINS 'eu/cluster'\` does not match a scalar reference because
+that value is neither scalar text nor a list.
+
+A logical element materialized through several deployments can have several
+resolved \`runsOn\` targets. In that case bind a candidate infrastructure node
+and use \`candidate IN node.runsOn\`.
+
+Query JSON serializes attribute values as arrays for a stable transport shape.
+The linked element or edge also exposes \`listAttributes\` and
+\`referenceAttributes\`; use that metadata when an automated analysis needs to
+recover the language-level cardinality and reference kind.
+
+Properties of two bound aliases can be compared directly:
+
+\`\`\`cypher
+WHERE source.runsOn = target.runsOn
+WHERE source.runsOn <> target.runsOn
+\`\`\`
+
+Scalar references compare by qualified id and lists compare as complete ordered
+lists. If either property is absent, both comparisons evaluate to false. Set
+intersection and overlap tests are not supported; post-process query JSON for
+those operations.
+
 \`node.deployed\` is true when an element's deployment resolves to at least one
 \`runsOn\` or \`uses\` infrastructure object. The built-in Deployment view uses it to keep
 undeployed logical elements out of the physical diagram.
 
+\`edge.projectionRoot\` is available on projected relationships and identifies
+the infrastructure element whose projection produced the selected segment.
+It can be used in relationship predicates and has the same value shown in
+\`query --format json\` output. Resolved \`node.runsOn\` can contain several
+concrete infrastructure objects, so use \`candidate IN node.runsOn\` when
+matching placement targets.
+
 ## Relationship Selectors
 
 Relationship selectors are boolean flags inside relationship braces:
@@ -44407,15 +45458,21 @@ The top-level shape is:
 - \`groups\`: render groups created by \`GROUP BY\`;
 - \`externalElements\`: selected ids drawn outside the internal boundary.
 
+Elements expose their linked \`attributes\`, optional \`listAttributes\` and
+\`referenceAttributes\` metadata, and any \`annotations\`. Relationship data is
+nested under each result item's \`edge\` field and carries the same attribute
+metadata plus edge annotations. Annotations can be inspected in JSON but cannot
+currently be referenced by a \`WHERE\` predicate.
+
 For built-in C1-C4 execution, this list combines explicit model externality
 with externality relative to the opened diagram boundaries. C2 folds a closed
 endpoint to its system, C3 to its container or service, and C4 to its component.
 \`IS External\` in a custom query continues to match only the explicit model
 marker.
 
-To apply one of these boundary contracts to a custom CLI query, pass both
-\`-q <query.aiq>\` and \`-v c1|c2|c3|c4\`. Without \`-v\`, custom query
-execution does not apply a built-in view boundary.
+A custom query file supplies its own selection and grouping contract and
+overrides \`--view\`. To customize C1-C4 boundary behavior, copy the nearest
+bundled built-in \`.aiq\` file and modify its predicates or grouping explicitly.
 
 Each edge contains its selected category and two endpoint pairs:
 
@@ -44429,7 +45486,9 @@ Each edge contains its selected category and two endpoint pairs:
 - nested \`edge.projectionOrigins\`, when present, lists every logical source and
   target that shares the physical segment;
 - nested \`edge.projectionRoot\` identifies the infrastructure element whose
-  projection produced the segment.
+  projection produced the segment;
+- nested \`edge.sourcePlacement\` and \`edge.targetPlacement\`, when present,
+  identify the concrete placement of each logical endpoint independently.
 
 An abridged response remains ordinary JSON:
 
@@ -44503,6 +45562,8 @@ examples/builtin-views/c1.aiq
 examples/builtin-views/c2.aiq
 examples/builtin-views/c3.aiq
 examples/builtin-views/c4.aiq
+examples/builtin-views/deployment-system.aiq
+examples/builtin-views/deployment-container.aiq
 examples/builtin-views/deployment.aiq
 \`\`\`
 
@@ -44519,9 +45580,15 @@ C4 opens every component rooted in \`$tab\`, selects direct Code-element
 neighborhoods in either direction, and folds outside code to closed components.
 Concrete code types and containment remain project-defined.
 
-Deployment selects deployment nodes and physically deployed logical nodes from \`$tab\`,
-uses one undirected \`OPTIONAL MATCH ROLLUP\` for projected paths, and keeps
-placement lookup separate from relationship matching.
+D1 and D2 select physically deployed logical nodes and source-owned system
+endpoints from \`$tab\`, use one undirected \`OPTIONAL MATCH ROLLUP\` for projected
+paths, and keep placement lookup separate from relationship matching. When the
+source owns no deployed elements, environment discovery falls back to
+infrastructure used by its authored wires. D1 folds logical nodes to systems.
+D1 then contracts internal infrastructure paths and groups the remaining systems
+and external integrations by environment. D2 applies the structured environment
+scope after discovery and retains its physical detail. The legacy Deployment
+query retains all relevant environments.
 
 When a built-in view is close but hides the wrong thing, read
 \`references/query-recipes.md\`, copy the nearest built-in \`.aiq\`, and change
@@ -44554,16 +45621,23 @@ examples/builtin-views/c1.aiq
 examples/builtin-views/c2.aiq
 examples/builtin-views/c3.aiq
 examples/builtin-views/c4.aiq
+examples/builtin-views/deployment-system.aiq
+examples/builtin-views/deployment-container.aiq
 examples/builtin-views/deployment.aiq
 \`\`\`
 
 Before inventing a query from scratch, open the nearest built-in query, copy it
 to the project, and make the smallest change.
 
+Choose \`deployment-system.aiq\` for a D1 overview and
+\`deployment-container.aiq\` for D2 detail in one environment. Start from the
+legacy \`deployment.aiq\` only when the intended result is one container-level
+graph across every relevant environment.
+
 \`\`\`shell
-archinsight query . -c <context-id> -s <source.ai> -q queries/custom.aiq -f text
-archinsight query . -c <context-id> -s <source.ai> -q queries/custom.aiq -f json
-archinsight render . -c <context-id> -s <source.ai> -q queries/custom.aiq -f svg -o custom.svg
+archinsight query . -s <source.ai> -q queries/custom.aiq -f text
+archinsight query . -s <source.ai> -q queries/custom.aiq -f json
+archinsight render . -s <source.ai> -q queries/custom.aiq -f svg -o custom.svg
 \`\`\`
 
 Use \`references/queries.md\` for syntax details. Use this file for common
@@ -44616,10 +45690,12 @@ archinsight link . --format text
 archinsight structure . --format text
 \`\`\`
 
-3. Run the built-in query explicitly and inspect its JSON:
+3. Run the built-in query explicitly and inspect its JSON. Choose the command
+   that matches the diagram being investigated:
 
 \`\`\`shell
-archinsight query . -c <context-id> -s <source.ai> -q examples/builtin-views/deployment.aiq -f json
+archinsight query . -s <source.ai> -v deployment-system -f json
+archinsight query . -s <source.ai> -v deployment-container --environment <environment> -f json
 \`\`\`
 
 4. Check the query filters:
@@ -44627,17 +45703,17 @@ archinsight query . -c <context-id> -s <source.ai> -q examples/builtin-views/dep
 - \`node.sourceIdentity = $tab\` selects the semantic fragment rooted in the
   selected source, including contributions added to those roots through
   \`extend\` in other files.
-- The built-in Deployment node filter includes deployment elements and logical
+- The built-in D1 and D2 node filters include deployment elements and logical
   container or external elements whose deployment resolves to physical
   infrastructure. External endpoints without their own placement still enter
   through projected paths attached to a deployed logical node.
 - \`{projected}\` means only deployment-projected edges are selected.
 - \`{derived}\` means only rolled-up relationships are selected.
 - A relationship property such as \`sourceIdentity: $tab\` is available for a
-  deliberately narrow custom view. The current built-in Deployment query does not add
-  that edge filter; the selected node scope and semantic tab closure provide
-  the boundary.
-- The built-in Deployment view uses one undirected \`MATCH ROLLUP\` for the
+  deliberately narrow custom view. The built-in D1 and D2 queries rely on the
+  selected node scope and semantic tab closure instead of applying that filter
+  to projected relationships.
+- The built-in D1 and D2 views use one undirected \`MATCH ROLLUP\` for the
   projected neighborhood. Projection origin metadata lets that clause find
   ingress and egress segments while every segment preserves its real physical
   source and target.
@@ -44672,19 +45748,20 @@ traceability, not for inventing a direct physical connection.
 
 ## Include Internal Actors In Deployment
 
-The built-in Deployment query includes external actors reached by a projected physical
-path. If a deployment diagram also needs internal actors, use the bundled,
-tested customization:
+The built-in Deployment views include external actors reached by a projected
+physical path. If an all-environment deployment diagram also needs internal
+actors, use the bundled, tested legacy-view customization:
 
 \`\`\`shell
-archinsight query . -c <context-id> -s <source.ai> -q examples/queries/deployment-internal-actors.aiq -f json
+archinsight query . -s <source.ai> -q examples/queries/deployment-internal-actors.aiq -f json
 \`\`\`
 
-This query is generated from the exact built-in Deployment source and changes only the
-node, projected-target, and incoming-source predicates to admit \`Actor\`.
-Because the rest comes from the current built-in query, deployment targets,
-incoming paths, and infrastructure-to-infrastructure projected path segments
-stay synchronized with Deployment behavior.
+This query is generated from the exact legacy \`deployment.aiq\` source and
+changes only the node, projected-target, and incoming-source predicates to admit
+\`Actor\`. For a D1 or D2 customization, copy the corresponding
+\`deployment-system.aiq\` or \`deployment-container.aiq\` source and apply the
+same actor predicates there so its current scope and environment behavior remain
+intact.
 
 If the actor is declared in another source file, either render from that source
 or relax the \`node.sourceIdentity = $tab\` condition intentionally.
@@ -44722,8 +45799,8 @@ exist in the file but the diagram question is still logical.
 
 ## Projected Edges Across Split Files
 
-The current built-in Deployment query matches \`{projected}\` edges without an explicit
-\`sourceIdentity: $tab\` relationship filter. The query engine expands \`$tab\`
+The current built-in D1 and D2 queries match \`{projected}\` edges without an
+explicit \`sourceIdentity: $tab\` relationship filter. The query engine expands \`$tab\`
 to the roots declared by the selected source and contributions made to those
 roots through \`extend\`, so a normal multi-file split does not require a looser
 edge selector.
@@ -44733,7 +45810,8 @@ filter while keeping the node scope. Start again from the bundled current query
 instead of preserving the rest of the older copy:
 
 \`\`\`text
-copy examples/builtin-views/deployment.aiq to the project's query directory
+copy examples/builtin-views/deployment-system.aiq for D1
+or copy examples/builtin-views/deployment-container.aiq for D2
 remove sourceIdentity: $tab only from the relationship selector if an old copy has it
 keep node.sourceIdentity = $tab
 \`\`\`
@@ -44744,17 +45822,16 @@ by the tab before changing the model or broadening the node scope.
 
 ## Change Grouping
 
-Grouping controls visual clusters. If Deployment grouping by \`runsOn\` is not helpful,
-copy the complete current \`examples/builtin-views/deployment.aiq\` and change only:
+Grouping controls visual clusters. If D1 or D2 grouping is not helpful, copy the
+complete corresponding built-in query and change only its \`GROUP BY\` expression:
 
 \`\`\`cypher
 GROUP BY node.parent
 \`\`\`
 
 Use \`GROUP BY node.runsOn\` for deployment placement; use \`GROUP BY node.parent\`
-for logical ownership. If you still need target-owned ingress paths, start from
-\`examples/builtin-views/deployment.aiq\` and change only the \`GROUP BY\` expression so
-the incoming projection aliases stay in the \`RETURN\`.
+for logical ownership. Preserve the rest of the selected D1 or D2 query so its
+projected-neighborhood aliases and environment behavior remain unchanged.
 
 ## Working Rule
 
@@ -45225,11 +46302,10 @@ system commerce
       files: [
         projectionFile("definitions.ai", `define type BrokerEnvironment of Environment
     Compute compute
-    EventChannel events
+    Broker events
 
-define type EventChannel of NetworkConnection
-    constructor eventChannel
-    required Broker transport
+define type KafkaBroker of Broker
+    constructor kafka
 `),
         projectionFile("infrastructure.ai", `environment eu
     name = Europe
@@ -45240,16 +46316,13 @@ deployment production
             name = Kubernetes
 
     events:
-        eventChannel order_events
-            name = Order events
-            transport:
-                broker kafka
-                    name = Kafka
-                    technology = Managed Kafka
+        kafka kafka
+            name = Kafka
+            technology = Managed Kafka
             projection:
-                target $to connectTo target transport
+                target $to connectTo target $this
                     technology = Kafka
-                target transport originalLink source $from
+                target $this originalLink source $from
 `),
         projectionFile("model.ai", `context broker_example
 
@@ -45436,7 +46509,7 @@ Run:
 
 \`\`\`shell
 archinsight link examples/deployment-projections/${example.slug} --format text
-archinsight query examples/deployment-projections/${example.slug} -c ${example.context} -s model.ai -v deployment --format json
+archinsight query examples/deployment-projections/${example.slug} -s model.ai -v deployment-container --environment eu --format json
 \`\`\`
 
 Expected physical result:
@@ -45474,11 +46547,10 @@ receives only attributes written on that rule, while projection origin metadata
 still provides traceability. A path made entirely from \`connectTo\` therefore
 does not carry the logical operator or authored relationship attributes.
 
-Wire \`uses\` accepts only a \`NetworkConnection\` descendant. A built-in
-\`Broker\` is an \`InfrastructureComponent\`: it can exist in inventory, but a
-wire cannot select it directly. Put the broker behind a project-defined
-\`NetworkConnection\` vocabulary when it must participate in a physical wire
-path. See [Broker](#broker), the consumer-owned relationship rules in
+Wire \`uses\` accepts only a \`NetworkConnection\` descendant. The built-in
+\`Broker\` is one and can fill a wire-facing environment slot directly. Derive
+product-specific broker types from \`Broker\`, and put the physical projection
+on the concrete broker instance. See [Broker](#broker), the consumer-owned relationship rules in
 [Eventing](modeling.md#eventing), and the shared-definition layout in
 [Scaling](scaling.md#framework-once-use-everywhere).
 
@@ -45753,6 +46825,19 @@ WHERE source.context = $context
 RETURN source, dependency, target
 `;
 }
+function genericDirectAuthoredDependenciesQuery() {
+  return `MATCH (source:Element)-[dependency:REFERENCES]->(target:Element)
+WHERE source.context = $context
+RETURN source, dependency, target
+`;
+}
+function genericAsyncTopicDependenciesQuery() {
+  return `MATCH (consumer:Element)-[event:REFERENCES]->(producer:Element)
+WHERE consumer.context = $context
+  AND event.type = 'AsyncWire'
+RETURN consumer, event, producer
+`;
+}
 function genericKafkaServiceDependenciesQuery() {
   return `MATCH (consumer:ContainerElement)-[event:REFERENCES]->(producer:ContainerElement)
 WHERE consumer.context = $context