mainsequence 6.0.40__tar.gz → 6.0.41__tar.gz

{mainsequence-6.0.40/mainsequence.egg-info → mainsequence-6.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 6.0.40
+Version: 6.0.41
 Summary: Main Sequence SDK 
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License-Expression: LicenseRef-MainSequence-Proprietary

{mainsequence-6.0.40 → mainsequence-6.0.41}/agent_scaffold/skills/data_access/exploration/SKILL.md

@@ -156,10 +156,9 @@ field to filter by:
 
 Collection listing is scoped to one Organization Environment. Inside a
 registered project checkout, the CLI derives that scope from the process-frozen
-Git-resolved ProjectBranch. Outside one, pass
-`--organization-project-environment-uid <ENVIRONMENT_UID>` explicitly. Direct
-SDK calls use the canonical
-`organization_project_environment_uid=<ENVIRONMENT_UID>` filter.
+Git-resolved ProjectBranch. Do not pass an Environment UID or branch UID. On an
+unregistered branch, table operations fail when they require ProjectBranch
+context while unrelated local development remains available.
 
 Column lookup is also a different path. Use it only for schema-name discovery,
 not as the default dataset discovery flow:

{mainsequence-6.0.40 → mainsequence-6.0.41}/agent_scaffold/skills/data_publishing/meta_tables/SKILL.md

@@ -72,6 +72,8 @@ Before changing code, collect or infer:
 - who owns the MetaTable catalog lifecycle
 - who owns physical DDL: TS Manager, Alembic, or an external authority
 - for `external_registered`, the target canonical `DataSource` UID
+- the actual current Git branch; the SDK resolves its registered `ProjectBranch`
+  and Environment, and the user must not provide either UID
 - for contract changes, the selected `AlembicMetaTableMigration` provider or provider module path
 - for contract changes, the provider's `AlembicVersionMetaTable` root and whether it has been reserved
 - for contract changes, the intended Alembic revision, parent/current revision, target revision, and updated SQLAlchemy declarations

{mainsequence-6.0.40 → mainsequence-6.0.41}/agent_scaffold/skills/platform_operations/access_control_and_sharing/SKILL.md

@@ -158,7 +158,10 @@ Do not downgrade a secret into a constant for convenience.
 
 ### 6. `Constant` and `Secret` names are unique configuration identities
 
-Treat `Constant.name` and `Secret.name` as unique organization-level configuration keys.
+Treat `Constant.name` and `Secret.name` as unique Environment-level
+configuration keys. Project-facing SDK and CLI operations derive the
+Environment from the process-frozen current Git branch and registered
+`ProjectBranch`. Never ask the user to provide an Environment UID or branch UID.
 
 For creation or sync tasks:
 

{mainsequence-6.0.40 → mainsequence-6.0.41}/agent_scaffold/skills/platform_operations/orchestration_and_releases/SKILL.md

@@ -195,6 +195,10 @@ push alone does not prove deployment success.
 
 Use `Artifact` when the operational unit is a file.
 
+Artifact and Bucket operations derive their Organization Environment from the
+process-frozen current Git branch and registered `ProjectBranch`. Do not ask the
+user to select an Environment UID or branch UID.
+
 Examples:
 
 - vendor drops

{mainsequence-6.0.40 → mainsequence-6.0.41}/mainsequence/cli/cli.py

@@ -1320,47 +1320,6 @@ def _merge_cli_filter_alias(
     return merged
 
 
-def _scope_table_collection_filters(
-    filters: dict[str, object],
-    *,
-    organization_project_environment_uid: object | None,
-    command_label: str,
-) -> dict[str, object]:
-    filter_key = "organization_project_environment_uid"
-    scoped = _merge_cli_filter_alias(
-        filters,
-        filter_key=filter_key,
-        value=organization_project_environment_uid,
-        option_name="organization-project-environment-uid",
-    )
-    if filter_key in scoped:
-        return scoped
-
-    try:
-        context = require_project_branch_context(
-            command_label,
-            context=get_project_runtime_context(),
-        )
-    except ProjectRuntimeContextError as exc:
-        error(
-            f"{command_label} requires an Organization Environment scope. "
-            "Run inside a registered ProjectBranch checkout or pass "
-            "`--organization-project-environment-uid`."
-        )
-        raise typer.Exit(1) from exc
-
-    environment_uid = str(context.organization_project_environment_uid or "").strip()
-    if not environment_uid:
-        error(
-            f"{command_label} cannot resolve an Organization Environment from "
-            "the active ProjectBranch."
-        )
-        raise typer.Exit(1)
-
-    scoped[filter_key] = environment_uid
-    return scoped
-
-
 def _require_item_uid(item: dict, *, prompt_label: str) -> str:
     uid = str(item.get("uid") or "").strip()
     if not uid:
@@ -4466,7 +4425,6 @@ def _data_node_storage_list_impl(
     filter_entries: list[str] | None,
     show_filters: bool,
     data_source_uid: str | None = None,
-    organization_project_environment_uid: object | None = None,
 ) -> None:
     filters = _resolve_cli_list_filters(
         model_ref=DATA_NODE_STORAGE_MODEL_REF,
@@ -4481,11 +4439,6 @@ def _data_node_storage_list_impl(
         option_name="data-source-uid",
     )
     _require_login()
-    filters = _scope_table_collection_filters(
-        filters,
-        organization_project_environment_uid=organization_project_environment_uid,
-        command_label="Data Node Storage listing",
-    )
 
     try:
         storages = list_data_node_storages(timeout=timeout, filters=filters)
@@ -4519,7 +4472,6 @@ def _meta_table_list_impl(
     filter_entries: list[str] | None,
     show_filters: bool,
     data_source_uid: str | None = None,
-    organization_project_environment_uid: object | None = None,
 ) -> None:
     filters = _resolve_cli_list_filters(
         model_ref=META_TABLE_MODEL_REF,
@@ -4534,11 +4486,6 @@ def _meta_table_list_impl(
         option_name="data-source-uid",
     )
     _require_login()
-    filters = _scope_table_collection_filters(
-        filters,
-        organization_project_environment_uid=organization_project_environment_uid,
-        command_label="MetaTable listing",
-    )
 
     try:
         meta_tables = list_meta_tables(timeout=timeout, filters=filters)
@@ -6067,11 +6014,6 @@ def meta_table_list_cmd(
     data_source_uid: str | None = typer.Option(
         None, "--data-source-uid", help="Filter by data source UID."
     ),
-    organization_project_environment_uid: uuid.UUID | None = typer.Option(
-        None,
-        "--organization-project-environment-uid",
-        help=("Organization Environment scope. Defaults to the active Git-resolved ProjectBranch."),
-    ),
     filter_entries: list[str] | None = typer.Option(None, "--filter", help=LIST_FILTER_OPTION_HELP),
     show_filters: bool = typer.Option(
         False, "--show-filters", help="Show the filters supported by this list command and exit."
@@ -6088,7 +6030,6 @@ def meta_table_list_cmd(
         filter_entries=filter_entries,
         show_filters=show_filters,
         data_source_uid=data_source_uid,
-        organization_project_environment_uid=organization_project_environment_uid,
     )
 
 
@@ -6359,11 +6300,6 @@ def data_node_storage_list_cmd(
     data_source_uid: str | None = typer.Option(
         None, "--data-source-uid", help="Filter by data source UID."
     ),
-    organization_project_environment_uid: uuid.UUID | None = typer.Option(
-        None,
-        "--organization-project-environment-uid",
-        help=("Organization Environment scope. Defaults to the active Git-resolved ProjectBranch."),
-    ),
     filter_entries: list[str] | None = typer.Option(None, "--filter", help=LIST_FILTER_OPTION_HELP),
     show_filters: bool = typer.Option(
         False, "--show-filters", help="Show the filters supported by this list command and exit."
@@ -6395,7 +6331,6 @@ def data_node_storage_list_cmd(
         filter_entries=filter_entries,
         show_filters=show_filters,
         data_source_uid=data_source_uid,
-        organization_project_environment_uid=organization_project_environment_uid,
     )
 
 

{mainsequence-6.0.40 → mainsequence-6.0.41}/mainsequence/client/base.py

@@ -97,6 +97,26 @@ class CurrentProjectBranchCollectionMixin:
         return list(cls.iter_filter_admin(timeout=timeout, **kwargs))
 
 
+class CurrentProjectEnvironmentResourceMixin:
+    """Scope project-facing Environment resources to the frozen Git context."""
+
+    SDK_OWNED_CONTEXT_FIELDS: ClassVar[frozenset[str]] = frozenset(
+        {"organization_project_environment_uid"}
+    )
+
+    @classmethod
+    def _sdk_owned_query_context(cls, operation: str) -> dict[str, str]:
+        from mainsequence.project_context import resolve_project_environment_uid
+
+        return {
+            "organization_project_environment_uid": resolve_project_environment_uid(operation)
+        }
+
+    @classmethod
+    def _sdk_owned_create_context(cls, operation: str) -> dict[str, str]:
+        return cls._sdk_owned_query_context(operation)
+
+
 class BaseObjectOrm:
     FILTERSET_FIELDS: ClassVar[dict[str, list[str]] | None] = None
     FILTER_VALUE_NORMALIZERS: ClassVar[dict[str, str | Callable[..., Any]]] = {}
@@ -105,6 +125,7 @@ class BaseObjectOrm:
     DESTROY_QUERY_PARAMS: ClassVar[dict[str, str | Callable[..., Any]] | None] = None
     DESTROY_QUERY_PARAM_DESCRIPTIONS: ClassVar[dict[str, str] | None] = None
     PUBLIC_LOOKUP_FIELD: ClassVar[str] = "uid"
+    SDK_OWNED_CONTEXT_FIELDS: ClassVar[frozenset[str]] = frozenset()
 
     END_POINTS = {
         "User": "users",
@@ -154,6 +175,37 @@ class BaseObjectOrm:
         s = session
         return s
 
+    @classmethod
+    def _sdk_owned_query_context(cls, operation: str) -> dict[str, Any]:
+        return {}
+
+    @classmethod
+    def _sdk_owned_create_context(cls, operation: str) -> dict[str, Any]:
+        return {}
+
+    @classmethod
+    def _reject_sdk_context_overrides(
+        cls,
+        values: dict[str, Any],
+        *,
+        operation: str,
+    ) -> None:
+        overridden = sorted(set(values) & set(cls.SDK_OWNED_CONTEXT_FIELDS))
+        if overridden:
+            raise ValueError(
+                f"{operation} cannot override SDK-resolved context field(s): "
+                f"{', '.join(overridden)}."
+            )
+
+    @classmethod
+    def _with_sdk_owned_create_context(
+        cls,
+        operation: str,
+        values: dict[str, Any],
+    ) -> dict[str, Any]:
+        cls._reject_sdk_context_overrides(values, operation=operation)
+        return {**values, **cls._sdk_owned_create_context(operation)}
+
     @property
     def s(self):
         s = self.build_session()
@@ -468,11 +520,19 @@ class BaseObjectOrm:
         """
         Generator variant: yields objects across all pages without accumulating into memory.
         """
+        operation = f"{cls.__name__}.filter"
+        cls._reject_sdk_context_overrides(kwargs, operation=operation)
         filter_kwargs, read_query_kwargs = cls._split_filter_and_read_query_kwargs(kwargs)
         normalized_filters = cls._normalize_filter_kwargs(filter_kwargs)
         normalized_read_query = cls._normalize_read_query_kwargs(read_query_kwargs)
         base_url = cls.get_object_url()
-        params = cls._parse_parameters_filter({**normalized_filters, **normalized_read_query})
+        params = cls._parse_parameters_filter(
+            {
+                **normalized_filters,
+                **normalized_read_query,
+                **cls._sdk_owned_query_context(operation),
+            }
+        )
 
         next_url = f"{base_url}/"
         yielded = 0
@@ -534,6 +594,8 @@ class BaseObjectOrm:
         Raises Exception if multiple or unexpected data is returned.
         """
         if pk is not None:
+            operation = f"{cls.__name__}.get"
+            cls._reject_sdk_context_overrides(filters, operation=operation)
             base_url = cls.get_object_url()
             detail_url = f"{base_url}/{pk}/"
             _, read_query_kwargs = cls._split_filter_and_read_query_kwargs(filters)
@@ -541,7 +603,11 @@ class BaseObjectOrm:
             extra_params = {
                 key: value for key, value in filters.items() if key not in read_query_kwargs
             }
-            params = {**extra_params, **normalized_read_query}
+            params = {
+                **extra_params,
+                **normalized_read_query,
+                **cls._sdk_owned_query_context(operation),
+            }
 
             r = make_request(
                 s=cls.build_session(),
@@ -585,7 +651,10 @@ class BaseObjectOrm:
     @classmethod
     def create(cls, timeout=None, files=None, *args, **kwargs):
         base_url = cls.get_object_url()
-        data = cls.serialize_for_json(kwargs)
+        operation = f"{cls.__name__}.create"
+        data = cls.serialize_for_json(
+            cls._with_sdk_owned_create_context(operation, dict(kwargs))
+        )
         payload = {"json": data}
         if files:
             payload["files"] = files
@@ -604,6 +673,8 @@ class BaseObjectOrm:
     @classmethod
     def _destroy_by_reference(cls, public_reference, *args, timeout=None, **kwargs):
         base_url = cls.get_object_url()
+        operation = f"{cls.__name__}.delete"
+        cls._reject_sdk_context_overrides(kwargs, operation=operation)
         payload: dict[str, Any] = {}
 
         if getattr(cls, "DESTROY_QUERY_PARAMS", None):
@@ -615,6 +686,10 @@ class BaseObjectOrm:
             if data:
                 payload["json"] = data
 
+        query_context = cls._sdk_owned_query_context(operation)
+        if query_context:
+            payload.setdefault("params", {}).update(query_context)
+
         r = make_request(
             s=cls.build_session(),
             loaders=cls.LOADERS,
@@ -634,8 +709,13 @@ class BaseObjectOrm:
     def _patch_by_reference(cls, public_reference, *args, _into=None, **kwargs):
         base_url = cls.get_object_url()
         url = f"{base_url}/{public_reference}/"
+        operation = f"{cls.__name__}.patch"
+        cls._reject_sdk_context_overrides(kwargs, operation=operation)
         data = cls.serialize_for_json(kwargs)
         payload = {"json": data}
+        query_context = cls._sdk_owned_query_context(operation)
+        if query_context:
+            payload["params"] = query_context
 
         r = make_request(
             s=cls.build_session(),
@@ -769,7 +849,18 @@ class DetailActionObjectMixin:
         expected_statuses: tuple[int, ...] = (200,),
         empty_response: Any = None,
     ) -> Any:
-        payload = payload or {}
+        payload = dict(payload or {})
+        query_context = type(self)._sdk_owned_query_context(
+            f"{type(self).__name__}.{action_name}"
+        )
+        if query_context:
+            params = dict(payload.get("params") or {})
+            type(self)._reject_sdk_context_overrides(
+                params,
+                operation=f"{type(self).__name__}.{action_name}",
+            )
+            params.update(query_context)
+            payload["params"] = params
         response = make_request(
             s=type(self).build_session(),
             loaders=type(self).LOADERS,

{mainsequence-6.0.40 → mainsequence-6.0.41}/mainsequence/client/metatables/core.py

@@ -33,9 +33,16 @@ from mainsequence.project_context import (
     get_project_runtime_context,
     require_project_branch_context,
     require_project_metatables_data_source,
+    resolve_project_environment_uid,
 )
 
-from ..base import BaseObjectOrm, BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin
+from ..base import (
+    BaseObjectOrm,
+    BasePydanticModel,
+    CurrentProjectEnvironmentResourceMixin,
+    LabelableObjectMixin,
+    ShareableObjectMixin,
+)
 from ..data_sources_interfaces import get_duckdb_interface_class, get_sqlite_interface_class
 from ..dtype_codec import (
     DATE,
@@ -1237,7 +1244,13 @@ class DataSource(BasePydanticModel, BaseObjectOrm):
             raise NotImplementedError
 
 
-class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, BaseObjectOrm):
+class MetaTable(
+    CurrentProjectEnvironmentResourceMixin,
+    BasePydanticModel,
+    LabelableObjectMixin,
+    ShareableObjectMixin,
+    BaseObjectOrm,
+):
     ENDPOINT: ClassVar[str] = "meta-tables"
     COLLECTION_CREATE_ROW_MODEL: ClassVar[type[ManagedMetaTableCollectionCreateRow]] = (
         ManagedMetaTableCollectionCreateRow
@@ -1246,7 +1259,6 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
         "identifier": ["in", "exact", "contains"],
         "uid": ["in", "exact"],
         "data_source__uid": ["in", "exact"],
-        "organization_project_environment_uid": ["in", "exact"],
         "namespace": ["exact", "contains", "in", "isnull"],
         "management_mode": ["exact", "in"],
         "provisioning_status": ["exact", "in"],
@@ -1261,8 +1273,6 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
         "uid__in": "str",
         "data_source__uid": "uid",
         "data_source__uid__in": "uid",
-        "organization_project_environment_uid": "uid",
-        "organization_project_environment_uid__in": "uid",
         "physical_schema": "str",
         "physical_schema__in": "str",
         "labels": "str",
@@ -1332,6 +1342,11 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
 
     model_config = ConfigDict(populate_by_name=True)
 
+    @classmethod
+    def _sdk_owned_create_context(cls, operation: str) -> dict[str, str]:
+        # MetaTable collection creation has its own managed project_context contract.
+        return {}
+
     @model_validator(mode="before")
     @classmethod
     def _strip_legacy_storage_hash(cls, value: Any) -> Any:
@@ -1425,9 +1440,11 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
         timeout: int | float | tuple[float, float] | None = None,
         **filters: Any,
     ) -> list[MetaTable]:
+        operation = f"{cls.__name__}.filter_by_body"
+        cls._reject_sdk_context_overrides(filters, operation=operation)
         response_json = cls._post_action(
             "filter",
-            filters,
+            {**filters, **cls._sdk_owned_query_context(operation)},
             timeout=timeout,
             expected_statuses=(200,),
         )
@@ -1472,7 +1489,12 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
         **kwargs,
     ):
         url = f"{type(self).get_object_url().rstrip('/')}/{self._public_uid()}/"
-        payload = {"json": serialize_to_json(kwargs)}
+        operation = f"{type(self).__name__}.patch"
+        type(self)._reject_sdk_context_overrides(kwargs, operation=operation)
+        payload = {
+            "json": serialize_to_json(kwargs),
+            "params": type(self)._sdk_owned_query_context(operation),
+        }
         response = make_request(
             s=type(self).build_session(),
             loaders=type(self).LOADERS,
@@ -1504,6 +1526,7 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
                 "full_delete_downstream_tables": full_delete_downstream_tables,
                 "delete_with_no_table": delete_with_no_table,
                 "override_protection": override_protection,
+                **cls._sdk_owned_query_context(f"{cls.__name__}.delete"),
             }
         }
         response = make_request(
@@ -1550,9 +1573,13 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
             raise ValueError(
                 "project_context is SDK-controlled and cannot be supplied by the caller."
             )
+        if "organization_project_environment_uid" in unvalidated_payload:
+            raise ValueError(
+                "organization_project_environment_uid is SDK-controlled and cannot "
+                "be supplied by the caller."
+            )
         payload = MetaTableRegistrationRequest.model_validate(unvalidated_payload)
-        if payload.management_mode != "external_registered":
-            payload = _with_current_metatable_project_context(payload)
+        payload = _with_current_metatable_project_context(payload)
         response_json = cls._post_action(
             "register",
             payload,
@@ -1823,6 +1850,8 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
         q = (q or "").strip()
         if not q:
             raise ValueError("q is required")
+        operation = f"{cls.__name__}.description_search"
+        cls._reject_sdk_context_overrides(filters, operation=operation)
 
         body = {
             "q": q,
@@ -1838,6 +1867,7 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
 
         if filters:
             body.update(filters)
+        body.update(cls._sdk_owned_query_context(operation))
 
         payload = {"params": serialize_to_json(body)}
         response = make_request(
@@ -1857,8 +1887,14 @@ class MetaTable(BasePydanticModel, LabelableObjectMixin, ShareableObjectMixin, B
         q = (q or "").strip()
         if not q:
             raise ValueError("q is required")
+        operation = f"{cls.__name__}.column_search"
+        cls._reject_sdk_context_overrides(filters, operation=operation)
 
-        payload = {"params": serialize_to_json({"q": q, **filters})}
+        payload = {
+            "params": serialize_to_json(
+                {"q": q, **filters, **cls._sdk_owned_query_context(operation)}
+            )
+        }
         response = make_request(
             s=cls.build_session(),
             loaders=cls.LOADERS,
@@ -3080,7 +3116,6 @@ class TimeIndexMetaTable(MetaTable):
         "identifier": ["in", "exact", "contains"],
         "uid": ["in", "exact"],
         "data_source__uid": ["in", "exact"],
-        "organization_project_environment_uid": ["in", "exact"],
         "namespace": ["exact", "contains", "in", "isnull"],
         "physical_schema": ["exact", "in"],
         "physical_table_name": ["exact", "contains", "in"],
@@ -3091,8 +3126,6 @@ class TimeIndexMetaTable(MetaTable):
         "uid__in": "uid",
         "data_source__uid": "uid",
         "data_source__uid__in": "uid",
-        "organization_project_environment_uid": "uid",
-        "organization_project_environment_uid__in": "uid",
         "physical_schema": "str",
         "physical_schema__in": "str",
         "labels": "str",
@@ -3331,6 +3364,11 @@ class TimeIndexMetaTable(MetaTable):
             raise ValueError(
                 "project_context is SDK-controlled and cannot be supplied by the caller."
             )
+        if "organization_project_environment_uid" in unvalidated_payload:
+            raise ValueError(
+                "organization_project_environment_uid is SDK-controlled and cannot "
+                "be supplied by the caller."
+            )
         payload = TimeIndexMetaTableRegistrationRequest.model_validate(unvalidated_payload)
         payload_json = _with_current_metatable_project_context(payload)
         request_payload = {"json": serialize_to_json(payload_json)}
@@ -4706,6 +4744,10 @@ def _current_metatable_project_context() -> MetaTableProjectContextRequest:
     return _metatable_project_context_from_resolution(get_project_runtime_context())
 
 
+def _current_metatable_environment_uid() -> str:
+    return resolve_project_environment_uid("External MetaTable registration")
+
+
 def _metatable_project_context_for_request() -> MetaTableProjectContextRequest | None:
     return _current_metatable_project_context()
 
@@ -4716,7 +4758,15 @@ def _with_current_metatable_project_context(
     payload_json = _payload_json(payload)
     if "project_context" in payload_json:
         raise ValueError("project_context is SDK-controlled and cannot be supplied by the caller.")
+    if "organization_project_environment_uid" in payload_json:
+        raise ValueError(
+            "organization_project_environment_uid is SDK-controlled and cannot "
+            "be supplied by the caller."
+        )
     if payload_json.get("management_mode") == "external_registered":
+        payload_json["organization_project_environment_uid"] = (
+            _current_metatable_environment_uid()
+        )
         return payload_json
     project_context = _metatable_project_context_for_request()
     if project_context is not None:
@@ -4730,13 +4780,23 @@ def _with_current_metatable_project_context_collection(
     payload_rows = [dict(payload) for payload in payloads]
     if any("project_context" in row for row in payload_rows):
         raise ValueError("project_context is SDK-controlled and cannot be supplied by the caller.")
+    if any("organization_project_environment_uid" in row for row in payload_rows):
+        raise ValueError(
+            "organization_project_environment_uid is SDK-controlled and cannot "
+            "be supplied by the caller."
+        )
     managed_rows = [
         row for row in payload_rows if row.get("management_mode") != "external_registered"
     ]
-    if not managed_rows:
-        return payload_rows
+    external_rows = [
+        row for row in payload_rows if row.get("management_mode") == "external_registered"
+    ]
+    if external_rows:
+        environment_uid = _current_metatable_environment_uid()
+        for row in external_rows:
+            row["organization_project_environment_uid"] = environment_uid
 
-    project_context = _metatable_project_context_for_request()
+    project_context = _metatable_project_context_for_request() if managed_rows else None
     if project_context is not None:
         current_project_context = project_context.model_dump(mode="json")
         for row in managed_rows: