fred-runtime 2.0.8__tar.gz → 2.0.11__tar.gz

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-runtime
-Version: 2.0.8
+Version: 2.0.11
 Summary: Runtime adapters and infrastructure wiring for Fred v2 agents.
 Author-email: Thales <noreply@thalesgroup.com>
 License: Apache-2.0
@@ -12,8 +12,9 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Operating System :: OS Independent
 Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: fred-core>=1.5.3
+Requires-Dist: fred-core>=2.0.5
 Requires-Dist: fred-sdk>=0.1.11
+Requires-Dist: alembic>=1.18.4
 Requires-Dist: deepagents>=0.4.11
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: langchain-mcp-adapters>=0.2.1
@@ -30,7 +31,9 @@ Requires-Dist: bandit>=1.8.6; extra == "dev"
 Requires-Dist: basedpyright==1.31.0; extra == "dev"
 Requires-Dist: detect-secrets>=1.5.0; extra == "dev"
 Requires-Dist: pytest>=8.4.2; extra == "dev"
+Requires-Dist: pytest-asyncio>=1.2.0; extra == "dev"
 Requires-Dist: pytest-cov>=6.2.1; extra == "dev"
+Requires-Dist: pytest-socket>=0.7.0; extra == "dev"
 Requires-Dist: ruff>=0.12.5; extra == "dev"
 
 # fred-runtime

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/app/agent_app.py

@@ -563,6 +563,21 @@ class LocalRegistryAgentInvoker(AgentInvokerPort):
 
         context_dict = request.context.model_dump(mode="json")
         context_dict.setdefault("execution_action", ExecutionGrantAction.EXECUTE.value)
+        # RFC AGENT-INVOKE: apply the caller's per-call scope onto the callee's
+        # retrieval context. These keys are read back when the callee's
+        # RuntimeContext is built, so they narrow its document/library/search world.
+        # Scope narrows only; the callee still runs under the delegated identity.
+        if request.scope is not None:
+            if request.scope.document_uids is not None:
+                context_dict["selected_document_uids"] = list(
+                    request.scope.document_uids
+                )
+            if request.scope.library_ids is not None:
+                context_dict["selected_document_libraries_ids"] = list(
+                    request.scope.library_ids
+                )
+            if request.scope.search_policy is not None:
+                context_dict["search_policy"] = request.scope.search_policy
         execute_request = _AgentExecuteRequest.model_construct(
             agent_id=request.agent_id,
             agent_instance_id=None,

fred_runtime-2.0.11/fred_runtime/app/container.py

@@ -0,0 +1,27 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Pod container factory — single composition-root entry point."""
+
+from __future__ import annotations
+
+from fred_runtime.app.config import AgentPodConfig
+from fred_runtime.app.context import PodApplicationContext
+
+PodContainer = PodApplicationContext
+
+
+def build_pod_container(configuration: AgentPodConfig) -> PodContainer:
+    """Create a fresh PodApplicationContext with no side effects."""
+    return PodApplicationContext(configuration)

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/app/context.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """PodApplicationContext — single composition root for a fred-runtime agent pod."""
 
 from __future__ import annotations

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/app/dependencies.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """FastAPI dependency helpers for pod container injection."""
 
 from __future__ import annotations

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/app/mcp_config.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """Typed representation of the mcp_catalog.yaml loaded by an agent pod."""
 
 from __future__ import annotations

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/__init__.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from .completion import completion_candidates
 from .entrypoint import build_parser, main
 from .history_display import (

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/completion.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 from collections.abc import Sequence

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/entrypoint.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 import argparse

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/history_display.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 import json

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/kpi_display.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 import re

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/pod_client.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 import json

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/repl.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 import getpass

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/repl_helpers.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 import uuid

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/cli/url_helpers.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import annotations
 
 import os

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/client.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """
 Compatibility shim — all implementation has moved to fred_runtime.cli.*
 

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/common/context_aware_tool.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, Optional
 
 import httpx  # ← we log/inspect HTTP errors coming from MCP adapters
 from fred_core.common import OwnerFilter
+from fred_core.common.team_id import is_personal_team_id
 from fred_core.kpi.kpi_writer_structures import KPIActor
 from fred_sdk.support.mcp_utils import normalize_mcp_content
 from langchain_core.tools import BaseTool
@@ -20,6 +21,7 @@ from fred_runtime.runtime_context import get_runtime_context
 from fred_runtime.runtime_support import (
     RuntimeContextProvider,
     get_document_library_tags_ids,
+    get_document_uids,
     get_vector_search_scopes,
 )
 
@@ -170,6 +172,15 @@ class ContextAwareTool(BaseTool):
                 library_ids,
             )
 
+        document_uids = get_document_uids(context)
+        if document_uids and "document_uids" in tool_properties:
+            kwargs["document_uids"] = document_uids
+            logger.info(
+                "ContextAwareTool(%s) injecting document filter: %s",
+                self.name,
+                document_uids,
+            )
+
         session_id = context.session_id
         if (
             session_id
@@ -183,19 +194,24 @@ class ContextAwareTool(BaseTool):
                 session_id,
             )
 
-        # Force team_id depending on agent settings
-        if "team_id" in tool_properties and settings.team_id:
-            kwargs["team_id"] = settings.team_id
+        # Force team_id depending on agent settings.
+        # Personal-space IDs ("personal-<uuid>") are not real ReBAC teams;
+        # don't forward them to tools that look up team membership.
+        effective_team_id = (
+            settings.team_id if not is_personal_team_id(settings.team_id) else None
+        )
+        if "team_id" in tool_properties and effective_team_id:
+            kwargs["team_id"] = effective_team_id
             logger.info(
                 "ContextAwareTool(%s) injecting team_id: %s",
                 self.name,
-                settings.team_id,
+                effective_team_id,
             )
 
         # Force owner_filter depending on agent settings
         if "owner_filter" in tool_properties:
             owner_filter = (
-                OwnerFilter.TEAM if settings.team_id else OwnerFilter.PERSONAL
+                OwnerFilter.TEAM if effective_team_id else OwnerFilter.PERSONAL
             )
             kwargs["owner_filter"] = owner_filter.value
             logger.info(

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/common/token_expiry.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """Shared helpers to detect expired access tokens in HTTP responses/errors."""
 
 from __future__ import annotations

fred_runtime-2.0.11/fred_runtime/deep/__init__.py

@@ -0,0 +1,15 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+

fred_runtime-2.0.11/fred_runtime/graph/__init__.py

@@ -0,0 +1,15 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+

{fred_runtime-2.0.8 → fred_runtime-2.0.11}/fred_runtime/graph/graph_runtime.py

@@ -1,3 +1,17 @@
+# Copyright Thales 2026
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """
 Executable runtime for v2 graph agents.
 
@@ -22,7 +36,7 @@ import uuid
 from collections.abc import AsyncIterator, Awaitable, Callable, Mapping
 from contextlib import asynccontextmanager, nullcontext
 from dataclasses import dataclass, field
-from typing import Protocol, cast
+from typing import Any, Protocol, cast
 
 from fred_core.portable import MetricsProvider
 from fred_sdk.contracts.context import (
@@ -33,6 +47,7 @@ from fred_sdk.contracts.context import (
     BoundRuntimeContext,
     ConversationTurn,
     FetchedResource,
+    InvocationScope,
     PublishedArtifact,
     ResourceFetchRequest,
     ResourceScope,
@@ -76,7 +91,7 @@ from langchain_core.messages import BaseMessage
 from langchain_core.runnables import RunnableConfig
 from langchain_core.tools import BaseTool
 from langgraph.checkpoint.base import Checkpoint, CheckpointMetadata, empty_checkpoint
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
 
 from fred_runtime.runtime_support.checkpoints import (
     AsyncCheckpointReader,
@@ -86,6 +101,84 @@ from fred_runtime.runtime_support.model_metadata import runtime_metadata_from_me
 
 logger = logging.getLogger(__name__)
 
+# RFC AGENT-INVOKE: typed agent invocation — how many times invoke_agent re-asks a
+# callee for a valid JSON object before giving up and returning structured=None.
+_STRUCTURED_OUTPUT_MAX_ATTEMPTS = 2
+
+
+def _structured_output_instruction(schema: dict[str, Any]) -> str:
+    """Instruction appended to the callee message asking for schema-conformant JSON."""
+    return (
+        "\n\nIMPORTANT: Respond with ONLY a single valid JSON object that conforms to "
+        "this JSON Schema. No prose, no explanation, no markdown code fences:\n"
+        + json.dumps(schema, ensure_ascii=False)
+    )
+
+
+def _try_json_object(text: str) -> dict[str, Any] | None:
+    """Parse ``text`` as JSON, returning it only if it is a JSON object."""
+    try:
+        parsed = json.loads(text)
+    except (ValueError, TypeError):
+        return None
+    return parsed if isinstance(parsed, dict) else None
+
+
+def _extract_json_object(text: str) -> dict[str, Any] | None:
+    """Best-effort extraction of a single JSON object from an agent's free text.
+
+    Tries, in order: the whole string, a fenced ``` block, then the first balanced
+    ``{...}`` span. Returns ``None`` if nothing parses to an object.
+    """
+    if not text:
+        return None
+    candidate = text.strip()
+    obj = _try_json_object(candidate)
+    if obj is not None:
+        return obj
+
+    fence = candidate.find("```")
+    if fence != -1:
+        rest = candidate[fence + 3 :]
+        if rest[:4].lower() == "json":
+            rest = rest[4:]
+        end = rest.find("```")
+        if end != -1:
+            obj = _try_json_object(rest[:end].strip())
+            if obj is not None:
+                return obj
+
+    start = candidate.find("{")
+    while start != -1:
+        depth = 0
+        for index in range(start, len(candidate)):
+            char = candidate[index]
+            if char == "{":
+                depth += 1
+            elif char == "}":
+                depth -= 1
+                if depth == 0:
+                    obj = _try_json_object(candidate[start : index + 1])
+                    if obj is not None:
+                        return obj
+                    break
+        start = candidate.find("{", start + 1)
+    return None
+
+
+def _coerce_structured_payload(
+    content: str, output_schema: type[BaseModel]
+) -> dict[str, Any] | None:
+    """Extract + validate a callee's text into ``output_schema``; ``None`` on failure."""
+    parsed = _extract_json_object(content)
+    if parsed is None:
+        return None
+    try:
+        return output_schema.model_validate(parsed).model_dump(mode="json")
+    except ValidationError:
+        return None
+
+
 GraphNodeHandler = Callable[
     [BaseModel, GraphNodeContext], GraphNodeResult | Awaitable[GraphNodeResult]
 ]
@@ -669,7 +762,16 @@ class _GraphNodeExecutionContext:
         message: str,
         *,
         prior_turns: tuple[ConversationTurn, ...] = (),
+        output_schema: type[BaseModel] | None = None,
+        scope: InvocationScope | None = None,
     ) -> AgentInvocationResult:
+        """Invoke another registered agent for one turn (RFC AGENT-INVOKE).
+
+        When ``output_schema`` is given the callee is asked for a JSON object of that
+        shape; the validated payload is attached to ``result.structured`` (with a
+        bounded retry, ``None`` if it could not be coerced). When ``scope`` is given,
+        the callee's retrieval world is narrowed for this call only.
+        """
         agent_invoker = self.services.agent_invoker
         if agent_invoker is None:
             raise RuntimeError(
@@ -680,6 +782,13 @@ class _GraphNodeExecutionContext:
 
         self.emit_status("invoke_agent", detail=agent_id)
 
+        schema_dict = (
+            output_schema.model_json_schema() if output_schema is not None else None
+        )
+        max_attempts = (
+            _STRUCTURED_OUTPUT_MAX_ATTEMPTS if output_schema is not None else 1
+        )
+
         span = _start_runtime_span(
             services=self.services,
             binding=self.binding,
@@ -690,6 +799,7 @@ class _GraphNodeExecutionContext:
                 "target_agent_id": agent_id,
             },
         )
+        result: AgentInvocationResult | None = None
         try:
             with _graph_phase_timer(
                 metrics=self.services.metrics,
@@ -702,14 +812,49 @@ class _GraphNodeExecutionContext:
                     "target_agent_id": agent_id,
                 },
             ) as kpi_dims:
-                result = await agent_invoker.invoke(
-                    AgentInvocationRequest(
-                        agent_id=agent_id,
-                        message=message,
-                        context=self.binding.portable_context,
-                        prior_turns=prior_turns,
+                for attempt in range(max_attempts):
+                    effective_message = message
+                    if schema_dict is not None:
+                        effective_message = message + _structured_output_instruction(
+                            schema_dict
+                        )
+                        if attempt > 0:
+                            effective_message = (
+                                "Your previous response was not a valid JSON object. "
+                                + effective_message
+                            )
+                    result = await agent_invoker.invoke(
+                        AgentInvocationRequest(
+                            agent_id=agent_id,
+                            message=effective_message,
+                            context=self.binding.portable_context,
+                            prior_turns=prior_turns,
+                            scope=scope,
+                            output_schema=schema_dict,
+                        )
+                    )
+                    if output_schema is None or result.is_error:
+                        break
+                    structured = _coerce_structured_payload(
+                        result.content, output_schema
+                    )
+                    if structured is not None:
+                        result = result.model_copy(update={"structured": structured})
+                        break
+
+                assert result is not None
+                if (
+                    output_schema is not None
+                    and not result.is_error
+                    and result.structured is None
+                ):
+                    logger.warning(
+                        "invoke_agent(%s): could not coerce output to %s after %d "
+                        "attempt(s); returning structured=None",
+                        agent_id,
+                        output_schema.__name__,
+                        max_attempts,
                     )
-                )
                 if result.is_error:
                     kpi_dims["status"] = "error"
                     if span is not None:
@@ -723,6 +868,7 @@ class _GraphNodeExecutionContext:
         finally:
             if span is not None:
                 span.end()
+        assert result is not None
         return result
 
     async def publish_text(